Apply fix from upstream for fontdir bug #249384.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28 x86_64

4 files changed, 214 insertions, 5 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index 4e35f1375ea5..e2d8c9d85ca8 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/netpbm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.202 2009/01/21 22:55:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.203 2009/01/21 22:56:05 vapier Exp $
+
+*netpbm-10.44.00-r1 (21 Jan 2009)
+
+  21 Jan 2009; Mike Frysinger <vapier@gentoo.org>
+  +files/netpbm-10.44.00-fontdir.patch, +netpbm-10.44.00-r1.ebuild:
+  Apply fix from upstream for fontdir bug #249384.
 
 *netpbm-10.26.59 (21 Jan 2009)
 
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 1c0caf9c2276..8ab3f602da28 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -5,20 +5,24 @@ AUX netpbm-10.30-build.patch 2276 RMD160 aa69ccc2d3e332b4fa50e33621ead91f95a124e
 AUX netpbm-10.31-build.patch 1629 RMD160 4226692b199871b3bfb27a9e6fec97d8ac1a4bf6 SHA1 574bd4443c6dbd8a2508bc2d2e3096cfcc815710 SHA256 eaf363941337718390856c318c8e69114c8fb9dbcea8b07755350dbdabce6323
 AUX netpbm-10.35.0-xml2.patch 850 RMD160 426cc33a622b8641bdbff8e60a8418318cdee682 SHA1 ce767bd1a0fe861cc9d1a47fa0bb53b12b4a58cc SHA256 b36d159a7e3ec7377760f30e835b8b2bed6c00a9aa992562d50de5ddb6937847
 AUX netpbm-10.42.0-gcc43.patch 541 RMD160 4162fc8f0020941d9072ce595a4586a8a9f2159e SHA1 aebb30f5196d88acd8156f6954bf2c2903700aa3 SHA256 259f194d7d55742d2d7d0915f57814642e059890157eef1eeb3c5c2ba511ef86
+AUX netpbm-10.44.00-fontdir.patch 1120 RMD160 9fee334109a2dc6922dbc5c1b000077434f21e6b SHA1 08d05597f3afa38ac2a5e4bc383d409f8f848503 SHA256 22ae6474afc747e3163c61b128ea92cd138b656cedae8a79c8b1ab67e335fc14
 DIST netpbm-10.26.58.tgz 2550354 RMD160 29695ca9ef5cca1e147a3bbb5b0d60fe5a6fca5d SHA1 663baa755e8336622cff48009435503119fbce00 SHA256 9f55e41b13a6a27de07033506a870aa6a0fe288faff8958e338eb5a4ea468360
+DIST netpbm-10.26.59.tgz 2544733 RMD160 05b7d4b4d29e120239eaee6ba55cbba96da7f8af SHA1 3fe1349c285a12b936c39f6b49ef3baa73de4def SHA256 a63416cecd9c88bad57f035e54ae9ca5ba5f48dd434869d5555593d511a0b60b
 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.43.00.tar.lzma 1870919 RMD160 ab7efe1f7239a8dba1609767e959016da9143b2f SHA1 961828c75ba6cc2afbb42a1ba12383df412daee9 SHA256 35dfd184e405bd2aa723a7ace17d70931b103c17f2aba84fd0ef614c33fe66b6
 DIST netpbm-10.44.00.tar.lzma 1880748 RMD160 8da4bc01241c3b281f63f2105292af8efe492bfb SHA1 6f5d59b878fdebcb3d7243392b56b4d79dc299b5 SHA256 84c9212e3fd6cde274301de1ef063061bfbac050ee57554ccaf29aa657d86a49
 EBUILD netpbm-10.26.58.ebuild 2895 RMD160 8a8fee01473d703ec0ea85622bf05d169739d51a SHA1 57bcff40f9ac1d1800da768b7f4ddca6536fa435 SHA256 a4db977a55259e1348e2fc1e57cc8a954b51a57201a95bfc59a2b85fe7e49fc6
