gentoo resync : 24.12.2018

5 files changed, 8 insertions, 37 deletions

diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest
index ea8fb3f5e214..a12f6742061c 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -1,9 +1,7 @@
-DIST osinfo-db-20180531.tar.xz 70868 BLAKE2B 919a2767d24af91e9aa7b14f3a238b9239aa774bec04233c95929981531d1fabb24ebfdc5c92ab401f51cf6bbf2432b6e8486a833d06a96a51e1893f39f6f641 SHA512 48b3bd2e52c16829f70d62ad8b1f32313956fcb7085cd906965f1d7b12f61952c60123ef335fbd4a1dd86aebc9751b9bf44f71c61f4bb6ac9bcb30d514ac36a9
-DIST osinfo-db-20180612.tar.xz 71356 BLAKE2B 3dcf9d843d32eb4e5be7cda47e8c8d123939b381d41f0596d8fd5794c64130b1fed39b367a1f6b58c34e91b5a38811af54066311ece209cbcaf268d1f032e55c SHA512 02c92bca33ae35abe28fb575c73ab96fedf5652e7822a10a213f084390b3d863e3ea83469d8a2bbf6ed69328803d48f2f35a1e45f938ca698a63e08b82c05e9d
-DIST osinfo-db-20180720.tar.xz 73976 BLAKE2B 23f92ba745f0e21ae839ab1bdfec7128dd33d60871f90cfc37c74b1720cfa74c04c63b609283cb5f1b10e5211f7be931478c4dcc6ed683f40100a371311b2e77 SHA512 9c62c1427ca71931984f9edb80d2784a40596d9000b91b70d66ad4a9956a50a57ec1b38de9a56e2d4889cbdec9cceda68e6a9ede49d6fea0bb0f35326350d6b3
 DIST osinfo-db-20181011.tar.xz 77900 BLAKE2B dcfbac56772d24ff416b1432404d5be82b9683bf2f3a3d7a6cdd730a07b0953b3acfdefff436dbe8339dc9dd2bbd628f1aa5871ce83a6f114c899f5e37e49df1 SHA512 0ea06d7356f1a89d98bda0c2a47b1b4c3a34059ee00e1160b7571239f4095154ddda91e3d0ae798dcbb2279fd7a3ea9099a65ef304785fe208bcdab47bc9aaa4
