Version bump and drop old ebuilds. Fixes bug #476584. Thanks to Jonas Stein

7 files changed, 24 insertions, 133 deletions

diff --git a/sci-geosciences/opencpn/ChangeLog b/sci-geosciences/opencpn/ChangeLog
index c6d5ba5f6cec..1ffa114dd532 100644
--- a/sci-geosciences/opencpn/ChangeLog
+++ b/sci-geosciences/opencpn/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-geosciences/opencpn
-# 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 $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/opencpn/ChangeLog,v 1.10 2013/07/14 23:11:41 mschiff Exp $
+
+*opencpn-3.2.2 (14 Jul 2013)
+
+  14 Jul 2013; Marc Schiffbauer <mschiff@gentoo.org> -opencpn-2.5.0.ebuild,
+  -opencpn-2.5.0-r1.ebuild, +opencpn-3.2.2.ebuild,
+  -files/opencpn-2.5.0-multilib-strict.patch,
+  -files/opencpn-2.5.0_tinyxml_stl.patch:
+  Version bump and drop old ebuilds. Fixes bug #476584. Thanks to Jonas Stein
 
 *opencpn-3.0.2 (17 Jul 2012)
 
diff --git a/sci-geosciences/opencpn/Manifest b/sci-geosciences/opencpn/Manifest
index ebe6aa0df18d..714b4c4b55c7 100644
--- a/sci-geosciences/opencpn/Manifest
+++ b/sci-geosciences/opencpn/Manifest
@@ -1,20 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-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
+DIST opencpn-3.2.2.tar.gz 50225043 SHA256 bb53b8264fb6fd82e3e7778771ffdcec26621c24db9ece388c4e5e89711550ab SHA512 0ea40529e12ab3fd7f21c60d87c33aed2038b2dff1ecb9a4ff799f15fe6d0c73d65a91f7eb02949383f45629bfd4715319b72a6bb5bc76114b53636818e8ca6b WHIRLPOOL db5bca7541bc8aa7c18e80bdb25d91674f681e9f0922c885324896651ce075b74e017caee5e0d304617d92bf221e4e6c0754f6aae9276027a62383c38ca4b98f
 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.19 (GNU/Linux)
