old
authorMike Frysinger <vapier@gentoo.org>
Wed, 6 Sep 2006 14:19:17 +0000 (14:19 +0000)
committerMike Frysinger <vapier@gentoo.org>
Wed, 6 Sep 2006 14:19:17 +0000 (14:19 +0000)
24 files changed:
media-libs/netpbm/files/digest-netpbm-10.26.29 [deleted file]
media-libs/netpbm/files/digest-netpbm-10.26.30 [deleted file]
media-libs/netpbm/files/digest-netpbm-10.29 [deleted file]
media-libs/netpbm/files/digest-netpbm-10.30-r1 [deleted file]
media-libs/netpbm/files/digest-netpbm-10.31-r1 [deleted file]
media-libs/netpbm/files/digest-netpbm-10.32 [deleted file]
media-libs/netpbm/files/digest-netpbm-10.33 [deleted file]
media-libs/netpbm/files/netpbm-10.19-message.patch [deleted file]
media-libs/netpbm/files/netpbm-10.30-anytopnm.patch [deleted file]
media-libs/netpbm/files/netpbm-10.30-jpeg-prototypes.patch [deleted file]
media-libs/netpbm/files/netpbm-10.30-pngtopnm.patch [deleted file]
media-libs/netpbm/files/netpbm-10.30-tifftopnm.patch [deleted file]
media-libs/netpbm/files/netpbm-10.31-need-libm.patch [deleted file]
media-libs/netpbm/files/netpbm-10.31-parallel.patch [deleted file]
media-libs/netpbm/files/netpbm-10.31-pnmtopng-modtime-segfault.patch [deleted file]
media-libs/netpbm/files/netpbm-10.32-parallel.patch [deleted file]
media-libs/netpbm/files/netpbm-10.33-lib-objs.patch [deleted file]
media-libs/netpbm/netpbm-10.26.29.ebuild [deleted file]
media-libs/netpbm/netpbm-10.26.30.ebuild [deleted file]
media-libs/netpbm/netpbm-10.29.ebuild [deleted file]
media-libs/netpbm/netpbm-10.30-r1.ebuild [deleted file]
media-libs/netpbm/netpbm-10.31-r1.ebuild [deleted file]
media-libs/netpbm/netpbm-10.32.ebuild [deleted file]
media-libs/netpbm/netpbm-10.33.ebuild [deleted file]

