gentoo auto-resync : 12:12:2022 - 21:25:47

4 files changed, 2 insertions, 152 deletions

diff --git a/sys-apps/ppc64-diag/Manifest b/sys-apps/ppc64-diag/Manifest
index bbffdc407316..4af693dedcbe 100644
--- a/sys-apps/ppc64-diag/Manifest
+++ b/sys-apps/ppc64-diag/Manifest
@@ -1,10 +1,6 @@
 AUX fix-systemd-unit-path.patch 1539 BLAKE2B 78865aea8745102e34a0f29884d21efd768b59de7cca660af4d9866edd4755ab18b3563a37d2e184e3ec75c81378e06df9b06f764af6e2e851b693c017a0f4bf SHA512 2091c4d553c57b2a23dcf02d477c379c1ece870f572cfa12478fd339b8b5272320cd53f63ca4a22a911689ad3de73b011f0937dd8da5810e32ce6be2dfb0714a
 AUX opal_errd.initd 374 BLAKE2B b463e484e60ea63afd2c4f27a4e8330ae6733ecd3e6925b4c1e7333022ff1bd895da29343a7dbf1e92a88c9b204b691d64450c3847dacc8329678f2c9b55cb21 SHA512 1e6e363dbf59d3ef96e724d37d9dd6e764a145cbaf3cc18007d9da50dc5c2ef4effef50282daea93db62ae6722cb6857060896ab5ff76b7348d42d09926b2b04
 AUX rtas_errd.initd 371 BLAKE2B a5367e20d7732fc0b778349e740351fbd55049a08e456a859fc5d8a2e06418bc865b7ef5d27fb3ba420bb008ca7ee5b4781fc41393716d6e502cb691f602805b SHA512 a92128d9b5e31d1206999123734924e8e24833beba4e39b067fbb38bb16cbf174d1dbd51a1d27f294ba95da849020fd60e737ada35db98a7b6210cd06375c1de
-DIST ppc64-diag-2.7.7.tar.gz 423357 BLAKE2B b32def540811f383e401d352d17f2edce6a998a91a7b27bcab981e42469f44aaa505104ed2d2ced8a85485c0886525ff5128b36cdbad3a8eed90e8002877498c SHA512 42d94214345ab8deb7bd9ee8b145052fc2f733ba13d1567dbe6592fe9306670e3cd0ab6122e515464f7050753a992061c056e009673c7f8f6e554e9eaf75c550
-DIST ppc64-diag-2.7.8.tar.gz 424366 BLAKE2B e5e4791dffba4ede725051682019f0b75c2ee718fd33170912ccf228946fa56b4e63930a9b9c8d7e58ce27f0a18b03ea7c58ba259b781d4c40eed945e2d895a9 SHA512 1a8890624609f64eb412cabb690f30a67b7f714260de14acc195268ecbda79d6c5e7d80694dabb3ab148fc74a4df6b8e147750e869ab49f40d04742ef284398e
 DIST ppc64-diag-2.7.9.tar.gz 439622 BLAKE2B a30a94359227812254d7ae9a571e524e88eb136fad9567cc5670d85dd66fb3a0f761a58da7eeeabe22434b959fa0d73a8c5213379184432c2a5efe8f8d9c2a47 SHA512 b6756c17e67e876ad3a945d05dbd2c2523cbf121c4aa658a4edaf33775c8165ff26a252bdf812600e2d47ae69cd68f6e22c0de6f2d3994856adcd3d949322673
-EBUILD ppc64-diag-2.7.7.ebuild 1557 BLAKE2B f2625c84268207eb112f92318383567e347b4b4286da37d2c5c5e5ce24078e54430617176cb9e22f0170663e5a36d13309fd18c4c2f2e0eac6243cdc690dc225 SHA512 d4d3b3ecf072c68a2122ebeab58e724a0b497c1911591f4a5ebc30c84fad819d0f6eb5e4c5c8ba5891f1600ad936e9a6e9af77a3049710723dabfec75376050f
-EBUILD ppc64-diag-2.7.8.ebuild 1572 BLAKE2B 1d38e9dc5a739fa8791f2c515aeeb96ff6f73c4bf6a75a4c2b3278b1137775c75077be53f9c754156d9fb13787eb23d60ca8117f0fe236cdc2d6cb8ce6d4c8b1 SHA512 57a492c116173c5f909cb5c7af9792bfd3d3dca2862c35e7a807e666ca02207ac2e4e651f112cdd133ef0ffafd86135a9236fcccfa9665e437f20abc3546d3c4
-EBUILD ppc64-diag-2.7.9.ebuild 1717 BLAKE2B 063d59b07921903804239f55382a1ead38bc17c3119aef66c5b1164b518bee86511f8023369c05521b52e197d2ffbf55b71021518c5153f357c7264928c57667 SHA512 fa6f6a44484219601b97694491a5494928f3e738a474f1d3e533cbf85913034a2142fdf64f1acb626224d4bbcf3e9aead33bcac3e14ec3409d8581092e51799e
+EBUILD ppc64-diag-2.7.9.ebuild 1716 BLAKE2B 165705c7e54c9c62e3c18989af20c08094c1e9eb221429d50a1045103b8746ef88bb3922678795e294c8a59bf0ad6628f4284cf1d015ac382c9a82d99e3d2d62 SHA512 754c3c1207c73cb60283f4326a1d81495c86ab466ecfccc296d38be43f3fbac8846e46644195b21cc1f9089d877a5a9a2e07884d6085460fd4713bd642d3c708
 MISC metadata.xml 886 BLAKE2B 85a1fa6462be80d9dec2bbb295a5e5d54cc02ea260291e4d74ad43a44e0d75417514257d00eed844833474c0acf8fc2cd0f5293494dc2ad87855f1fbc971006a SHA512 c1e15f167ea9d262610959a24047a243a2faa3176562415f144c5e4d31eaa924abb9db009c8902a7636d69dc608f8321d5556055d5f166e367a2144a7c1a93db
