Version bump gebabel to its latest release. Punt older.

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

3 files changed, 33 insertions, 27 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/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
 }