Backport patch fixing build issues with recent automake, drop my patch that caused bug #399259 by Vu Tran Kien <vutrankien.vn@gmail.com>

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

6 files changed, 70 insertions, 133 deletions

diff --git a/sys-devel/icecream/ChangeLog b/sys-devel/icecream/ChangeLog
index 41f6fd8858eb..eb070e4615a4 100644
--- a/sys-devel/icecream/ChangeLog
+++ b/sys-devel/icecream/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-devel/icecream
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/icecream/ChangeLog,v 1.42 2012/05/24 02:41:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/icecream/ChangeLog,v 1.43 2012/08/23 10:42:09 xarthisius Exp $
+
+*icecream-0.9.7-r1 (23 Aug 2012)
+
+  23 Aug 2012; Kacper Kowalik <xarthisius@gentoo.org>
+  +files/0.9.7-automake.patch, +icecream-0.9.7-r1.ebuild,
+  -files/0.9.7-automake-1.11.2.patch, -icecream-0.9.6-r1.ebuild,
+  -icecream-0.9.7.ebuild:
+  Backport patch fixing build issues with recent automake, drop my patch that
+  caused bug #399259 by Vu Tran Kien <vutrankien.vn@gmail.com>
 
   24 May 2012; Mike Frysinger <vapier@gentoo.org> icecream-0.9.6-r1.ebuild,
   icecream-0.9.7.ebuild:
@@ -223,4 +232,3 @@
   +files/icecream.nokde.patch, +files/icecream_disable.patch,
   +files/icecreamdaemon, +files/icecreamscheduler:
   Initial import. The ebuild was contributed by Alexander Holler.
-
diff --git a/sys-devel/icecream/Manifest b/sys-devel/icecream/Manifest
index 6311439f8e7c..773c052d737b 100644
--- a/sys-devel/icecream/Manifest
+++ b/sys-devel/icecream/Manifest
@@ -1,34 +1,32 @@
 -----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
