Version bumped

5 files changed, 80 insertions, 10 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index d8c92da4cff6..75043274948e 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/netpbm
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.37 2004/01/14 17:45:29 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.38 2004/01/14 18:13:21 mholzer Exp $
+
+*netpbm-10.11.15 (14 Jan 2004)
+
+  14 Jan 2004; Martin Holzer <mholzer@gentoo.org> netpbm-10.11.14.ebuild,
+  netpbm-10.11.15.ebuild:
+  Version bumped
 
   14 Jan 2004; Martin Holzer <mholzer@gentoo.org> netpbm-10.11.13-r1.ebuild,
   netpbm-10.11.14.ebuild, netpbm-10.11.5-r3.ebuild, netpbm-9.12-r4.ebuild:
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index e694a0ef609a..b8ac34d92e07 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,6 +1,6 @@
-MD5 6dd07c13d311f0871b8271ac688918e5 ChangeLog 5812
-MD5 df2b6fe30428b26f94f51ed7d20286b4 netpbm-10.11.15.ebuild 1662
-MD5 df2b6fe30428b26f94f51ed7d20286b4 netpbm-10.11.14.ebuild 1662
+MD5 f4032f5863dc85aedfae75c141bdcb2f ChangeLog 5962
+MD5 f6dfd4e3a22bb1cb929ce94dd72e2d87 netpbm-10.11.15.ebuild 1702
+MD5 c8e4166c7bb790a9b5cdb439fc0fb8b9 netpbm-10.11.14.ebuild 1701
 MD5 22e8f9ccaff0f3cc18a059b054d1a2e7 netpbm-10.11.5-r3.ebuild 1621
 MD5 3231ed5592124d02215bdb0223ff0d13 netpbm-9.12-r4.ebuild 1523
 MD5 15efd1a3748d1c9b0a9d9e88374bcbbc files/digest-netpbm-10.11.15 65
diff --git a/media-libs/netpbm/files/digest-netpbm-10.11.15 b/media-libs/netpbm/files/digest-netpbm-10.11.15
new file mode 100644
index 000000000000..c56ebc60fab6
--- /dev/null
+++ b/media-libs/netpbm/files/digest-netpbm-10.11.15
@@ -0,0 +1 @@
+MD5 c608c25a805c0de13191682750793de6 netpbm-10.11.15.tgz 1882830
diff --git a/media-libs/netpbm/netpbm-10.11.14.ebuild b/media-libs/netpbm/netpbm-10.11.14.ebuild
index c2c349cac458..654a45f5df95 100644
--- a/media-libs/netpbm/netpbm-10.11.14.ebuild
+++ b/media-libs/netpbm/netpbm-10.11.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.11.14.ebuild,v 1.5 2004/01/14 17:45:29 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.11.14.ebuild,v 1.6 2004/01/14 18:13:21 mholzer Exp $
 
 inherit flag-o-matic
 
@@ -23,19 +23,18 @@ DEPEND=">=media-libs/jpeg-6b
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+	cp Makefile.config.in Makefile.config
 
 	if [ `use svga` ] ; then
-		cfg="svga"
-	else
-		cfg="config"
+	echo "LINUXSVGAHDR_DIR = /usr/include" >> Makefile.config
+	echo "LINUXSVGALIB = /usr/lib/libvga.so" >> Makefile.config
 	fi
 
 	# Sparc support ...
 	replace-flags "-mcpu=ultrasparc" "-mcpu=v8 -mtune=ultrasparc"
 	replace-flags "-mcpu=v9" "-mcpu=v8 -mtune=v9"
 
-	sed -e "s:-O3:${CFLAGS} -fPIC:" ${FILESDIR}/${PV}/Makefile.${cfg} \
-		> Makefile.config || die "Flag replacement failed"
+	sed -i -e "s:-O3:${CFLAGS} -fPIC:" Makefile.config || die " sed failed"
 }
 
 src_compile() {
diff --git a/media-libs/netpbm/netpbm-10.11.15.ebuild b/media-libs/netpbm/netpbm-10.11.15.ebuild
new file mode 100644
index 000000000000..cd3f6e737078
--- /dev/null
+++ b/media-libs/netpbm/netpbm-10.11.15.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.11.15.ebuild,v 1.1 2004/01/14 18:13:21 mholzer Exp $
+
+inherit flag-o-matic
+
+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"
+RESTRICT="nomirror"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm ~amd64 ~ia64"
+IUSE="svga"
+RESTRICT="nomirror"
+
+DEPEND=">=media-libs/jpeg-6b
+	>=media-libs/tiff-3.5.5
+	>=media-libs/libpng-1.2.1
+	svga? ( media-libs/svgalib )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	cp Makefile.config.in Makefile.config
+
+	if [ `use svga` ] ; then
+	echo "LINUXSVGAHDR_DIR = /usr/include" >> Makefile.config
+	echo "LINUXSVGALIB = /usr/lib/libvga.so" >> Makefile.config
+	fi
+
+	# Sparc support ...
+	replace-flags "-mcpu=ultrasparc" "-mcpu=v8 -mtune=ultrasparc"
+	replace-flags "-mcpu=v9" "-mcpu=v8 -mtune=v9"
+
+	sed -i -e "s:-O3:${CFLAGS} -fPIC:" Makefile.config || die " sed failed"
+}
+
+src_compile() {
+	MAKEOPTS="${MAKEOPTS} -j1"
+	emake CC="${CC}" CXX="${CXX}"|| die "emake failed"
+}
+
+src_install() {
+	make package pkgdir=${D}/usr/ || die "make package failed"
+
+	# Fix symlink not being created.
+	dosym `basename ${D}/usr/lib/libnetpbm.so.*` /usr/lib/libnetpbm.so
+
+	dodir /usr/share
+	rm -rf ${D}/usr/bin/doc.url
+	rm -rf ${D}/usr/man/web
+	rm -rf ${D}/usr/link
+	rm -rf ${D}/usr/README
+	rm -rf ${D}/usr/pkginfo
+	mv ${D}/usr/man/ ${D}/usr/share/man
+
+	dodoc README
+	export GLOBIGNORE='*.html:.*'
+	cd doc && \
+		dodoc * && \
+		dohtml -r . || die "doc install failed"
+}