Fix tifftopnm #109781 and anytopnm/pngtopnm #109783 (both by Erik Thiele).

Package-Manager: portage-2.0.53_rc6

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index 5e1eff2b8d2d0f1524838b42b3d09d5d0fdb7de9..f4d2dde0212037e6f2aa0d095bc3467ba764fd90 100644 (file)
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,10 +1,13 @@
 # ChangeLog for media-libs/netpbm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.83 2005/10/29 08:41:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.84 2005/10/30 01:59:21 vapier Exp $
 
-  29 Oct 2005; Mike Frysinger <vapier@gentoo.org>
-  +files/netpbm-10.30-anytopnm.patch, netpbm-10.30.ebuild:
-  Fix anytopnm as pointed out by Erik Thiele in #109781.
+*netpbm-10.30-r1 (30 Oct 2005)
+
+  30 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/netpbm-10.30-pngtopnm.patch, +files/netpbm-10.30-tifftopnm.patch,
+  +files/netpbm-10.30-anytopnm.patch, +netpbm-10.30-r1.ebuild:
+  Fix anytopnm/tifftopnm #109781 and pngtopnm #109783 (both by Erik Thiele).
 
 *netpbm-10.26.17 (29 Oct 2005)
 

diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 0d8f2df783b09a6ee1e7dfddabab57d7263a0e30..72cce9068f04f16bbf582ea3d8a002a583154c0b 100644 (file)
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,29 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 fcd07de03c3338e6f4eb5e034f348be5 ChangeLog 11980
+MD5 75c947c6a483c52cc0bd0be6852dca4b ChangeLog 12111
 MD5 0a45793fc070f81d4d6f6806706a8a57 files/digest-netpbm-10.26.17 139
 MD5 c6c3222383568021fbbdc34114b6f279 files/digest-netpbm-10.28 62
 MD5 8c4a20ca06c83687436b8cb75917d5f1 files/digest-netpbm-10.29 62
 MD5 e03ba0a74da10891ecaa41fb86191275 files/digest-netpbm-10.29-r1 136
-MD5 af57721491b0a7cd11ccba542d8e20c6 files/digest-netpbm-10.30 136
+MD5 af57721491b0a7cd11ccba542d8e20c6 files/digest-netpbm-10.30-r1 136
 MD5 3e364cbe32c6c5bd2f329b8dbcf604d5 files/netpbm-10.29-anytopnm.patch 1562
 MD5 e3ef1ff99bf9335b47ea62db7416b625 files/netpbm-10.29-build.patch 2283
 MD5 103e8f6f6474dcc4b17ee049111bc3f6 files/netpbm-10.29-infinity.patch 5840
 MD5 d0d44fe5de727324db35e8110dc81f63 files/netpbm-10.29-pnmtopng-alpha-check.patch 603
 MD5 d54a93389a63382e459a5aa153484b46 files/netpbm-10.30-anytopnm.patch 1434
 MD5 c63d12c2c7deaafa4fcddb6035b34169 files/netpbm-10.30-build.patch 2276
+MD5 2dd6e3d7a2601a35259474344f7feb20 files/netpbm-10.30-pngtopnm.patch 417
+MD5 87a9972b59b90f26620b09ad990a8546 files/netpbm-10.30-tifftopnm.patch 373
 MD5 ef9c07e7cbf6b830f8dd61e59fb0a34b files/netpbm-dSAFER.patch 818
 MD5 e1f6c302199a36c1be4ecf1654be9bac metadata.xml 224
 MD5 dd5dad8f02465203f9d2aa46d3aee51b netpbm-10.26.17.ebuild 2799
 MD5 4ff1d95265184a7c760d4748a4cb1beb netpbm-10.28.ebuild 2460
 MD5 4b1a6bc24bd0b85afb5756e7c1e218e8 netpbm-10.29-r1.ebuild 2937
 MD5 44a56191027bdda13f3bd51f336a971a netpbm-10.29.ebuild 2423
