Version bump.

Package-Manager: portage-2.1.1

5 files changed, 194 insertions, 12 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index ce936c6cd409..a0bce6977fba 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,12 @@
 # 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.128 2006/09/06 14:19:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.129 2006/09/11 06:45:10 vapier Exp $
+
+*netpbm-10.35.0 (11 Sep 2006)
+
+  11 Sep 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/netpbm-10.35.0-xml2.patch, +netpbm-10.35.0.ebuild:
+  Version bump.
 
 *netpbm-10.26.31 (06 Sep 2006)
 
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index d0c67ae0576c..b03b2e8abe33 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -21,22 +21,31 @@ AUX netpbm-10.34-xml2.patch 988 RMD160 3875b151e1688cdc6caef52dd36ffb14a3a9c1ab
 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
+AUX netpbm-10.35.0-xml2.patch 850 RMD160 426cc33a622b8641bdbff8e60a8418318cdee682 SHA1 ce767bd1a0fe861cc9d1a47fa0bb53b12b4a58cc SHA256 b36d159a7e3ec7377760f30e835b8b2bed6c00a9aa992562d50de5ddb6937847
+MD5 1505c38760a92008a8de01390f575fdf files/netpbm-10.35.0-xml2.patch 850
+RMD160 426cc33a622b8641bdbff8e60a8418318cdee682 files/netpbm-10.35.0-xml2.patch 850
+SHA256 b36d159a7e3ec7377760f30e835b8b2bed6c00a9aa992562d50de5ddb6937847 files/netpbm-10.35.0-xml2.patch 850
 DIST netpbm-10.26.31.tgz 2541053 RMD160 3de542779a3d4ffc5b66c1f2680d4aafe8fa7dd2 SHA1 80bcfa1dc7c54a986188e1cf0698ba0ee04af2e0 SHA256 db57e60013a73c85b721ac3429602f340d68d984cb700bb7f91ce6c5cb10f649
 DIST netpbm-10.30-manpages.tar.bz2 233254 RMD160 6312e1486f473f57332a5dc050a03ac1dfce7f47 SHA1 a1893e67380029ddbb76a1451833a134f4d42818 SHA256 75eb6ceaebafffb6a2d608d49f2b61c5049e5795976bbfb2d55608de1f858124
 DIST netpbm-10.33-manpages.tar.bz2 236722 RMD160 5e43836a5f4d16f1ba5ece21e9996dbe60b252ae SHA1 6c0372f540ad040771beae15a8c2015252679e5f SHA256 aa18adee4a187ad5df243cb1a7c51097dc6a7d6a8072cf6da09972b74ac5454a
 DIST netpbm-10.34.tgz 2507007 RMD160 57a596efa6cacb981135d554a72cbaffc4cfe72c SHA1 530458871f9d3dc763a1bf82f227eeb79098c601 SHA256 b1e0a35be36e763e85c68b47806e7e1abf431f68289dd108923384b77ded785b
-EBUILD netpbm-10.26.31.ebuild 2803 RMD160 65d3a6843ba3cff11d87a900d8c1f424ede5faf0 SHA1 b5e53d0c6fba4ca0d21f2e73272f42670a61f38b SHA256 38233f970dbd54cbe7299c5701ac34c733f0794e3fb9cc25486acc1c26d5d62a
-MD5 6032f62df8339c5a41e0f2e3a89d9efc netpbm-10.26.31.ebuild 2803
-RMD160 65d3a6843ba3cff11d87a900d8c1f424ede5faf0 netpbm-10.26.31.ebuild 2803
-SHA256 38233f970dbd54cbe7299c5701ac34c733f0794e3fb9cc25486acc1c26d5d62a netpbm-10.26.31.ebuild 2803
+DIST netpbm-10.35.0.tar.bz2 2108163 RMD160 31ef604122d5c41fb157631000a0f62f95cf3a41 SHA1 b27547f371267e39ca2b5e87c3119c88ec1804e0 SHA256 961f1bafa39c3b79c207a410a553fafdfce6faf136eaa1cd3d890275debff058
+EBUILD netpbm-10.26.31.ebuild 2804 RMD160 ec8d7970099e8dd06ca92fb7f160a00df95a0089 SHA1 7fddc8e21ee8d113508e37f355242742472cd0eb SHA256 a32f5f4e8775bfa8120fc7d593c939c33f16255f0da24bc02bca8e387738cd70
+MD5 1ee8dd04df8583b5b3296d7ceb23c1ef netpbm-10.26.31.ebuild 2804
+RMD160 ec8d7970099e8dd06ca92fb7f160a00df95a0089 netpbm-10.26.31.ebuild 2804
+SHA256 a32f5f4e8775bfa8120fc7d593c939c33f16255f0da24bc02bca8e387738cd70 netpbm-10.26.31.ebuild 2804
 EBUILD netpbm-10.34.ebuild 3147 RMD160 4f3b2100699344cabad84617f4946e8799cad9b3 SHA1 62e5294d44c90c3d77f67146c30a02c3efee7567 SHA256 a34cc23ae5f6f7ba84a72535e61782c808dc3effe371094c6c5e2b3707d51585
 MD5 814648da948a26619804efb4744a5576 netpbm-10.34.ebuild 3147
 RMD160 4f3b2100699344cabad84617f4946e8799cad9b3 netpbm-10.34.ebuild 3147
 SHA256 a34cc23ae5f6f7ba84a72535e61782c808dc3effe371094c6c5e2b3707d51585 netpbm-10.34.ebuild 3147
