gentoo resync : 03.11.2021

9 files changed, 119 insertions, 25 deletions

diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 285621355445..e32eca69aa84 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/fax4cups/Manifest b/net-print/fax4cups/Manifest
index f4b2dbd666fc..c53e77dca215 100644
--- a/net-print/fax4cups/Manifest
+++ b/net-print/fax4cups/Manifest
@@ -1,3 +1,3 @@
 DIST fax4CUPS-1.29.tar.gz 15347 BLAKE2B 7ae33ce3c60d2e6283a958bafcba9bc441dd50517bbd508050822354130d8ac02e5fbf4c1d6662e2a84962af202032bcb3b1fb26a473a65006a9b324a09ab1b6 SHA512 b3548095c58bafa3e35a4ad26f7d9fc95538bd0a94f40b248e2ab10adf726a23ff2b6a274085278ef3e0379a4f67b43e31d604491cf1a45ca0fbc163fc4a774b
-EBUILD fax4cups-1.29-r1.ebuild 944 BLAKE2B d44ddf0b6419067d37c9f9def29287d18e699471a31d308f69a885438b663c23b8e43379038576223a189f51c4077446b213f1b2761b827f191ab3577842e14d SHA512 99de32b11f3e50bbf304fb94a423b3d877cc1ad1fe4de7041ee33dd31f87409a015c91e1aa5e7bda72f0eb31f260f82c525d8e96490ec259e0ff46857fb88e57
+EBUILD fax4cups-1.29-r1.ebuild 995 BLAKE2B e6ed18f8fd1da56d2c7e193d1efb4b4c86dab971279a96ac6ea9ad485227473cdef86fa139770d7b73dceabe2b2db5aac9e3f926a39c717f750b031e01183c13 SHA512 64edd9c6c59effe0f1c635f89d842e09deb71e4c80a60a019416b3856c58f50bbf050a6b3fadafe69fc2c63b0c3599b6c2eaec3c3db283dee5ae63c3ec5548a9
 MISC metadata.xml 468 BLAKE2B 18de778194056d2fab86ab52e08cfc375fcdba36ba2e79a30645c55e8e843b634c63b5ab4e963d02d0b4e640e837ad89b8f8549678940109c937d39d63f834ea SHA512 48103147e4e6f21054b932f183755955eeaea4630d2cdb8c7730b055e0ac4b86d5e3f9345d970f9c5a538c8e69e1622afab3ec5bbe35ece476b4631941d151dd
diff --git a/net-print/fax4cups/fax4cups-1.29-r1.ebuild b/net-print/fax4cups/fax4cups-1.29-r1.ebuild
index fe10769ae330..37f2f9ce8f78 100644
--- a/net-print/fax4cups/fax4cups-1.29-r1.ebuild
+++ b/net-print/fax4cups/fax4cups-1.29-r1.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 DESCRIPTION="Fax backend for CUPS"
 HOMEPAGE="http://vigna.dsi.unimi.it/fax4CUPS/"
 SRC_URI="http://vigna.dsi.unimi.it/fax4CUPS/fax4CUPS-${PV}.tar.gz"
-LICENSE="GPL-2"
+S="${WORKDIR}/fax4CUPS-${PV}"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-
 IUSE="+hylafax mgetty-fax efax"
 REQUIRED_USE="|| ( hylafax mgetty-fax efax )"
 
@@ -23,27 +23,26 @@ RDEPEND="${DEPEND}
 	)
 	app-admin/sudo
 "
-
-S=${WORKDIR}/fax4CUPS-${PV}
+BDEPEND="net-print/cups"
 
 src_install() {
 	doman fax4CUPS.1
 
-	exeinto $(cups-config --serverbin)/backend
+	exeinto $(cups-config --serverbin || die)/backend
 	insinto /usr/share/cups/model
 
+	local i
 	for i in hylafax efax mgetty-fax; do
-		if use $i
-		then
+		if use ${i}; then
 			# Backend
-			doexe $i
+			doexe ${i}
 			# PPD
-			doins $i.ppd
+			doins ${i}.ppd
 		fi
 	done
 }
 
 pkg_postinst() {
-	elog "Please execute '/etc/init.d/cups restart'"
+	elog "Please execute '${EROOT}/etc/init.d/cups restart'"
 	elog "to get the *.ppd files working properly"
 }
