Add support for USE=xml #137871 by Stefan Trenker.

Package-Manager: portage-2.1.1_pre1-r2

4 files changed, 79 insertions, 11 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index 7c7dcd47afb0..e9360884abcb 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/netpbm
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.122 2006/06/24 18:09:25 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.123 2006/06/24 23:37:00 vapier Exp $
+
+  24 Jun 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/netpbm-10.34-xml2.patch, netpbm-10.34.ebuild:
+  Add support for USE=xml #137871 by Stefan Trenker.
 
   24 Jun 2006; Rene Nussbaumer <killerfox@gentoo.org> netpbm-10.34.ebuild:
   Stable on hppa. See bug #137344.
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 2a2f1b00ea40..b8df363416e8 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX netpbm-10.19-message.patch 633 RMD160 43ac665250a7af5079bf4e517220eee3871001df SHA1 9379a4e75fab608ff4f6e78a84020f209e70a7e9 SHA256 63ad772f1422216119b13ceb4e231e439bbf5ce30f29c300298972c81e65a2d4
 MD5 8ef24fe5097b041d3dcac4a1ea1ae8fa files/netpbm-10.19-message.patch 633
 RMD160 43ac665250a7af5079bf4e517220eee3871001df files/netpbm-10.19-message.patch 633
@@ -50,6 +53,10 @@ AUX netpbm-10.33-memmem.patch 967 RMD160 8f29108edbc1bae5ce699f8768f9be322509c75
 MD5 9d15cf1f501ff1763968008a2111703a files/netpbm-10.33-memmem.patch 967
 RMD160 8f29108edbc1bae5ce699f8768f9be322509c75c files/netpbm-10.33-memmem.patch 967
 SHA256 f59badd541cb5880f933bbf4c479ae429d186970b5a9c6fb43c707b38d87c17f files/netpbm-10.33-memmem.patch 967
+AUX netpbm-10.34-xml2.patch 988 RMD160 3875b151e1688cdc6caef52dd36ffb14a3a9c1ab SHA1 f6de880a74330887c3bd606bb971115d42100c5d SHA256 61cbd386f31d53d09719561dfbcd36ea53bce5bd696e00a2838e203b7b8b1492
+MD5 a8a24cc76003bd9b963688e79e0e2dfd files/netpbm-10.34-xml2.patch 988
+RMD160 3875b151e1688cdc6caef52dd36ffb14a3a9c1ab files/netpbm-10.34-xml2.patch 988
+SHA256 61cbd386f31d53d09719561dfbcd36ea53bce5bd696e00a2838e203b7b8b1492 files/netpbm-10.34-xml2.patch 988
 DIST netpbm-10.26.29.tgz 2540954 RMD160 6cf2dbd2c78cc1271ef24705bd8dba97224dd537 SHA1 9c0431c64500018c6f51af6e85d9f7574391c0d8 SHA256 bca1c7867705f0d6feaab3807442394dddebfb3fa8fcce9ade8b6df50594138e
 DIST netpbm-10.29.tgz 2359729 RMD160 c88d01b1106c7eb1f087d98a5570c0c61200d083 SHA256 b0e4e0d7a21809a606d55ad7f30d0715b080e35609791257ab3f075b7449f964
 DIST netpbm-10.30-manpages.tar.bz2 233254 RMD160 6312e1486f473f57332a5dc050a03ac1dfce7f47 SHA1 a1893e67380029ddbb76a1451833a134f4d42818 SHA256 75eb6ceaebafffb6a2d608d49f2b61c5049e5795976bbfb2d55608de1f858124
@@ -83,14 +90,14 @@ EBUILD netpbm-10.33.ebuild 2960 RMD160 74d33736f17c6443b5a02bfe4c17e0d3d52812dc
 MD5 54bec4bbc45bad5ad2a25ef984fe42c2 netpbm-10.33.ebuild 2960
 RMD160 74d33736f17c6443b5a02bfe4c17e0d3d52812dc netpbm-10.33.ebuild 2960
 SHA256 34e640cd6e51f38c8c2e9b37e0ebe07cbdcf7324836e43e725f39f8a19e00bfa netpbm-10.33.ebuild 2960
