Gentoo Archives: gentoo-commits

From: Ben Kohler <bkohler@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/hwinfo/
Date: Tue, 18 May 2021 14:15:21
Message-Id: 1621347295.ad1935d365fb6553bc3e64b0f01bd69b8fb96a43.bkohler@gentoo
1 commit: ad1935d365fb6553bc3e64b0f01bd69b8fb96a43
2 Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 18 13:41:25 2021 +0000
4 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
5 CommitDate: Tue May 18 14:14:55 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad1935d3
7
8 sys-apps/hwinfo: drop old
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.3
11 Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
12
13 sys-apps/hwinfo/Manifest | 2 --
14 sys-apps/hwinfo/hwinfo-21.23.ebuild | 56 ---------------------------------
15 sys-apps/hwinfo/hwinfo-21.4.ebuild | 63 -------------------------------------
16 3 files changed, 121 deletions(-)
17
18 diff --git a/sys-apps/hwinfo/Manifest b/sys-apps/hwinfo/Manifest
19 index 7182a792023..95e7193967d 100644
20 --- a/sys-apps/hwinfo/Manifest
21 +++ b/sys-apps/hwinfo/Manifest
22 @@ -1,3 +1 @@
23 -DIST hwinfo-21.23-1.2.src.rpm 844672 BLAKE2B 33cfd68c06081d76b33243474b9a72cc5994c749ff57b7fc4f36c88627707068fb86d4825bae66e4e08f730dc8849264f5f31f8717f28400b3d54302ac12b1eb SHA512 d25c955fa5620268a34a857916e0bdbbdb92f8e092735ac453e7bacc6476e00047c9ccef3a5275e5d50cc354bf9e3cffef57af519dc885d0afd3d161ab426629
24 -DIST hwinfo-21.4-1.1.src.rpm 781525 BLAKE2B 83c6d0b3d15a7b4354223eef8b976643ec6520842007ce6fb06534360a8994d4aac0975eba059275910f59391e7069b0166b69301006ea78ca4b74c6aefbde7c SHA512 bccac7749751924e1e1a8005e6fd783da7114926b6d9b9a1247b3b26dd680848eb2b85b368c312d08b444c8d7b75036d249daf33afc5b7efbbcc09bfbad4b340
25 DIST hwinfo-21.72-1.3.src.rpm 926285 BLAKE2B b8a38b2f04649e268a6d6fbebabd724a0c678e81ea9c09c3453ababa26e91ba5fe55c7feccf157ab81ab676e6610ba1700ef1691bdd06fbcbc1cdd86806282d2 SHA512 4e51ee4f8e03eee82317557aa39b5018cc2370b33bfdb280ecb8716687d951f8c34fa7598a1e0eff03025991eee654af488e3343d93167e4cf16380d047c2de3
26
27 diff --git a/sys-apps/hwinfo/hwinfo-21.23.ebuild b/sys-apps/hwinfo/hwinfo-21.23.ebuild
28 deleted file mode 100644
29 index 97cc8c3e0a7..00000000000
30 --- a/sys-apps/hwinfo/hwinfo-21.23.ebuild
31 +++ /dev/null
32 @@ -1,56 +0,0 @@
33 -# Copyright 1999-2018 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=6
37 -
38 -inherit multilib rpm toolchain-funcs
39 -
40 -DESCRIPTION="Hardware detection tool used in SuSE Linux"
41 -HOMEPAGE="https://www.opensuse.org/"
42 -SRC_URI="http://download.opensuse.org/source/factory/repo/oss/suse/src/${P}-1.2.src.rpm"
43 -
44 -LICENSE="GPL-2"
45 -SLOT="0"
46 -KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
47 -IUSE=""
48 -
49 -RDEPEND="
50 - amd64? ( dev-libs/libx86emu )
51 - x86? ( dev-libs/libx86emu )"
52 -DEPEND="${RDEPEND}
53 - sys-devel/flex
54 - >=sys-kernel/linux-headers-2.6.17"
55 -
56 -MAKEOPTS="${MAKEOPTS} -j1"
57 -
58 -src_prepare() {
59 - # Respect AR variable.
60 - sed -i \
61 - -e 's:ar r:$(AR) r:' \
62 - src/{,isdn,ids,smp,hd}/Makefile || die
63 -
64 - # Respect LDFLAGS.
65 - sed -i -e 's:$(CC) $(CFLAGS):$(CC) $(LDFLAGS) $(CFLAGS):' src/ids/Makefile || die
66 -
67 - # Respect MAKE variable. Skip forced -pipe and -g. Respect LDFLAGS.
68 - sed -i \
69 - -e 's:make:$(MAKE):' \
70 - -e 's:-pipe -g::' \
71 - -e 's:LDFLAGS.*=:LDFLAGS +=:' \
72 - Makefile{,.common} || die
73 - default
74 -}
75 -
76 -src_compile() {
77 - tc-export AR
78 - emake CC="$(tc-getCC)" RPM_OPT_FLAGS="${CFLAGS}"
79 -}
80 -
81 -src_install() {
82 - emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" install
83 -
84 - dodoc changelog README*
85 - doman doc/*.{1,8}
86 - insinto /usr/share/doc/${PF}/examples
87 - doins doc/example*.c
88 -}
89
90 diff --git a/sys-apps/hwinfo/hwinfo-21.4.ebuild b/sys-apps/hwinfo/hwinfo-21.4.ebuild
91 deleted file mode 100644
92 index a63b0e33b3f..00000000000
93 --- a/sys-apps/hwinfo/hwinfo-21.4.ebuild
94 +++ /dev/null
95 @@ -1,63 +0,0 @@
96 -# Copyright 1999-2018 Gentoo Foundation
97 -# Distributed under the terms of the GNU General Public License v2
98 -
99 -EAPI=5
100 -
101 -inherit multilib rpm toolchain-funcs
102 -
103 -DESCRIPTION="hardware detection tool used in SuSE Linux"
104 -HOMEPAGE="https://www.opensuse.org/"
105 -SRC_URI="http://download.opensuse.org/source/factory/repo/oss/suse/src/${P}-1.1.src.rpm"
106 -
107 -LICENSE="GPL-2"
108 -SLOT="0"
109 -KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
110 -IUSE=""
111 -
112 -RDEPEND="
113 - amd64? ( dev-libs/libx86emu )
114 - x86? ( dev-libs/libx86emu )"
115 -DEPEND="${RDEPEND}
116 - sys-devel/flex
117 - >=sys-kernel/linux-headers-2.6.17"
118 -
119 -MAKEOPTS="${MAKEOPTS} -j1"
120 -
121 -src_prepare() {
122 - # Respect AR variable.
123 - sed -i \
124 - -e 's:ar r:$(AR) r:' \
125 - src/{,isdn,ids,smp,hd}/Makefile || die
126 -
127 - # Avoid -I directories for dbus because HAL is obsolete.
128 - sed -i -e '/CFLAGS/d' src/hd/Makefile || die
129 - # Respect LDFLAGS.
130 - sed -i -e 's:$(CC) -shared:& $(LDFLAGS):' src/Makefile || die
131 - sed -i -e 's:$(CC) $(CFLAGS):$(CC) $(LDFLAGS) $(CFLAGS):' src/ids/Makefile || die
132 -
133 - # Use linux/pci.h directly. #506876
134 - sed -i \
135 - -e '/#include.*sys\/pci.h/s:sys/pci.h:linux/pci.h:' \
136 - src/hd/*.c || die
137 -
138 - # Respect MAKE variable. Skip forced -pipe and -g. Respect LDFLAGS.
139 - sed -i \
140 - -e 's:make:$(MAKE):' \
141 - -e 's:-pipe -g::' \
142 - -e 's:LDFLAGS.*=:LDFLAGS +=:' \
143 - Makefile{,.common} || die
144 -}
145 -
146 -src_compile() {
147 - tc-export AR
148 - emake CC="$(tc-getCC)" RPM_OPT_FLAGS="${CFLAGS}"
149 -}
150 -
151 -src_install() {
152 - emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" install
153 -
154 - dodoc changelog README
155 - doman doc/*.{1,8}
156 - insinto /usr/share/doc/${PF}/examples
157 - doins doc/example*.c
158 -}