-
-iD8DBQFQBe36KWxsyjWmQTQRCOl0AJ9sM6Lz7m6vyJ41u9CUl/qtFlUurgCgjl70
-oKiaRCBCUKslxvQkJw0ef5M=
-=8yM4
------END PGP SIGNATURE-----
+EBUILD opencpn-3.2.2.ebuild 918 SHA256 80a1422b02c2bc38f1f0243c98df17703779cd380e0d9f8dbeb378b2bfeb250f SHA512 b8271b015f3c9e9cd7f016999b3a1abd18b86c972e19b4486d88e64a642ff6a5b443f8c7e958abaf47ef01293d9e135e1f49c167af70601e085c8eb436fb6a3b WHIRLPOOL 3b0f19127be76fdb55ade974e974e4f1022c565cae9f4588f7a0e17592f00b06b42845eb2fa22bdd9997c3c9c7bec158955fb3bf7708730a71cdaea960c210b2
+MISC ChangeLog 2115 SHA256 d2011f23d5749ed20a3145feb0f13b42cc78545c888aa6aff7b6de7bbbc1cea0 SHA512 2d849d42f7efcebb37a1e5ab2b9ba6489b3215a991fd1c0b570d2c3a32bcc9353fc36a9b64a89fee051e6f1f07bd6d56e78bdb98d8cd458871430180e183cf1c WHIRLPOOL 59dd8151e0a5791613fc9ac634b4c1218c8078d7e65e6508c812de2a138efd3e1cf4642cdd64e79d93cbb17969cfe25474156c56cd44f0522cbb32d5362fa487
+MISC metadata.xml 234 SHA256 32d2f99553696b3b1d775b539c24f95a2a186a4726b6414a4a93d95161d56346 SHA512 d28c1c8c4ea440a32202e6850eeea6b15cbf21e6410f50aacc3698e0a8c3bc1a79c6096ee94898d50714398c67adbcbb081633ade09c7d974d687b169733da30 WHIRLPOOL 8b171ad781e79c299ff9e350442f225295c2072a8ec52e213871ffe737fd69079dcb95fc847401fa017860dc75f2b32255ec117c3d2a9ec8a03624077a6e1785
diff --git a/sci-geosciences/opencpn/files/opencpn-2.5.0-multilib-strict.patch b/sci-geosciences/opencpn/files/opencpn-2.5.0-multilib-strict.patch
deleted file mode 100644
index e66969ec368b..000000000000
--- a/sci-geosciences/opencpn/files/opencpn-2.5.0-multilib-strict.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN OpenCPN-2.5.0-Source.old/CMakeLists.txt OpenCPN-2.5.0-Source/CMakeLists.txt
---- OpenCPN-2.5.0-Source.old/CMakeLists.txt	2011-07-31 16:21:15.000000000 +0200
-+++ OpenCPN-2.5.0-Source/CMakeLists.txt	2011-07-31 16:22:09.000000000 +0200
-@@ -49,7 +49,7 @@
- IF (NOT WIN32)
-   # default
-   SET (ARCH "i386")
--  SET (LIB_INSTALL_DIR "lib")
-+  SET (LIB_INSTALL_DIR "lib${LIB_SUFFIX}")
-   IF (EXISTS /etc/debian_version)
-     SET (PACKAGE_FORMAT "DEB")
-     SET (PACKAGE_DEPS "libwxgtk2.8-0 (>= 2.8.7.1), libglu1-mesa (>= 7.0.0), libgl1-mesa-glx (>= 7.0.0), zlib1g, bzip2")
diff --git a/sci-geosciences/opencpn/files/opencpn-2.5.0_tinyxml_stl.patch b/sci-geosciences/opencpn/files/opencpn-2.5.0_tinyxml_stl.patch
deleted file mode 100644
index cf3980e4e8c7..000000000000
--- a/sci-geosciences/opencpn/files/opencpn-2.5.0_tinyxml_stl.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- OpenCPN-2.5.0-Source/CMakeLists.txt	2011-07-26 16:51:59.000000000 +0200
-+++ opencpn/CMakeLists.txt	2011-09-28 16:28:35.181651034 +0200
-@@ -325,9 +325,12 @@
-       )
- 
- IF(TINYXML_FOUND)
-+    message (STATUS "Building with tinyxml includes")
-     INCLUDE_DIRECTORIES(${TINYXML_INCLUDE_DIR})
-+    ADD_DEFINITIONS(-DTIXML_USE_STL)
- ELSE(TINYXML_FOUND)
--  SET(SRCS ${SRCS} ${SRC_TINYXML})
-+    message (STATUS "tinyxml library not found")
-+    SET(SRCS ${SRCS} ${SRC_TINYXML})
- ENDIF(TINYXML_FOUND)
- 
- 
diff --git a/sci-geosciences/opencpn/metadata.xml b/sci-geosciences/opencpn/metadata.xml
index 1718b525bf5f..8ecaf962d2a5 100644
--- a/sci-geosciences/opencpn/metadata.xml
+++ b/sci-geosciences/opencpn/metadata.xml
@@ -5,8 +5,4 @@
 	<maintainer>
 		<email>mschiff@gentoo.org</email>
 	</maintainer>
-	<use>
-		<flag name='gpsd'>Add support for using a GPS device through the GPSD
-		deamon</flag>
-	</use>
 </pkgmetadata>
diff --git a/sci-geosciences/opencpn/opencpn-2.5.0-r1.ebuild b/sci-geosciences/opencpn/opencpn-2.5.0-r1.ebuild
deleted file mode 100644
index efb58c7bc63c..000000000000
--- a/sci-geosciences/opencpn/opencpn-2.5.0-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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
-}
diff --git a/sci-geosciences/opencpn/opencpn-2.5.0.ebuild b/sci-geosciences/opencpn/opencpn-3.2.2.ebuild
index c7fba2ea8f02..7677a1645976 100644
--- a/sci-geosciences/opencpn/opencpn-2.5.0.ebuild
+++ b/sci-geosciences/opencpn/opencpn-3.2.2.ebuild
@@ -1,21 +1,20 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 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.ebuild,v 1.4 2011/11/19 09:48:59 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/opencpn/opencpn-3.2.2.ebuild,v 1.1 2013/07/14 23:11:42 mschiff Exp $
 
-EAPI=4
+EAPI=5
 
 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="https://github.com/OpenCPN/OpenCPN/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gpsd"
+KEYWORDS="~amd64 ~x86"
+IUSE="gps"
 
 RDEPEND="
 	app-arch/bzip2
@@ -24,22 +23,17 @@ RDEPEND="
 	sys-libs/zlib
 	virtual/opengl
 	x11-libs/gtk+:2
-	>=x11-libs/wxGTK-2.8.8[X]
-	gpsd? ( >=sci-geosciences/gpsd-2.90 )
+	x11-libs/wxGTK[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"
-)
+S="${WORKDIR}/OpenCPN-${P}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_use gpsd GPSD)
+		$(cmake-utils_use_use gps GPSD)
 		-DUSE_S57=ON
 		-DUSE_GARMINHOST=ON
 		-DUSE_WIFI_CLIENT=OFF