gentoo resync : 28.04.2021

3 files changed, 35 insertions, 17 deletions

diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 4be71e5752eb..df97dd33df16 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,4 +1,4 @@
-AUX make-tarball.sh 1364 BLAKE2B 40001ac396b0ff26bb8e5d1a1a160b1467b4f9453d930394cf66dbc5e60b9d1e04c419801ca4ea2cbcb930797fe07df305549b7d5155e3cac3ce099a4dddbfbf SHA512 89b0ebfe6f5a82c3e3fc678ec4599d7281a0978c3a53437f0fbcfcb33607f8087bca1263d8a52c5b25cb1ab91a6635385cf423213464af858fc2f9663d5446a7
+AUX make-tarball.sh 1895 BLAKE2B d6311e862d8b2fb10d88a90263f7187c04bde49ff0ecb7860d4b306a6553b41f24ed718e94113807f7b8cdfe21774de383baf7799f2a3c3a12acea6f7aedbd4f SHA512 8128d2d8c0fb60d1d3cba73b4b3d87e914a7ac284e5f049cfd0a596f772d705acb3222da2d6a6f7d1882c7221eeaae9daac9d1b855e61881600345dc615cc428
 AUX netpbm-10.31-build.patch 1641 BLAKE2B 2102aa5a41b89beea645842ebaf72d472464c161601673f25d100f030c8058c86a98ae1d402387c7ce09eaa2558d099ab6cc8551fe1f231ea5a7e71b813d84ee SHA512 352b4390c7b622a7509ce370ba03d596bdee9ed19f63ab72990f15cec74eee42e768525aeaff87a160c8edb0034189c0a09a86189f7324675091484652cc1abd
 AUX netpbm-10.66-test.patch 347 BLAKE2B e4f88878dd61c2d7e8ad642d5a32aec8351cdcf8ef2d4bf81dd9174a69d17b6c56fc3eb7160f63764360a7bdea99bcb2cb3e8dd47d04f881185f86e2a8f6cbf5 SHA512 bb271d77794fa8b3d5d4632e32d6bd2b5f9522853c6b96c7056fe9817da47b89153eba2653cf3a5a29f597e3fa616e1f6c810bd986651e610176d69b428afb74
 AUX netpbm-10.70-system-libs.patch 1024 BLAKE2B 8fe242dad22030b66613a9c3c3e1c5d0a00589581f68dccf2940b9991a16cf6e1c5deec86562ec696db65e0d1465e7dacf840c6d9220be1bce3505d9dccf96ff SHA512 e25f58186621820612923e50d1342262cc30a790725d31a8ff2a9e8eae8415db600b6601539e1124eb9dcc5fed2f7db9738d6b8effe9e8e118af1f517111eb81
@@ -9,5 +9,5 @@ AUX netpbm-10.76.00-test.patch 6045 BLAKE2B ec4bf18a2022e67b26b78a591f3949552e10
 DIST netpbm-10.70.00.tar.xz 2621612 BLAKE2B 2b07d130de0afeb3c1df32c6d267bc6bd13d4f556988cb7784b51941d81de1ad4f3381a0788eec6309bc6c024a21eb273a5f00726f6bb9a8ecb87f547678fc77 SHA512 f70d6dd79ce813f9fc4935d382b50bd3cecdf02c324b0f012056e56e33f24b621e8c1b3d054c6f470d437d0d793593de95eaa9724055d59c342228398a40f0b4
 DIST netpbm-10.76.00.tar.xz 2657184 BLAKE2B b8d82268ba50881fab10bca00ea408afa39096f4f9c079b523d8e28ce62301797ee50f55c84f85a6d832b723da7449531e725bf60a4a89975c51382b2cbc4a94 SHA512 234a5616a7631a8eb70817bb88ed509ddddfce93f71739654ef78a2735245b268c391adb49b514ed883569c9fc6ea9c3eeed10aa7898c02b797fee5249b11cf3
 EBUILD netpbm-10.70.00.ebuild 5373 BLAKE2B bae61227e2fd3e65aa4005e4abb612cbf8e4ab749ff61921c9999eb4fa9203eea7efc9256df0149b47f3877aa2dad9c91a05df774801272e3c467e16ea578fb2 SHA512 b94aeeb1d9c1b7e721708711e1eb5d2bbdfd69692540edd1b79a102c191fb8bad1cc57e6ce18a0ba2e36a417416ddb7ec233381a0ca482cbad8757b90cde5e02
