commit: 8ff0f0fe5eafd4e857eb37cc42e841221f4e0230 Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> AuthorDate: Mon Jan 24 09:26:59 2022 +0000 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> CommitDate: Mon Jan 24 09:26:59 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ff0f0fe
sys-apps/hwids: treeclean Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> profiles/package.mask | 4 -- sys-apps/hwids/Manifest | 1 - sys-apps/hwids/hwids-20210613-r2.ebuild | 93 -------------------------------- sys-apps/hwids/hwids-99999999.ebuild | 95 --------------------------------- sys-apps/hwids/metadata.xml | 21 -------- 5 files changed, 214 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 830b20510b3b..f5462bb26e81 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -340,10 +340,6 @@ www-servers/bozohttpd # Broken and upstream needs new maintainer. x11-plugins/purple-facebook -# Mike Gilbert <[email protected]> (2021-12-24) -# Replaced by sys-apps/hwdata. Removal on 2022-01-23. -sys-apps/hwids - # Jonas Stein <[email protected]> (2021-12-24) # Alpha version =app-editors/ghex-4.0.0_alpha diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest deleted file mode 100644 index 3a7943079186..000000000000 --- a/sys-apps/hwids/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST hwids-20210613.tar.gz 3867741 BLAKE2B 64c4b0a83058a2052f7b132241008a3cc75452e93a9a57a9159c357c23fd09ee256abc2b94e700b5d8e8bd4e231ae12932d2c2f32fb03853207739cb3387047d SHA512 4568f6b8c0ca80ec772bd2785d4dc169d1d13a721472a15399158d9a7f31abbe414c5c8cfdf1a3b81cce4e33742a4b6e005e97e3e907643d0afdc8e953624fea diff --git a/sys-apps/hwids/hwids-20210613-r2.ebuild b/sys-apps/hwids/hwids-20210613-r2.ebuild deleted file mode 100644 index 1918ad974880..000000000000 --- a/sys-apps/hwids/hwids-20210613-r2.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 2012-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit udev - -DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases" -HOMEPAGE="https://github.com/gentoo/hwids"; -if [[ ${PV} == 99999999 ]]; then - PYTHON_COMPAT=( python3_{6..9} ) - inherit git-r3 python-any-r1 - EGIT_REPO_URI="https://github.com/gentoo/hwids.git"; -else - SRC_URI="https://github.com/gentoo/hwids/archive/${P}.tar.gz"; - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="|| ( GPL-2 BSD ) public-domain" -SLOT="0" -IUSE="+net +pci systemd +udev +usb" -REQUIRED_USE="systemd? ( udev )" - -RDEPEND=" - systemd? ( sys-apps/systemd[hwdb(+)] ) - udev? ( virtual/udev ) -" - -if [[ ${PV} == 99999999 ]]; then - BDEPEND=" - net-misc/curl - udev? ( $(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]') ) - " - python_check_deps() { - if use udev; then - has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]" - fi - } -else - S=${WORKDIR}/hwids-${P} -fi - -pkg_setup() { - : -} - -src_unpack() { - if [[ ${PV} == 99999999 ]]; then - git-r3_src_unpack - cd "${S}" || die - emake fetch - else - default - fi -} - -src_prepare() { - default - sed -i -e '/udevadm hwdb/d' Makefile || die -} - -_emake() { - emake \ - NET=$(usex net) \ - PCI=$(usex pci) \ - UDEV=$(usex udev) \ - USB=$(usex usb) \ - "$@" -} - -src_compile() { - if [[ ${PV} == 99999999 ]] && use udev; then - python_setup - _emake udev-hwdb - fi - _emake -} - -src_install() { - _emake install \ - DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \ - MISCDIR="${EPREFIX}/usr/share/misc" \ - HWDBDIR="${EPREFIX}$(get_udevdir)/hwdb.d" \ - DESTDIR="${D}" -} - -pkg_postinst() { - if use systemd; then - systemd-hwdb --root="${ROOT}" update - elif use udev; then - udevadm hwdb --update --root="${ROOT}" - fi -} diff --git a/sys-apps/hwids/hwids-99999999.ebuild b/sys-apps/hwids/hwids-99999999.ebuild deleted file mode 100644 index a4f483a3048a..000000000000 --- a/sys-apps/hwids/hwids-99999999.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 2012-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit udev - -DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases" -HOMEPAGE="https://github.com/gentoo/hwids"; -if [[ ${PV} == 99999999 ]]; then - PYTHON_COMPAT=( python3_{6..9} ) - inherit git-r3 python-any-r1 - EGIT_REPO_URI="https://github.com/gentoo/hwids.git"; -else - SRC_URI="https://github.com/gentoo/hwids/archive/${P}.tar.gz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="|| ( GPL-2 BSD ) public-domain" -SLOT="0" -IUSE="+net +pci systemd +udev +usb" -REQUIRED_USE="systemd? ( udev )" - -RDEPEND=" - systemd? ( sys-apps/systemd[hwdb(+)] ) - udev? ( virtual/udev ) -" - -if [[ ${PV} == 99999999 ]]; then - BDEPEND=" - dev-vcs/git-tools - net-misc/curl - udev? ( $(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]') ) - " - python_check_deps() { - if use udev; then - has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]" - fi - } -else - S=${WORKDIR}/hwids-${P} -fi - -pkg_setup() { - : -} - -src_unpack() { - if [[ ${PV} == 99999999 ]]; then - git-r3_src_unpack - cd "${S}" || die - git-restore-mtime || die - emake fetch - else - default - fi -} - -src_prepare() { - default - sed -i -e '/udevadm hwdb/d' Makefile || die -} - -_emake() { - emake \ - NET=$(usex net) \ - PCI=$(usex pci) \ - UDEV=$(usex udev) \ - USB=$(usex usb) \ - "$@" -} - -src_compile() { - if [[ ${PV} == 99999999 ]] && use udev; then - python_setup - _emake udev-hwdb - fi - _emake -} - -src_install() { - _emake install \ - DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \ - MISCDIR="${EPREFIX}/usr/share/misc" \ - HWDBDIR="${EPREFIX}$(get_udevdir)/hwdb.d" \ - DESTDIR="${D}" -} - -pkg_postinst() { - if use systemd; then - systemd-hwdb --root="${ROOT}" update - elif use udev; then - udevadm hwdb --update --root="${ROOT}" - fi -} diff --git a/sys-apps/hwids/metadata.xml b/sys-apps/hwids/metadata.xml deleted file mode 100644 index dfe5f36d6fa1..000000000000 --- a/sys-apps/hwids/metadata.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Base System</name> - </maintainer> - <maintainer type="person"> - <email>[email protected]</email> - </maintainer> - <stabilize-allarches/> - <use> - <flag name="net">Install the oui.txt and iab.txt databases</flag> - <flag name="pci">Install the pci.ids database</flag> - <flag name="usb">Install the usb.ids database</flag> - <flag name="udev">Install hwdb.d rules for udev</flag> - </use> - <upstream> - <remote-id type="github">gentoo/hwids</remote-id> - </upstream> -</pkgmetadata>
