Non-maintainer commit: Version bump, #308573

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

3 files changed, 151 insertions, 2 deletions

diff --git a/www-apps/mediawiki/ChangeLog b/www-apps/mediawiki/ChangeLog
index bf5c9b6380ca..1249a09bb044 100644
--- a/www-apps/mediawiki/ChangeLog
+++ b/www-apps/mediawiki/ChangeLog
@@ -1,6 +1,12 @@
 # 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.131 2010/03/14 19:20:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.132 2010/04/02 17:24:11 dertobi123 Exp $
+
+*mediawiki-1.15.2 (02 Apr 2010)
+
+  02 Apr 2010; Tobias Scherbaum <dertobi123@gentoo.org>
+  +mediawiki-1.15.2.ebuild:
+  Non-maintainer commit: Version bump, #308573
 
   14 Mar 2010; Raúl Porcel <armin76@gentoo.org> mediawiki-1.14.1.ebuild,
   mediawiki-1.15.1.ebuild:
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index f8378cabca6f..256b7551a327 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -11,6 +11,7 @@ DIST mediawiki-1.13.5.tar.gz 9562950 RMD160 05d77ced9daab78071c176d644f7fef3d804
 DIST mediawiki-1.14.0.tar.gz 10122254 RMD160 11ef4698412f5ce716fe82e8d8e76742da1f7da1 SHA1 47d98ead3ba1c5c28e7cd30806febf8db650e7f6 SHA256 4a50f891548e0de8d2f12de14dd745f93d798fef0f5de6968385ee7f9b1917ed
 DIST mediawiki-1.14.1.tar.gz 10359679 RMD160 d4506627c48b95341cb72823080c34fcd9b704bc SHA1 7248752cf937f4c14750bf12eb30736ba060cc17 SHA256 0c41845e069ce1f3a716892e6c8e529ee7a112a7f9e50ec2a9c9c6b34d0ba690
 DIST mediawiki-1.15.1.tar.gz 10826029 RMD160 437c5337e524dc2e3e23ab9bf10fe10f3be5886a SHA1 bc6fa790b7738892c6b415fc76658a976763715d SHA256 044a221b135673b395ca9b253af6eed7196eb991827c35348a683c4bae59da44
+DIST mediawiki-1.15.2.tar.gz 11469228 RMD160 46171059799d5a74b535523f562d3a5db7066f55 SHA1 c1e7e7243a052f3f9719f78573980c16f25da4b2 SHA256 6b1e5f6d385214853452f36331aa952523bd40fc2765761d9788b827cfc5b704
 EBUILD mediawiki-1.11.2.ebuild 4292 RMD160 e951a16cf825b1d7865da4e16284123b8fc8b98b SHA1 201b2c3ec5d7a883ffd8730ae5c40e89cf206218 SHA256 73d67206127df034bcbed0ada674fe94f1a2c600dc66bc60220f31ea135442b0
 EBUILD mediawiki-1.12.3.ebuild 4310 RMD160 dce3dfbde70aee0b7033514b0bb23aac2ee679c8 SHA1 7523c29fb557d33098545c92595e9163d0c1f872 SHA256 a01e594e95b04408052b443e1d2b6738b6678132b3662393642dd963916174ce
 EBUILD mediawiki-1.13.3.ebuild 4110 RMD160 b39d6fa354baca811fd12694adbabbb6f426f869 SHA1 f9017b39fdbadced4e8cb42948666fab8d015a50 SHA256 d5638c9042ff0d42f365ce742cc401c264a81be9609dc96d2f576af9dcc08c0d
@@ -18,5 +19,6 @@ EBUILD mediawiki-1.13.5.ebuild 4111 RMD160 a69431824b9c0ed467b87f48a148dbfa718a9
 EBUILD mediawiki-1.14.0.ebuild 4117 RMD160 a4aed0b0745cfa207ec46d730c41e094016cfb67 SHA1 7b761402ea24a33d8b1750a4452b965e257027a5 SHA256 3fd5356a8100fc63e652a66ef73b9cab3b33230176dd5aa373be7ef55259eb4a
 EBUILD mediawiki-1.14.1.ebuild 4118 RMD160 d085d5a25fa72f69d90aafe74ede22c1b41216a2 SHA1 b5ed1ebbbac9922754a6f4ca8d2d58d72006254d SHA256 bae459188d79c3c5bd126e33be4a57753d8faf0847c3a8ccf9dc89796c680676
 EBUILD mediawiki-1.15.1.ebuild 4118 RMD160 4659575ee437a5b7a8db7cf9884fae2506094f62 SHA1 32e28e2811c1850250a72d2eeb2bc04952316ffb SHA256 51fcb712fe7b79fca5bf1fac4fd6337329a456a24b49ee908646dd872da86395
-MISC ChangeLog 22857 RMD160 9343d4e96e677ddbdabd13431768c39fd48d41fa SHA1 561aa2e1342d6aa7f2642f34e8af9d3e88c1e751 SHA256 34b6e96bbc6ce88818dfd2a5ab5df683f366febc15442b7171708a50937bda7e
+EBUILD mediawiki-1.15.2.ebuild 4125 RMD160 da13ee58e212ae87ddbe04e86b0be70e485fb7f1 SHA1 8600448aca56a1031052c9ec88ad9c907d036dab SHA256 ddbf15bc0c5f618fb8e943840beb276c74a0cb7497ad0cd3fce9c077938a7c43
+MISC ChangeLog 23025 RMD160 e19925638afe426994b1947d4aea6b6a2f5f7d2f SHA1 1e0ceeb984f9a9d8b8ce364da01d617495661f94 SHA256 2c32e102c0b8b6cc5dce869601f0f33503489a3faba58a375a4380a6e7dab488
 MISC metadata.xml 418 RMD160 337019d783d66bbadf67162c84d6d3b8b3a8f0f4 SHA1 b49b71fd11a91a2e5f8953cf9a1643abee3c67b3 SHA256 68dd9b135528db0c39e306e60b4e910b402ee121fa1b0dc17107d1ba7c66d0eb
diff --git a/www-apps/mediawiki/mediawiki-1.15.2.ebuild b/www-apps/mediawiki/mediawiki-1.15.2.ebuild
new file mode 100644
index 000000000000..faca900bdde2
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.15.2.ebuild
@@ -0,0 +1,141 @@
+# 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.2.ebuild,v 1.1 2010/04/02 17:24:11 dertobi123 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
+		app-text/ghostscript-gpl
+		media-gfx/imagemagick
+	)
+	imagemagick? ( media-gfx/imagemagick )"
+
+RESTRICT="test"
+
+need_httpd_cgi
+need_php_httpd
+
+pkg_setup() {
+	webapp_pkg_setup
+	local flags="pcre session spl 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
+}