sys-apps/hwids: bump to 20171003

Package-Manager: Portage-2.3.10_p4, Repoman-2.3.3_p52

diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index 814ac9e504bc952faf0934286fab32503ee1555a..08ee8ea1300046b9f8d14fb0f5632c355559b6a5 100644 (file)
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -1,2 +1,3 @@
 DIST hwids-20170328.tar.gz 2049249 SHA256 e46abb9ccb54aff728bb0502405aa700974a2a7366d3bb257967ce60d847cfb3 SHA512 ffccbcda78f856b93026102d1d7f62f4639910671c63e30471c990b1029db94b542c555b6ad69820f8a91a45ef9d52c320b9767d38ff08b6e72c041a28e6f0f3 WHIRLPOOL c08493ad1e96c53ec1cc7b7df46e6e8f9db982bcdda57595f7a51820b43ab955a40760adfa9d03bfbc283a05dffe18075d0244a638b5ecf94a4068906f2ffc24
 DIST hwids-20170715.tar.gz 2091853 SHA256 5a20e6f0f3567b23dfc45a103c0b73333dd3a73a1ea7256b68374e841586e80e SHA512 6f1d2e3d7b7fc260f02b3cc87b46385292503dda2a46dea4e69b02915e9d411e9682fb98ca921eb45289e416320a8ef46a3df0753f8f820d20c719663076bd88 WHIRLPOOL 74b77157c1a2f8496bad708009017b925b651f50ca6919a3acd112cab84fcd6512ecb8bd95587a8572e4f79258db7173c3d18c50a21f2fe8f5ef171a467721bd
+DIST hwids-20171003.tar.gz 3035908 SHA256 9befd0d4d796fe77f3ab7576d5beba8ea5c0066285db255d93389d1592d5cd2f SHA512 6a05963f1883cfeb774671931a32eb9322ead145d4d8aa2fa791e90fc3c823a0b3baeaaa4ce84de0e6a10dcd7f1b5943f6d2cab8790d21e8f34ca1d403598a8a WHIRLPOOL e3bfeb025e60c11dc6f576b044ceee10e17bd318cbde26de64ea146519f707c4d95fdf592f90becd860df5059af272074871b33f5d039392651845ebbf785737

diff --git a/sys-apps/hwids/hwids-20171003.ebuild b/sys-apps/hwids/hwids-20171003.ebuild
new file mode 100644 (file)
index 0000000..3f04c85
--- /dev/null
+++ b/sys-apps/hwids/hwids-20171003.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit udev
+
+DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases"
+HOMEPAGE="https://github.com/gentoo/hwids"
+if [[ ${PV} == "99999999" ]]; then
+       PYTHON_COMPAT=( python3_6 )
+       inherit git-r3 python-any-r1
+       EGIT_REPO_URI="${HOMEPAGE}.git"
+else
+       SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+fi
+
+LICENSE="|| ( GPL-2 BSD ) public-domain"
+SLOT="0"
+IUSE="+net +pci +udev +usb"
+
+DEPEND=""
+RDEPEND="
+       udev? ( virtual/udev )
+       !<sys-apps/pciutils-3.1.9-r2
+       !<sys-apps/usbutils-005-r1
+"
+
+if [[ ${PV} == 99999999 ]]; then
+       DEPEND+="
+               net-misc/curl
+               udev? ( $(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]') )
+       "
+       python_check_deps() {
+               if use udev; then
+                       has_version --host-root "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() {
+       [[ ${PV} == 99999999 ]] && use udev && python_setup
+       _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 udev; then
+               udevadm hwdb --update --root="${ROOT%/}"
+       fi
+}

diff --git a/sys-apps/hwids/hwids-99999999.ebuild b/sys-apps/hwids/hwids-99999999.ebuild
index 13f25bb11b32652307f72f131758059e31ceb3af..3f04c8534c6cf077052451277d5c19a5f58724d8 100644 (file)
--- a/sys-apps/hwids/hwids-99999999.ebuild
+++ b/sys-apps/hwids/hwids-99999999.ebuild
@@ -8,7 +8,8 @@ inherit udev
 DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases"
 HOMEPAGE="https://github.com/gentoo/hwids"
 if [[ ${PV} == "99999999" ]]; then
-       inherit git-r3
+       PYTHON_COMPAT=( python3_6 )
+       inherit git-r3 python-any-r1
        EGIT_REPO_URI="${HOMEPAGE}.git"
 else
        SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
@@ -19,18 +20,31 @@ LICENSE="|| ( GPL-2 BSD ) public-domain"
 SLOT="0"
 IUSE="+net +pci +udev +usb"
 
-DEPEND="udev? (
-       dev-lang/perl
-       >=virtual/udev-206
-)"
-[[ ${PV} == "99999999" ]] && DEPEND+=" udev? ( net-misc/curl )"
-RDEPEND="!<sys-apps/pciutils-3.1.9-r2
-       !<sys-apps/usbutils-005-r1"
+DEPEND=""
+RDEPEND="
+       udev? ( virtual/udev )
+       !<sys-apps/pciutils-3.1.9-r2
+       !<sys-apps/usbutils-005-r1
+"
 
-if [[ ${PV} != 99999999 ]]; then
+if [[ ${PV} == 99999999 ]]; then
+       DEPEND+="
+               net-misc/curl
+               udev? ( $(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]') )
+       "
+       python_check_deps() {
+               if use udev; then
+                       has_version --host-root "dev-python/pyparsing[${PYTHON_USEDEP}]"
+               fi
+       }
+else
        S=${WORKDIR}/hwids-${P}
 fi
 
+pkg_setup() {
+       :
+}
+
 src_unpack() {
        if [[ ${PV} == 99999999 ]]; then
                git-r3_src_unpack
@@ -56,6 +70,7 @@ _emake() {
 }
 
 src_compile() {
+       [[ ${PV} == 99999999 ]] && use udev && python_setup
        _emake
 }