gentoo resync : 05.12.2021

5 files changed, 135 insertions, 13 deletions

diff --git a/dev-libs/lockdev/Manifest b/dev-libs/lockdev/Manifest
index 067288c11ce6..efa498b51830 100644
--- a/dev-libs/lockdev/Manifest
+++ b/dev-libs/lockdev/Manifest
@@ -1,6 +1,8 @@
-AUX lockdev-1.0.3-add-autotools.patch 1344 BLAKE2B 7248172afeeb5b78ca5626d20604ec79dec47c8e46ff48421344cdc16b92859a57133fc2efd88c120ea202043d8c2f1d3dc6f21f9e4eda2beb11ddee18d338a6 SHA512 45be61a30a9c26d6f3955860306049d9fa5019cc408158f2780b9ceb8b15d618774f1710c2cc9b579e88e45cec422bb6eda3c9a6baf18895a7e78f60dce894cf
+AUX lockdev-1.0.3-add-autotools.patch 1402 BLAKE2B 72b4af6b04ceed1f5f12c99ffa04931a543c806212551cfc619188896fb013520312476feae01649b2a6d658556f430f553a7738a98734e97848d71c358628bc SHA512 d9a68810539d3f11b74730ad784b87e9e8109a3b600892c5f448d2fb4e0fe0b2b363bab80c8144066fd5c1ac8413295b1d5849ed14bc666705ccb8965acc1e0f
 AUX lockdev-1.0.3-fix-perl.patch 307 BLAKE2B aa1d9fb4131a0dcedbac0034e450ef47cac62d4e45c56865c2e7c8c8d896143afae2e767eac3fc878fc8281656db603cb9bbe5a7ae3dfe62a164b8023493cca0 SHA512 f8647472a451ce641d687a9c61f2e650456a68a6fd9fbb57a3871a1480871de639815aef924bd6f1cf85d1c13203b605c0461077f362d2523881269040a8114a
+AUX lockdev-1.0.3-major-minor.patch 612 BLAKE2B 1ce680aa00e86d6b62ad5d44028c1708b1b656c00c03c65957b308c9109118f24681b9d9750f275870a1e43b45e1bf924dbb9fb510f1aea3d5636fcdcf81d3c4 SHA512 9a6b769f8924c51c52b481bc11551cf272ab2be3c4e27f0d5ef103a0e86b3103dbbb9ffe106ad51229c34654b86b78da44e8b3df09b6e49a56e475673ad3d1f0
 DIST lockdev_1.0.3-1.2.diff.gz 7642 BLAKE2B ee0da062e802d1112c49bf3dc4cdd1f3567eb11fd4173fe0170b079c2752231ee93e39201674d8e71a5970f4d7e6443406d159af63687bb37c8c72203132c4f9 SHA512 22fce119a8075a5b99a4ef83b31f62da64725067863949d4833b4d66f9e8e2d34920eee11c5acdcc14b1a643a21c56c39ec2adf31ae7fa489795dd5534eb7b6c
 DIST lockdev_1.0.3.orig.tar.gz 29150 BLAKE2B 812acf8b39507e7b00e8fd49e6828be2b6ba21811c3dca49f94543756d428f7fea9d8005e43574653180f71aa634b0f92a2c42380235c2584c6958ca38d499fb SHA512 4066985059add674ef8a9195e611db8ead89ca6191c04b7f29243b12a3448c82a3d0ea852bf99e26e1c71f163891acd198867650a5c4843f787e1944a8bc7f2b
-EBUILD lockdev-1.0.3.1.2-r3.ebuild 2077 BLAKE2B 123ff3b8038eb0a0e4d7ebe81f3fff1cdc391078c31107849da30b020df50ebeafe47c1d417519af1427dda84ace637ef5562d7caba2f29b6850cfba9d807656 SHA512 ecab70b968c16fdff4c6ebba749a9fb11a2c1e277c47a8f10bc3bc211044021def72900b8ccefabfe6bf0fcb9f39b0bfbdaba0e91e0c932d323762df4a090932
+EBUILD lockdev-1.0.3.1.2-r3.ebuild 1956 BLAKE2B db846cb320977b0f3e3b63afee8cc9a0aaa350bb963c2ac7e412955583cfac4e451e09f0fb31e6c1ab35eadf5c5374842ba01504dea9a1c36e55722d9cffe0b9 SHA512 06bf4982c3bedbb1707769d66783e1650058f16950983958ceef07c5fe5965e0e0ca56a6914dce7e8dde7c4ab4412d31ea26a65ba3f12c45c52ca08fdb14fe8c
+EBUILD lockdev-1.0.3.1.2-r4.ebuild 1906 BLAKE2B 7d563034345c314a09e5de913981e644ca5cab4da4e90d62cdbc351f66b8d5eab929c6c39960cbb81cd596d5ae378b48f2c53efc6ae76f7a341c5eaddec32420 SHA512 a0d7fb443a87668666ea8adc298409f5c3c546b4d031f60720261bb4791b7c7a1613d1ed3e8648b9adf3a7d9801d0a4b251d3361f5719620a7fd106f95e17c6f
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/dev-libs/lockdev/files/lockdev-1.0.3-add-autotools.patch b/dev-libs/lockdev/files/lockdev-1.0.3-add-autotools.patch
index f54bcb8fd72c..01551f56295d 100644
--- a/dev-libs/lockdev/files/lockdev-1.0.3-add-autotools.patch
+++ b/dev-libs/lockdev/files/lockdev-1.0.3-add-autotools.patch
@@ -5,8 +5,8 @@ Contributed by Nick Fortino (nfortino@gmail.com) 2/1/2009
 
 Updated by Jonathan Callen <abcd@gentoo.org> 2009-09-11
 
