Actualy run eautoreconf due to the required patch for gpsd. Fixes bug #372081

Package-Manager: portage-2.2.0_alpha38/cvs/Linux x86_64

4 files changed, 32 insertions, 8 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/Manifest b/sci-geosciences/viking/Manifest
index 69f25527bdb8..ff8ea413522f 100644
--- a/sci-geosciences/viking/Manifest
+++ b/sci-geosciences/viking/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 1.2.1-autoreconf.patch 454 RMD160 079004a3708f909304945dd324d973ef26885278 SHA1 8272b44044578ab39349ab23592877522b1f4a0f SHA256 4cb58f3d86dc10443f9a1cabd7a132797e5eab1d1072ba65fd034970b5d8a400
 AUX viking-gpsd-2.96.patch 2162 RMD160 39d74daddc7501db65c7208d0080d5cb82ac4462 SHA1 a7c469194ae04535549b7bac65365be0f66c5652 SHA256 7277a6f0bbe7b16440ca92a5975c6f0b38261f13bbbb6f04e4fc684b8965c902
 DIST viking-1.2.1.tar.gz 1054364 RMD160 609b464db5c4035123199cd3a4c8985e381710db SHA1 594e9ee50dfb93a213399ced9dce72b296b9335a SHA256 7c4b36398a9ec121ab11b66f042d17368dd46cf328a2a0e00bda38fd357a9743
-EBUILD viking-1.2.1.ebuild 1272 RMD160 6dc7fe650e82570ea77231f17a414580bb342dcc SHA1 a08292aa7ade47424baa7d43fe30e2a1b672bb8c SHA256 74c9f9ecfc40dcc2fd86e6953b474877f928563e547763ff58e56d8450a04d94
-MISC ChangeLog 2407 RMD160 000097277da80d7ea5e7d04b45f95171871d9547 SHA1 67b8562f31e2b50afc830d2d24404e2522fdd424 SHA256 c04f9dea25a884ff315f5af0fe0e572e3f66230d1b4b93dd5bc9831ea0699954
+EBUILD viking-1.2.1.ebuild 1370 RMD160 b92770b9733ed541757e726d1ac8534045e08af8 SHA1 883b98f7aa8801758e680ba18fa13b12ae35fc8c SHA256 6f33316e81ee18d9488e91892d57abda60ef2aa46070909c129456666e91002a
+MISC ChangeLog 2597 RMD160 00a1038c85c8ca0f099d99662ea91fd6cc2b3d8b SHA1 5f188b3c8b398d691839c7ab438cbce6d814d95a SHA256 a9a9417149143e34bd065d305e3189563ae84bb6d70604ed41024a43c8feb3ea
 MISC metadata.xml 237 RMD160 20944f06e761a57587043f3ec7ec969a5ab9bdcc SHA1 33b0366a9efeb0caad5712fb7e628147dff924be SHA256 29eb01e164be9510d6a51d6477c169df641127a2a2df064c9d99c90c067ac3d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk37E8YACgkQHB6c3gNBRYeQtACgpJY6DeedYkvuI2wT2gytLAsr
-5kEAn38MLwJqi6zIpoA+pB8ov3LR8dhJ
-=GTQ/
+iEYEARECAAYFAk37r2YACgkQHB6c3gNBRYfUwQCgi49FPFRlLrmQzLfDarBnRuyh
+fZoAmgOoCH+gl3mnFDLNNFxTaDNeQx8e
+=jyN7
 -----END PGP SIGNATURE-----
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 \