From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1703286-garchives=archives.gentoo.org@lists.gentoo.org> 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 (4096 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3273A1580FD for <garchives@archives.gentoo.org>; Fri, 27 Dec 2024 09:17:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2C169E077D; Fri, 27 Dec 2024 09:17:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 099A6E077D for <gentoo-commits@lists.gentoo.org>; Fri, 27 Dec 2024 09:17:11 +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 33A4233BDFF for <gentoo-commits@lists.gentoo.org>; Fri, 27 Dec 2024 09:17:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 435C317F0 for <gentoo-commits@lists.gentoo.org>; Fri, 27 Dec 2024 09:17:08 +0000 (UTC) From: "Viorel Munteanu" <ceamac@gentoo.org> 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" <ceamac@gentoo.org> Message-ID: <1735291018.841652b7b879338a611badfba10b2a205274dc72.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.9.0.ebuild X-VCS-Directories: media-libs/netpbm/ X-VCS-Committer: ceamac X-VCS-Committer-Name: Viorel Munteanu X-VCS-Revision: 841652b7b879338a611badfba10b2a205274dc72 X-VCS-Branch: master Date: Fri, 27 Dec 2024 09:17:08 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e03805e4-d855-46a7-8ac1-d69f146615e0 X-Archives-Hash: 6b7242c6ce5e24c22f0d1b858ba34a2b commit: 841652b7b879338a611badfba10b2a205274dc72 Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> AuthorDate: Fri Dec 27 08:34:51 2024 +0000 Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> CommitDate: Fri Dec 27 09:16:58 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=841652b7 media-libs/netpbm: drop 11.9.0 Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org> media-libs/netpbm/Manifest | 1 - media-libs/netpbm/netpbm-11.9.0.ebuild | 260 --------------------------------- 2 files changed, 261 deletions(-) diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest index 2dc91d88d187..65bee825fb46 100644 --- a/media-libs/netpbm/Manifest +++ b/media-libs/netpbm/Manifest @@ -1,4 +1,3 @@ DIST netpbm-11.2.11.tar.xz 3782252 BLAKE2B 422b9cefee2a54a9c222236935291f0c8d1f13f064f4ebd277d0f92974b9ce3d7e3d9ae6a0410d767553704a03c2de14ca8456996a53fca0f95d61f9ae72605f SHA512 3d94c0c8c25873a16c78af960c964f5756b3e7a29463f001345956acc3bf1378b0b0b4fc0c57d7388dced0979ba4e8cee0def2200092544dd96fc7d04304660b DIST netpbm-11.2.12.tar.xz 3782188 BLAKE2B c8adb0ba54a982848a2ee0bafeacbdf4bf34dcd3ebaf6ec8473ab9c1edbe49299e1904fbea46d17fefafa0ec32a00fe79a8ab2793e6633a3f37c5db99477174a SHA512 a277aa0b70f994b9c18b7c1f2f64610d3e154e47871a82f06062ab6d1bb6b049c8d1b1c56fb9cf5d43e5b865dfea281f1caf95d40dfbbdcbc3e0134678a3b32c -DIST netpbm-11.9.0.tar.xz 3806004 BLAKE2B bc00128a712845870ca0cdb15ac954efeb43fbc148d16019a272a45f2a6d8e27440954e8877c5dc5da00fe76ca842014c71a8f494788abf882bced2908554251 SHA512 243b7a0a35e30eafc219c78a9a81425d71a6c61ee2cf9ef519d8c3f113e2c98f24e01b3dfe978602d1fdeb7c152f6cddd68e8073d6efbb0ae9f8c0f3ddcbdcfa DIST netpbm-11.9.1.tar.xz 3806184 BLAKE2B 9a8b018d113ee66a6cc194301303beb99ffa3573f9ee8fff97747d37c37dff2294030d097863a0e28c93a72e2a94da3bff33b9294571f7fc13cbc4388812d7d5 SHA512 f80b2506c077d6910360f1d79395bb63b7ba016a665e182c8ab7cfaefc4a6b768159e6c024db5d48ac4eb95fe5193256045147fc0c67ea6994fed3f566cc7571 diff --git a/media-libs/netpbm/netpbm-11.9.0.ebuild b/media-libs/netpbm/netpbm-11.9.0.ebuild deleted file mode 100644 index bbb92941ecc7..000000000000 --- a/media-libs/netpbm/netpbm-11.9.0.ebuild +++ /dev/null @@ -1,260 +0,0 @@ -# Copyright 1999-2024 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" -# and the advanced branch of their svn (currently versions 11.9.yy) on SLOT "0/advanced". -# 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" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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 - app-alternatives/lex - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/netpbm-11.9.0-build.patch - "${FILESDIR}"/netpbm-11.0.0-misc-deps.patch - "${FILESDIR}"/netpbm-11.1.0-fix-clang-O2.patch - "${FILESDIR}"/netpbm-11.6.1-incompatible-pointer-types.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 '/SUPPORT_SUBDIRS/s:urt::' -i 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 \ - -e '/^importinc:/s|^|importinc:\nmanual_|' \ - -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\ - -i common.mk || die - sed \ - -e '/%.c/s: importinc$::' \ - -i common.mk lib/Makefile lib/util/Makefile || die - sed \ - -e 's:pkg-config:$(PKG_CONFIG):' \ - -i GNUmakefile converter/other/Makefile other/pamx/Makefile || die - - # The postscript knob is currently bound up with a fork test. - if ! use postscript ; then - sed \ - -e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \ - -i converter/other/Makefile generator/Makefile || die - sed -r \ - -e 's:(pbmtextps|pnmtops|pstopnm).*::' \ - -i test/all-in-place.{ok,test} || die - sed \ - -e 's:lps-roundtrip.*::' \ - -e 's:pbmtextps-dump.*::' \ - -e 's:pbmtextps.*::' \ - -i test/Test-Order || die - sed \ - -e '/^$/d' \ - -i test/all-in-place.ok || die - sed \ - '2iexit 80' \ - -i test/ps-{alt-,flate-,}roundtrip.test || die - fi - - # Do not test png if not built - if ! use png ; then - sed -E \ - -e 's:(pamtopng|pngtopam|pnmtopng).*::' \ - -i test/all-in-place.{ok,test} || die - sed \ - -e '/^$/d' \ - -i test/all-in-place.ok || die - - sed -E \ - -e 's:(pamrgbatopng|pngtopnm).*::' \ - -i test/legacy-names.{ok,test} || die - sed \ - -e '/^$/d' \ - -i test/legacy-names.ok || die - sed \ - -e 's:png-roundtrip.*::' \ - -e 's:winicon-roundtrip.*::' \ - -i test/Test-Order || die - fi - - # pbmtext-iso88591 requires LC_ALL=en_US.iso88591, not available on musl - # pbmtext-utf8 requires locale, not available on musl - # ppmpat-random and pnmindex are broken on musl - # bug #907295 - if use elibc_musl; then - sed \ - -e 's:pbmtext-iso88591.*::' \ - -e 's:pbmtext-utf8.*::' \ - -e 's:ppmpat-random.*::' \ - -e 's:pnmindex.*::' \ - -i test/Test-Order || die - fi - - # broken in 11.9.0, upstream informed. Skip it for now. - sed -e 's:pammixmulti-identity.*::' -i test/Test-Order -} - -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 USERDOC - docinto html - dodoc -r ../userguide/*.html -}