From 3cafd803b6d89f6e823358a8d7f4a97e6d0629e1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 27 Oct 2022 15:57:47 +0100 Subject: gentoo auto-resync : 27:10:2022 - 15:57:47 --- media-libs/netpbm/Manifest | 4 +- media-libs/netpbm/netpbm-10.86.33.ebuild | 229 ------------------------------- media-libs/netpbm/netpbm-10.86.34.ebuild | 2 +- 3 files changed, 2 insertions(+), 233 deletions(-) delete mode 100644 media-libs/netpbm/netpbm-10.86.33.ebuild (limited to 'media-libs/netpbm') diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest index e2a8ba0d1f40..d4fbbb7e99be 100644 --- a/media-libs/netpbm/Manifest +++ b/media-libs/netpbm/Manifest @@ -3,8 +3,6 @@ AUX netpbm-10.86.21-build.patch 2319 BLAKE2B b22150c8683790c9ac31abc00b8f3f5b55c AUX netpbm-10.86.21-misc-deps.patch 1565 BLAKE2B a4d629ea9fe01efc45c799dac4bd3764368be33f264929bdc338bb724ace03471949467e5c84144636a9f4ee9130395dad77e23aa6686998bf9700dbde224cbf SHA512 f274ede7d11ed0f2a1825a4412a52fd9e30f5caf470c6111b606a87f1e67b16278c9f2a901d512ea3516ba033e30a3c08386cc5af1a555f868b7d7175fbfeed0 AUX netpbm-10.86.21-test.patch 331 BLAKE2B 59451b2f1632afdd8e84bcec0ef91e0589604706b373281bf4963385fe971991711cc6ed4f169cc45aa460ac1db20de69039b137da1a2ec3d6cb82b60ae5f745 SHA512 e5c1a88cc03e227c7a7a01e9586ceacaf24a6752f4285f228b0176a8a12a6a9ac83d8ce1c5965e8f56ab652b5e42aa2cd535f1e121449fe668312b7e49720e4f AUX netpbm-10.86.22-fix-ps-test.patch 15448 BLAKE2B cfe77600197fc39ef0be0ed793f5181db57fd718a6fed268a8afb2fd2b5afab404c3be3c89dc25d178f8fe2edc4d386e33f22f7b3bc826e9c90307ef3895830f SHA512 a521c771d2384cb86d87b4efdf05e0835adcbefb84d4e66e744b2f8bc40df5358f20c4824dce5a942ccc24b18168276278d65e8e9a529b7c09b157b3e02438bb -DIST netpbm-10.86.33.tar.xz 3696704 BLAKE2B 57657d69e235ee9babefce6e44e7ac35ac9b67c38797cee140488afe268687e4030158280c1064f8111891b9114106420314cdbce1b8be8d7dd45204a07aa5b0 SHA512 b0a555276e26d171705e93bdc26d33869fa611e01728d935edd0a7b96815db4f9ff264d7d6cecccc751b0bbfd639b14316f1ab576b1182b755e0f1832d8f43ca DIST netpbm-10.86.34.tar.xz 3698852 BLAKE2B 7ea0e93450fb0bdf50b1b498468dd32350f20c8e993cda3e0ffa942dcdeab775a532a4771b10c55c862340964a4520f51ea4916c20051d5140dbb0a9ce373860 SHA512 bbb4dc685a44c0d7733808edd938b1205891ae5cf312218ef717bf63053513058251a659e3cf9acc762b0aeec8da3fc8e8a05e1442591c87f5a1dce7f63ee870 -EBUILD netpbm-10.86.33.ebuild 6048 BLAKE2B d910c8a535e954db53376f7bd15eba900873de1763320e4e5a183974de2edeea978fa64750ff53740c43121739fa3f36d003ec549beaf142c2d5959e00f26c2a SHA512 f9c97f4e8c55590caa6f54110f244c643e70d2534d802c196e67f994af6f551e9974f1aef193a0e2c5b1ef675e5984ad0bd13914c7eda9ec36d182377cfb66cc -EBUILD netpbm-10.86.34.ebuild 6048 BLAKE2B d910c8a535e954db53376f7bd15eba900873de1763320e4e5a183974de2edeea978fa64750ff53740c43121739fa3f36d003ec549beaf142c2d5959e00f26c2a SHA512 f9c97f4e8c55590caa6f54110f244c643e70d2534d802c196e67f994af6f551e9974f1aef193a0e2c5b1ef675e5984ad0bd13914c7eda9ec36d182377cfb66cc +EBUILD netpbm-10.86.34.ebuild 6049 BLAKE2B 75cca31ec252ba64f4997d09a013e80b76d5aa4fa83654b7492a277f07c61e0070dcb0691b01a24662bb8549e9123ab8ea4ee0fd6a0dfe4d6aa7a2914582e1ad SHA512 bbf15b9c22a5a71e2e07f24fa946f757af8ac5f46fc8e9dfdc9fe6b23b329d1cff3c088f92ab62b3eb9e1a0fe985d8a39a2697cedee0da95ed7783e2d6d5392e MISC metadata.xml 578 BLAKE2B 44f5899feee3b35c43e1b21f631fc53acc615003a5ed21c3461b5946882f1b67b9de9ac0b3d5d24f9faf291bbc9d3410841ccbba15f4981fb5ec050195bf93d7 SHA512 a9ef7432d1404a5dfc2458761867fbdcb9be368f20ea3290bb0a2aac10a82c968d3d97c4dbbf65f4840f0a60e9266d63c577e33c27d3b8b45b70349cb211478d diff --git a/media-libs/netpbm/netpbm-10.86.33.ebuild b/media-libs/netpbm/netpbm-10.86.33.ebuild deleted file mode 100644 index 8b60df263a57..000000000000 --- a/media-libs/netpbm/netpbm-10.86.33.ebuild +++ /dev/null @@ -1,229 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic multilib toolchain-funcs - -DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats" -HOMEPAGE="http://netpbm.sourceforge.net/" -SRC_URI="https://github.com/ceamac/netpbm-make-dist/releases/download/v${PV}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml" - -BDEPEND=" - app-arch/xz-utils - sys-devel/flex - virtual/pkgconfig -" -# app-text/ghostscript-gpl is really needed for postscript -# some utilities execute /usr/bin/gs -RDEPEND="jbig? ( media-libs/jbigkit:= ) - jpeg? ( media-libs/libjpeg-turbo:=[static-libs?] ) - png? ( - >=media-libs/libpng-1.4:0= - sys-libs/zlib - ) - postscript? ( - app-text/ghostscript-gpl - sys-libs/zlib - ) - rle? ( media-libs/urt:= ) - svga? ( media-libs/svgalib ) - tiff? ( >=media-libs/tiff-3.5.5:0 ) - xml? ( dev-libs/libxml2 ) - X? ( x11-libs/libX11 )" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/netpbm-10.86.21-build.patch - "${FILESDIR}"/netpbm-10.86.21-test.patch #450530 - "${FILESDIR}"/netpbm-10.86.21-misc-deps.patch - "${FILESDIR}"/netpbm-10.86.22-fix-ps-test.patch #670362 -) - -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() { - if use ${1} ; then - [[ ${2} != "!" ]] && echo -l${2:-$1} - else - echo NONE - fi -} - -# for bug #828127 -netpbm_cflags_for_build() { - if is-flagq -fPIC; then - echo -fPIC - 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 - - # 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 - sed -i \ - -e 's:pkg-config:$(PKG_CONFIG):' \ - GNUmakefile converter/other/Makefile other/pamx/Makefile || die - - # The postscript knob is currently bound up with a fork test. - if ! use postscript ; then - sed -i \ - -e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \ - converter/other/Makefile generator/Makefile || die - sed -i -r \ - -e 's:(pbmtextps|pnmtops|pstopnm).*::' \ - test/all-in-place.{ok,test} || die - sed -i -e 's:lps-roundtrip.*::' test/Test-Order || die - sed -i -e '/^$/d' test/all-in-place.ok || die - sed -i '2iexit 80' test/ps-{alt-,flate-,}roundtrip.test || die - fi - - # the new postscript test needs +x - chmod +x test/lps-roundtrip.test - - # Do not test png if not built - if ! use png ; then - sed -i -r \ - -e 's:(pamtopng|pngtopam|pnmtopng).*::' \ - test/all-in-place.{ok,test} || die - sed -i -e '/^$/d' test/all-in-place.ok || die - - sed -i -r \ - -e 's:(pamrgbatopng|pngtopnm).*::' \ - test/legacy-names.{ok,test} || die - sed -i -e '/^$/d' test/legacy-names.ok || die - sed -i -e 's:png-roundtrip.*::' test/Test-Order || die - fi - - # this test requires LC_ALL=en_US.iso88591, not available on musl - if use elibc_musl; then - sed -i -e 's:pbmtext-iso88591.*::' test/Test-Order || die - fi -} - -src_configure() { - # cannot chain the die with the heredoc - # repoman tries to parse the heredoc and fails - 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) - PKG_CONFIG = $(tc-getPKG_CONFIG) - - STRIPFLAG = - CFLAGS_SHLIB = -fPIC - CFLAGS_FOR_BUILD += $(netpbm_cflags_for_build) - - 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 = $($(tc-getPKG_CONFIG) --libs zlib) - 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 - [[ $? -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,data} - 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/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die - - dodir /usr/share - 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 - dodoc -r ../userguide/*.html -} diff --git a/media-libs/netpbm/netpbm-10.86.34.ebuild b/media-libs/netpbm/netpbm-10.86.34.ebuild index 8b60df263a57..a9ec64dd2493 100644 --- a/media-libs/netpbm/netpbm-10.86.34.ebuild +++ b/media-libs/netpbm/netpbm-10.86.34.ebuild @@ -6,7 +6,7 @@ EAPI=8 inherit flag-o-matic multilib toolchain-funcs DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats" -HOMEPAGE="http://netpbm.sourceforge.net/" +HOMEPAGE="https://netpbm.sourceforge.net/" SRC_URI="https://github.com/ceamac/netpbm-make-dist/releases/download/v${PV}/${P}.tar.xz" LICENSE="GPL-2" -- cgit v1.2.3