Version bump to the latest security release for bug #324029. Update to EAPI=3 and add USE flag dependencies for php and ocaml instead of pkg_setup tests.

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

3 files changed, 157 insertions, 2 deletions

diff --git a/www-apps/mediawiki/ChangeLog b/www-apps/mediawiki/ChangeLog
index 83195660b009..4bff48d8d753 100644
--- a/www-apps/mediawiki/ChangeLog
+++ b/www-apps/mediawiki/ChangeLog
@@ -1,6 +1,13 @@
 # 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.137 2010/08/12 08:13:26 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.138 2010/10/09 20:56:22 radhermit Exp $
+
+*mediawiki-1.15.5 (09 Oct 2010)
+
+  09 Oct 2010; Tim Harder <radhermit@gentoo.org> +mediawiki-1.15.5.ebuild:
+  Version bump to the latest security release for bug #324029. Update to
+  EAPI=3 and add USE flag dependencies for php and ocaml instead of
+  pkg_setup tests.
 
   12 Aug 2010; Alex Legler <a3li@gentoo.org> -mediawiki-1.11.2.ebuild,
   -mediawiki-1.12.3.ebuild, -mediawiki-1.13.3.ebuild,
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index 9b49c8b2db76..208ebd4d64f5 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -6,7 +9,20 @@ AUX postinstall-1.13-en.txt 2751 RMD160 4f6c918bc1b897ed017ab8129a6d5387e982e07a
 AUX postupgrade-1.13-en.txt 1651 RMD160 aaae13a05a0984dfb327b9b5e2c6faa0d3c0c037 SHA1 a97fb9f33d964a795ec159df0628e1897b12e257 SHA256 be7ed53ebce19077a55ce3fbd7eafca7843fffc0c5e821549a4e2e1db9c560bf
 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
 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
-MISC ChangeLog 23624 RMD160 95757d785363ee1302472d7cc5d9ec55f7975411 SHA1 ff730dceeb33adb567da3620d5afb646615c5a09 SHA256 ec089d93a77fe47c3774319146b57c79e4a90e6d7d62b6c437c72ef4d36efc5d
+EBUILD mediawiki-1.15.5.ebuild 3701 RMD160 5e296c25b812b6f8f39edd5c68fd298b851eec52 SHA1 2309668b1cb92371f0d44d106038a764c2e5fa86 SHA256 4b1b423f744d9408932a22ce8b6813cfe402168c82347d7117b45a756e0fcdd1
+MISC ChangeLog 23898 RMD160 821c911343a033986e52ad216966a142d0b99fe5 SHA1 9c66edb95ed2afe3bf3ce84a148e7fc397b67fa5 SHA256 cf992e99eab76300bc3f8f2075c96ef680f633bb172e96d0f645f281afcbaf22
 MISC metadata.xml 295 RMD160 0e99ed39b17f196d96fa661725f18447202c793a SHA1 3d63cc41895a26fde229f1394541cf6792fbc016 SHA256 ac52057208794d9f818ca0f56f292885eac738678c8fcdf56e099e98ce953593
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQEcBAEBAgAGBQJMsNcAAAoJEEqz6FtPBkyjZDYIAIuTSiGUUUbo11FD7/g8SIqN
+g/p8vQO8atTIy9t6RP2pU4w5rSkjZ+lKKcXpFISKv7WvsvTHQGQ2Pl8vWNKerHdc
+S0kxM+kClk1j8yBgEMH4OqnHJFogu+8+bN6HCXaXtxSNTB+0yq4LwM2tz/MKpbyk
+jY8Xqevpt9m1aQRS6Cfy2XqHcISGXbo3xY46HBWboJlsIcK0jyXnZyzJmlbB3Nii
+fVG0/aJFRxn2sTg2uzUOqmmLHaZb8wizP8UsSEO6rIh46soIudBK9hIZOn3hQDm1
+tum9k0PTeP2l+MS+jqRR1eUZr23y0ceFKMe5Hp/nRKrp4NicyA50nx2k9O0OT+0=
+=gNkG
+-----END PGP SIGNATURE-----
diff --git a/www-apps/mediawiki/mediawiki-1.15.5.ebuild b/www-apps/mediawiki/mediawiki-1.15.5.ebuild
new file mode 100644
index 000000000000..ddeb787bd30d
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.15.5.ebuild
@@ -0,0 +1,132 @@
+# 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.15.5.ebuild,v 1.1 2010/10/09 20:56:22 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"
+
+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] )"
+
+RESTRICT="test"
+
+need_httpd_cgi
+need_php_httpd
+
+pkg_setup() {
+	if ! 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
+
+	webapp_pkg_setup
+}
+
+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
+}