gentoo resync : 24.12.2018

3 files changed, 2 insertions, 62 deletions

diff --git a/sys-libs/libosinfo/Manifest b/sys-libs/libosinfo/Manifest
index c574617b6eb9..a25851a09035 100644
--- a/sys-libs/libosinfo/Manifest
+++ b/sys-libs/libosinfo/Manifest
@@ -1,5 +1,3 @@
-DIST libosinfo-1.1.0.tar.gz 904154 BLAKE2B b34d1aaf2d53ac43613cfbdfd05bc12de505d37a743d64e43af379351f640759ad0ec2f30af74bf82a97b3e12b4a02b097bbdd6e0d3e83f7befa2af5340724a2 SHA512 c4f9e67bb5538e31e7d2ed3d764547ba0a2263da5bbf4d1ef930a32d5953fab59abc672e5f86a1f7f5ac1ebd0c5195986193f699a6b0efbcb6769917c0ed7102
 DIST libosinfo-1.2.0.tar.gz 916787 BLAKE2B 652910ca1e70071d88adb771e458f0c19159a772eec1178c94ea5f65c5045bb00e4b1354b1ce4229d28821b6b1557424e419c1505b721883731a36b0761a1b5d SHA512 d98a107a08c5e2cddd746631b3ceac4278184ea5561ad2372d772b8ae253dc1363f217778d105387e5b5c5e86be9607668aa94929ad9b4ee48ab7abf50fb6a01
-EBUILD libosinfo-1.1.0.ebuild 1461 BLAKE2B 53a086589e8808da1c9188a04953568ad375f05e610ec99ef927056bb38abfe7b7e544460a48a4b2cc6941e370bf53aa13f160e39e21b9fccc92c99cfa466c6c SHA512 c4b9b5cece89019416028d47f92f6a5bec7a8da928e90a7a740fd10fcbcf2bd29446e01c12f18aff934520464b6c47f08d37dc4dbc5f74f4a754507fdab24d71
-EBUILD libosinfo-1.2.0.ebuild 1735 BLAKE2B 965b8d1c8b19b62aa2ddaeb266a3401b37917431ce3cf4c0c2f278b9d8a25c25e7e5541b3407bb4157fd3950de6db9d26a3610b3074e5abb96bb6f190aca7fc3 SHA512 8a315929bf13cdc334d7f5d904adf699fb23a6d5a4035e9a9d84516ebd31a805ac1eb56c646773d3c242f2731e255e5a44d9a5bba786f6bc62b41f41a9fc004a
+EBUILD libosinfo-1.2.0.ebuild 1733 BLAKE2B 6d8f39bfe7139b5a9103922b61768f458a8ac5db914bb4b7cd4a13b897d5fb1b062adfd81a6aca778a97475ec95835a386904f2bf70a413a992bc3fa3f7c5b67 SHA512 331e01a546b7b81c1d88d2bec8984e15747924d40b6caac719680dae5af709d9816c06bc7eea9c19a9202648c3245191b107390a5097af7323e3c3910fb33dd2
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-libs/libosinfo/libosinfo-1.1.0.ebuild b/sys-libs/libosinfo/libosinfo-1.1.0.ebuild
deleted file mode 100644
index 6f21f3a179b6..000000000000
--- a/sys-libs/libosinfo/libosinfo-1.1.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 udev vala
-
-DESCRIPTION="GObject library for managing information about real and virtual OSes"
-HOMEPAGE="http://libosinfo.org/"
-SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-
-IUSE="+introspection +vala 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.36.0:2
-	>=net-libs/libsoup-2.42: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-0.9.7:= )
-"
-# perl dep is for pod2man, and configure.ac checks for it too now
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-libs/gobject-introspection-common
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig
-	test? ( dev-libs/check )
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--with-usb-ids-path=/usr/share/misc/usb.ids \
-		--with-pci-ids-path=/usr/share/misc/pci.ids \
-		--disable-static \
-		$(use_enable test tests) \
-		$(use_enable introspection) \
-		$(use_enable vala) \
-		--disable-coverage
-}
diff --git a/sys-libs/libosinfo/libosinfo-1.2.0.ebuild b/sys-libs/libosinfo/libosinfo-1.2.0.ebuild
index b4b476115c62..72e0867bd9fc 100644
--- a/sys-libs/libosinfo/libosinfo-1.2.0.ebuild
+++ b/sys-libs/libosinfo/libosinfo-1.2.0.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 IUSE="+introspection +vala test"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # Unsure about osinfo-db-tools rdep, but at least fedora does it too
 RDEPEND="