commit: e106187a132852c135da81fc6d7e54d07958805f
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Mar 6 23:07:08 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Mar 6 23:54:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e106187a
sci-geosciences/gebabbel: Bump to EAPI 6
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../gebabbel/files/gebabbel-0.3-gcc45.patch| 4 ++--
sci-geosciences/gebabbel/gebabbel-0.4.ebuild | 22 +-
sci-geosciences/gebabbel/metadata.xml | 14 +++---
3 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/sci-geosciences/gebabbel/files/gebabbel-0.3-gcc45.patch
b/sci-geosciences/gebabbel/files/gebabbel-0.3-gcc45.patch
index e8064e366c9..f8e7b47f338 100644
--- a/sci-geosciences/gebabbel/files/gebabbel-0.3-gcc45.patch
+++ b/sci-geosciences/gebabbel/files/gebabbel-0.3-gcc45.patch
@@ -2,8 +2,8 @@ Fixing build with gcc 4.5
http://bugs.gentoo.org/show_bug.cgi?id=318579
src/MyMainWindow.cpp
-+++ src/MyMainWindow.cpp
+--- a/src/MyMainWindow.cpp
b/src/MyMainWindow.cpp
@@ -219,7 +219,7 @@
// Creating the toolbar
diff --git a/sci-geosciences/gebabbel/gebabbel-0.4.ebuild
b/sci-geosciences/gebabbel/gebabbel-0.4.ebuild
index 671a59af4e3..38141acd13b 100644
--- a/sci-geosciences/gebabbel/gebabbel-0.4.ebuild
+++ b/sci-geosciences/gebabbel/gebabbel-0.4.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
+EAPI=6
MY_P=${P/g/G}
-inherit eutils qt4-r2
+inherit qmake-utils
-DESCRIPTION="QT-Frontend to load and convert gps tracks with gpsbabel"
+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"
@@ -24,21 +24,25 @@ RDEPEND="${DEPEND}
sci-geosciences/gpsbabel
"
-PATCHES=(
- "${FILESDIR}"/${PN}-0.3-gcc45.patch
-)
+DOCS=( CHANGELOG CREDITS )
+
+PATCHES=( "${FILESDIR}"/${PN}-0.3-gcc45.patch )
S=${WORKDIR}/${MY_P}
src_prepare() {
- qt4-r2_src_prepare
+ default
# do not mess with cflags
sed \
-e "/QMAKE_CXXFLAGS/s:=.*$:= ${CXXFLAGS}:g" \
-i *.pro || die
}
+src_configure() {
+ eqmake4 Gebabbel.pro
+}
+
src_install() {
dobin bin/${PN}
- dodoc CHANGELOG CREDITS
+ einstalldocs
}
diff --git a/sci-geosciences/gebabbel/metadata.xml
b/sci-geosciences/gebabbel/metadata.xml
index 35ccac22a7a..e9dd5e2e89a 100644
--- a/sci-geosciences/gebabbel/metadata.xml
+++ b/sci-geosciences/gebabbel/metadata.xml
@@ -1,11 +1,11 @@
http://www.gentoo.org/dtd/metadata.dtd;>
-
-sci-geoscien...@gentoo.org
-Gentoo Geosciences Project
-
-
-gebabbel
-
+
+ sci-geoscien...@gentoo.org
+ Gentoo Geosciences Project
+
+
+ gebabbel
+
