Fix building with newer gettext. Bug #418111

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

4 files changed, 78 insertions, 6 deletions

diff --git a/media-gfx/icoutils/ChangeLog b/media-gfx/icoutils/ChangeLog
index 3be368d076ab..8741814aa2de 100644
--- a/media-gfx/icoutils/ChangeLog
+++ b/media-gfx/icoutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/icoutils
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/icoutils/ChangeLog,v 1.24 2012/01/15 15:19:10 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/icoutils/ChangeLog,v 1.25 2012/06/03 18:04:15 hwoarang Exp $
+
+*icoutils-0.29.1-r2 (03 Jun 2012)
+
+  03 Jun 2012; Markos Chandras <hwoarang@gentoo.org>
+  +files/icoutils-0.29.1-gettext.patch, +icoutils-0.29.1-r2.ebuild:
+  Fix building with newer gettext. Bug #418111
 
   15 Jan 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   icoutils-0.29.1-r1.ebuild:
diff --git a/media-gfx/icoutils/Manifest b/media-gfx/icoutils/Manifest
index 2eb87382240f..5b9bf9a9a636 100644
--- a/media-gfx/icoutils/Manifest
+++ b/media-gfx/icoutils/Manifest
@@ -1,17 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX icoutils-0.29.1-gettext.patch 354 RMD160 96c01b6cb9d1ac955c0986e4ba7a3ef92bf50014 SHA1 4a22907e23a79214768cd2dc636af6890e98de7d SHA256 5f5461741fb9ba94fb30d0df4c6379bd31b59d7546ccb3f1ceb448d157fdc200
 AUX icoutils-0.29.1-locale.patch 831 RMD160 49c2b2e1b3d5dad5ee7772e65e8dabf4ad979a74 SHA1 b8cdf893f93ea548535735278eeedd8363259266 SHA256 dcbe19a6826c339bcde7773b18947ec479312effe748c5b78b0500862ed2287a
 DIST icoutils-0.26.0.tar.gz 603257 RMD160 b7b75c0a8b7734fd50e9e72c085270df2b115b44 SHA1 fe31911d6bbfa6d4066bae7d3b4f70908d14e097 SHA256 ffb6fdd3eaf0f24c53759a4eda6090dde60a4efd3342ee6c3a2a0305507b5871
 DIST icoutils-0.29.1.tar.bz2 456955 RMD160 99d145eb2f8f552c42749b379fd71e20f9b866bf SHA1 312036e81d8c1800fb21ca6fc6b6ff3219e2c030 SHA256 646c33e5ecefb2faa254fca01c816ceae3c854855f9dfe9e896e301fc8c61ea0
 EBUILD icoutils-0.26.0.ebuild 915 RMD160 d99e31f451b42a05b46263a7f0bbf3d96805dc6e SHA1 a57ba5f562ff41b0f8efc2bed7d81cb6d2aeb2e4 SHA256 c1014edafa53f21aa7b86abd5dd2c4adb3edfc1e64c3e2d75b86befb97f86d9b
 EBUILD icoutils-0.29.1-r1.ebuild 1007 RMD160 4f3151bc57da39adc2ee47142e30d76238977f05 SHA1 27c178643d4c3f85a3a0faef08ba5dabc12616c2 SHA256 28d3e7a8c6f14408aeb3b236a93a6e6618e6d2afddd95c90788633bc02db4ac9
-MISC ChangeLog 2966 RMD160 76df7a7e90e9e0f4c8e1fb2a5bfab05f92f7dab9 SHA1 11941da0c52dabc7c5ffba06d0053896f90bfc2b SHA256 677b92bc4241e8edda7159300f0aaa4a6465cc66310665d5404f662aa260feff
+EBUILD icoutils-0.29.1-r2.ebuild 1085 RMD160 0b8f203ffa92e214b7f3decf0067f861109eeb6b SHA1 034cd8db299fd7dae53cbcd02ff347d01b60b5aa SHA256 03705b3d47ac7d4eb7743f2740e5546d602a8325ec1e710f42f1fdb71cf2bf65
+MISC ChangeLog 3168 RMD160 37ef9ecde385a5c527acddaa3d502f881cb8fa9e SHA1 7ed686f8d582d705a46e79aadd474bc7bf0154ba SHA256 caaa671d9a6ccd7ff93b59abe4ccfd7a7e2f73b16389a7062fab070fec1c15c1
 MISC metadata.xml 434 RMD160 972c6bf3f2e49270d8d16a5bc91f0d56cbe15dc5 SHA1 310a44b1780dedd6d6649ed7f7ed9c976cb1881a SHA256 f58590127b58ec58a28cd086e27afe08ce1b6d1629f8e7a8b4ab522cc013963e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAk8S7nQACgkQuUQtlDBCeQJyTgCfYXWFKeRM44CSYtW+A/G3rkUA
