gentoo resync : 03.11.2021

4 files changed, 102 insertions, 1 deletions

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
+}