gentoo auto-resync : 27:10:2022 - 15:57:47

8 files changed, 91 insertions, 235 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index d4bb8ec1d517..3fffaee6db03 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index 5c06520c2211..fd4021cf8b4b 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -3,8 +3,10 @@ AUX libbluray-jars.patch 1371 BLAKE2B 1c32115ec03db19b849248bcdbe4b9868527717b27
 DIST libbluray-1.3.0.tar.bz2 754069 BLAKE2B d4c699ce28d2e5b1d4dda461a1359d3a446afe72368e9d76066ca4d5c49d1f24b4bcec307608d96913d0c668168a86267416b9db37ad942628c2926b79ec47d9 SHA512 3d5145e6fd7de099c07f937282112c7abb12a5590b7c0b965b00bddee3837ddfd1a30076aaa6d6278d07a5beee3856f602125983ae075ab30eceb6ac1bd9bcdc
 DIST libbluray-1.3.1.tar.bz2 754867 BLAKE2B 471963bc5b77f9da31c2ad900e7bbb1528943d2341aa4f12471e5d9a0db6964e62e917c4f19e29115c8c129bb7f8730780b44dbb1c8939c94c686f39d8521fe8 SHA512 f39fc8a11771e8fdd5eeebf0ab23535ffab44721f64b350e5d153eee44555b31c618b6d765da114254dc83ff0ff89e84c6b185f61cdbcfedd2d47a5f6e26b75a
 DIST libbluray-1.3.2.tar.bz2 757957 BLAKE2B e970e07f6ad216f7bdac866acfb87400b4fbd511ad41293f0aa93e6cc04f77bca249c78b75eb89d92e41c9a1d25df93c4cab53cdb2cfd27b8a47233bbc277cad SHA512 6f2d3a984809db33a99d2fe3618370a3fda3ef1c417b725d3c2e1f24ff21495f95a6a5f78b30b2b26bab47865f68dd08c08e8a554809d3a5225956da712dc064
+DIST libbluray-1.3.3.tar.bz2 761335 BLAKE2B 3d17e686e363b0692b7d75596089ed12dbe46006738ea23f274b2992a541e6f1b0384ac2afc785359d94f652017284668c3a044db24ef6de5625575fca956bce SHA512 fc36b4eea43f430f5f774129bd5cf075ed0128433779ad0146d59cc87e9625f4b6c31098fed1f5754b84fd08d9c8044d8d43d78c5b9c07937878cf15f517ba6f
 EBUILD libbluray-1.3.0-r1.ebuild 2026 BLAKE2B afdec663eeda2df1dfda5bab20fadc416b718c0f1fa9198c9d382316f79220dd7773b3e8fc16cb37c96202fd6a2bb2004093b785caf572debe94e410fc70965e SHA512 ad3e56facfd5a192c3787096414baeaf0fd29a7f2e9550739c42ef76670aac2ff8cfd6390f46dd3fc6076b1384217c02b19d8739369fd969ad1913475a3d7b02
 EBUILD libbluray-1.3.1.ebuild 2055 BLAKE2B 386214b48440b49fa436b3e48aa261a9ed7447089590189bca0aa0ed959ee7a48085a9a065c5c6095b74aee541ede6d68494d57d95ee190870e6e652295da4ed SHA512 4bf8f7fda1832f6ed9d951eeef24ef04ff6938443887cfb84d4cf6ff94021dabd989fb65d5d34f2945751a2a790a7482c636dd0c6101da86ec14b98e3a0ecd5d
 EBUILD libbluray-1.3.2.ebuild 1960 BLAKE2B 66c522544ba6786b46c08f620f65c40b79d9aaf826283ec8362fa0fe4a9c0197862ce8a6e93408c6503ed7dea8931b11ee53e042e10934d7ca03a2fc9f5eef5f SHA512 ff981aa8143118a59e7eccdab56bacd0b8b9918f8eff508ecd885b78d28fb6f3348d2555c277aaea4f46e3435d7e9b63b8b84efff2d66a34ac8a580445b49650
