summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-06-15 08:57:04 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-06-15 08:57:04 +0000
commitc8bfa58cc2bd2ca6d0aef4cdc4c3fc26e6651ba9 (patch)
treeff1e49e3f3a3de70b6c6f24f54bbf51f24634384 /sci-geosciences
parentNeed also gtk introspection (diff)
downloadhistorical-c8bfa58cc2bd2ca6d0aef4cdc4c3fc26e6651ba9.tar.gz
historical-c8bfa58cc2bd2ca6d0aef4cdc4c3fc26e6651ba9.tar.bz2
historical-c8bfa58cc2bd2ca6d0aef4cdc4c3fc26e6651ba9.zip
Add sci-geo as herd. Move gettext only to depend. Rename glu to opengl as the goal used to be get rid of glu everywhere.
Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64
Diffstat (limited to 'sci-geosciences')
-rw-r--r--sci-geosciences/opencpn/ChangeLog7
-rw-r--r--sci-geosciences/opencpn/Manifest12
-rw-r--r--sci-geosciences/opencpn/metadata.xml2
-rw-r--r--sci-geosciences/opencpn/opencpn-2.3.1.ebuild17
4 files changed, 21 insertions, 17 deletions
diff --git a/sci-geosciences/opencpn/ChangeLog b/sci-geosciences/opencpn/ChangeLog
index 1e31f6a251fa..91bf033cc5d2 100644
--- a/sci-geosciences/opencpn/ChangeLog
+++ b/sci-geosciences/opencpn/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sci-geosciences/opencpn
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/opencpn/ChangeLog,v 1.2 2011/06/15 01:30:15 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/opencpn/ChangeLog,v 1.3 2011/06/15 08:57:04 scarabeus Exp $
+
+ 15 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> opencpn-2.3.1.ebuild,
+ metadata.xml:
+ Add sci-geo as herd. Move gettext only to depend. Rename glu to opengl as the
+ goal used to be get rid of glu everywhere.
15 Jun 2011; Marc Schiffbauer <mschiff@gentoo.org> opencpn-2.3.1.ebuild:
Drop bogus bzip2 dep and force default build flags
diff --git a/sci-geosciences/opencpn/Manifest b/sci-geosciences/opencpn/Manifest
index 33e4d16c6393..a73e6abe89af 100644
--- a/sci-geosciences/opencpn/Manifest
+++ b/sci-geosciences/opencpn/Manifest
@@ -2,13 +2,13 @@
Hash: SHA1
DIST OpenCPN-2.3.1-Source.tar.gz 62899032 RMD160 7b2c513cde37204e9cfb2f4575e30139cac05d3a SHA1 f7db674de0c3308d1c5af802386965326bb800f5 SHA256 a94bf3cac62edc089153a1b83b0595cecd54bef8ddfd364f1ed19bcd2e10e0c4
-EBUILD opencpn-2.3.1.ebuild 1108 RMD160 ad64d892f168900127d88b4ef4c1c98b75b724cb SHA1 cc593aa07ba321bb34f7f0b97f9bad3526a6a8fc SHA256 4570b51497f5a3e9f6f8429ef7ae155f09e143c15d680f0572cdad4fe281ce32
-MISC ChangeLog 561 RMD160 75c589e34733f20ad151fd79da4b7875016acd5b SHA1 1bdb1cc4846052d3c1e57774742681fb2fa5d7ee SHA256 44380eb6c02aec8390eec7409bcdf94a097719ab48718084a4a51c77e8920bd6
-MISC metadata.xml 329 RMD160 6f2c8a7d356d05d8bd5cbdc8341de2a059f72c4f SHA1 82947c456314e5adeada30f31d7c91d1f7b64366 SHA256 f9dfb153a47ecce7cf936ca5aa8e7f86488d7c8a35f8a135a186972612f1cd16
+EBUILD opencpn-2.3.1.ebuild 1098 RMD160 7b3d298f2080cc8c5f9f1c6812a5104cf6f9c9ac SHA1 66c4e72847560e2ac537d7df8496a58860df32ab SHA256 036c0d6123b459c18487f44674bea112eed4968a670d267f5c12ada94eed692a
+MISC ChangeLog 782 RMD160 a743f51f4d253dd26415936e2981fc5fd3ceb753 SHA1 798a23bd193cb934f6b8e69836c7cfd8f26160a1 SHA256 23c302f520c20708fd7193b7b18690ea312e17de237eee3808b8997868a99f59
+MISC metadata.xml 337 RMD160 fb6e38e51bc117236717d93aa74e8e25db035a26 SHA1 625261a58d4723baf66003dcd930d7d1a1bc62f6 SHA256 d79f8ef3be20a8db292f07b5d59b705cb584d6860b2ef8fbaba69e29986c6463
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iD8DBQFN+As7KWxsyjWmQTQRApLTAKCINhZcwh5CmZDvfV9Ok8taGT3tQACgnCDO
-CaWUXDgmLorNHBJlhNNsx5I=
-=Cd74
+iEYEARECAAYFAk34c+oACgkQHB6c3gNBRYdl7ACfSSo3EZAiR5Li37kIGKUrbmLX
+9+wAn0o+49VLsu/0xNDVnUF3EaRpIE+p
+=vcgc
-----END PGP SIGNATURE-----
diff --git a/sci-geosciences/opencpn/metadata.xml b/sci-geosciences/opencpn/metadata.xml
index 821ef81687f0..1718b525bf5f 100644
--- a/sci-geosciences/opencpn/metadata.xml
+++ b/sci-geosciences/opencpn/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>no-herd</herd>
+ <herd>sci-geosciences</herd>
<maintainer>
<email>mschiff@gentoo.org</email>
</maintainer>
diff --git a/sci-geosciences/opencpn/opencpn-2.3.1.ebuild b/sci-geosciences/opencpn/opencpn-2.3.1.ebuild
index 0b35944d2aa1..b34aae4c1bed 100644
--- a/sci-geosciences/opencpn/opencpn-2.3.1.ebuild
+++ b/sci-geosciences/opencpn/opencpn-2.3.1.ebuild
@@ -1,11 +1,10 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/opencpn/opencpn-2.3.1.ebuild,v 1.2 2011/06/15 01:30:15 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/opencpn/opencpn-2.3.1.ebuild,v 1.3 2011/06/15 08:57:04 scarabeus Exp $
-EAPI="4"
+EAPI=4
WX_GTK_VER="2.8"
-
inherit cmake-utils wxwidgets
MY_P=OpenCPN-${PV}-Source
@@ -23,22 +22,22 @@ IUSE="gpsd"
# s57 must be enabled in this release to make the buils succeed
# if s57 may be disabled in a later release virtual/glu may be
# use conditional
-DEPEND="gpsd? ( >=sci-geosciences/gpsd-2.90 )
- sys-devel/gettext
+RDEPEND="gpsd? ( >=sci-geosciences/gpsd-2.90 )
sys-libs/zlib
- virtual/glu
+ virtual/opengl
>=x11-libs/wxGTK-2.8.8[X]"
-RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ sys-devel/gettext"
S="${WORKDIR}/${MY_P}"
src_configure() {
- local mycmakeargs
- mycmakeargs=(
+ local mycmakeargs=(
$(cmake-utils_use_use gpsd GPSD)
-DUSE_S57=ON
-DUSE_GARMINHOST=ON
-DUSE_WIFI_CLIENT=OFF
)
+
cmake-utils_src_configure
}