old

3 files changed, 0 insertions, 220 deletions

diff --git a/media-libs/netpbm/files/netpbm-10.26.64-min_DCT_v_scaled_size.patch b/media-libs/netpbm/files/netpbm-10.26.64-min_DCT_v_scaled_size.patch
deleted file mode 100644
index c3e629be955b..000000000000
--- a/media-libs/netpbm/files/netpbm-10.26.64-min_DCT_v_scaled_size.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-support for jpeg-7
-
---- netpbm-10.46.00/converter/ppm/ppmtompeg/jpeg.c
-+++ netpbm-10.48.00/converter/ppm/ppmtompeg/jpeg.c
-@@ -53,6 +53,17 @@
- #define HEADER_SIZE 607   /*JFIF header size used on output images*/
- 
- 
-+static int
-+minDctVScaledSize(struct jpeg_decompress_struct const cinfo) {
-+
-+#if JPEG_LIB_VERSION >= 70
-+    return cinfo.min_DCT_v_scaled_size;
-+#else
-+    return cinfo.min_DCT_scaled_size;
-+#endif
-+}
-+
-+
- 
- /*=======================================================================*
-  *                                                                       *
-@@ -467,11 +474,7 @@
-   max_v_samp = (temp_v<v_samp[2]) ? v_samp[2]:temp_v;
-   
-   /* Make an 8-row-high sample array that will go away when done with image */
--#ifdef JPEG4
--  buffer_height = 8;  /* could be 2, 4,8 rows high */
--#else
--  buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_scaled_size;
--#endif
-+  buffer_height = cinfo.max_v_samp_factor * minDctVScaledSize(cinfo);
-   
-   for(cp=0,compptr = cinfo.comp_info;cp<cinfo.num_components;
-       cp++,compptr++) {
diff --git a/media-libs/netpbm/files/netpbm-10.30-build.patch b/media-libs/netpbm/files/netpbm-10.30-build.patch
deleted file mode 100644
index 8f42f65e80da..000000000000
--- a/media-libs/netpbm/files/netpbm-10.30-build.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-- Don't install libnetpbm.a and libnetpbm.so into a sep link dir
-- Try to fix parallel building
-- Make the libopt tool less 'helpful'
-- Remove pointless echo during build
-
---- 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): buildtools/all
-+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;
---- converter/other/jpeg2000/Makefile
-+++ converter/other/jpeg2000/Makefile
-@@ -57,7 +57,6 @@
- include $(SRCDIR)/Makefile.common
- 
- $(BINARIES): %: %.o $(JASPERLIB_DEP) $(NETPBMLIB) $(LIBOPT)
--	echo deps: $^
- 	$(LD) $(LDFLAGS) $(MATHLIB) $(LDLIBS) -o $@ $< \
- 	 `$(LIBOPT) $(NETPBMLIB) $(JASPERLIB_USE)` $(JASPERDEPLIBS) -lm \
- 	  $(RPATH) $(LADD)
diff --git a/media-libs/netpbm/netpbm-10.26.64.ebuild b/media-libs/netpbm/netpbm-10.26.64.ebuild
deleted file mode 100644
index 5b6fab168870..000000000000
--- a/media-libs/netpbm/netpbm-10.26.64.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.26.64.ebuild,v 1.1 2009/09/29 19:31:58 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.42.0-gcc43.patch #211296
-	epatch "${FILESDIR}"/netpbm-10.26.64-min_DCT_v_scaled_size.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() {
-	emake 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
-}