[gentoo-commits] repo/gentoo:master commit in: eclass/

[Miroslav Šulc]

commit:     f9921e9eb94a060287dbedb71012c729fe5750b7
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun Feb 26 08:40:39 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Feb 27 08:28:55 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9921e9e

java-pkg-simple.eclass: MANIFEST.MF show Gentoo in "Created-By: "

Presently, MANIFEST.MF can receive upstream's "Created-By:" if such line
is found in a predefined META-INF/MANIFEST.MF in ${JAVA_RESOURCE_DIRS}.
This change removes such line before the jar command creates the final
MANIFEST.MF putting "Created-By: (Gentoo)"

Closes: https://bugs.gentoo.org/897786
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/29801
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 eclass/java-pkg-simple.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass
index abac18ca03f8..a1589b025617 100644
--- a/eclass/java-pkg-simple.eclass
+++ b/eclass/java-pkg-simple.eclass
@@ -1,4 +1,4 @@
-# Copyright 2004-2022 Gentoo Authors
+# Copyright 2004-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: java-pkg-simple.eclass
@@ -417,6 +417,7 @@ java-pkg-simple_src_compile() {
        # package
        local jar_args
        if [[ -e ${classes}/META-INF/MANIFEST.MF ]]; then
+               sed '/Created-By: /Id' -i ${classes}/META-INF/MANIFEST.MF
                jar_args="cfm ${JAVA_JAR_FILENAME} 
${classes}/META-INF/MANIFEST.MF"
        else
                jar_args="cf ${JAVA_JAR_FILENAME}"