| 1 |
commit: e106187a132852c135da81fc6d7e54d07958805f |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Mar 6 23:07:08 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 6 23:54:09 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e106187a |
| 7 |
|
| 8 |
sci-geosciences/gebabbel: Bump to EAPI 6 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
.../gebabbel/files/gebabbel-0.3-gcc45.patch | 4 ++-- |
| 13 |
sci-geosciences/gebabbel/gebabbel-0.4.ebuild | 22 +++++++++++++--------- |
| 14 |
sci-geosciences/gebabbel/metadata.xml | 14 +++++++------- |
| 15 |
3 files changed, 22 insertions(+), 18 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sci-geosciences/gebabbel/files/gebabbel-0.3-gcc45.patch b/sci-geosciences/gebabbel/files/gebabbel-0.3-gcc45.patch |
| 18 |
index e8064e366c9..f8e7b47f338 100644 |
| 19 |
--- a/sci-geosciences/gebabbel/files/gebabbel-0.3-gcc45.patch |
| 20 |
+++ b/sci-geosciences/gebabbel/files/gebabbel-0.3-gcc45.patch |
| 21 |
@@ -2,8 +2,8 @@ Fixing build with gcc 4.5 |
| 22 |
|
| 23 |
http://bugs.gentoo.org/show_bug.cgi?id=318579 |
| 24 |
|
| 25 |
---- src/MyMainWindow.cpp |
| 26 |
-+++ src/MyMainWindow.cpp |
| 27 |
+--- a/src/MyMainWindow.cpp |
| 28 |
++++ b/src/MyMainWindow.cpp |
| 29 |
@@ -219,7 +219,7 @@ |
| 30 |
|
| 31 |
// Creating the toolbar |
| 32 |
|
| 33 |
diff --git a/sci-geosciences/gebabbel/gebabbel-0.4.ebuild b/sci-geosciences/gebabbel/gebabbel-0.4.ebuild |
| 34 |
index 671a59af4e3..38141acd13b 100644 |
| 35 |
--- a/sci-geosciences/gebabbel/gebabbel-0.4.ebuild |
| 36 |
+++ b/sci-geosciences/gebabbel/gebabbel-0.4.ebuild |
| 37 |
@@ -1,13 +1,13 @@ |
| 38 |
-# Copyright 1999-2014 Gentoo Foundation |
| 39 |
+# Copyright 1999-2017 Gentoo Foundation |
| 40 |
# Distributed under the terms of the GNU General Public License v2 |
| 41 |
|
| 42 |
-EAPI=4 |
| 43 |
+EAPI=6 |
| 44 |
|
| 45 |
MY_P=${P/g/G} |
| 46 |
|
| 47 |
-inherit eutils qt4-r2 |
| 48 |
+inherit qmake-utils |
| 49 |
|
| 50 |
-DESCRIPTION="QT-Frontend to load and convert gps tracks with gpsbabel" |
| 51 |
+DESCRIPTION="Qt-Frontend to load and convert gps tracks with gpsbabel" |
| 52 |
HOMEPAGE="http://gebabbel.sourceforge.net/" |
| 53 |
SRC_URI="mirror://sourceforge/${PN}/${MY_P}-Src.tar.gz" |
| 54 |
|
| 55 |
@@ -24,21 +24,25 @@ RDEPEND="${DEPEND} |
| 56 |
sci-geosciences/gpsbabel |
| 57 |
" |
| 58 |
|
| 59 |
-PATCHES=( |
| 60 |
- "${FILESDIR}"/${PN}-0.3-gcc45.patch |
| 61 |
-) |
| 62 |
+DOCS=( CHANGELOG CREDITS ) |
| 63 |
+ |
| 64 |
+PATCHES=( "${FILESDIR}"/${PN}-0.3-gcc45.patch ) |
| 65 |
|
| 66 |
S=${WORKDIR}/${MY_P} |
| 67 |
|
| 68 |
src_prepare() { |
| 69 |
- qt4-r2_src_prepare |
| 70 |
+ default |
| 71 |
# do not mess with cflags |
| 72 |
sed \ |
| 73 |
-e "/QMAKE_CXXFLAGS/s:=.*$:= ${CXXFLAGS}:g" \ |
| 74 |
-i *.pro || die |
| 75 |
} |
| 76 |
|
| 77 |
+src_configure() { |
| 78 |
+ eqmake4 Gebabbel.pro |
| 79 |
+} |
| 80 |
+ |
| 81 |
src_install() { |
| 82 |
dobin bin/${PN} |
| 83 |
- dodoc CHANGELOG CREDITS |
| 84 |
+ einstalldocs |
| 85 |
} |
| 86 |
|
| 87 |
diff --git a/sci-geosciences/gebabbel/metadata.xml b/sci-geosciences/gebabbel/metadata.xml |
| 88 |
index 35ccac22a7a..e9dd5e2e89a 100644 |
| 89 |
--- a/sci-geosciences/gebabbel/metadata.xml |
| 90 |
+++ b/sci-geosciences/gebabbel/metadata.xml |
| 91 |
@@ -1,11 +1,11 @@ |
| 92 |
<?xml version="1.0" encoding="UTF-8"?> |
| 93 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 94 |
<pkgmetadata> |
| 95 |
- <maintainer type="project"> |
| 96 |
- <email>sci-geosciences@g.o</email> |
| 97 |
- <name>Gentoo Geosciences Project</name> |
| 98 |
- </maintainer> |
| 99 |
- <upstream> |
| 100 |
- <remote-id type="sourceforge">gebabbel</remote-id> |
| 101 |
- </upstream> |
| 102 |
+ <maintainer type="project"> |
| 103 |
+ <email>sci-geosciences@g.o</email> |
| 104 |
+ <name>Gentoo Geosciences Project</name> |
| 105 |
+ </maintainer> |
| 106 |
+ <upstream> |
| 107 |
+ <remote-id type="sourceforge">gebabbel</remote-id> |
| 108 |
+ </upstream> |
| 109 |
</pkgmetadata> |
Archives