Revbump. USE=gpsd -> USE=gps. Fixes #390973

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

3 files changed, 78 insertions, 16 deletions

diff --git a/sci-geosciences/opencpn/ChangeLog b/sci-geosciences/opencpn/ChangeLog
index 4e50cdf5e78d..5f039e0b73ec 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.7 2011/11/19 09:48:59 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/opencpn/ChangeLog,v 1.8 2011/12/02 16:39:38 mschiff Exp $
+
+*opencpn-2.5.0-r1 (02 Dec 2011)
+
+  02 Dec 2011; Marc Schiffbauer <mschiff@gentoo.org> +opencpn-2.5.0-r1.ebuild:
+  Revbump. USE=gpsd -> USE=gps. Fixes #390973
 
   19 Nov 2011; Markos Chandras <hwoarang@gentoo.org> opencpn-2.5.0.ebuild:
   Stable on amd64 wrt bug #390551
diff --git a/sci-geosciences/opencpn/Manifest b/sci-geosciences/opencpn/Manifest
index 59b7f9e07494..2e0b6904b7de 100644
--- a/sci-geosciences/opencpn/Manifest
+++ b/sci-geosciences/opencpn/Manifest
@@ -1,26 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX opencpn-2.5.0-multilib-strict.patch 573 RMD160 2487dabe962039bbc6b1e7556bab5420c963dde2 SHA1 553953ce46a2a4c3db2a12c749c09cb8ed31b747 SHA256 d4ad6bbd2989e865dc7b5aee76dec370d76028519bc34c5e4bf94643b88bddc7
 AUX opencpn-2.5.0_tinyxml_stl.patch 503 RMD160 7929cf54048919a6ce3672e90424af83418c0cae SHA1 09c8c13a5e742cfd45e25ca36041ee013ef0c63a SHA256 cb82924e3073f6a274ce512a7c58d1f188d2e5fdbc6c661b02cdeb9d781c1a88
 DIST OpenCPN-2.5.0-Source.tar.gz 109134818 RMD160 6b4f7bb8e904e678c1fe901f14800fd4cc5d4f4a SHA1 afc30c0d383813d15f815c2b20583447c728c0ec SHA256 2496d43efb9140ec4ca6511fd37e198b88152b685a830bb408f3e4dc641dbb05
+EBUILD opencpn-2.5.0-r1.ebuild 1589 RMD160 bed572e226d78d63b790b65b239b90c47efc20a5 SHA1 27528e32913941eb6fc7cf453db03cc65c125411 SHA256 39ef8a62b47d09f90a07d28f185cbab964bcaa8b71ab35d4077bdc76448fcd7b
 EBUILD opencpn-2.5.0.ebuild 1026 RMD160 2833fa78f387a55dfb964bad8fdd308116851b7a SHA1 7398b4978e85ae7170dacbb412dfa7c9649998e6 SHA256 eb3fe68435f0565a4641f1c3363c6c8e9bd56e74bee835b5082ab77e1b89f770
