gentoo resync : 29.12.2022

5 files changed, 8 insertions, 142 deletions

diff --git a/gui-libs/libadwaita/Manifest b/gui-libs/libadwaita/Manifest
index fccc6523bf78..f0029573e54b 100644
--- a/gui-libs/libadwaita/Manifest
+++ b/gui-libs/libadwaita/Manifest
@@ -1,9 +1,5 @@
-DIST libadwaita-1.0.1.tar.xz 1559064 BLAKE2B 126b77cf7e75775a302b460a0912695839cfd69fb418f22290c2d3d03b85c5e7fe5e5d02064e29ae6e395b5c85d20b84b7a12b0af2e3b32f0624e213ed9a849f SHA512 0f5bb34e26f13853eb646190aaac45c5c168d86e4edf39463b850c0969dd5ed02d8fbc4a20758a2ff5b7592c2284a7f1ffb2cea651f793f9a29764066da237bd
-DIST libadwaita-1.0.2.tar.xz 1557688 BLAKE2B 7b357c06e221c02e5a98a3f776c650b4dfe6039206b135897b75058f4c79c1a8f6be46562025b42af481399e82839eb330b38fd909a72695c1641c29fc223cdc SHA512 c11d8f4d25044896bc2c5ac3cc6c3e6597ad894aa9025b4588e4aa26cdb87f58939508e211290baf10839428a56616aacae6ea6b35c9bc9d95f05bdcfb9e1023
-DIST libadwaita-1.1.0.tar.xz 2723120 BLAKE2B 48114b3b295819703836b03a0adaa860791857c5e4b93a74e2178c27da70a2585e5d7247b39ecf08a593289f26979a41f59c5f78c7ddfdb2d3f3c16694c8ef7c SHA512 03f8af476676c4bc1861ca16c646240ac52b9d859f53ff94b6be1d3b3dd982004fd88d4105f3c69f997414a2b3c47315f1ef6a023cf174b01c888ead4efd8d72
 DIST libadwaita-1.1.1.tar.xz 2731088 BLAKE2B 0f1106cccd37200a5566fad9aa1becfb4d404ae4447184330ae2e427993fc161b235e7f39f95d137741772fb4efbc87723f6a444caa72a7708d6ff85a8ee7d6b SHA512 9700c9db2085d1f30399716e164bd338963353190fbe8161c3d50791ab56f4be8db2fbd939dde2553487944f3227a2582f5bd03cf1b6e867afa59eead16feab9
