diff options
| -rw-r--r-- | media-libs/netpbm/ChangeLog | 8 | ||||
| -rw-r--r-- | media-libs/netpbm/files/digest-netpbm-10.30 | 2 | ||||
| -rw-r--r-- | media-libs/netpbm/files/netpbm-10.30-build.patch | 60 | ||||
| -rw-r--r-- | media-libs/netpbm/netpbm-10.30.ebuild | 110 |
4 files changed, 179 insertions, 1 deletions
diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog index 304ac65bb227..bcbd5b0c157e 100644 --- a/media-libs/netpbm/ChangeLog +++ b/media-libs/netpbm/ChangeLog @@ -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 diff --git a/media-libs/netpbm/files/digest-netpbm-10.30 b/media-libs/netpbm/files/digest-netpbm-10.30 new file mode 100644 index 000000000000..130f0281157a --- /dev/null +++ b/media-libs/netpbm/files/digest-netpbm-10.30 @@ -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 index 000000000000..902f9aa5ab4b --- /dev/null +++ b/media-libs/netpbm/files/netpbm-10.30-build.patch @@ -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 index 000000000000..87ded5f3c0e7 --- /dev/null +++ b/media-libs/netpbm/netpbm-10.30.ebuild @@ -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 +} |