Version bump to fix warnings in older code #337747 by David J Cozatt. Fix parallel build issues with include dir handling #149843 by Jiri Tyr.

Package-Manager: portage-2.2_rc83/cvs/Linux x86_64

4 files changed, 203 insertions, 10 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index a75d7bd0761c..1524dc989607 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/netpbm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.243 2010/07/23 20:52:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.244 2010/09/18 14:03:58 vapier Exp $
+
+*netpbm-10.51.00 (18 Sep 2010)
+
+  18 Sep 2010; Mike Frysinger <vapier@gentoo.org> +netpbm-10.51.00.ebuild,
+  +files/netpbm-10.51.00-ppmtompeg-free.patch:
+  Version bump to fix warnings in older code #337747 by David J Cozatt. Fix
+  parallel build issues with include dir handling #149843 by Jiri Tyr.
 
   23 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
   netpbm-10.49.00.ebuild:
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 705196752f0c..bb74ff8bc889 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX netpbm-10.31-build.patch 1629 RMD160 4226692b199871b3bfb27a9e6fec97d8ac1a4bf6 SHA1 574bd4443c6dbd8a2508bc2d2e3096cfcc815710 SHA256 eaf363941337718390856c318c8e69114c8fb9dbcea8b07755350dbdabce6323
 AUX netpbm-10.35.0-pnmtopng-zlib.patch 412 RMD160 fbef74327c74badad288454090b79627e2fde0d6 SHA1 08fd7b8e17c0f272cf628582b22f9ecde0d35cc9 SHA256 577a6b5a49c8773ca29adb045132ee71034e3b6f4abf29ff92126adb1ba83a17
 AUX netpbm-10.35.0-xml2.patch 850 RMD160 426cc33a622b8641bdbff8e60a8418318cdee682 SHA1 ce767bd1a0fe861cc9d1a47fa0bb53b12b4a58cc SHA256 b36d159a7e3ec7377760f30e835b8b2bed6c00a9aa992562d50de5ddb6937847
@@ -6,16 +9,18 @@ AUX netpbm-10.46.00-min_DCT_v_scaled_size.patch 1022 RMD160 8b3370958c504c9330dc
 AUX netpbm-10.48.00-pngx.patch 1149 RMD160 387a1f7df51b457eb2a87c32b7ac60a499249c82 SHA1 0823541f93d804f17d6e7512c5f7e9facc4558d6 SHA256 86ffe862542e882db61d4e32ae49c78e1f6056df42eaa44ffe8e43867c27ce74
 AUX netpbm-10.48.00-pnmtopng-zlib.patch 419 RMD160 d4e51baf414ee3ca3ed2c1e8ba186bfa3be7a9dd SHA1 0cc0892bde1384b34d37fe1085866e4b919c0cb3 SHA256 29031875887a03adc503a2f6d5965a8b4eb1e82a1def98d9e3a6fb4250285897
 AUX netpbm-10.49.00-sigpower.patch 719 RMD160 ef830e01c14424a8b1d2f8e149d12a601c397c83 SHA1 b765c7e1d8a3148557dcbc49c26d77a8a6ec05d8 SHA256 b4a5304f36384a2f96e5c208089230c7190dc06cb99beccfe826520234f9c6fe
+AUX netpbm-10.51.00-ppmtompeg-free.patch 565 RMD160 038a02a0a5fabf0c30ecdce7e3aea46048655de1 SHA1 6aac3454b5dd1049a854b9c5c8e1c63152a46308 SHA256 454a7517042375fad994fe47e69480fa4b2957b59b6f91e7f782e694551ca842
 DIST netpbm-10.33-manpages.tar.bz2 236722 RMD160 5e43836a5f4d16f1ba5ece21e9996dbe60b252ae SHA1 6c0372f540ad040771beae15a8c2015252679e5f SHA256 aa18adee4a187ad5df243cb1a7c51097dc6a7d6a8072cf6da09972b74ac5454a
