Bump for #390889

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

3 files changed, 136 insertions, 16 deletions

diff --git a/www-apps/mediawiki/ChangeLog b/www-apps/mediawiki/ChangeLog
index 47e5203ee42d..6f52d81b1b11 100644
--- a/www-apps/mediawiki/ChangeLog
+++ b/www-apps/mediawiki/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/mediawiki
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.168 2011/09/27 19:30:57 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.169 2011/12/09 09:19:11 patrick Exp $
+
+*mediawiki-1.18.0 (09 Dec 2011)
+
+  09 Dec 2011; Patrick Lauer <patrick@gentoo.org> +mediawiki-1.18.0.ebuild:
+  Bump for #390889
 
   27 Sep 2011; Tim Harder <radhermit@gentoo.org> -mediawiki-1.16.4.ebuild:
   Remove old.
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index b7698082f885..bd4166b6a4a2 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -1,20 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX postinstall-1.13-en.txt 2751 RMD160 4f6c918bc1b897ed017ab8129a6d5387e982e07a SHA1 a4afb248ab7cb7abe25aa9d69533a7fd52401d73 SHA256 cebfe53c219cd6acacffcf0ed24493c0aa3180c89fa954e4a7e458dd0feb62c9
 AUX postupgrade-1.16-en.txt 1512 RMD160 362daf6f25f8a1497209426751aedd4cf78796c7 SHA1 d86a1f9097b4809f3f295e3784d4c4baf79936b6 SHA256 d45dd49ecfd27f3dee9296925befbf334437035e311c985db78ac6132b990877
 DIST mediawiki-1.16.5.tar.gz 13235937 RMD160 0a8298051baaf02f400bc6f317508f7b7544ec57 SHA1 2526a5aebeafe49dcbfb1584823e467445daf1ae SHA256 5b451f578d9876f02a1a4363851d1558385290638676680ab33dc26116db20cb
+DIST mediawiki-1.18.0.tar.gz 17018978 RMD160 9e83e7f07ee11da4348afb01a7aad63501176aef SHA1 4f41ebcf986873625ae22641da8dca76542914a7 SHA256 da522adc659280c5a95813c571d76f7bc555942e0ae3a5f6d92e9a852e252077
 EBUILD mediawiki-1.16.5.ebuild 3786 RMD160 0ff8b4d5b4091b32e04cc25e52acf32059b3fb2b SHA1 a354d0652ec80de0bfa73d0d9e749a597856c7fa SHA256 6b59a5221b34f7cc6e1cc500157c739179b3f2214e21d7d994edb36ffa75fe36
-MISC ChangeLog 28620 RMD160 2b9bd0eb9230712d908708a02560b3cd335bc76d SHA1 e2ce30baedebd3fa08db30079bcbd39eb0dfc200 SHA256 2ee617514d087ed4c676c0d4cb9c8be4bec7ed050b686d0a77da0620d2213b16
+EBUILD mediawiki-1.18.0.ebuild 3787 RMD160 2420ed7fdbce1cc21be3415d3d8346b30d458f6a SHA1 8473baab956a39acfb140f1a806a3b9062b12599 SHA256 aaaf5ff710b4798555fcae771db08dc78bfd11a94ca9363f24fbd024a528392d
+MISC ChangeLog 28747 RMD160 803a1cfccb17b379f1e4431cbeed58e2831d0853 SHA1 af9a9a6620cf9626a7fbc6c31a3c0d7fc253ed6d SHA256 ec579e4c7dfb989f31ff7ce4095fd5c288ba6b9d96c80616908c527551dff68d
 MISC metadata.xml 295 RMD160 0e99ed39b17f196d96fa661725f18447202c793a SHA1 3d63cc41895a26fde229f1394541cf6792fbc016 SHA256 ac52057208794d9f818ca0f56f292885eac738678c8fcdf56e099e98ce953593
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQEcBAEBCgAGBQJOgiR3AAoJEEqz6FtPBkyjRqQIAK0iQ5Y9+vhmJSPY+SQfQk6q
-fu0/48fDlPwqmveLSwvNRaUFmSpLeq3lw2XaYRA3GDWLTygXEpDyy5CmTcxylrag
-vm/B/iu+ToII/qcuwPoxug1zNScth9K36NaZSvHz0SqjIulk4a3aYmEBStItxFdH
-6CkZ9M4mDAgscEf6pYHU822sRQCE9pSihVnl3SO+NYaVS1vBtZs3mNpHeABlXmfE
-sT/tzg3rycTy1Wy8x5nXUWmZV/ALKR0+JS5Cnbkl7T3ix4V4Be6vXJn5EkfsTU1b
-o9AOpo1YOW6CVDiN6+AUf3B6fV5S5GWYUVcWJtN2ciE9wQNIBOi6ZqbSKU8IdM8=
-=pe3C
------END PGP SIGNATURE-----
diff --git a/www-apps/mediawiki/mediawiki-1.18.0.ebuild b/www-apps/mediawiki/mediawiki-1.18.0.ebuild
new file mode 100644
index 000000000000..48bfa0e17297
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.18.0.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.18.0.ebuild,v 1.1 2011/12/09 09:19:11 patrick 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 sqlite"
+
+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 media-gfx/graphicsmagick[imagemagick] )
+	)
+	imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) )
+	!imagemagick? ( || ( dev-lang/php[gd] dev-lang/php[gd-external] ) )
+	|| (  >=dev-lang/php-5.3[mysql?,postgres?,session,xml]
+		<dev-lang/php-5.3[mysql?,pcre,postgres?,session,spl,xml] )
+	sqlite? ( dev-db/sqlite:3[fts3]
+		|| ( >=dev-lang/php-5.3[sqlite3,pdo] <dev-lang/php-5.3[sqlite,pdo] ) )"
+
+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
+}