Version bump.

(Portage version: 2.1_pre7-r3)

4 files changed, 142 insertions, 1 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index 3dd27a23bcbb..47d78e4563a8 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.110 2006/03/15 23:46:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.111 2006/03/31 23:30:44 vapier Exp $
+
+*netpbm-10.33 (31 Mar 2006)
+
+  31 Mar 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/netpbm-10.33-lib-objs.patch, +netpbm-10.33.ebuild:
+  Version bump.
 
 *netpbm-10.26.26 (15 Mar 2006)
 
diff --git a/media-libs/netpbm/files/digest-netpbm-10.33 b/media-libs/netpbm/files/digest-netpbm-10.33
new file mode 100644
index 000000000000..9aac08f9ec38
--- /dev/null
+++ b/media-libs/netpbm/files/digest-netpbm-10.33
@@ -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 b7292055fd825d5c132540a5fbdbe342 netpbm-10.33.tgz 2456707
+RMD160 7721314f9ef27f22a6bb034ca9e3577cff2984e5 netpbm-10.33.tgz 2456707
+SHA256 5e00e5e5390fdc7e2e5117761c853e6ea8de783bf7f21be63c611fc75d764eb8 netpbm-10.33.tgz 2456707
diff --git a/media-libs/netpbm/files/netpbm-10.33-lib-objs.patch b/media-libs/netpbm/files/netpbm-10.33-lib-objs.patch
new file mode 100644
index 000000000000..9c4c37ea885e
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.33-lib-objs.patch
@@ -0,0 +1,14 @@
+Fix building on PIC hosts (filename.o was added to LIBOBJECTS_X but this
+target wasn't updated ... so it gets built w/out -fPIC)
+
+--- lib/Makefile
++++ lib/Makefile
+@@ -184,7 +184,7 @@
+ compile.h:
+ 	$(SRCDIR)/buildtools/stamp-date >$@ || rm $@
+ 
+-util/shhopt.o util/nstring.o: FORCE
++$(LIBOBJECTS_X): FORCE
+ 	@if [ ! -d $(dir $@) ] ; then mkdir $(dir $@) ; fi
+ 	$(MAKE) -C $(dir $@) -f $(SRCDIR)/$(SUBDIR)/$(dir $@)Makefile \
+ 		SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@) 
diff --git a/media-libs/netpbm/netpbm-10.33.ebuild b/media-libs/netpbm/netpbm-10.33.ebuild
new file mode 100644
index 000000000000..22ed12e05e12
--- /dev/null
+++ b/media-libs/netpbm/netpbm-10.33.ebuild
@@ -0,0 +1,115 @@
+# 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.33.ebuild,v 1.1 2006/03/31 23:30:44 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://sourceforge/${PN}/${P}.tgz
+	mirror://gentoo/${PN}-${MAN_VER}-manpages.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="svga jpeg tiff png zlib"
+
+DEPEND="jpeg? ( >=media-libs/jpeg-6b )
+	tiff? ( >=media-libs/tiff-3.5.5 )
+	png? ( >=media-libs/libpng-1.2.1 )
+	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 '-dynamiclib -install_name $(SONAME)';;
+		*)         echo '-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.33-lib-objs.patch
+
+	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
+
+	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)
+
+	# 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
+}