Version bump.
authorMike Frysinger <vapier@gentoo.org>
Tue, 18 Oct 2005 22:44:34 +0000 (22:44 +0000)
committerMike Frysinger <vapier@gentoo.org>
Tue, 18 Oct 2005 22:44:34 +0000 (22:44 +0000)
Package-Manager: portage-2.0.53_rc5

media-libs/netpbm/ChangeLog
media-libs/netpbm/Manifest
media-libs/netpbm/files/digest-netpbm-10.30 [new file with mode: 0644]
media-libs/netpbm/files/netpbm-10.30-build.patch [new file with mode: 0644]
media-libs/netpbm/netpbm-10.30.ebuild [new file with mode: 0644]
media-libs/urt/Manifest

index 304ac65bb227707d6ed58e36dc0991f73b19643d..bcbd5b0c157eb75a716b603db4a336a725043048 100644 (file)
@@ -1,6 +1,12 @@
 # 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.75 2005/10/18 21:46:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.76 2005/10/18 22:44:34 vapier Exp $
+
+*netpbm-10.30 (18 Oct 2005)
+
+  18 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/netpbm-10.30-build.patch, +netpbm-10.30.ebuild:
+  Version bump.
 
   18 Oct 2005; Aron Griffis <agriffis@gentoo.org> netpbm-10.29.ebuild:
   Mark 10.29 stable on ia64 #109705
index c76a68c3fd71d019ca5b6c6aebabf33d85a59a55..fdf4db6f1eb347b5e3db1a96a10f63291dbc4097 100644 (file)
@@ -1,34 +1,47 @@
-MD5 fc5b2c41ccdc4c486d3f7b65771753b5 netpbm-10.19.ebuild 1739
-MD5 e1d7f1307e675fbbfc3a07f2539c0708 netpbm-10.20-r1.ebuild 2442
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 13948142cf9dfbf4f7d0bc984f3d03de ChangeLog 10972
+MD5 d3afaf9141525a706f8c077f66918670 files/10.11.14/Makefile.config 17308
+MD5 be5dafab017b8247e09f643e9798441e files/10.11.14/Makefile.svga 17374
+MD5 d3afaf9141525a706f8c077f66918670 files/10.11.5/Makefile.config 17308
+MD5 be5dafab017b8247e09f643e9798441e files/10.11.5/Makefile.svga 17374
+MD5 943662580b449abb996444e348c48298 files/9.12/Makefile.config 11635
+MD5 6735fc271948c349d02f59361b4c373e files/digest-netpbm-10.11.14 65
+MD5 15efd1a3748d1c9b0a9d9e88374bcbbc files/digest-netpbm-10.11.15 65
+MD5 19ce2b4d396523dcbcb1e415d4bdb8c9 files/digest-netpbm-10.11.5-r3 64
+MD5 74da89b4a373ba2116b4ba5d8e9d31a0 files/digest-netpbm-10.18.7 64
+MD5 c06a062a991dc2b0f8bd88ac44a1e5e5 files/digest-netpbm-10.19 62
+MD5 40a3370de6ed591305e4585ffbc605bd files/digest-netpbm-10.20 62
+MD5 40a3370de6ed591305e4585ffbc605bd files/digest-netpbm-10.20-r1 62
+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 b38412609f4a8671a787d303b8d2b876 files/digest-netpbm-9.12-r4 61
+MD5 3e364cbe32c6c5bd2f329b8dbcf604d5 files/netpbm-10.29-anytopnm.patch 1562
+MD5 102062d84b1750c991d13e5528a9420b files/netpbm-10.29-build.patch 2278
+MD5 103e8f6f6474dcc4b17ee049111bc3f6 files/netpbm-10.29-infinity.patch 5840
+MD5 d0d44fe5de727324db35e8110dc81f63 files/netpbm-10.29-pnmtopng-alpha-check.patch 603
+MD5 ffa6c02e94b0dfc779d129cd7e09e928 files/netpbm-10.30-build.patch 1886
+MD5 ef9c07e7cbf6b830f8dd61e59fb0a34b files/netpbm-dSAFER.patch 818
 MD5 e1f6c302199a36c1be4ecf1654be9bac metadata.xml 224
 MD5 e356185ae787b984b1502205834c74f4 netpbm-10.11.14.ebuild 2010