-AUX icecream-create-env 2129 RMD160 7230eceda65fb955c647545ae0333d73d319eb92 SHA1 dd154e964b2e2a9b1b54e14df61a974aa3fe89e3 SHA256 8c830bbb0a59ed8a13f84afd4fac083a4984e611e9da862ebfb330dd55e434c6
-AUX icecream-gentoo-multilib.patch 1579 RMD160 35671f69f782e326749f8ff50bd25ede3ffca628 SHA1 64c2f0c7b54911735792c5f14c78549d2c3f9a4e SHA256 0efa29f5cb350aa8118cb9c4ba8d62cf675b6af5692ee18e25021f463465fc8a
-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 2793 RMD160 aba4c39934fd283de6b654c57ab7f6430e08dc6d SHA1 4da59c311770053db8162b36c005a2cbc3f790af SHA256 31875a86efe85daa87c16b0af6dcb8ca69369f433bc8246ebde80d052f2822dc
-EBUILD icecream-0.9.7.ebuild 2720 RMD160 a5be735e7879cc1768f0f00735eef68797dcf007 SHA1 38d56a14ed6f56df90243e799441b090a5d2ce18 SHA256 ff8ee9ab95fa3b29abe335ab7bb29cad41cffe28f8b6628072cdb0ac2b4b0521
-MISC ChangeLog 8368 RMD160 e0fc0b3caef3ae5c8810f610a9430292b867fc0b SHA1 f2efdfe2a0894375579ab00c56077fafde1067e0 SHA256 2ad1443160ce52da3afa49f958ee8e8bee07632b74c6bf7f972c965194942fbe
-MISC metadata.xml 160 RMD160 1233ca29861ca7c47f0b09d1d7a29def80f7df02 SHA1 1bfdc9d282a84c95e2bdcda19ace5b94e2e67349 SHA256 56717bdb03ad5d833acecfbc612a67f569256b328bf610fbc6cc33714186dae9
+AUX 0.9.6-crosscompile.patch 471 SHA256 b0d4f69301cac95f5e3a7a3a91b5470769144e0deb33cb1504b70ad29b8cb783 SHA512 5c33cd6a1aae9b628e6308a4438355298ee0b4217d8561aaee9960c816aa336aa62eb2e5844f8cf756bbf3731fda4c07ac4c1bf30b2ef93c45205dcfbe8a7ae4 WHIRLPOOL e3bcf73125e91ca9d5d0e1a8b314d042734ae89cf4d2f77bd44821ea6fa665dd344af9049eb88a3c0f593e71f22ebef6a5ccc8a42fda08a25d8e15c82799993f
+AUX 0.9.6-symlinks.patch 614 SHA256 4100330fb48453abe7facecff4eb199e5285093df49d082e14050a4c30cb2dfb SHA512 739a683cb9142fb2ee52ec73194de03dac8815103fbd7a102cebabefd649c8ddfe6121649727de2785a525493a5f244352aa5a18796361014e6fe6fcbfe92321 WHIRLPOOL aab994500630cfe1b498ab3f870c45ae1a9745e3472c9d0ee9b50f42cb08312754768a62ee035d913853e0cfe7ce05c9c90772df238e68b6a91a2d4ab1e67ed6
+AUX 0.9.7-automake.patch 1085 SHA256 6f3281250708ec2ea5a1dd188104bdfa66e5f7b388c58a0b4827d3cc9f108da5 SHA512 2a2b8a03d10783a56484ec7b97cec0bf8f6853fc9c1e8d558297f7d1d0060d3e53410d9b6c77bd00359e249817fd6f0d854773850a1983b19417cee140ec17e3 WHIRLPOOL cbb5a0dcc9c5ec97458a38e91dace3474f7edd80d8190193295b22f427adb9aa9aa7ddabea29f078d93ada521610ae3fc479e6d3b42faa345d4dbd67a982da9b
+AUX icecream 1724 SHA256 07b5e4645e99646e1448147ef1e30b4a50f1478b25578ba9e71c6aa2c151ca53 SHA512 fc1ba10b7d50ddabb6365033b17ba51e3b9169bf28f91bdfec7e98be2e98845f293bcc6b714a7ea0fd8618607d4f4d9203d506d0aa00876c55ceb4565d226396 WHIRLPOOL bc79fe5810dbbd05e881eb0767e259fb73f98a5ca4ded1cffc42a462485538a160865f102ab199f79fceee63073d0da144826de8dddece22d43f0f00b5c83c72
+AUX icecream-conf.d-verbosity.patch 463 SHA256 c103468c3303809181b554b152a7ee0db041d12dd040d5196cc9da453303c957 SHA512 cc09d4e2b418b16b37c904183afa31f7783065ab2eb0deb62fbf7c3b7135d767cbb5c37c6b010f53a398795c16cd8dddf1029df9be36083efd693ed1a106f42d WHIRLPOOL bb8636a071d338e57961a6e73f5d008ab1f7a067ee551be335fcc10599c7bd1d4e9da005c170f5581aff122fbd23759d173f103d36cc1560d0c774bda148d4a3
+AUX icecream-config 1692 SHA256 24acbd8e5b0218ce966e78f451985f72530865f86e5a1ee2b6c92d8bf50ff66b SHA512 9bba4e6ebabfc5c2b6d205fdf53e08ce1c29801da6a69534d5c3c221ce1ff7d8575d56bd451254ee9d30d27b6a95d00fd64e3a5cb1129c72583193a27a7fef70 WHIRLPOOL bd23a6f38ecf907363fb15d6968be688c58c053e116575de68ad9a656fd3b4f3b880e82a5da70ec250bd5a8f926a665a88a45144d57052a57187cd66241a40a2
+AUX icecream-create-env 2129 SHA256 8c830bbb0a59ed8a13f84afd4fac083a4984e611e9da862ebfb330dd55e434c6 SHA512 0f916de64da40f7258804cdc42b367e86d4d6a6a2a149b23612df228a2af4bf2e48aa3f7bbe654b2be08709dd51fdee3f2feb05eed6ca245e326708587d16a4f WHIRLPOOL 1be39bf0cd319b84a8dea2cf114b2968eafee791ae64fc16dbcce5015883984158b91f916adb7d07efb16ffe8d705b9445f7db5b89a67dbae2be351067577c4f
+AUX icecream-gentoo-multilib.patch 1579 SHA256 0efa29f5cb350aa8118cb9c4ba8d62cf675b6af5692ee18e25021f463465fc8a SHA512 24a9de13691e39e96c32db5722e7a6979a7a233335bf37fc42f5cf8d8b67d111d26fcf68d5fc20acc4aacee0d1e7cc88ff04ee36a127efc45f3bffe269e7c253 WHIRLPOOL 58f94a649e807fd8c90e384cf84111cf32fb994c45233d2ef6225e97f2d0ae88e3192e42d0d89e0e89e841fea3b54cff6c164e31866a628ba77960a08c182921
+DIST icecc-0.9.7.tar.bz2 379527 SHA256 ba01c19e946d5a142ad9f912c24086ee12e7ca4927d64860787eb4bcd100657f SHA512 023a77d6df33af9837a87218272dc61d68f3782ad59dc8783ec3ca47cbb38619dbcaa25ac7e6654c6cacbd79477c3403b0a73aca595c6fe20aa9a39268f4f2e2 WHIRLPOOL cf822cc6667ceda286b41c4fd172092f51d75cb2c5d1ca3db0dd32796580128808881f09053f209d7f9165ccecf9e97093925fca1ae54597b2a775485d82004f
+EBUILD icecream-0.9.7-r1.ebuild 2720 SHA256 5bb764f976160194da14010cd1a8581a5da59e08b600aa8155e055a4df75eee5 SHA512 a5ca2b6ca5adb124ad6f2b617e495b4a2a6a0c9da1b7cf830716335a6f6275f2756cc1575b8295c05c3644ab08022d087f814bc1ac901ac3eb43a9f1d6273b3f WHIRLPOOL 695494caa961cff98705d0c30757df051a9098c32b246de8cbfb1eac1574fe018ee3c3d37b856a77d4917caf312cecd04afba48d4c5c2af5c0e1c584f72836c3
+MISC ChangeLog 8750 SHA256 cd0427b0d8733bd5abda1ff5abf85750805114967c7f26d5227436b203240799 SHA512 f29171e29ba1f234b68f682dec13e55df726d765d2bb60df631a5e796af2654e5b1f6714811dbe7315f9045a3215368f1bea257ea268557d3f6086c9095cc67e WHIRLPOOL 7929aed3fe03a5c24315f713c28ac622544fac7ffeb2ba217e5bef9f0a7ad091a2f030235a0b778447ebb4940b86831368a858c7a79ed8d26bdce80d17bb71ab
+MISC metadata.xml 160 SHA256 56717bdb03ad5d833acecfbc612a67f569256b328bf610fbc6cc33714186dae9 SHA512 83001424d846619d2551025541359bae52ff22cfbbce0d2beef47b085c937ee44eeb267493486451403905151e3a66db2f5fb1a1d072bf03e598146df9af02e8 WHIRLPOOL 1d4572f178726ad1e060380478c630fc46fb641eed12408419df7bbf3b9331a92514bb970e798877e01313571eb7af5aaee9b98182ea93a4a1d7c644fe2598b0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPvaAhAAoJELEHsLL7fEFWGgIP/jg7LZOHkEQQL+VtXPJM5zaQ
-/C0VG2BlKRtW8boz17B5b4k3TJ1MhbnCPTJmy+stqWvmMBetwj9eZAWYmxFxkqvg
-rWk/dGne2/oUpVkpzJ1JMEwboRG2b2EAJbyQ21C592xZXmLx+VYCD5Y5pAc7JzRU
-kQiwuOw7wRjxWHsCXwBiAyl49L90XSeDUkmjxxDxLjHHLhTNaOmOnaAXBA1RUEp3
-iIKWxRRqM8IoYu651py+3oyEfgaMLNMMQDNPlSV46LEdcUWxCw+JnFxAYtzKhBUg
-gdpYgpPK6m1W0kpr7/qoqhq7gCuwYmEVpWkL0UtfgDabBIbMrS7ru0VKDpeyPCiS
-9dSqrR1JsMrq0vTSlVi3KOQ1x0PMGrLoEJSoEkDOv0oik3P2wfjxqM3Qe6Pf/XSG
-31IrOtTlL7rSMtAHs1AqAFgjgn+JicBWY/ClPh82s81AJpWOYpS39Ey44QssD1aD
-t5YZkzzdaXnp1EiS/3Zsn1wiLmehBWjQnmVjB7KmvlhqWaNM9SsehU+Zlpgxezc1
-vhvGsGPFDeOEOqFpOJGm+rZP029Z8ujlMmfzKr3Ng0OrXL6sxgDYsvL5W5fHqCRY
-KTYF3FgcL83Ow85HpLGXw7i1ndfLrCI6g66rbtpEGqMI2rJBnGTeei2jHM7SVauI
-VhaNojQAfqPUPjfmSQ9w
-=Ewx2
+iQIcBAEBCAAGBQJQNgkLAAoJEF0huFKJUZL5sccP/R05hKDZ8b+egz5MQVZRoFHa
+FqEhGbcdUjs3AJI3rewDfUG/eluSbXyIM+wGchQmZ6ESVt0qd4jSe7bsFx+HSRb2
+raOkbShbhqRns5xOVR3Q7xWFqAA6hQr2PQNUAYihQCJ72PDSOX2GqkqYkHhkNZhO
+N2NIJbASK0sZ6VP9xdyXjCGQFkxegF0M6yemmn8l8G3/XWN0LyD1zhWDGXmr06Ag
+9KOF865M9KRN9UQrFuAROnzENJY/0iDjGMaMvMzo3PFVxaEkIX8OpfRnU0SLCj4m
+Uvnb13OYIAfKr9uqLeoDJtDnNnf3IYfFSQt/IC5JWKPmRWPEEwTK1e9rgFVzszMf
+wmAkI9YBLyPv4/kDQ4tbSisP6tsyv/dhvfOd+a0DXTtJTCIyraGwCElzEvcab5yE
+d/rvPozHEEdkfS71Y/+vMUIC/AJg5rGtea61k4jCPQ+O3h1diJz0hG4ho6eUjg1d
+2gPOZmiuC5ONqOrBhOt5nHOu0EVyJypr4Ic0rbCIniswJF7Rv2v+yqUbzed6JvF4
+BxMPulhqSlXgeDKEDTj5IZqp+IekK5BV2FpocALcK2zsyKEazYyRG7VAA2nIjvSd
+rnfxf1v60nXavZo/B6I3sNcS7SP6IGkkxdm5Ni5jMt8/EB+UAy/PCuzQZijyWi1o
+JLLC5Due3dQf3kUszsaL
+=OlV0
 -----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
