summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-06-17 19:47:45 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-06-17 19:47:45 +0000
commit02b06fac7d3e16ee76b9ce50a876b235159a4f07 (patch)
tree728584e8e3ba7d897024c2b77950a3e9ce2f2530 /sci-geosciences/viking
parentVersion bump. (diff)
downloadgentoo-2-02b06fac7d3e16ee76b9ce50a876b235159a4f07.tar.gz
gentoo-2-02b06fac7d3e16ee76b9ce50a876b235159a4f07.tar.bz2
gentoo-2-02b06fac7d3e16ee76b9ce50a876b235159a4f07.zip
Actualy run eautoreconf due to the required patch for gpsd. Fixes bug #372081
(Portage version: 2.2.0_alpha38/cvs/Linux x86_64)
Diffstat (limited to 'sci-geosciences/viking')
-rw-r--r--sci-geosciences/viking/ChangeLog6
-rw-r--r--sci-geosciences/viking/files/1.2.1-autoreconf.patch13
-rw-r--r--sci-geosciences/viking/viking-1.2.1.ebuild10
3 files changed, 26 insertions, 3 deletions
diff --git a/sci-geosciences/viking/ChangeLog b/sci-geosciences/viking/ChangeLog
index 4eb8eae72d59..00346136ab46 100644
--- a/sci-geosciences/viking/ChangeLog
+++ b/sci-geosciences/viking/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-geosciences/viking
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/ChangeLog,v 1.15 2011/06/17 08:43:45 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/ChangeLog,v 1.16 2011/06/17 19:47:45 scarabeus Exp $
+
+ 17 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+ +files/1.2.1-autoreconf.patch, viking-1.2.1.ebuild:
+ Actualy run eautoreconf due to the required patch for gpsd. Fixes bug #372081
*viking-1.2.1 (17 Jun 2011)
diff --git a/sci-geosciences/viking/files/1.2.1-autoreconf.patch b/sci-geosciences/viking/files/1.2.1-autoreconf.patch
new file mode 100644
index 000000000000..3e66afa4e934
--- /dev/null
+++ b/sci-geosciences/viking/files/1.2.1-autoreconf.patch
@@ -0,0 +1,13 @@
+diff -urN viking-1.2.1.old/configure.ac viking-1.2.1/configure.ac
+--- viking-1.2.1.old/configure.ac 2011-06-17 21:44:31.920086938 +0200
++++ viking-1.2.1/configure.ac 2011-06-17 21:44:43.574941232 +0200
+@@ -344,9 +344,6 @@
+ doc/Makefile
+ doc/examples/Makefile
+ doc/dev/Makefile])
+-if test x$enable_gtk_doc = xyes; then
+-AC_CONFIG_FILES([doc/reference/Makefile])
+-fi
+ AC_OUTPUT([
+ viking.spec
+ ])
diff --git a/sci-geosciences/viking/viking-1.2.1.ebuild b/sci-geosciences/viking/viking-1.2.1.ebuild
index b88a33bff678..7ea7568bf528 100644
--- a/sci-geosciences/viking/viking-1.2.1.ebuild
+++ b/sci-geosciences/viking/viking-1.2.1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/viking-1.2.1.ebuild,v 1.1 2011/06/17 08:43:45 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/viking/viking-1.2.1.ebuild,v 1.2 2011/06/17 19:47:45 scarabeus Exp $
EAPI=4
-inherit base
+inherit base autotools
DESCRIPTION="GPS data editor and analyzer"
HOMEPAGE="http://viking.sourceforge.net/"
@@ -38,8 +38,14 @@ DOCS=( README doc/GEOCODED-PHOTOS doc/GETTING-STARTED doc/GPSMAPPER )
PATCHES=(
"${FILESDIR}"/${PN}-gpsd-2.96.patch
+ "${FILESDIR}"/${PV}-autoreconf.patch
)
+src_prepare() {
+ base_src_prepare
+ eautoreconf
+}
+
src_configure() {
econf \
--disable-deprecations \