From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 03E0E15800A for ; Thu, 3 Aug 2023 05:13:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2C0EF2BC014; Thu, 3 Aug 2023 05:13:43 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 148D02BC014 for ; Thu, 3 Aug 2023 05:13:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1E25A340D3B for ; Thu, 3 Aug 2023 05:13:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6B4B7E8F for ; Thu, 3 Aug 2023 05:13:40 +0000 (UTC) From: "Viorel Munteanu" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Viorel Munteanu" Message-ID: <1691038947.cbeed0ed9b8b36ae2d41d6b976ebb0985ae4e074.ceamac@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/netpbm/Manifest media-libs/netpbm/netpbm-11.3.0.ebuild X-VCS-Directories: media-libs/netpbm/ X-VCS-Committer: ceamac X-VCS-Committer-Name: Viorel Munteanu X-VCS-Revision: cbeed0ed9b8b36ae2d41d6b976ebb0985ae4e074 X-VCS-Branch: master Date: Thu, 3 Aug 2023 05:13:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3a32a194-4351-47a4-aa2b-cb923e4ff705 X-Archives-Hash: affbccb47c102c15430dd57d383547c0 commit: cbeed0ed9b8b36ae2d41d6b976ebb0985ae4e074 Author: Viorel Munteanu gentoo org> AuthorDate: Thu Aug 3 05:02:27 2023 +0000 Commit: Viorel Munteanu gentoo org> CommitDate: Thu Aug 3 05:02:27 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbeed0ed media-libs/netpbm: drop 11.3.0 Signed-off-by: Viorel Munteanu gentoo.org> media-libs/netpbm/Manifest | 1 - media-libs/netpbm/netpbm-11.3.0.ebuild | 258 --------------------------------- 2 files changed, 259 deletions(-) diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest index 37e6bc4a159b..d783fb50ac7b 100644 --- a/media-libs/netpbm/Manifest +++ b/media-libs/netpbm/Manifest @@ -1,4 +1,3 @@ DIST netpbm-10.86.36.tar.xz 3700660 BLAKE2B c5f0acd0147f2ad66f69ae2ade56fcbb5286faddc7f8f3387e2269fd20ea2586a29d7e7dc96bd715fe12896eef47803b826031087e6be8166183ba7cf82aebf4 SHA512 b05df76760629881047c44799a905a491fb4c139a9af909d77cc4238fc82dfac37ba174df4f81cb1177716ad38a37b26eadcc3889d2c2057ff9d850697fad3c6 DIST netpbm-11.2.0.tar.xz 3777372 BLAKE2B d9a2de49db61f642df75fe1c1fcda752f837535ac7cc698fb50e7c2c93dacfe3894fc46b402af30d07e3617f0f421a36d8d6a3d846c07d6b3526724dce93283b SHA512 70bde6e6112ae595e18be588ea95d2b2acb08e42bb36d0fc93b9584c4b2adf72e35f80ff87823a8e3d98a8ffd0ff907401d351533b9170d7a11a28515c10fdbd -DIST netpbm-11.3.0.tar.xz 3778748 BLAKE2B da847e2c4a23d6fb404b868cfabfae7b82fe744c0b04b49ed0c02ef8877690f752995cb570326673f0ffd7b4b75ce8bf086859971611e9d76b49e3124536d582 SHA512 6efbfee9174912fb2979834b090657572d400fb84bf137b5faa5c4517b9d3d9457d8b482acff586902e71566e3c0a7e3bad4c87cfec15a0efda03553c1314bce DIST netpbm-11.3.1.tar.xz 3779152 BLAKE2B fa342670a72939c661290b344819cb8ba1bc5f0d09c49cbe68560077384c985a714c6808a4858e5f0eb6a8fb52be698eb075ff7892d0972f4eeb571c3ebd45ef SHA512 d43fdb7f2a91575cb17486ab9ca31d5c0757fd9756a230db9b9bfc3a786f58a2fbb4f6f0ce40d396245a8b1dd718b8aab0d80611ec23b19312bcd93c5d2548b3 diff --git a/media-libs/netpbm/netpbm-11.3.0.ebuild b/media-libs/netpbm/netpbm-11.3.0.ebuild deleted file mode 100644 index 886d2f5cab79..000000000000 --- a/media-libs/netpbm/netpbm-11.3.0.ebuild +++ /dev/null @@ -1,258 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic multilib toolchain-funcs - -# Upstream has 3 flavors of netpbm: super stable, stable and advanced. -# They only provide a tarball for super stable, but super stable is a bit lagging. -# So we package the stable branch of their svn (currently versions 11.2.xx) on SLOT "0/stable[.rev]" -# and the advanced branch of their svn (currently versions 11.3.yy) on SLOT "0/advanced[.rev]". -# The stable branch is stabilized according to usual Gentoo rules, while the -# advanced branch will not be stabilized. -# A detailed explanation is here https://netpbm.sourceforge.net/release.html - -DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats" -HOMEPAGE="https://netpbm.sourceforge.net/" -SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}.tar.xz" - -LICENSE="Artistic BSD GPL-2 IJG LGPL-2.1 MIT public-domain" -SLOT="0/advanced.103" -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" - -# app-text/ghostscript-gpl is really needed for postscript -# some utilities execute /usr/bin/gs -# some installed programs are perl scripts -RDEPEND=" - dev-lang/perl - 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:= ) - xml? ( dev-libs/libxml2 ) - X? ( x11-libs/libX11 ) -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto -" -BDEPEND=" - app-arch/xz-utils - sys-devel/flex - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/netpbm-10.86.21-build.patch - "${FILESDIR}"/netpbm-11.0.0-misc-deps.patch - "${FILESDIR}"/netpbm-11.1.0-fix-clang-O2.patch -) - -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_lib() { - usex ${1} -l${2:-$1} NONE -} - -# 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 - - # fix typo in a test - sed -i \ - -e 's:^o#! /bin/sh:#! /bin/sh:' \ - test/stdin-ppm3.test || 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.*::' \ - -e 's:pbmtextps-dump.*::' \ - -e 's:pbmtextps.*::' \ - 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 || die - - # Do not test png if not built - if ! use png ; then - sed -i -E \ - -e 's:(pamtopng|pngtopam|pnmtopng).*::' \ - test/all-in-place.{ok,test} || die - sed -i \ - -e '/^$/d' \ - test/all-in-place.ok || die - - sed -i -E \ - -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.*::' \ - -e 's:winicon-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() { - cat config.mk.in - >> config.mk <<-EOF || die "writing config.mk failed" - # Misc stuff - 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_lib tiff) - # Let tiff worry about its own dependencies #395753 - TIFFLIB_NEEDS_JPEG = N - TIFFLIB_NEEDS_Z = N - JPEGLIB = $(netpbm_config_lib jpeg) - PNGLIB = $(netpbm_config_lib png) - ZLIB = $($(tc-getPKG_CONFIG) --libs zlib) - LINUXSVGALIB = $(netpbm_config_lib svga vga) - XML2_LIBS = $(netpbm_config_lib xml xml2) - JBIGLIB = $(netpbm_config_lib jbig) - JBIGHDR_DIR = - JASPERLIB = NONE - JASPERHDR_DIR = - URTLIB = $(netpbm_config_lib rle) - URTHDR_DIR = - X11LIB = $(netpbm_config_lib X X11) - X11HDR_DIR = - EOF -} - -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 ../userguide/*.html -}