-lcYAn2LIYzPi0HEMZRDzn6rdWCjMa4KN
-=fJEm
+iQIcBAEBCgAGBQJPy6ckAAoJEPqDWhW0r/LCqLYQAI99NYOEAsiTsfl+jGFQI535
+fYkboiljX8nU3jA12WZzB+fIaBk0/AdNKaUgTLIVcp9Mvmfb/Qr6Ci2ZaYtYyoM6
+9uBiGbdOWl0VTL1XobfKsNZQt0K6AjmQv47EcOX/ZFjYO//E4iYFkk35MGjTS/EE
++gVtmlTSzHJ1HccHS69xHVLQ9HIKK610cOzX666XZerO1jwDvy+1HPzvdBlCG3n4
+c+z2BkdaFFmV9j2zWB8pkR2PCL8LFo9i69SX7u8vD20NnPepLDsero8t5rgxAYSV
+PKCS/uhKgOY75Q8SbCkycqU2IZ6w1OsfByPHSEsN3xjvfvHkc2PWkIuDyYzXax4n
+nMAIDE+tp4t4Oz/MYTFOmBkzeK5hPbSfHwoa6Imk2LuLd3x/mWaYKFunWv4Uc0Sx
+Kc6r1emJr6g0SkDJ2apnZzPkHlBHwN34JdgXdORSv9RdVbQqCBCBZMvqVLlncqjs
+u+6BoY4WbvtIho82ui0On5oPPm5St4l1EHyZcaNePZxSImhUeGx+kJ/R7XVFYUcr
+sSG2NQ5RnTtOrp6RoJj90QDJYux0jYYLwBstqfXxDvL5Ms+I+8RcrqgTYSvWUQiY
+yvC0Mf2IY8WZRisax2Q9IrU6aTXlR37grgy6otw+cjPdrl0b8/FF+7XVOLbSeim0
+buH3lvcG8/kYZCFiU6HL
+=FgPf
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/icoutils/files/icoutils-0.29.1-gettext.patch b/media-gfx/icoutils/files/icoutils-0.29.1-gettext.patch
new file mode 100644
index 000000000000..4aa4c44cc3ce
--- /dev/null
+++ b/media-gfx/icoutils/files/icoutils-0.29.1-gettext.patch
@@ -0,0 +1,13 @@
+Index: icoutils-0.29.1/configure.ac
+===================================================================
+--- icoutils-0.29.1.orig/configure.ac
++++ icoutils-0.29.1/configure.ac
+@@ -26,7 +26,7 @@ gl_INIT
+ 
+ # Gettext
+ AM_GNU_GETTEXT([external])
+-# AM_GNU_GETTEXT_VERSION(0.14.1)
++AM_GNU_GETTEXT_VERSION(0.14.1)
+ 
+ # Checks for header files.
+ AC_HEADER_STDC
diff --git a/media-gfx/icoutils/icoutils-0.29.1-r2.ebuild b/media-gfx/icoutils/icoutils-0.29.1-r2.ebuild
new file mode 100644
index 000000000000..d38467e698f2
--- /dev/null
+++ b/media-gfx/icoutils/icoutils-0.29.1-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/icoutils/icoutils-0.29.1-r2.ebuild,v 1.1 2012/06/03 18:04:15 hwoarang Exp $
+
+EAPI="2"
+
+inherit autotools eutils
+
+DESCRIPTION="A set of programs for extracting and converting images in Microsoft Windows icon and cursor files (.ico, .cur)."
+HOMEPAGE="http://www.nongnu.org/icoutils/"
+SRC_URI="http://savannah.nongnu.org/download/icoutils/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls"
+
+RDEPEND="media-libs/libpng
+		nls? ( virtual/libintl )
+		>=dev-lang/perl-5.6
+		>=dev-perl/libwww-perl-5.64"
+
+DEPEND="${RDEPEND}
+		nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-locale.patch
+	epatch "${FILESDIR}"/${P}-gettext.patch
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	econf \
+		`use_enable nls` \
+		--disable-dependency-tracking || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" mkinstalldirs="mkdir -p" install || die
+	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
+}