Version bump. Include build fix by Naohiro Aota for bsd systems #341565.

Package-Manager: portage-2.2.0_alpha75/cvs/Linux x86_64

5 files changed, 217 insertions, 6 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index 2df4e3ec4616..8720dbdfa887 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/netpbm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.260 2011/11/16 09:47:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.261 2011/12/05 00:03:07 vapier Exp $
+
+*netpbm-10.56.00 (05 Dec 2011)
+
+  05 Dec 2011; Mike Frysinger <vapier@gentoo.org> +netpbm-10.56.00.ebuild,
+  +files/netpbm-10.56.00-alloca.patch, +files/make-tarball.sh:
+  Version bump. Include build fix by Naohiro Aota for bsd systems #341565.
 
   16 Nov 2011; Justin Lecher <jlec@gentoo.org> netpbm-10.51.00-r2.ebuild:
   Corrected Slotting of media-libs/tiff and media-libs/libpng
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 43a1d4f2582a..1176cd9ea60e 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,19 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
+AUX make-tarball.sh 772 RMD160 9d189e738ad60db0c5f6ee60310eef196c90fb60 SHA1 2abdb919806566f120b025e43449a03e902bc4ef SHA256 706b10492b02f441307a36ad15d0de86fded932f00d8493e2e7ebe18024aaf7f
 AUX netpbm-10.31-build.patch 1629 RMD160 4226692b199871b3bfb27a9e6fec97d8ac1a4bf6 SHA1 574bd4443c6dbd8a2508bc2d2e3096cfcc815710 SHA256 eaf363941337718390856c318c8e69114c8fb9dbcea8b07755350dbdabce6323
 AUX netpbm-10.51.00-pnmconvol-nooffset.patch 3930 RMD160 c54357f13fc1147b8020b523b9c28c5ffd381647 SHA1 e3bf297d209783bfe15d2257b47dc3ed9b492826 SHA256 d9c7f70e58d50dac4998157021ac2fef92822d1abd9b9d060384b195e4f1cabb
 AUX netpbm-10.51.00-ppmtompeg-free.patch 1199 RMD160 3e3594fc27166423904ec56c0d17e427811614cd SHA1 ebe9561fd836c930ebd417cb81f507e502b36d57 SHA256 45c0229b035e8b50f759a5aae646a60ef07f4c0fb156b4aee1dc52aa0c1cbc75
 AUX netpbm-10.51.00-underlinking.patch 657 RMD160 c95af06e30622d8eeab0138001357da44314a062 SHA1 ae55ffd420c4a3d9d1c2f6a3e255438c09535572 SHA256 f933003b9c50717d76abaf3272b9bef66b328629a8791144fd0038e692989b95
+AUX netpbm-10.56.00-alloca.patch 254 RMD160 075f2302525319868550c513547111ec5a0a3b24 SHA1 14393dd033c170b775d5dff2a7990769035bac96 SHA256 7e26ef344eb80320a63e1614f6964da7daf52bcdf276b3d83fe2115f0a4ee144
 DIST netpbm-10.51.00-libpng-1.5.patch.bz2 8120 RMD160 49ee4fe57f170ffc1fb5470440dc840f0fb5387e SHA1 a6f0c2e37a5cb051e3c9275918c7e5b34c396aa9 SHA256 260a5f0e9834e7e1aa5c2dcc292695aa43b5aa198af1cb33e5705f7cac10da7b
 DIST netpbm-10.51.00.tar.xz 1834148 RMD160 71593d33e102de72230fbc306165ecc67bbb4c4f SHA1 ae5f9393ebcc75b0914f40c93a837de98a0a71c8 SHA256 6d7bb30d1d0e7f6a23b55c6f03bbb20b539909ad84281dc944b1072656dc1d0e
+DIST netpbm-10.56.00.tar.xz 1881348 RMD160 b8eb01b9db2a91919319627335a9fc92dd5e5dad SHA1 6b1b9f8926ea7c4bc739255cf0c1d39f7751a169 SHA256 2169916c7c03bea90449f87b911a97f961565aa2b0123ab9f72b70d9429b172f
 EBUILD netpbm-10.51.00-r2.ebuild 4868 RMD160 1b4f7226fde38ccc9a8f347268a7e9e55b0835e4 SHA1 e897adebc96794d3f17973585df8c5dac28cfd28 SHA256 fc999b9493878d29aae528c049721e73b939bb42f0854598b358a6d5aee0b328