+EBUILD netpbm-10.26.59.ebuild 2895 RMD160 b0403bdea6bfbf2da6ed88983904e6f6d79c1594 SHA1 11b63292a24f725b9e5d981e1cada6246c77b3bc SHA256 ad7c2f01044afeff466a339f4549b080371fc7db337da65e394aa62fb0921765
 EBUILD netpbm-10.43.00.ebuild 3927 RMD160 0138350a176529084e647f4feab0cb898805e42f SHA1 0dd67797e46e0a1508152cec58fa4f4157d25b34 SHA256 33cdda1b5a77013f40c4132cc8fedecfddb66b493b022930ed3d9d4bb971a2cd
+EBUILD netpbm-10.44.00-r1.ebuild 4004 RMD160 e2f24e469c94400e995b6d6bb106738d0feee1ab SHA1 aefd961f857e0a11b395a82503d00674291a08c1 SHA256 ef4c97dfb833dec8499b9733d399b072f57868a06a1d8c080ba6e87c6736d34e
 EBUILD netpbm-10.44.00.ebuild 3938 RMD160 ca0228359bd7d52482606e99e21f885295d62a4e SHA1 75f27f95e8e96a7ae36e6f6bae316c647997d5e6 SHA256 9052b77de00a06cfef6e72823a859a590bae101eadc16e62a22753e950588c00
-MISC ChangeLog 27183 RMD160 ed066d90e904f6e9b303fcf98ad333ee80bf9785 SHA1 049f7d9239c7791086b3e4ea0f40d2f9b265e9a8 SHA256 1b56e42306f7f657d469f88ac30c1e249a551c61bf5863dffd4b8f784ef641ee
+MISC ChangeLog 27420 RMD160 004e3835e33bc2048de4e515edb50f67bfd0d8ba SHA1 8e094f5fa44ce054709bdbdc6141a96c427189b6 SHA256 8be75322550ab58d540d513a21e7291cbed962ee89229b54e5001c1e281bd8b2
 MISC metadata.xml 266 RMD160 de6149ba44458a170c3f6f6d5c015a3b4e5fe3bd SHA1 bb0d212119622779ede27328c6df989b362deac3 SHA256 4db3c087a1641cf4b8ae3750db0fb27bf8ff9a4dcbe496d1c173a9f9c04df75d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkODE4ACgkQ67wieSYcaxccCwCdGgLDhPI9Zjg7gfSNruzyl78T
-4wkAoMAm1T4dz3sX9Jov8HJ/hM+LvvGD
-=/wV0
+iEYEARECAAYFAkl3qAoACgkQn/5bYzqsSmHDogCgmbmDPmT0a51/RaSpXcp3PdOf
+EpgAn0xpihIW7vbvhEJKECqHc4S1o/E+
+=EYfR
 -----END PGP SIGNATURE-----
