Version bump, bug #261126 and bug #261128, thank Patrick for both reports.

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

4 files changed, 295 insertions, 12 deletions

diff --git a/www-apps/mediawiki/ChangeLog b/www-apps/mediawiki/ChangeLog
index 35ee50a704a3..5990475b14ab 100644
--- a/www-apps/mediawiki/ChangeLog
+++ b/www-apps/mediawiki/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/mediawiki
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.117 2009/01/01 23:13:27 keytoaster Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.118 2009/04/07 15:42:20 pva Exp $
+
+*mediawiki-1.14.0 (07 Apr 2009)
+*mediawiki-1.13.5 (07 Apr 2009)
+
+  07 Apr 2009; Peter Volkov <pva@gentoo.org> +mediawiki-1.13.5.ebuild,
+  +mediawiki-1.14.0.ebuild:
+  Version bump, bug #261126 and bug #261128, thank Patrick for both reports.
 
   01 Jan 2009; Tobias Heinlein <keytoaster@gentoo.org>
   mediawiki-1.13.3.ebuild:
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index d30e8f7e3de6..181578998a3d 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX access_restrict.patch 1240 RMD160 29e27a84951daf447da1ecba3e929e94d02e0fb1 SHA1 1ec89557c26b682b2550ff95201a233eca471bec SHA256 22ca5d7e4cd6f3b03f2eb01a5e2ba0a1931998ff56ba3f1ebaa0a60cec436829
 AUX access_restrict_1.12.0.patch 1278 RMD160 f5c8559d7c527604395e7441e3fd2a5818171ac9 SHA1 d4c1265a1565ce1cfe9d6c15503a299bde7d8ddf SHA256 c4b5385d9ac0645285f3e1dc41ebd597f34ba98992d89119bebb2727e6503b1a
 AUX jobindexlength-mysql.patch 392 RMD160 a6031a663b1a4af2d15d1cb2ba7b659fe813a175 SHA1 1442974131d16077edccc4f9539a37838b737e14 SHA256 19cf34e4864fd7352b917905480bf9ca5a984ec4d8914990902c907381b0b79b
@@ -10,15 +7,12 @@ AUX postupgrade-1.13-en.txt 1651 RMD160 aaae13a05a0984dfb327b9b5e2c6faa0d3c0c037
 DIST mediawiki-1.11.2.tar.gz 4880707 RMD160 e12cda810df8863c7adc84c9c44965335d0e85e0 SHA1 c5d5e99d73e646cff421b3bb92dd638fb93cd575 SHA256 3516fd7f0069e30b1ed6b6fea3794047ac08baf3cf71085c6943605efafd806f
 DIST mediawiki-1.12.3.tar.gz 8403452 RMD160 5a8827370259d0ed6f5e8d9e90cca06956bb7a1b SHA1 6b72558b85e81151f37cc3d7e6a7877a3650f04a SHA256 9565cd45abee86d8224ee15df8e590d0f35ae25d26ae4824f7e71aa49ebf765b
 DIST mediawiki-1.13.3.tar.gz 9252548 RMD160 643d18503d0fccfe97d0916b871813863bc3131f SHA1 e6b19d170629c8657742236b9f827a6df0350efd SHA256 da6962de7156def500ff926060d1d3d1db93ab94ee97620ca5ab8e444035a244