-EBUILD netpbm-10.34.ebuild 2967 RMD160 13abb282c7760c8bd5588c88f9803227e9eb454b SHA1 fae1da6de4beba25d9948280e7eca677e595329f SHA256 b955d42d2ef770efdbb67c80b62a31464c44d7f3ec646af096e1f4576b18c720
-MD5 5527d937f4fc8864c9a63fa93dca721b netpbm-10.34.ebuild 2967
-RMD160 13abb282c7760c8bd5588c88f9803227e9eb454b netpbm-10.34.ebuild 2967
-SHA256 b955d42d2ef770efdbb67c80b62a31464c44d7f3ec646af096e1f4576b18c720 netpbm-10.34.ebuild 2967
-MISC ChangeLog 17560 RMD160 b47487aa2f36a8e0b260bc71b9a16a3b90a7281a SHA1 aee231a0ce58c279e672ca84673c8afb4c89b317 SHA256 f3798c1137e42571981d0dcff834224356e21619d3170b670d44be6e5de167c8
-MD5 09e3a1a6f31fb18e19a33a939185683d ChangeLog 17560
-RMD160 b47487aa2f36a8e0b260bc71b9a16a3b90a7281a ChangeLog 17560
-SHA256 f3798c1137e42571981d0dcff834224356e21619d3170b670d44be6e5de167c8 ChangeLog 17560
+EBUILD netpbm-10.34.ebuild 3088 RMD160 1d2686809543c520ec25c9f5d1a7b971c408f695 SHA1 6ca2c3d666d85ddb89881f45a7cf6bfcd6cb0054 SHA256 f6bfe245f0008d14575bcbcaff2b394e97055e0cdf3e16889818372edbef0fa6
+MD5 0f467d9caf2fe01a34f969f56427102d netpbm-10.34.ebuild 3088
+RMD160 1d2686809543c520ec25c9f5d1a7b971c408f695 netpbm-10.34.ebuild 3088
+SHA256 f6bfe245f0008d14575bcbcaff2b394e97055e0cdf3e16889818372edbef0fa6 netpbm-10.34.ebuild 3088
+MISC ChangeLog 17716 RMD160 eb0f735953f43ac9395aa4444f4bbf156efb546e SHA1 e5902419a71e8c2d98ff92d0b98f0e5b8b4593b7 SHA256 22f3263b4b261fd544041674c16d22435f975e57331aa370e0c521b129dbb528
+MD5 59e7189b7d9c8df9008b408ae81ffb1f ChangeLog 17716
+RMD160 eb0f735953f43ac9395aa4444f4bbf156efb546e ChangeLog 17716
+SHA256 22f3263b4b261fd544041674c16d22435f975e57331aa370e0c521b129dbb528 ChangeLog 17716
 MISC metadata.xml 224 RMD160 b7bf7da46cd75283f29d006f5d6854890a3d8aab SHA1 222093833f902db8f97b1e4b00ad402caf7f9c78 SHA256 06e3a779a82014f8783ebfc67e1b11107bcb670aacdf1f81faa361642046ba23
 MD5 e1f6c302199a36c1be4ecf1654be9bac metadata.xml 224
 RMD160 b7bf7da46cd75283f29d006f5d6854890a3d8aab metadata.xml 224
