From c650f7cf611feaa59620fd8626e78108fa3b5e51 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Tue, 11 Oct 2022 19:38:57 +0100
Subject: gentoo auto-resync : 11:10:2022 - 19:38:57

---
 eclass/Manifest.gz            | Bin 37297 -> 37299 bytes
 eclass/ecm.eclass             |  13 ++++++++-----
 eclass/java-pkg-simple.eclass |  22 +++++++++++++---------
 3 files changed, 21 insertions(+), 14 deletions(-)

(limited to 'eclass')

diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 31c00b4c06bb..df1bdcc0178f 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 8febb9d22850..47992dbc86ca 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -247,7 +247,10 @@ case ${ECM_TEST} in
 		;;
 esac
 
-BDEPEND+=" >=kde-frameworks/extra-cmake-modules-${KFMIN}:${KFSLOT}"
+BDEPEND+="
+	dev-libs/libpcre2:*
+	>=kde-frameworks/extra-cmake-modules-${KFMIN}:${KFSLOT}
+"
 RDEPEND+=" >=kde-frameworks/kf-env-4"
 COMMONDEPEND+=" dev-qt/qtcore:${KFSLOT}"
 
@@ -325,10 +328,10 @@ _ecm_punt_kfqt_module() {
 	[[ ! -e "CMakeLists.txt" ]] && return
 
 	# FIXME: dep=WebKit will result in 'Widgets' over 'WebKitWidgets' (no regression)
-	pcregrep -Mni "(?s)find_package\s*\(\s*${prefix}(\d+|\\$\{\w*\})[^)]*?${dep}.*?\)" \
+	pcre2grep -Mni "(?s)find_package\s*\(\s*${prefix}(\d+|\\$\{\w*\})[^)]*?${dep}.*?\)" \
 		CMakeLists.txt > "${T}/bogus${dep}"
 
-	# pcregrep returns non-zero on no matches/error
+	# pcre2grep returns non-zero on no matches/error
 	[[ $? -ne 0 ]] && return
 
 	local length=$(wc -l "${T}/bogus${dep}" | cut -d " " -f 1)
@@ -386,10 +389,10 @@ ecm_punt_bogus_dep() {
 			-i CMakeLists.txt || die
 		return
 	else
-		pcregrep -Mni "(?s)find_package\s*\(\s*${prefix}[^)]*?${dep}.*?\)" CMakeLists.txt > "${T}/bogus${dep}"
+		pcre2grep -Mni "(?s)find_package\s*\(\s*${prefix}[^)]*?${dep}.*?\)" CMakeLists.txt > "${T}/bogus${dep}"
 	fi
 
-	# pcregrep returns non-zero on no matches/error
+	# pcre2grep returns non-zero on no matches/error
 	if [[ $? -ne 0 ]] ; then
 		return
 	fi
diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass
index 7a9582393dd4..abac18ca03f8 100644
--- a/eclass/java-pkg-simple.eclass
+++ b/eclass/java-pkg-simple.eclass
@@ -415,15 +415,6 @@ java-pkg-simple_src_compile() {
 	fi
 
 	# package
-	[[ ! -d ${classes}/META-INF ]] && mkdir ${classes}/META-INF
-	if  [[ -v JAVA_AUTOMATIC_MODULE_NAME ]]; then
-		echo "Automatic-Module-Name: ${JAVA_AUTOMATIC_MODULE_NAME}" \
-			>> ${classes}/META-INF/MANIFEST.MF || die "adding module name failed"
-	fi
-	if  [[ -v JAVA_MAIN_CLASS ]]; then
-		echo "Main-Class: ${JAVA_MAIN_CLASS}" \
-			>> ${classes}/META-INF/MANIFEST.MF || die "adding main class failed"
-	fi
 	local jar_args
 	if [[ -e ${classes}/META-INF/MANIFEST.MF ]]; then
 		jar_args="cfm ${JAVA_JAR_FILENAME} ${classes}/META-INF/MANIFEST.MF"
@@ -431,6 +422,19 @@ java-pkg-simple_src_compile() {
 		jar_args="cf ${JAVA_JAR_FILENAME}"
 	fi
 	jar ${jar_args} -C ${classes} . || die "jar failed"
+	if  [[ -n "${JAVA_AUTOMATIC_MODULE_NAME}" ]]; then
+		echo "Automatic-Module-Name: ${JAVA_AUTOMATIC_MODULE_NAME}" \
+			>> "${T}/add-to-MANIFEST.MF" || die "adding module name failed"
+	fi
+	if  [[ -n "${JAVA_MAIN_CLASS}" ]]; then
+		echo "Main-Class: ${JAVA_MAIN_CLASS}" \
+			>> "${T}/add-to-MANIFEST.MF" || die "adding main class failed"
+	fi
+	if [[ -f "${T}/add-to-MANIFEST.MF" ]]; then
+		jar ufmv ${JAVA_JAR_FILENAME} "${T}/add-to-MANIFEST.MF" \
+			|| die "updating MANIFEST.MF failed"
+		rm -f "${T}/add-to-MANIFEST.MF" || die "cannot remove"
+	fi
 }
 
 # @FUNCTION: java-pkg-simple_src_install
-- 
cgit v1.2.3