Version bump to latest. Drop older.

(Portage version: 2.2.0_alpha49/cvs/Linux x86_64)

3 files changed, 33 insertions, 10 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/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)