@@ -116,3 +123,10 @@ SHA256 b983e4e062abf2034aaa4e7db47fd20d446dc86f92f070ee20e979bdc82c1d20 files/di
 MD5 aa322e4cfbd60cf8ff55e2bdc716b3d3 files/digest-netpbm-10.34 500
 RMD160 40829b0750c9d553b14403a2afeb29b89ac310a2 files/digest-netpbm-10.34 500
 SHA256 02ab164f86c651741c75c27cf1b7434fbdaa1fa8db3d7caedbd3cbb4c8e51baf files/digest-netpbm-10.34 500
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEnc3iamhnQswr0vIRAgonAJwLzPWmAKGgVpyqjb1D8uewFvy3/gCeLgfg
+5YZJIHUDWkl5yfgQjDWmQME=
+=2t95
+-----END PGP SIGNATURE-----
diff --git a/media-libs/netpbm/files/netpbm-10.34-xml2.patch b/media-libs/netpbm/files/netpbm-10.34-xml2.patch
new file mode 100644
index 000000000000..db9efef3a5e1
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.34-xml2.patch
@@ -0,0 +1,47 @@
+http://bugs.gentoo.org/137871
+
+--- converter/other/Makefile
++++ converter/other/Makefile
+@@ -7,14 +7,6 @@
+ 
+ include $(BUILDDIR)/Makefile.config
+ 
+-ifeq ($(shell xml2-config --version),)
+-  XML2_LIBS=NONE
+-  XML2_CFLAGS=NONE
+-else
+-  XML2_LIBS=$(shell xml2-config --libs)
+-  XML2_CFLAGS=$(shell xml2-config --cflags)
+-endif
+-
+ SUBDIRS = jbig pnmtopalm jpeg2000 cameratopam pamtosvg
+ ifneq ($(BUILD_FIASCO), N)
+   SUBDIRS += fiasco
+@@ -101,7 +93,7 @@
+   BINARIES += pnmtops
+ endif
+ 
+-ifneq ($(XML2LIBS),NONE)
++ifneq ($(XML2_LIBS),NONE)
+   BINARIES += svgtopam
+ endif 
+ 
+--- Makefile.config.in
++++ Makefile.config.in
+@@ -419,6 +419,16 @@
+ ZHDR_DIR = 
+ #ZLIB = libz.so
+ 
++# The XML2 library
++
++ifeq ($(shell xml2-config --version),)
++  XML2_LIBS=NONE
++  XML2_CFLAGS=NONE
++else
++  XML2_LIBS=$(shell xml2-config --libs)
++  XML2_CFLAGS=$(shell xml2-config --cflags)
++endif
++
+ # The JBIG lossless image compression library (aka JBIG-KIT):
+ 
+ JBIGLIB = $(BUILDDIR)/converter/other/jbig/libjbig.a
diff --git a/media-libs/netpbm/netpbm-10.34.ebuild b/media-libs/netpbm/netpbm-10.34.ebuild
index 48e409f6039f..6b3f950d2b83 100644
--- a/media-libs/netpbm/netpbm-10.34.ebuild
+++ b/media-libs/netpbm/netpbm-10.34.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.34.ebuild,v 1.6 2006/06/24 18:09:25 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.34.ebuild,v 1.7 2006/06/24 23:37:00 vapier Exp $
 
 inherit flag-o-matic toolchain-funcs eutils multilib
 
@@ -13,11 +13,12 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="svga jpeg tiff png zlib"
+IUSE="svga jpeg tiff png xml zlib"
 
 DEPEND="jpeg? ( >=media-libs/jpeg-6b )
 	tiff? ( >=media-libs/tiff-3.5.5 )
 	png? ( >=media-libs/libpng-1.2.1 )
+	xml? ( dev-libs/libxml2 )
 	zlib? ( sys-libs/zlib )
 	svga? ( media-libs/svgalib )
 	media-libs/jbigkit
@@ -50,6 +51,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/netpbm-10.31-build.patch
 	epatch "${FILESDIR}"/netpbm-10.33-memmem.patch
+	epatch "${FILESDIR}"/netpbm-10.34-xml2.patch #137871
 
 	rm -f configure
 	cp Makefile.config.in Makefile.config
@@ -75,6 +77,7 @@ src_unpack() {
 	PNGLIB = $(netpbm_config png)
 	ZLIB = $(netpbm_config zlib z)
 	LINUXSVGALIB = $(netpbm_config svga vga)
+	XML2_LIBS = $(netpbm_config xml xml2)
 
 	# Use system versions instead of bundled
 	JBIGLIB = -ljbig