-MD5 11d5f86df1298bfe5c076cd3ff802616 ChangeLog 10821
+MD5 bc37890e535cf2fcbe66043b92491072 netpbm-10.11.15.ebuild 2009
 MD5 28ca860ea5e88498171e08bc22685c16 netpbm-10.11.5-r3.ebuild 1567
-MD5 6aeff0855ca82c4712982529c5d4ba9c netpbm-10.29-r1.ebuild 2923
+MD5 323b69ef703b303e44f51be5b762df65 netpbm-10.18.7.ebuild 2009
+MD5 fc5b2c41ccdc4c486d3f7b65771753b5 netpbm-10.19.ebuild 1739
+MD5 e1d7f1307e675fbbfc3a07f2539c0708 netpbm-10.20-r1.ebuild 2442
 MD5 a936cf1a2061cebff85f7a54e12d6422 netpbm-10.20.ebuild 2273
-MD5 bc37890e535cf2fcbe66043b92491072 netpbm-10.11.15.ebuild 2009
 MD5 4ff1d95265184a7c760d4748a4cb1beb netpbm-10.28.ebuild 2460
-MD5 323b69ef703b303e44f51be5b762df65 netpbm-10.18.7.ebuild 2009
-MD5 f17a1fb0d30a71452e534e435c7295b2 netpbm-9.12-r4.ebuild 1343
+MD5 6aeff0855ca82c4712982529c5d4ba9c netpbm-10.29-r1.ebuild 2923
 MD5 1439cca7e279cd1c0e71f589f9b94aac netpbm-10.29.ebuild 2429
