Fix autoreconf with >=automake-1.11.2 wrt bug #397715 by Jason Mours <jason.mours@verizon.net>

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

4 files changed, 46 insertions, 23 deletions

diff --git a/sys-devel/icecream/ChangeLog b/sys-devel/icecream/ChangeLog
index b417a7082585..032aac6a238c 100644
--- a/sys-devel/icecream/ChangeLog
+++ b/sys-devel/icecream/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/icecream
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/icecream/ChangeLog,v 1.40 2011/09/25 13:28:17 scarabeus Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/icecream/ChangeLog,v 1.41 2012/01/13 18:46:25 xarthisius Exp $
+
+  13 Jan 2012; Kacper Kowalik <xarthisius@gentoo.org>
+  +files/0.9.7-automake-1.11.2.patch, icecream-0.9.7.ebuild:
+  Fix autoreconf with >=automake-1.11.2 wrt bug #397715 by Jason Mours
+  <jason.mours@verizon.net>
 
 *icecream-0.9.7 (25 Sep 2011)
 
diff --git a/sys-devel/icecream/Manifest b/sys-devel/icecream/Manifest
index 8aeb699cbc4b..4b05a8a2610a 100644
--- a/sys-devel/icecream/Manifest
+++ b/sys-devel/icecream/Manifest
@@ -1,8 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 0.9.6-crosscompile.patch 471 RMD160 4dbea92702b7a7170e7d8593265156de75545dc2 SHA1 088469d36da0dda0861f741a92b32632f906a5c4 SHA256 b0d4f69301cac95f5e3a7a3a91b5470769144e0deb33cb1504b70ad29b8cb783
 AUX 0.9.6-symlinks.patch 614 RMD160 b6882810d96141d46d029b33bd68c29d98ec9662 SHA1 d4d0a6091533698c5b905e0ce490fc0400bfff4d SHA256 4100330fb48453abe7facecff4eb199e5285093df49d082e14050a4c30cb2dfb
+AUX 0.9.7-automake-1.11.2.patch 503 RMD160 cc8e6657a6987c31864298aba151d25cd61fe78b SHA1 a9b85c52016700706e2ef4bd3488f584bef5bce7 SHA256 654dbdcec0f2c75a320de31db9cdf1f01368c218ecd95f747d93d9a88fca39f2
 AUX icecream 1724 RMD160 2527e0a0a7c2dc37ef0d0afe64875cd2c3768b80 SHA1 6dc26e75a42571f72b913cc811abe23a15c12a28 SHA256 07b5e4645e99646e1448147ef1e30b4a50f1478b25578ba9e71c6aa2c151ca53
 AUX icecream-conf.d-verbosity.patch 463 RMD160 b08c0f5cfec00b5dcc968bac3b598892055edf6f SHA1 6adc235bb1e6b4a27e9d7610385d6bc8ef6d389d SHA256 c103468c3303809181b554b152a7ee0db041d12dd040d5196cc9da453303c957
 AUX icecream-config 1692 RMD160 2d6c85b86b2c8308c08f5876308165044195fd34 SHA1 42091716b09a2511a31981b2ae2836e9f43ac2e6 SHA256 24acbd8e5b0218ce966e78f451985f72530865f86e5a1ee2b6c92d8bf50ff66b
@@ -11,23 +12,23 @@ AUX icecream-gentoo-multilib.patch 1579 RMD160 35671f69f782e326749f8ff50bd25ede3
 DIST icecc-0.9.6.tar.bz2 378702 RMD160 c210061fbe5c2046d13e8c7d78e0a107fd94f761 SHA1 2591652c56a574f985f47719af40ad0484151982 SHA256 d0e6000f2d5e6f4936aa568e5bb3e4f75f836335aed8e3fef5369487df3741a6
 DIST icecc-0.9.7.tar.bz2 379527 RMD160 b836086596b44f03871a46909f0340cafeb9e059 SHA1 3699b6dacdc873a22a478b5959cfe0e7dd7115aa SHA256 ba01c19e946d5a142ad9f912c24086ee12e7ca4927d64860787eb4bcd100657f
 EBUILD icecream-0.9.6-r1.ebuild 2791 RMD160 78007e0e27ec668c481291605f0169df77721ab8 SHA1 53b76e84d0c029a3294609c43f30b006467de4f4 SHA256 6c6cfb29282759ebf11240b7377e3d3b5fa71fa544eb2bd3479f3a80950b22eb