+DIST mediawiki-1.13.5.tar.gz 9562950 RMD160 05d77ced9daab78071c176d644f7fef3d8049447 SHA1 fb49c08038686c572327b8e43f2c6e15bdbd83a1 SHA256 a7720107c609adfcb2c9a4972f0348c15ef92c1da9017e79e074fb11424d4bbd
+DIST mediawiki-1.14.0.tar.gz 10122254 RMD160 11ef4698412f5ce716fe82e8d8e76742da1f7da1 SHA1 47d98ead3ba1c5c28e7cd30806febf8db650e7f6 SHA256 4a50f891548e0de8d2f12de14dd745f93d798fef0f5de6968385ee7f9b1917ed
 EBUILD mediawiki-1.11.2.ebuild 4290 RMD160 a388e21da0ab0ded3c9c3e47ad33e0fb9d67b44a SHA1 eb89e22640fe59833298a76c0a9fbfbc4a7adff5 SHA256 d003e85adb4c5121dc28a5abeacf582c4a71b07398e759f29ba87006ac310282
 EBUILD mediawiki-1.12.3.ebuild 4305 RMD160 379e8071eb330704d218ee4beac2ff7f512478b7 SHA1 ac0e92a824e0008b0538f0131bd90f17ec6e4912 SHA256 55653d6d1091cc66c220b3622cac4a535dbbcd9a398fbc5d802e237d62f52eee
 EBUILD mediawiki-1.13.3.ebuild 4112 RMD160 2fe5dd05e900f64f9ad419610f91a7f617c2e234 SHA1 e02eae76efe67a77a5dbcf1862b33676de441e05 SHA256 802f5a78580db787b466a5718309c14f4e28cdf81e67f007ace0063d9b309c48
-MISC ChangeLog 20786 RMD160 d326efe035b639cd1a8a5ee5910497dea25cdcc1 SHA1 b8139953a7b6b2219ec3c991cfc7c67d1c612ba3 SHA256 21c7566aee4f5afc88174d78758892244143db763b532a3b2c4e538fa2b9e53f
+EBUILD mediawiki-1.13.5.ebuild 4109 RMD160 138d1f1989d509ea6296ebbd7018071cfa8e5e28 SHA1 7ecdb1f41186eed3607e367ccee8faa724d6523b SHA256 8753097c751b2ed049d7b028bf0b0ae57c83c0e4e57ce04a06792f52da6a8ec0
+EBUILD mediawiki-1.14.0.ebuild 4109 RMD160 a2178a05ea1f38781a63b0483706ad0d583cf19d SHA1 e90f6b01d1fb3877eda0ef3ec61f3fbc1832e141 SHA256 2729df35cd95925f524903e7c3fd1e7aed57557e442e622c1b37fcab350ac73a
+MISC ChangeLog 21021 RMD160 69b8821161472c9a659c2b1f6d2e66c144c18252 SHA1 9d05807d77783c709db19bab2b0da8ee11d38517 SHA256 c39fae0826542ab60b007b383daca3e12061ce162084dc88b0632fcbeeea6e92
 MISC metadata.xml 418 RMD160 337019d783d66bbadf67162c84d6d3b8b3a8f0f4 SHA1 b49b71fd11a91a2e5f8953cf9a1643abee3c67b3 SHA256 68dd9b135528db0c39e306e60b4e910b402ee121fa1b0dc17107d1ba7c66d0eb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkldTiYACgkQt3UOBHx+2m/cpwCeMDjFW21NEsemu7whSDRqQAIi
-X1kAniQbw4CJyhE+xIpvZ8Rgkbn8HkwN
-=NImz
------END PGP SIGNATURE-----
diff --git a/www-apps/mediawiki/mediawiki-1.13.5.ebuild b/www-apps/mediawiki/mediawiki-1.13.5.ebuild
new file mode 100644
index 000000000000..34c7b90af4aa
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.13.5.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.13.5.ebuild,v 1.1 2009/04/07 15:42:20 pva 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="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="imagemagick math mysql postgres +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_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 "No math support 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.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
+}
diff --git a/www-apps/mediawiki/mediawiki-1.14.0.ebuild b/www-apps/mediawiki/mediawiki-1.14.0.ebuild
new file mode 100644
index 000000000000..6c88ab71ae39
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.14.0.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.14.0.ebuild,v 1.1 2009/04/07 15:42:20 pva 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="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="imagemagick math mysql postgres +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_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 "No math support 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.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
+}