-MD5 3e364cbe32c6c5bd2f329b8dbcf604d5 files/netpbm-10.29-anytopnm.patch 1562
-MD5 74da89b4a373ba2116b4ba5d8e9d31a0 files/digest-netpbm-10.18.7 64
-MD5 6735fc271948c349d02f59361b4c373e files/digest-netpbm-10.11.14 65
-MD5 40a3370de6ed591305e4585ffbc605bd files/digest-netpbm-10.20-r1 62
-MD5 102062d84b1750c991d13e5528a9420b files/netpbm-10.29-build.patch 2278
-MD5 8c4a20ca06c83687436b8cb75917d5f1 files/digest-netpbm-10.29 62
-MD5 d0d44fe5de727324db35e8110dc81f63 files/netpbm-10.29-pnmtopng-alpha-check.patch 603
-MD5 103e8f6f6474dcc4b17ee049111bc3f6 files/netpbm-10.29-infinity.patch 5840
-MD5 40a3370de6ed591305e4585ffbc605bd files/digest-netpbm-10.20 62
-MD5 c06a062a991dc2b0f8bd88ac44a1e5e5 files/digest-netpbm-10.19 62
-MD5 e03ba0a74da10891ecaa41fb86191275 files/digest-netpbm-10.29-r1 136
-MD5 ef9c07e7cbf6b830f8dd61e59fb0a34b files/netpbm-dSAFER.patch 818
-MD5 b38412609f4a8671a787d303b8d2b876 files/digest-netpbm-9.12-r4 61
-MD5 19ce2b4d396523dcbcb1e415d4bdb8c9 files/digest-netpbm-10.11.5-r3 64
-MD5 15efd1a3748d1c9b0a9d9e88374bcbbc files/digest-netpbm-10.11.15 65
-MD5 c6c3222383568021fbbdc34114b6f279 files/digest-netpbm-10.28 62
-MD5 be5dafab017b8247e09f643e9798441e files/10.11.14/Makefile.svga 17374
-MD5 d3afaf9141525a706f8c077f66918670 files/10.11.14/Makefile.config 17308
-MD5 be5dafab017b8247e09f643e9798441e files/10.11.5/Makefile.svga 17374
-MD5 d3afaf9141525a706f8c077f66918670 files/10.11.5/Makefile.config 17308
-MD5 943662580b449abb996444e348c48298 files/9.12/Makefile.config 11635
+MD5 53647d93024c9fc3be41fc1fce7eceb2 netpbm-10.30.ebuild 2738
+MD5 f17a1fb0d30a71452e534e435c7295b2 netpbm-9.12-r4.ebuild 1343
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDVXtugIKl8Uu19MoRAk1oAJwNLOQGtTbiZg67ivyR5Biw603wiACfQZG+
+VGsd9sXPU0VcU2CFeqMTE8E=
+=cJaL
+-----END PGP SIGNATURE-----
diff --git a/media-libs/netpbm/files/digest-netpbm-10.30 b/media-libs/netpbm/files/digest-netpbm-10.30
new file mode 100644 (file)
index 0000000..130f028
--- /dev/null
@@ -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-build.patch b/media-libs/netpbm/files/netpbm-10.30-build.patch
new file mode 100644 (file)
index 0000000..902f9aa
--- /dev/null
@@ -0,0 +1,60 @@
+- Don't install libnetpbm.a and libnetpbm.so into a sep link dir
+- Try to fix parallel building
+- Make the libopt tool less 'helpful'
+
+--- lib/Makefile
++++ lib/Makefile
+@@ -249,7 +249,7 @@
+ .PHONY: install.staticlib
+ install.staticlib: $(PKGDIR)/link
+       $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \
+-        $(PKGDIR)/link
++        $(PKGDIR)/lib
+ 
+ # Install a shared library stub -- the ".so" file used at link time to
+ # prepare a program for dynamically linking a library at run time 
+@@ -257,9 +257,9 @@
+ install.sharedlibstub: $(PKGDIR)/link
+ ifeq ($(NETPBMLIBTYPE),unixshared)
+ # install the link-time (.so) links to the runtime libraries
+-      cd $(PKGDIR)/link ; \
++      cd $(PKGDIR)/lib ; \
+           rm -f libnetpbm.$(NETPBMLIBSUFFIX); \
+-          $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
++          $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
+             libnetpbm.$(NETPBMLIBSUFFIX)
+ endif
+ ifeq ($(NETPBMLIBTYPE),dll)
+--- GNUmakefile
++++ GNUmakefile
+@@ -87,6 +87,9 @@
+ 
+ .PHONY: nonmerge
+ nonmerge: $(PRODUCT_SUBDIRS:%=%/all)
++
++$(PRODUCT_SUBDIRS:%=%/all): $(LIBOPT)
++converter/all analyzer/all editor/all generator/all other/all: lib/all
+ 
+ OMIT_CONFIG_RULE = 1
+ include $(SRCDIR)/Makefile.common
+--- buildtools/libopt.c
++++ buildtools/libopt.c
+@@ -496,4 +496,5 @@
+ main(int argc, char **argv) {
+ 
++    bool shut_the_hell_up = TRUE;
+     bool error;
+     bool runtime;  /* -runtime option has been seen */
+@@ -508,4 +509,6 @@
+         if (strcmp(argv[arg], "-runtime") == 0)
+             runtime = TRUE;
++        else if (strcmp(argv[arg], "-v") == 0)
++            shut_the_hell_up = FALSE;
+         else {
+             if (strlen(argv[arg]) > 200)
+@@ -534,4 +537,5 @@
+     } else {
+         fputs(outputLine, stdout);
++        if (shut_the_hell_up == FALSE)
+         fprintf(stderr, "libopt results: '%s'\n", outputLine);
+         retval = 0;
diff --git a/media-libs/netpbm/netpbm-10.30.ebuild b/media-libs/netpbm/netpbm-10.30.ebuild
new file mode 100644 (file)
index 0000000..87ded5f
--- /dev/null
@@ -0,0 +1,110 @@
+# 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.ebuild,v 1.1 2005/10/18 22:44:34 vapier Exp $
+
+inherit flag-o-matic 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://sourceforge/${PN}/${P}.tgz
+       mirror://gentoo/${P}-manpages.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~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
+
+       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}"/${P}-manpages
+       doman *.[0-9]
+       dodoc README* gen-netpbm-manpages
+}
index 879485e95c1b4bd9189cd2364c56e415570f23fa..593d09a3e07799120ffdf734a19aad4c4c36a293 100644 (file)
@@ -6,4 +6,4 @@ MD5 3f2cd2217e501f325bdc547781337c5c files/urt-3.1b-compile-updates.patch 3397
 MD5 17ad983b2b258ee3e633108e342276c1 files/urt-3.1b-rle-fixes.patch 5072
 MD5 eb209f87460fb61c12f96550740045e8 files/urt-3.1b-tempfile.patch 593
 MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161
-MD5 00540d29a1b09672cd1b744c17abf93e urt-3.1b-r1.ebuild 1792
+MD5 b5fa5ba3f58e162f72bbe7d43fff4b2d urt-3.1b-r1.ebuild 1850