-EBUILD icecream-0.9.7.ebuild 2679 RMD160 5511de677aa0350f03f2eabc8341116546f23ea8 SHA1 a7064132f7a898664e938a60cfe7a59258a2587a SHA256 2c5fe311f788185103841ee91934738a456901db6e7bfd2b9a9444b415b40fbc
-MISC ChangeLog 8019 RMD160 e4350046c23b73ad4ed93f5d0fbd7c287f5dd808 SHA1 5297722dae94b35a4e63ad80e9fbfd961cfdb871 SHA256 ced921777adfbca282a6ceb216ad813e51050f9cd83ec65d72b9e35336f1b8f0
+EBUILD icecream-0.9.7.ebuild 2719 RMD160 2752008b7f46ebb9c75f445844cffb461eb92276 SHA1 49fc60dbe290d2cfc0b24ca94842f6e4d08f3632 SHA256 4ef3d7bb575e7d551f6952b40af89bc1932c9ba9a6db4d6db5c062508ce05ada
+MISC ChangeLog 8235 RMD160 fd394eb18118485b8278e2205c97d44a9e40aec3 SHA1 d751aefdda8e5139e5388d9c4cb274d72840f9b2 SHA256 b1ce2da9a075a8955ea2dccf0bdf7ca84a0ff2d30c34a19fc17b9df7581da40d
 MISC metadata.xml 160 RMD160 1233ca29861ca7c47f0b09d1d7a29def80f7df02 SHA1 1bfdc9d282a84c95e2bdcda19ace5b94e2e67349 SHA256 56717bdb03ad5d833acecfbc612a67f569256b328bf610fbc6cc33714186dae9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOfyxVAAoJEOSiRoyO7jvo/cwP/At+y9x1RD0Oa2CsRb6ShbeU
