gentoo resync : 13.06.2020

4 files changed, 2 insertions, 70 deletions

diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index 999bd9c78804..cc8bc17f451a 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -1,9 +1,5 @@
-DIST gobject-introspection-1.60.2.tar.xz 1285000 BLAKE2B 43d96bbac8dd6600726876277f945e7eb01dba2063907c21960cbf5f49d766ac156ed116641b69dfe28f3025c4b482ffd39e8e107aba9ee48010a500111a58e4 SHA512 8e8c1c3a025cb6c18933302ada8cce7c4826f22eef791c80a97abb28379239f8d99312e1237bcea1060f4d5cf65441909b9da434561982209bb4976b1f22529e
 DIST gobject-introspection-1.62.0.tar.xz 980732 BLAKE2B 96ecc98bea97b7cb24e2c0a0adb8158cfc8915ee8e3b980adf08ec3256d4d0f87bc92d33cce30f5b23c85c4b144d8da755e5313735091b27ff53fea45a80014e SHA512 b460a95fd7a323e9b0c9a45e680ebe98bbae7632abfa53b3e0b0ec050775cab17dde693314d6d4f8e93614c32b5587f8ce0b4a4c9ee9ba46c029ce029014e638
-DIST gobject-introspection-1.64.0.tar.xz 1000240 BLAKE2B 09e6dec65a53a107bee387cef9cb271345ae564f3520bd9a6485cf1796deaa47243c05f45a72f3243e811a2c1962a2ae123a6b344819187cbf36eae0ed58fbaa SHA512 d1960424d82dea1f1d36a7c3f9922029e751e77da8dc6904c24750babe7c3f4c11a6795eb218aab342ccbb6326d0ac3eac2c2c903e90b146f4e28c0f413da1ae
 DIST gobject-introspection-1.64.1.tar.xz 1000280 BLAKE2B c0248831648f6f1849516f30facac9ecade4b4fdb9dce70f93f516364c08f93d0622e06376bd7895dd25c3f1fb5b0af533d6c60f1b2590848cc6781b81a584f4 SHA512 7610871f7ed5778ea9813062ed6465d131af58c00bdea1bb51dde7f98f459f44ae453eb6d0c5bdc6f7dcd92d639816f4e0773ccd5673cd065d22dabc6448647c
-EBUILD gobject-introspection-common-1.60.2.ebuild 995 BLAKE2B 9dc1baa0c18a297475f7af1bcf8db071e065ba5c792f432c337029a56a3315edc4705ed8c76e07ed9dbd22a4df14cdf1ecbd375310a34cf531228cda0c78288c SHA512 ad2656b8023463ac448932896f2569e2da326c7bfcd2f4e45d2d7759e4fedae1deea86833e9e4620958d3a546620d0a88241570074c81ed9aaf1a988cd247d5b
-EBUILD gobject-introspection-common-1.62.0.ebuild 933 BLAKE2B e3ccaee483a115a71e73056b02a03145d9d993996daba737d4d5923e94074dea4ca875dfa44fe99e328b73b6930acbf77060932478b825d816bb12688cd64a8e SHA512 114bc4bb11dcd8645e89b03dfe0bfb3825c11e29013c29fae10047d5b37ba60b272c36c7119768a8b244302fbc4463f05bf0d7f4a5abc5ac176c0574cbb1cd37
-EBUILD gobject-introspection-common-1.64.0.ebuild 940 BLAKE2B 9815ccecda746b9a9d400f61547e05e3ecdc33b9f39666a6585fd2af893411b1dc534f9c4b8761f4e15f0bfe667793ac54d3fee19c2716aa81fb6ac4303f644d SHA512 d0e8823632409df83c905a56bb2cc0d426effd8f2188497171beeaaf5841db2a7f61c877166000085a83dd11a6c379f350649191430f7c26bf5cc2501db868d5
+EBUILD gobject-introspection-common-1.62.0.ebuild 931 BLAKE2B 1bf492f4c5a9d5bd608791bec1be8f923c609e234db9d0301817c192e52f79d4bd7618bb425de2f9b3c8d3954be1155aa330cabb5f90671fcdf502b29ad2efd0 SHA512 07eb34e10d5808c2a09410dc2f46f791a0df1abd1e0842c214a55b85c74bb10e2539ca29989bd8c66dcaf7290b3f715b93bece914ee928807601157b5d866021
 EBUILD gobject-introspection-common-1.64.1.ebuild 940 BLAKE2B 9815ccecda746b9a9d400f61547e05e3ecdc33b9f39666a6585fd2af893411b1dc534f9c4b8761f4e15f0bfe667793ac54d3fee19c2716aa81fb6ac4303f644d SHA512 d0e8823632409df83c905a56bb2cc0d426effd8f2188497171beeaaf5841db2a7f61c877166000085a83dd11a6c379f350649191430f7c26bf5cc2501db868d5
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild
deleted file mode 100644
index 18bc4769fe11..000000000000
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="gobject-introspection"
-
-inherit gnome.org
-
-DESCRIPTION="Build infrastructure for GObject Introspection"
-HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
-# Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like:
-# https://forums.gentoo.org/viewtopic-p-7421930.html
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr/share/aclocal
-	insinto /usr/share/aclocal
-	doins m4/introspection.m4
-
-	dodir /usr/share/gobject-introspection-1.0
-	insinto /usr/share/gobject-introspection-1.0
-	doins Makefile.introspection
-}
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.62.0.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.62.0.ebuild
index 42dca4deacee..2b1f0b3ef7dd 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.62.0.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.62.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}"
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.0.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.0.ebuild
deleted file mode 100644
index 08b6851ff4fb..000000000000
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="gobject-introspection"
-
-inherit gnome.org
-
-DESCRIPTION="Build infrastructure for GObject Introspection"
-HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}"
-# Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like:
-# https://forums.gentoo.org/viewtopic-p-7421930.html
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/aclocal
-	doins m4/introspection.m4
-
-	insinto /usr/share/gobject-introspection-1.0
-	doins Makefile.introspection
-}