Fixed for automake-1.11.2, bug #401195

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

4 files changed, 27 insertions, 9 deletions

diff --git a/sci-visualization/epix/ChangeLog b/sci-visualization/epix/ChangeLog
index 9dd8802ef4a9..967c85644d33 100644
--- a/sci-visualization/epix/ChangeLog
+++ b/sci-visualization/epix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/epix
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/epix/ChangeLog,v 1.38 2011/11/27 05:55:07 bicatali Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/epix/ChangeLog,v 1.39 2012/01/30 02:26:59 bicatali Exp $
+
+  30 Jan 2012; Sébastien Fabbro <bicatali@gentoo.org> epix-1.2.9.ebuild,
+  +files/epix-1.2.9-automake.patch:
+  Fixed for automake-1.11.2, bug #401195
 
 *epix-1.2.9 (27 Nov 2011)
 
diff --git a/sci-visualization/epix/Manifest b/sci-visualization/epix/Manifest
index 1c9dabcdfb00..878e731eb72d 100644
--- a/sci-visualization/epix/Manifest
+++ b/sci-visualization/epix/Manifest
@@ -4,18 +4,19 @@ Hash: SHA1
 AUX 50epix-gentoo.el 298 RMD160 cf3db606d04a04c8695828c9b870df5dc425d75e SHA1 aee1c361f181625fcf34bf12fc2a8d54b8595b24 SHA256 5aa1fc2e45f9c544f4cfc95a803a2540a42ef766258eecbb3d166b158565d219
 AUX epix-1.2.6-doc-gentoo.patch 2613 RMD160 51814fc3ed8fc00cdb097f2090c4cf6168408b1a SHA1 4efd409d05342e2d6ec425c1883d566f2b070b12 SHA256 f0368e0a08e26051070816f24503b01b1eada43ec8e5b022643b144998f51513
 AUX epix-1.2.7-doc-gentoo.patch 2080 RMD160 0386998057f1e48ae87a7f71f329331594d34b51 SHA1 ebc901bef5d48cf245dd569c579564717bbf94d8 SHA256 1c378083d1bbedb9a27ea7d2b94c04b4a4cdb0c3e3c9b2e02b72fcf1f6a2ad02
+AUX epix-1.2.9-automake.patch 373 RMD160 d50bdd89ac91f7e71f0ff6cd3f178feb6e7f6fc0 SHA1 2cb6e603b9f1ae137e03f48ff07ac020a5aaf4b9 SHA256 8b176fe6fa54c82462ee7c720543c22ef12598bbbf99e5c165b8c896895004c9
 DIST epix-1.2.6_withpdf.tar.bz2 1736850 RMD160 6d47689f42ed4631338bee8b27d00fede8eb97e3 SHA1 c88b256fbcb40c1a94cc979c67eee930a6e24ed0 SHA256 9c377bcf8556bd91f46322e618a8e2d607ebc64e41b2cc57483aa87f414490db
 DIST epix-1.2.8_withpdf.tar.bz2 1699834 RMD160 2dfc5c2d41f720449f1bdf031a96468af3463ff6 SHA1 4a3ea064f20b9529cb7f259e57e4083c0c689edb SHA256 1dfd0ea9fd379ad72140558e64e93c065e592216f061f25cf508df10ab175e22
 DIST epix-1.2.9_withpdf.tar.bz2 1701229 RMD160 d031eae4d2f757ed1bb5a1ae57322a0808b7a35d SHA1 1c42e0131fdde99c6bf60881bf09f20c69910877 SHA256 c8735b6f4a5732586d2ec25268ba98186ef00638943642dfcb40cae4f7887653
 EBUILD epix-1.2.6.ebuild 1716 RMD160 7e1425040dcc1710bab7828551ec28c2cb1543c8 SHA1 22c3b7f05f170bd3148d13a1235855a17ba4e9c4 SHA256 9234c750128cb682fe5f557a3910811e1fed6f28eecfeabc1ae212183682ea4c
 EBUILD epix-1.2.8.ebuild 1631 RMD160 bb4400d1b8a0abe00e5ed35ccf2d136126494d64 SHA1 aade05ef964e0b57e73511d16f04d65310454c76 SHA256 c849b6d9c977baa9c338a0263aef586a86db2b3b8a3215635573bf0eab0753e0