-MISC ChangeLog 36356 RMD160 f0b621f4bbe1f1812f9b981e4f9ec86933262e07 SHA1 4cf84b42e0040c2333ec1055f480b80cea724f33 SHA256 7fec55bcb6354f44d419d85bc2fca8765a4d2d147511db6adbee12b0a233f944
+EBUILD netpbm-10.56.00.ebuild 3997 RMD160 5dcad3c3798793acc90dc2520aadeb0cb1631fd6 SHA1 0eeee0f6d11560b7932e2d2245976791bebc6ffd SHA256 f532d2388d2ef0b7f2fd1bc76027ba8dda21165363779d99fd89a1d0c04fde1a
+MISC ChangeLog 36604 RMD160 cebd85fb50eb06b23657fdd0a0ec6084af06e94e SHA1 2e018f012748e7d2d86a6a1f9cf5d0bbd664d7fc SHA256 598ed39527f4ef18084ba8f32c3560d773a158af1a500b028b128841b4169487
 MISC metadata.xml 261 RMD160 1d652dbebb408b61de2afc2d49c8356a8eebee4c SHA1 c977c691e58d2ecbf5222ecde5ba6bf9a86ad84c SHA256 e04079912e263782a8c0e4f115e49ff3694535ff2efef7b7fff85cf8d100102b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk7DhtEACgkQgAnW8HDreRbPJwCgz09H5eRHrUpJNh+Zw0f84S6J
-WGUAmwdRE966tMfY3XWDeY/Ehp1IaWPz
-=rbuY
+iF4EAREIAAYFAk7cCkoACgkQaC/OocHi7JZ6vQD8D8OkUH3xpuYV3QGFFBU4REPO
+/XrfgedYzis+3w9jU5oA/jLQGxvYUgdV1QUlS1hbhg/3YxGagMgaXrx0VcaXgq4g
+=Dixb
 -----END PGP SIGNATURE-----
diff --git a/media-libs/netpbm/files/make-tarball.sh b/media-libs/netpbm/files/make-tarball.sh
new file mode 100755
index 000000000000..176f7b74ebe6
--- /dev/null
+++ b/media-libs/netpbm/files/make-tarball.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+. /etc/init.d/functions.sh
+
+if [[ $# -eq 0 || $# -gt 2 ]] ; then
+	exec echo "Usage: $0 <version> [netpbm svn root]"
+fi
+
+PN=netpbm
+PV=$1
+P=${PN}-${PV}
+
+SVN_ROOT=${2:-/usr/local/src}
+
+T=/tmp
+
+maint_pkg_create() {
+	local base="/usr/local/src"
+	local srcdir="${base}/netpbm/release_number"
+	if [[ -d ${srcdir} ]] ; then
+		cd "${T}" || die
+
+		rm -rf ${P}
+
+		ebegin "Exporting ${srcdir}/${PV} to ${P}"
+		svn export -q ${srcdir}/${PV} ${P}
+		eend $? || return 1
+
+		ebegin "Creating ${P}.tar.xz"
+		tar cf - ${P} | xz > ${P}.tar.xz
+		eend $?
+
+		einfo "Tarball now ready at: ${T}/${P}.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
+}
+maint_pkg_create
diff --git a/media-libs/netpbm/files/netpbm-10.56.00-alloca.patch b/media-libs/netpbm/files/netpbm-10.56.00-alloca.patch
new file mode 100644
index 000000000000..218b1e769c50
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.56.00-alloca.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/341565
+
+--- a/editor/specialty/pampaintspill.c
++++ b/editor/specialty/pampaintspill.c
+@@ -42,7 +42,6 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <math.h>
+-#include <alloca.h>
+ #include <time.h>
+ 
+ #include "mallocvar.h"
diff --git a/media-libs/netpbm/netpbm-10.56.00.ebuild b/media-libs/netpbm/netpbm-10.56.00.ebuild
new file mode 100644
index 000000000000..e942cbd6a694
--- /dev/null
+++ b/media-libs/netpbm/netpbm-10.56.00.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.56.00.ebuild,v 1.1 2011/12/05 00:03:07 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="jbig? ( media-libs/jbigkit )
+	jpeg? ( virtual/jpeg )
+	jpeg2k? ( media-libs/jasper )
+	png? ( >=media-libs/libpng-1.4:0 )
+	rle? ( media-libs/urt )
+	svga? ( media-libs/svgalib )
+	tiff? ( >=media-libs/tiff-3.5.5:0 )
+	xml? ( dev-libs/libxml2 )
+	zlib? ( sys-libs/zlib )
+	X? ( x11-libs/libX11 )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	sys-devel/flex"
+
+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}"/netpbm-10.56.00-alloca.patch #341565
+
+	# make sure we use system urt
+	sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
+	rm -rf urt
+
+	# 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
+	sed -i \
+		-e '/%.c/s: importinc$::' \
+		common.mk lib/Makefile lib/util/Makefile || die
+
+	# avoid ugly depend.mk warnings
+	touch $(find . -name Makefile | sed s:Makefile:depend.mk:g)
+}
+
+src_configure() {
+	cat config.mk.in - >> 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() {
+	# Subdir make targets like to use `mkdir` all over the place
+	# without any actual dependencies, thus the -j1.
+	emake -j1 package pkgdir="${D}"/usr || die
+
+	[[ $(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
+	dodoc HISTORY Netpbm.programming USERDOC
+	dohtml -r .
+}