revert previous commit: do not remove the super stable series

Package-Manager: portage-2.1.4.1
RepoMan-Options: --force

4 files changed, 351 insertions, 11 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index 75075b2dbfd8..c5198e65309e 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,12 +1,6 @@
 # ChangeLog for media-libs/netpbm
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.178 2008/02/08 17:58:19 maekke Exp $
-
-  08 Feb 2008; Markus Meier <maekke@gentoo.org>
-  -files/netpbm-10.26.37-headers.patch,
-  -files/netpbm-10.26.45-headers.patch, -netpbm-10.26.48.ebuild,
-  -netpbm-10.26.49.ebuild:
-  old, bug #209334
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.179 2008/02/09 22:54:18 vapier Exp $
 
 *netpbm-10.26.49 (28 Jan 2008)
 
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 3c431083fd08..fe692b4a7dd0 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,20 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX netpbm-10.26.45-headers.patch 5460 RMD160 636e91ef394d294f36ca74655424968cee6e18ae SHA1 676b02337bef6fea34e0f02b5269ac79d8fb6082 SHA256 361eb8206e3dda44d981abaceda0ea7787e77ed35b52eb5fbc79e077a193aa92
 AUX netpbm-10.30-build.patch 2276 RMD160 aa69ccc2d3e332b4fa50e33621ead91f95a124ed SHA1 d14b5144c310c9182c45cefb629f2b4e77be0058 SHA256 aa7c4dcad0fe5aa71cce357236aa859b14c3794c92c5a5b848cc31618194b174
 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
+DIST netpbm-10.26.49.tgz 2543652 RMD160 d99cdb34e0734b62fd188c4dd9aea12808a09359 SHA1 851275ae4a077c4e2ef6b0d2b5bc0c540d5f43ce SHA256 b3014a81abd9ff9850012dcda29f27d3e513bafca96e07bf8e4508fd94c7b53e
+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.37.0.tar.bz2 2097635 RMD160 240759eebb9eb7619019d55fdd5fcf7f548f6512 SHA1 73ac4325930d6d0a3779f33879e8bbf0402c4e9b SHA256 5107920e6adbecc0511f5d7c24224abc98b5872a6ce48074537314ecd83a7952
 DIST netpbm-10.40.0.tar.bz2 2126805 RMD160 17057c1bb90c90080a83726a60cc69fa0084022b SHA1 2b4c1346e142d7310f266918702121198d10f5dd SHA256 b30e71386211d6e144706c673ede113dcf11f5b481abd5836285b021800e33c7
+EBUILD netpbm-10.26.49.ebuild 2888 RMD160 ece9dbeadc7ac34c8c21b865d2faae7c84b7ff96 SHA1 08aa56d44f2b15168c4158c589a63e4c832ed678 SHA256 229ff0299c0d45350b69b08d7e841dd1e77aced7f2ca09fec0bd3cd20160e338
 EBUILD netpbm-10.37.0.ebuild 3176 RMD160 c845bcb06d679218d0c5f1ad803c9cd879ad3410 SHA1 e5582dce796933d3a4049a07befaf3aeac9628a0 SHA256 5f273a533588bd933701d2e3efabc034701a9c1e01085a7d810646f2f07676b6
 EBUILD netpbm-10.40.0.ebuild 3176 RMD160 f55a7bb26a9e77fca095583dda37c289a27aa865 SHA1 781af81b8116958b6a3cdec4a14c9ec5b9c43e87 SHA256 1d2aa91e2ce566a2129541b4a545164ea70b40784b9054062ba2bd8fb8c49bf7
-MISC ChangeLog 24467 RMD160 97ec4f6fcb3cb6de0ce970839beb546d53825c2d SHA1 78dcaef6644c3fbcf9c6253a09c2c3a5e38fb684 SHA256 8d019e38439bd930d235480c67f266ab44bc560026f31c7753023d6ee8ef1f87
+MISC ChangeLog 24267 RMD160 03ac7b6d99c0717880f3d664b5f79f0dbd51efaa SHA1 2f3588b15fc00ffce0ae9f2c538006c2a5a5e80c SHA256 49f575d9a9ab22af09c3fe9312c563713e4f3bb318973862c671acc779563f2a
 MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c35398222ef7ed670c31965e42cca77fe4b1da6 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHrJiIkKaRLQcq0GIRAiJ9AJ444l4B8Tybc46G/khou8ruIOu2CgCfVZPK