-EBUILD epix-1.2.9.ebuild 1623 RMD160 07de70741a1699239c686da1ab17e480d4740848 SHA1 551744a6f402675207c74e13baa98ea31eb50ac8 SHA256 407e64a788f4d8743adbcd59742f021d1c9ac5c0e8329e078f55652e77569cf5
-MISC ChangeLog 7608 RMD160 f85770d4db2a1241157aedea6d29b1e86ddd8ae9 SHA1 02d9030c09399d809928a7586b5697404ad68312 SHA256 2a38cfc717e4a18c0e483577dcffd245de441ed7e9d3b290a1c092cb64ef80cf
+EBUILD epix-1.2.9.ebuild 1672 RMD160 da5836572257e7f4edaf91770dbdce205b30cc79 SHA1 22a75b5c1613191c0bcd9a3fd4c58d08180c92e6 SHA256 bba2ac5b44f749f74f95654a5c4c2556376ebb30440c84d0e4288976305705ec
+MISC ChangeLog 7760 RMD160 643325fef0fd563073650112d3fa408c083159c0 SHA1 fb3535c3bcc8f341b135639a90bf83fe1ede7eda SHA256 9f2341b7feec4ebabecacefab544a83b45e7bf67d8a49bb1cba1fef4b77a6f6a
 MISC metadata.xml 674 RMD160 b9ef5d9bd4c2a378d20e8b2abf7e49aa009d2404 SHA1 0bbed1bb0008d1dd7710b029ca04a743a0caa1e5 SHA256 ddb3fcaa3745e042ed7ef3e79faf17ce4d6264ff48261c0e2a5466964908edae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7R0O4ACgkQ1ycZbhPLE2Au7wCgmGEzdGh1MctmuR4wbmuBCADX
-a90AoLN5VK4vdduD6ohY7bFrAa5fGZwG
-=MVSk
+iEYEARECAAYFAk8mAAAACgkQ1ycZbhPLE2D5FgCfXjLZFP6GI2QrfTp8eTrSFd6d
+XLYAoJqocUP43HzlUnMpzl+LKWoi5EqH
+=MgpS
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/epix/epix-1.2.9.ebuild b/sci-visualization/epix/epix-1.2.9.ebuild
index f2b5b1d532cc..1979ba7d01dd 100644
--- a/sci-visualization/epix/epix-1.2.9.ebuild
+++ b/sci-visualization/epix/epix-1.2.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/epix/epix-1.2.9.ebuild,v 1.1 2011/11/27 05:55:07 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/epix/epix-1.2.9.ebuild,v 1.2 2012/01/30 02:26:59 bicatali Exp $
 
 EAPI=4
 inherit elisp-common bash-completion-r1 autotools
@@ -26,6 +26,7 @@ SITEFILE=50${PN}-gentoo.el
 src_prepare() {
 	# disable automatic install of doc and examples
 	epatch "${FILESDIR}"/${PN}-1.2.7-doc-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-1.2.9-automake.patch
 	eautoreconf
 }
 
diff --git a/sci-visualization/epix/files/epix-1.2.9-automake.patch b/sci-visualization/epix/files/epix-1.2.9-automake.patch
new file mode 100644
index 000000000000..11233b0102dd
--- /dev/null
+++ b/sci-visualization/epix/files/epix-1.2.9-automake.patch
@@ -0,0 +1,12 @@
+--- Makefile.am.orig	2012-01-30 02:24:22.000000000 +0000
++++ Makefile.am	2012-01-30 02:24:58.000000000 +0000
+@@ -15,7 +15,8 @@
+ bin_SCRIPTS = epix elaps flix laps
+ 
+ pkglib_LIBRARIES = libepix.a
+-pkglib_DATA = epix-lib.sh
++pkgepixdir = $(pkglibdir)
++pkgepix_DATA = epix-lib.sh
+ include_HEADERS = epix.h
+ 
+ libepix_a_CXXSOURCES = active_screen.cc affine.cc angle_units.cc \