-EBUILD netpbm-10.76.00.ebuild 5238 BLAKE2B d2dc02fdf01e48e7967c3a79bf3626c94a2f730a16340b87379b5900ca6596bbddd1dad68c1bb105bfada1f33ee68880544995ba2e116d4a9031b94960dfc7f9 SHA512 af6bcc41dc8ea868ddaad86e513ab70b797c6a75b43d97a686447bb2ddff4c60e80669345359fe844c2cb38bf20f927f5ff274041588a8450ed527fcf0eae321
+EBUILD netpbm-10.76.00.ebuild 5261 BLAKE2B 56e5848b5c56ea78e54c7b2d09ef1bf942afe4aa8148ae3b534c8df9db9bae562753b0f1139e681bcc52e9758dedad4fa8ea2a6922260ae301e5607e168683ce SHA512 c75b3a3715371cd535c73811c667cc7c4d97f0e37089c017d769a572d7c716cb9b23a93f7f06f84760e0cd3d2203d6df61165c67533663f5a47f8607cca4d3e0
 MISC metadata.xml 342 BLAKE2B cd90d97e1e3d42554ec5feb7ab3db473ab52ba26e9ce4045a0bb55b89aca21f61c34043d0ec6db28af8f08dc95addcae6cd933544104259a334a794a467bcfdd SHA512 7bb2ebbf5bd2957fd06142bebe3271a0d4695b0b18d9bf9c0084ec7d0da65889efd5fbe39fa121b5f8dce0c3562bcd5ffc687d8092324ca85e43fa7f4cc53c7b
diff --git a/media-libs/netpbm/files/make-tarball.sh b/media-libs/netpbm/files/make-tarball.sh
index 90a64ffb34d7..29ad4b3d92e4 100644..100755
--- a/media-libs/netpbm/files/make-tarball.sh
+++ b/media-libs/netpbm/files/make-tarball.sh
@@ -1,13 +1,23 @@
 #!/bin/bash
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
 
-. /etc/init.d/functions.sh
+# Helper script for creating tarballs of netpbm releases since the netpbm
+# project refuses to do so themselves for "current" releases.  Their process
+# is entirely contained in the svn repo.
+# http://netpbm.sourceforge.net/getting_netpbm.php
+# https://sourceforge.net/p/netpbm/code/HEAD/tree/
+
+. /lib/gentoo/functions.sh
 
 PV=$1
 SVN_ROOT=${2:-/usr/local/src}
+NETPBM="${SVN_ROOT}/netpbm"
+USERGUIDE="${NETPBM}/userguide"
 
 if [[ $# -eq 0 ]] ; then
 	ebegin "Detecting latest version"
-	cd "${SVN_ROOT}/netpbm/release_number"
+	cd "${NETPBM}/release_number" || die
 	svn up -q || die
 	PV=$(svn ls | sort -V | tail -1) || die
 	[[ -z ${PV} ]] && die
@@ -17,9 +27,14 @@ if [[ $# -eq 0 ]] ; then
 
 	if [[ ! -d ${PV} ]] ; then
 		ebegin "Checking out ${PV}"
-		svn up -q ${PV}
+		svn up -q "${PV}"
 		eend || die
 	fi
+
+	ebegin "Updating userguide"
+	cd "${USERGUIDE}" || die
+	svn up -q || die
+	eend
 fi
 
 if [[ $# -gt 2 ]] ; then
@@ -32,28 +47,28 @@ P=${PN}-${PV}
 T=/tmp
 
 maint_pkg_create() {
-	local base="/usr/local/src"
-	local srcdir="${base}/netpbm/release_number"
-	local htmldir="${base}/netpbm/userguide"
+	local base="${SVN_ROOT}"
+	local srcdir="${NETPBM}/release_number"
+	local htmldir="${USERGUIDE}"
 	if [[ -d ${srcdir} ]] ; then
 		cd "${T}" || die
 
-		rm -rf ${P}
+		rm -rf "${P}"
 
 		ebegin "Exporting ${srcdir}/${PV} to ${P}"
-		svn export -q "${srcdir}/${PV}" ${P}
+		svn export -q "${srcdir}/${PV}" "${P}"
 		eend $? || return 1
 
 		ebegin "Exporting ${htmldir} to ${P}/userguide"
-		svn export -q "${htmldir}" ${P}/userguide
+		svn export -q "${htmldir}" "${P}"/userguide
 		eend $? || return 1
 
 		ebegin "Generating manpages from html"
-		(cd "${P}/userguide" && ../buildtools/makeman *.html)
+		(cd "${P}/userguide" && ../buildtools/makeman ./*.html)
 		eend $? || return 1
 
 		ebegin "Creating ${P}.tar.xz"
-		tar cf - ${P} | xz > ${P}.tar.xz
+		tar cf - "${P}" | xz > "${P}".tar.xz
 		eend $?
 
 		einfo "Tarball now ready at: ${T}/${P}.tar.xz"
diff --git a/media-libs/netpbm/netpbm-10.76.00.ebuild b/media-libs/netpbm/netpbm-10.76.00.ebuild
index a1fcc051cc55..ab3d9c130b38 100644
--- a/media-libs/netpbm/netpbm-10.76.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.76.00.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,11 +11,14 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
 
-BDEPEND="app-arch/xz-utils
-	sys-devel/flex"
+BDEPEND="
+	app-arch/xz-utils
+	sys-devel/flex
+	virtual/pkgconfig
+"
 RDEPEND="jbig? ( media-libs/jbigkit )
 	jpeg? ( virtual/jpeg:0 )
 	png? ( >=media-libs/libpng-1.4:0 )