Fix building with zlib >= 1.2.5.1-r1 wrt #383585 by Alexandre Rostovtsev and Mike Frysinger

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

3 files changed, 37 insertions, 22 deletions

diff --git a/media-libs/libextractor/ChangeLog b/media-libs/libextractor/ChangeLog
index 32f744a55363..f887965e3fb2 100644
--- a/media-libs/libextractor/ChangeLog
+++ b/media-libs/libextractor/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libextractor
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libextractor/ChangeLog,v 1.60 2011/10/09 17:37:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libextractor/ChangeLog,v 1.61 2011/10/09 17:45:36 ssuominen Exp $
+
+  09 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
+  libextractor-0.5.20c.ebuild:
+  Fix building with zlib >= 1.2.5.1-r1 wrt #383585 by Alexandre Rostovtsev and
+  Mike Frysinger
 
   09 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
   libextractor-0.6.2.ebuild:
diff --git a/media-libs/libextractor/Manifest b/media-libs/libextractor/Manifest
index ebc6427e32a0..841fb2205ea3 100644
--- a/media-libs/libextractor/Manifest
+++ b/media-libs/libextractor/Manifest
@@ -9,18 +9,18 @@ DIST libextractor-0.6.2.tar.gz 955346 RMD160 ff53d8b889651e730f28344900414f1971a
 EBUILD libextractor-0.5.19a.ebuild 1074 RMD160 c078c23b027770d2fef34383639411f79e674752 SHA1 e788ceb0eb71b9c4cf2b31608a6d38cd923d6b6d SHA256 2caf591e056b1c41577b619904f8c7b3b6659856bb3c1b1af38bb8a24d0004ba
 EBUILD libextractor-0.5.20a.ebuild 1077 RMD160 5606b594469a8f2c2fb39aab707ad143aa0eae9b SHA1 4e79be21da1a15214d2ffaede646c1f7dffe4b3d SHA256 4e893da142cccf9ba0831d9f9f7ce1a4a641a25c0852f08aa1e2819fe93b32f7
 EBUILD libextractor-0.5.20b.ebuild 1077 RMD160 814de7afd7f5785e6a4a9c348c57c8eeee7ff886 SHA1 12437c9ef2d69d9bfbd80daedb190d93078426f5 SHA256 f3095d40d33d057b4c7c6bb1247aa3a457e8a8650484a785c91b0ab389729d63
-EBUILD libextractor-0.5.20c.ebuild 1077 RMD160 d2633690c347d8aaad7ea7db7a783aec371a7e19 SHA1 83508905d33e342b64ac9b77e69dc0b41cadc8ad SHA256 28733c2475b56a17847ef430f51ebb8ac1985629cf33de623e4a2301090a7649
+EBUILD libextractor-0.5.20c.ebuild 1144 RMD160 2b8af22dfce821c44c3b6634a814fb371684f51e SHA1 e89077169ae064f874cf9fbe2e13a8df6e646ea2 SHA256 f6727c3266c6f346200f15dbf3eeec2d85ca506512f2bc88203ca6d9dfb7b438
 EBUILD libextractor-0.6.2.ebuild 1422 RMD160 3c978885b82e30e8b749fb67f24eb19cb0658ae3 SHA1 13ee54e2f5628234562bf9ca0fa1d778c0784137 SHA256 8ace7334529bad03f633ec037cd0caa772f577c3aa81e5b5803a0ebe59a76de4
-MISC ChangeLog 10987 RMD160 fc9ffd383c1a83239dfd82f6dbb33daa2370b547 SHA1 682a8383748fca7a2ff8616b4b5c74ce2b12270a SHA256 746dea9e1d8d6e9427431734ec18edc13aab2542bf2a427dc52490881901eafa
+MISC ChangeLog 11169 RMD160 cb0a0530eb3554bdd88888595842b732b9825f10 SHA1 7f35c6cb68859f584e30ca059be63292611afb9d SHA256 7acdcc333dc9566a407634f4f1e258db392f855cc883b7edefbfd1e12957ff85
 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOkdvjAAoJEEdUh39IaPFNXJAH/1OfjpwrNS5TtMt2++NBgqw/