diff --git a/media-libs/netpbm/files/digest-netpbm-10.26.29 b/media-libs/netpbm/files/digest-netpbm-10.26.29
deleted file mode 100644 (file)
index bac7439..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 223a5116f33e6d21706db37fda1c353a netpbm-10.26.29.tgz 2540954
-RMD160 6cf2dbd2c78cc1271ef24705bd8dba97224dd537 netpbm-10.26.29.tgz 2540954
-SHA256 bca1c7867705f0d6feaab3807442394dddebfb3fa8fcce9ade8b6df50594138e netpbm-10.26.29.tgz 2540954
-MD5 2d90a47369f74692aa24b773dfd6a122 netpbm-10.30-manpages.tar.bz2 233254
-RMD160 6312e1486f473f57332a5dc050a03ac1dfce7f47 netpbm-10.30-manpages.tar.bz2 233254
-SHA256 75eb6ceaebafffb6a2d608d49f2b61c5049e5795976bbfb2d55608de1f858124 netpbm-10.30-manpages.tar.bz2 233254
diff --git a/media-libs/netpbm/files/digest-netpbm-10.26.30 b/media-libs/netpbm/files/digest-netpbm-10.26.30
deleted file mode 100644 (file)
index 40dc06b..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 c7fcfa99980fbdd049198d6e79aae978 netpbm-10.26.30.tgz 2540954
-RMD160 f01dd1bf0d8400454cc0a05862d50ff4f9b1179c netpbm-10.26.30.tgz 2540954
-SHA256 8c906b349abe4991b4d907062c447a844c7ec973aa8cf21329092bfd5da40fcd netpbm-10.26.30.tgz 2540954
-MD5 2d90a47369f74692aa24b773dfd6a122 netpbm-10.30-manpages.tar.bz2 233254
-RMD160 6312e1486f473f57332a5dc050a03ac1dfce7f47 netpbm-10.30-manpages.tar.bz2 233254
-SHA256 75eb6ceaebafffb6a2d608d49f2b61c5049e5795976bbfb2d55608de1f858124 netpbm-10.30-manpages.tar.bz2 233254
diff --git a/media-libs/netpbm/files/digest-netpbm-10.29 b/media-libs/netpbm/files/digest-netpbm-10.29
deleted file mode 100644 (file)
index 688477f..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 606c7ca1f3cd4c722a98961216730aec netpbm-10.29.tgz 2359729
-RMD160 c88d01b1106c7eb1f087d98a5570c0c61200d083 netpbm-10.29.tgz 2359729
-SHA256 b0e4e0d7a21809a606d55ad7f30d0715b080e35609791257ab3f075b7449f964 netpbm-10.29.tgz 2359729
diff --git a/media-libs/netpbm/files/digest-netpbm-10.30-r1 b/media-libs/netpbm/files/digest-netpbm-10.30-r1
deleted file mode 100644 (file)
index 26448e9..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 2d90a47369f74692aa24b773dfd6a122 netpbm-10.30-manpages.tar.bz2 233254
-RMD160 6312e1486f473f57332a5dc050a03ac1dfce7f47 netpbm-10.30-manpages.tar.bz2 233254
-SHA256 75eb6ceaebafffb6a2d608d49f2b61c5049e5795976bbfb2d55608de1f858124 netpbm-10.30-manpages.tar.bz2 233254
-MD5 f84620e2733fb13eebe1394948077342 netpbm-10.30.tgz 2370761
-RMD160 6e0409e7c7085751d266f1137a89d2a3d37022da netpbm-10.30.tgz 2370761
-SHA256 cf682d5cbe185d535c12f65067c7ce991601d16595125c502cf4f8c15a6f801c netpbm-10.30.tgz 2370761
diff --git a/media-libs/netpbm/files/digest-netpbm-10.31-r1 b/media-libs/netpbm/files/digest-netpbm-10.31-r1
deleted file mode 100644 (file)
index a310d2f..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 2d90a47369f74692aa24b773dfd6a122 netpbm-10.30-manpages.tar.bz2 233254
-RMD160 6312e1486f473f57332a5dc050a03ac1dfce7f47 netpbm-10.30-manpages.tar.bz2 233254
-SHA256 75eb6ceaebafffb6a2d608d49f2b61c5049e5795976bbfb2d55608de1f858124 netpbm-10.30-manpages.tar.bz2 233254
-MD5 6ba2e0ee998eb23f4620ec9c175a90b6 netpbm-10.31.tgz 2383586
-RMD160 abeb8b44ce3496f7b4127ca6e1a89bd11e5ef2bb netpbm-10.31.tgz 2383586
-SHA256 f954261ebb9765a03d015949e5dc913cfcce5b4f661e334004936c9cdf2e5ee6 netpbm-10.31.tgz 2383586
diff --git a/media-libs/netpbm/files/digest-netpbm-10.32 b/media-libs/netpbm/files/digest-netpbm-10.32
deleted file mode 100644 (file)
index 0749f78..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 2d90a47369f74692aa24b773dfd6a122 netpbm-10.30-manpages.tar.bz2 233254
-RMD160 6312e1486f473f57332a5dc050a03ac1dfce7f47 netpbm-10.30-manpages.tar.bz2 233254
-SHA256 75eb6ceaebafffb6a2d608d49f2b61c5049e5795976bbfb2d55608de1f858124 netpbm-10.30-manpages.tar.bz2 233254
-MD5 0c20a71933ae2d8ed37a3e1417fba0d0 netpbm-10.32.tgz 2390874
-RMD160 9050c6b2b9891745c07d0694a0188cd905c5b9f4 netpbm-10.32.tgz 2390874
-SHA256 081a72f2201cceadb87e122b178e7abaee55a703943307748b346ba54dbfd625 netpbm-10.32.tgz 2390874
diff --git a/media-libs/netpbm/files/digest-netpbm-10.33 b/media-libs/netpbm/files/digest-netpbm-10.33
deleted file mode 100644 (file)
index 9aac08f..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 61a2d777a3eb0ce803bf021c7b99076f netpbm-10.33-manpages.tar.bz2 236722
-RMD160 5e43836a5f4d16f1ba5ece21e9996dbe60b252ae netpbm-10.33-manpages.tar.bz2 236722
-SHA256 aa18adee4a187ad5df243cb1a7c51097dc6a7d6a8072cf6da09972b74ac5454a netpbm-10.33-manpages.tar.bz2 236722
-MD5 b7292055fd825d5c132540a5fbdbe342 netpbm-10.33.tgz 2456707
-RMD160 7721314f9ef27f22a6bb034ca9e3577cff2984e5 netpbm-10.33.tgz 2456707
-SHA256 5e00e5e5390fdc7e2e5117761c853e6ea8de783bf7f21be63c611fc75d764eb8 netpbm-10.33.tgz 2456707
diff --git a/media-libs/netpbm/files/netpbm-10.19-message.patch b/media-libs/netpbm/files/netpbm-10.19-message.patch
deleted file mode 100644 (file)
index 10a5744..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
---- netpbm-10.19/converter/other/giftopnm.c.message    2003-10-30 02:46:12.000000000 +0100
-+++ netpbm-10.19/converter/other/giftopnm.c    2004-02-09 17:02:56.964219996 +0100
-@@ -1255,7 +1255,8 @@
-                          requestedImageSeq+1,
-                          imageSeq, imageSeq>1?"s":"" );
-         } else {
--            pm_message("Reading Image Sequence %d", imageSeq);
-+            if (verbose)
-+                pm_message("Reading Image Sequence %d", imageSeq+1);
-             convertImage(ifP, !allImages && (imageSeq != requestedImageSeq), 
-                          imageout_file, alphafile, gifScreen, gif89);
-         }
diff --git a/media-libs/netpbm/files/netpbm-10.30-anytopnm.patch b/media-libs/netpbm/files/netpbm-10.30-anytopnm.patch
deleted file mode 100644 (file)
index 7f42b8a..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
- - make the findawk function more flexible and prefer gawk over all others
- - fix computeTypeFromMimeType so that it sets the proper var
-
---- converter/other/anytopnm
-+++ converter/other/anytopnm
-@@ -21,13 +21,13 @@
- # systems, 'awk' does not have gsub().  On other systems, 'awk' has all the
- # functions and 'nawk' does not exist.  On Solaris 8 and 9, we need 'nawk.
--  nawk 1>/dev/null 2>/dev/null 1</dev/null
--    
--  if [ $? -eq 127 ]; then
--    AWK=awk
--  else
--    AWK=nawk
--  fi
-+  for AWK in gawk nawk awk ; do
-+    $AWK 1>/dev/null 2>/dev/null 1</dev/null
-+
-+    if [ $? -ne 127 ]; then
-+      break
-+    fi
-+  done
- }
-@@ -90,26 +90,26 @@
-     case "$1" in
-         image/jpeg )
--            type="jfif"
-+            filetype="jfif"
-             ;;
-         image/gif )
--            type="gif"
-+            filetype="gif"
-             ;;
-         image/tiff )
--            type="tiff"
-+            filetype="tiff"
-             ;;
-         image/bmp )
--            type="bmp"
-+            filetype="bmp"
-             ;;
-         image/png )
--            type="png"
-+            filetype="png"
-             ;;
-         image/x-portable-bitmap | image/x-portable-pixmap | \
-                 image/x-portable-greymap)
--            type="pnm"
-+            filetype="pnm"
-             ;;
-         image/x-xpm )
--            type="xpm"
-+            filetype="xpm"
-             ;;
-         * )
-             filetype=unknown
diff --git a/media-libs/netpbm/files/netpbm-10.30-jpeg-prototypes.patch b/media-libs/netpbm/files/netpbm-10.30-jpeg-prototypes.patch
deleted file mode 100644 (file)
index 83df22f..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-Make sure we keep all the prototypes the same or we hit a build
-failure like this:
-converter/ppm/ppmtompeg/headers/jpeg.h:47:
-error: previous declaration of 'JMovie2JPEG' was here
-nojpeg.c:89: error: conflicting types for 'JMovie2JPEG'
-
-http://bugs.gentoo.org/111895
-
---- converter/ppm/ppmtompeg/headers/jpeg.h
-+++ converter/ppm/ppmtompeg/headers/jpeg.h
-@@ -44,6 +44,6 @@
- #include "ansi.h"
--extern void     JMovie2JPEG _ANSI_ARGS_((char *infilename, char *obase,
--                                        int start, int end));
--extern void ReadJPEG _ANSI_ARGS_((MpegFrame * mf, FILE *fp));
-+extern void     JMovie2JPEG _ANSI_ARGS_((const char * const infilename, const char * const obase,
-+                                        int const start, int end));
-+extern void ReadJPEG _ANSI_ARGS_((MpegFrame * const mf, FILE * const fp));
---- converter/ppm/ppmtompeg/nojpeg.c
-+++ converter/ppm/ppmtompeg/nojpeg.c
-@@ -86,7 +86,7 @@
- JMovie2JPEG(const char * const infilename,
-             const char * const obase,
-             int          const start,
--            int          const end) {
-+            int          end) {
-     pm_error("This program has not been built with the "
-              "ability to handle JPEG input files");
---- converter/ppm/ppmtompeg/jpeg.c
-+++ converter/ppm/ppmtompeg/jpeg.c
-@@ -72,10 +72,10 @@
-  ************************************************************************/
- void
-   JMovie2JPEG(infilename,obase,start,end)
--char *infilename;       /* input filename string */
--char *obase;            /* output filename base string=>obase##.jpg */ 
--int start;              /* first frame to be extracted */
--int end;                /* last frame to be extracted */
-+const char * const infilename;  /* input filename string */
-+const char * const obase;       /* output filename base string=>obase##.jpg */ 
-+int const start;                /* first frame to be extracted */
-+int end;                        /* last frame to be extracted */
- {
-   FILE *inFile;                       /* Jmovie file pointer */
-   FILE *outFile;              /* JPEG file pointer for output file */
diff --git a/media-libs/netpbm/files/netpbm-10.30-pngtopnm.patch b/media-libs/netpbm/files/netpbm-10.30-pngtopnm.patch
deleted file mode 100644 (file)
index 236096c..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix from upstream for http://bugs.gentoo.org/109783
-
---- converter/other/pngtopnm.c
-+++ converter/other/pngtopnm.c
-@@ -722,7 +722,7 @@
-     if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY ||
-         info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
--        retval = TRUE;
-+        retval = FALSE;
-     else if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) {
-         bool foundColor;
-         unsigned int i;
diff --git a/media-libs/netpbm/files/netpbm-10.30-tifftopnm.patch b/media-libs/netpbm/files/netpbm-10.30-tifftopnm.patch
deleted file mode 100644 (file)
index edf67c1..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix for http://bugs.gentoo.org/109781
-
---- converter/other/tifftopnm.c
-+++ converter/other/tifftopnm.c
-@@ -108,6 +108,9 @@
-     unsigned int option_def_index;
-     unsigned int alpha_spec;
-+    /* make sure we init in case some options werent provided */
-+    cmdlineP->alphaFilename = NULL;
-+
-     MALLOCARRAY_NOFAIL(option_def, 100);
-     opt.opt_table = option_def;
diff --git a/media-libs/netpbm/files/netpbm-10.31-need-libm.patch b/media-libs/netpbm/files/netpbm-10.31-need-libm.patch
deleted file mode 100644 (file)
index a241ad2..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-libnetpbm.so uses libm functions so we need to link with libm
-
-patch by Diego Pettenò
-http://bugs.gentoo.org/121253
-
---- netpbm-10.31/lib/Makefile
-+++ netpbm-10.31/lib/Makefile
-@@ -115,7 +115,7 @@
-       $(SYMLINK) $< $@
- libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBOBJECTS_X)
-       $(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \
--          $(SHLIB_CLIB) $(LADD)
-+          $(SHLIB_CLIB) $(LADD) -lm
- endif
- ifeq ($(NETPBMLIBTYPE),dll)
diff --git a/media-libs/netpbm/files/netpbm-10.31-parallel.patch b/media-libs/netpbm/files/netpbm-10.31-parallel.patch
deleted file mode 100644 (file)
index 5d989e4..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur netpbm-10.31.orig/GNUmakefile netpbm-10.31/GNUmakefile
---- netpbm-10.31.orig/GNUmakefile      2006-01-19 20:19:35.000000000 +0100
-+++ netpbm-10.31/GNUmakefile   2006-01-19 20:23:45.000000000 +0100
-@@ -62,7 +62,7 @@
- PRODUCT_SUBDIRS = lib converter analyzer editor generator other
- SUPPORT_SUBDIRS = urt buildtools
--SUBDIRS = $(PRODUCT_SUBDIRS) $(SUPPORT_SUBDIRS)
-+SUBDIRS = . $(PRODUCT_SUBDIRS) $(SUPPORT_SUBDIRS)
- SCRIPTS = manweb
- MANUALS1 = netpbm
diff --git a/media-libs/netpbm/files/netpbm-10.31-pnmtopng-modtime-segfault.patch b/media-libs/netpbm/files/netpbm-10.31-pnmtopng-modtime-segfault.patch
deleted file mode 100644 (file)
index ba81837..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-Fix segfault when running `pnmtopng`
-
-http://bugs.gentoo.org/117180
-
---- netpbm-10.31/converter/other/pnmtopng.c
-+++ netpbm-10.31/converter/other/pnmtopng.c
-@@ -267,7 +267,7 @@ parseCommandLine (int argc, char ** argv
-     unsigned int option_def_index;
-     unsigned int alphaSpec, transparentSpec, backgroundSpec;
--    unsigned int textSpec, ztxtSpec, modtimeSpec, paletteSpec;
-+    unsigned int textSpec, ztxtSpec, paletteSpec;
-     unsigned int filterSpec;
-     unsigned int nofilter, sub, up, avg, paeth, filter;
-@@ -296,7 +296,7 @@ parseCommandLine (int argc, char ** argv
-     OPTENT3(0, "ztxt",             OPT_STRING,    &cmdlineP->ztxt,
-             &ztxtSpec,             0);
-     OPTENT3(0, "modtime",          OPT_STRING,    &modtime,
--            &modtimeSpec,          0);
-+            &cmdlineP->modtimeSpec,0);
-     OPTENT3(0, "palette",          OPT_STRING,    &cmdlineP->palette,
-             &paletteSpec,          0);
-     OPTENT3(0, "compression",      OPT_UINT,
diff --git a/media-libs/netpbm/files/netpbm-10.32-parallel.patch b/media-libs/netpbm/files/netpbm-10.32-parallel.patch
deleted file mode 100644 (file)
index 0cc1644..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-Bug #116665: parallel build fails
-
-There are two problems.
-1. inttypes_netpbm.h is required by many files that include Makefile.common
-   via the target importinc, but the rule to create it is included only in
-   the root file GNUmakefile.
-2. Several makefiles in subdirectories do not contain complete dependency
-   information, especially dependencies on generated header files.
-   This is addressed by making importinc a dependencie of recursive calls
-   to make all.
-
-This patch also contains some changes between SRCDIR and BUILDDIR.
-As those are the same on Gentoo builds, these changes have not been tested.
-
-  2006-03-01 Martin von Gagern <Martin.vGagern@gmx.net>
-
-diff -rux Makefile.config netpbm-10.32/GNUmakefile netpbm/GNUmakefile
---- netpbm-10.32/GNUmakefile   2006-02-25 20:02:54.000000000 +0100
-+++ netpbm/GNUmakefile 2006-02-28 23:57:29.000000000 +0100
-@@ -89,6 +89,7 @@
- OMIT_CONFIG_RULE = 1
- OMIT_VERSION_H_RULE = 1
-+OMIT_INTTYPES_RULE = 1
- include $(SRCDIR)/Makefile.common
- $(BUILDDIR)/Makefile.config: $(SRCDIR)/Makefile.config.in
-@@ -107,7 +108,7 @@
- DELETEIT = (rm -f $@ || false)
--inttypes_netpbm.h: $(TYPEGEN)
-+$(BUILDDIR)/inttypes_netpbm.h: $(TYPEGEN)
-       $(TYPEGEN) >$@ || $(DELETEIT)
- # We run a couple of programs on the build machine in computing the
-diff -rux Makefile.config netpbm-10.32/Makefile.common netpbm/Makefile.common
---- netpbm-10.32/Makefile.common       2006-02-25 19:53:48.000000000 +0100
-+++ netpbm/Makefile.common     2006-02-28 23:53:49.000000000 +0100
-@@ -129,13 +129,11 @@
-   $(IMPORTINC_LIB_FILES) \
-   $(IMPORTINC_LIB_UTIL_FILES) \
--$(IMPORTINC_ROOT_FILES):importinc/%:$(SRCDIR)/%
-+$(IMPORTINC_ROOT_FILES):importinc/%:$(BUILDDIR)/%
-       mkdir -p importinc
-       rm -f $@
-       $(SYMLINK) $< $@
--importinc/pm_config.h: $(BUILDDIR)/pm_config.h
--
- $(IMPORTINC_LIB_FILES):importinc/%:$(SRCDIR)/lib/%
-       mkdir -p importinc
-       rm -f $@
-@@ -168,6 +166,11 @@
-       $(MAKE) -C $(dir $@) $(notdir $@)
- endif
-+ifneq ($(OMIT_INTTYPES_RULE),1)
-+$(BUILDDIR)/inttypes_netpbm.h:
-+      $(MAKE) -C $(dir $@) -f $(SRCDIR)/GNUmakefile $(notdir $@)
-+endif
-+
- # Note that any time you do a make on a fresh Netpbm source tree,
- # Make notices that 'Makefile.config', which the make files include, does not
- # exist and runs the "Makefile.config" target, which runs Configure.
-@@ -484,7 +487,7 @@
- %/install.merge:
-       $(MAKE) -C $(dir $@) -f $(SRCDIR)/$(SUBDIR)/$(dir $@)Makefile \
-           SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@) 
--$(SUBDIRS:%=%/all): %/all: $(CURDIR)/%
-+$(SUBDIRS:%=%/all): %/all: $(CURDIR)/% importinc
-       $(MAKE) -C $(dir $@) -f $(SRCDIR)/$(SUBDIR)/$(dir $@)Makefile \
-           SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@) 
- $(SUBDIRS:%=%/mergetrylist): %/mergetrylist: $(CURDIR)/% FORCE
diff --git a/media-libs/netpbm/files/netpbm-10.33-lib-objs.patch b/media-libs/netpbm/files/netpbm-10.33-lib-objs.patch
deleted file mode 100644 (file)
index 9c4c37e..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix building on PIC hosts (filename.o was added to LIBOBJECTS_X but this
-target wasn't updated ... so it gets built w/out -fPIC)
-
---- lib/Makefile
-+++ lib/Makefile
-@@ -184,7 +184,7 @@
- compile.h:
-       $(SRCDIR)/buildtools/stamp-date >$@ || rm $@
--util/shhopt.o util/nstring.o: FORCE
-+$(LIBOBJECTS_X): FORCE
-       @if [ ! -d $(dir $@) ] ; then mkdir $(dir $@) ; fi
-       $(MAKE) -C $(dir $@) -f $(SRCDIR)/$(SUBDIR)/$(dir $@)Makefile \
-               SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@) 
diff --git a/media-libs/netpbm/netpbm-10.26.29.ebuild b/media-libs/netpbm/netpbm-10.26.29.ebuild
deleted file mode 100644 (file)
index a0e09cd..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.26.29.ebuild,v 1.1 2006/06/09 13:43:14 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 ~hppa ~ia64 ~mips ~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
-
-       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}"/${PN}-${MAN_VER}-manpages || die
-       doman *.[0-9]
-       dodoc README* gen-netpbm-manpages
-}
diff --git a/media-libs/netpbm/netpbm-10.26.30.ebuild b/media-libs/netpbm/netpbm-10.26.30.ebuild
deleted file mode 100644 (file)
index a4bfc7a..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.26.30.ebuild,v 1.1 2006/08/05 06:50:36 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 ~hppa ~ia64 ~mips ~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
-
-       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}"/${PN}-${MAN_VER}-manpages || die
-       doman *.[0-9]
-       dodoc README* gen-netpbm-manpages
-}
diff --git a/media-libs/netpbm/netpbm-10.29.ebuild b/media-libs/netpbm/netpbm-10.29.ebuild
deleted file mode 100644 (file)
index 828d59a..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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.29.ebuild,v 1.10 2005/10/21 12:15:32 ka0ttic Exp $
-
-inherit flag-o-matic toolchain-funcs eutils
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 mips ppc ppc64 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 )"
-
-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/$(get_libdir)/libvga.so" >> Makefile.config
-       fi
-
-       if use jpeg ; then
-               echo "JPEGLIB = libjpeg.so" >> Makefile.config
-       fi
-
-       if use png ; then
-               echo "PNGLIB = libpng.so" >> Makefile.config
-       fi
-
-       if use tiff ; then
-               echo "TIFFLIB = libtiff.so" >> Makefile.config
-       fi
-
-       if use zlib ; then
-               echo "ZLIB = libz.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:$(CFLAGS):$(CFLAGS) -fPIC:' \
-               -e 's:$(LDFLAGS):$(LDFLAGS) -fPIC:' \
-               lib/Makefile
-        sed -i -e 's:$(CCOPT):$(CCOPT) -fPIC:' \
-               lib/util/Makefile
-
-}
-
-src_compile() {
-       emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die "emake failed"
-}
-
-src_install() {
-       make package pkgdir=${D}/usr/ || die "make package failed"
-
-       if [ "$(get_libdir)" != "lib" ]; then
-               mv ${D}/usr/lib ${D}/usr/$(get_libdir)
-       fi
-
-       # Fix symlink not being created.
-       dosym `basename ${D}/usr/$(get_libdir)/libnetpbm.so.*` /usr/$(get_libdir)/libnetpbm.so
-
-       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/VERSION
-       rm -rf ${D}/usr/pkginfo
-       rm -f ${D}/usr/config_template
-       dodir /usr/share
-       mv ${D}/usr/man ${D}/usr/share/man
-
-       # Install the maps in /usr/share/netpbm so other programs (like plucker) can
-       # use them.  #77797
-       mv ${D}/usr/misc ${D}/usr/share/netpbm
-
-       dodoc README
-       export GLOBIGNORE='*.html:.*'
-       cd doc && \
-               dodoc * && \
-               dohtml -r . || die "doc install failed"
-}
diff --git a/media-libs/netpbm/netpbm-10.30-r1.ebuild b/media-libs/netpbm/netpbm-10.30-r1.ebuild
deleted file mode 100644 (file)
index 0b4e53c..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.30-r1.ebuild,v 1.12 2006/01/07 10:04:58 vapier Exp $
-
-inherit flag-o-matic toolchain-funcs eutils multilib
-
-MAN_VER=${PV}
-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 ppc ppc64 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.30-anytopnm.patch
-       epatch "${FILESDIR}"/netpbm-10.30-pngtopnm.patch
-       epatch "${FILESDIR}"/netpbm-10.30-tifftopnm.patch
-       epatch "${FILESDIR}"/netpbm-10.30-jpeg-prototypes.patch #111895
-
-       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
-       append-flags -Wall
-
-       # 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}"/${PN}-${MAN_VER}-manpages || die
-       doman *.[0-9]
-       dodoc README* gen-netpbm-manpages
-}
diff --git a/media-libs/netpbm/netpbm-10.31-r1.ebuild b/media-libs/netpbm/netpbm-10.31-r1.ebuild
deleted file mode 100644 (file)
index 59f9b7e..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.31-r1.ebuild,v 1.4 2006/02/02 22:47:44 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 ~ppc ~ppc64 ~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.31-build.patch
-       epatch "${FILESDIR}"/netpbm-10.30-tifftopnm.patch
-       epatch "${FILESDIR}"/netpbm-10.31-pnmtopng-modtime-segfault.patch #117180
-       epatch "${FILESDIR}"/netpbm-10.19-message.patch #Fedora
-       epatch "${FILESDIR}"/netpbm-10.31-need-libm.patch #121253
-       epatch ${FILESDIR}/${P}-parallel.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
-       append-flags -Wall
-
-       # 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}"/${PN}-${MAN_VER}-manpages || die
-       doman *.[0-9]
-       dodoc README* gen-netpbm-manpages
-}
diff --git a/media-libs/netpbm/netpbm-10.32.ebuild b/media-libs/netpbm/netpbm-10.32.ebuild
deleted file mode 100644 (file)
index cabcc50..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.32.ebuild,v 1.3 2006/03/08 01:58:39 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 ~ppc ~ppc64 ~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.31-build.patch
-       epatch "${FILESDIR}"/netpbm-10.30-tifftopnm.patch
-       epatch "${FILESDIR}"/netpbm-10.32-parallel.patch
-
-       rm -f configure
-       cp Makefile.config.in Makefile.config
-       cat >> Makefile.config <<-EOF
-       # Gentoo toolchain options
-       CC = $(tc-getCC) -Wall
-       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
-}
-
-src_compile() {
-       replace-flags -mcpu=ultrasparc "-mcpu=v8 -mtune=ultrasparc"
-       replace-flags -mcpu=v9 "-mcpu=v8 -mtune=v9"
-
-       emake || die
-}
-
-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}"/${PN}-${MAN_VER}-manpages || die
-       doman *.[0-9]
-       dodoc README* gen-netpbm-manpages
-}
diff --git a/media-libs/netpbm/netpbm-10.33.ebuild b/media-libs/netpbm/netpbm-10.33.ebuild
deleted file mode 100644 (file)
index 9992883..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.33.ebuild,v 1.3 2006/04/17 00:12:53 flameeyes Exp $
-
-inherit flag-o-matic toolchain-funcs eutils multilib
-
-MAN_VER=10.33
-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 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-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 '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';;
-               *)         echo '$(LDFLAGS) -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.31-build.patch
-       epatch "${FILESDIR}"/netpbm-10.33-lib-objs.patch
-       epatch "${FILESDIR}/${P}-memmem.patch"
-
-       rm -f configure
-       cp Makefile.config.in Makefile.config
-       cat >> Makefile.config <<-EOF
-       # Gentoo toolchain options
-       CC = $(tc-getCC) -Wall
-       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
-}
-
-src_compile() {
-       replace-flags -mcpu=ultrasparc "-mcpu=v8 -mtune=ultrasparc"
-       replace-flags -mcpu=v9 "-mcpu=v8 -mtune=v9"
-
-       emake || die
-}
-
-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}"/${PN}-${MAN_VER}-manpages || die
-       doman *.[0-9]
-       dodoc README* gen-netpbm-manpages
-}