Version bump, remove old/broken. Should install all files, bug #236411, thank Dan Johnston for report. Dropped access_restrict patch - let administrator decide what to restrict, fixes bug #236872, thank Michael Mair-Keimberger for report.

(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 i686)

5 files changed, 209 insertions, 255 deletions

diff --git a/www-apps/mediawiki/ChangeLog b/www-apps/mediawiki/ChangeLog
index 5632fb58869d..7d813c429bf9 100644
--- a/www-apps/mediawiki/ChangeLog
+++ b/www-apps/mediawiki/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for www-apps/mediawiki
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.110 2008/09/01 07:47:36 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.111 2008/09/29 06:38:47 pva Exp $
+
+*mediawiki-1.13.1 (29 Sep 2008)
+
+  29 Sep 2008; Peter Volkov <pva@gentoo.org> +files/postinstall-1.13-en.txt,
+  +files/postupgrade-1.13-en.txt, -mediawiki-1.11.1.ebuild,
+  -mediawiki-1.13.0.ebuild, +mediawiki-1.13.1.ebuild:
+  Version bump, remove old/broken. Should install all files, bug #236411,
+  thank Dan Johnston for report. Dropped access_restrict patch - let
+  administrator decide what to restrict, fixes bug #236872, thank Michael
+  Mair-Keimberger for report.
 
 *mediawiki-1.13.0 (01 Sep 2008)
 
