Added new version 3.0.2. Updated dependencies. Closes #426902. Thanks Christian!

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

4 files changed, 103 insertions, 14 deletions

diff --git a/sci-geosciences/opencpn/ChangeLog b/sci-geosciences/opencpn/ChangeLog
index 5f039e0b73ec..c6d5ba5f6cec 100644
--- a/sci-geosciences/opencpn/ChangeLog
+++ b/sci-geosciences/opencpn/ChangeLog
@@ -1,6 +1,13 @@
 # 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.8 2011/12/02 16:39:38 mschiff Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/opencpn/ChangeLog,v 1.9 2012/07/17 22:57:56 mschiff Exp $
+
+*opencpn-3.0.2 (17 Jul 2012)
+
+  17 Jul 2012; Marc Schiffbauer <mschiff@gentoo.org> +opencpn-3.0.2.ebuild,
+  +files/opencpn-3.0.2-multilib-strict.patch:
+  Added new version 3.0.2. Updated dependencies. Closes #426902. Thanks
+  Christian!
 
 *opencpn-2.5.0-r1 (02 Dec 2011)
 
diff --git a/sci-geosciences/opencpn/Manifest b/sci-geosciences/opencpn/Manifest
index 2e0b6904b7de..ebe6aa0df18d 100644
--- a/sci-geosciences/opencpn/Manifest
+++ b/sci-geosciences/opencpn/Manifest
@@ -1,17 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-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 1553 RMD160 3ec8c21f54ebcb2b1b546793868a947d89b62a64 SHA1 f70ee62a1105278c769a2f5ba116247d7914efb1 SHA256 105a0df0aa23393962ca67f904d674164d16abaef185c4c32fe7e468a5d69970
-MISC metadata.xml 337 RMD160 fb6e38e51bc117236717d93aa74e8e25db035a26 SHA1 625261a58d4723baf66003dcd930d7d1a1bc62f6 SHA256 d79f8ef3be20a8db292f07b5d59b705cb584d6860b2ef8fbaba69e29986c6463
+AUX opencpn-2.5.0-multilib-strict.patch 573 SHA256 d4ad6bbd2989e865dc7b5aee76dec370d76028519bc34c5e4bf94643b88bddc7 SHA512 3a141826d9ca523d1fbf04276797f0334b5fc49005a791619ece662f6cab4f545b3e0b071676aee97b4fb6b3900ebcba8af465101b7619e356c1ea1764a7120c WHIRLPOOL b2069d3a0a52801d09ccaff927562be1b7bb16ea25f6dc044dea05dea182b704fe44ef65408f91a4f1bfd72df8d3f103bbea84e91e9875a0e0aed21da3221d43
+AUX opencpn-2.5.0_tinyxml_stl.patch 503 SHA256 cb82924e3073f6a274ce512a7c58d1f188d2e5fdbc6c661b02cdeb9d781c1a88 SHA512 6261481bb1691a32cf18639b82c85cfc40134eebc35d37adb1b619872a16c2bdf16e3bc0e6568ad93d7c3d8e43c0bda63f030dfcab64b8d083da1f26ad7934a2 WHIRLPOOL 94362e74715c66426e0affd80d44f09bd6e59f6e0abafa249c17f53001e8f3646276554ad00bbe1b4593767ed569f3846a4f0b00e4790ff4180811bc43e5e0b3
+AUX opencpn-3.0.2-multilib-strict.patch 518 SHA256 77772c8908f2be02d3b1c0d6b69af22c966bb717a147ed51079f5542a3cba6c6 SHA512 c081d32666e2e6bae4a26804e2e21b2c219532fb6f170bb74f1b4ed9606d2e6b50c80c7d3b7b40bbe915c30eabf1adf12929e27f640fa710b75cadae9f6acf59 WHIRLPOOL c08b57d5a19ede490d7dc773303bbd016e2fcb5c8a81c5189a12ab768a4a69582fed9efd02e14273143939c2bffcf0e06db85b6c3743dae9c216722e919528fc
+DIST OpenCPN-2.5.0-Source.tar.gz 109134818 SHA256 2496d43efb9140ec4ca6511fd37e198b88152b685a830bb408f3e4dc641dbb05 SHA512 29fc4e429cc35240c7fe7ccdc6d8e75c7b5a5eb58a982a906f585f90765c36dd0885a06781e1d503966cc495c04e9c884d7a5720ba60a780168b9525bec4dfad WHIRLPOOL 15b51badac069fd339ad51bc9b1d28cc51ca608fa2671a035d45d8fa1eb2f86d7d679ab123aef68ab8aec7867fa47098111486c98cfec99183f6e277ced5531d
+DIST OpenCPN-3.0.2-Source.tar.gz 42818873 SHA256 0193bb1e33ba8feccbc42f5da9076a1e0f6518699094bd4414b7746f66321bf9 SHA512 6c5d027a21eb84d8d3c68851bf6cff399c4758c5a5ff022a877afb709a8a2ed40f6a1aefbf9befb3cf4b18870781f6a614704ef30fe231e75cf3fc6fc8179c61 WHIRLPOOL 4c43a0be5316b19bf68548441aa43f4c4b328f1c5f90bf6acc6fd4ace0ad01505a89c40ce880925e616e8b49a498e28e7add2755a7577f2172607e2d3784e628
+EBUILD opencpn-2.5.0-r1.ebuild 1589 SHA256 39ef8a62b47d09f90a07d28f185cbab964bcaa8b71ab35d4077bdc76448fcd7b SHA512 c99c9d3ac29d405c200fa40f069970c378a56a2d5b620efab0c85224e2234445f57afd0de716590009c0cbb352edaafaa6050847d01da6d44fa6efaa50ce5013 WHIRLPOOL b26dab7310db38dbb3feab8ed72e4b44876a3802889303976310a947a19f74b4f0093d82ab01107522a84fddaa1b545a8e320fa89160d398d6b5f8d14b202b5a
+EBUILD opencpn-2.5.0.ebuild 1026 SHA256 eb3fe68435f0565a4641f1c3363c6c8e9bd56e74bee835b5082ab77e1b89f770 SHA512 3f278f644299fd594ad3924c29bf7320e1fd850bf949002e73a058bb31e367c7c16ca6b3f7d84c19b2967479061a697def29e203e0be093d5cdd0ee7d02719f9 WHIRLPOOL a60f85052e8a3e68869e4bf0e16c0362d2f65910e214cf4707071d8ca55f0aa2702a6f5087c45763b3e70a1d4aa506ffa530af9f8961b864aaf7d5ec0e0356a4
+EBUILD opencpn-3.0.2.ebuild 1640 SHA256 926bf862facb5bec17b2a8c021c8e41b7d2634b796f98c4aa75ac62c4ec483f0 SHA512 8e1a7a5dcf36b47c219a1ec06643d8e5e6acefd75a9d534ef7f3285af0321268786d891979c08a0df83b99901edd742a36b9a925e14df49ee6fa6076714a8fad WHIRLPOOL 960019c20eef185588b22d10e3a32c8c36a16468c2b1d60407e49f71684832e7b217152ce74e4159c1afcee84c578136622e5758497ee34e1a266a71bca4ff3a
+MISC ChangeLog 1791 SHA256 a10840b9e8f4dc73c2982f2f3bbf58b1a3057c8b84be824f8a2c3386b481d8c5 SHA512 277d7e59c0682b9b53ee7f8f61166cb62b6ca7113dd417dc816d0f1246d98432f132c657eaae57e2b952b74c87a1b43867b39bd9d56ecd5e7f4a4e3f5411601e WHIRLPOOL 3d2fafa6b4ff94a69658c61830c5bd223225ee6a391d65a28b253da03943fc6717c7c9554a1dea241d4d1c5350730cfde19c02502e8c8cb5ba6444798df244d8
+MISC metadata.xml 337 SHA256 d79f8ef3be20a8db292f07b5d59b705cb584d6860b2ef8fbaba69e29986c6463 SHA512 ddbf5acc8ebabb7f50abb7fc34e8fc5afa36b13a0f1e583e1f90541d9fc57e53573e3f468e5e1f79ec9dfdedbf3b2a4439f674b0bf7a7fd2a5581300a8850212 WHIRLPOOL a3fb659e54c50151911c4d46e32f750dc7bdaa80bba5e6d159c0b796a43d375fd8d28b9cf1392f5f518ff10531102c3f4a60ae53fa3a6581cac97b3d7feb3679
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iD8DBQFO2P9bKWxsyjWmQTQRAjPSAKCp9X9Iikx7VArUr4dYokkWtBW4RwCgsrxv
-SGa7BOlof1KBKLHjp86kbZU=
-=M4zS
+iD8DBQFQBe36KWxsyjWmQTQRCOl0AJ9sM6Lz7m6vyJ41u9CUl/qtFlUurgCgjl70
+oKiaRCBCUKslxvQkJw0ef5M=
+=8yM4
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/opencpn/files/opencpn-3.0.2-multilib-strict.patch b/sci-geosciences/opencpn/files/opencpn-3.0.2-multilib-strict.patch
new file mode 100644
index 000000000000..c66736fde9c7
--- /dev/null
+++ b/sci-geosciences/opencpn/files/opencpn-3.0.2-multilib-strict.patch
@@ -0,0 +1,12 @@
+--- OpenCPN-3.0.2-Source/CMakeLists.txt.orig	2012-07-18 00:27:24.531257698 +0200
++++ OpenCPN-3.0.2-Source/CMakeLists.txt	2012-07-18 00:29:37.669412986 +0200
+@@ -99,6 +99,9 @@
+       SET (LIB_INSTALL_DIR "lib")
+     ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8")
+   ENDIF (EXISTS /etc/suse-release OR EXISTS /etc/SuSE-release)
++  IF (EXISTS /etc/gentoo-release)
++    SET (LIB_INSTALL_DIR "lib${LIB_SUFFIX}")
++  ENDIF (EXISTS /etc/gentoo-release)
+   IF(APPLE)
+     IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
+       IF (CMAKE_OSX_64)
diff --git a/sci-geosciences/opencpn/opencpn-3.0.2.ebuild b/sci-geosciences/opencpn/opencpn-3.0.2.ebuild
new file mode 100644
index 000000000000..6b12e770b0b7
--- /dev/null
+++ b/sci-geosciences/opencpn/opencpn-3.0.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/opencpn/opencpn-3.0.2.ebuild,v 1.1 2012/07/17 22:57:56 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"
+SRC_URI="http://opencpn.org/ocpn/downloads/beta/${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.96-r1 )
+"
+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/portage/package.use*; then
+			ewarn "The local 'gpsd' USE flag has been removed in favour of the"
+		if use gps; then
+			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
+}