gentoo Easter resync : 12.04.2020

3 files changed, 2 insertions, 36 deletions

diff --git a/sys-apps/osinfo-db-tools/Manifest b/sys-apps/osinfo-db-tools/Manifest
index 55c73114fefe..2cc8f0d56156 100644
--- a/sys-apps/osinfo-db-tools/Manifest
+++ b/sys-apps/osinfo-db-tools/Manifest
@@ -1,5 +1,3 @@
-DIST osinfo-db-tools-1.4.0.tar.gz 519089 BLAKE2B 2c2e0cdbcd0a795f8deb09727b8b971748f5d0ecc08449238d3054cbd947a0f6059456d4e9feadded47cd0e0aaa87132f1bec7524a3183115dd459eca989d1b0 SHA512 f4813f948551f630cc9936986abc3ef4455647ec529b353dc4fee71f8071beeebac0a2ee1988cede92ea3635bca9bedd400ac9f275e3f5592ff50236d97cfb91
 DIST osinfo-db-tools-1.6.0.tar.gz 547189 BLAKE2B 38db3118d618d620a137b12021fbcf9caffe1e0f67252d2eb7c514d4f25969b152679f55b493bb64abc0925ff07ccea897acfd809d17d7257db2b33a690f4878 SHA512 a3bdf9d913b388b0f567a14245f57c4f1da9dae40d723f8e76096ffdae9d7a8e587ed4832e3e59c820bc01bbb2b74815b3fefd8e1f47cebd903091457fdee951
-EBUILD osinfo-db-tools-1.4.0.ebuild 856 BLAKE2B 038ba8148b42ea03985e3f898b791876a87b30080f369f228d61d74f65a0f013bc2c9b321f2b12357c2a4d4140a6aa11270019d1f9bdb3ec892dd62732a774ec SHA512 17aacd592fd949ffec601cf416b3f07fcc3562b6cb1ad5562cefa94b861959364f72da470133defe109c4aaca3f0dd497479339511933affb9ccd3ecb201e6fa
-EBUILD osinfo-db-tools-1.6.0-r1.ebuild 1296 BLAKE2B a1a99a1fafeb1748f59186a701981675475ad60644c9dbafddcc5e266dbc12e1bce12353b072f05a41061d8ea18973ae3ff3fae146c8781d67796eadfdd41f64 SHA512 1add0750f95629e65c7ddf6198fce1d7dff47fa30bb5e5f9a3a994578e01f18376bcac6c3eb72ace433462bc11fdabd29439a78d7ee7b8f69feff33a52c60476
+EBUILD osinfo-db-tools-1.6.0-r1.ebuild 1293 BLAKE2B 107343796bd9fd0647d3ed78b08c7b99945a5f73f70508a57b5eb295943949a2b3b3d8a61920f43072f068ce039b9243ae939d46a2a5ed4cd60c0ca7961e9905 SHA512 40c37b7492eb21c64e074f6832e4729167a9a36a7bc41680e7ce1665cbdb3f69e2341f734b54ca8f78906ed99d94102479655a2a9b5fa7d43d1ebfe25222521f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.4.0.ebuild b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.4.0.ebuild
deleted file mode 100644
index 212f158f0ea5..000000000000
--- a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.4.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="Tools for managing the osinfo database"
-HOMEPAGE="https://libosinfo.org/"
-SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-# Blocker on old libosinfo as osinfo-db-validate was part of it before
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.6.0
-	>=app-arch/libarchive-3.0.0:=
-	dev-libs/json-glib
-	!<sys-libs/libosinfo-1.0.0
-"
-# perl dep is for pod2man (and syntax check but only in git, but configure check exists in release)
-# libxslt is checked for in configure.ac, but never used in 1.1.0
-DEPEND="${RDEPEND}
-	>=dev-libs/libxslt-1.0.0
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.19.8
-	dev-lang/perl
-"
diff --git a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.6.0-r1.ebuild b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.6.0-r1.ebuild
index 1d3a019cc342..32b3f7fa9ee7 100644
--- a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.6.0-r1.ebuild
+++ b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.6.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"