From b201d522a362c1b7e3649b9a68a8937fe4309762 Mon Sep 17 00:00:00 2001 From: Ben Kohler Date: Wed, 27 Sep 2023 12:26:34 -0500 Subject: sys-apps/hwinfo: add slot operator dep for libx86emu Closes: https://bugs.gentoo.org/914727 Signed-off-by: Ben Kohler --- sys-apps/hwinfo/hwinfo-22.2-r1.ebuild | 61 +++++++++++++++++++++++++++++++++++ sys-apps/hwinfo/hwinfo-22.2.ebuild | 61 ----------------------------------- sys-apps/hwinfo/hwinfo-23.1-r1.ebuild | 60 ++++++++++++++++++++++++++++++++++ sys-apps/hwinfo/hwinfo-23.1.ebuild | 60 ---------------------------------- 4 files changed, 121 insertions(+), 121 deletions(-) create mode 100644 sys-apps/hwinfo/hwinfo-22.2-r1.ebuild delete mode 100644 sys-apps/hwinfo/hwinfo-22.2.ebuild create mode 100644 sys-apps/hwinfo/hwinfo-23.1-r1.ebuild delete mode 100644 sys-apps/hwinfo/hwinfo-23.1.ebuild (limited to 'sys-apps/hwinfo') diff --git a/sys-apps/hwinfo/hwinfo-22.2-r1.ebuild b/sys-apps/hwinfo/hwinfo-22.2-r1.ebuild new file mode 100644 index 000000000000..8caed913683a --- /dev/null +++ b/sys-apps/hwinfo/hwinfo-22.2-r1.ebuild @@ -0,0 +1,61 @@ +# 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-22.2.ebuild b/sys-apps/hwinfo/hwinfo-22.2.ebuild deleted file mode 100644 index 4cd975bef396..000000000000 --- a/sys-apps/hwinfo/hwinfo-22.2.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 new file mode 100644 index 000000000000..65e37b38840c --- /dev/null +++ b/sys-apps/hwinfo/hwinfo-23.1-r1.ebuild @@ -0,0 +1,60 @@ +# 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} +} diff --git a/sys-apps/hwinfo/hwinfo-23.1.ebuild b/sys-apps/hwinfo/hwinfo-23.1.ebuild deleted file mode 100644 index 3152e42bc576..000000000000 --- a/sys-apps/hwinfo/hwinfo-23.1.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} -} -- cgit v1.2.3-65-gdbad