diff --git a/www-apps/mediawiki/files/postinstall-1.13-en.txt b/www-apps/mediawiki/files/postinstall-1.13-en.txt
new file mode 100644
index 000000000000..4fbc24755714
--- /dev/null
+++ b/www-apps/mediawiki/files/postinstall-1.13-en.txt
@@ -0,0 +1,88 @@
+To complete installation you need to proceed the following steps:
+=================================================================
+
+1. Temporarily make the MediaWiki config/ directory writable to the user the
+web server is running as. The quickest way is to make the directory world
+writable. For example:
+
+$ cd ${MY_INSTALLDIR}
+$ chmod a+w config
+
+
+2. Configure database.
+a.) If you know the root password on your database, the MediaWiki installation
+script can create a new database for you.
+
+b.) If you don't know the root password, MediaWiki still needs database to
+work with. So, please, read the following link and find solution which suits
+your needs best:
+
+http://www.mediawiki.org/wiki/Manual:Installing_MediaWiki#Create_a_database
+
+
+3. Now continue the installation through web browser by accessing the
+following page:
+
+lynx http://${VHOST_HOSTNAME}${VHOST_APPDIR}/config/
+ 
+
+4. After the setup script has finished running successfully, a file called
+LocalSettings.php is created in the "config" directory. Move this file to the
+root wiki directory (${MY_INSTALLDIR}):
+
+$ mv config/LocalSettings.php .
+
+Set stringent permissions on the LocalSettings.php file:
+
+$ chown <webserver-user>:root LocalSettings.php
+$ chmod 600 LocalSettings.php
+
+And delete the "config" directory:
+
+$ rm -rf config
+
+
+5. Once you have done the above, your wiki should be ready to use!
+
+http://${VHOST_HOSTNAME}${VHOST_APPDIR}/
+ 
+
+Enabling Optional Features and other configuration
+==================================================
+
+Allow images and other files to be uploaded through the wiki
+------------------------------------------------------------
+
+If you wish to enable images and other files to be uploaded through wiki then
+edit the LocalSettings.php file and set \$wgEnableUploads to 'true':
+
+\$wgEnableUploads       = true;
+
+Now if MediaWiki was built with the imagemagick USE-flag the directory
+permissions are correct, otherwise install ImageMagick and adjust permissions
+on the images directory to allow the web server to write. For example:
+ 
+$ chown <webserver-user>:<webserver-group> ${MY_INSTALLDIR}/images
+
+IMPORTANT: Uploads need to be set up properly in order to be secure! For more
+details take a look at the following page:
+
+http://www.mediawiki.org/wiki/Manual:$wgEnableUploads
+
+
+Math Support
+------------
+
+If you wish to enable the math support then you need to build MediaWiki with
+'math' USE-flag enabled or required support executable will no be present.
+After you've installed MediaWiki with math USE-flag enabled edit
+LocalSettings.php file to set the \$wgUseTeX to 'true':
+
+\$wgUseTeX           = true;
+
+
+Other
+-----
+
+For other tweaks, continue with the following:
+http://www.mediawiki.org/wiki/Manual:Installing_MediaWiki#See_also
diff --git a/www-apps/mediawiki/files/postupgrade-1.13-en.txt b/www-apps/mediawiki/files/postupgrade-1.13-en.txt
new file mode 100644
index 000000000000..00d16a8e869c
--- /dev/null
+++ b/www-apps/mediawiki/files/postupgrade-1.13-en.txt
@@ -0,0 +1,49 @@
+These instructions help you to upgrade your mediawiki installation.
+
+Please NOTE: at this point it is supposed that you've already read
+RELEASE-NOTES and done full wiki backup, as described here:
+http://www.mediawiki.org/wiki/Manual:Backing_up_a_wiki
+
+
+Run the update script
+=====================
+
+Note: Make sure there's an AdminSettings.php file in the wiki root, and it
+contains up to date information. The user needs full permissions (shell
+access) on the database. If there is no AdminSettings.php, create it:
+
+$ cd ${MY_INSTALLDIR}
+$ cp AdminSettings.sample AdminSettings.php
+
+Now edit AdminSettings.php.
+
+The preferred method of performing the update is using the command-line
+maintenance script, although it is also possible to re-run the web-based
+installer. To run command-line maintenance script, change to the maintenance
+directory and execute the update script:
+
+$ cd ${MY_INSTALLDIR}/maintenance
+$ php update.php
+
+MediaWiki will inspect the existing schema and update it to work with the new
+code, adding tables and columns as needed.
+
+For alternative ways to upgrade your wiki, please, take a look at:
+http://www.mediawiki.org/wiki/Manual:Upgrading
+
+
+Upgrade extensions
+==================
+
+Certain extensions have been updated in order to work with MediaWiki 1.13. Be
+sure to upgrade to the latest versions of such extensions. You might need to
+perform manual updates to custom extensions.
+
+
+Test the update
+===============
+
+Once the upgrade has completed, browse to the wiki and check basics such as
+viewing and editing pages to ensure things still work as expected.
+
+Visit Special:Version and check that the version shown is correct.
diff --git a/www-apps/mediawiki/mediawiki-1.11.1.ebuild b/www-apps/mediawiki/mediawiki-1.11.1.ebuild
deleted file mode 100644
index d5f70eaa16f9..000000000000
--- a/www-apps/mediawiki/mediawiki-1.11.1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.11.1.ebuild,v 1.8 2008/09/01 07:47:36 hollow Exp $
-
-EAPI="1"
-inherit webapp depend.php versionator eutils
-
-MY_BRANCH=$(get_version_component_range 1-2)
-
-DESCRIPTION="The MediaWiki wiki web application (as used on wikipedia.org)"
-HOMEPAGE="http://www.mediawiki.org"
-SRC_URI="http://download.wikimedia.org/mediawiki/${MY_BRANCH}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="imagemagick math mysql postgres restrict +ocamlopt"
-
-DEPEND="math? ( >=dev-lang/ocaml-3.0.6 )"
-RDEPEND="${DEPEND}
-	math? (
-		app-text/dvipng
-		virtual/tex-base
-		virtual/ghostscript
-		media-gfx/imagemagick
-	)
-	imagemagick? ( media-gfx/imagemagick )"
-
-RESTRICT="test"
-
-need_httpd_cgi
-need_php_httpd
-
-pkg_setup() {
-	webapp_pkg_setup
-	local flags="pcre session xml"
-	use mysql && flags="${flags} mysql"
-	use postgres && flags="${flags} postgres"
-	if ! PHPCHECKNODIE="yes" require_php_with_use ${flags} || \
-		! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external ; then
-			die "Re-install ${PHP_PKG} with ${flags} and either gd or gd-external"
-	fi
-
-	# see Bug 204812
-	if use ocamlopt && use math && ! built_with_use --missing true dev-lang/ocaml ocamlopt; then
-		eerror "In order to build ${PN} with native code support from ocaml"
-		eerror "You first need to have a native code ocaml compiler."
-		eerror "You need to install dev-lang/ocaml with ocamlopt useflag on."
-		die "Please install ocaml with ocamlopt useflag"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# XXX: besides, is/was this patch really that required? if so, why? (trapni)
-#	epatch ${FILESDIR}/jobindexlength-mysql.patch
-
-	if use restrict ; then
-		epatch "${FILESDIR}/access_restrict.patch"
-	fi
-}
-
-src_compile() {
-	if use math; then
-		einfo "Compiling math support"
-		cd math || die
-		if ! use ocamlopt; then
-			sed -i -e "s/ocamlopt/ocamlc/" Makefile
-			sed -i -e "s/cmxa/cma/" Makefile
-			sed -i -e "s/cmx/cmo/g" Makefile
-		fi
-		emake || die
-	else
-		einfo "No math support enabled. Skipping."
-	fi
-
-	# TODO: think about includes/zhtable/ support
-}
-
-src_install() {
-	webapp_src_preinst
-
-	# copy the app's main files excluding math support, docs, and tests
-	local DIRS=(
-		"bin"
-		"config"
-		"extensions"
-		"images"
-		"includes"
-		"includes/api"
-		"includes/cbt"
-		"includes/filerepo"
-		"includes/media"
-		"includes/normal"
-		"includes/templates"
-		"includes/zhtable"
-		"languages"
-		"languages/classes"
-		"languages/messages"
-		"locale"
-		"maintenance"
-		"maintenance/archives"
-		"maintenance/dtrace"
-		"maintenance/language"
-		"maintenance/ora"
-		"maintenance/postgres"
-		"maintenance/postgres/archives"
-		"maintenance/storage"
-		"serialized"
-		"skins"
-		"skins/chick"
-		"skins/common"
-		"skins/common/images"
-		"skins/common/images/icons"
-		"skins/disabled"
-		"skins/htmldump"
-		"skins/monobook"
-		"skins/myskin"
-		"skins/simple"
-	)
-
-	insinto ${MY_HTDOCSDIR}
-	doins *.php *.inc *.phtml
-	for DIR in ${DIRS[*]}; do
-		insinto ${MY_HTDOCSDIR}/${DIR}
-		doins ${DIR}/*
-		[[ -f ${DIR}/.htaccess ]] && doins ${DIR}/.htaccess
-	done
-
-	# installing some docs
-	local DOCS="AdminSettings.sample FAQ HISTORY INSTALL README RELEASE-NOTES UPGRADE"
-	dodoc ${DOCS} docs/*.txt
-	rm -f ${DOCS} COPYING docs/*.txt
-
-	docinto php-memcached
-	dodoc docs/php-memcached/*
-
-	# If imagemagick is enabled then setup for image upload.
-	# We ensure the directory is prepared for writing.  The post-
-	# install instructions guide the user to enable the feature.
-	if use imagemagick; then
-		webapp_serverowned ${MY_HTDOCSDIR}/images
-	fi
-
-	# If we've enabled math USE-flag, install math support.
-	# We ensure the directories are prepared for writing.  The post-
-	# install instructions guide the user to enable the feature.
-	if use math; then
-		einfo "Installing math support"
-		exeinto ${MY_HTDOCSDIR}/math
-		doexe math/texvc
-
-		# Docs
-		docinto math
-		dodoc math/{README,TODO}
-
-		# Working directories.  Server writeable.
-		dodir ${MY_HTDOCSDIR}/images/math
-		webapp_serverowned ${MY_HTDOCSDIR}/images/math
-		dodir ${MY_HTDOCSDIR}/images/tmp
-		webapp_serverowned ${MY_HTDOCSDIR}/images/tmp
-	fi
-
-	webapp_postinst_txt en "${FILESDIR}/postinstall-1.11-en.txt"
-	webapp_src_install
-}
diff --git a/www-apps/mediawiki/mediawiki-1.13.0.ebuild b/www-apps/mediawiki/mediawiki-1.13.1.ebuild
index 67b5212625b8..2321b05ec936 100644
--- a/www-apps/mediawiki/mediawiki-1.13.0.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.13.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.13.0.ebuild,v 1.1 2008/09/01 07:47:36 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.13.1.ebuild,v 1.1 2008/09/29 06:38:47 pva Exp $
 
 EAPI="1"
 inherit webapp depend.php versionator eutils
@@ -13,7 +13,7 @@ SRC_URI="http://download.wikimedia.org/mediawiki/${MY_BRANCH}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="imagemagick math mysql postgres restrict +ocamlopt"
+IUSE="imagemagick math mysql postgres +ocamlopt"
 
 DEPEND="math? ( >=dev-lang/ocaml-3.0.6 )"
 RDEPEND="${DEPEND}
@@ -49,119 +49,93 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# XXX: besides, is/was this patch really that required? if so, why? (trapni)
-#	epatch ${FILESDIR}/jobindexlength-mysql.patch
-
-	if use restrict ; then
-		epatch "${FILESDIR}/access_restrict_${PV}.patch"
-	fi
-}
-
 src_compile() {
 	if use math; then
 		einfo "Compiling math support"
 		cd math || die
 		if ! use ocamlopt; then
-			sed -i -e "s/ocamlopt/ocamlc/" Makefile
-			sed -i -e "s/cmxa/cma/" Makefile
-			sed -i -e "s/cmx/cmo/g" Makefile
+			sed -e "s/ocamlopt/ocamlc/" \
+				-e "s/cmxa/cma/" \
+				-e "s/cmx/cmo/g" -i Makefile || die
 		fi
 		emake || die
 	else
 		einfo "No math support enabled. Skipping."
 	fi
 
-	# TODO: think about includes/zhtable/ support
+	# TODO: 1. think about includes/zhtable/ support
+	# 2. generate docs (?): echo '0' | php mwdocgen.php
 }
 
 src_install() {
 	webapp_src_preinst
 
-	# copy the app's main files excluding math support, docs, and tests
-	local DIRS=(
-		"bin"
-		"config"
-		"extensions"
-		"images"
-		"includes"
-		"includes/api"
-		"includes/cbt"
-		"includes/filerepo"
-		"includes/media"
-		"includes/normal"
-		"includes/templates"
-		"includes/zhtable"
-		"languages"
-		"languages/classes"
-		"languages/messages"
-		"locale"
-		"maintenance"
-		"maintenance/archives"
-		"maintenance/dtrace"
-		"maintenance/language"
-		"maintenance/ora"
-		"maintenance/postgres"
-		"maintenance/postgres/archives"
-		"maintenance/storage"
-		"serialized"
-		"skins"
-		"skins/chick"
-		"skins/common"
-		"skins/common/images"
-		"skins/common/images/icons"
-		"skins/disabled"
-		"skins/htmldump"
-		"skins/monobook"
-		"skins/myskin"
-		"skins/simple"
-	)
-
-	insinto ${MY_HTDOCSDIR}
-	doins *.php *.inc *.phtml
-	for DIR in ${DIRS[*]}; do
-		insinto ${MY_HTDOCSDIR}/${DIR}
-		doins ${DIR}/*
-		[[ -f ${DIR}/.htaccess ]] && doins ${DIR}/.htaccess
-	done
-
-	# installing some docs
-	local DOCS="AdminSettings.sample FAQ HISTORY INSTALL README RELEASE-NOTES UPGRADE"
-	dodoc ${DOCS} docs/*.txt
-	rm -f ${DOCS} COPYING docs/*.txt
-
-	docinto php-memcached
-	dodoc docs/php-memcached/*
-
-	# If imagemagick is enabled then setup for image upload.
-	# We ensure the directory is prepared for writing.  The post-
-	# install instructions guide the user to enable the feature.
-	if use imagemagick; then
-		webapp_serverowned ${MY_HTDOCSDIR}/images
-	fi
+	# First we install math, docs and then copy everything left into htdocs dir
+	# to avoid bugs like #236411.
 
 	# If we've enabled math USE-flag, install math support.
 	# We ensure the directories are prepared for writing.  The post-
 	# install instructions guide the user to enable the feature.
 	if use math; then
 		einfo "Installing math support"
-		exeinto ${MY_HTDOCSDIR}/math
-		doexe math/texvc
+		exeinto "${MY_HTDOCSDIR}"/math
+		doexe math/texvc || die "Failed to create math support executable."
 
-		# Docs
 		docinto math
 		dodoc math/{README,TODO}
+		docinto ""
 
 		# Working directories.  Server writeable.
-		dodir ${MY_HTDOCSDIR}/images/math
-		webapp_serverowned ${MY_HTDOCSDIR}/images/math
-		dodir ${MY_HTDOCSDIR}/images/tmp
-		webapp_serverowned ${MY_HTDOCSDIR}/images/tmp
+		dodir "${MY_HTDOCSDIR}"/images/math
+		webapp_serverowned "${MY_HTDOCSDIR}"/images/math
+		dodir "${MY_HTDOCSDIR}"/images/tmp
+		webapp_serverowned "${MY_HTDOCSDIR}"/images/tmp
+	fi
+
+	local DOCS="FAQ HISTORY INSTALL README RELEASE-NOTES UPGRADE"
+	dodoc ${DOCS} docs/*.txt
+	docinto php-memcached
+	dodoc docs/php-memcached/*
+
+	# Clean everything not used at the site...
+	rm -rf ${DOCS} COPYING tests math t docs
+	find . -name Makefile -delete
+	# and install
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	# If imagemagick is enabled then setup for image upload.
+	# We ensure the directory is prepared for writing.
+	if use imagemagick; then
+		webapp_serverowned "${MY_HTDOCSDIR}"/images
 	fi
 
-	webapp_postinst_txt en "${FILESDIR}/postinstall-1.11-en.txt"
+	webapp_postinst_txt en "${FILESDIR}/postinstall-1.13-en.txt"
+	webapp_postupgrade_txt en "${FILESDIR}/postupgrade-1.13-en.txt"
 	webapp_src_install
 }
+
+pkg_preinst() {
+	prev_instal="false"
+	if has_version ${CATEGORY}/${PN}; then
+		prev_instal="true"
+	fi
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+	if ${prev_instal}; then
+		einfo
+		elog "=== Consult the release notes ==="
+		elog "Before doing anything, stop and consult the release notes"
+		elog "/usr/share/doc/${PF}/RELEASE-NOTES.bz2"
+		elog
+		elog "These detail bug fixes, new features and functionality, and any"
+		elog "particular points that may need to be noted during the upgrade procedure."
+		einfo
+		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."
+		einfo
+	fi
+}