---- Makefile.am
-+++ Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -0,0 +1,20 @@
 +include_HEADERS = src/lockdev.h src/ttylock.h
 +
@@ -28,9 +28,9 @@ Updated by Jonathan Callen <abcd@gentoo.org> 2009-09-11
 +	for page in $(manpage_links); do \
 +		$(LN_S) -f lockdev.3 $(DESTDIR)$(man3dir)/$${page} ; \
 +	done
---- configure.ac
-+++ configure.ac
-@@ -0,0 +1,22 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -0,0 +1,25 @@
 +AC_INIT([lockdev], [1.0.3], [BUG-REPORT-ADDRESS])
 +AC_CONFIG_AUX_DIR([scripts])
 +AM_INIT_AUTOMAKE
@@ -51,5 +51,8 @@ Updated by Jonathan Callen <abcd@gentoo.org> 2009-09-11
 +# Checks for programs.
 +AC_PROG_LN_S
 +
++AC_HEADER_MAJOR
++
++AC_CONFIG_HEADERS([config.h])
 +AC_CONFIG_FILES([Makefile])
 +AC_OUTPUT
diff --git a/dev-libs/lockdev/files/lockdev-1.0.3-major-minor.patch b/dev-libs/lockdev/files/lockdev-1.0.3-major-minor.patch
new file mode 100644
index 000000000000..8a47137f8aee
--- /dev/null
+++ b/dev-libs/lockdev/files/lockdev-1.0.3-major-minor.patch
@@ -0,0 +1,24 @@
+--- a/src/lockdev.c
++++ b/src/lockdev.c
+@@ -123,13 +123,17 @@
+ #include <sys/param.h>
+ #include <sys/stat.h>
+ #include <sys/file.h>
+-#if defined (__GNU_LIBRARY__)
++
++#include "config.h"
++#if defined (MAJOR_IN_MKDEV)
++# include <sys/mkdev.h>
++#elif defined (MAJOR_IN_SYSMACROS)
+ # include <sys/sysmacros.h>
+-# define MAJOR(dev) gnu_dev_major (dev)
+-# define MINOR(dev) gnu_dev_minor (dev)
+ #else
+-#  error "put here a define for MAJOR and MINOR"
++# error "include here the header file defining major() and minor()"
+ #endif
++#define MAJOR(dev) major (dev)
++#define MINOR(dev) minor (dev)
+ 
+ #include "lockdev.h"
+ 
diff --git a/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild b/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild
index 2cd31f466afb..419f982bc81b 100644
--- a/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild
+++ b/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild
@@ -26,6 +26,7 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="perl"
 
 PATCHES=(
+	"${WORKDIR}/${DEB_P}.diff"
 	"${FILESDIR}/${MY_P}-add-autotools.patch"
 	"${FILESDIR}/${MY_P}-fix-perl.patch"
 )
@@ -37,12 +38,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cd "${WORKDIR}" || die
-	# Note: we do *not* want to be in ${S} for this, as that breaks the patch
-	epatch "${WORKDIR}/${DEB_P}.diff"
-
-	cd "${S}" || die
-	epatch "${PATCHES[@]}"
+	epatch -p1 "${PATCHES[@]}"
 	epatch_user
 
 	eautoreconf
diff --git a/dev-libs/lockdev/lockdev-1.0.3.1.2-r4.ebuild b/dev-libs/lockdev/lockdev-1.0.3.1.2-r4.ebuild
new file mode 100644
index 000000000000..49560227160a
--- /dev/null
+++ b/dev-libs/lockdev/lockdev-1.0.3.1.2-r4.ebuild
@@ -0,0 +1,97 @@
+# Copyright 2001-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GENTOO_DEPEND_ON_PERL="no"
+
+inherit perl-module autotools multilib-minimal
+
+MAJOR=$(ver_cut 1)
+MY_PV=$(ver_cut 1-3)
+MY_P=${PN}-${MY_PV}
+DEB_PV=$(ver_rs 3 '-')
+DEB_P=${PN}_${DEB_PV}
+
+DESCRIPTION="Library for locking devices"
+HOMEPAGE="http://packages.debian.org/source/sid/lockdev"
+SRC_URI="
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${MY_PV}.orig.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${DEB_P}.diff.gz
+"
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="perl"
+
+PATCHES=(
+	"${WORKDIR}/${DEB_P}.diff"
+	"${FILESDIR}/${MY_P}-add-autotools.patch"
+	"${FILESDIR}/${MY_P}-fix-perl.patch"
+	"${FILESDIR}/${MY_P}-major-minor.patch"
+)
+
+PERL_S=./LockDev
+
+pkg_setup() {
+	use perl && perl_set_version
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# perl module build
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	econf
+
+	if multilib_is_native_abi && use perl; then
+		cd "${PERL_S}" || die
+		perl-module_src_configure
+	fi
+}
+
+multilib_src_compile() {
+	emake
+
+	if multilib_is_native_abi && use perl; then
+		cd "${PERL_S}" || die
+		perl-module_src_compile
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi && use perl; then
+		cd "${PERL_S}" || die
+		SRC_TEST="do"
+		export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${BUILD_DIR}/.libs"
+		perl-module_src_test
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use perl; then
+		cd "${PERL_S}" || die
+		mytargets="pure_install"
+		perl-module_src_install
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc AUTHORS ChangeLog* debian/NEWS README.debug
+	newdoc debian/changelog changelog.debian
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	use perl && perl_set_version
+}