diff options
| -rw-r--r-- | media-libs/netpbm/Manifest | 1 | ||||
| -rw-r--r-- | media-libs/netpbm/files/netpbm-10.31-build.patch | 50 | ||||
| -rw-r--r-- | media-libs/netpbm/files/netpbm-10.66-test.patch | 17 | ||||
| -rw-r--r-- | media-libs/netpbm/files/netpbm-10.70-system-libs.patch | 40 | ||||
| -rw-r--r-- | media-libs/netpbm/netpbm-10.70.00.ebuild | 205 |
5 files changed, 0 insertions, 313 deletions
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest index acb659885fd9..c1b2c7ff12b3 100644 --- a/media-libs/netpbm/Manifest +++ b/media-libs/netpbm/Manifest @@ -1,3 +1,2 @@ -DIST netpbm-10.70.00.tar.xz 2621612 BLAKE2B 2b07d130de0afeb3c1df32c6d267bc6bd13d4f556988cb7784b51941d81de1ad4f3381a0788eec6309bc6c024a21eb273a5f00726f6bb9a8ecb87f547678fc77 SHA512 f70d6dd79ce813f9fc4935d382b50bd3cecdf02c324b0f012056e56e33f24b621e8c1b3d054c6f470d437d0d793593de95eaa9724055d59c342228398a40f0b4 DIST netpbm-10.86.24.tar.xz 3698448 BLAKE2B 189fbaeb91db15e317c62758c64d1165d3cb32fa0221b2dcdefb0425577d4af9a13e66c35774149a44727c99fc18263123fd3c2b71f6409344bcf458341a4470 SHA512 50ad5a726c4219e1d87c7a46868b8f7bdb2d676903f049816b58e00addb416e4684a6c669188beebc5cc3c3961d2b0e35cd663215196d9925e3a23a989e14be3 DIST netpbm-10.86.27.tar.xz 3699900 BLAKE2B cf1e2742b343100081d53cdccfca5d41ce46ad57adb72c10c2e8ea94547e8d097e657c50554dae79b47c5c2e8d8146d15ef372b9e031152411b3379a0998a8d8 SHA512 b809b05647b4f4509db04a937a5c0b03301ccf93a56d773d6ddfe11a1cdc254befeb311e20306e5329db75fce9697b823c351a32ba0a771f4545793a55cb646c diff --git a/media-libs/netpbm/files/netpbm-10.31-build.patch b/media-libs/netpbm/files/netpbm-10.31-build.patch deleted file mode 100644 index 281f8ee928f7..000000000000 --- a/media-libs/netpbm/files/netpbm-10.31-build.patch +++ /dev/null @@ -1,50 +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' - ---- a/lib/Makefile -+++ b/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) ---- a/GNUmakefile -+++ b/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 ---- a/buildtools/libopt.c -+++ b/buildtools/libopt.c -@@ -502,7 +502,7 @@ - - strcpy(outputLine, ""); /* initial value */ - runtime = FALSE; /* initial value */ -- quiet = FALSE; /* initial value */ -+ quiet = TRUE; /* initial value */ - error = FALSE; /* no error yet */ - for (arg = 1; arg < argc && !error; arg++) { - if (strcmp(argv[arg], "-runtime") == 0) diff --git a/media-libs/netpbm/files/netpbm-10.66-test.patch b/media-libs/netpbm/files/netpbm-10.66-test.patch deleted file mode 100644 index 7c80648bafab..000000000000 --- a/media-libs/netpbm/files/netpbm-10.66-test.patch +++ /dev/null @@ -1,17 +0,0 @@ -https://bugs.gentoo.org/450530 - -we disable fiascotopnm all the time, so delete the test too - ---- a/test/all-in-place.test -+++ b/test/all-in-place.test -@@ -387,10 +387,6 @@ for i in $ordinary_testprogs - - - --# Test fiascotopnm, which has a unique -v flag. -- --${PBM_TESTPREFIX}fiascotopnm -v 2> /dev/null -- testExitStatus fiascotopnm 2 $? - - - diff --git a/media-libs/netpbm/files/netpbm-10.70-system-libs.patch b/media-libs/netpbm/files/netpbm-10.70-system-libs.patch deleted file mode 100644 index efe9fd8dd3c4..000000000000 --- a/media-libs/netpbm/files/netpbm-10.70-system-libs.patch +++ /dev/null @@ -1,40 +0,0 @@ -when we disable the bundled libs, make sure we don't try to run install in them - ---- a/converter/other/jbig/Makefile -+++ b/converter/other/jbig/Makefile -@@ -5,7 +5,7 @@ endif - SUBDIR = converter/other/jbig - VPATH=.:$(SRCDIR)/$(SUBDIR) - --SUBDIRS = libjbig -+SUBDIRS = - - include $(BUILDDIR)/config.mk - -@@ -35,6 +35,7 @@ SCRIPTS = - - ifeq ($(JBIGLIB),$(INTERNAL_JBIGLIB)) - JBIGLIB_DEP = $(JBIGLIB) -+ SUBDIRS += libjbig - else - # It's not our internal version; user's on his own to make sure it's built - endif ---- a/converter/other/jpeg2000/Makefile -+++ b/converter/other/jpeg2000/Makefile -@@ -5,7 +5,7 @@ endif - SUBDIR = converter/other/jpeg2000 - VPATH=.:$(SRCDIR)/$(SUBDIR) - --SUBDIRS = libjasper -+SUBDIRS = - - include $(BUILDDIR)/config.mk - -@@ -52,6 +52,7 @@ ifeq ($(JASPERLIB),$(INTERNAL_JASPERLIB) - # MERGE_OBJECTS contains relative paths, so $(INTERNAL_JASPERLIB) had better - # be relative to the current directory. - MERGE_OBJECTS += $(JASPERLIB) -+ SUBDIRS += libjasper - endif - MERGEBINARIES = $(BINARIES) - diff --git a/media-libs/netpbm/netpbm-10.70.00.ebuild b/media-libs/netpbm/netpbm-10.70.00.ebuild deleted file mode 100644 index 595ad00ef034..000000000000 --- a/media-libs/netpbm/netpbm-10.70.00.ebuild +++ /dev/null @@ -1,205 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib toolchain-funcs - -DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats" -HOMEPAGE="http://netpbm.sourceforge.net/" -SRC_URI="mirror://gentoo/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="doc jbig jpeg png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib" - -BDEPEND="app-arch/xz-utils - sys-devel/flex" -RDEPEND="jbig? ( media-libs/jbigkit ) - jpeg? ( virtual/jpeg:0 ) - png? ( >=media-libs/libpng-1.4:0 ) - rle? ( media-libs/urt ) - svga? ( media-libs/svgalib ) - tiff? ( >=media-libs/tiff-3.5.5:0 ) - xml? ( dev-libs/libxml2 ) - zlib? ( sys-libs/zlib ) - X? ( x11-libs/libX11 )" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/netpbm-10.31-build.patch - "${FILESDIR}"/netpbm-10.66-test.patch #450530 - "${FILESDIR}"/netpbm-10.70-system-libs.patch -) - -netpbm_libtype() { - case ${CHOST} in - *-darwin*) echo dylib;; - *) echo unixshared;; - esac -} - -netpbm_libsuffix() { - local suffix=$(get_libname) - echo "${suffix//\.}" || die -} - -netpbm_ldshlib() { - case ${CHOST} in - *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';; - *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';; - esac -} - -netpbm_config() { - if use $1 ; then - [[ $2 != "!" ]] && echo -l${2:-$1} - else - echo NONE || die - fi -} - -src_prepare() { - default - - # make sure we use system libs - sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die - rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die - - # disable certain tests based on active USE flags - local del=( - $(usex jbig '' 'jbigtopnm pnmtojbig jbig-roundtrip') - $(usex rle '' 'utahrle-roundtrip') - $(usex tiff '' 'tiff-roundtrip') - ) - - if [[ "${#del[@]}" -gt 0 ]] ; then - sed -i -r $(printf -- ' -e /%s.test/d' "${del[@]}") test/Test-Order || die - fi - - del=( - pnmtofiasco fiascotopnm # We always disable fiasco - $(usex jpeg '' 'jpegtopnm pnmtojpeg ppmtojpeg') - $(usex jbig '' 'jbigtopnm pnmtojbig') - jpeg2ktopam pamtojpeg2k # jasper has been removed - $(usex rle '' 'pnmtorle rletopnm') - $(usex tiff '' 'pamtotiff pnmtotiff pnmtotiffcmyk tifftopnm') - ) - - if [[ "${#del[@]}" -gt 0 ]] ; then - sed -i -r $(printf -- ' -e s/\<%s\>(:.ok)?//' "${del[@]}") test/all-in-place.{ok,test} || die - sed -i '/^$/d' test/all-in-place.ok || die - fi - - # take care of the importinc stuff ourselves by only doing it once - # at the top level and having all subdirs use that one set #149843 - sed -i \ - -e '/^importinc:/s|^|importinc:\nmanual_|' \ - -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\ - common.mk || die - - sed -i \ - -e '/%.c/s: importinc$::' \ - common.mk lib/Makefile lib/util/Makefile || die - - # avoid ugly depend.mk warnings - touch $(find . -name Makefile | sed s:Makefile:depend.mk:g) -} - -src_configure() { - cat config.mk.in - >> config.mk <<-EOF - # Misc crap - BUILD_FIASCO = N - SYMLINK = ln -sf - - # These vars let src_test work by default - PKGDIR_DEFAULT = ${T}/netpbm - RESULTDIR_DEFAULT = ${T}/netpbm-test - - # Toolchain options - CC = $(tc-getCC) -Wall - LD = \$(CC) - CC_FOR_BUILD = $(tc-getBUILD_CC) - LD_FOR_BUILD = \$(CC_FOR_BUILD) - AR = $(tc-getAR) - RANLIB = $(tc-getRANLIB) - - STRIPFLAG = - CFLAGS_SHLIB = -fPIC - - LDRELOC = \$(LD) -r - LDSHLIB = $(netpbm_ldshlib) - LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to - LINKERISCOMPILER = Y - NETPBMLIBSUFFIX = $(netpbm_libsuffix) - NETPBMLIBTYPE = $(netpbm_libtype) - STATICLIB_TOO = $(usex static-libs Y N) - - # The var is called SSE, but the code is actually SSE2. - WANT_SSE = $(usex cpu_flags_x86_sse2 Y N) - - # Gentoo build options - TIFFLIB = $(netpbm_config tiff) - # Let tiff worry about its own dependencies #395753 - TIFFLIB_NEEDS_JPEG = N - TIFFLIB_NEEDS_Z = N - JPEGLIB = $(netpbm_config jpeg) - PNGLIB = $(netpbm_config png) - ZLIB = $(netpbm_config zlib z) - LINUXSVGALIB = $(netpbm_config svga vga) - XML2_LIBS = $(netpbm_config xml xml2) - JBIGLIB = $(netpbm_config jbig) - JBIGHDR_DIR = - JASPERLIB = NONE - JASPERHDR_DIR = - URTLIB = $(netpbm_config rle) - URTHDR_DIR = - X11LIB = $(netpbm_config X X11) - X11HDR_DIR = - EOF - # cannot chain the die with the heredoc above as bash-3 - # has a parser bug in that setup #282902 - [[ $? -eq 0 ]] || die "writing config.mk failed" -} - -src_compile() { - emake -j1 pm_config.h version.h manual_importinc #149843 - emake -} - -src_test() { - # The code wants to install everything first and then test the result. - emake install.{bin,lib} - emake check -} - -src_install() { - # Subdir make targets like to use `mkdir` all over the place - # without any actual dependencies, thus the -j1. - emake -j1 package pkgdir="${ED}"/usr - - if [[ $(get_libdir) != "lib" ]] ; then - mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die - fi - - # Remove cruft that we don't need, and move around stuff we want - rm "${ED}"/usr/bin/{doc.url,manweb} || die - rm -r "${ED}"/usr/man/web || die - rm -r "${ED}"/usr/link || die - rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die - - dodir /usr/share - mv "${ED}"/usr/man "${ED}"/usr/share/ || die - mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die - - doman userguide/*.[0-9] - dodoc README - - cd doc || die - dodoc HISTORY Netpbm.programming USERDOC - - docinto html - dodoc -r *.html - use doc && dodoc -r ../userguide/*.html -} |