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
commit69941fb396f9a46d0f8b24c9fdfb2a9b5dafa33c (patch)
treed21f98b2e8a5a1bf9e8f0ad4c464e0a65a9d6c7a /sci-geosciences
parentNeed also gtk introspection (diff)
downloadgentoo-2-69941fb396f9a46d0f8b24c9fdfb2a9b5dafa33c.tar.gz
gentoo-2-69941fb396f9a46d0f8b24c9fdfb2a9b5dafa33c.tar.bz2
gentoo-2-69941fb396f9a46d0f8b24c9fdfb2a9b5dafa33c.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.
(Portage version: 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/metadata.xml2
-rw-r--r--sci-geosciences/opencpn/opencpn-2.3.1.ebuild17
3 files changed, 15 insertions, 11 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/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
}