Version bump to the latest stable release (fixes bug #332745, thanks to Tobias Margitan for reporting and William Cooke for patches). Add sqlite3 USE flag, replace remaining pkg_setup use flag check with use dependencies, and add new postupgrade instructions since a few variables are set in LocalSettings.php instead of using AdminSettings.php.

Package-Manager: portage-2.2_rc90/cvs/Linux x86_64

4 files changed, 192 insertions, 9 deletions

diff --git a/www-apps/mediawiki/ChangeLog b/www-apps/mediawiki/ChangeLog
index 4bcf4fec0a3e..9cdb937cb101 100644
--- a/www-apps/mediawiki/ChangeLog
+++ b/www-apps/mediawiki/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for www-apps/mediawiki
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.139 2010/10/09 21:05:44 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.140 2010/10/09 21:30:45 radhermit Exp $
+
+*mediawiki-1.16.0 (09 Oct 2010)
+
+  09 Oct 2010; Tim Harder <radhermit@gentoo.org> +mediawiki-1.16.0.ebuild,
+  +files/postupgrade-1.16-en.txt:
+  Version bump to the latest stable release (fixes bug #332745, thanks to
+  Tobias Margitan for reporting and William Cooke for patches). Add sqlite3
+  USE flag, replace remaining pkg_setup use flag check with use
+  dependencies, and add new postupgrade instructions since a few variables
+  are set in LocalSettings.php instead of using AdminSettings.php.
 
   09 Oct 2010; Tim Harder <radhermit@gentoo.org> mediawiki-1.15.5.ebuild:
   Call webapp_pkg_setup first in pkg_setup.
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index 82d6de0ab801..d31707d439a5 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -7,22 +7,25 @@ AUX jobindexlength-mysql.patch 392 RMD160 a6031a663b1a4af2d15d1cb2ba7b659fe813a1
 AUX postinstall-1.11-en.txt 2502 RMD160 a72826f3b8e4b6461c50227d4db5ec5da79e710d SHA1 1dc394d76537ce7b24601bb63ec1ef7f2e49ad7f SHA256 d88c989eac3d99fec4c057eb89ec04a05aabfc57b6503b8da7843bfbc730daf4
 AUX postinstall-1.13-en.txt 2751 RMD160 4f6c918bc1b897ed017ab8129a6d5387e982e07a SHA1 a4afb248ab7cb7abe25aa9d69533a7fd52401d73 SHA256 cebfe53c219cd6acacffcf0ed24493c0aa3180c89fa954e4a7e458dd0feb62c9
 AUX postupgrade-1.13-en.txt 1651 RMD160 aaae13a05a0984dfb327b9b5e2c6faa0d3c0c037 SHA1 a97fb9f33d964a795ec159df0628e1897b12e257 SHA256 be7ed53ebce19077a55ce3fbd7eafca7843fffc0c5e821549a4e2e1db9c560bf
+AUX postupgrade-1.16-en.txt 1512 RMD160 362daf6f25f8a1497209426751aedd4cf78796c7 SHA1 d86a1f9097b4809f3f295e3784d4c4baf79936b6 SHA256 d45dd49ecfd27f3dee9296925befbf334437035e311c985db78ac6132b990877
 DIST mediawiki-1.14.1.tar.gz 10359679 RMD160 d4506627c48b95341cb72823080c34fcd9b704bc SHA1 7248752cf937f4c14750bf12eb30736ba060cc17 SHA256 0c41845e069ce1f3a716892e6c8e529ee7a112a7f9e50ec2a9c9c6b34d0ba690
 DIST mediawiki-1.15.2.tar.gz 11469228 RMD160 46171059799d5a74b535523f562d3a5db7066f55 SHA1 c1e7e7243a052f3f9719f78573980c16f25da4b2 SHA256 6b1e5f6d385214853452f36331aa952523bd40fc2765761d9788b827cfc5b704
 DIST mediawiki-1.15.5.tar.gz 11595008 RMD160 5113beb1df46c56275a90d5a1cb85c2b01ca541f SHA1 b157fe37bb89c78e5ffa0f27b14beb886db3a5f4 SHA256 f838c94af81e018dcf11f77674d2a363e97b8832d0d66416294fd301db720ab5
+DIST mediawiki-1.16.0.tar.gz 12647934 RMD160 dc65164fd92bdfbc22992652cd31789d08527936 SHA1 41d6dc0530eb00fd96f48690b8d7041d2b7fd7f3 SHA256 81abaf3393cfbffb464f9c2da8c091983b49bbbb09d156669b443042cd48ac92
 EBUILD mediawiki-1.14.1.ebuild 4118 RMD160 d085d5a25fa72f69d90aafe74ede22c1b41216a2 SHA1 b5ed1ebbbac9922754a6f4ca8d2d58d72006254d SHA256 bae459188d79c3c5bd126e33be4a57753d8faf0847c3a8ccf9dc89796c680676
 EBUILD mediawiki-1.15.2.ebuild 4117 RMD160 17385de26d61fc83f93e371b3511222222bc22a6 SHA1 75de4dd65baa435b74bb36182a2ead48215f44ad SHA256 5544bdc1ff3ee84d55f3b31de182a69e6fde46b1ffe9a33116e0eaf8696ae8ef
 EBUILD mediawiki-1.15.5.ebuild 3700 RMD160 863141e9bcaf8a307bfeadb751e0c66cd3854814 SHA1 921fe261f608616374f9c112997b37aaa8fa88d5 SHA256 4b2318352d72b1137ac6d353f92cb7cb324a9445f3f37220d8d4d134012259fb
-MISC ChangeLog 24017 RMD160 e08f84fda76899dd5c84c3e5e4bb6f057b7d327a SHA1 f6c908a9d2c813a9c427b9bb2a17385ee10a8a7b SHA256 f6bbe625671f11f6caab81656b9e6ae4b84deac796580b28edac12d003106e3b
+EBUILD mediawiki-1.16.0.ebuild 3615 RMD160 8629b5e8234f7c806b611aa7a6f41067cd1024af SHA1 c67a6c4c004e8a138fc4c8a785387ddfe6862cf3 SHA256 fc9d23adc94715a2122c7c4e17e2bd6230b33bc969453c37650865c8f9a88f05
+MISC ChangeLog 24516 RMD160 5955aeba2a7e4be300bacbfdc331a2d4a2b694db SHA1 2a6b4e4e65dcfa5e799b1270b659d8e8d5a49831 SHA256 53faef7ea9a3e715766c7ebe07d67ba5b99629c3ed608b7855a1ec3c6448b595
 MISC metadata.xml 295 RMD160 0e99ed39b17f196d96fa661725f18447202c793a SHA1 3d63cc41895a26fde229f1394541cf6792fbc016 SHA256 ac52057208794d9f818ca0f56f292885eac738678c8fcdf56e099e98ce953593
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQEcBAEBAgAGBQJMsNkuAAoJEEqz6FtPBkyjR1EH/00WD8QfkRPqexnLWn/H3UY8
-0ZqJ04CADDKVhSkveo6+gQIKeK1Ct31ob4yyil3fimXQLLutSHol80Tpi1L1VYcb
-7kBeIjpnDl0RaTufNmyxGb0VSha+CmhnHaXNJSAV2ZoamAl1mCBsBudlg7Od8PQa
-DVjibMDl4mzjUmTFQS5vwO33057WPM21kIjBzdVoH19pmRSqi/tQ4mWFDTN+9cjh
-z2JoPAzEhQLYiWLYF+oSuo1D/NsFPE2zWZo4mYi3LL9gB80JRfIp33/9sWx5maMk
-+pqN63otbjRX6Yqdv7Xxcun3z0mjCROg7bym8jfd3tlQvkzUwyWiYkuCXdHDGpQ=
-=kt/2
+iQEcBAEBAgAGBQJMsN8PAAoJEEqz6FtPBkyjkMgIAJoTY3TPnAIkdooCCamgHHjW
+tJPtA8e7N7wdaro60lBe5DmfQjwY0S/uMxATFQ26JhhmV092QMIxF8UGFMhFya6g
+eBpkxW4QdM+bJUToUvug4Ac316wo7Mb1drgdEH9S64lc0O8Tp5St+KN32I976Gkf
+todxdQtf2/eR9Bwbm9T+qSeNhP3yu6OGsxibj8l6mu0rK2GOnpQSpPaR9fwaekI4
+KS7dYd2Qg8oE1KWjMuiJKd0QW2TMKhaie3uVgWnDFm5L4VNb3TTGowzEwOpXsBdp
+QS4Y5d7aadVgVCZkj24hNaymmkpyzWue+k7hCey3A1f+gr3UTJEjiTHuP+by690=
+=rZvb
 -----END PGP SIGNATURE-----
diff --git a/www-apps/mediawiki/files/postupgrade-1.16-en.txt b/www-apps/mediawiki/files/postupgrade-1.16-en.txt
new file mode 100644
index 000000000000..ebf6f713ea97
--- /dev/null
+++ b/www-apps/mediawiki/files/postupgrade-1.16-en.txt
@@ -0,0 +1,44 @@
+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 $wgDBadminusr and $wgDBadminpassword is set in your
+LocalSettings.php file in your wiki root. The user needs full permissions
+(shell access) on the database.
+
+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.16.0.ebuild b/www-apps/mediawiki/mediawiki-1.16.0.ebuild
new file mode 100644
index 000000000000..84aa7f7181c9
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.16.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.16.0.ebuild,v 1.1 2010/10/09 21:30:45 radhermit Exp $
+
+EAPI="3"
+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="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="imagemagick math mysql postgres +ocamlopt sqlite3"
+
+DEPEND="math? ( >=dev-lang/ocaml-3.0.6[ocamlopt?] )"
+RDEPEND="${DEPEND}
+	math? (
+		app-text/dvipng
+		virtual/tex-base
+		app-text/ghostscript-gpl
+		media-gfx/imagemagick
+	)
+	imagemagick? ( media-gfx/imagemagick )
+	|| ( <dev-lang/php-5.3[mysql?,pcre,postgres?,session,spl,xml]
+		>=dev-lang/php-5.3[mysql?,postgres?,session,xml] )
+	|| ( dev-lang/php[gd] dev-lang/php[gd-external] )
+	sqlite3? ( >=dev-db/sqlite-3.6[fts3] )"
+
+RESTRICT="test"
+
+need_httpd_cgi
+need_php_httpd
+
+src_compile() {
+	if use math; then
+		einfo "Compiling math support"
+		cd math || die
+		if ! use ocamlopt; then
+			sed -e "s/ocamlopt/ocamlc/" \
+				-e "s/cmxa/cma/" \
+				-e "s/cmx/cmo/g" -i Makefile || die
+		fi
+		emake || die
+	else
+		einfo "Math support not enabled. Skipping."
+	fi
+
+	# TODO: 1. think about includes/zhtable/ support
+	# 2. generate docs (?): echo '0' | php mwdocgen.php
+}
+
+src_install() {
+	webapp_src_preinst
+
+	# 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 || die "Failed to create math support executable."
+
+		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
+	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.13-en.txt"
+	webapp_postupgrade_txt en "${FILESDIR}/postupgrade-1.16-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
+}