gentoo auto-resync : 20:03:2023 - 18:37:48

6 files changed, 249 insertions, 4 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index a34253ebb73e..250458919c96 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/kvazaar/Manifest b/media-libs/kvazaar/Manifest
index 4d3f6e49250a..1ea04fd0169e 100644
--- a/media-libs/kvazaar/Manifest
+++ b/media-libs/kvazaar/Manifest
@@ -3,6 +3,6 @@ DIST greatest-1.2.1.tar.gz 19792 BLAKE2B e6abd20eebf3223311fcd62e341595318dd00f1
 DIST kvazaar-2.1.0.tar.gz 605962 BLAKE2B 0d61af55ab0caef2247524e8c564f9c24cfb479fcbd721f43e4409899e1a187a0e6de0b08a052cfb144ea31da906ba1c2160d6712828d6e55f0826d87f5c96ba SHA512 14b29f48908e004cf1b4f1f0c338b7b134a34140edcd58a645b4529c506cd567ebe3d56aa66e469dc417e1baa29bb8a476825b78825e810ac68a029191ad32ec
 DIST kvazaar-2.2.0.tar.gz 617414 BLAKE2B 6ddb88ddea315d80e0af87a13127f235c184ae829492d1ff456899d2a24669b3deca25a320a8bdcf6e2cebc2c24e33c0678ac7bf51d2634a46781f66497bed54 SHA512 476abe251d7f555911851bc5a7dca84a96c0cd243c6a45dd59b808b8adf2b0787f69101a061bd48dfb6fe54a0aea046417f21fc826f14f518cada25c6d22aec4
 EBUILD kvazaar-2.1.0.ebuild 1893 BLAKE2B 4fd421fc771cdef9ad7ce50e7cd4778aae6e1b8a2c18ed061e4a6e3acfce4256080ed2c188d9e66ca72d9a4063d34ad0bd237477a73ce31d51dd8d30a1863071 SHA512 9983889198b20539ab3a2e9a40fccb972be786189463df7bc2187b88a11540cdfbfc2d324369b622e5c7fba7d6cd4fd0126bc77b65bd2f4485286b131dbf35a7
-EBUILD kvazaar-2.2.0.ebuild 1587 BLAKE2B db1bf5792deb3c5b3e993d08b87ad3e15b4e65a79c905c8d2917ae3a1273595095eb896a915a8da36beaf363df4d5400b4eea8f1b9aae5c1a82695a077d03079 SHA512 e4821db7cd8c04b5ef2bebb48ae5a26013ae5bcc4174c3a25c8ac002edc59cdea0e5c22403cd6b61933a7490b3e0df8e83e48cd97e1fe96d2904a9e2613a16fe
+EBUILD kvazaar-2.2.0.ebuild 1594 BLAKE2B 853dac1c4f43f0a64b895eeb83fb19a1c35d964943f1ac630ac86948db644ada54835d0037545e8f63a3b511592839c82cb349e615ab1accef06ccfb12687da9 SHA512 d34c5a4092da075f7c34da26df2bc6b8ccdb29f9bf0228fff5f8757c3f87804995022969c82e191e73cf00a8e244fe9561fe46026808e801b78fec6f64e7d9c2
 EBUILD kvazaar-9999.ebuild 1587 BLAKE2B db1bf5792deb3c5b3e993d08b87ad3e15b4e65a79c905c8d2917ae3a1273595095eb896a915a8da36beaf363df4d5400b4eea8f1b9aae5c1a82695a077d03079 SHA512 e4821db7cd8c04b5ef2bebb48ae5a26013ae5bcc4174c3a25c8ac002edc59cdea0e5c22403cd6b61933a7490b3e0df8e83e48cd97e1fe96d2904a9e2613a16fe
 MISC metadata.xml 307 BLAKE2B 712a78cc3cbe9bee1e770452448efd933eb76c6de75e8302e8f61b22aec35a2f43ceb7c3014bf88b81ecf4ff27da4b115ab24605a53fbbba18100896fff12ff8 SHA512 29403efb372cc2ddb9e428be05bb7bf57b0a51a3ab66a0b0bfbdfbcdf6db1b5d357ddafc1b3a77d00109840ea4c610a088e7c8f97a3c0b9cd330a6edd2651ae6