diff --git a/media-libs/netpbm/files/netpbm-10.44.00-fontdir.patch b/media-libs/netpbm/files/netpbm-10.44.00-fontdir.patch
new file mode 100644
index 000000000000..35c4a17b5d7e
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.44.00-fontdir.patch
@@ -0,0 +1,50 @@
+fix from upstream
+
+http://bugs.gentoo.org/249384#c6
+
+Index: converter/ppm/picttoppm.c
+===================================================================
+--- converter/ppm/picttoppm.c	(revision 811)
++++ converter/ppm/picttoppm.c	(revision 812)
+@@ -4056,6 +4056,23 @@
+ 
+ 
+ 
++static void
++loadDefaultFontDir(void) {
++/*----------------------------------------------------------------------------
++   Load the fonts from the font directory file "fontdir" (in the current
++   directory), if it exists.
++-----------------------------------------------------------------------------*/
++    struct stat statbuf;
++    int rc;
++
++    rc = stat("fontdir", &statbuf);
++    
++    if (rc == 0)
++        load_fontdir("fontdir");
++}
++
++
++
+ int
+ main(int argc, char * argv[]) {
+     int argn;
+@@ -4092,8 +4109,6 @@
+         ++argn;
+     }
+ 
+-    load_fontdir("fontdir");
+-
+     if (argn < argc) {
+         ifp = pm_openr(argv[argn]);
+         ++argn;
+@@ -4103,6 +4118,8 @@
+     if (argn != argc)
+         pm_usage(usage);
+ 
++    loadDefaultFontDir();
++
+     if (header) {
+         stage = "Reading 512 byte header";
+         skip(512);
diff --git a/media-libs/netpbm/netpbm-10.44.00-r1.ebuild b/media-libs/netpbm/netpbm-10.44.00-r1.ebuild
new file mode 100644
index 000000000000..ce9d9dd3316a
--- /dev/null
+++ b/media-libs/netpbm/netpbm-10.44.00-r1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.44.00-r1.ebuild,v 1.1 2009/01/21 22:56:05 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.lzma
+	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="jbig jpeg jpeg2k png rle svga tiff xml zlib"
+
+RDEPEND="jpeg? ( >=media-libs/jpeg-6b )
+	jpeg2k? ( media-libs/jasper )
+	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 )
+	jbig? ( media-libs/jbigkit )
+	rle? ( media-libs/urt )"
+DEPEND="${RDEPEND}
+	app-arch/lzma-utils"
+
+maint_pkg_create() {
+	local base="/usr/local/src"
+	local srcdir="${base}/netpbm/release_number"
+	if [[ -d ${srcdir} ]] ; then
+		cd "${T}" || die
+
+		ebegin "Exporting ${srcdir}/${PV} to netpbm-${PV}"
+		svn export -q ${srcdir}/${PV} netpbm-${PV}
+		eend $? || return 1
+
+		ebegin "Creating netpbm-${PV}.tar.lzma"
+		tar cf - netpbm-${PV} | lzma > netpbm-${PV}.tar.lzma
+		eend $?
+
+		einfo "Tarball now ready at: ${T}/netpbm-${PV}.tar.lzma"
+	else
+		einfo "You need to run:"
+		einfo " cd ${base}"
+		einfo " svn co https://netpbm.svn.sourceforge.net/svnroot/netpbm"
+		die "need svn checkout dir"
+	fi
+}
+pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} && ! -e ${DISTDIR}/${P}.tar.lzma ]] && maint_pkg_create ; }
+
+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() {
+	if use $1 ; then
+		[[ $2 != "!" ]] && echo -l${2:-$1}
+	else
+		echo NONE
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/netpbm-10.31-build.patch
+	epatch "${FILESDIR}"/netpbm-10.35.0-xml2.patch #137871
+	epatch "${FILESDIR}"/netpbm-10.44.00-fontdir.patch #249384#c6
+
+	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)
+	JBIGLIB = -ljbig
+	JBIGHDR_DIR = $(netpbm_config jbig "!")
+	JASPERLIB = -ljasper
+	JASPERHDR_DIR = $(netpbm_config jpeg2k "!")
+	URTLIB = $(netpbm_config rle)
+	URTHDR_DIR =
+	EOF
+}
+
+src_compile() {
+	replace-flags -mcpu=ultrasparc "-mcpu=v8 -mtune=ultrasparc"
+	replace-flags -mcpu=v9 "-mcpu=v8 -mtune=v9"
+
+	emake -j1 || die
+}
+
+src_install() {
+	emake -j1 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} || die
+	rm -r "${D}"/usr/man/web || die
+	rm -r "${D}"/usr/link || die
+	rm -f "${D}"/usr/{README,VERSION,config_template,pkginfo} || die
+	dodir /usr/share
+	mv "${D}"/usr/man "${D}"/usr/share/ || die
+	mv "${D}"/usr/misc "${D}"/usr/share/netpbm || die
+
+	dodoc README
+	cd doc
+	GLOBIGNORE='*.html:.*' dodoc *
+	dohtml -r .
+
+	cd "${WORKDIR}"/${PN}-${MAN_VER}-manpages || die
+	doman *.[0-9]
+	dodoc README* gen-netpbm-manpages
+}