diff --git a/net-print/ink/Manifest b/net-print/ink/Manifest
index cce09d67bd32..36216d6a1f48 100644
--- a/net-print/ink/Manifest
+++ b/net-print/ink/Manifest
@@ -1,5 +1,5 @@
 DIST ink-0.5.1.tar.gz 105174 BLAKE2B dc5807ee0f87e8e48e283e86d7d9ea9fe74b407591448eb66d45871185c2439fb97c81ef8c6ab0d10d871f28c49bd0d3a55b981d126314af829420ecacec7bb2 SHA512 12a21279ca4f390c5748b8ab1c62770c82decec1f9bfa3e6c13d7a269a7cb28fb96f92506c532f52fb4e3f1b72012e2c2a08e654a91edb1c73d1f7b778dc5848
-DIST ink-0.5.2.tar.gz 120024 BLAKE2B f90038992759c484bcf12f949feebd92d202e4e392873ac579733032964a928556fe0d380b814cf5f9519d7e9be964964e1b60b1913b083dd9573e5636351875 SHA512 3e04646141b4c3267cf6e29b28b84b2a879a8edbe3356e469b8195b8fb97787144d167ec2bab41b3365c3171638a31dd566cb690725711d942528e2b4c6d4195
+DIST ink-0.5.3.tar.gz 111791 BLAKE2B 15269a5ea267434f529256aeb144950111ffdaf9d9e182b62f5e1b0b3e6340495a2fdf22ffa6578a1960259a5f1a9097f27ca09ea6ecb1fb1f702aa15b7b2b5b SHA512 a05a3647d0fcae652f1b339006d22b7324e42615ed63fed47269dad409d0a6bd7640b9ec9fb6871d7ff0027af2577b64af98cbb8d9e38810e3b26490a5c0a2a1
 EBUILD ink-0.5.1.ebuild 505 BLAKE2B e09a6a1779b8501130d107164de2f9a6f4f0e0da55cc098082d3bcead9752685d3c228b61420c7c9aebbe589898bc11f561fe8e2baea88b5fa9d49f71cd3d8fd SHA512 9c167ff20458772e81b4704a2dd6ed6ddea9229a7baad1f64783de84ce1dc52480f8e8ebcb8bfc32e56c463a0679fc6d9d8522221a41726b41babbab240443b7
-EBUILD ink-0.5.2.ebuild 505 BLAKE2B 3e81556ff9998a1479e8018cccb83d6a3e0a8ceece323ef92f961370f67e27fbfb2677408386336974e2567de97c500337f22898b91e810f59c17ca398e858e0 SHA512 76ad0d794dda25154196ef1f27ae98999ca5e755b4ff24dbdd772662cb3cda3641b2a4a343e3aac8e6a0d8aa406049f8a6fcdf71400b367a5a5d1c8afd7b6144
+EBUILD ink-0.5.3.ebuild 380 BLAKE2B 9851a56cf1a672141d7ce29ca52a8396f9c3dedb3d0335e0c2cbf434fe0cb7d81a9bca127a74bfd33af85e8272167a20497241562809eff8ba4442ca1c7f2073 SHA512 8cd9ceaf658b944b9bb6746d12d3948b1049dcfbb2327601da87273c7003fc4172b4fb0f532bb0492628221169f93860e8575837737c3b7564f2c2a24abc0218
 MISC metadata.xml 333 BLAKE2B 52927a7468c64aded68640d17cf20ce194779c23fb379770ff9496c5d4ce6c7d8a1b95ae6bd4d5810b5d02f5b9f4e5200fc99eed70e89c982dfde109a9695e5f SHA512 781d5d910ac309158d603b3872dd6d13142879feac149660e9255274e65b727376625c87463245ef6918a292bf5abf052d85b8b7bc4df25f86722790a06b731b
diff --git a/net-print/ink/ink-0.5.2.ebuild b/net-print/ink/ink-0.5.3.ebuild
index c74f9fc83d85..3371caf8ab65 100644
--- a/net-print/ink/ink-0.5.2.ebuild
+++ b/net-print/ink/ink-0.5.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 DESCRIPTION="A command line utility to display the ink level of your printer"
 SRC_URI="mirror://sourceforge/ink/${P/_}.tar.gz"