-EBUILD osinfo-db-20180531.ebuild 671 BLAKE2B c2911f510895eb36e53bb93ecbc8914cbbfdec31c836f6828688ac022aa3f0dcba8fd22effde1238736bb2b5029404e232933eac6bcd41ce1b9c1ac28a0c5a7a SHA512 1ededfeaa0e2271d861deab2b9ed94eae3c6fa323af8b50b850a8ccd3d2f9128f6701252ccedf80c385a0f4d1dbfa979859fbd4b74d92a8b786c92de8da4a453
-EBUILD osinfo-db-20180612.ebuild 674 BLAKE2B 1e05c5e43f9bd1b9caa05505d8f2e14eaca4605fcf00e857baf4810a5038dbed48ab7c9de19732f22c649d85d9a9588aefecddbeef9e7c1499523d39ab7330b3 SHA512 fb407f5ae28e4309b92836504ed11c819e4b9a12509527b4030300a8826a9c54d7491544d771c84a5e93b1a844b3c3accae6e1159cecc5e385ea0ec29a918179
-EBUILD osinfo-db-20180720.ebuild 674 BLAKE2B 1e05c5e43f9bd1b9caa05505d8f2e14eaca4605fcf00e857baf4810a5038dbed48ab7c9de19732f22c649d85d9a9588aefecddbeef9e7c1499523d39ab7330b3 SHA512 fb407f5ae28e4309b92836504ed11c819e4b9a12509527b4030300a8826a9c54d7491544d771c84a5e93b1a844b3c3accae6e1159cecc5e385ea0ec29a918179
-EBUILD osinfo-db-20181011.ebuild 671 BLAKE2B d0f8709bfe7cca393adb179bef4c40b11ccb5061b8e3454ec97e3e4a4f80198b7c3ce42c1fbb702e41a15f022704f4949cf423605f3565540061cfb463a1d9ca SHA512 31d0459256798eb2768c375ec7b5b1b0916bb4c3b2d8fdfd0db9f5a6034c2dc5e3e1778dc08d0e3f2f77b7169c1798169d3299522ddd6e4b64826e82d33dee7d
+DIST osinfo-db-20181116.tar.xz 80112 BLAKE2B b7c8043c50c53c28d041221c271a1f2134e95d3b75e6cb2ccf17fa51d716d31fdafffb461e56d97a2b9e9bb0c2748260eb073cfaf059d7f965af42226299c2af SHA512 b442e7b738d31211dd292145d03b00d82248c43d5de142084270157c1b8eef0d9eb8f8b2818c6eeafa8f7b55450120826f2d687dfa5c1f1690a9e3c77d97afb7
+DIST osinfo-db-20181203.tar.xz 80044 BLAKE2B 7cdc11afdd4bab83413c1512b9fca7ad0679a486a83d714a14aad8a3718a6c7829286ff7acf5a1e4ccc78289c66f9673a9bdeb9423d7570ac5b26d0756025bfe SHA512 6091a31ecc6e618e29c7161a3e3d78ff0eaafeaa88d5bbe38dce136f8814a4411765e854424bacf87998403ba8fa0afc2b0a744095f691a80207252f21ecd270
+EBUILD osinfo-db-20181011.ebuild 669 BLAKE2B f58a09627324826e1851a6c3057890bdfcc9b801641d0791fdfccc1863be3c1d4ad24a57a3c60d307d973ec197b91f67fa2331aa146b00218bd410134967ae85 SHA512 d0c6a63533e18277b92c3c930874c4e7d4f13aafd1e47001716299efb9544b4f6c64b5287c84311ce4b437e13ac0a89068a2d8bbbcff8b1e75936665061e665f
+EBUILD osinfo-db-20181116.ebuild 671 BLAKE2B d0f8709bfe7cca393adb179bef4c40b11ccb5061b8e3454ec97e3e4a4f80198b7c3ce42c1fbb702e41a15f022704f4949cf423605f3565540061cfb463a1d9ca SHA512 31d0459256798eb2768c375ec7b5b1b0916bb4c3b2d8fdfd0db9f5a6034c2dc5e3e1778dc08d0e3f2f77b7169c1798169d3299522ddd6e4b64826e82d33dee7d
+EBUILD osinfo-db-20181203.ebuild 671 BLAKE2B d0f8709bfe7cca393adb179bef4c40b11ccb5061b8e3454ec97e3e4a4f80198b7c3ce42c1fbb702e41a15f022704f4949cf423605f3565540061cfb463a1d9ca SHA512 31d0459256798eb2768c375ec7b5b1b0916bb4c3b2d8fdfd0db9f5a6034c2dc5e3e1778dc08d0e3f2f77b7169c1798169d3299522ddd6e4b64826e82d33dee7d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db/osinfo-db-20180531.ebuild b/sys-apps/osinfo-db/osinfo-db-20180531.ebuild
deleted file mode 100644
index 3b6e0493c49c..000000000000
--- a/sys-apps/osinfo-db/osinfo-db-20180531.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="osinfo database files"
-HOMEPAGE="http://libosinfo.org/"
-SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
-S="${WORKDIR}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	sys-apps/osinfo-db-tools
-"
-# we don't depend on intltool here, contrary to README, as the tarball already
-# contains the processed results with translations in XML files
-
-src_unpack() { :; }
-
-src_install() {
-	osinfo-db-import --root "${D}" --dir "/usr/share/osinfo" "${DISTDIR}/${A}"
-}
diff --git a/sys-apps/osinfo-db/osinfo-db-20181011.ebuild b/sys-apps/osinfo-db/osinfo-db-20181011.ebuild
index d81f82552c17..156899e36a33 100644
--- a/sys-apps/osinfo-db/osinfo-db-20181011.ebuild
+++ b/sys-apps/osinfo-db/osinfo-db-20181011.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
 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"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-apps/osinfo-db/osinfo-db-20180612.ebuild b/sys-apps/osinfo-db/osinfo-db-20181116.ebuild
index 05bfe3807574..d81f82552c17 100644
--- a/sys-apps/osinfo-db/osinfo-db-20180612.ebuild
+++ b/sys-apps/osinfo-db/osinfo-db-20181116.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/sys-apps/osinfo-db/osinfo-db-20180720.ebuild b/sys-apps/osinfo-db/osinfo-db-20181203.ebuild
index 05bfe3807574..d81f82552c17 100644
--- a/sys-apps/osinfo-db/osinfo-db-20180720.ebuild
+++ b/sys-apps/osinfo-db/osinfo-db-20181203.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6