Version bump gebabel to its latest release. Punt older.

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

4 files changed, 46 insertions, 31 deletions

diff --git a/sci-geosciences/gebabbel/ChangeLog b/sci-geosciences/gebabbel/ChangeLog
index 052aeac1d02e..27d9a089cf44 100644
--- a/sci-geosciences/gebabbel/ChangeLog
+++ b/sci-geosciences/gebabbel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-geosciences/gebabbel
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gebabbel/ChangeLog,v 1.5 2010/05/06 11:42:57 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gebabbel/ChangeLog,v 1.6 2011/06/16 14:35:41 scarabeus Exp $
+
+*gebabbel-0.4 (16 Jun 2011)
+
+  16 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> -gebabbel-0.3.ebuild,
+  -files/gebabbel-0.3-fix.diff, +gebabbel-0.4.ebuild:
+  Version bump gebabel to its latest release. Punt older.
 
   06 May 2010; Samuli Suominen <ssuominen@gentoo.org> gebabbel-0.3.ebuild,
   +files/gebabbel-0.3-gcc45.patch:
diff --git a/sci-geosciences/gebabbel/Manifest b/sci-geosciences/gebabbel/Manifest
index 132bd50febf5..b016b39b8026 100644
--- a/sci-geosciences/gebabbel/Manifest
+++ b/sci-geosciences/gebabbel/Manifest
@@ -1,6 +1,15 @@
-AUX gebabbel-0.3-fix.diff 545 RMD160 663f72fc848bc76167c900d19aaa69dc3f863bfc SHA1 27694e44e2fa37394a96637c08c5ccd0e891f8b9 SHA256 8a2d0d7babe2c902c41622bd24626b74212427520f6c5f5843f3dca35a7f77ca
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gebabbel-0.3-gcc45.patch 423 RMD160 6c6d9b21610cc7b28a0a17374c2f377869dab361 SHA1 a04701795f8c1d2632155486f45f4969adcb7534 SHA256 0aeec5c3a23e215cfc63cd8945e4e1ffe0a2f770e03fbe0a9d54b6fdbfd1f091
-DIST Gebabbel-0.3-Src.tar.gz 2316428 RMD160 7b9779122fc416ef7df8573565db168a21ed92c9 SHA1 5183b46e2803c05238de52be557f76095527e3f1 SHA256 85f80c936b5db07150c2d5431cce6c6272c0ae8d5eacc8a058fc08cfd5693d5e
-EBUILD gebabbel-0.3.ebuild 881 RMD160 37fc153277be4c60e9f60393bbcf777ffb114f55 SHA1 da76259e36e2a980a488ca42fa36ddd63813df3b SHA256 7afdd24d0c00a676c1f45e710e1012ab4b445818802d3ac06727b67cbbd4c2c3
-MISC ChangeLog 1111 RMD160 b8440bd1035c5bff30ea3df57b0af86ca6ac86fa SHA1 6981981e3caa7313e8fb46d463a7ad73d2eb4fd4 SHA256 a51fd6a1dfe9fb8ba0b069745feba2600e0d558fc3d6dc6c03f9ea7676b6dfe4
+DIST Gebabbel-0.4-Src.tar.gz 9698769 RMD160 5f4de1678434e75d88ace0e38e0242ee2da2addb SHA1 7f79d118950e705c622a7074b500009961412bbf SHA256 dcf3543412525959eaad755673fa65412077735fec400e6e62b1bd2c94ec1adf
+EBUILD gebabbel-0.4.ebuild 882 RMD160 e0e5f760519fedfaffff927f283521557932fac1 SHA1 214fde3970431635b558bc1ec78d207f6d159618 SHA256 cd50676294f21044cf4d4ce86afa2dbd08a60f0625d0f839d92ed910e679ec63
+MISC ChangeLog 1330 RMD160 adc17df4b72b66d103021b8bd682e705b40e005f SHA1 5f9148f793a29e6c63186e0ed778ce409d160cf7 SHA256 43c8b36142671544c7028b433ef881e45cd544cf4f8501bf173f2d2e82e3b665
 MISC metadata.xml 237 RMD160 20944f06e761a57587043f3ec7ec969a5ab9bdcc SHA1 33b0366a9efeb0caad5712fb7e628147dff924be SHA256 29eb01e164be9510d6a51d6477c169df641127a2a2df064c9d99c90c067ac3d7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk36FKMACgkQHB6c3gNBRYdVQwCgxZe0CBrybmnpBb1/6GOtefzQ
+62wAoJWr9076O3nmXOH0SqqwA53qqKUv
+=X7P2
+-----END PGP SIGNATURE-----
diff --git a/sci-geosciences/gebabbel/files/gebabbel-0.3-fix.diff b/sci-geosciences/gebabbel/files/gebabbel-0.3-fix.diff
deleted file mode 100644
index 70dfdaa82168..000000000000
--- a/sci-geosciences/gebabbel/files/gebabbel-0.3-fix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- Gebabbel-0.3/src/MyMainWindow.cpp	2007-07-11 23:55:10.000000000 +0200
-+++ Gebabbel-0.3-1/src/MyMainWindow.cpp	2007-09-06 20:19:16.000000000 +0200
-@@ -809,7 +809,7 @@
- 
- 		// The options -Si and -Sn replace -s and -N since gpsbabel-1.3.3
- 		// Separators.setPattern( " -[pwrtTsNixo] " );
--		Separators.setPattern( " -[pwrtTixo] \| -Sn \| -Si " );
-+		Separators.setPattern( " -[pwrtTixoS][in]? " );
- 
- 		// Command must start with the path to the gpsbabel executable,
- 		// which can be an absolute path or only consist of the executable name
diff --git a/sci-geosciences/gebabbel/gebabbel-0.3.ebuild b/sci-geosciences/gebabbel/gebabbel-0.4.ebuild
index 506b89ce5250..3856a4c71e5b 100644
--- a/sci-geosciences/gebabbel/gebabbel-0.3.ebuild
+++ b/sci-geosciences/gebabbel/gebabbel-0.4.ebuild
@@ -1,37 +1,48 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gebabbel/gebabbel-0.3.ebuild,v 1.5 2010/05/06 11:42:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gebabbel/gebabbel-0.4.ebuild,v 1.1 2011/06/16 14:35:41 scarabeus Exp $
 
-EAPI=2
-inherit eutils qt4
+EAPI=4
 
-MY_PN=${PN/g/G}
-MY_P=${MY_PN}-${PV}
+MY_P=${P/g/G}
+inherit eutils qt4-r2
 
 DESCRIPTION="QT-Frontend to load and convert gps tracks with gpsbabel"
 HOMEPAGE="http://gebabbel.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}-Src.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-DEPEND="x11-libs/qt-core:4
-	x11-libs/qt-gui:4[accessibility]"
+
+DEPEND="
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4[accessibility]
+"
 RDEPEND="${DEPEND}
-	sci-geosciences/gpsbabel"
+	sci-geosciences/gpsbabel
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3-gcc45.patch
+)
 
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix.diff \
-		"${FILESDIR}"/${P}-gcc45.patch
+	base_src_prepare
+	# do not mess with cflags
+	sed -i \
+		-e 's:-O0 -g3::g' \
+		*.pro || die
 }
 
 src_configure() {
-	eqmake4 ${MY_PN}.pro
+	eqmake4
 }
 
 src_install() {
-	dobin bin/${PN} || die "dobin failed"
-	dodoc CHANGELOG || die "dodoc failed"
+	dobin bin/${PN}
+	dodoc CHANGELOG
 }