-EBUILD libadwaita-1.0.1.ebuild 1453 BLAKE2B db91a232fb42d2ccad9f07d18daf27ee9ceacb32c1e96c3942f89512cd9bd711f394e909286e01d74b35eea074c1e06dfffe73a65d854292d36845ec52200ea6 SHA512 461f5dc5a80846843d9e6586665457b6d3266840c7e0b474b1e0cd9f022ea248b92d537aba2025a8079ce2a3d08c8182662bf811e08b3e4bf61e849056ccc450
-EBUILD libadwaita-1.0.2.ebuild 1459 BLAKE2B b50bb9974dc44553a0d33d154c272407ad57ef3775e3d524b1c667564bcfb51fad9fb21b63b6e9fdf4aa5c974435f1ee8bff83be44c4d3447e38c34d596aae8a SHA512 1cba1098c5bf0d6abb79762ddfa958c8e22852bc4af1786eb3032bc72d67643b4e439697e486becca49f118971ef777f32d64cdbb83b62f34a6f96785c067d23
-EBUILD libadwaita-1.1.0.ebuild 1459 BLAKE2B b50bb9974dc44553a0d33d154c272407ad57ef3775e3d524b1c667564bcfb51fad9fb21b63b6e9fdf4aa5c974435f1ee8bff83be44c4d3447e38c34d596aae8a SHA512 1cba1098c5bf0d6abb79762ddfa958c8e22852bc4af1786eb3032bc72d67643b4e439697e486becca49f118971ef777f32d64cdbb83b62f34a6f96785c067d23
-EBUILD libadwaita-1.1.1.ebuild 1470 BLAKE2B 11e575ccf847a8b434b11ebfae489ea87716bc11cf9936bcd5bbb6be43ccf4db492da1310e3c6ab8cd388fc84b8d9d3bc1c19308a4d4aa8409f62183834c9e7a SHA512 6bac20fc1f1f09cf2bfd4a24e001cbbaa1071eb520b2cbc54eee5f4caaf445c4a21046d3f87875723d2a1320ac7ed79e0b1466b3c722324444142229544d5eae
+DIST libadwaita-1.1.2.tar.xz 2731632 BLAKE2B e60201f6d2f51713350b3ec18dae10a5993c6fcea3491495b5e9878461a558609c306a418a59515f2b827b6ee8049ff09b710c4326a87e372e975519bec61274 SHA512 ae89c49986d1bddc5eacc736be8ff0842634bf564e73d4a456b6d899ecc0fcc337f27a17cbb5f8921009f45d82434ab22cf7c2bc9541c4179cd298c2d6706587
+EBUILD libadwaita-1.1.1.ebuild 1481 BLAKE2B c35cf9b03a4b089ee9ed676212eddc0f2b581d265f9a32034653be48a938fbd2c54e51ca6ff5b4a964636ef4b840c1a34372f3dc4101786ce6a6e22148fa5aed SHA512 9e35ad8d6788340e78e3d61ced1b40803c9b1bf032823ee8eb09bde8f28c9fe5000c7ed3c412b94f85ff16b670650efd521ab17d5b106cc2cd3815c88d305650
+EBUILD libadwaita-1.1.2.ebuild 1478 BLAKE2B b41edff61fa54d6ba1487b85521ebefee38ae26679197032e4418edbe0218c559caecb85491d1e4b642f9ce6c4cfe91843ce3d516ba5152bf3fdb9e17b7eb23f SHA512 2d7d65f6a2d2453a6bc41e399152f8d7b615818abb30159a265d0ea3c73142093b631ebedf3c1f0555dbbd69ba50d4595668a6f53a45322084fe306e0627db5a
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gui-libs/libadwaita/libadwaita-1.0.2.ebuild b/gui-libs/libadwaita/libadwaita-1.0.2.ebuild
deleted file mode 100644
index b70296c62fd8..000000000000
--- a/gui-libs/libadwaita/libadwaita-1.0.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-VALA_MIN_API_VERSION="0.52"
-inherit gnome.org meson python-any-r1 vala virtualx
-
-DESCRIPTION="Building blocks for modern adaptive GNOME applications"
-HOMEPAGE="https://gnome.pages.gitlab.gnome.org/libadwaita/ https://gitlab.gnome.org/GNOME/libadwaita"
-
-LICENSE="LGPL-2.1+"
-SLOT="1"
-IUSE="+introspection test +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-DEPEND="
-	>=dev-libs/glib-2.66:2
-	>=gui-libs/gtk-4.5.0:4[introspection?]
-	dev-libs/fribidi
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	vala? ( $(vala_depend) )
-	>=dev-util/meson-0.59.0
-	dev-util/glib-utils
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		# Never use gi-docgen subproject
-		--wrap-mode nofallback
-
-		-Dprofiling=false
-		$(meson_feature introspection)
-		$(meson_use vala vapi)
-		-Dgtk_doc=false # we ship pregenerated docs
-		$(meson_use test tests)
-		-Dexamples=false
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test --timeout-multiplier 2
-}
-
-src_install() {
-	meson_src_install
-
-	insinto /usr/share/gtk-doc/html
-	# This will install libadwaita API docs unconditionally, but this is intentional
-	doins -r "${S}"/doc/libadwaita-1
-}
diff --git a/gui-libs/libadwaita/libadwaita-1.1.0.ebuild b/gui-libs/libadwaita/libadwaita-1.1.0.ebuild
deleted file mode 100644
index b70296c62fd8..000000000000
--- a/gui-libs/libadwaita/libadwaita-1.1.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-VALA_MIN_API_VERSION="0.52"
-inherit gnome.org meson python-any-r1 vala virtualx
-
-DESCRIPTION="Building blocks for modern adaptive GNOME applications"
-HOMEPAGE="https://gnome.pages.gitlab.gnome.org/libadwaita/ https://gitlab.gnome.org/GNOME/libadwaita"
-
-LICENSE="LGPL-2.1+"
-SLOT="1"
-IUSE="+introspection test +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-DEPEND="
-	>=dev-libs/glib-2.66:2
-	>=gui-libs/gtk-4.5.0:4[introspection?]
-	dev-libs/fribidi
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	vala? ( $(vala_depend) )
-	>=dev-util/meson-0.59.0
-	dev-util/glib-utils
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		# Never use gi-docgen subproject
-		--wrap-mode nofallback
-
-		-Dprofiling=false
-		$(meson_feature introspection)
-		$(meson_use vala vapi)
-		-Dgtk_doc=false # we ship pregenerated docs
-		$(meson_use test tests)
-		-Dexamples=false
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test --timeout-multiplier 2
-}
-
-src_install() {
-	meson_src_install
-
-	insinto /usr/share/gtk-doc/html
-	# This will install libadwaita API docs unconditionally, but this is intentional
-	doins -r "${S}"/doc/libadwaita-1
-}
diff --git a/gui-libs/libadwaita/libadwaita-1.1.1.ebuild b/gui-libs/libadwaita/libadwaita-1.1.1.ebuild
index 2ea4bd1ebf37..240720a09fce 100644
--- a/gui-libs/libadwaita/libadwaita-1.1.1.ebuild
+++ b/gui-libs/libadwaita/libadwaita-1.1.1.ebuild
@@ -14,7 +14,7 @@ SLOT="1"
 IUSE="+introspection test +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.66:2
diff --git a/gui-libs/libadwaita/libadwaita-1.0.1.ebuild b/gui-libs/libadwaita/libadwaita-1.1.2.ebuild
index 13dde998ce1f..21b53489be86 100644
--- a/gui-libs/libadwaita/libadwaita-1.0.1.ebuild
+++ b/gui-libs/libadwaita/libadwaita-1.1.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
 VALA_MIN_API_VERSION="0.52"
 inherit gnome.org meson python-any-r1 vala virtualx
 
@@ -14,7 +14,7 @@ SLOT="1"
 IUSE="+introspection test +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 DEPEND="
 	>=dev-libs/glib-2.66:2
@@ -33,8 +33,8 @@ BDEPEND="
 "
 
 src_prepare() {
-	use vala && vala_src_prepare
 	default
+	use vala && vala_setup
 }
 
 src_configure() {