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 3A7AF15808B for ; Mon, 30 Sep 2024 06:04:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5FBB5E2A49; Mon, 30 Sep 2024 06:04:31 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3725CE2A49 for ; Mon, 30 Sep 2024 06:04:31 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4295134311E for ; Mon, 30 Sep 2024 06:04:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D4178C36 for ; Mon, 30 Sep 2024 06:04:28 +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: <1727676249.c82aa0b161c8dcf97cd40208a227bca5c3bfa2b1.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.2.10.ebuild media-libs/netpbm/netpbm-11.2.11.ebuild media-libs/netpbm/netpbm-11.2.9-r1.ebuild media-libs/netpbm/netpbm-11.8.0.ebuild X-VCS-Directories: media-libs/netpbm/ X-VCS-Committer: ceamac X-VCS-Committer-Name: Viorel Munteanu X-VCS-Revision: c82aa0b161c8dcf97cd40208a227bca5c3bfa2b1 X-VCS-Branch: master Date: Mon, 30 Sep 2024 06:04:28 +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: 692e2468-2a6a-4d9b-b4a4-f4c825753b4d X-Archives-Hash: 53f14da6620f1a2ce3972d5f7f52121b commit: c82aa0b161c8dcf97cd40208a227bca5c3bfa2b1 Author: Viorel Munteanu gentoo org> AuthorDate: Mon Sep 30 05:54:03 2024 +0000 Commit: Viorel Munteanu gentoo org> CommitDate: Mon Sep 30 06:04:09 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c82aa0b1 media-libs/netpbm: add 11.8.0 Signed-off-by: Viorel Munteanu gentoo.org> media-libs/netpbm/Manifest | 1 + media-libs/netpbm/netpbm-11.2.10.ebuild | 2 +- media-libs/netpbm/netpbm-11.2.11.ebuild | 2 +- media-libs/netpbm/netpbm-11.2.9-r1.ebuild | 2 +- ...{netpbm-11.2.11.ebuild => netpbm-11.8.0.ebuild} | 72 ++++++++++------------ 5 files changed, 36 insertions(+), 43 deletions(-) diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest index fbca555eadb6..60b7a5dedbf9 100644 --- a/media-libs/netpbm/Manifest +++ b/media-libs/netpbm/Manifest @@ -2,3 +2,4 @@ DIST netpbm-11.2.10.tar.xz 3782160 BLAKE2B 22dab865106f48a83992ff780a3a3cb26e7fd DIST netpbm-11.2.11.tar.xz 3782252 BLAKE2B 422b9cefee2a54a9c222236935291f0c8d1f13f064f4ebd277d0f92974b9ce3d7e3d9ae6a0410d767553704a03c2de14ca8456996a53fca0f95d61f9ae72605f SHA512 3d94c0c8c25873a16c78af960c964f5756b3e7a29463f001345956acc3bf1378b0b0b4fc0c57d7388dced0979ba4e8cee0def2200092544dd96fc7d04304660b DIST netpbm-11.2.9.tar.xz 3782172 BLAKE2B b5acec8306c820e7b0ac2dec21ab5df8f2cdbec01d3d59f82b307d90111954e81e1b01ad7d8e25e8fbd0ea7cf61e8b023e3dfaed6d1cab71b51f7e367d792e56 SHA512 02961bb2ac4a4292e028ed5dbd05daf89ac795f50d36d97be67c49a61be0cbd977e954aa9266c4649d9a46de3fbe7c4b2b51c8363cc7bee322926dd4a9af2ab1 DIST netpbm-11.7.2.tar.xz 3805736 BLAKE2B 8b194c5c49d2422cb5101579716a0295bb364c80172e9a4eeb563e1cdbe44e681397e15207d117da7f0bb997cb90d3c4c8cb4299bc33ede74f9e845714448c1d SHA512 1a56118e89ce68caca09b59b05da7291e1ca706279862ea77e5266022aa939f32e49f9ea127065776f64faff3222ea3f24b6a385bcd6c34a60eb86207983a9b8 +DIST netpbm-11.8.0.tar.xz 3804048 BLAKE2B 8f838790a38decca5efdbd8b05c07a9e13f3d10093e118547674b84e053534f2f05ccb7a8c6e9e8a1ba5bb121036b7b1b3a88841ee28bc92a7d06865fd905481 SHA512 f7ce52bda45157d8b8ecac2076e3073b471b02cdeab3fe5e61862c5b79fa247d2109703a419098028eeb335d71441794708985f5f6c31b77da4daba04df23e80 diff --git a/media-libs/netpbm/netpbm-11.2.10.ebuild b/media-libs/netpbm/netpbm-11.2.10.ebuild index c6199bf3f6c3..39d53ac0580d 100644 --- a/media-libs/netpbm/netpbm-11.2.10.ebuild +++ b/media-libs/netpbm/netpbm-11.2.10.ebuild @@ -8,7 +8,7 @@ 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.7.yy) on SLOT "0/advanced". +# and the advanced branch of their svn (currently versions 11.8.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 diff --git a/media-libs/netpbm/netpbm-11.2.11.ebuild b/media-libs/netpbm/netpbm-11.2.11.ebuild index 9a28f7bcf4a0..479210cdd749 100644 --- a/media-libs/netpbm/netpbm-11.2.11.ebuild +++ b/media-libs/netpbm/netpbm-11.2.11.ebuild @@ -8,7 +8,7 @@ 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.7.yy) on SLOT "0/advanced". +# and the advanced branch of their svn (currently versions 11.8.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 diff --git a/media-libs/netpbm/netpbm-11.2.9-r1.ebuild b/media-libs/netpbm/netpbm-11.2.9-r1.ebuild index 556244652106..85aa017b7bfb 100644 --- a/media-libs/netpbm/netpbm-11.2.9-r1.ebuild +++ b/media-libs/netpbm/netpbm-11.2.9-r1.ebuild @@ -8,7 +8,7 @@ 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.6.yy) on SLOT "0/advanced". +# and the advanced branch of their svn (currently versions 11.8.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 diff --git a/media-libs/netpbm/netpbm-11.2.11.ebuild b/media-libs/netpbm/netpbm-11.8.0.ebuild similarity index 84% copy from media-libs/netpbm/netpbm-11.2.11.ebuild copy to media-libs/netpbm/netpbm-11.8.0.ebuild index 9a28f7bcf4a0..31d10bb8169f 100644 --- a/media-libs/netpbm/netpbm-11.2.11.ebuild +++ b/media-libs/netpbm/netpbm-11.8.0.ebuild @@ -8,7 +8,7 @@ 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.7.yy) on SLOT "0/advanced". +# and the advanced branch of their svn (currently versions 11.8.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 @@ -18,7 +18,7 @@ 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/stable" +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" @@ -57,7 +57,6 @@ 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 - "${FILESDIR}"/netpbm-11.2.7-fix-pnmcolormap2-test.patch "${FILESDIR}"/netpbm-11.6.1-incompatible-pointer-types.patch "${FILESDIR}"/netpbm-11.7.2-lto.patch ) @@ -96,81 +95,74 @@ src_prepare() { default # make sure we use system libs - sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die + sed '/SUPPORT_SUBDIRS/s:urt::' -i 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 \ + sed \ -e '/^importinc:/s|^|importinc:\nmanual_|' \ -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\ - common.mk || die - sed -i \ + -i common.mk || die + sed \ -e '/%.c/s: importinc$::' \ - common.mk lib/Makefile lib/util/Makefile || die - sed -i \ + -i common.mk lib/Makefile lib/util/Makefile || die + sed \ -e 's:pkg-config:$(PKG_CONFIG):' \ - GNUmakefile converter/other/Makefile other/pamx/Makefile || die + -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 -i \ + sed \ -e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \ - converter/other/Makefile generator/Makefile || die - sed -i -r \ + -i converter/other/Makefile generator/Makefile || die + sed -r \ -e 's:(pbmtextps|pnmtops|pstopnm).*::' \ - test/all-in-place.{ok,test} || die - sed -i \ + -i test/all-in-place.{ok,test} || die + sed \ -e 's:lps-roundtrip.*::' \ -e 's:pbmtextps-dump.*::' \ -e 's:pbmtextps.*::' \ - test/Test-Order || die - sed -i \ + -i test/Test-Order || die + sed \ -e '/^$/d' \ - test/all-in-place.ok || die - sed -i \ + -i test/all-in-place.ok || die + sed \ '2iexit 80' \ - test/ps-{alt-,flate-,}roundtrip.test || die + -i 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 \ + sed -E \ -e 's:(pamtopng|pngtopam|pnmtopng).*::' \ - test/all-in-place.{ok,test} || die - sed -i \ + -i test/all-in-place.{ok,test} || die + sed \ -e '/^$/d' \ - test/all-in-place.ok || die + -i test/all-in-place.ok || die - sed -i -E \ + sed -E \ -e 's:(pamrgbatopng|pngtopnm).*::' \ - test/legacy-names.{ok,test} || die - sed -i \ + -i test/legacy-names.{ok,test} || die + sed \ -e '/^$/d' \ - test/legacy-names.ok || die - sed -i \ + -i test/legacy-names.ok || die + sed \ -e 's:png-roundtrip.*::' \ -e 's:winicon-roundtrip.*::' \ - test/Test-Order || die + -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 is broken 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 } @@ -260,7 +252,7 @@ src_install() { dodoc README cd doc || die - dodoc HISTORY Netpbm.programming USERDOC + dodoc HISTORY USERDOC docinto html dodoc -r ../userguide/*.html }