-RvQhob4sxPKt2hVuH4Q5MyDTklhd935oz9biPR1g8BpbEfuRPOdCd9wsqyCMZ0zb
-p+zMnMuA03BoMKa0jcBeJXZQkt1ziqPQ9GsNTo2P095cphzWmzkdQRFCmMLpENHY
-95kUQd2syg5KbewAm8O/++/1dhSLBH8B8WYBMLuumdyqedMIsdt+pxRSduFQ062A
-AdXtBz0lmYVRqv3GR5PBNdIx8tOMYhimsEhS6D2FBfhfrEcXAAQPXr4jUaWOf+86
-cANLa1TBcAkyugrCfnKH7WZGsVGtABxLbGRIzCnjA968jB/sZSOZb2/Banm/7yY=
-=vCQ1
+iQEcBAEBAgAGBQJOkd3YAAoJEEdUh39IaPFNmXoH/jFCaSRkkyBS2BC8ztuSSA9K
+vheb+2iQW3vqVOlRl6AYoQLE/Vizk2/MuUbFiLsFuo96ehKGdVKNPxBz3xRRH9iA
+2ImHy+VLsBg99dhMsnF8DJ8czj0Gkh2HBSPFt2KZhq6y3lPKnZyOPewnjUC0KfJ2
+i0GaTMLYYdyDwCfoibeBS+FjdFg0yhyrgCPjEnqxvY+81cC0Z/vhgGuinlbM+rwc
+DrRieAgFE+JRyuj6t8QQc/XWUD/EhmY9C0Qp1PbzdqQQx461aUnoyHLjBb1Dc3Af
+XBU8kBke6VolubixSdsncABB228hKffzKhGDdUQQOq+oJhOZ2wJi+Es6bboUFX8=
+=pUGL
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libextractor/libextractor-0.5.20c.ebuild b/media-libs/libextractor/libextractor-0.5.20c.ebuild
index 86cf626dac14..0cba7660d8a1 100644
--- a/media-libs/libextractor/libextractor-0.5.20c.ebuild
+++ b/media-libs/libextractor/libextractor-0.5.20c.ebuild
@@ -1,38 +1,48 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libextractor/libextractor-0.5.20c.ebuild,v 1.2 2009/12/29 17:43:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libextractor/libextractor-0.5.20c.ebuild,v 1.3 2011/10/09 17:45:36 ssuominen Exp $
 
+EAPI=4
 inherit libtool
 
 DESCRIPTION="A simple library for keyword extraction"
 HOMEPAGE="http://www.gnunet.org/libextractor/"
 SRC_URI="http://gnunet.org/${PN}/download/${P}.tar.gz"
 
-IUSE="gtk nls vorbis zlib"
-SLOT="0"
 LICENSE="LGPL-2.1"
+SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gtk nls vorbis zlib"
+
 # Disabled tests because they dont work (tester@g.o)
 RESTRICT="test"
 
-DEPEND=">=sys-devel/libtool-1.4.1
+RDEPEND=">=sys-devel/libtool-2.2.6b
 	>=dev-libs/glib-2.0.0
 	media-libs/libmpeg2
 	nls? ( virtual/libintl )
 	gtk? ( >=x11-libs/gtk+-2.6.10 )
 	zlib? ( sys-libs/zlib )
 	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-RDEPEND=""
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	#bug 383585
+	has_version '>=sys-libs/zlib-1.2.5.1-r1' && \
+		sed -i -e '1i#define OF(x) x' src/plugins/oo/ooextractor.c
 
-src_compile() {
 	elibtoolize
+}
+
+src_configure() {
 	#bug #188169 -> --disable-xpdf
-	econf --enable-glib --enable-exiv2 \
+	econf \
+		--enable-glib \
+		--enable-exiv2 \
 		--disable-xpdf \
-		$(use_enable nls) || die "econf failed"
-	emake -j1 || die "emake failed"
+		$(use_enable nls)
 }
 
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
+src_compile() {
+	emake -j1
 }