public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/hwids/
Date: Tue,  3 Oct 2017 21:55:10 +0000 (UTC)	[thread overview]
Message-ID: <1507067704.68db88d36f97e6e29a1f49d093a1843c642d0c48.floppym@gentoo> (raw)

commit:     68db88d36f97e6e29a1f49d093a1843c642d0c48
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  3 21:53:36 2017 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Oct  3 21:55:04 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68db88d3

sys-apps/hwids: bump to 20171003

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

 sys-apps/hwids/Manifest                            |  1 +
 ...hwids-99999999.ebuild => hwids-20171003.ebuild} | 33 ++++++++++++++++------
 sys-apps/hwids/hwids-99999999.ebuild               | 33 ++++++++++++++++------
 3 files changed, 49 insertions(+), 18 deletions(-)

diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index 814ac9e504b..08ee8ea1300 100644
--- 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-99999999.ebuild b/sys-apps/hwids/hwids-20171003.ebuild
similarity index 71%
copy from sys-apps/hwids/hwids-99999999.ebuild
copy to sys-apps/hwids/hwids-20171003.ebuild
index 13f25bb11b3..3f04c8534c6 100644
--- a/sys-apps/hwids/hwids-99999999.ebuild
+++ b/sys-apps/hwids/hwids-20171003.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
 }
 

diff --git a/sys-apps/hwids/hwids-99999999.ebuild b/sys-apps/hwids/hwids-99999999.ebuild
index 13f25bb11b3..3f04c8534c6 100644
--- 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
 }
 


             reply	other threads:[~2017-10-03 21:55 UTC|newest]

Thread overview: 100+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-03 21:55 Mike Gilbert [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-11-25  3:22 [gentoo-commits] repo/gentoo:master commit in: sys-apps/hwids/ Mike Gilbert
2021-10-03 11:28 David Seifert
2021-09-18 19:48 Sam James
2021-09-15 16:00 Mike Gilbert
2021-08-10 14:37 Mike Gilbert
2021-08-10 14:37 Mike Gilbert
2021-06-20 17:18 Mike Gilbert
2021-06-13 14:42 Mike Gilbert
2021-05-14 22:14 David Seifert
2021-02-07 18:09 Mike Gilbert
2021-02-07 18:09 Mike Gilbert
2020-12-07 17:42 Mike Gilbert
2020-12-07 17:31 Mike Gilbert
2020-08-14 19:24 Mike Gilbert
2020-08-14 19:16 Mike Gilbert
2020-08-13  2:56 Mike Gilbert
2020-08-13  2:56 Mike Gilbert
2020-08-13  2:56 Mike Gilbert
2020-03-06 19:40 Mike Gilbert
2020-03-06 19:39 Mike Gilbert
2020-02-04 18:52 Mike Gilbert
2019-11-26 11:46 Agostino Sarubbo
2019-11-26 10:18 Thomas Deutschmann
2019-09-13 17:58 Mikle Kolyada
2019-09-13 17:58 Mikle Kolyada
2019-09-13 17:58 Mikle Kolyada
2019-08-26 18:45 Sergei Trofimovich
2019-08-23 16:33 Agostino Sarubbo
2019-08-23 13:11 Agostino Sarubbo
2019-08-23 10:00 Agostino Sarubbo
2019-08-22 22:03 Agostino Sarubbo
2019-08-22 22:01 Agostino Sarubbo
2019-08-22  6:03 Sergei Trofimovich
2019-08-20 20:36 Aaron Bauman
2019-08-19 11:37 Agostino Sarubbo
2019-08-19  5:57 Agostino Sarubbo
2019-08-18 21:58 Mike Gilbert
2019-05-04 19:40 Andreas K. Hüttel
2019-04-17 12:21 Mikle Kolyada
2019-04-17 12:21 Mikle Kolyada
2019-04-17 12:21 Mikle Kolyada
2019-04-13  3:27 Aaron Bauman
2019-04-01 17:21 Thomas Deutschmann
2019-03-17  1:49 Mike Gilbert
2019-03-17  1:49 Mike Gilbert
2019-03-17  1:49 Mike Gilbert
2019-03-16 22:55 Sergei Trofimovich
2019-03-16 21:57 Sergei Trofimovich
2019-03-16 14:46 Mikle Kolyada
2019-03-15 23:17 Mikle Kolyada
2019-03-15  9:56 Mikle Kolyada
2019-03-14 21:53 Sergei Trofimovich
2019-03-14  8:31 Sergei Trofimovich
2019-03-11 19:58 Sergei Trofimovich
2018-09-17 15:01 Mike Gilbert
2018-06-26 11:21 Thomas Deutschmann
2018-05-14 22:02 Mikle Kolyada
2018-04-22  6:33 Matt Turner
2018-04-18 20:52 Mikle Kolyada
2018-03-17 23:02 Matt Turner
2018-03-17 23:02 Matt Turner
2018-03-15 19:09 Mike Gilbert
2018-03-15  1:50 Mart Raudsepp
2018-03-05 17:13 Tobias Klausmann
2018-02-25 18:21 Thomas Deutschmann
2018-02-23 10:15 Sergei Trofimovich
2018-02-22  9:49 Jason Zaman
2018-02-21 22:34 Sergei Trofimovich
2018-01-12  4:19 Mike Frysinger
2017-12-24  9:46 Mart Raudsepp
2017-10-05 22:02 Mike Gilbert
2017-07-15 15:20 Mike Gilbert
2017-07-15 15:20 Mike Gilbert
2017-05-05 19:11 Markus Meier
2017-04-30  9:37 Agostino Sarubbo
2017-04-29 15:02 Agostino Sarubbo
2017-04-27 11:23 Agostino Sarubbo
2017-04-25  7:21 Jeroen Roovers
2017-04-23 10:27 Agostino Sarubbo
2017-04-22  7:33 Tobias Klausmann
2017-03-28 21:04 Mike Gilbert
2016-11-04  1:48 Mike Gilbert
2016-08-19 10:07 Pacho Ramos
2016-08-07  9:30 Pacho Ramos
2016-08-01  5:29 Mike Frysinger
2016-08-01  5:29 Mike Frysinger
2016-08-01  5:29 Mike Frysinger
2016-04-21 22:40 Mike Gilbert
2016-03-06 15:04 Mike Gilbert
2016-03-06 15:01 Mike Gilbert
2016-01-14  2:29 Mike Frysinger
2016-01-11  9:56 Agostino Sarubbo
2016-01-10 11:22 Agostino Sarubbo
2016-01-09  7:00 Agostino Sarubbo
2016-01-07 20:12 Markus Meier
2015-12-26 12:03 Agostino Sarubbo
2015-12-19  6:18 Jeroen Roovers
2015-12-14 16:13 Agostino Sarubbo
2015-12-14  7:54 Anthony G. Basile

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1507067704.68db88d36f97e6e29a1f49d093a1843c642d0c48.floppym@gentoo \
    --to=floppym@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox