commit:     c24263bda58c554326c0671286175874592c27b6
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 29 06:43:15 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Sep 29 06:43:33 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c24263bd

www-apps/mediawiki: fixed removal of files

Closes: https://bugs.gentoo.org/913416
Closes: https://bugs.gentoo.org/913417
Closes: https://bugs.gentoo.org/913418
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../{mediawiki-1.39.4.ebuild => mediawiki-1.39.4-r1.ebuild}    |  8 ++++++--
 .../{mediawiki-1.40.0.ebuild => mediawiki-1.40.0-r1.ebuild}    | 10 ++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/www-apps/mediawiki/mediawiki-1.39.4.ebuild 
b/www-apps/mediawiki/mediawiki-1.39.4-r1.ebuild
similarity index 86%
rename from www-apps/mediawiki/mediawiki-1.39.4.ebuild
rename to www-apps/mediawiki/mediawiki-1.39.4-r1.ebuild
index 84b2ab5eeb78..1c2f607e938e 100644
--- a/www-apps/mediawiki/mediawiki-1.39.4.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.39.4-r1.ebuild
@@ -33,7 +33,7 @@ src_unpack() {
        default
 
        # remove lua binaries (bug #631554)
-       rm -fr 
"${S}"/extensions/Scribunto/includes/engines/LuaStandalone/binaries || die 
"Failed to remove lua binaries"
+       rm -r 
"${S}"/extensions/Scribunto/includes/engines/LuaStandalone/binaries || die 
"Failed to remove lua binaries"
 }
 
 src_install() {
@@ -49,7 +49,7 @@ src_install() {
        docinto databases
        dodoc docs/databases/*
        # Clean everything not used at the site...
-       rm -rf ${DOCS} COPYING tests docs || die
+       rm -r ${DOCS} COPYING tests docs || die
        find . -name Makefile -delete || die
        # and install
        insinto "${MY_HTDOCSDIR}"
@@ -78,6 +78,10 @@ pkg_postinst() {
                elog "These detail bug fixes, new features and functionality, 
and any"
                elog "particular points that may need to be noted during the 
upgrade procedure."
                echo
+               elog "If you plan to use the Scribunto extension with Lua, make 
sure to configure"
+               elog "path to Lua executable using this documentation:"
+               elog 
"https://www.mediawiki.org/wiki/Extension:Scribunto#Lua_binary";
+               echo
                ewarn "Back up existing files and the database before upgrade."
                ewarn "http://www.mediawiki.org/wiki/Manual:Backing_up_a_wiki";
                ewarn "provides an overview of the backup process."

diff --git a/www-apps/mediawiki/mediawiki-1.40.0.ebuild 
b/www-apps/mediawiki/mediawiki-1.40.0-r1.ebuild
similarity index 86%
rename from www-apps/mediawiki/mediawiki-1.40.0.ebuild
rename to www-apps/mediawiki/mediawiki-1.40.0-r1.ebuild
index 84b2ab5eeb78..d8047a894f10 100644
--- a/www-apps/mediawiki/mediawiki-1.40.0.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.40.0-r1.ebuild
@@ -33,7 +33,7 @@ src_unpack() {
        default
 
        # remove lua binaries (bug #631554)
-       rm -fr 
"${S}"/extensions/Scribunto/includes/engines/LuaStandalone/binaries || die 
"Failed to remove lua binaries"
+       rm -r 
"${S}"/extensions/Scribunto/includes/Engines/LuaStandalone/binaries || die 
"Failed to remove Lua binaries"
 }
 
 src_install() {
@@ -48,9 +48,11 @@ src_install() {
        dodoc ${DOCS} docs/*.txt
        docinto databases
        dodoc docs/databases/*
+
        # Clean everything not used at the site...
-       rm -rf ${DOCS} COPYING tests docs || die
+       rm -r ${DOCS} COPYING tests docs || die
        find . -name Makefile -delete || die
+
        # and install
        insinto "${MY_HTDOCSDIR}"
        doins -r .
@@ -78,6 +80,10 @@ pkg_postinst() {
                elog "These detail bug fixes, new features and functionality, 
and any"
                elog "particular points that may need to be noted during the 
upgrade procedure."
                echo
+               elog "If you plan to use the Scribunto extension with Lua, make 
sure to configure"
+               elog "path to Lua executable using this documentation:"
+               elog 
"https://www.mediawiki.org/wiki/Extension:Scribunto#Lua_binary";
+               echo
                ewarn "Back up existing files and the database before upgrade."
                ewarn "http://www.mediawiki.org/wiki/Manual:Backing_up_a_wiki";
                ewarn "provides an overview of the backup process."

Reply via email to