summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-print/libinklevel')
-rw-r--r--net-print/libinklevel/Manifest2
-rw-r--r--net-print/libinklevel/files/libinklevel-0.9.2-autoconf-2.70.patch51
-rw-r--r--net-print/libinklevel/libinklevel-0.9.3.ebuild (renamed from net-print/libinklevel/libinklevel-0.9.2.ebuild)25
-rw-r--r--net-print/libinklevel/metadata.xml2
4 files changed, 68 insertions, 12 deletions
diff --git a/net-print/libinklevel/Manifest b/net-print/libinklevel/Manifest
index e57b5a8b883a..cbd810bdce57 100644
--- a/net-print/libinklevel/Manifest
+++ b/net-print/libinklevel/Manifest
@@ -1 +1 @@
-DIST libinklevel-0.9.2.tar.gz 367928 BLAKE2B f74af31529246668a0bc00c17b2ec1432532eb484b7efb230873e251c26b349ff26f4eb51f7f610198416964c090f60232f10e40f5170783cbe806cbcf849155 SHA512 127acaef2d2c09981b4da80e4d86a869c66f0f2f9733e139800bc944c159ddca42829499a97ecbb712b74c950bb28a4e22382c9c2a42d374bc5593f8802b6c59
+DIST libinklevel-0.9.3.tar.gz 385622 BLAKE2B c44726239d09719b634046dd40e168b6d0aefe86e675ac6669e7ffcefffbe30f9116fd2b778d7b6c9ae06d7781126202b6dcdddc50359e8905c9dab3893a6cb7 SHA512 bc45661fb861fb8fc6e209ceb4023e7eed2e474e05de76a9185e698aac7bc14d302bd254a1d95bdda104bce066d85ca27bb69d6620e17eca41b95bb279a6ad47
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.3.ebuild
index 48ac1c077b47..3e9d079e6f5f 100644
--- a/net-print/libinklevel/libinklevel-0.9.2.ebuild
+++ b/net-print/libinklevel/libinklevel-0.9.3.ebuild
@@ -1,29 +1,35 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=8
-inherit autotools eutils multilib
+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"
+SRC_URI="https://downloads.sourceforge.net/libinklevel/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~ppc x86"
-LICENSE="GPL-2"
-IUSE="debug static-libs"
+IUSE="debug"
DEPEND=">=sys-libs/libieee1284-0.2.11
virtual/libusb:1"
RDEPEND="${DEPEND}"
-S="${WORKDIR}/${MY_P}"
+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
}
@@ -32,7 +38,6 @@ src_configure() {
}
src_install() {
- emake DESTDIR="${D}" install
- dodoc AUTHORS ChangeLog NEWS README
- use static-libs || rm "${D}"/usr/$(get_libdir)/libinklevel.{a,la}
+ default
+ find "${ED}" -name '*.la' -delete || die
}
diff --git a/net-print/libinklevel/metadata.xml b/net-print/libinklevel/metadata.xml
index 2ae8f556b809..fa03614f75b6 100644
--- a/net-print/libinklevel/metadata.xml
+++ b/net-print/libinklevel/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>printing@gentoo.org</email>