-DIST netpbm-10.35.71.tgz 2544654 RMD160 36379f1df33810cdfc3f6b3da3eaf5355f3ab8ef SHA1 3a20e4ebebc1a78830fe0da05b56545325ffba0f SHA256 73e0ca8f1adc23eeb438fb099d5a4e55899e6dd95aaddee9907a08dfa1891906
-DIST netpbm-10.35.73.tgz 2548185 RMD160 b4507ac7897227bf0fb8addceb9a14c9f4601ee8 SHA1 e498fcedbc88c618e69163cdb9fa782178a1645e SHA256 cf35edf16444dbd8e8bccf6a8b4265c1451ed4edfdd3bae45650b48c1083ba6d
-DIST netpbm-10.46.00.tar.lzma 1897731 RMD160 79230ebe58c90f9f6f7d5de13f215ac22c581c18 SHA1 0dee5f49bf1ebd5d08675db21a621f3d7ceea3d0 SHA256 598350fc2b65f268666a711ae50952573c606157727a1fe5295de9bff4e1fd3a
-DIST netpbm-10.48.00.tar.lzma 1908122 RMD160 597c1f2c7a276bf2200cc65e25218a92ef316000 SHA1 fc62507988d59b27b59b5ddc87ef441fa247ab44 SHA256 8847d09c3275528cedaf51fbb1c42b494bd53ec97d6f4681a5c297dcd5c405a7
 DIST netpbm-10.49.00.tar.lzma 1917909 RMD160 26ce43d25a1e7319627d82bfa9a8e73d3c87d1fa SHA1 72db0cff9f805a3f84766dd8add82eaa30685ed3 SHA256 4414fe9b64c695e5d750670aa6e2b03828877d653bc8806e778c1352553c7c8e
-EBUILD netpbm-10.35.71.ebuild 4357 RMD160 b314454ddf4c7d3a5dfbe59c4d6ace22a6301399 SHA1 688caaf0156a06aed0531415f0e515ca2296d5f0 SHA256 feac44588c9f767acefbb2810fbed4eea4eff1c1602439463c309ab34312b784
-EBUILD netpbm-10.35.73.ebuild 4366 RMD160 6f33358bf43bc24e2faf46488ed334dc91766821 SHA1 2db292c001c4c04f42c9be4abe0ca143d48d40cd SHA256 6f81e2d6e5c7c18959255ba353cf01ade3a4ed7f47e80a565e61cdc510f737c4
-EBUILD netpbm-10.46.00-r1.ebuild 4424 RMD160 6db996e17abba307a10df72eaacdb578788e86d6 SHA1 82c5cb191af8a3e4694597905035287fac25e812 SHA256 dbdf3237971b26b2a5e5a9a832f3670972b6f3beff51b41fa27308dc83354c9c
-EBUILD netpbm-10.48.00-r1.ebuild 4339 RMD160 3c4708c48f06ca3c1dd2c49cd290bf1ae29b74a8 SHA1 8acaec1188fa0b25d793379a9582b9490decb3bc SHA256 eb17822e7b266d63831efc54a2972297f1b2da54309a4a9e81f52ec04df4028a
+DIST netpbm-10.51.00.tar.xz 1834148 RMD160 71593d33e102de72230fbc306165ecc67bbb4c4f SHA1 ae5f9393ebcc75b0914f40c93a837de98a0a71c8 SHA256 6d7bb30d1d0e7f6a23b55c6f03bbb20b539909ad84281dc944b1072656dc1d0e
 EBUILD netpbm-10.49.00.ebuild 4308 RMD160 f92fac1b63e0d4c066d57e1085669b5196dfa58f SHA1 637e36390084ecd4bee85497f9628dcff7d7ccec SHA256 41bcaa9810b8f815876b8d00ee115ab0b7b9432f4c6f44309c0330d8973b85f0
-MISC ChangeLog 33172 RMD160 0ea2d8bbfa24311153ba7d209fad7e987378bddc SHA1 fae6dc7e63c803372a2844539b7dca576f0fee5e SHA256 7b0678e78fff8c5a181c3ffdc0e32ba231b35cc6a1ff306494e307f2db896958
+EBUILD netpbm-10.51.00.ebuild 4448 RMD160 e7dd2b8de0b4e9c6a3d447fdda0ffee2108e6d52 SHA1 987045c3a2bdaf810bf3c16e1c0c7b2facef2102 SHA256 083f0b4aeda9494e6c5b3233b7c7f2b19be86dead92ba355fb149912130a9970
+MISC ChangeLog 33471 RMD160 3337a14af6f568f6c36a94e2423f307ff41cca0d SHA1 d97996b6f5fd009688c4429cd34da706de760e72 SHA256 9d4d652e0d91dcb66177884dfce4a9c12833433434da98983eaeea124f2a6494
 MISC metadata.xml 266 RMD160 de6149ba44458a170c3f6f6d5c015a3b4e5fe3bd SHA1 bb0d212119622779ede27328c6df989b362deac3 SHA256 4db3c087a1641cf4b8ae3750db0fb27bf8ff9a4dcbe496d1c173a9f9c04df75d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iF4EAREIAAYFAkyUx5AACgkQTwhj9JtAlp6hfgEAk4sdl8wJNdkaILVmm3VqJm5F