-MD5 bde29df5f2df4f0fc7dfa96aeeddb7ca netpbm-10.30.ebuild 2846
+MD5 a73492e4059cb1e6edbc85859cac0fea netpbm-10.30-r1.ebuild 2950
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDYzXhgIKl8Uu19MoRAuZ4AJwPbpgm6rYftFfY5m1dZ4UmFpuJvACfcptj
-5IgKCxqh2xPd9BEf0kpZpK4=
-=qjjh
+iD8DBQFDZCkQgIKl8Uu19MoRAl4yAJ9hjl2uTjC70ZEu6eEn7fmXZs1p1gCePIuA
+7lhJPGj32oM96iQMgdBakYQ=
+=KlkN
 -----END PGP SIGNATURE-----

diff --git a/media-libs/netpbm/files/digest-netpbm-10.30-r1 b/media-libs/netpbm/files/digest-netpbm-10.30-r1
new file mode 100644 (file)
index 0000000..130f028
--- /dev/null
+++ b/media-libs/netpbm/files/digest-netpbm-10.30-r1
@@ -0,0 +1,2 @@
+MD5 2d90a47369f74692aa24b773dfd6a122 netpbm-10.30-manpages.tar.bz2 233254
+MD5 f84620e2733fb13eebe1394948077342 netpbm-10.30.tgz 2370761

diff --git a/media-libs/netpbm/files/netpbm-10.30-pngtopnm.patch b/media-libs/netpbm/files/netpbm-10.30-pngtopnm.patch
new file mode 100644 (file)
index 0000000..236096c
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.30-pngtopnm.patch
@@ -0,0 +1,13 @@
+Fix from upstream for http://bugs.gentoo.org/109783
+
+--- converter/other/pngtopnm.c
++++ converter/other/pngtopnm.c
+@@ -722,7 +722,7 @@
+     if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY ||
+         info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+ 
+-        retval = TRUE;
++        retval = FALSE;
+     else if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) {
+         bool foundColor;
+         unsigned int i;

diff --git a/media-libs/netpbm/files/netpbm-10.30-tifftopnm.patch b/media-libs/netpbm/files/netpbm-10.30-tifftopnm.patch
new file mode 100644 (file)
index 0000000..edf67c1
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.30-tifftopnm.patch
@@ -0,0 +1,14 @@
+Fix for http://bugs.gentoo.org/109781
+
+--- converter/other/tifftopnm.c
++++ converter/other/tifftopnm.c
+@@ -108,6 +108,9 @@
+     unsigned int option_def_index;
+     unsigned int alpha_spec;
+ 
++    /* make sure we init in case some options werent provided */
++    cmdlineP->alphaFilename = NULL;
++
+     MALLOCARRAY_NOFAIL(option_def, 100);
+ 
+     opt.opt_table = option_def;

diff --git a/media-libs/netpbm/netpbm-10.30-r1.ebuild b/media-libs/netpbm/netpbm-10.30-r1.ebuild
new file mode 100644 (file)
index 0000000..1ed016f
--- /dev/null
+++ b/media-libs/netpbm/netpbm-10.30-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.30-r1.ebuild,v 1.1 2005/10/30 01:59:21 vapier Exp $
+
+inherit flag-o-matic toolchain-funcs eutils multilib
+
+MAN_VER=${PV}
+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 ~hppa ~ia64 ~mips ~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.30-build.patch
+       epatch "${FILESDIR}"/netpbm-10.30-anytopnm.patch
+       epatch "${FILESDIR}"/netpbm-10.30-pngtopnm.patch
+       epatch "${FILESDIR}"/netpbm-10.30-tifftopnm.patch
+
+       rm -f configure
+       cp Makefile.config.in Makefile.config
+       cat >> Makefile.config <<-EOF
+       # Gentoo toolchain options
+       CC = $(tc-getCC)
+       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
+
+       # Sparc support ...
+       replace-flags -mcpu=ultrasparc "-mcpu=v8 -mtune=ultrasparc"
+       replace-flags -mcpu=v9 "-mcpu=v8 -mtune=v9"
+}
+
+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
+}