-MISC ChangeLog 18340 RMD160 1bb57f12ff36397e5033e0817064cd07b11ef656 SHA1 0428f511ad5a2b164671761811a3556990804e8b SHA256 c9577429d99d3a420b764c83ec628054e325b9561cd083a7b17c877613ab42c9
-MD5 77cb519af9bb31030dd03bd9f5178917 ChangeLog 18340
-RMD160 1bb57f12ff36397e5033e0817064cd07b11ef656 ChangeLog 18340
-SHA256 c9577429d99d3a420b764c83ec628054e325b9561cd083a7b17c877613ab42c9 ChangeLog 18340
+EBUILD netpbm-10.35.0.ebuild 3049 RMD160 4e2f9effc2194b099b9ba85d72aa8d4165ad2966 SHA1 c76d830b067593a986835f54c4b5f69c9d5084d2 SHA256 694c4113c83e834d929a4fa38ad4358eb77c66ad3d4c36673600a8818669e410
+MD5 38766f3c3311b46777c428e4051ef635 netpbm-10.35.0.ebuild 3049
+RMD160 4e2f9effc2194b099b9ba85d72aa8d4165ad2966 netpbm-10.35.0.ebuild 3049
+SHA256 694c4113c83e834d929a4fa38ad4358eb77c66ad3d4c36673600a8818669e410 netpbm-10.35.0.ebuild 3049
+MISC ChangeLog 18498 RMD160 e16e4a82f1d34b88c0d692f28d14568e16cc99ac SHA1 d8f127ab4383145421e22c540b05f505ba0d9a68 SHA256 fdfa8aec5aa5a0e45d158ad171fa4d36010b4de97b14929236e9523b73490e4a
+MD5 f31541cfec1eace9a48be56ffe545cfa ChangeLog 18498
+RMD160 e16e4a82f1d34b88c0d692f28d14568e16cc99ac ChangeLog 18498
+SHA256 fdfa8aec5aa5a0e45d158ad171fa4d36010b4de97b14929236e9523b73490e4a ChangeLog 18498
 MISC metadata.xml 224 RMD160 b7bf7da46cd75283f29d006f5d6854890a3d8aab SHA1 222093833f902db8f97b1e4b00ad402caf7f9c78 SHA256 06e3a779a82014f8783ebfc67e1b11107bcb670aacdf1f81faa361642046ba23
 MD5 e1f6c302199a36c1be4ecf1654be9bac metadata.xml 224
 RMD160 b7bf7da46cd75283f29d006f5d6854890a3d8aab metadata.xml 224
@@ -47,10 +56,13 @@ SHA256 54aa10176140a79ae5f9a3f347725ed9719d2f70e8205d2537206ced55176f54 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
+MD5 6c38193545c977d16c142232648c8c25 files/digest-netpbm-10.35.0 518
+RMD160 7f7cffdb59f299f34fecfe7c6445a578f71fe6ec files/digest-netpbm-10.35.0 518
+SHA256 8be7e9429cf125ffb8a183712c00d6b6b71f902485f1330c604575ac6b995fd0 files/digest-netpbm-10.35.0 518
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE/tkVamhnQswr0vIRAvqTAJoDzuR86a/pg8UwCnxrCAJ6qDCe2gCcD7xo
-9em9bFWP1ZSzYV1swiVbx2E=
-=AmBI
+iD8DBQFFBQYLamhnQswr0vIRAouzAJ46g2kbWp/pbn7UzpcaDTCI5iUzLwCgvGG3
+HO58Ii8D6sSf5ofKn743gWU=
+=iRok
 -----END PGP SIGNATURE-----