+wNHlC9vA26afL+lFEk4A/16HCSK1UHFxsR2S3eciUoZ6j1JbqTHcjaWaJEf7s6pC
+=dMKa
+-----END PGP SIGNATURE-----
diff --git a/media-libs/netpbm/files/netpbm-10.51.00-ppmtompeg-free.patch b/media-libs/netpbm/files/netpbm-10.51.00-ppmtompeg-free.patch
new file mode 100644
index 000000000000..ee5be69c14c5
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.51.00-ppmtompeg-free.patch
@@ -0,0 +1,15 @@
+addedSourceP is a pointer to a struct declared on the stack, so we cant
+call free() on it
+
+e-mailed to upstream maintainer already
+
+--- converter/ppm/ppmtompeg/param.c
++++ converter/ppm/ppmtompeg/param.c
+@@ -295,7 +295,6 @@ mergeInputSource(struct inputSource * co
+         baseSourceP->inputFileEntries[baseSourceP->numInputFileEntries++] =
+             addedSourceP->inputFileEntries[i];
+ 
+-    free(addedSourceP);
+     /* Note the space allocated for the *addedSourceP input file
+        entries themselves is still allocated, and used by 
+        *baseSourceP.
diff --git a/media-libs/netpbm/netpbm-10.51.00.ebuild b/media-libs/netpbm/netpbm-10.51.00.ebuild
new file mode 100644
index 000000000000..cf7d2dd07470
--- /dev/null
+++ b/media-libs/netpbm/netpbm-10.51.00.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.51.00.ebuild,v 1.1 2010/09/18 14:03:58 vapier Exp $
+
+EAPI="3"
+
+inherit toolchain-funcs eutils multilib
+
+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.xz"
+
+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 X xml zlib"
+
+RDEPEND="jpeg? ( virtual/jpeg )
+	jpeg2k? ( media-libs/jasper )
+	tiff? ( >=media-libs/tiff-3.5.5 )
+	png? ( >=media-libs/libpng-1.4 )
+	xml? ( dev-libs/libxml2 )
+	zlib? ( sys-libs/zlib )
+	svga? ( media-libs/svgalib )
+	jbig? ( media-libs/jbigkit )
+	rle? ( media-libs/urt )
+	X? ( x11-libs/libX11 )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	app-arch/xz-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.xz"
+		tar cf - netpbm-${PV} | xz > netpbm-${PV}.tar.xz
+		eend $?
+
+		einfo "Tarball now ready at: ${T}/netpbm-${PV}.tar.xz"
+	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.xz ]] && 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_prepare() {
+	epatch "${FILESDIR}"/netpbm-10.31-build.patch
+	epatch "${FILESDIR}"/${P}-ppmtompeg-free.patch
+
+	# make sure we use system urt
+	echo all: > urt/Makefile || die
+
+	# take care of the importinc stuff ourselves by only doing it once
+	# at the top level and having all subdirs use that one set #149843
+	sed -i \
+		-e '/^importinc:/s|^|importinc:\nmanual_|' \
+		-e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\
+		common.mk || die
+
+	# avoid ugly depend.mk warnings
+	touch $(find . -name Makefile | sed s:Makefile:depend.mk:g)
+}
+
+src_configure() {
+	cat config.mk.in /dev/stdin >> config.mk <<-EOF
+	# Misc crap
+	BUILD_FIASCO = N
+	SYMLINK = ln -sf
+
+	# Toolchain options
+	CC = $(tc-getCC) -Wall
+	LD = \$(CC)
+	CC_FOR_BUILD = $(tc-getBUILD_CC)
+	LD_FOR_BUILD = \$(CC_FOR_BUILD)
+	AR = $(tc-getAR)
+	RANLIB = $(tc-getRANLIB)
+
+	STRIPFLAG =
+	CFLAGS_SHLIB = -fPIC
+
+	LDRELOC = \$(LD) -r
+	LDSHLIB = $(netpbm_ldshlib)
+	LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to
+	LINKERISCOMPILER = Y
+	NETPBMLIBSUFFIX = $(netpbm_libsuffix)
+	NETPBMLIBTYPE = $(netpbm_libtype)
+
+	# 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 =
+	X11LIB = $(netpbm_config X X11)
+	X11HDR_DIR =
+	EOF
+	# cannot chain the die with the heredoc above as bash-3
+	# has a parser bug in that setup #282902
+	[ $? -eq 0 ] || die "writing config.mk failed"
+}
+
+src_compile() {
+	emake -j1 pm_config.h version.h manual_importinc || die #149843
+	emake || die
+}
+
+src_install() {
+	emake 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 "${D}"/usr/bin/{doc.url,manweb} || die
+	rm -r "${D}"/usr/man/web || die
+	rm -r "${D}"/usr/link || die
+	rm "${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 .
+}