diff --git a/media-libs/kvazaar/kvazaar-2.2.0.ebuild b/media-libs/kvazaar/kvazaar-2.2.0.ebuild
index eae2fc58decc..0fe90be9a1f7 100644
--- a/media-libs/kvazaar/kvazaar-2.2.0.ebuild
+++ b/media-libs/kvazaar/kvazaar-2.2.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999 ]] ; then
 else
 	SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		test? ( https://github.com/silentbicycle/greatest/archive/v${GREATEST_PV}.tar.gz -> greatest-${GREATEST_PV}.tar.gz )"
-	KEYWORDS="~amd64 ~mips"
+	KEYWORDS="~amd64 ~mips ~riscv"
 fi
 inherit autotools flag-o-matic multilib-minimal
 
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 9b4d718ba352..604ada9aa8cb 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -6,7 +6,9 @@ AUX netpbm-10.86.22-fix-ps-test.patch 15448 BLAKE2B cfe77600197fc39ef0be0ed793f5
 AUX netpbm-11.0.0-misc-deps.patch 1446 BLAKE2B 721e926a83d50d04d4a407051ee077db5e5bf8fb1ae9aff1ff1d7859cf1bb0d5f74fa1143681b451d36323f93d5e7fa3876e485d6538958e30779cac081df5b8 SHA512 7135533660b15a113df5a38298725f895e8cbd6ac4695eb5f2d40bd214c43cb9d1c261063e0cea162a6ca6071cda5f4e0380d29eefa6af57e7d67ce319fe2216
 AUX netpbm-11.1.0-fix-clang-O2.patch 773 BLAKE2B a8d2bef659d384b0f94560fec847d37731315f5cdb67e5474efb596672d146446c6d545caa816d74f9d4c32fe486ce49f8cb55f38e9706bae6b0ba79c0dbbb5e SHA512 0a0049415d5c252603c47325d69ae582bec76ac15f442682ef0a2ff8c5a8cd19e28543644883bde891f2a376a401f43ed923b184112f49c67d295b9215d519de
 DIST netpbm-10.86.36.tar.xz 3700660 BLAKE2B c5f0acd0147f2ad66f69ae2ade56fcbb5286faddc7f8f3387e2269fd20ea2586a29d7e7dc96bd715fe12896eef47803b826031087e6be8166183ba7cf82aebf4 SHA512 b05df76760629881047c44799a905a491fb4c139a9af909d77cc4238fc82dfac37ba174df4f81cb1177716ad38a37b26eadcc3889d2c2057ff9d850697fad3c6
-DIST netpbm-11.1.0.tar.xz 3771676 BLAKE2B 0f377dc36b03b99a174c2d5a09d62aea8a813f9eb501a59630c4f083247cc3c82e3fee88085ec686f4d787d67104b834a511b4ef1f7d75eda7b10fed3281d9e5 SHA512 77528e2508d7a2d348de339d57b677fd1a061bb2902273d536ea09c34033af03a75bb723bcc7e87551406f47f115085a60691b3fda4ae672372b8473528370de
+DIST netpbm-10.86.37.tar.xz 3701336 BLAKE2B 3215303fc7617b6b783bf053c28a57daf82ffefc30d3cdac77449266495269988bd001d87d1631cb9d1066e06affb6b910cb5e1a95a0472c91821a60829f8c99 SHA512 ef9c6117ac2d4607af1d4136c833d596d1e2f7f40565ba2cc28e197a0bcec759fde47786fb900a68470a3acf71fc353a1ccf2efcb64b4a19720769a5a029b2a2
+DIST netpbm-11.1.1.tar.xz 3772212 BLAKE2B 23066054aa3996c369ae85ebcc0c1ec97a9366283648b6b1c3afd5a0b915bc69a7db292783de4bffc5fb1e6a8223e43d8b9613419cd04edd327ed52905122803 SHA512 6f84fbcde968a95f3809ef4359e1e5e69240528eb9ecd9aeae7086053eb690d7e4c52422aa51090df0794ab555b47f6cf010fd5caa8081901262c4b4926d17a1
 EBUILD netpbm-10.86.36.ebuild 6771 BLAKE2B 261ea89a2609e11f160fbcfb5a940963b77cfdf1820705566758a988d294635e3213ec4af3ce3ab37a74cde19ea875ac53dae8b2552f6e588dbd5e31230102cd SHA512 d9075e67b699f62852ed6e0fe747fd55b6bde0d97b7510cbdc56472ec328f5257899805defff19de56d9e3b548488e7b99ff35e170fed5080f6f15b786f43002
-EBUILD netpbm-11.1.0-r2.ebuild 6968 BLAKE2B e3deb3af629c1addd0a3db814088af4ae11a453c62500b79463e246afaee6059dcd77d9d477af9a6eca51fc8783deed96c698fbb8c4398b44940cf72d36871b6 SHA512 0e0941d1c0d62595f4d0a119c4e139a289e26d1193534d37c27b09e9122f104a89d3fc5da46c00c94cc9548550ac15442fedb8deb1057379de40de5989be2197
+EBUILD netpbm-10.86.37.ebuild 6779 BLAKE2B 3db12103e6b08f81ccb6aebfa1f5bfda803deb8c089b54cc528985ca22ae6b52d1ce04026fb2991a120a141accf7f3207b8c7b6d1b07093c1d58009f02a3e00c SHA512 d6d368f4c87bf2d739096d2f941e7553fcf0e86eca4e1c51a969cec30efd3673f0c90f71f8f0787ca4c71f86f717871142fb9f1a7e1ef8405c2dd97005b72ff7
+EBUILD netpbm-11.1.1.ebuild 6968 BLAKE2B e3deb3af629c1addd0a3db814088af4ae11a453c62500b79463e246afaee6059dcd77d9d477af9a6eca51fc8783deed96c698fbb8c4398b44940cf72d36871b6 SHA512 0e0941d1c0d62595f4d0a119c4e139a289e26d1193534d37c27b09e9122f104a89d3fc5da46c00c94cc9548550ac15442fedb8deb1057379de40de5989be2197
 MISC metadata.xml 424 BLAKE2B 9ccc907d6c15cb1a7d6cfe4679d6fa9f488642948897ca34958a06b439ebcfb912cfb18fa9d93f15f19573aed4bd7083d277151c477410a59cd64b4c9c0446d4 SHA512 a987be2134a44cc916d5a026068219b8ccaa149e577eaf2a53a7802321793129777cc79b069df95ec9320f15279249a5f9d8a61509452ef02effcb6c66cf9e80
diff --git a/media-libs/netpbm/netpbm-10.86.37.ebuild b/media-libs/netpbm/netpbm-10.86.37.ebuild
new file mode 100644
index 000000000000..da803d5346cd
--- /dev/null
+++ b/media-libs/netpbm/netpbm-10.86.37.ebuild
@@ -0,0 +1,243 @@
+# 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 10.86.xx) on SLOT "0/stable"
+# and the advanced branch of their svn (currently versions 11.aa.bb) 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
+
+# libnetpbm.so is not 100% ABI compatible between stable and advanced, so
+# packages that depend on it should use "media-libs/netpbm:="
+
+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/stable"
+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
+# also 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-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_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
+
+	# 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() {
+	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 *.html
+	dodoc -r ../userguide/*.html
+}
diff --git a/media-libs/netpbm/netpbm-11.1.0-r2.ebuild b/media-libs/netpbm/netpbm-11.1.1.ebuild
index 760e8d601915..760e8d601915 100644
--- a/media-libs/netpbm/netpbm-11.1.0-r2.ebuild
+++ b/media-libs/netpbm/netpbm-11.1.1.ebuild