+EBUILD libbluray-1.3.3.ebuild 1967 BLAKE2B 6c0d9471ffb0d0e1ddbcab410042d136e5d23455a97e5ed024d027b232001c6e1cfd1aefdc7bc4039004d695ed69649e8695b59418a186a921696666929124f6 SHA512 1cd12292d1918822e668961c233a7b8ffaea9216e64618c903666dc0fcf34f3858bceb3dad3cd2ae7193134b6f303efec57a14fa05a4f0e12d1cacec7c76f4e1
 EBUILD libbluray-9999.ebuild 1967 BLAKE2B 6c0d9471ffb0d0e1ddbcab410042d136e5d23455a97e5ed024d027b232001c6e1cfd1aefdc7bc4039004d695ed69649e8695b59418a186a921696666929124f6 SHA512 1cd12292d1918822e668961c233a7b8ffaea9216e64618c903666dc0fcf34f3858bceb3dad3cd2ae7193134b6f303efec57a14fa05a4f0e12d1cacec7c76f4e1
 MISC metadata.xml 541 BLAKE2B 5a2652471709a6c8784f756ad2d5c9bbfd1611637fede987c298e1b4588ddab74346ac0d607c36bc3fa662a1e80287d2dd9963019b52daad9cd3ac2f0ecff02f SHA512 70349aab49af818166f114ed16c0eaf4264e548e8f204d636da57086b68a17f42a6b119a2533a5fb9f6a60dc3c3a9948910536f4eaecb1a75e682d439b12d558
