gentoo resync : 22.12.2021

3 files changed, 2 insertions, 99 deletions

diff --git a/dev-libs/lockdev/Manifest b/dev-libs/lockdev/Manifest
index efa498b51830..22fe45a6e0a9 100644
--- a/dev-libs/lockdev/Manifest
+++ b/dev-libs/lockdev/Manifest
@@ -3,6 +3,5 @@ AUX lockdev-1.0.3-fix-perl.patch 307 BLAKE2B aa1d9fb4131a0dcedbac0034e450ef47cac
 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 1956 BLAKE2B db846cb320977b0f3e3b63afee8cc9a0aaa350bb963c2ac7e412955583cfac4e451e09f0fb31e6c1ab35eadf5c5374842ba01504dea9a1c36e55722d9cffe0b9 SHA512 06bf4982c3bedbb1707769d66783e1650058f16950983958ceef07c5fe5965e0e0ca56a6914dce7e8dde7c4ab4412d31ea26a65ba3f12c45c52ca08fdb14fe8c
-EBUILD lockdev-1.0.3.1.2-r4.ebuild 1906 BLAKE2B 7d563034345c314a09e5de913981e644ca5cab4da4e90d62cdbc351f66b8d5eab929c6c39960cbb81cd596d5ae378b48f2c53efc6ae76f7a341c5eaddec32420 SHA512 a0d7fb443a87668666ea8adc298409f5c3c546b4d031f60720261bb4791b7c7a1613d1ed3e8648b9adf3a7d9801d0a4b251d3361f5719620a7fd106f95e17c6f
+EBUILD lockdev-1.0.3.1.2-r4.ebuild 1900 BLAKE2B c00df70b152d468a26f17637e569ec7a24ad1ec52b2dba5864e8eab72e23e9f72c7f4897d398552c5fb4ea0c5fb6df5d04aabdff3f13235e553229e886d4f299 SHA512 0516e4e47e4c8b8728eaa575260cb98457c3bda45efc5974eeba8b1d612aea4fa0e1dbdd852ce0425f3895150b2ec1fe4d8448870cbd84115aafee154409d863
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
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
deleted file mode 100644
index 419f982bc81b..000000000000
--- a/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL="no"
-inherit perl-module epatch versionator autotools multilib-minimal
-
-MAJOR=$(get_major_version)
-MY_PV=$(get_version_component_range 1-3)
-MY_P=${PN}-${MY_PV}
-DEB_PV=$(replace_version_separator 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"
-)
-
-PERL_S=./LockDev
-
-pkg_setup() {
-	use perl && perl_set_version
-}
-
-src_prepare() {
-	epatch -p1 "${PATCHES[@]}"
-	epatch_user
-
-	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
-}
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
index 49560227160a..f06891e08476 100644
--- a/dev-libs/lockdev/lockdev-1.0.3.1.2-r4.ebuild
+++ b/dev-libs/lockdev/lockdev-1.0.3.1.2-r4.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}"/${PN}-${MY_PV}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="perl"
 
 PATCHES=(