summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2014-01-06 14:56:17 +0000
committerJustin Lecher <jlec@gentoo.org>2014-01-06 14:56:17 +0000
commita563c2eb15b9c04d4400c061efdd8c403b112412 (patch)
tree16460cb8085cb81112f224a02acc158dcc2eec63 /sci-geosciences
parentAdd ~x86-fbsd #497068 (diff)
downloadgentoo-2-a563c2eb15b9c04d4400c061efdd8c403b112412.tar.gz
gentoo-2-a563c2eb15b9c04d4400c061efdd8c403b112412.tar.bz2
gentoo-2-a563c2eb15b9c04d4400c061efdd8c403b112412.zip
sci-geosciences/gpsbabel: Punt base.eclass; add missing die
(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Diffstat (limited to 'sci-geosciences')
-rw-r--r--sci-geosciences/gpsbabel/ChangeLog8
-rw-r--r--sci-geosciences/gpsbabel/gpsbabel-1.4.3.ebuild18
-rw-r--r--sci-geosciences/gpsbabel/gpsbabel-1.4.4.ebuild18
-rw-r--r--sci-geosciences/gpsbabel/metadata.xml2
4 files changed, 27 insertions, 19 deletions
diff --git a/sci-geosciences/gpsbabel/ChangeLog b/sci-geosciences/gpsbabel/ChangeLog
index 12415fa67685..390c2f65dd9e 100644
--- a/sci-geosciences/gpsbabel/ChangeLog
+++ b/sci-geosciences/gpsbabel/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-geosciences/gpsbabel
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsbabel/ChangeLog,v 1.31 2013/03/02 23:20:56 hwoarang Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsbabel/ChangeLog,v 1.32 2014/01/06 14:56:17 jlec Exp $
+
+ 06 Jan 2014; Justin Lecher <jlec@gentoo.org> gpsbabel-1.4.3.ebuild,
+ gpsbabel-1.4.4.ebuild, metadata.xml:
+ Punt base.eclass; add missing die
02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> gpsbabel-1.4.3.ebuild,
gpsbabel-1.4.4.ebuild:
diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.4.3.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.4.3.ebuild
index d2c31ccf98df..0a35c220445a 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-1.4.3.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.4.3.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsbabel/gpsbabel-1.4.3.ebuild,v 1.5 2013/03/02 23:20:56 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsbabel/gpsbabel-1.4.3.ebuild,v 1.6 2014/01/06 14:56:17 jlec Exp $
EAPI=4
-inherit eutils qt4-r2 base autotools
+inherit eutils qt4-r2 autotools
DESCRIPTION="GPS waypoints, tracks and routes converter"
HOMEPAGE="http://www.gpsbabel.org/"
-SRC_URI="mirror://gentoo/${P}.tar.gz
+SRC_URI="
+ mirror://gentoo/${P}.tar.gz
doc? ( http://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )"
LICENSE="GPL-2"
@@ -44,7 +45,8 @@ PATCHES=(
)
src_prepare() {
- base_src_prepare
+ epatch ${PATCHES[@]}
+ epatch_user
rm -rf shapelib || die
use doc && cp "${DISTDIR}/gpsbabel.org-style3.css" "${S}"
@@ -58,7 +60,7 @@ src_configure() {
--with-zlib=system
if use qt4; then
- pushd "${S}/gui" > /dev/null
+ pushd "${S}/gui" > /dev/null || die
lrelease *.ts || die
eqmake4
popd > /dev/null
@@ -68,13 +70,13 @@ src_configure() {
src_compile() {
emake
if use qt4; then
- pushd "${S}/gui" > /dev/null
+ pushd "${S}/gui" > /dev/null || die
emake
popd > /dev/null
fi
if use doc; then
- perl xmldoc/makedoc
+ perl xmldoc/makedoc || die
emake gpsbabel.html
fi
}
diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.4.4.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.4.4.ebuild
index 190ac7cd1d5f..0c995de07d4d 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-1.4.4.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.4.4.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsbabel/gpsbabel-1.4.4.ebuild,v 1.2 2013/03/02 23:20:56 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsbabel/gpsbabel-1.4.4.ebuild,v 1.3 2014/01/06 14:56:17 jlec Exp $
EAPI=4
-inherit eutils qt4-r2 base autotools
+inherit eutils qt4-r2 autotools
DESCRIPTION="GPS waypoints, tracks and routes converter"
HOMEPAGE="http://www.gpsbabel.org/"
-SRC_URI="http://dev.gentoo.org/~patrick/${P}.tar.gz
+SRC_URI="
+ http://dev.gentoo.org/~patrick/${P}.tar.gz
doc? ( http://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )"
LICENSE="GPL-2"
@@ -44,7 +45,8 @@ PATCHES=(
)
src_prepare() {
- base_src_prepare
+ epatch ${PATCHES[@]}
+ epatch_user
rm -rf shapelib || die
use doc && cp "${DISTDIR}/gpsbabel.org-style3.css" "${S}"
@@ -58,7 +60,7 @@ src_configure() {
--with-zlib=system
if use qt4; then
- pushd "${S}/gui" > /dev/null
+ pushd "${S}/gui" > /dev/null || die
lrelease *.ts || die
eqmake4
popd > /dev/null
@@ -68,13 +70,13 @@ src_configure() {
src_compile() {
emake
if use qt4; then
- pushd "${S}/gui" > /dev/null
+ pushd "${S}/gui" > /dev/null || die
emake
popd > /dev/null
fi
if use doc; then
- perl xmldoc/makedoc
+ perl xmldoc/makedoc || die
emake gpsbabel.html
fi
}
diff --git a/sci-geosciences/gpsbabel/metadata.xml b/sci-geosciences/gpsbabel/metadata.xml
index 3190fbf9c377..5f27678c1441 100644
--- a/sci-geosciences/gpsbabel/metadata.xml
+++ b/sci-geosciences/gpsbabel/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sci-geosciences</herd>
+ <herd>sci-geosciences</herd>
</pkgmetadata>