gentoo auto-resync : 30:09:2023 - 11:39:43

2 files changed, 34 insertions, 39 deletions

diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index b688dd7ccf80..2de98ec1c4b8 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -4,8 +4,8 @@ AUX netpbm-11.0.0-misc-deps.patch 1446 BLAKE2B 721e926a83d50d04d4a407051ee077db5
 AUX netpbm-11.1.0-fix-clang-O2.patch 773 BLAKE2B a8d2bef659d384b0f94560fec847d37731315f5cdb67e5474efb596672d146446c6d545caa816d74f9d4c32fe486ce49f8cb55f38e9706bae6b0ba79c0dbbb5e SHA512 0a0049415d5c252603c47325d69ae582bec76ac15f442682ef0a2ff8c5a8cd19e28543644883bde891f2a376a401f43ed923b184112f49c67d295b9215d519de
 DIST netpbm-11.2.0.tar.xz 3777372 BLAKE2B d9a2de49db61f642df75fe1c1fcda752f837535ac7cc698fb50e7c2c93dacfe3894fc46b402af30d07e3617f0f421a36d8d6a3d846c07d6b3526724dce93283b SHA512 70bde6e6112ae595e18be588ea95d2b2acb08e42bb36d0fc93b9584c4b2adf72e35f80ff87823a8e3d98a8ffd0ff907401d351533b9170d7a11a28515c10fdbd
 DIST netpbm-11.2.4.tar.xz 3791116 BLAKE2B bc3c4c7dd1c473cf6a0511c1a756dc11ddac693bd288daa8cac5d997d75f48ea9f039552decaff601a46fcdc1b08bba55596fc116547eee5a0ab78cf9a0ea55c SHA512 41219fcf8c02eb1f9bb8619d972312d63f0781e071f1c494ba5b2e1f2b614c37d78097259bcf39cb85feac783c811fcc24f088ec2cd406786296ae055ee10318
-DIST netpbm-11.3.6.tar.xz 3793216 BLAKE2B 9aad0279d4e639c8788fb24e62b80a8d326f2fd67aef23c8f8b64d269ce8aa5d9af9281b006199b180733cd38ae1ec9eea4df2c6caf12a19d64f763f10b40ec2 SHA512 0db3efa8679db998f9d6d7d973aa1e24c0db297070858297ca8ddb0a3926c7483a1608f75e7aa112a560850188845088d328582803baab8db8f4cef6e990ddba
+DIST netpbm-11.4.2.tar.xz 3792928 BLAKE2B 2742f27f04ce4c2a7f6189ae572583e9e96b7a6ba1f32bfd4f4fed7b193cf37191512178e901f64e06e13a51450541254637141054fbe7c41bad76e921537487 SHA512 9feea2a5e586e78dd07c9493cc69370c24007f80a1e0215c2d1f7b5a76228463da8dd49e94f5759faba7d91fb30bdb378dd3974dbc72218b68afeaa15bd163c6
 EBUILD netpbm-11.2.0.ebuild 6830 BLAKE2B c07e114dd61e0aef2f08f93bd722f72fac8021bbe9d369b111084a706e64f93e76913074e74758bc37780abd13eff479e58f00b524daf1a6ba2171b57272d825 SHA512 9cc1e468d04a7e8538e4ed1964e5a34834c8b3e637c4db7c79dde6c0290500d713ed09f3d746a07f0c6bce9fbf812f5be497050d79c6360a65aaadb1e793c83e
 EBUILD netpbm-11.2.4.ebuild 6838 BLAKE2B dbae0fa94f43bf2b7f0dc6a0797448a5b776730c9ae03277bddafca0d95e6e47769bdd0220772ccc65a3aaf54b0c8c22b1818a128cc62e92411b2aa75dd8f862 SHA512 1e0cfdde5a2e5856402edc684aa1dbc21a3141f288cb78ee1905efada4a7c0ba84f4b1a6cf4557777cf16be2c7754f0e2668c9544aa0b2bb5605ce63c889cdd2
-EBUILD netpbm-11.3.6.ebuild 6840 BLAKE2B 079ef16532536ddbc0435da2c49c63eaef668a6e1f2542d8fa02acccb41272acabc760f47b06c83ca77e6044944ca00cbe753a6ba3edcf0df36869955051de30 SHA512 e4a794b998ade53ece428a675ba4f4208400385e10bf6ad3a433eb47e9e34e306a816c3c641254a08460e29cf4eefa8388f961e67c4e97e083ca64f0b6879969
+EBUILD netpbm-11.4.2.ebuild 6722 BLAKE2B 65b486aaba5a3a219f484290ff4d22dd0e01781b9d441339dec183bd0f36f9430f7fa3ef1dd087b2b11dc858349c3a28e813fa63220bed4dc54bded4c5165c53 SHA512 b4eb0fcae2a166dcddd03b607d2ac90d91045e02189b249818ab4ffb55adc48f940b91aaa247fc1d930a29b0e14cfd63a1300aee4eebb8617ce51808954c2834
 MISC metadata.xml 424 BLAKE2B 9ccc907d6c15cb1a7d6cfe4679d6fa9f488642948897ca34958a06b439ebcfb912cfb18fa9d93f15f19573aed4bd7083d277151c477410a59cd64b4c9c0446d4 SHA512 a987be2134a44cc916d5a026068219b8ccaa149e577eaf2a53a7802321793129777cc79b069df95ec9320f15279249a5f9d8a61509452ef02effcb6c66cf9e80
diff --git a/media-libs/netpbm/netpbm-11.3.6.ebuild b/media-libs/netpbm/netpbm-11.4.2.ebuild
index 886d2f5cab79..1b6604b4e321 100644
--- a/media-libs/netpbm/netpbm-11.3.6.ebuild
+++ b/media-libs/netpbm/netpbm-11.4.2.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[.rev]"
-# and the advanced branch of their svn (currently versions 11.3.yy) on SLOT "0/advanced[.rev]".
+# and the advanced branch of their svn (currently versions 11.4.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
@@ -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/advanced.103"
+SLOT="0/advanced.104"
 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"
 
@@ -93,46 +93,41 @@ 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
@@ -140,30 +135,30 @@ src_prepare() {
 
 	# 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
 
 	# this test requires LC_ALL=en_US.iso88591, not available on musl
 	if use elibc_musl; then
-		sed -i \
+		sed \
 			-e 's:pbmtext-iso88591.*::' \
-			test/Test-Order || die
+			-i test/Test-Order || die
 	fi
 }
 
@@ -252,7 +247,7 @@ src_install() {
 	dodoc README
 
 	cd doc || die
-	dodoc HISTORY Netpbm.programming USERDOC
+	dodoc HISTORY USERDOC
 	docinto html
 	dodoc -r ../userguide/*.html
 }