@@ -10,12 +10,6 @@ HOMEPAGE="http://ink.sourceforge.net/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND=">net-print/libinklevel-0.8"
+DEPEND="net-print/libinklevel"
 RDEPEND="${DEPEND}"
-
-src_configure() {
-	# always use /bin/bash as configure shell, bug #526548
-	CONFIG_SHELL=/bin/bash default
-}
diff --git a/net-print/libinklevel/Manifest b/net-print/libinklevel/Manifest
index 3f1d2c0e511e..1915f08f53c9 100644
--- a/net-print/libinklevel/Manifest
+++ b/net-print/libinklevel/Manifest
@@ -1,3 +1,6 @@
+AUX libinklevel-0.9.2-autoconf-2.70.patch 1911 BLAKE2B a5fa846bf17c252be5f58fe2c1f265592a636de4d631632f41622df736f47ebbb975672895e10ce9ceb009711c36643d3fdc5a7d1462a6d16e6b3f2f85067606 SHA512 ba24cc8b9b0075740d7d871f74cb333f0fd3b02ebcb277ead4f6228840efeb51bce245c96ece8e502a4af5770c8fc2a6a2ad7a0be1524512f45e535872d2a3a0
 DIST libinklevel-0.9.2.tar.gz 367928 BLAKE2B f74af31529246668a0bc00c17b2ec1432532eb484b7efb230873e251c26b349ff26f4eb51f7f610198416964c090f60232f10e40f5170783cbe806cbcf849155 SHA512 127acaef2d2c09981b4da80e4d86a869c66f0f2f9733e139800bc944c159ddca42829499a97ecbb712b74c950bb28a4e22382c9c2a42d374bc5593f8802b6c59
-EBUILD libinklevel-0.9.2.ebuild 829 BLAKE2B acd6dbe0f4e4367a933cd6ec55d19d9e15a22659bed1547868f724ca16acf0591c7888691d02718fb9bacb44cfc712f2e2482feb50aa9761f3c988245dc426b7 SHA512 f3d3ad5af722ab6a7efeaaa4b6ff0f5430ac5b285d86d43a8916016778956103041405be7931e74838303251f127de862f4f5dad3903f4c09c4eee81857f1740
+DIST libinklevel-0.9.3.tar.gz 385622 BLAKE2B c44726239d09719b634046dd40e168b6d0aefe86e675ac6669e7ffcefffbe30f9116fd2b778d7b6c9ae06d7781126202b6dcdddc50359e8905c9dab3893a6cb7 SHA512 bc45661fb861fb8fc6e209ceb4023e7eed2e474e05de76a9185e698aac7bc14d302bd254a1d95bdda104bce066d85ca27bb69d6620e17eca41b95bb279a6ad47
+EBUILD libinklevel-0.9.2.ebuild 889 BLAKE2B bb459cafb3504903003fec7cca8c6b0c63a794419ec5a1307977ce81c1105c09eff8add253f43daacfd0d7e903cb6c57b2680c3bde0fdbe71630f56a75b5f828 SHA512 c3386c22e2c7d555d8b7817e30e4f89843524d3868b6fdf7e0fb8d3ed9ac8fb78a9c83f20af491a095d39251f3e3310f0f351922bf3abc9e758611330d8b19ee
+EBUILD libinklevel-0.9.3.ebuild 797 BLAKE2B 27c98475dc87f26d4fae56caa94c888f595cb2cc226798f3d6ff776408da8224846d4615f1f982a68bb9ef595192d507fcdfe3fe9fc839a9c4f27775621ae4ed SHA512 a55da790acad91c21ee89ee120996ca45ae97dc524a7bf1cd89aae2ba7e0da105fe0346f756042dc1da9133881b174e75c56d773739c7b5496bf2b81f053ced4
 MISC metadata.xml 341 BLAKE2B 0704370a2a25c5d5bb5bcf775b75235cb01bd402d51d3335c0ca46b345e6729a2139f51e9cb1a57ab586c140d279a029be79cf5234c60bab9c28218c014b23ff SHA512 10b7818239b88f229321028831803666ac6c51df61a412201ed82d88a7d1862d54b49b1c99267132bb46a14565dc0bab599161277318423f9242d22feae26d6d
