gentoo auto-resync : 08:07:2023 - 22:23:22

4 files changed, 7 insertions, 133 deletions

diff --git a/sys-apps/hwinfo/Manifest b/sys-apps/hwinfo/Manifest
index 6220183c48e6..2c5ab58845e1 100644
--- a/sys-apps/hwinfo/Manifest
+++ b/sys-apps/hwinfo/Manifest
@@ -1,8 +1,5 @@
-DIST hwinfo-21.80-1.1.src.rpm 968192 BLAKE2B a11a1060137ff89504963c01c4129dcac93e8eea9747ea20272763f648068e8b4fb3f1c31ae761664b1b1ffedf32971b3b27804f125473f0367cc6eed03751bf SHA512 7bf64d9ee6b2381c43ffb22dc5623c8a8ed05c26b4e154c3093a9cb255779a1d482c18cd085b272ce619249743f1c43989337bed142685b4d6c634f4551893ee
-DIST hwinfo-22.1-1.1.src.rpm 969862 BLAKE2B f295c941804d3264b45739fa3d1801c2e31d67ce50f49caafeaae5a4dbf809fcfb9b44eaefee6ac9c61f54c1639fe1cf7ba710a9bbae5c4adbc7b5740e706796 SHA512 83f5d2dc78dfb10987a57a52f194d5db38ec66e73daad8fdf08386b131cf862b6c7bc3404451550f91363bb3d4090e67ca36aeba001f506075e55721004f2759
 DIST hwinfo-22.2-1.2.src.rpm 1063515 BLAKE2B 4baede16a2528421df77de2d6547f7301db8545de712327dc96a435819d2a35bac7d7ddd3bac5b0758d947ceb0360cb09d640154f392a844e8e201339781f4ed SHA512 76384ca7bce779ca92cd17f5312546ca6ff1ffd93be9d35253e65d1efda03bb8d596e89776024a51f9874c57cf2852938fb85c1f5b745d898e0bafe10cdbbdf9
-EBUILD hwinfo-21.80.ebuild 1561 BLAKE2B f66110bb40f16efaeade743b03ddc26b72cd7b875c4ecf6c4599f1729c0feaab83a3b3f24867630c46c38ccac6ac6010eacc0b8b655f1e3d03af8e4679330ce9 SHA512 b455efce4294dbbcba410c675df5f0c34c4e97b9fa065953db481faa060d51348619f3f6c1030e4eae8336749e717034a73501ecb347f19f03204d2058a133aa
-EBUILD hwinfo-22.1-r1.ebuild 1601 BLAKE2B e23d4ce9ba384343871d30a7a171c27344c832cc08d32e6998a981264133e8a6541fa40e953a82c93fa10d2df2e8d1e37e58deae283a6da4b7a1fbb3ad182869 SHA512 466d6106c319ffc4d9f9d5fd1df56ba4e5cb248258484a28c70e7dd8be0156a8b88df4b997a2c3ae13223461331b30e0edf330def3b86cc2c503b92936a896e2
-EBUILD hwinfo-22.1.ebuild 1561 BLAKE2B f66110bb40f16efaeade743b03ddc26b72cd7b875c4ecf6c4599f1729c0feaab83a3b3f24867630c46c38ccac6ac6010eacc0b8b655f1e3d03af8e4679330ce9 SHA512 b455efce4294dbbcba410c675df5f0c34c4e97b9fa065953db481faa060d51348619f3f6c1030e4eae8336749e717034a73501ecb347f19f03204d2058a133aa
+DIST hwinfo-23.1-1.1.src.rpm 1064746 BLAKE2B 59b3bac5dd8188abfec76a6f86bf0f9cbab5922900681d987ce3728911065331f730314df23d53dbd08992b4d67d7431b6f9566dcefa574b09956e41ccc8dfb0 SHA512 51622e3fff885e83b4f143e1f029915fb4a29b2a4b35d618945dfa8638a36e7e51c0b2edf51ad091a17a2599fd850cbc90c4d744889fcf375a9a7c5683966bdd
 EBUILD hwinfo-22.2.ebuild 1599 BLAKE2B 98ba96b088ba930b690f01f93782cfc01cef87cbf60b97906ded75a2c196bc2988720f76fabae763539591696dac924707d83627fef8aa5d951198d979566692 SHA512 5a522e561e968cbcaa4e7c1476c2307f84e59553b1c13e9d6d790bcf9c9bf9535809da043556df2a3261c0fec618f2d11c167a5498747dc0a2aead185d7ccdeb
+EBUILD hwinfo-23.1.ebuild 1609 BLAKE2B 3d8423eec5dce1b018da2d709ef2b10beb94b199aab642194e592652b93e5b0a35c79895a26fea37b761f16e7febcd212837708955d0299b5bf1a831e305ca32 SHA512 240b42a262f4f0d3355cee7ce7914db5f3388bf5d2bd55bfac396d5c41770a0448f5d82660dbd8256ce0ac2e17ad2ae8ff98943a8742731420e19cde1658b0e8
 MISC metadata.xml 335 BLAKE2B 038b3d0d2c3215e9c141823f3578880ecb43da74b991cce36793a6af5b3549603ad1fa95c1bbe477126c3b84f6493099400d8914d94cdbe1c557b0166c0ca43b SHA512 e24489f0c20cc1cd356f7059c4a2a8d02b2f39fcb43df0d685977ce6e1593c134420daf6d940f96f08fd0d19026618d89946e6ff0a24f449be5d5c8910b10581
diff --git a/sys-apps/hwinfo/hwinfo-21.80.ebuild b/sys-apps/hwinfo/hwinfo-21.80.ebuild
deleted file mode 100644
index eca80e98fb3a..000000000000
--- a/sys-apps/hwinfo/hwinfo-21.80.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit rpm toolchain-funcs
-
-DESCRIPTION="Hardware detection tool used in SuSE Linux"
-HOMEPAGE="https://github.com/openSUSE/hwinfo/"
-#Using srpms from SUSE to get pregenerated changelog, otherwise we could use GH
-#SRC_URI="https://github.com/openSUSE/hwinfo/archive/${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI="http://download.opensuse.org/tumbleweed/repo/src-oss/src/${P}-1.1.src.rpm"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	amd64? ( dev-libs/libx86emu )
-	x86? ( dev-libs/libx86emu )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6.17"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_prepare() {
-	# Respect AR variable.
-	sed -i \
-		-e 's:ar r:$(AR) r:' \
-		src/{,isdn,ids,smp,hd}/Makefile || die
-
-	# Respect LDFLAGS.
-	sed -i -e 's:$(CC) $(CFLAGS):$(CC) $(LDFLAGS) $(CFLAGS):' src/ids/Makefile || die
-
-	# Respect MAKE variable. Skip forced -pipe and -g. Respect LDFLAGS.
-	sed -i \
-		-e 's:make:$(MAKE):' \
-		-e 's:-pipe -g::' \
-		-e 's:LDFLAGS.*=:LDFLAGS +=:' \
-		Makefile{,.common} || die
-	# Workaround from Arch, if using source tarballs from github
-	# echo 'touch changelog' > git2log
-	default
-}
-
-src_compile() {
-	tc-export AR
-	emake CC="$(tc-getCC)" RPM_OPT_FLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" install
-	keepdir /var/lib/hardware/udi
-
-	dodoc changelog README*
-	docinto examples
-	dodoc doc/example*.c
-	doman doc/*.{1,8}
-}
diff --git a/sys-apps/hwinfo/hwinfo-22.1.ebuild b/sys-apps/hwinfo/hwinfo-22.1.ebuild
deleted file mode 100644
index eca80e98fb3a..000000000000
--- a/sys-apps/hwinfo/hwinfo-22.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit rpm toolchain-funcs
-
-DESCRIPTION="Hardware detection tool used in SuSE Linux"
-HOMEPAGE="https://github.com/openSUSE/hwinfo/"
-#Using srpms from SUSE to get pregenerated changelog, otherwise we could use GH
-#SRC_URI="https://github.com/openSUSE/hwinfo/archive/${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI="http://download.opensuse.org/tumbleweed/repo/src-oss/src/${P}-1.1.src.rpm"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	amd64? ( dev-libs/libx86emu )
-	x86? ( dev-libs/libx86emu )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6.17"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_prepare() {
-	# Respect AR variable.
-	sed -i \
-		-e 's:ar r:$(AR) r:' \
-		src/{,isdn,ids,smp,hd}/Makefile || die
-
-	# Respect LDFLAGS.
-	sed -i -e 's:$(CC) $(CFLAGS):$(CC) $(LDFLAGS) $(CFLAGS):' src/ids/Makefile || die
-
-	# Respect MAKE variable. Skip forced -pipe and -g. Respect LDFLAGS.
-	sed -i \
-		-e 's:make:$(MAKE):' \
-		-e 's:-pipe -g::' \
-		-e 's:LDFLAGS.*=:LDFLAGS +=:' \
-		Makefile{,.common} || die
-	# Workaround from Arch, if using source tarballs from github
-	# echo 'touch changelog' > git2log
-	default
-}
-
-src_compile() {
-	tc-export AR
-	emake CC="$(tc-getCC)" RPM_OPT_FLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" install
-	keepdir /var/lib/hardware/udi
-
-	dodoc changelog README*
-	docinto examples
-	dodoc doc/example*.c
-	doman doc/*.{1,8}
-}
diff --git a/sys-apps/hwinfo/hwinfo-22.1-r1.ebuild b/sys-apps/hwinfo/hwinfo-23.1.ebuild
index f26f8ed34b55..3152e42bc576 100644
--- a/sys-apps/hwinfo/hwinfo-22.1-r1.ebuild
+++ b/sys-apps/hwinfo/hwinfo-23.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit rpm toolchain-funcs
 
@@ -13,15 +13,14 @@ SRC_URI="http://download.opensuse.org/tumbleweed/repo/src-oss/src/${P}-1.1.src.r
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND="
-	amd64? ( dev-libs/libx86emu )
+RDEPEND="amd64? ( dev-libs/libx86emu )
 	x86? ( dev-libs/libx86emu )"
 DEPEND="${RDEPEND}
-	sys-devel/flex
 	>=sys-kernel/linux-headers-2.6.17"
+BDEPEND="sys-devel/flex"
 
 MAKEOPTS="${MAKEOPTS} -j1"