Version bump to latest. Drop older.

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

4 files changed, 40 insertions, 16 deletions

diff --git a/sci-geosciences/opencpn/ChangeLog b/sci-geosciences/opencpn/ChangeLog
index 91bf033cc5d2..3dc8b8d846f9 100644
--- a/sci-geosciences/opencpn/ChangeLog
+++ b/sci-geosciences/opencpn/ChangeLog
@@ -1,6 +1,12 @@
 # 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.3 2011/06/15 08:57:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/opencpn/ChangeLog,v 1.4 2011/07/31 14:25:54 scarabeus Exp $
+
+*opencpn-2.5.0 (31 Jul 2011)
+
+  31 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org> -opencpn-2.3.1.ebuild,
+  +opencpn-2.5.0.ebuild, +files/opencpn-2.5.0-multilib-strict.patch:
+  Version bump to latest. Drop older.
 
   15 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> opencpn-2.3.1.ebuild,
   metadata.xml:
diff --git a/sci-geosciences/opencpn/Manifest b/sci-geosciences/opencpn/Manifest
index a73e6abe89af..76af215db4f7 100644
--- a/sci-geosciences/opencpn/Manifest
+++ b/sci-geosciences/opencpn/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST OpenCPN-2.3.1-Source.tar.gz 62899032 RMD160 7b2c513cde37204e9cfb2f4575e30139cac05d3a SHA1 f7db674de0c3308d1c5af802386965326bb800f5 SHA256 a94bf3cac62edc089153a1b83b0595cecd54bef8ddfd364f1ed19bcd2e10e0c4
-EBUILD opencpn-2.3.1.ebuild 1098 RMD160 7b3d298f2080cc8c5f9f1c6812a5104cf6f9c9ac SHA1 66c4e72847560e2ac537d7df8496a58860df32ab SHA256 036c0d6123b459c18487f44674bea112eed4968a670d267f5c12ada94eed692a
-MISC ChangeLog 782 RMD160 a743f51f4d253dd26415936e2981fc5fd3ceb753 SHA1 798a23bd193cb934f6b8e69836c7cfd8f26160a1 SHA256 23c302f520c20708fd7193b7b18690ea312e17de237eee3808b8997868a99f59
+AUX opencpn-2.5.0-multilib-strict.patch 573 RMD160 2487dabe962039bbc6b1e7556bab5420c963dde2 SHA1 553953ce46a2a4c3db2a12c749c09cb8ed31b747 SHA256 d4ad6bbd2989e865dc7b5aee76dec370d76028519bc34c5e4bf94643b88bddc7
+DIST OpenCPN-2.5.0-Source.tar.gz 109134818 RMD160 6b4f7bb8e904e678c1fe901f14800fd4cc5d4f4a SHA1 afc30c0d383813d15f815c2b20583447c728c0ec SHA256 2496d43efb9140ec4ca6511fd37e198b88152b685a830bb408f3e4dc641dbb05
+EBUILD opencpn-2.5.0.ebuild 991 RMD160 a1b2a1714166e1d657817f575b0cd433f1d75dd1 SHA1 4818fad476b274c3c4a87d38744233170fdd1e1e SHA256 d74732e91d76c203167bf1ba7fe85426f337613ecb6b432a5e09a818b49d56b2
+MISC ChangeLog 998 RMD160 b2c5899207f480442b2ee236633b2236c359e446 SHA1 5c9f7e7968093c0adc187d1b7474e08628f9d371 SHA256 8b894a03336ed3a36dc9948945941f0d64bb112a93b99cf62a60c9e26ba4f236
 MISC metadata.xml 337 RMD160 fb6e38e51bc117236717d93aa74e8e25db035a26 SHA1 625261a58d4723baf66003dcd930d7d1a1bc62f6 SHA256 d79f8ef3be20a8db292f07b5d59b705cb584d6860b2ef8fbaba69e29986c6463
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk34c+oACgkQHB6c3gNBRYdl7ACfSSo3EZAiR5Li37kIGKUrbmLX
-9+wAn0o+49VLsu/0xNDVnUF3EaRpIE+p
-=vcgc
+iEYEARECAAYFAk41ZdMACgkQHB6c3gNBRYeiIACdH2lZ2CY+iICX9ecw6uRhG6CS
+zFYAoIrIDSNOvFkWo9tCPJC/CfbD/Gpe
+=B+bz
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..e66969ec368b
--- /dev/null
+++ b/sci-geosciences/opencpn/files/opencpn-2.5.0-multilib-strict.patch
@@ -0,0 +1,12 @@
+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/opencpn-2.3.1.ebuild b/sci-geosciences/opencpn/opencpn-2.5.0.ebuild
index b34aae4c1bed..76074522f567 100644
--- a/sci-geosciences/opencpn/opencpn-2.3.1.ebuild
+++ b/sci-geosciences/opencpn/opencpn-2.5.0.ebuild
@@ -1,13 +1,13 @@
 # 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.3 2011/06/15 08:57:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/opencpn/opencpn-2.5.0.ebuild,v 1.1 2011/07/31 14:25:54 scarabeus Exp $
 
 EAPI=4
 
 WX_GTK_VER="2.8"
+MY_P=OpenCPN-${PV}-Source
 inherit cmake-utils wxwidgets
 
-MY_P=OpenCPN-${PV}-Source
 DESCRIPTION="a free, open source software for marine navigation"
 HOMEPAGE="http://opencpn.org/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
@@ -15,22 +15,27 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-# build system seems very fragile:
-# we need to force most useflags to make it actually build
 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
-RDEPEND="gpsd? ( >=sci-geosciences/gpsd-2.90 )
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/tinyxml
+	media-libs/freetype:2
 	sys-libs/zlib
 	virtual/opengl
-	>=x11-libs/wxGTK-2.8.8[X]"
+	x11-libs/gtk+:2
+	>=x11-libs/wxGTK-2.8.8[X]
+	gpsd? ( >=sci-geosciences/gpsd-2.90 )
+"
 DEPEND="${DEPEND}
 	sys-devel/gettext"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-multilib-strict.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_use gpsd GPSD)