From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ED3C4158089 for ; Thu, 2 Nov 2023 12:47:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 349512BC016; Thu, 2 Nov 2023 12:47:50 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 168692BC016 for ; Thu, 2 Nov 2023 12:47:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 14546335D1E for ; Thu, 2 Nov 2023 12:47:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 628CAAA5 for ; Thu, 2 Nov 2023 12:47:47 +0000 (UTC) From: "Ben Kohler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ben Kohler" Message-ID: <1698929206.ced487de3da966a76e9eedb6fe2705983415bda8.bkohler@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/hwinfo/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/hwinfo/Manifest sys-apps/hwinfo/hwinfo-22.2-r1.ebuild sys-apps/hwinfo/hwinfo-23.1-r1.ebuild X-VCS-Directories: sys-apps/hwinfo/ X-VCS-Committer: bkohler X-VCS-Committer-Name: Ben Kohler X-VCS-Revision: ced487de3da966a76e9eedb6fe2705983415bda8 X-VCS-Branch: master Date: Thu, 2 Nov 2023 12:47:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 98a923b0-08be-46c8-b275-58cf5376a03f X-Archives-Hash: 2606b6e817c83a5a1a50ee86989ffbc0 commit: ced487de3da966a76e9eedb6fe2705983415bda8 Author: Ben Kohler gentoo org> AuthorDate: Thu Nov 2 12:46:06 2023 +0000 Commit: Ben Kohler gentoo org> CommitDate: Thu Nov 2 12:46:46 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ced487de sys-apps/hwinfo: drop 22.2-r1, 23.1-r1 Closes: https://bugs.gentoo.org/915332 Signed-off-by: Ben Kohler gentoo.org> sys-apps/hwinfo/Manifest | 2 -- sys-apps/hwinfo/hwinfo-22.2-r1.ebuild | 61 ----------------------------------- sys-apps/hwinfo/hwinfo-23.1-r1.ebuild | 60 ---------------------------------- 3 files changed, 123 deletions(-) diff --git a/sys-apps/hwinfo/Manifest b/sys-apps/hwinfo/Manifest index 7f4845b30d16..c57d4ab8f8f3 100644 --- a/sys-apps/hwinfo/Manifest +++ b/sys-apps/hwinfo/Manifest @@ -1,3 +1 @@ -DIST hwinfo-22.2-1.2.src.rpm 1063515 BLAKE2B 4baede16a2528421df77de2d6547f7301db8545de712327dc96a435819d2a35bac7d7ddd3bac5b0758d947ceb0360cb09d640154f392a844e8e201339781f4ed SHA512 76384ca7bce779ca92cd17f5312546ca6ff1ffd93be9d35253e65d1efda03bb8d596e89776024a51f9874c57cf2852938fb85c1f5b745d898e0bafe10cdbbdf9 -DIST hwinfo-23.1-1.1.src.rpm 1064746 BLAKE2B 59b3bac5dd8188abfec76a6f86bf0f9cbab5922900681d987ce3728911065331f730314df23d53dbd08992b4d67d7431b6f9566dcefa574b09956e41ccc8dfb0 SHA512 51622e3fff885e83b4f143e1f029915fb4a29b2a4b35d618945dfa8638a36e7e51c0b2edf51ad091a17a2599fd850cbc90c4d744889fcf375a9a7c5683966bdd DIST hwinfo-23.2.tar.gz 1237565 BLAKE2B 86c085c0b58b967f94ded3db4975cd824f69908b3b7fc1d27e2d51cb0e570969a7af2274f55d6eb1d871e1422016deb8007c76199be441ad94486ab18f9bff7a SHA512 86096455cc58ecdd3be4306d61beaea02da39b8ee3b2a99966d4aaf022e276616329ca82550d7903e2aed9b1723a99b2305617fb85df21c1d2024ce46b447af3 diff --git a/sys-apps/hwinfo/hwinfo-22.2-r1.ebuild b/sys-apps/hwinfo/hwinfo-22.2-r1.ebuild deleted file mode 100644 index 8caed913683a..000000000000 --- a/sys-apps/hwinfo/hwinfo-22.2-r1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2023 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.2.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}" LIBDIR="${EPREFIX}/usr/$(get_libdir)" -} - -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-23.1-r1.ebuild b/sys-apps/hwinfo/hwinfo-23.1-r1.ebuild deleted file mode 100644 index 65e37b38840c..000000000000 --- a/sys-apps/hwinfo/hwinfo-23.1-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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-kernel/linux-headers-2.6.17" -BDEPEND="sys-devel/flex" - -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}" LIBDIR="${EPREFIX}/usr/$(get_libdir)" -} - -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} -}