From 7156eec31f6ca356c682b6184cd7f589d443c4a2 Mon Sep 17 00:00:00 2001
From: Mart Raudsepp <leio@gentoo.org>
Date: Tue, 18 Aug 2020 13:15:35 +0300
Subject: sys-libs/libosinfo: fix mixed up usb.ids and pci.ids options

Thanks-to: dantrell
Package-Manager: Portage-2.3.103, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio@gentoo.org>
---
 sys-libs/libosinfo/libosinfo-1.8.0-r1.ebuild | 60 ++++++++++++++++++++++++++++
 sys-libs/libosinfo/libosinfo-1.8.0.ebuild    | 60 ----------------------------
 2 files changed, 60 insertions(+), 60 deletions(-)
 create mode 100644 sys-libs/libosinfo/libosinfo-1.8.0-r1.ebuild
 delete mode 100644 sys-libs/libosinfo/libosinfo-1.8.0.ebuild

(limited to 'sys-libs/libosinfo')

diff --git a/sys-libs/libosinfo/libosinfo-1.8.0-r1.ebuild b/sys-libs/libosinfo/libosinfo-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..4b5e771089fe
--- /dev/null
+++ b/sys-libs/libosinfo/libosinfo-1.8.0-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit meson udev vala xdg
+
+DESCRIPTION="GObject library for managing information about real and virtual OSes"
+HOMEPAGE="https://libosinfo.org/"
+SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+
+IUSE="gtk-doc +introspection +vala test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# Unsure about osinfo-db-tools rdep, but at least fedora does it too
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	net-libs/libsoup:2.4
+	>=dev-libs/libxml2-2.6.0
+	>=dev-libs/libxslt-1.0.0
+	sys-apps/hwids[pci,usb]
+	sys-apps/osinfo-db-tools
+	sys-apps/osinfo-db
+	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+"
+DEPEND="${RDEPEND}"
+# perl dep is for pod2man for automagic manpage building
+BDEPEND="
+	dev-lang/perl
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.10
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	xdg_src_prepare
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc enable-gtk-doc)
+		$(meson_feature introspection enable-introspection)
+		$(meson_use test enable-tests)
+		$(meson_feature vala enable-vala)
+		-Dwith-pci-ids-path=/usr/share/misc/pci.ids
+		-Dwith-usb-ids-path=/usr/share/misc/usb.ids
+	)
+	meson_src_configure
+}
diff --git a/sys-libs/libosinfo/libosinfo-1.8.0.ebuild b/sys-libs/libosinfo/libosinfo-1.8.0.ebuild
deleted file mode 100644
index 051ad6413e0f..000000000000
--- a/sys-libs/libosinfo/libosinfo-1.8.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit meson udev vala xdg
-
-DESCRIPTION="GObject library for managing information about real and virtual OSes"
-HOMEPAGE="https://libosinfo.org/"
-SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-
-IUSE="gtk-doc +introspection +vala test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# Unsure about osinfo-db-tools rdep, but at least fedora does it too
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	net-libs/libsoup:2.4
-	>=dev-libs/libxml2-2.6.0
-	>=dev-libs/libxslt-1.0.0
-	sys-apps/hwids[pci,usb]
-	sys-apps/osinfo-db-tools
-	sys-apps/osinfo-db
-	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-"
-DEPEND="${RDEPEND}"
-# perl dep is for pod2man for automagic manpage building
-BDEPEND="
-	dev-lang/perl
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.10
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	xdg_src_prepare
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc enable-gtk-doc)
-		$(meson_feature introspection enable-introspection)
-		$(meson_use test enable-tests)
-		$(meson_feature vala enable-vala)
-		-Dwith-pci-ids-path=/usr/share/misc/usb.ids
-		-Dwith-usb-ids-path=/usr/share/misc/pci.ids
-	)
-	meson_src_configure
-}
-- 
cgit v1.2.3-65-gdbad