deleted file mode 100644
index 6536f555e7de..000000000000
--- a/sys-devel/icecream/files/0.9.7-automake-1.11.2.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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/files/0.9.7-automake.patch b/sys-devel/icecream/files/0.9.7-automake.patch
new file mode 100644
index 000000000000..6905a2a34158
--- /dev/null
+++ b/sys-devel/icecream/files/0.9.7-automake.patch
@@ -0,0 +1,32 @@
+Backport upstream patch to fix automake-1.12 issues
+
+https://bugs.gentoo.org/show_bug.cgi?id=397715
+https://bugs.gentoo.org/show_bug.cgi?id=399259
+--- client/Makefile.am
++++ client/Makefile.am
+@@ -1,10 +1,11 @@
+ INCLUDES = -I$(srcdir)/../services
+ 
+ bin_PROGRAMS = icecc
+-pkglib_SCRIPTS = icecc-create-env
++pkglibexec_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
++AM_CPPFLAGS = -DPLIBDIR=\"$(pkglibexecdir)\"
+ 
+ EXTRA_DIST = icecc-create-env
+ 
+--- configure.in
++++ configure.in
+@@ -246,10 +246,6 @@
+ KDE_EXPAND_MAKEVAR(mybindir, bindir)
+ AC_DEFINE_UNQUOTED(BINDIR, "$mybindir", [Where to look for icecc])
+ 
+-myopkglibdir='${libdir}/'"$PACKAGE"
+-KDE_EXPAND_MAKEVAR(mypkglibdir, myopkglibdir)
+-AC_DEFINE_UNQUOTED(PLIBDIR, "$mypkglibdir", [Where to look for icecc-create-env])
+-
+ myorundir='${localstatedir}/run'
+ KDE_EXPAND_MAKEVAR(myrundir, myorundir)
+ AC_DEFINE_UNQUOTED(RUNDIR, "$myrundir", [Where to place pid files])
diff --git a/sys-devel/icecream/icecream-0.9.6-r1.ebuild b/sys-devel/icecream/icecream-0.9.6-r1.ebuild
deleted file mode 100644
index 347c2e35272c..000000000000
--- a/sys-devel/icecream/icecream-0.9.6-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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.6-r1.ebuild,v 1.2 2012/05/24 02:41:18 vapier Exp $
-
-EAPI=3
-
-inherit base autotools user
-
-MY_P="icecc-${PV}"
-
-DESCRIPTION="icecc is a program for distributed compiling of C(++) code across several machines; based on distcc"
-HOMEPAGE="http://old-en.opensuse.org/Icecream"
-SRC_URI="ftp://ftp.suse.com/pub/projects/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-symlinks.patch"
-	"${FILESDIR}/${PV}-crosscompile.patch"
-	"${FILESDIR}/${PN}-conf.d-verbosity.patch"
-	"${FILESDIR}/${PN}-gentoo-multilib.patch"
-)
-
-pkg_setup() {
-	enewgroup icecream
-	enewuser icecream -1 -1 /var/cache/icecream icecream
-}
-
-src_prepare() {
-	base_src_prepare
-
-	eautoreconf
-}
-
-src_install() {
-	base_src_install
-
-	dosbin "${FILESDIR}"/icecream-config || die "install failed"
-	dosbin "${FILESDIR}"/icecream-create-env || die "install failed"
-
-	newconfd suse/sysconfig.icecream icecream || die "install failed"
-	doinitd "${FILESDIR}"/icecream || die "install failed"
-
-	diropts -m0755
-	keepdir /usr/lib/icecc/bin
-}
-
-pkg_postinst() {
-	ebegin "Scanning for compiler front-ends..."
-	/usr/sbin/icecream-config --install-links
-	/usr/sbin/icecream-config --install-links "${CHOST}"
-	eend ${?}
-
-	elog
-	elog "If you have compiled binutils/gcc/glibc with processor-specific flags"
-	elog "(as normal using Gentoo), there is a greater chance that your compiler"
-	elog "won't work on other machines. The best would be to build gcc, glibc and"
-	elog "binutils without those flags and then copy the needed files into your"
-	elog "tarball for distribution to other machines. This tarball can be created"
-	elog "by running /usr/bin/icecc --build-native, and used by setting"
-	elog "ICECC_VERSION in /etc/conf.d/icecream"
-	elog '  ICECC_VERSION=<filename_of_archive_containing_your_environment>'
-	elog
-	elog "To use icecream with portage add the following line to /etc/make.conf"
-	elog '  PREROOTPATH=/usr/lib/icecc/bin'
-	elog
-	elog "To use icecream with normal make use (e.g. in /etc/profile)"
-	elog '  PATH=/usr/lib/icecc/bin:$PATH'
-	elog
-	elog "N.B. To use icecream with ccache, the ccache PATH should come first:"
-	elog '  PATH=/usr/lib/ccache/bin:/usr/lib/icecc/bin:$PATH'
-	elog
-	elog "Don't forget to open the following ports in your firewall(s):"
-	elog " TCP/10245 on the daemon computers (required)"
-	elog " TCP/8765 for the the scheduler computer (required)"
-	elog " TCP/8766 for the telnet interface to the scheduler (optional)"
-	elog " UDP/8765 for broadcast to find the scheduler (optional)"
-	elog
-	elog "Further usage instructions: ${HOMEPAGE}"
-}
diff --git a/sys-devel/icecream/icecream-0.9.7.ebuild b/sys-devel/icecream/icecream-0.9.7-r1.ebuild
index 5dee323f3a48..b2e9aa2e1b34 100644
--- a/sys-devel/icecream/icecream-0.9.7.ebuild
+++ b/sys-devel/icecream/icecream-0.9.7-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2012/05/24 02:41:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/icecream/icecream-0.9.7-r1.ebuild,v 1.1 2012/08/23 10:42:09 xarthisius Exp $
 
 EAPI=4
 
@@ -22,7 +22,7 @@ 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}/${PV}-automake.patch"
 	"${FILESDIR}/${PN}-conf.d-verbosity.patch"
 	"${FILESDIR}/${PN}-gentoo-multilib.patch"
 )