-MhVZSgA5pnp9Q0o6Q5qDKsnWz4OteG1NcM4Sf+5/sBZhsqQW2Hpeyv0zkxm6mN9l
-ba8CzL5IJRG/nm0d2R1DNrrWUeU6L7AtKsG1yzmllnyExreDAX+6UzfCwWHZw9OL
-PvoHcpeDE0b6sETJiV7LKrHCjA5UTHKHl0aVkhwVQ7ByPCcoXtmzfDV6y9aYmD4i
-DvYW0JHc9/My6oCdMl0R2TiNIqznIbll9GSwi5mIuqeyjPcxwtMoMrOXcx0z8sYq
-LGP7ORsXhb2rb63C7wZrPT5PNgNgfUSnYY5sT/5LpHKGKd/xik2z8A2p650Zy5j0
-/8Xop5aJnA63rbMBokMjACw9li9HDLDH2a4lxcgbr/wcyxzgYA5ByqacF4ZsDCNp
-dyyFTJWYozRYKif7jM1zkNLvMitw7B0WJnjq36A8qL6Mf8TTCbX7WFMZZJn2oO9d
-X5objcYI+1QsCoHJBunbBHkvzxrVstMzN4hj+U+tOj41+fIHOXjQ3/K5JspzQIZq
-Os6qJ6UzVTMY6eSpQn9E7Jd5qyjJNgiPMwQo8+owroCvjDKm7yVSpHFIZhw2L5UC
-BTXnf+AIqlhh3b2rA6uikLo26OlZOWklCqZy2G/98FleT5ADP79SyB6c65805If9
-jfPay4KrXzymKfuJs3t7
-=hmEA
+iQIcBAEBCAAGBQJPEHwSAAoJEF0huFKJUZL51D4P/3N4AC4njxA8Pooqw4m8Xfmj
+KfMfFaR80YOTAP5MKzi9OLxV3YT91t3oe5snAV707GjFM/OddjFv3CaeieztSUVM
+ENj7PmxlfiPkXRvAxfHyE4vx1UHxbUGhmVW4Er8/t5ed/bCTncspGuKC9oxcHwrz
+3Xo6G7BENMnZ1O6jIcQj1MI5rcj6ojgcptQ9tts5tNbhUuFPcF83tnGRe5ERJDwR
+ROPPHCeZvLCIecEh512xqAtYC7wzI1860mqAFtr6rEeX5laAv1GU/IpUgVqzIDWq
+JDowwnv3nDshw2M2NCtEzM6QEwl3D7YE5RY+7zaxM+exXf1lNE/izukRvNCWzmwZ
+ub6txZqlhMqv5SwXz2gUQnzqRP2r2cutQC+iYF7lSsGCEN6Jzak/8obAQqg0NZ87
+b3mcXv8MnvJWGQPSocRhJQ+o/RuvcW2j6So0NM2yPXFITNwRn6WDlWs5quScDdr1
+x1wDTI5KqxpCu2A89FPhNhwI9g7Wu1F3tOMNTtDVdsydbWFezzOIP74hk/kUq/Lm
+5r4vlwujV8JwqFY5Ae/oyslv40PRVh7HEe8ZobEPF6hkMyNzz+Q3QQxTWwlszYv4
+mSIpkNlQ71SVWnsPgmJgZveYbeW9AXwU34oGu2zEHHlkiL3oYf1K3fLzqNIzMyXG
+Z1cQNWudy6yEnfr4e5GY
+=ljWL
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/icecream/files/0.9.7-automake-1.11.2.patch b/sys-devel/icecream/files/0.9.7-automake-1.11.2.patch
new file mode 100644
index 000000000000..6536f555e7de
--- /dev/null
+++ b/sys-devel/icecream/files/0.9.7-automake-1.11.2.patch
@@ -0,0 +1,16 @@
+Fix autoreconf with >=automake-1.11.2
+
+https://bugs.gentoo.org/397715
+
+Patch written by Kacper Kowalik <xarthisius@gentoo.org>
+--- client/Makefile.am
++++ client/Makefile.am
+@@ -1,7 +1,7 @@
+ INCLUDES = -I$(srcdir)/../services
+ 
+ bin_PROGRAMS = icecc
+-pkglib_SCRIPTS = icecc-create-env
++pkgdata_SCRIPTS = icecc-create-env
+ icecc_SOURCES = main.cpp arg.cpp cpp.cpp local.cpp remote.cpp util.cpp md5.c safeguard.cpp
+ icecc_LDADD = ../services/libicecc.la $(LIBRSYNC)
+ noinst_HEADERS = client.h md5.h util.h
diff --git a/sys-devel/icecream/icecream-0.9.7.ebuild b/sys-devel/icecream/icecream-0.9.7.ebuild
index f7d49a0ea09f..e2ccafffc2f8 100644
--- a/sys-devel/icecream/icecream-0.9.7.ebuild
+++ b/sys-devel/icecream/icecream-0.9.7.ebuild
@@ -1,12 +1,12 @@
-# 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/sys-devel/icecream/icecream-0.9.7.ebuild,v 1.1 2011/09/25 13:28:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/icecream/icecream-0.9.7.ebuild,v 1.2 2012/01/13 18:46:25 xarthisius Exp $
 
 EAPI=4
 
-inherit base autotools
+inherit autotools base
 
-MY_P="icecc-${PV}"
+MY_P=icecc-${PV}
 
 DESCRIPTION="icecc is a program for distributed compiling of C(++) code across several machines; based on distcc"
 HOMEPAGE="http://en.opensuse.org/Icecream"
@@ -17,11 +17,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
 IUSE=""
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 PATCHES=(
 	"${FILESDIR}/0.9.6-symlinks.patch"
 	"${FILESDIR}/0.9.6-crosscompile.patch"
+	"${FILESDIR}/0.9.7-automake-1.11.2.patch"
 	"${FILESDIR}/${PN}-conf.d-verbosity.patch"
 	"${FILESDIR}/${PN}-gentoo-multilib.patch"
 )