diff --git a/media-libs/netpbm/files/digest-netpbm-10.35.0 b/media-libs/netpbm/files/digest-netpbm-10.35.0
new file mode 100644
index 000000000000..5aa8d0a4de1c
--- /dev/null
+++ b/media-libs/netpbm/files/digest-netpbm-10.35.0
@@ -0,0 +1,6 @@
+MD5 61a2d777a3eb0ce803bf021c7b99076f netpbm-10.33-manpages.tar.bz2 236722
+RMD160 5e43836a5f4d16f1ba5ece21e9996dbe60b252ae netpbm-10.33-manpages.tar.bz2 236722
+SHA256 aa18adee4a187ad5df243cb1a7c51097dc6a7d6a8072cf6da09972b74ac5454a netpbm-10.33-manpages.tar.bz2 236722
+MD5 1eb3f50a384964ea60c8d28e39056ad1 netpbm-10.35.0.tar.bz2 2108163
+RMD160 31ef604122d5c41fb157631000a0f62f95cf3a41 netpbm-10.35.0.tar.bz2 2108163
+SHA256 961f1bafa39c3b79c207a410a553fafdfce6faf136eaa1cd3d890275debff058 netpbm-10.35.0.tar.bz2 2108163
diff --git a/media-libs/netpbm/files/netpbm-10.35.0-xml2.patch b/media-libs/netpbm/files/netpbm-10.35.0-xml2.patch
new file mode 100644
index 000000000000..2dcc74fc6bab
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.35.0-xml2.patch
@@ -0,0 +1,38 @@
+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
+--- 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.35.0.ebuild b/media-libs/netpbm/netpbm-10.35.0.ebuild
new file mode 100644
index 000000000000..8e31cb5a277f
--- /dev/null
+++ b/media-libs/netpbm/netpbm-10.35.0.ebuild
@@ -0,0 +1,120 @@
+# 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.35.0.ebuild,v 1.1 2006/09/11 06:45:10 vapier Exp $
+
+inherit flag-o-matic toolchain-funcs eutils multilib
+
+MAN_VER=10.33
+DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
+HOMEPAGE="http://netpbm.sourceforge.net/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	mirror://gentoo/${PN}-${MAN_VER}-manpages.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+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
+	media-libs/jasper
+	media-libs/urt"
+
+netpbm_libtype() {
+	case ${CHOST} in
+		*-darwin*) echo dylib;;
+		*)         echo unixshared;;
+	esac
+}
+netpbm_libsuffix() {
+	local suffix=$(get_libname)
+	echo ${suffix//\.}
+}
+netpbm_ldshlib() {
+	case ${CHOST} in
+		*-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';;
+		*)         echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';;
+	esac
+}
+netpbm_config() {
+	use $1 && echo -l${2:-$1} || echo NONE
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/netpbm-10.31-build.patch
+	epatch "${FILESDIR}"/netpbm-10.35.0-xml2.patch #137871
+
+	rm -f configure
+	cp Makefile.config.in Makefile.config
+	cat >> Makefile.config <<-EOF
+	# Gentoo toolchain options
+	CC = $(tc-getCC) -Wall
+	CC_FOR_BUILD = $(tc-getBUILD_CC)
+	AR = $(tc-getAR)
+	RANLIB = $(tc-getRANLIB)
+	STRIPFLAG =
+	CFLAGS_SHLIB = -fPIC
+
+	# workaround parallel build issues
+	SYMLINK = ln -sf
+
+	NETPBMLIBTYPE = $(netpbm_libtype)
+	NETPBMLIBSUFFIX = $(netpbm_libsuffix)
+	LDSHLIB = $(netpbm_ldshlib)
+
+	# Gentoo build options
+	TIFFLIB = $(netpbm_config tiff)
+	JPEGLIB = $(netpbm_config jpeg)
+	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
+	JBIGHDR_DIR =
+	JASPERLIB = -ljasper
+	JASPERHDR_DIR =
+	URTLIB = -lrle
+	URTHDR_DIR =
+	EOF
+}
+
+src_compile() {
+	replace-flags -mcpu=ultrasparc "-mcpu=v8 -mtune=ultrasparc"
+	replace-flags -mcpu=v9 "-mcpu=v8 -mtune=v9"
+
+	emake || die
+}
+
+src_install() {
+	make package pkgdir="${D}"/usr || die "make package failed"
+
+	[[ $(get_libdir) != "lib" ]] && mv "${D}"/usr/lib "${D}"/usr/$(get_libdir)
+
+	# Remove cruft that we don't need, and move around stuff we want
+	rm -f "${D}"/usr/bin/{doc.url,manweb}
+	rm -rf "${D}"/usr/man/web
+	rm -rf "${D}"/usr/link
+	rm -f "${D}"/usr/{README,VERSION,config_template,pkginfo}
+	dodir /usr/share
+	mv "${D}"/usr/man "${D}"/usr/share/
+	mv "${D}"/usr/misc "${D}"/usr/share/netpbm
+
+	dodoc README
+	cd doc
+	GLOBIGNORE='*.html:.*' dodoc *
+	dohtml -r .
+
+	cd "${WORKDIR}"/${PN}-${MAN_VER}-manpages || die
+	doman *.[0-9]
+	dodoc README* gen-netpbm-manpages
+}