diff --git a/net-print/libinklevel/files/libinklevel-0.9.2-autoconf-2.70.patch b/net-print/libinklevel/files/libinklevel-0.9.2-autoconf-2.70.patch
new file mode 100644
index 000000000000..462f23eb73b1
--- /dev/null
+++ b/net-print/libinklevel/files/libinklevel-0.9.2-autoconf-2.70.patch
@@ -0,0 +1,51 @@
+https://sources.debian.org/patches/libinklevel/0.9.3-3/0001-configure.ac-fix-ftbfs-with-autoconf2.70.patch/
+https://bugs.gentoo.org/750173
+
+From: Boyuan Yang <byang@debian.org>
+Date: Sat, 16 Jan 2021 11:03:56 -0500
+Subject: configure.ac: fix ftbfs with autoconf2.70
+
+Applied-Upstream: email, yes
+--- a/configure.ac
++++ b/configure.ac
+@@ -12,7 +12,7 @@ ABI_VERSION=5:0:0
+ 
+ dnl no more configuration after this line
+ 
+-AC_CONFIG_SRCDIR(libinklevel.c)
++AC_CONFIG_SRCDIR([libinklevel.c])
+ 
+ ## Determine hostname & OS
+ ## AC_CANONICAL_HOST
+@@ -77,9 +77,9 @@ AC_CHECK_HEADERS([ifaddrs.h])
+ 
+ ## Check for mandatory header files
+ 
+-AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h \ 
++AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h \
+                  sys/ioctl.h sys/socket.h sys/time.h sys/timeb.h wchar.h ]
+-                 ,,AC_MSG_ERROR( required header file missing ))
++                 ,,AC_MSG_ERROR([required header file missing]))
+ 
+ ## determine libraries that need to get linked
+ 
+@@ -96,7 +96,7 @@ AC_CHECK_FUNCS([getifaddrs])
+ AC_CHECK_FUNCS([alarm ftime gethostbyaddr gethostbyname gettimeofday inet_ntoa \
+                memset select socket strchr strdup strerror strncasecmp strstr \
+                gethostname]
+-               ,,AC_MSG_ERROR( required library function missing ))
++               ,,AC_MSG_ERROR([required library function missing]))
+ AC_FUNC_MALLOC
+ AC_FUNC_REALLOC
+ AC_HEADER_RESOLV
+@@ -117,8 +117,8 @@ case $host in
+ 	      PKG_CHECK_MODULES([LIBUSB1], [libusb-1.0]);;
+ 
+   *-freebsd*) AC_DEFINE_UNQUOTED(HOST_OS,FREEBSD,[Host OS])
+-              AC_CHECK_LIB([usb], libusb_init,, AC_MSG_ERROR(Library not found),);;
+-  *-*-*) AC_MSG_ERROR( Host OS not (yet) supported) ;;
++              AC_CHECK_LIB([usb], libusb_init,, AC_MSG_ERROR([Library not found]),);;
++  *-*-*) AC_MSG_ERROR([Host OS not (yet) supported]) ;;
+ esac
+ 
+ ## Variables to be exported
diff --git a/net-print/libinklevel/libinklevel-0.9.2.ebuild b/net-print/libinklevel/libinklevel-0.9.2.ebuild
index b6fb5ca58d72..59afe1969cd3 100644
--- a/net-print/libinklevel/libinklevel-0.9.2.ebuild
+++ b/net-print/libinklevel/libinklevel-0.9.2.ebuild
@@ -21,6 +21,10 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.2-autoconf-2.70.patch
+)
+
 src_prepare() {
 	sed -i -e "/^dist_doc_DATA/d" Makefile.am \
 		|| die "Failed to disable installation of docs"
diff --git a/net-print/libinklevel/libinklevel-0.9.3.ebuild b/net-print/libinklevel/libinklevel-0.9.3.ebuild
new file mode 100644
index 000000000000..384eec93be7e
--- /dev/null
+++ b/net-print/libinklevel/libinklevel-0.9.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_P="${P/_/}"
+DESCRIPTION="A library to get the ink level of your printer"
+HOMEPAGE="http://libinklevel.sourceforge.net/"
+SRC_URI="mirror://sourceforge/libinklevel/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug"
+
+DEPEND=">=sys-libs/libieee1284-0.2.11
+	virtual/libusb:1"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.2-autoconf-2.70.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e "/^dist_doc_DATA/d" Makefile.am \
+		|| die "Failed to disable installation of docs"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable debug)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}