diff --git a/sys-apps/ppc64-diag/ppc64-diag-2.7.7.ebuild b/sys-apps/ppc64-diag/ppc64-diag-2.7.7.ebuild
deleted file mode 100644
index 9c94baecc1f4..000000000000
--- a/sys-apps/ppc64-diag/ppc64-diag-2.7.7.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Diagnostic tools for PowerLinux"
-HOMEPAGE="https://github.com/power-ras/ppc64-diag"
-SRC_URI="https://github.com/power-ras/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~ppc64"
-IUSE="rtas"
-
-DEPEND="virtual/libudev:=
-	rtas? (
-		sys-libs/ncurses:0=
-		sys-libs/librtas
-		sys-libs/libservicelog
-		sys-libs/libvpd
-	)
-"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/fix-systemd-unit-path.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with rtas librtas)
-	# handle ncurses[tinfo]
-	sed -e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \
-		-i Makefile || die
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}/opal_errd.initd" opal_errd
-
-	if use rtas; then
-		newinitd "${FILESDIR}/rtas_errd.initd" rtas_errd
-		keepdir /var/log/ppc64-diag/diag_disk
-	else
-		# makefile installs it unconditionally
-		rm -rf "${ED}/lib/systemd/system/rtas_errd.service" || die
-		rm -rf "${ED}/usr/lib/systemd/system/rtas_errd.service" || die
-	fi
-
-	keepdir /var/log/opal-elog
-	keepdir /var/log/dump
-}
-
-src_test() {
-	# it assumes MKTEMP created dir in /tmp, add /var to the string.
-	# /varplatform.0x01 becomes platform.0x01, just as test expects
-	# so we sed a sed expression, don't judge me
-	sed -i 's%\/tmp/%\/var\/tmp\/%' opal_errd/tests/test-extract_opal_dump-000 || die
-	emake check
-}
diff --git a/sys-apps/ppc64-diag/ppc64-diag-2.7.8.ebuild b/sys-apps/ppc64-diag/ppc64-diag-2.7.8.ebuild
deleted file mode 100644
index d8d62ef7d06e..000000000000
--- a/sys-apps/ppc64-diag/ppc64-diag-2.7.8.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Diagnostic tools for PowerLinux"
-HOMEPAGE="https://github.com/power-ras/ppc64-diag"
-SRC_URI="https://github.com/power-ras/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~ppc64"
-IUSE="rtas"
-
-DEPEND="virtual/libudev:=
-	rtas? (
-		sys-libs/ncurses:0=
-		sys-libs/librtas
-		sys-libs/libservicelog
-		>=sys-libs/libvpd-2.2.9:=
-	)
-"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/fix-systemd-unit-path.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with rtas librtas)
-	# handle ncurses[tinfo]
-	sed -e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \
-		-i Makefile || die
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}/opal_errd.initd" opal_errd
-
-	if use rtas; then
-		newinitd "${FILESDIR}/rtas_errd.initd" rtas_errd
-		keepdir /var/log/ppc64-diag/diag_disk
-	else
-		# makefile installs it unconditionally
-		rm -rf "${ED}/lib/systemd/system/rtas_errd.service" || die
-		rm -rf "${ED}/usr/lib/systemd/system/rtas_errd.service" || die
-	fi
-
-	keepdir /var/log/opal-elog
-	keepdir /var/log/dump
-}
-
-src_test() {
-	# it assumes MKTEMP created dir in /tmp, add /var to the string.
-	# /varplatform.0x01 becomes platform.0x01, just as test expects
-	# so we sed a sed expression, don't judge me
-	sed -i 's%\/tmp/%\/var\/tmp\/%' opal_errd/tests/test-extract_opal_dump-000 || die
-	emake check
-}
diff --git a/sys-apps/ppc64-diag/ppc64-diag-2.7.9.ebuild b/sys-apps/ppc64-diag/ppc64-diag-2.7.9.ebuild
index 57a0b0068a7e..efa16f44fa52 100644
--- a/sys-apps/ppc64-diag/ppc64-diag-2.7.9.ebuild
+++ b/sys-apps/ppc64-diag/ppc64-diag-2.7.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/power-ras/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~ppc64"
+KEYWORDS="ppc64"
 IUSE="rtas"
 
 DEPEND="virtual/libudev:=