-MISC ChangeLog 1395 RMD160 b0ce3f26b569fa162cfb0563bc9dc863df3b8e39 SHA1 15bbec7ebfee65241712b925f9c71d82e0e56da4 SHA256 0554426d5cb3ceaf22d8b00728cdfc11eab6ec35b99854610a404bdf1e191ff9
+MISC ChangeLog 1553 RMD160 3ec8c21f54ebcb2b1b546793868a947d89b62a64 SHA1 f70ee62a1105278c769a2f5ba116247d7914efb1 SHA256 105a0df0aa23393962ca67f904d674164d16abaef185c4c32fe7e468a5d69970
 MISC metadata.xml 337 RMD160 fb6e38e51bc117236717d93aa74e8e25db035a26 SHA1 625261a58d4723baf66003dcd930d7d1a1bc62f6 SHA256 d79f8ef3be20a8db292f07b5d59b705cb584d6860b2ef8fbaba69e29986c6463
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOx3snAAoJEPqDWhW0r/LCTJAP/jsvRo77xc4UOmG4mqL3fzpV
-FCVJI9g7iZHPObQdrmY51zqrGoSWt2ojq4xf3edKy7Q9CmltgBvoPMAdxdRHhd9f
-oUh0/gHpL0OBk+ZYm9HbnHRpL74IWusmIm49YmqBlfqG2HhYGeWok86syy4kBzAZ
-YLUi9z355Azsq4YTZz6ZSdiq0H/w8pSRJUwAgQMuZy0wz0sLam03aOW1xOKBaVcg
-REgOcUeZVJckhoJe+Papfp9FT4SHhOwyTDpkIHu+Ox/PmQjwrcDTflu1YNGFK0Fa
-nmHkyOFkAOS90IgJKanNvp1CrB9FXKydpi1EAsr0vI3IKFvP2SDsAjCiL+amUi+Z
-QjRdG43RUinmyenOd0q9UKMSHIeqb6QK1GYG+35RtHX5TWuqCP5C9RDS0TeBe3Vy
-mRmDPNPQNSi/EegRlWPMRa0F4wDtXAby88eR2NorkeIUbPPOkQawmFCQ5RFK4YJJ
-lhxefdctAceWDDGwxcDEH0o3w4SQbAzpyIllSJjyZejBG7pqLP5cuOnVez/Qk7Ms
-8v60d5YyE3Zx2sWLujVNGHHUDm8nCWj2fIPOIDTFUd5QCouYBAK72sQH2SlYd0OO
-2FukqDMFxLDKosPPcW9Zjm/A/ffCKnN75aUUbSg0k548TwFi9JDCbtnNg3qZjVF5
-yUJLABGYW8lJjF9oYwOq
-=cTXz
+iD8DBQFO2P9bKWxsyjWmQTQRAjPSAKCp9X9Iikx7VArUr4dYokkWtBW4RwCgsrxv
+SGa7BOlof1KBKLHjp86kbZU=
+=M4zS
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/opencpn/opencpn-2.5.0-r1.ebuild b/sci-geosciences/opencpn/opencpn-2.5.0-r1.ebuild
new file mode 100644
index 000000000000..efb58c7bc63c
--- /dev/null
+++ b/sci-geosciences/opencpn/opencpn-2.5.0-r1.ebuild
@@ -0,0 +1,66 @@
+# 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.5.0-r1.ebuild,v 1.1 2011/12/02 16:39:38 mschiff Exp $
+
+EAPI=4
+
+WX_GTK_VER="2.8"
+MY_P=OpenCPN-${PV}-Source
+inherit cmake-utils wxwidgets
+
+DESCRIPTION="a free, open source software for marine navigation"
+HOMEPAGE="http://opencpn.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gps"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/tinyxml
+	media-libs/freetype:2
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/gtk+:2
+	>=x11-libs/wxGTK-2.8.11.0[X]
+	gps? ( >=sci-geosciences/gpsd-2.95 )
+"
+DEPEND="${DEPEND}
+	sys-devel/gettext"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-multilib-strict.patch"
+	"${FILESDIR}/${P}_tinyxml_stl.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_use gps GPSD)
+		-DUSE_S57=ON
+		-DUSE_GARMINHOST=ON
+		-DUSE_WIFI_CLIENT=OFF
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	if grep -rqE "sci-geosciences/opencpn.*gpsd" /etc/make.conf /etc/portage/package.use*; then
+		if use gps; then
+			ewarn "The local 'gpsd' USE flag has been removed in favour of the"
+			ewarn "global 'gps' USE flag which is enabled on your system."
+			ewarn ""
+			ewarn "Please remove the 'gpsd' USE flag from your make.conf"
+			ewarn "and/or /etc/portage/package.use files."
+		else
+			ewarn "global 'gps' USE flag."
+			ewarn ""
+			ewarn "In order to have GPS support in OpenCPN you need to"
+			ewarn "enable the 'gps' USE flag."
+		fi
+	fi
+}