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 5E6AB158087 for ; Mon, 24 Jan 2022 09:27:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7B062BC00D; Mon, 24 Jan 2022 09:27:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5252E2BC00D for ; Mon, 24 Jan 2022 09:27:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6ADDD342E3A for ; Mon, 24 Jan 2022 09:27:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F024DD0 for ; Mon, 24 Jan 2022 09:27:28 +0000 (UTC) From: "Jakov Smolić" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jakov Smolić" Message-ID: <1643016419.8ff0f0fe5eafd4e857eb37cc42e841221f4e0230.jsmolic@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/hwids/, profiles/ X-VCS-Repository: repo/gentoo X-VCS-Files: profiles/package.mask sys-apps/hwids/Manifest sys-apps/hwids/hwids-20210613-r2.ebuild sys-apps/hwids/hwids-99999999.ebuild sys-apps/hwids/metadata.xml X-VCS-Directories: profiles/ sys-apps/hwids/ X-VCS-Committer: jsmolic X-VCS-Committer-Name: Jakov Smolić X-VCS-Revision: 8ff0f0fe5eafd4e857eb37cc42e841221f4e0230 X-VCS-Branch: master Date: Mon, 24 Jan 2022 09:27:28 +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: de25f7d3-2f27-452c-8483-74b4d908c5ba X-Archives-Hash: 7cdfe29c86bc2f34490f04eaa8977f5a commit: 8ff0f0fe5eafd4e857eb37cc42e841221f4e0230 Author: Jakov Smolić gentoo org> AuthorDate: Mon Jan 24 09:26:59 2022 +0000 Commit: Jakov Smolić gentoo 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ć 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 (2021-12-24) -# Replaced by sys-apps/hwdata. Removal on 2022-01-23. -sys-apps/hwids - # Jonas Stein (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 @@ - - - - - base-system@gentoo.org - Gentoo Base System - - - floppym@gentoo.org - - - - Install the oui.txt and iab.txt databases - Install the pci.ids database - Install the usb.ids database - Install hwdb.d rules for udev - - - gentoo/hwids - -