gentoo resync : 18.12.2020

4 files changed, 2 insertions, 64 deletions

diff --git a/sys-libs/libvpd/Manifest b/sys-libs/libvpd/Manifest
index 58ce113ef5a1..38a0fa01ba17 100644
--- a/sys-libs/libvpd/Manifest
+++ b/sys-libs/libvpd/Manifest
@@ -1,6 +1,3 @@
-AUX libvpd-2.2.6-localstatedir.patch 688 BLAKE2B e1674fd78b6b863310a4f6a0c2f0f031a7e5009cf3e392fa373ef4b6a8de950632839cd5111876f1337527471c61bce34dea9c4f33259fad5607d65dd72c0493 SHA512 8ce3f73d5ef84922dfb7574cbf01adc9fd0d2eb34b9e9f56a57aa888944ef66cd4b35286b559dd4d0769a024693622896900adbfec391d316e20b533781dbe49
-DIST libvpd-2.2.6.tar.gz 374262 BLAKE2B b7741948aa62ad6221d28a674f765d085e1446c0bb45d7aa7a5f08599471023b2bb794ad5645c3b70af5806cd48cc87f117f9b4021e0f8c872ca48b748cc1e60 SHA512 17046eeb6ccc5372d465848eff7135cf6e9f876a2d82862e1d01a9f674b691958942e119f846bc3220c1e8f7eb549c5c7867d5d5e896072c733f400d202abc1d
 DIST libvpd-2.2.8.tar.gz 52725 BLAKE2B 76bdc6ddf80236a6848185273c2cac181d44214f0c609d7c5af6fa4d09a7cd816324af35745617ce3daa7268311e2ed754335600df1d4970a324eb327015d051 SHA512 d0b7d1760c6ae54717c538405c651317b7318dec5780961f5386c09b7d245e35a84c2fc47d89c47c3cd2168d73d7186f5819981d52c3ba962514639833dc62aa
-EBUILD libvpd-2.2.6.ebuild 896 BLAKE2B b5b1f44f7baeb76b113abb72bb93ab264264cfcf401ae2feda707f6cbb4443ad9827cdb44fd4100fdbd0bd2511f63033c80b1cc6555dd744820aec6b7c4d2ddd SHA512 68d26a3b3c1c7a9db3f39a8201cf07a4809e5be5424a177aabbddd58dd796e4c759466242099135e94fe8d62e89413524a0f10c55813e76e70c3b76327e79328
-EBUILD libvpd-2.2.8.ebuild 911 BLAKE2B 71b4ca4d178740dd80642635562400b1c166fb3e22d6717462190accfe346fd57af9dc4242d5b19bfc4addaa61992e424b0e74cc530b561ef301b82f6d0d1253 SHA512 e46a8cba1cd7ff8d6de787e069d11b6b5c37408e0fae107e4d267f296057548838898fec35c643dc1a5eeb486b5bda19305b8a5067019e154d092587a0f11c91
+EBUILD libvpd-2.2.8.ebuild 909 BLAKE2B 6b3e715ce6d8c736d205340513b93479f1c8d176e29b2e162f27d448f8d08fe962232050a44eb57c46d9049c4a4cf5af8f533a4061dd2670b6504e579042abd4 SHA512 c1af2a36595cae47c3d803b2ce14e664587aa7348376f03f194d5d89a7c64e86c15e8da0aff50858a8862bf194b8dfaa597b3000fa4940dce91d38ac4c304e08
 MISC metadata.xml 343 BLAKE2B 88ff852b7b901d0f81c494ab49f283835edb7e312965526050fde66fcf0b259c197e0b1b312e09910a77257e4e1b8d8f3fd6c465b95a9fbe7288b8d64a4a6659 SHA512 42f1b8b76a107cfa61ae9db8b900aed22a3bc8e8d3573dbb3c507ebde688ef2c50f7f79847eb345e738365fbb99ba22d99aee56e302c6eed064379ddc1e3a710
diff --git a/sys-libs/libvpd/files/libvpd-2.2.6-localstatedir.patch b/sys-libs/libvpd/files/libvpd-2.2.6-localstatedir.patch
deleted file mode 100644
index 78a44a6351c6..000000000000
--- a/sys-libs/libvpd/files/libvpd-2.2.6-localstatedir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -66,6 +66,6 @@
- 
- install-exec-hook:
- 	mkdir -p $(DESTDIR)/${sysconfdir}/udev/rules.d/
--	mkdir -p $(DESTDIR)/${localstatedir}/lib/lsvpd/
-+	mkdir -p $(DESTDIR)/${localstatedir}/lsvpd/
- 	install -D --mode=644 90-vpdupdate.rules \
-                 ${DESTDIR}/${sysconfdir}/udev/rules.d/90-vpdupdate.rules
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -1046,7 +1046,7 @@
- 
- install-exec-hook:
- 	mkdir -p $(DESTDIR)/${sysconfdir}/udev/rules.d/
--	mkdir -p $(DESTDIR)/${localstatedir}/lib/lsvpd/
-+	mkdir -p $(DESTDIR)/${localstatedir}/lsvpd/
- 	install -D --mode=644 90-vpdupdate.rules \
-                 ${DESTDIR}/${sysconfdir}/udev/rules.d/90-vpdupdate.rules
- 
diff --git a/sys-libs/libvpd/libvpd-2.2.6.ebuild b/sys-libs/libvpd/libvpd-2.2.6.ebuild
deleted file mode 100644
index 2a691e27d0c6..000000000000
--- a/sys-libs/libvpd/libvpd-2.2.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit udev
-
-DESCRIPTION="Library implementation for listing vpds"
-HOMEPAGE="https://sourceforge.net/projects/linux-diag/"
-SRC_URI="https://sourceforge.net/projects/linux-diag/files/libvpd/${PV}/libvpd-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="ppc ppc64"
-IUSE="static-libs"
-
-DEPEND="
-	>=dev-db/sqlite-3.7.8
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.6-localstatedir.patch
-)
-
-src_configure() {
-	# sysconfdir is used only to establish where the udev rules file should go
-	# unfortunately it also adds the subdirs on its own so we strip it down to
-	# dirname
-	econf \
-		$(use_enable static-libs static) \
-		--sysconfdir="$( dirname $(get_udevdir) )"
-}
-
-src_install() {
-	default
-	keepdir /var/lib/lsvpd
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sys-libs/libvpd/libvpd-2.2.8.ebuild b/sys-libs/libvpd/libvpd-2.2.8.ebuild
index 9c9a0165e233..0c38cecb19fc 100644
--- a/sys-libs/libvpd/libvpd-2.2.8.ebuild
+++ b/sys-libs/libvpd/libvpd-2.2.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/power-ras/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~ppc ~ppc64"
+KEYWORDS="ppc ppc64"
 
 DEPEND="
 	dev-db/sqlite:3