Merge updates from master

19 files changed, 698 insertions, 17 deletions

diff --git a/dev-java/icu4j/Manifest b/dev-java/icu4j/Manifest
index 764b0abe0d37..89b9fe8422c7 100644
--- a/dev-java/icu4j/Manifest
+++ b/dev-java/icu4j/Manifest
@@ -1 +1,2 @@
 DIST icu-72.1.tar.gz 67092974 BLAKE2B 2261c7969ddbfdb4e75e405646cc9f29b1f8dd21f98641b9318457d3cd27694833a9181f4888d2cb243ba65191fe9216a508684c1dbd5a85f36e06ae8fac7d9e SHA512 fee1278f16528867da63d95feee6864a1f62befa9cc0b006439e1b47cf6f3f0e6581692432129e465208b5bd7fcc44e1175f124e83157547b3d9a78f3a4944ab
+DIST icu-73.2.tar.gz 81522943 BLAKE2B 006d7ccab04385f0aa60e2e60b616be9598f448f27d9b0f6dba554874bfe1dd442ba0719a7677ba8aba7e4e0f05e5e50dca74855a900da1f496aad0cd54c3cdc SHA512 f234fb9c76af62dad59e159ef7f7792aca563d88f2988d3d1ecc8be6250837beb9a530ec121e0949f6925ee8e5171a0d04fa41a0c50d9993c4061fa55be6836e
diff --git a/dev-java/icu4j/files/icu4j-73.2-DateFormatTest.patch b/dev-java/icu4j/files/icu4j-73.2-DateFormatTest.patch
new file mode 100644
index 000000000000..ee2cf024a3a2
--- /dev/null
+++ b/dev-java/icu4j/files/icu4j-73.2-DateFormatTest.patch
@@ -0,0 +1,90 @@
+1) TestDateFormatCalendar(com.ibm.icu.dev.test.format.DateFormatTest)
+java.lang.AssertionError: FAIL: Parsed result: Thursday, April 5, 2001 at 5:45:00 PM Central European Summer Time, exp 4/5/2001 5:45 PM
+	at org.junit.Assert.fail(Assert.java:89)
+	at com.ibm.icu.dev.test.AbstractTestLog.errln(AbstractTestLog.java:50)
+	at com.ibm.icu.dev.test.format.DateFormatTest.TestDateFormatCalendar(DateFormatTest.java:2267)
+2) TestGenericTime(com.ibm.icu.dev.test.format.DateFormatTest)
+java.lang.AssertionError: : "y/M/d H:mm zzzz".format(2004 01 01 01:00 PST): expected "2004/1/1 1:00 Pacific Standard Time", got "2004/1/1 10:00 Central European Standard Time"
+	at org.junit.Assert.fail(Assert.java:89)
+	at com.ibm.icu.dev.test.AbstractTestLog.errln(AbstractTestLog.java:50)
+	at com.ibm.icu.dev.test.TestFmwk.handleAssert(TestFmwk.java:610)
+	at com.ibm.icu.dev.test.TestFmwk.handleAssert(TestFmwk.java:591)
+	at com.ibm.icu.dev.test.TestFmwk.assertEquals(TestFmwk.java:543)
+	at com.ibm.icu.dev.test.format.DateFormatTest.expect(DateFormatTest.java:3426)
+	at com.ibm.icu.dev.test.format.DateFormatTest.TestGenericTime(DateFormatTest.java:664)
+3) TestDotAndAtLeniency(com.ibm.icu.dev.test.format.DateFormatTest)
+java.lang.AssertionError: com.ibm.icu.text.SimpleDateFormat@c82a5c46	Sunday, January 15, 2012  12:00:00 AM Central European. Standard Time.
+	at org.junit.Assert.fail(Assert.java:89)
+	at com.ibm.icu.dev.test.AbstractTestLog.errln(AbstractTestLog.java:50)
+	at com.ibm.icu.dev.test.format.DateFormatTest.showParse(DateFormatTest.java:4788)
+	at com.ibm.icu.dev.test.format.DateFormatTest.TestDotAndAtLeniency(DateFormatTest.java:4772)
+4) TestTwoDigitYearDSTParse(com.ibm.icu.dev.test.format.DateFormatTest)
+java.lang.AssertionError: FAIL: Hour (-DST) = 11.0; expected 11.000277777777777
+	at org.junit.Assert.fail(Assert.java:89)
+	at com.ibm.icu.dev.test.AbstractTestLog.errln(AbstractTestLog.java:50)
+	at com.ibm.icu.dev.test.format.DateFormatTest.TestTwoDigitYearDSTParse(DateFormatTest.java:335)
+5) TestGenericTimeZoneOrder(com.ibm.icu.dev.test.format.DateFormatTest)
+java.lang.AssertionError: : "y/M/d H:mm zzz".format(2004 01 01 01:00 PST): expected "2004/1/1 1:00 PST", got "2004/1/1 10:00 GMT+1"
+	at org.junit.Assert.fail(Assert.java:89)
+	at com.ibm.icu.dev.test.AbstractTestLog.errln(AbstractTestLog.java:50)
+	at com.ibm.icu.dev.test.TestFmwk.handleAssert(TestFmwk.java:610)
+	at com.ibm.icu.dev.test.TestFmwk.handleAssert(TestFmwk.java:591)
+	at com.ibm.icu.dev.test.TestFmwk.assertEquals(TestFmwk.java:543)
+	at com.ibm.icu.dev.test.format.DateFormatTest.expect(DateFormatTest.java:3476)
+	at com.ibm.icu.dev.test.format.DateFormatTest.TestGenericTimeZoneOrder(DateFormatTest.java:749)
+
+--- a/tests/core/src/com/ibm/icu/dev/test/format/DateFormatTest.java
++++ b/tests/core/src/com/ibm/icu/dev/test/format/DateFormatTest.java
+@@ -37,6 +37,7 @@ import java.util.ResourceBundle;
+ import java.util.Set;
+ 
+ import org.junit.Test;
++import org.junit.Ignore;
+ import org.junit.runner.RunWith;
+ import org.junit.runners.JUnit4;
+ 
+@@ -297,7 +298,7 @@ public class DateFormatTest extends TestFmwk {
+     /**
+      * Test the parsing of 2-digit years.
+      */
+-    @Test
++    @Test @Ignore
+     public void TestTwoDigitYearDSTParse() {
+ 
+         SimpleDateFormat fullFmt = new SimpleDateFormat("EEE MMM dd HH:mm:ss.SSS zzz yyyy G");
+@@ -613,7 +614,7 @@ public class DateFormatTest extends TestFmwk {
+         expect(DATA, new Locale("en", "", ""));
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void TestGenericTime() {
+ 
+ 
+@@ -718,7 +719,7 @@ public class DateFormatTest extends TestFmwk {
+ 
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void TestGenericTimeZoneOrder() {
+         // generic times should parse the same no matter what the placement of the time zone string
+         // should work for standard and daylight times
+@@ -2199,7 +2200,7 @@ public class DateFormatTest extends TestFmwk {
+     /**
+      * Test DateFormat(Calendar) API
+      */
+-    @Test
++    @Test @Ignore
+     public void TestDateFormatCalendar() {
+         DateFormat date=null, time=null, full=null;
+         Calendar cal=null;
+@@ -4741,7 +4742,7 @@ public class DateFormatTest extends TestFmwk {
+ 
+     static Date TEST_DATE = new Date(2012-1900, 1-1, 15); // January 15, 2012
+ 
+-    @Test
++    @Test @Ignore
+     public void TestDotAndAtLeniency() {
+         for (ULocale locale : Arrays.asList(ULocale.ENGLISH, ULocale.FRENCH)) {
+             List<Object[]> tests = new ArrayList();
diff --git a/dev-java/icu4j/icu4j-72.1.ebuild b/dev-java/icu4j/icu4j-72.1.ebuild
index 6c36773ab3b6..efe703205a6a 100644
--- a/dev-java/icu4j/icu4j-72.1.ebuild
+++ b/dev-java/icu4j/icu4j-72.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
@@ -65,6 +65,7 @@ JAVA_TEST_EXCLUDES=(
 	"com.ibm.icu.dev.test.stringprep.TestData" # Invalid test class 1. No runnable methods
 	"com.ibm.icu.dev.test.calendar.ChineseTestCase" # Invalid test class 1. Test class should have exactly one public zero-argument constructor
 	"com.ibm.icu.dev.test.calendar.TestCase" # java.lang.IllegalArgumentException: Test class can only have one constructor
+	"com.ibm.icu.dev.test.message2.TestCase" # Invalid test class - No runnable methods
 	"com.ibm.icu.dev.test.bidi.TestData" # Invalid test class 1. Test class should have exactly one public constructor
 	# following kills 98 tests and and avoids 9 test failures
 	# coverage tests fail because test handlers for the parametrized tests are not defined so the tests are broken and cannot succeed
diff --git a/dev-java/icu4j/icu4j-73.2.ebuild b/dev-java/icu4j/icu4j-73.2.ebuild
new file mode 100644
index 000000000000..4749dae91cdc
--- /dev/null
+++ b/dev-java/icu4j/icu4j-73.2.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.ibm.icu:icu4j:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A set of Java libraries providing Unicode and Globalization support"
+HOMEPAGE="https://icu.unicode.org"
+SRC_URI="https://github.com/unicode-org/icu/archive/release-${PV/./-}.tar.gz -> icu-${PV}.tar.gz"
+S="${WORKDIR}/icu-release-${PV/./-}/icu4j/main"
+
+LICENSE="icu"
+SLOT="70"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*
+	test? ( dev-java/junitparams:0 )"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+HTML_DOCS=( ../{APIChangeReport,readme}.html )
+
+PATCHES=(
+	"${FILESDIR}/icu4j-73.2-DateFormatTest.patch"
+)
+
+JAVA_TEST_EXCLUDES=(
+	# Invalid tests, not run by maven
+	"com.ibm.icu.dev.data.TestDataElements_testtypes"
+	"com.ibm.icu.dev.data.resources.TestDataElements_en_Latn_US"
+	"com.ibm.icu.dev.data.resources.TestDataElements_en_US"
+	"com.ibm.icu.dev.data.resources.TestDataElements_fr_Latn_FR"
+	"com.ibm.icu.dev.data.resources.TestDataElements_te"
+	"com.ibm.icu.dev.data.resources.TestMessages"
+	"com.ibm.icu.dev.test.ModuleTest"
+	"com.ibm.icu.dev.test.TestBoilerplate"
+	"com.ibm.icu.dev.test.TestDataModule"
+	"com.ibm.icu.dev.test.bidi.TestData"
+	"com.ibm.icu.dev.test.calendar.ChineseTestCase"
+	"com.ibm.icu.dev.test.calendar.TestCase"
+	"com.ibm.icu.dev.test.format.ExhaustivePersonNameFormatterTest"
+	"com.ibm.icu.dev.test.localespi.TestUtil"
+	"com.ibm.icu.dev.test.message2.TestCase"
+	"com.ibm.icu.dev.test.stringprep.TestData"
+	"com.ibm.icu.dev.test.translit.TestUtility"
+	# Maven: [INFO] Tests run: 364, Failures: 0, Errors: 0, Skipped: 0
+	"com.ibm.icu.dev.test.serializable.CompatibilityTest" # Tests run: 364,  Failures: 4
+	# Maven: [INFO] Tests run: 90, Failures: 0, Errors: 0, Skipped: 0
+	"com.ibm.icu.dev.test.serializable.CoverageTest" # Tests run: 99,  Failures: 9
+	# Following tests need to run separately:
+	com.ibm.icu.dev.test.calendar.CalendarRegressionTest
+	com.ibm.icu.dev.test.calendar.CompatibilityTest
+	com.ibm.icu.dev.test.calendar.DataDrivenCalendarTest
+	com.ibm.icu.dev.test.calendar.HolidayTest
+	com.ibm.icu.dev.test.calendar.IndianTest
+	com.ibm.icu.dev.test.calendar.IslamicTest
+	com.ibm.icu.dev.test.calendar.JapaneseTest
+	com.ibm.icu.dev.test.format.DataDrivenFormatTest
+	com.ibm.icu.dev.test.format.DateFormatRegressionTest
+	com.ibm.icu.dev.test.format.DateFormatRoundTripTest
+	com.ibm.icu.dev.test.format.DateIntervalFormatTest
+	com.ibm.icu.dev.test.format.DateTimeGeneratorTest
+	com.ibm.icu.dev.test.format.TestMessageFormat
+	com.ibm.icu.dev.test.message2.MessageFormat2Test
+	com.ibm.icu.dev.test.message2.Mf2FeaturesTest
+	com.ibm.icu.dev.test.message2.Mf2IcuTest
+	com.ibm.icu.dev.test.timezone.TimeZoneBoundaryTest
+	com.ibm.icu.dev.test.util.CurrencyTest
+)
+JAVA_TEST_EXTRA_ARGS="-Djava.locale.providers=CLDR,COMPAT,SPI"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,junitparams"
+JAVA_TEST_RESOURCE_DIRS=(
+	tests/res/collate/src
+	tests/res/core/src
+	tests/res/translit/src
+)
+JAVA_TEST_SRC_DIR=(
+	tests/charset/src
+	tests/collate/src
+	tests/core/src
+	tests/localespi/src
+	tests/packaging/src
+	tests/translit/src
+)
+
+src_prepare() {
+	default #780585
+	java-pkg_clean ! -path "./shared/data/*" # keep icudata.jar, icutzdata.jar, testdata.jar
+	java-pkg-2_src_prepare
+
+	# java-pkg-simple.eclass wants resources in JAVA_RESOURCE_DIRS
+	mkdir -p resources || die
+
+	pushd classes > /dev/null || die
+		find -type f \
+			! -name '*.java' \
+			! -name 'license.html' \
+			| xargs cp --parent -t ../resources || die
+	popd > /dev/null || die
+
+	pushd resources/core/src > /dev/null || die
+		# icudata and icutzdata for "icu4j.jar"
+		jar -xf "${S}"/shared/data/icudata.jar || die
+		jar -xf "${S}"/shared/data/icutzdata.jar || die
+		# move these resources to "icu4j-charset.jar"
+		mkdir -p "${S}"/resources/charset/src/com/ibm/icu/impl/data/icudt"$(ver_cut 1)"b || die
+		mv com/ibm/icu/impl/data/icudt"$(ver_cut 1)"b/{*.cnv,cnvalias.icu} \
+			"${S}"/resources/charset/src/com/ibm/icu/impl/data/icudt"$(ver_cut 1)"b || die
+
+		# create 9 files com/ibm/icu/impl/data/icudt69b/*/fullLocaleNames.lst
+		for dir in $(find com/ibm/icu/impl/data/icudt"$(ver_cut 1)"b/ -type d ! -name 'unit' -exec echo {} +); do
+			ls -1 $dir/*.res | sed -e 's%.*\/%%' -e 's%\..*$%%' -e '/pool/d' -e '/res_index/d' -e '/tzdbNames/d'\
+				> $dir/'fullLocaleNames.lst';
+		done || die "fullLocaleNames.lst failed"
+	popd > /dev/null || die
+
+	if use test; then
+		# initializationError(com.ibm.icu.dev.data.resources.TestDataElements)
+		# but test_excluding it would kill tousands of other tests.
+		mkdir -p tests/framework/src/com/ibm/icu/dev/data/resources || die
+		mv tests/{core,framework}/src/com/ibm/icu/dev/data/resources/TestDataElements.java || die
+
+		# Separate tests resources
+		mkdir tests/res || die
+		pushd tests > /dev/null || die
+			find -type f \
+				! -name '*.java' \
+				| xargs cp --parent -t res || die
+		popd > /dev/null || die
+
+		cp -r ../tools/misc/{src,resources} || die
+		find ../tools/misc/resources -type f -name '*.java' -exec rm -rf {} + || die
+	fi
+}
+
+src_compile() {
+	einfo "Compiling icu4j.jar"
+	JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu"
+	JAVA_JAR_FILENAME="icu4j.jar"
+	JAVA_MAIN_CLASS="com.ibm.icu.util.VersionInfo"
+	JAVA_RESOURCE_DIRS="resources/core/src"
+	JAVA_SRC_DIR=(
+		classes/collate/src
+		classes/core/src
+		classes/currdata/src
+		classes/langdata/src
+		classes/regiondata/src
+		classes/translit/src
+	)
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":icu4j.jar"
+	rm -r target || die
+
+	einfo "Compiling icu4j-charset.jar"
+	JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.charset"
+	JAVA_JAR_FILENAME="icu4j-charset.jar"
+	JAVA_MAIN_CLASS=""
+	JAVA_RESOURCE_DIRS="resources/charset/src"
+	JAVA_SRC_DIR=( classes/charset/src )
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":icu4j-charset.jar"
+	rm -r target || die
+
+	einfo "Compiling icu4j-localespi.jar"
+	JAVA_AUTOMATIC_MODULE_NAME="com.ibm.icu.localespi"
+	JAVA_JAR_FILENAME="icu4j-localespi.jar"
+	JAVA_RESOURCE_DIRS="resources/localespi/src"
+	JAVA_SRC_DIR=( classes/localespi/src )
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":icu4j-localespi.jar"
+	rm -r target || die
+
+	# main/test/framework
+	# needed for compilicg the tests
+	# but "No runnable methods" ("Invalid test class")
+	if use test; then
+		JAVA_JAR_FILENAME="framework.jar"
+		JAVA_RESOURCE_DIRS=( tests/res/framework/src ../tools/misc/resources )
+		JAVA_SRC_DIR=( tests/framework/src ../tools/misc/src )
+		java-pkg-simple_src_compile
+		rm -fr target || die
+	fi
+
+	# javadocs
+	if use doc; then
+		JAVA_JAR_FILENAME="ignoreme.jar"
+		JAVA_SRC_DIR=( classes )
+		java-pkg-simple_src_compile
+	fi
+}
+
+src_test () {
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":framework.jar:shared/data/testdata.jar"
+
+	JAVA_TEST_RUN_ONLY=(
+		com.ibm.icu.dev.test.rbbi.AbstractBreakIteratorTests
+		com.ibm.icu.dev.test.calendar.CalendarRegressionTest
+		com.ibm.icu.dev.test.calendar.CompatibilityTest
+		com.ibm.icu.dev.test.calendar.DataDrivenCalendarTest
+		com.ibm.icu.dev.test.calendar.HolidayTest
+		com.ibm.icu.dev.test.calendar.IndianTest
+		com.ibm.icu.dev.test.calendar.IslamicTest
+		com.ibm.icu.dev.test.calendar.JapaneseTest
+		com.ibm.icu.dev.test.format.DataDrivenFormatTest
+		com.ibm.icu.dev.test.format.DateFormatRegressionTest
+		com.ibm.icu.dev.test.format.DateFormatRoundTripTest
+		com.ibm.icu.dev.test.format.DateIntervalFormatTest
+		com.ibm.icu.dev.test.format.DateTimeGeneratorTest
+		com.ibm.icu.dev.test.format.TestMessageFormat
+		com.ibm.icu.dev.test.message2.MessageFormat2Test
+		com.ibm.icu.dev.test.message2.Mf2FeaturesTest
+		com.ibm.icu.dev.test.message2.Mf2IcuTest
+		com.ibm.icu.dev.test.timezone.TimeZoneBoundaryTest
+		com.ibm.icu.dev.test.util.CurrencyTest
+	)
+	java-pkg-simple_src_test
+
+	JAVA_TEST_RUN_ONLY=()
+	# ../maven-build/maven-icu4j-localespi/pom.xml#L133-L143
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if [[ "${vm_version}" != "1.8" ]] ; then
+		java-pkg-simple_src_test
+	fi
+}
+
+src_install() {
+	default
+	java-pkg_dojar "icu4j.jar"
+	java-pkg_dojar "icu4j-charset.jar"
+	java-pkg_dojar "icu4j-localespi.jar"
+
+	if use doc; then
+		java-pkg_dojavadoc target/api
+	fi
+	if use source; then
+		java-pkg_dosrc "classes"
+	fi
+}
diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass
index 14650ea7e8d3..e50344c32acb 100644
--- a/eclass/java-pkg-simple.eclass
+++ b/eclass/java-pkg-simple.eclass
@@ -501,6 +501,9 @@ java-pkg-simple_src_test() {
 		return
 	fi
 
+	# https://bugs.gentoo.org/906311
+	rm -rf ${classes} || die
+
 	# create the target directory
 	mkdir -p ${classes} || die "Could not create target directory for testing"
 
@@ -519,7 +522,6 @@ java-pkg-simple_src_test() {
 		find "${JAVA_TEST_SRC_DIR[@]}" -name \*.java > ${test_sources}
 	fi
 
-
 	# compile
 	if [[ -s ${test_sources} ]]; then
 		if [[ -n ${moduleinfo} ]] || [[ java-pkg_get-target -lt 9 ]]; then
@@ -555,21 +557,19 @@ java-pkg-simple_src_test() {
 	if [[ -n ${JAVA_TEST_RUN_ONLY} ]]; then
 		tests_to_run="${JAVA_TEST_RUN_ONLY[@]}"
 	else
-		pushd "${JAVA_TEST_SRC_DIR}" > /dev/null || die
-			tests_to_run=$(find * -type f\
-				\( -name "*Test.java"\
-				-o -name "Test*.java"\
-				-o -name "*Tests.java"\
-				-o -name "*TestCase.java" \)\
-				! -name "*Abstract*"\
-				! -name "*BaseTest*"\
-				! -name "*TestTypes*"\
-				! -name "*TestUtils*"\
-				! -name "*\$*")
-			tests_to_run=${tests_to_run//"${classes}"\/}
-			tests_to_run=${tests_to_run//.java}
-			tests_to_run=${tests_to_run//\//.}
-		popd > /dev/null || die
+		tests_to_run=$(find "${classes}" -type f\
+			\( -name "*Test.class"\
+			-o -name "Test*.class"\
+			-o -name "*Tests.class"\
+			-o -name "*TestCase.class" \)\
+			! -name "*Abstract*"\
+			! -name "*BaseTest*"\
+			! -name "*TestTypes*"\
+			! -name "*TestUtils*"\
+			! -name "*\$*")
+		tests_to_run=${tests_to_run//"${classes}"\/}
+		tests_to_run=${tests_to_run//.class}
+		tests_to_run=${tests_to_run//\//.}
 
 		# exclude extra test classes, usually corner cases
 		# that the code above cannot handle
diff --git a/gnome-base/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest
index 08597587239f..34b312537bed 100644
--- a/gnome-base/gnome-applets/Manifest
+++ b/gnome-base/gnome-applets/Manifest
@@ -1 +1,2 @@
 DIST gnome-applets-3.46.0.tar.xz 9248780 BLAKE2B 5bc61dbbb2f6a7c96a9ad6895936996025bfc6d99ac29ff552e62e5061866b1ef30384d6adecefee933cbb533184a47cb6c40c5c8c7562d4892817aa73628dab SHA512 826abf56f76925f0246b49194b09ec9ae43963c43e3f861269ab839c08823bb2b8b1b47cd20a93495bfef0d4220ef579190f0dd491c3cb2ed70fdd0483b1f007
+DIST gnome-applets-3.50.0.tar.xz 9257700 BLAKE2B ce085b1dc352ca267eeb725c3da4903e2017a385759236914707fdc5963e8f2a7eb6b06ce9b8d6a55240cc23ceb94a18474a0c5594c0e8801a2a929ed6cf9d0e SHA512 81eca5e87802e0c146cf6f327653b36e2bc62dc6a294306037139e1deba2f01c30b8d1700960d60b74e405ea98a876e7bed4e32539f37b89dd0091bfc98f20a9
diff --git a/gnome-base/gnome-applets/gnome-applets-3.50.0.ebuild b/gnome-base/gnome-applets/gnome-applets-3.50.0.ebuild
new file mode 100644
index 000000000000..66e13e1bc849
--- /dev/null
+++ b/gnome-base/gnome-applets/gnome-applets-3.50.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome2
+
+DESCRIPTION="Applets for the GNOME Flashback Panel"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-applets/"
+
+LICENSE="GPL-2+ FDL-1.1"
+SLOT="0"
+IUSE="tracker"
+KEYWORDS="~amd64 ~riscv"
+
+# FIXME: automagic wireless-tools
+# TODO: gucharmap could be optional, but no knob
+# TODO: libgweather could be optional, but no knob
+RDEPEND="
+	>=x11-libs/gtk+-3.20.0:3[X]
+	>=dev-libs/glib-2.44.0:2
+	>=gnome-base/gnome-panel-3.41.1
+	>=gnome-base/libgtop-2.11.92:=
+	>=x11-libs/libwnck-43.0:3
+	>=x11-libs/libnotify-0.7
+	>=sys-power/upower-0.99.8:=
+	>=x11-themes/adwaita-icon-theme-3.14.0
+	>=dev-libs/libxml2-2.5.0:2
+	>=dev-libs/libgweather-4.2.0:4=
+	>=gnome-extra/gucharmap-2.33.0:2.90
+	>=sys-auth/polkit-0.97
+	x11-libs/libX11
+	tracker? ( app-misc/tracker:3 )
+	>=x11-libs/pango-1.50.0
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.6
+	virtual/pkgconfig
+" # yelp-tools and autoconf-archive for eautoreconf
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable tracker tracker-search-bar)
+}
diff --git a/gnome-base/gnome-applets/metadata.xml b/gnome-base/gnome-applets/metadata.xml
index b66f5436b537..4aa4279c967a 100644
--- a/gnome-base/gnome-applets/metadata.xml
+++ b/gnome-base/gnome-applets/metadata.xml
@@ -5,6 +5,10 @@
     <email>gnome@gentoo.org</email>
     <name>Gentoo GNOME Desktop</name>
   </maintainer>
+  <maintainer type="person">
+    <email>flow@gentoo.org</email>
+    <name>Florian Schmaus</name>
+  </maintainer>
   <use>
     <flag name="tracker">Build the tracker search bar applet</flag>
   </use>
diff --git a/gnome-base/gnome-flashback/Manifest b/gnome-base/gnome-flashback/Manifest
index 3fa032831c8e..6db1ec9266da 100644
--- a/gnome-base/gnome-flashback/Manifest
+++ b/gnome-base/gnome-flashback/Manifest
@@ -1 +1,2 @@
 DIST gnome-flashback-3.46.0.tar.xz 892424 BLAKE2B f752687a07d8b5205aebed47e0ece8b77edc32aa9fa934b9e14234119d3bf074b528eb1af8ea5841ca20c2f91511eac40e6a708835542bbdc8ea4e1d364984e8 SHA512 845d9cf3551295bc6dcaeeb141875ddb875e8cf885a2a3b17c4234dd40b37b8ed5279f07414c4cc7590369b394a7270c48d34d767bd0d1ef0189f4b73e73da10
+DIST gnome-flashback-3.50.0.tar.xz 907036 BLAKE2B a995ab42fad19b566ff07c9f745a6a8ba3efab3e9201b72a813a4bc91976d2b5150b84cd1cbeb62e22ccead3d9bb17143ce793a699a0699d5223e021598c0fbc SHA512 1c6b5569f01870f9e55f22b5ba34dd7ba54d5d61fa3a1096e906ea0e0919e0af2f3a6e2dd95c8e0952aead80e207f1319faa4f657a5d3350fd73caddb55c7062
diff --git a/gnome-base/gnome-flashback/gnome-flashback-3.50.0.ebuild b/gnome-base/gnome-flashback/gnome-flashback-3.50.0.ebuild
new file mode 100644
index 000000000000..403aae023970
--- /dev/null
+++ b/gnome-base/gnome-flashback/gnome-flashback-3.50.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome2 toolchain-funcs
+
+DESCRIPTION="GNOME Flashback session"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-flashback/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="elogind systemd"
+REQUIRED_USE="^^ ( elogind systemd )"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	>=x11-libs/gdk-pixbuf-2.32.2:2
+	>=x11-libs/gtk+-3.22.0:3[X]
+	>=gnome-base/gnome-desktop-43:3=
+	>=gnome-base/gnome-panel-3.35.2
+	>=media-libs/libcanberra-0.13[gtk3]
+	>=dev-libs/glib-2.67.3:2
+	>=gnome-base/gsettings-desktop-schemas-3.31.0
+	>=sys-auth/polkit-0.97
+	>=app-i18n/ibus-1.5.2
+	>=sys-power/upower-0.99.0:=
+	>=x11-libs/libXrandr-1.5.0
+	>=x11-libs/libXxf86vm-1.1.4
+
+	x11-libs/libxcb:=
+	x11-libs/libX11
+	gnome-base/gdm
+	elogind? ( >=sys-auth/elogind-230 )
+	systemd? ( >=sys-apps/systemd-230:= )
+	net-wireless/gnome-bluetooth:3=
+	x11-libs/libXext
+	>=x11-libs/libXi-1.6.0
+	x11-libs/pango
+	x11-libs/libxkbfile
+	x11-misc/xkeyboard-config
+	x11-libs/libXfixes
+	media-libs/libpulse[glib]
+	media-libs/alsa-lib
+	sys-libs/pam
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+" # autoconf-archive for eautoreconf
+RDEPEND="${RDEPEND}
+	x11-wm/metacity
+	gnome-base/gnome-panel
+	gnome-base/gnome-settings-daemon
+"
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		--without-compiz-session
+		$(use_enable systemd systemd-session)
+	)
+
+	# Below elogind DESKTOP_* and SCREENSAVER_* pkg-config calls need to match up with
+	# what upstream has each version (libsystemd replaced with libelogind). Explicit
+	# per-version die to force a manual recheck. Only update the explicit version if the
+	# "PKG_CHECK_MODULES([DESKTOP/SCREENSAVER], ...)" blocks did not change; otherwise adjust
+	# elogind conditional block below accordingly first.
+	if ver_test ${PV} -ne 3.50.0; then
+		die "Maintainer has not checked over packages MENU pkg-config deps for elogind support"
+	fi
+
+	if use elogind; then
+		local pkgconfig="$(tc-getPKG_CONFIG)"
+		myconf+=(
+			DESKTOP_CFLAGS="$(${pkgconfig} --cflags glib-2.0 gio-2.0 gio-unix-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind x11)"
+			DESKTOP_LIBS="$(${pkgconfig} --libs glib-2.0 gio-2.0 gio-unix-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind x11)"
+			SCREENSAVER_CFLAGS="$(${pkgconfig} --cflags gdm gio-unix-2.0 glib-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind xxf86vm)"
+			SCREENSAVER_LIBS="$(${pkgconfig} --libs gdm gio-unix-2.0 glib-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind xxf86vm)"
+		)
+	fi
+
+	gnome2_src_configure "${myconf[@]}"
+}
diff --git a/gnome-base/gnome-flashback/metadata.xml b/gnome-base/gnome-flashback/metadata.xml
index 9d9ab3a44e19..68dd054fcefe 100644
--- a/gnome-base/gnome-flashback/metadata.xml
+++ b/gnome-base/gnome-flashback/metadata.xml
@@ -5,6 +5,10 @@
     <email>gnome@gentoo.org</email>
     <name>Gentoo GNOME Desktop</name>
   </maintainer>
+  <maintainer type="person">
+    <email>flow@gentoo.org</email>
+    <name>Florian Schmaus</name>
+  </maintainer>
   <upstream>
     <remote-id type="gnome-gitlab">GNOME/gnome-flashback</remote-id>
   </upstream>
diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index c2f51fecad37..d7cf85b2215f 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -1 +1,2 @@
 DIST gnome-panel-3.46.0.tar.xz 2797164 BLAKE2B 48f4a070df7015a8cca2b5041329f3ebb88474abf42cd21f74514ef557426c260110916eb1e23fafec1f99ec2e339258241484a87a6cd52a293d7df6abfff001 SHA512 a49f3978bd9561973c41083006b831cf4fcb07408048106ef56dae7e0809fb3ec825c8b4a1c09e818255c7995c45a6d33aa4f47e61f778f4b1f29ccc7c9033f7
+DIST gnome-panel-3.50.0.tar.xz 2769200 BLAKE2B a386ccf11408772939af434d9f69c00a3bc22c0c104acd2e88e105c3f0d8ea3cfcd9145e6fc5d6e802d02740bcc89a86af403a9ade86271eddb7d8325fecadad SHA512 29e5eb22feec1b2d57fc0cd4c307012bbad50b15d49dc0fc7e2c0a1090a744ca9f1857ee74f2f0a7f77943ebe6ecf4f71c577adaeb19633f34ba93aad26e3c74
diff --git a/gnome-base/gnome-panel/gnome-panel-3.50.0.ebuild b/gnome-base/gnome-panel/gnome-panel-3.50.0.ebuild
new file mode 100644
index 000000000000..3001fd142130
--- /dev/null
+++ b/gnome-base/gnome-panel/gnome-panel-3.50.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome2 toolchain-funcs
+
+DESCRIPTION="The GNOME Flashback Panel"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-panel/"
+
+LICENSE="GPL-2+ FDL-1.1 LGPL-2.1+"
+SLOT="0"
+IUSE="eds elogind systemd"
+REQUIRED_USE="^^ ( elogind systemd )"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	>=gnome-base/gnome-desktop-2.91.0:3=
+	>=x11-libs/gdk-pixbuf-2.26.0:2
+	>=x11-libs/pango-1.15.4
+	>=dev-libs/glib-2.67.1:2
+	>=x11-libs/gtk+-3.22.0:3[X]
+	>=x11-libs/libwnck-43.0:3
+	>=gnome-base/gnome-menus-3.7.90:3
+	eds? ( >=gnome-extra/evolution-data-server-3.46.0:= )
+	elogind? ( >=sys-auth/elogind-230 )
+	systemd? ( >=sys-apps/systemd-230:= )
+	>=x11-libs/cairo-1.0.0[X,glib]
+	>=dev-libs/libgweather-4.2.0:4=
+	>=gnome-base/dconf-0.13.4
+	>=x11-libs/libXrandr-1.3.0
+	gnome-base/gdm
+	x11-libs/libX11
+	x11-libs/libXi
+	sci-geosciences/geocode-glib:2
+	sys-auth/polkit
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+" # yelp-tools and autoconf-archive for eautoreconf
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		$(use_enable eds)
+	)
+
+	# Below elogind MENU_* pkg-config calls need to match up with what upstream has
+	# each version (libsystemd replaced with libelogind). Explicit per-version die
+	# to force a manual recheck. Only update the explicit version if the
+	# "PKG_CHECK_MODULES([MENU], ...)" block did not change; otherwise adjust
+	# elogind conditional block below accordingly first.
+	# DO NOT just change the version, look in configure.ac in which PKG_CHECK_MODULES-sections
+	# libsystemd is used and check if there are new sections where it is used!
+	if ver_test ${PV} -ne 3.50.0; then
+		die "Maintainer has not checked over packages MENU pkg-config deps for elogind support"
+	fi
+
+	if use elogind; then
+		local pkgconfig="$(tc-getPKG_CONFIG)"
+		myconf+=(
+			ACTION_BUTTON_CFLAGS="$(${pkgconfig} --cflags gio-unix-2.0 gtk+-3.0 libelogind x11)"
+			ACTION_BUTTON_LIBS="$(${pkgconfig} --libs gio-unix-2.0 gtk+-3.0 libelogind x11)"
+			LAUNCHER_CFLAGS="$(${pkgconfig} --cflags gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind)"
+			LAUNCHER_LIBS="$(${pkgconfig} --libs gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind)"
+			MENU_CFLAGS="$(${pkgconfig} --cflags gdm gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind)"
+			MENU_LIBS="$(${pkgconfig} --libs gdm gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind)"
+		)
+	fi
+
+	gnome2_src_configure "${myconf[@]}"
+}
diff --git a/gnome-base/gnome-panel/metadata.xml b/gnome-base/gnome-panel/metadata.xml
index 300ece137047..088b9ec9ec95 100644
--- a/gnome-base/gnome-panel/metadata.xml
+++ b/gnome-base/gnome-panel/metadata.xml
@@ -5,6 +5,10 @@
     <email>gnome@gentoo.org</email>
     <name>Gentoo GNOME Desktop</name>
   </maintainer>
+  <maintainer type="person">
+    <email>flow@gentoo.org</email>
+    <name>Florian Schmaus</name>
+  </maintainer>
   <upstream>
     <remote-id type="gnome-gitlab">GNOME/gnome-panel</remote-id>
   </upstream>
diff --git a/net-analyzer/gsa/Manifest b/net-analyzer/gsa/Manifest
index 3ed9ca3cea4c..7291a9f7b164 100644
--- a/net-analyzer/gsa/Manifest
+++ b/net-analyzer/gsa/Manifest
@@ -4,3 +4,5 @@ DIST gsa-22.5.0-node_modules.tar.xz 26394052 BLAKE2B 77e74ccacecd681e846884af463
 DIST gsa-22.5.0.tar.gz 3586703 BLAKE2B 33d9f5e32ccc33e4c1d24665bd7ba0819dc22281772c7ebba24d8c82f93bcc21e8b90f3e0666b9ed8846e2a88417f8bf5999619577c15c307485a7ce3243d104 SHA512 2f119f3d8b213cb10abc7b2a25052e943518f8a2c5950f6eb6e5227bf30f7467ddbcf78bbed5f499b96a0bb517c5033f38477f332a14f449b7b04e7b7902843b
 DIST gsa-22.5.3-node_modules.tar.xz 23161212 BLAKE2B 4bd48e37034cbe8b142392247f7c3231d97bea3d2327833f5d9fbe6b964b5a8f0f61a7d8db0750291fd750fb24bf401e0a6691123e876d76da68810662779df6 SHA512 2863e937bdfad8207a57d03d67f0fb573435845823ce2533fab4002ac25e37903ab21d6e53f272d39bfb900d4793c907d33d56dfe1b88469ad5a4ffcd3201613
 DIST gsa-22.5.3.tar.gz 3620562 BLAKE2B 1b2104bea4d5cb39d9faab05e0e6b1ac0b15c6d342f2066808b3b00fb9e4a07efd8d792eeb2ec1507172e3188770ba428ff5d2a913d00db40d28f899bea23d9f SHA512 fb7ee8b65cfac67789fe392c5734ef2267f80a9f6ac42272e02f21b266f7933c06d5aef33bfa1bedf2782016e26ca849a764f7150ecc8cc6fa8d206c6dd1ae71
+DIST gsa-22.7.0.tar.gz 3593214 BLAKE2B 9a9b4969735c8c05c67f490c98a008816ad6602c6a7a7cceaa611783087da63bde5fbeebe42f171e917820f5c7a79b1a486b41f0c945749c737aa3f4f47ec94c SHA512 e9832666c6218b5d8af9e7af5e088f3dc1e12eac0cbc06c1ccaf268e34a377a5892761dc6a41278c5342a30b008a58c10a36a5b10ee955a77bd55d9dfecfbd44
+DIST gsa-node-modules-22.7.0.tar.xz 27964004 BLAKE2B cbc7120763124deb79ddbcb12037ad8a031ef4de972086866a8393fef39c109a30e90d5f6d7948a55aca518c1ebc3ae46c12ad5440bc89002254bec64f5253e7 SHA512 594f0ffce70514bae8334d749f4e690cdb040b81c8a91238e5bbac18088a0866fe8a78be8a323b813cb5c751e69419c80da611ba7f619797dd9b502c320529b4
diff --git a/net-analyzer/gsa/gsa-22.7.0.ebuild b/net-analyzer/gsa/gsa-22.7.0.ebuild
new file mode 100644
index 000000000000..a45132ee3340
--- /dev/null
+++ b/net-analyzer/gsa/gsa-22.7.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_NODE_N="node-modules"
+MY_NODE_D="node_modules"
+MY_NODE_PV="${PV}"
+
+DESCRIPTION="Greenbone Security Assistant"
+HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gsa"
+SRC_URI="
+	https://github.com/greenbone/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/greenbone/${PN}/releases/download/v${PV}/${PN}-${MY_NODE_N}-${PV}.tar.xz
+"
+
+SLOT="0"
+LICENSE="AGPL-3+"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	>=net-libs/nodejs-14.0.0[ssl]
+	>=sys-apps/yarn-1.15.2
+"
+
+MY_NODE_DIR="${S}/${MY_NODE_D}/"
+
+src_prepare() {
+	default
+	# We will use pre-generated npm stuff.
+	mv "${WORKDIR}/${MY_NODE_D}" "${MY_NODE_DIR}" || die "couldn't move node_modules"
+
+	# Make SVGR not traverse the path up to / looking for a
+	# configuration file. Fixes
+	# Error: EACCES: permission denied, open '/.config/svgrrc'
+	# in case a directory /.config exists, see https://bugs.gentoo.org/909731
+	echo "runtimeConfig: false" > .svgrrc.yml || die
+}
+
+src_compile() {
+	# setting correct PATH for finding react-js
+	NODE_ENV=production PATH="${PATH}:${MY_NODE_DIR}/.bin/" \
+			yarn --offline build || die
+}
+
+src_install() {
+	insinto "usr/share/gvm/gsad/web"
+	doins -r build/*
+}
diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest
index e9abc90fc9bc..29e6cccb32ad 100644
--- a/x11-wm/metacity/Manifest
+++ b/x11-wm/metacity/Manifest
@@ -1 +1,2 @@
 DIST metacity-3.46.1.tar.xz 1959060 BLAKE2B 84dbe09dd8d6c7ce1894ed806cdc6cc5cc6c302ddf3aae5f7ef479f6c02ef6c2091bb1d815603f5d6e52d583192d43f47d835327e9e75cd626081becbf84bd8e SHA512 f0d8424868edf8209eb4cbd003de68ab892a5b515a1aca7b3626bf52eb8451cb0477ab35f702177c9654604e06adce46471897edcb54931d95e60b36bef92b20
+DIST metacity-3.50.0.tar.xz 1959172 BLAKE2B a697bb0d820211abdd212a250d0ea6a698962b37b9e200c54dab51ca11bb1c9a65708dd8f098211d3d451da83f484d549f5fc33c63f391f42744a8046849ccd7 SHA512 2fd66f96b0603dfea652ad21f9749c3dbd68c847cda884a0e16f23766c9b61fcdfa693dcb83beb33c909487a7d9f7f5eb796096cfc772cc44c4b267ef1b08699
diff --git a/x11-wm/metacity/metacity-3.50.0.ebuild b/x11-wm/metacity/metacity-3.50.0.ebuild
new file mode 100644
index 000000000000..0076bb83bb0a
--- /dev/null
+++ b/x11-wm/metacity/metacity-3.50.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome2
+
+DESCRIPTION="GNOME Flashback window manager"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/metacity/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+libcanberra vulkan xinerama"
+KEYWORDS="~amd64 ~riscv"
+
+# TODO: libgtop could be optional, but no knob
+RDEPEND="
+	>=dev-libs/glib-2.67.3:2
+	>=x11-libs/gtk+-3.24.6:3[X]
+	>=x11-libs/pango-1.2.0
+	>=x11-libs/libXcomposite-0.3
+	>=x11-libs/libXres-1.2
+	>=gnome-base/gsettings-desktop-schemas-3.3.0
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXdamage
+	x11-libs/libXpresent
+	libcanberra? ( media-libs/libcanberra[gtk3] )
+	>=x11-libs/startup-notification-0.7
+	x11-libs/libXcursor
+	gnome-base/libgtop:2=
+	x11-libs/libX11
+	xinerama? ( x11-libs/libXinerama )
+	x11-libs/libXrandr
+	x11-libs/libXext
+	x11-libs/libICE
+	x11-libs/libSM
+	gnome-extra/zenity
+	vulkan? ( media-libs/vulkan-loader )
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	vulkan? ( dev-util/vulkan-headers )
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.6
+	virtual/pkgconfig
+" # autoconf-archive for eautoreconf
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable libcanberra canberra) \
+		$(use_enable xinerama) \
+		$(use_enable vulkan)
+}
diff --git a/x11-wm/metacity/metadata.xml b/x11-wm/metacity/metadata.xml
index e6d1a7d56ae1..fd3e818e1e88 100644
--- a/x11-wm/metacity/metadata.xml
+++ b/x11-wm/metacity/metadata.xml
@@ -5,6 +5,10 @@
     <email>gnome@gentoo.org</email>
     <name>Gentoo GNOME Desktop</name>
   </maintainer>
+  <maintainer type="person">
+    <email>flow@gentoo.org</email>
+    <name>Florian Schmaus</name>
+  </maintainer>
   <use>
     <flag name="libcanberra">Enable sound event support using <pkg>media-libs/libcanberra</pkg></flag>
     <flag name="vulkan">Enable Vulkan based compositor support via META_COMPOSITOR=vulkan environment variable</flag>