diff --git a/media-libs/libbluray/libbluray-1.3.3.ebuild b/media-libs/libbluray/libbluray-1.3.3.ebuild
new file mode 100644
index 000000000000..9d617a0039d2
--- /dev/null
+++ b/media-libs/libbluray/libbluray-1.3.3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV#9999} != ${PV} ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://code.videolan.org/videolan/libbluray.git"
+else
+	SRC_URI="https://downloads.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+inherit autotools java-pkg-opt-2 multilib-minimal
+
+DESCRIPTION="Blu-ray playback libraries"
+HOMEPAGE="https://www.videolan.org/developers/libbluray.html"
+
+LICENSE="LGPL-2.1"
+SLOT="0/2"
+IUSE="aacs bdplus +fontconfig java +truetype utils +xml"
+
+RDEPEND="
+	dev-libs/libudfread[${MULTILIB_USEDEP}]
+	aacs? ( >=media-libs/libaacs-0.6.0[${MULTILIB_USEDEP}] )
+	bdplus? ( media-libs/libbdplus[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+	java? ( >=virtual/jre-1.8:* )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	java? ( >=virtual/jdk-1.8:* )
+"
+BDEPEND="
+	virtual/pkgconfig
+	java? (
+		dev-java/ant-core
+		>=virtual/jdk-1.8:*
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-jars.patch
+)
+
+DOCS=( ChangeLog README.md )
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# bug #621992
+	use java || unset JDK_HOME
+
+	ECONF_SOURCE="${S}" econf \
+		--disable-optimizations \
+		$(multilib_native_use_enable utils examples) \
+		$(multilib_native_use_enable java bdjava-jar) \
+		$(use_with fontconfig) \
+		$(use_with truetype freetype) \
+		$(use_with xml libxml2)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	multilib_is_native_abi || return
+
+	use utils &&
+		find .libs/ -type f -executable ! -name "${PN}.*" \
+			 $(use java || echo '! -name bdj_test') -exec dobin {} +
+
+	use java && java-pkg_regjar "${ED}"/usr/share/${PN}/lib/*.jar
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/librtprocess/Manifest b/media-libs/librtprocess/Manifest
index 24c0e0999f85..5f983249a7bd 100644
--- a/media-libs/librtprocess/Manifest
+++ b/media-libs/librtprocess/Manifest
@@ -1,4 +1,4 @@
 DIST librtprocess-0.12.0.tar.gz 158244 BLAKE2B 0fa18416b25b760541fd01285b5cc0c3a38d8ddb4dd88b45237fa0cd3f43bdb7831c06282e2c63ddee240c59f6641fb9233e2370d460e3ccdd2d86a5a75e318b SHA512 2eaaff9d9365b97cfb76cef36c0ba53d9b556f45d49bdcc84947ef3bf513240cec13d763ae7fc78589c2b68a739ed23477f6953a7329d8177275f81e5e588ddf
 EBUILD librtprocess-0.12.0-r1.ebuild 773 BLAKE2B 091b537a0cef013e524a9effe830bb893a5a8498c07713034ed1d509a628d671f8155d709a5406495a40813938a8555fefb248544152bba98c43696c1147cf48 SHA512 2d97eb72cf23e93d45208460abe633f3b863d21f55332e607ad0ca30a412c5bc6dcfccf710e9a7d6ae3c411fa4d996130d66733f2a30b46cf9be834b7ffba947
-EBUILD librtprocess-0.12.0.ebuild 384 BLAKE2B 923e9861b7bf096f2853e892e2ed988cccafd103b763c200e19da71bc2b6832a671ef399eb207f1bda2902544717ff0f02f5dd6931114cb34929dc829edede12 SHA512 f96650a70c39a1b44ad5063a1e9dd7e85415c807e26f730decf8a584ee1ca46da2997c7b4d400e7bf0f5aa1b5f5f17f5ba448f9a0187b454bbe67506b14aba80
+EBUILD librtprocess-0.12.0.ebuild 383 BLAKE2B a4e0d9d293dd141c857ebdd8fc589e543e0064d75ae0dbb562b6273d1b50fc3617558f6001c6fdd3be1f90a33dc4520a8a6d3e348ed7feb14dcf24e1beaeec08 SHA512 58dd87a4d2acb3db9926ab8e5fcf6279622c066c58357e1a6d96335310d5e3500459bebf2967fe5deed5f3ba9993a512dd8850f9aeca35d7118af6627bb9a170
 MISC metadata.xml 686 BLAKE2B bfde95b605e302d99e08b5be18dc694c4b7daca573e72927ada1dce430a9743f5b660ac9111cfdce37605f206eab8c94cf2997bc99de83ddc24f3f2ead670fcb SHA512 1a191e865353cf6256585746d9ec198a5c39da080060990a53a1bfcc024b2d782785c661e63d05cc4b08d61e0410cd6686bc2f45442b46d04c55c3a59b02744b
diff --git a/media-libs/librtprocess/librtprocess-0.12.0.ebuild b/media-libs/librtprocess/librtprocess-0.12.0.ebuild
index 6c56fd15df8a..e3fcacc8dbc7 100644
--- a/media-libs/librtprocess/librtprocess-0.12.0.ebuild
+++ b/media-libs/librtprocess/librtprocess-0.12.0.ebuild
@@ -11,4 +11,4 @@ SRC_URI="https://github.com/CarVac/librtprocess/archive/refs/tags/${PV}.tar.gz -
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index e2a8ba0d1f40..d4fbbb7e99be 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -3,8 +3,6 @@ AUX netpbm-10.86.21-build.patch 2319 BLAKE2B b22150c8683790c9ac31abc00b8f3f5b55c
 AUX netpbm-10.86.21-misc-deps.patch 1565 BLAKE2B a4d629ea9fe01efc45c799dac4bd3764368be33f264929bdc338bb724ace03471949467e5c84144636a9f4ee9130395dad77e23aa6686998bf9700dbde224cbf SHA512 f274ede7d11ed0f2a1825a4412a52fd9e30f5caf470c6111b606a87f1e67b16278c9f2a901d512ea3516ba033e30a3c08386cc5af1a555f868b7d7175fbfeed0
 AUX netpbm-10.86.21-test.patch 331 BLAKE2B 59451b2f1632afdd8e84bcec0ef91e0589604706b373281bf4963385fe971991711cc6ed4f169cc45aa460ac1db20de69039b137da1a2ec3d6cb82b60ae5f745 SHA512 e5c1a88cc03e227c7a7a01e9586ceacaf24a6752f4285f228b0176a8a12a6a9ac83d8ce1c5965e8f56ab652b5e42aa2cd535f1e121449fe668312b7e49720e4f
 AUX netpbm-10.86.22-fix-ps-test.patch 15448 BLAKE2B cfe77600197fc39ef0be0ed793f5181db57fd718a6fed268a8afb2fd2b5afab404c3be3c89dc25d178f8fe2edc4d386e33f22f7b3bc826e9c90307ef3895830f SHA512 a521c771d2384cb86d87b4efdf05e0835adcbefb84d4e66e744b2f8bc40df5358f20c4824dce5a942ccc24b18168276278d65e8e9a529b7c09b157b3e02438bb
-DIST netpbm-10.86.33.tar.xz 3696704 BLAKE2B 57657d69e235ee9babefce6e44e7ac35ac9b67c38797cee140488afe268687e4030158280c1064f8111891b9114106420314cdbce1b8be8d7dd45204a07aa5b0 SHA512 b0a555276e26d171705e93bdc26d33869fa611e01728d935edd0a7b96815db4f9ff264d7d6cecccc751b0bbfd639b14316f1ab576b1182b755e0f1832d8f43ca
 DIST netpbm-10.86.34.tar.xz 3698852 BLAKE2B 7ea0e93450fb0bdf50b1b498468dd32350f20c8e993cda3e0ffa942dcdeab775a532a4771b10c55c862340964a4520f51ea4916c20051d5140dbb0a9ce373860 SHA512 bbb4dc685a44c0d7733808edd938b1205891ae5cf312218ef717bf63053513058251a659e3cf9acc762b0aeec8da3fc8e8a05e1442591c87f5a1dce7f63ee870
-EBUILD netpbm-10.86.33.ebuild 6048 BLAKE2B d910c8a535e954db53376f7bd15eba900873de1763320e4e5a183974de2edeea978fa64750ff53740c43121739fa3f36d003ec549beaf142c2d5959e00f26c2a SHA512 f9c97f4e8c55590caa6f54110f244c643e70d2534d802c196e67f994af6f551e9974f1aef193a0e2c5b1ef675e5984ad0bd13914c7eda9ec36d182377cfb66cc
-EBUILD netpbm-10.86.34.ebuild 6048 BLAKE2B d910c8a535e954db53376f7bd15eba900873de1763320e4e5a183974de2edeea978fa64750ff53740c43121739fa3f36d003ec549beaf142c2d5959e00f26c2a SHA512 f9c97f4e8c55590caa6f54110f244c643e70d2534d802c196e67f994af6f551e9974f1aef193a0e2c5b1ef675e5984ad0bd13914c7eda9ec36d182377cfb66cc
+EBUILD netpbm-10.86.34.ebuild 6049 BLAKE2B 75cca31ec252ba64f4997d09a013e80b76d5aa4fa83654b7492a277f07c61e0070dcb0691b01a24662bb8549e9123ab8ea4ee0fd6a0dfe4d6aa7a2914582e1ad SHA512 bbf15b9c22a5a71e2e07f24fa946f757af8ac5f46fc8e9dfdc9fe6b23b329d1cff3c088f92ab62b3eb9e1a0fe985d8a39a2697cedee0da95ed7783e2d6d5392e
 MISC metadata.xml 578 BLAKE2B 44f5899feee3b35c43e1b21f631fc53acc615003a5ed21c3461b5946882f1b67b9de9ac0b3d5d24f9faf291bbc9d3410841ccbba15f4981fb5ec050195bf93d7 SHA512 a9ef7432d1404a5dfc2458761867fbdcb9be368f20ea3290bb0a2aac10a82c968d3d97c4dbbf65f4840f0a60e9266d63c577e33c27d3b8b45b70349cb211478d
diff --git a/media-libs/netpbm/netpbm-10.86.33.ebuild b/media-libs/netpbm/netpbm-10.86.33.ebuild
deleted file mode 100644
index 8b60df263a57..000000000000
--- a/media-libs/netpbm/netpbm-10.86.33.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
-HOMEPAGE="http://netpbm.sourceforge.net/"
-SRC_URI="https://github.com/ceamac/netpbm-make-dist/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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"
-
-BDEPEND="
-	app-arch/xz-utils
-	sys-devel/flex
-	virtual/pkgconfig
-"
-# app-text/ghostscript-gpl is really needed for postscript
-# some utilities execute /usr/bin/gs
-RDEPEND="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:0 )
-	xml? ( dev-libs/libxml2 )
-	X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}"
-
-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() {
-	if use ${1} ; then
-		[[ ${2} != "!" ]] && echo -l${2:-$1}
-	else
-		echo NONE
-	fi
-}
-
-# 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() {
-	# cannot chain the die with the heredoc
-	# repoman tries to parse the heredoc and fails
-	cat config.mk.in - >> config.mk <<-EOF
-	# Misc crap
-	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 tiff)
-	# Let tiff worry about its own dependencies #395753
-	TIFFLIB_NEEDS_JPEG = N
-	TIFFLIB_NEEDS_Z = N
-	JPEGLIB = $(netpbm_config jpeg)
-	PNGLIB = $(netpbm_config png)
-	ZLIB = $($(tc-getPKG_CONFIG) --libs zlib)
-	LINUXSVGALIB = $(netpbm_config svga vga)
-	XML2_LIBS = $(netpbm_config xml xml2)
-	JBIGLIB = $(netpbm_config jbig)
-	JBIGHDR_DIR =
-	JASPERLIB = NONE
-	JASPERHDR_DIR =
-	URTLIB = $(netpbm_config rle)
-	URTHDR_DIR =
-	X11LIB = $(netpbm_config X X11)
-	X11HDR_DIR =
-	EOF
-	[[ $? -eq 0 ]] || die "writing config.mk failed"
-}
-
-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-10.86.34.ebuild b/media-libs/netpbm/netpbm-10.86.34.ebuild
index 8b60df263a57..a9ec64dd2493 100644
--- a/media-libs/netpbm/netpbm-10.86.34.ebuild
+++ b/media-libs/netpbm/netpbm-10.86.34.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
-HOMEPAGE="http://netpbm.sourceforge.net/"
+HOMEPAGE="https://netpbm.sourceforge.net/"
 SRC_URI="https://github.com/ceamac/netpbm-make-dist/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"