-tTIq+I6LQGf12lZZDhwdGZo=
-=mieQ
+iD8DBQFHri8gj9hvisErhMIRAh64AKDWkUdVOpeFYi48b2OtxiaQU0NJ2gCfTvRo
+rO4+5GKOFZgVhdtqulCJ46k=
+=hsn+
 -----END PGP SIGNATURE-----
diff --git a/media-libs/netpbm/files/netpbm-10.26.45-headers.patch b/media-libs/netpbm/files/netpbm-10.26.45-headers.patch
new file mode 100644
index 000000000000..2542ebb9cd23
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.26.45-headers.patch
@@ -0,0 +1,229 @@
+--- netpbm-10.26.37/buildtools/typegen.c
++++ netpbm-10.26.37/buildtools/typegen.c
+@@ -28,6 +28,7 @@
+ -----------------------------------------------------------------------------*/
+ #include <stdio.h>
+ #include <unistd.h>
++#include <stdlib.h>
+ 
+ 
+ 
+--- netpbm-10.26.37/converter/other/pamtohdiff.c
++++ netpbm-10.26.37/converter/other/pamtohdiff.c
+@@ -14,6 +14,7 @@
+ 
+ ******************************************************************************/
+ #include <stdio.h>
++#include <string.h>
+ 
+ #include "pam.h"
+ #include "shhopt.h"
+--- netpbm-10.26.37/converter/other/fiasco/binerror.c
++++ netpbm-10.26.37/converter/other/fiasco/binerror.c
+@@ -25,6 +25,7 @@
+ #include "config.h"
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ #if STDC_HEADERS
+ #	include <stdarg.h>
+--- netpbm-10.26.37/converter/other/fiasco/codec/coeff.c
++++ netpbm-10.26.37/converter/other/fiasco/codec/coeff.c
+@@ -14,6 +14,8 @@
+  *  $State: Exp $
+  */
+ 
++#include <string.h>
++
+ #include "config.h"
+ 
+ #include "types.h"
+--- netpbm-10.26.37/converter/other/fiasco/codec/dfiasco.c
++++ netpbm-10.26.37/converter/other/fiasco/codec/dfiasco.c
+@@ -14,6 +14,8 @@
+  *  $State: Exp $
+  */
+ 
++#include <string.h>
++
+ #include "config.h"
+ 
+ #include "types.h"
+--- netpbm-10.26.37/converter/other/pnmtoxwd.c
++++ netpbm-10.26.37/converter/other/pnmtoxwd.c
+@@ -10,6 +10,8 @@
+ ** implied warranty.
+ */
+ 
++#include <string.h>
++
+ #include "pnm.h"
+ #include "shhopt.h"
+ #include "mallocvar.h"
+--- netpbm-10.26.37/converter/other/pnmtopalm/palmtopnm.c
++++ netpbm-10.26.37/converter/other/pnmtopalm/palmtopnm.c
+@@ -10,6 +10,7 @@
+ ******************************************************************************/
+ 
+ #include <assert.h>
++#include <string.h>
+ 
+ #include "pnm.h"
+ #include "shhopt.h"
+--- netpbm-10.26.37/converter/other/pnmtopalm/pnmtopalm.c
++++ netpbm-10.26.37/converter/other/pnmtopalm/pnmtopalm.c
+@@ -14,6 +14,7 @@
+ #include <stdio.h>
+ #include <assert.h>
+ #include <limits.h>
++#include <string.h>
+ 
+ #include "pnm.h"
+ #include "palm.h"
+--- netpbm-10.26.37/converter/other/hdifftopam.c
++++ netpbm-10.26.37/converter/other/hdifftopam.c
+@@ -7,6 +7,7 @@
+   By Bryan Henderson, San Jose, CA 2002.04.15.
+ ******************************************************************************/
+ #include <stdio.h>
++#include <string.h>
+ 
+ #include "pam.h"
+ #include "shhopt.h"
+--- netpbm-10.26.37/converter/ppm/ppmtoterm.c
++++ netpbm-10.26.37/converter/ppm/ppmtoterm.c
+@@ -19,6 +19,7 @@
+ **
+ */
+ 
++#include <string.h>
+ #include "ppm.h"
+ #include "shhopt.h"
+ 
+--- netpbm-10.26.37/other/pamstack.c
++++ netpbm-10.26.37/other/pamstack.c
+@@ -12,6 +12,8 @@
+   Contributed to the public domain by its author 2002.05.05.
+ -----------------------------------------------------------------------------*/
+ 
++#include <string.h>
++
+ #include "pam.h"
+ #include "shhopt.h"
+ 
+--- netpbm-10.26.37/other/pamarith.c
++++ netpbm-10.26.37/other/pamarith.c
+@@ -13,6 +13,8 @@
+ ** implied warranty.
+ */
+ 
++#include <string.h>
++
+ #include "pam.h"
+ #include "shhopt.h"
+ 
+--- netpbm-10.26.37/other/pamchannel.c
++++ netpbm-10.26.37/other/pamchannel.c
+@@ -11,6 +11,8 @@
+   Contributed to the public domain by its author 2000.08.05.
+ -----------------------------------------------------------------------------*/
+ 
++#include <string.h>
++
+ #include "pam.h"
+ #include "shhopt.h"
+ #include "mallocvar.h"
+--- netpbm-10.26.37/editor/pamditherbw.c
++++ netpbm-10.26.37/editor/pamditherbw.c
+@@ -11,6 +11,7 @@
+ =============================================================================*/
+ 
+ #include <assert.h>
++#include <string.h>
+ #include "pam.h"
+ #include "dithers.h"
+ #include "mallocvar.h"
+--- netpbm-10.26.37/editor/pnmsmooth.c
++++ netpbm-10.26.37/editor/pnmsmooth.c
+@@ -23,6 +23,7 @@
+ #define _BSD_SOURCE 1
+     /* This makes sure that mkstemp() is in unistd.h */
+ 
++#include <string.h>
+ #include <unistd.h>
+ #include <sys/wait.h>
+ #include "pnm.h"
+--- netpbm-10.26.37/generator/ppmwheel.c
++++ netpbm-10.26.37/generator/ppmwheel.c
+@@ -13,6 +13,8 @@
+ ** implied warranty.
+ */
+ 
++#include <string.h>
++
+ #include "ppm.h"
+ #include <math.h>
+ 
+--- netpbm-10.26.37/converter/other/fiasco/input/basis.c
++++ netpbm-10.26.37/converter/other/fiasco/input/basis.c
+@@ -14,6 +14,8 @@
+  *  $State: Exp $
+  */
+ 
++#include <string.h>
++
+ #include "config.h"
+ 
+ #include "types.h"
+--- netpbm-10.26.37/converter/other/pnmtotiffcmyk.c
++++ netpbm-10.26.37/converter/other/pnmtotiffcmyk.c
+@@ -58,6 +58,7 @@
+ /* On AIX, _XOPEN_SOURCE keeps inttypes.h from conflicting with tiffio.h */
+ #define _XOPEN_SOURCE
+ 
++#include <string.h>
+ #include "pnm.h"
+ #include <math.h>
+ /* float.h used to be included only if __osf__ was defined.  On some
+--- netpbm-10.26.37/analyzer/pnmpsnr.c
++++ netpbm-10.26.37/analyzer/pnmpsnr.c
+@@ -10,6 +10,7 @@
+ 
+ #include <stdio.h>
+ #include <math.h>
++#include <string.h>
+ 
+ #include "pam.h"
+ 
+--- netpbm-10.26.37/editor/pnmpad.c
++++ netpbm-10.26.37/editor/pnmpad.c
+@@ -11,6 +11,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include "pnm.h"
+ #include "shhopt.h"
+ #include "mallocvar.h"
+--- netpbm-10.26.37/generator/pbmpage.c
++++ netpbm-10.26.37/generator/pbmpage.c
+@@ -15,6 +15,7 @@
+ #include <math.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include "pbm.h"
+ 
+ /* Support both US and A4. */
+--- netpbm-10.26.37/converter/other/fiasco/input/mc.c
++++ netpbm-10.26.37/converter/other/fiasco/input/mc.c
+@@ -15,6 +15,8 @@
+  *  $State: Exp $
+  */
+ 
++#include <stdlib.h>
++
+ #include "config.h"
+ 
+ #include "types.h"
diff --git a/media-libs/netpbm/netpbm-10.26.49.ebuild b/media-libs/netpbm/netpbm-10.26.49.ebuild
new file mode 100644
index 000000000000..c6806f1ca085
--- /dev/null
+++ b/media-libs/netpbm/netpbm-10.26.49.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.26.49.ebuild,v 1.3 2008/02/09 22:54:18 vapier Exp $
+
+inherit flag-o-matic toolchain-funcs eutils multilib
+
+MAN_VER=10.30
+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 s390 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.30-build.patch
+	epatch "${FILESDIR}"/netpbm-10.26.45-headers.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 "${D}"/usr/include/shhopt.h
+	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
+}