Added mediawiki-1.11.1 to the tree. Removed the other branches (sec issue

#207757)
Package-Manager: portage-2.1.4_rc7

10 files changed, 133 insertions, 624 deletions

diff --git a/www-apps/mediawiki/ChangeLog b/www-apps/mediawiki/ChangeLog
index 63a949acd381..95fa554c4526 100644
--- a/www-apps/mediawiki/ChangeLog
+++ b/www-apps/mediawiki/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for www-apps/mediawiki
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.92 2007/11/26 12:00:23 tchiwam Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.93 2008/02/15 11:04:09 wrobel Exp $
+
+*mediawiki-1.11.1 (15 Feb 2008)
+
+  15 Feb 2008; Gunnar Wrobel <wrobel@gentoo.org>
+  -files/jobindexlength-mysql5.patch, +files/postinstall-1.11-en.txt,
+  -files/jobindexlength-mysql4.patch, -files/postinstall-en.txt,
+  -mediawiki-1.6.10.ebuild, -mediawiki-1.9.4.ebuild,
+  -mediawiki-1.10.2.ebuild, -mediawiki-1.11.0.ebuild,
+  +mediawiki-1.11.1.ebuild:
+  Added mediawiki-1.11.1 to the tree. Removed the other branches (sec issue
+  #207757)
 
   26 Nov 2007; <tchiwam@gentoo.org> files/postinstall-1.5-en.txt,
   mediawiki-1.6.10.ebuild, mediawiki-1.8.5.ebuild, mediawiki-1.9.4.ebuild,
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index cf195248737e..3c5002c093f2 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -1,18 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX access_restrict.patch 1240 RMD160 29e27a84951daf447da1ecba3e929e94d02e0fb1 SHA1 1ec89557c26b682b2550ff95201a233eca471bec SHA256 22ca5d7e4cd6f3b03f2eb01a5e2ba0a1931998ff56ba3f1ebaa0a60cec436829
 AUX jobindexlength-mysql.patch 392 RMD160 a6031a663b1a4af2d15d1cb2ba7b659fe813a175 SHA1 1442974131d16077edccc4f9539a37838b737e14 SHA256 19cf34e4864fd7352b917905480bf9ca5a984ec4d8914990902c907381b0b79b
-AUX jobindexlength-mysql4.patch 697 RMD160 98fb7cd28fae9b3c9e868b9f33542e2373507b61 SHA1 6c43d2e457968d7ca03e3940822390587aa376d1 SHA256 883d077b87744c5e179164f46df364b83bf3e0c59578446835771601f024a5fc
-AUX jobindexlength-mysql5.patch 711 RMD160 05b553a450e92ea42dda07525f294bdcdc40969b SHA1 985ba2498c116d62b943cf2235f53a2590c29563 SHA256 bd4a0cf0594454ace7c149963b8b6c550b38faf97dc840e76f10bbfab528d281
+AUX postinstall-1.11-en.txt 2502 RMD160 a72826f3b8e4b6461c50227d4db5ec5da79e710d SHA1 1dc394d76537ce7b24601bb63ec1ef7f2e49ad7f SHA256 d88c989eac3d99fec4c057eb89ec04a05aabfc57b6503b8da7843bfbc730daf4
 AUX postinstall-1.5-en.txt 2367 RMD160 5ace4659ea9d8faa9556fb4a693abad8a885258c SHA1 3057981fe89627053a2d31cd56ee44c69f05e5b5 SHA256 ef82063043a4d83f1a62e39266192d401f96b0999be0020b90eb48f8f683f70e
-AUX postinstall-en.txt 1731 RMD160 c6c370d046facf6a73c4827cd3f8510e63a442f3 SHA1 9e8a94696c5208b2b20024469777b9efe97204db SHA256 cb0067f6f3fb8366f499ef5f81a07ac236620bf5792a6b4497a34d9302779a71
-DIST mediawiki-1.10.2.tar.gz 4375272 RMD160 89a7823fa623ddebcf28eeb1a9049d0ba92b5fd7 SHA1 4d936849a23a5f4db58a06fef4d33e2d64e4de76 SHA256 6376a539698bb16f51cd71e7326bd5504690d07c79b770ac9c2a27cba0ca4c19
-DIST mediawiki-1.11.0.tar.gz 4885120 RMD160 551cd0630140af732095a33477d67e0cbe9de06f SHA1 754ddbbff80b1f76ca5022a0e70253cc1c45a2b1 SHA256 01031797ba4b61d78a6aef276198336f8d4e116746a844379d91987869425655
-DIST mediawiki-1.6.10.tar.gz 2729006 RMD160 91e9010c5881192e852bd2ed4f583204a00381ce SHA1 c38d65e7d52c1c18412e32b291feb328ea7ca7c0 SHA256 e0fe47444df671691378048804730a69d930d1ac1514359a91d72c8a33586ed7
+DIST mediawiki-1.11.1.tar.gz 4885712 RMD160 c4ccc87acbbea4868094c83f58cf2142217d2267 SHA1 d452e0013969b064a2166eeae8d03227a8ff1fa3 SHA256 05173b49b73a289ff532baf4088215756804075394268b733ba2ae4265be9476
 DIST mediawiki-1.8.5.tar.gz 3497708 RMD160 74e7fc958c6e6cb5ad81967423f8de3b81405463 SHA1 b7b50ebf711988c6f35d0d9e436cfef5d5628da0 SHA256 cb2e25d74fdb841a56d54ee6de33183fba14b0266c01948b76892c3b7b287580
-DIST mediawiki-1.9.4.tar.gz 3864981 RMD160 274f6bbed0d8fbf6c279a780a7c22fd090f1f7bc SHA1 9162571c56e95f2b9e941921d4d9f1826f7ae37f SHA256 ba507fa3d8f10060b52f849f287b52856ee441259b331e8111e5b6ed5884f194
-EBUILD mediawiki-1.10.2.ebuild 3811 RMD160 ae0ecc5e7c7c4c1b53dbd51437637a465cae004c SHA1 81030f7dd76d7057cb01053f5bb43b318830d643 SHA256 5de91e2f5a80730ac7902bc841497c3ae22d4d6799d23015d3b11cfd6df6541e
-EBUILD mediawiki-1.11.0.ebuild 3993 RMD160 95250f01b6e8af66f4383cda26e53e336bc31985 SHA1 5926823bedff7c7789c68ec3b1cd9127dc57e986 SHA256 1816992f75f76936f2d827d43aaca2c39fa4dac90e0d947e712617f4f0f9a91b
-EBUILD mediawiki-1.6.10.ebuild 3144 RMD160 7fe7c58c8a5df24416018ae7f20ab9a4142a08e6 SHA1 a26736a0d419b63bae05399cf90c0234b8bd3cbe SHA256 cf570f05719dee33f1ae0f76084341aea44524752adca9c3e2ff9dd7a8cc25db
+EBUILD mediawiki-1.11.1.ebuild 4233 RMD160 216825edeedda0b7ba8480db7219a7608ee861be SHA1 f760118d5494a4a052080509e1552378ca007818 SHA256 532f7121fca8f6c3a7a0f3b7e95d0811b7f5173c41c0a4b555ce1ed888e60361
 EBUILD mediawiki-1.8.5.ebuild 3571 RMD160 295a8e8bf279d5b73243743befa04073888a9e41 SHA1 89636bcd23f863b04cbe7abcf70094300955642b SHA256 8d7614aea499c6a09e6897cece172c93fd965fe6c59d961953a0521bb09f6c0d
-EBUILD mediawiki-1.9.4.ebuild 3575 RMD160 d9c73f6c0d3f48e8f960b184cd22dca7faa0758f SHA1 09df5acc778702a4a5dab85e97aa22cc1dfd376c SHA256 995d938441df3b791730ee47236dad5337426f76359cb484161a53e7689506aa
-MISC ChangeLog 16591 RMD160 ff79476ff9bc33c93d7475034809b6c6d43deb98 SHA1 e9ec07d9570006a1456e643c17374ec3b31e66dc SHA256 e6c5eceafe52d635dc6dd666e65ed27c0e41cd55c26c2f9c2395e8b231557d1b
+MISC ChangeLog 17030 RMD160 23ca7583b84cd6e92fed7728a0263aa19d4440d1 SHA1 92ec1184cd24697d7e81036c25c17b5c07624c65 SHA256 9c7d3111e4e2a4c60f36f2f2fb84c74af4008bf4a270f984e276be779aa694aa
 MISC metadata.xml 366 RMD160 8be6da5afadbc6c6e57d589097d8f702d951bde3 SHA1 4c3b825388a712b4452ba16912b38b9aba76b78e SHA256 dddc4891c17811953d2cae412c4b1a713dc00b3629cd38a5b530c15a0acebcc2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFHtXGuEEcxCpcDQ74RAtaaAKCcRsq+TvjWHV0NgGzChagoGBdIfACfeeMk
+O8RcaNFFZ47xAVBHyh5ZioI=
+=cSGh
+-----END PGP SIGNATURE-----
diff --git a/www-apps/mediawiki/files/jobindexlength-mysql4.patch b/www-apps/mediawiki/files/jobindexlength-mysql4.patch
deleted file mode 100644
index 330c4e2e56c5..000000000000
--- a/www-apps/mediawiki/files/jobindexlength-mysql4.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- mediawiki-1.7.1/maintenance/tables.sql.orig	2006-08-31 16:37:41.000000000 +0300
-+++ mediawiki-1.7.1/maintenance/tables.sql	2006-08-31 16:38:18.000000000 +0300
-@@ -967,12 +967,12 @@
-   job_id int(9) unsigned NOT NULL auto_increment,
-   
-   -- Command name, currently only refreshLinks is defined
--  job_cmd varchar(255) NOT NULL default '',
-+  job_cmd varchar(128) NOT NULL default '',
- 
-   -- Namespace and title to act on
-   -- Should be 0 and '' if the command does not operate on a title
-   job_namespace int NOT NULL,
--  job_title varchar(255) binary NOT NULL,
-+  job_title varchar(128) binary NOT NULL,
- 
-   -- Any other parameters to the command
-   -- Presently unused, format undefined
diff --git a/www-apps/mediawiki/files/jobindexlength-mysql5.patch b/www-apps/mediawiki/files/jobindexlength-mysql5.patch
deleted file mode 100644
index b2daf5dbeb26..000000000000
--- a/www-apps/mediawiki/files/jobindexlength-mysql5.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- mediawiki-1.7.1/maintenance/mysql5/tables.sql.orig	2006-08-31 16:43:04.000000000 +0300
-+++ mediawiki-1.7.1/maintenance/mysql5/tables.sql	2006-08-31 16:43:55.000000000 +0300
-@@ -979,12 +979,12 @@
-   job_id int(9) unsigned NOT NULL auto_increment,
-   
-   -- Command name, currently only refreshLinks is defined
--  job_cmd varchar(255) NOT NULL default '',
-+  job_cmd varchar(128) NOT NULL default '',
- 
-   -- Namespace and title to act on
-   -- Should be 0 and '' if the command does not operate on a title
-   job_namespace int NOT NULL,
--  job_title varchar(255) binary NOT NULL,
-+  job_title varchar(128) binary NOT NULL,
- 
-   -- Any other parameters to the command
-   -- Presently unused, format undefined
diff --git a/www-apps/mediawiki/files/postinstall-1.11-en.txt b/www-apps/mediawiki/files/postinstall-1.11-en.txt
new file mode 100644
index 000000000000..375599e1ad99
--- /dev/null
+++ b/www-apps/mediawiki/files/postinstall-1.11-en.txt
@@ -0,0 +1,72 @@
+1. Completing setup:
+
+To complete installation cd into the MediaWiki install location, but
+make sure to start mysql first.
+
+$ /etc/init.d/mysql start
+$ cd ${MY_INSTALLDIR}
+
+Then temporarily make the MediaWiki /config directory writable
+to the user the web server is running as. The quickest way is 
+to make the directory world writable. For example:
+
+$ chmod a+w config
+ 
+Then access it via a web browser, for example:
+
+lynx http://${VHOST_HOSTNAME}${VHOST_APPDIR}/config/
+ 
+2. After setup move the newly created LocalSettings.php from the config/
+directory to the main mediawiki directory, for example:
+  
+$ mv config/LocalSettings.php .
+
+Remember to restore safe permissions to the MediaWiki config/ and 
+LocalSettings.php (which contains clear-text passwords).
+
+$ chmod a-w config
+$ chmod ug=r,o=  LocalSettings.php
+$ chown root:apache LocalSettings.php
+
+After these steps MediaWiki should be accesable at
+http://${VHOST_HOSTNAME}${VHOST_APPDIR}/
+ 
+3. Enabling Optional Features:
+
+If you wish to enable image uploads then you must manually edit the
+LocalSettings.php file to uncomment the \$wgEnableUploads line.  
+If MediaWiki was built with the imagemagick USE-flag the directory
+permissions are correct, otherwise you must install ImageMagick and
+also adjust permissions on the images directory to allow the server
+to write. For example:
+ 
+$ chown apache:apache ${MY_INSTALLDIR}/images
+
+Math Support:
+
+If you wish to enable the math support then you must manually edit" 
+the LocalSettings.php file to uncomment the \$wgUseTeX line.
+MediaWiki must have been built with the math USE-flag enabled or the
+necessary support executable will not be present.
+You may also have to execute
+
+$ texconfig dvips printcmd -
+
+if you have not configured tetex before.
+
+
+4. Things you need to have on the server:
+
+- SQL database of your choice and support for that database compiled in PHP
+We check for required PHP features for mysql and postgres use flags in the ebuild;
+you are on your own if you are using a different kind of DB backend.
+- dev-php/PEAR-Mail is needed for using external smtp server.
+
+These are not installed as dependencies since it is possible to run the database
+and other services on other machines.
+
+It is very important that you follow all the major versions upgrade instructions 
+from the mediawiki.org web page - http://www.mediawiki.org/wiki/Manual:Upgrading 
+
+Do not, I repeat, do not assume that we can upgrade from version to version just
+like this. Make backups before upgrading.
diff --git a/www-apps/mediawiki/files/postinstall-en.txt b/www-apps/mediawiki/files/postinstall-en.txt
deleted file mode 100644
index 85236612f73b..000000000000
--- a/www-apps/mediawiki/files/postinstall-en.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-
-Completing setup:
-
-To complete installation cd into the MediaWiki install location, but
-make sure to start mysql first with:
-
-$ /etc/init.d/mysql start
-
-$ cd /var/www/localhost/htdocs/mediawiki/
-
-The host directory, localhost, may change depending on your installation.
-
-Then temporarily make the MediaWiki /config directory writable
-to the  user the web server is running as. The quickest way is 
-to make  the directory world writable.  For example:
-
-$ chmod a+w config
- 
-Then access it, for example:
-
-lynx http://localhost/mediawiki/config/
- 
-After setup move the newly created LocalSettings.php from the config/
-directory to the main mediawiki directory, for example:
-  
-$ mv config/LocalSettings.php .
-
-    Remember to restore safe permissions to the MediaWiki config/ and
-    LocalSettings.php (which contains clear-text passwords).
-    chmod a-w config
-    chmod ug=r,o=  LocalSettings.php
-    chown root:apache LocalSettings.php
-
-After these steps MediaWiki should be accesable at
-http://localhost/mediawiki/
- 
-Enabling Optional Features:
-
-If you wish to enable image uploads then you must manually edit the
-LocalSettings.php file to uncomment the \$wgDisableUploads line.  If" 
-MediaWiki was built with the imagemagick USE flag the directory
-permissions are correct, otherwise you must install ImageMagick and" 
-also adjust permissions on the images directory to allow the server
-to write.  For example:
- 
-$ chown apache:apache /var/www/localhost/htdocs/mediawiki/images
-
-If you wish to enable the math support then you must manually edit" 
-the LocalSettings.php file to uncomment the \$wgUseTeX line.
-Mediawiki must have been built with the tetex USE flag enabled or the
-necessary support executable will not be present.
diff --git a/www-apps/mediawiki/mediawiki-1.10.2.ebuild b/www-apps/mediawiki/mediawiki-1.10.2.ebuild
deleted file mode 100644
index 5f8ed0a10c84..000000000000
--- a/www-apps/mediawiki/mediawiki-1.10.2.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.10.2.ebuild,v 1.2 2007/11/26 12:00:23 tchiwam Exp $
-
-inherit webapp depend.php versionator
-
-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/.0_/}.tar.gz"
-#SRC_URI="mirror://sourceforge/wikipedia/${P/_/}.tar.gz"
-RESTRICT="mirror"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="imagemagick math mysql postgres restrict"
-
-S="${WORKDIR}/${P/_/}"
-#S="${WORKDIR}/${P/.0_/}"
-
-DEPEND="math? ( >=dev-lang/ocaml-3.0.6 )"
-
-RDEPEND="
-		>=dev-lang/php-5.1.4-r6
-		math? (
-			virtual/tetex
-			virtual/ghostscript
-			media-gfx/imagemagick
-		)
-		imagemagick? (
-			media-gfx/imagemagick
-		)
-"
-
-need_php
-
-pkg_setup() {
-	webapp_pkg_setup
-	require_php_with_use pcre session
-	if use mysql ; then
-		require_php_with_use mysql
-	fi
-	if use postgres ; then
-		require_php_with_use postgres
-	fi
-	require_gd
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# XXX: besides, is/was this patch really that required? if so, why? (trapni)
-#	epatch ${FILESDIR}/jobindexlength-mysql.patch
-
-	if use restrict ; then
-		epatch "${FILESDIR}/access_restrict.patch"
-	fi
-}
-
-src_compile() {
-	if use math; then
-		einfo "Compiling math support"
-		cd math || die
-		emake || die
-	else
-		einfo "No math support enabled. Skipping."
-	fi
-
-	# TODO: think about includes/zhtable/ support
-}
-
-src_install() {
-	webapp_src_preinst
-
-	# copy the app's main files excluding math support, docs, and tests
-	local DIRS=(
-		"bin"
-		"config"
-		"extensions"
-		"images"
-		"includes"
-		"includes/api"
-		"includes/cbt"
-		"includes/media"
-		"includes/normal"
-		"includes/templates"
-		"includes/zhtable"
-		"languages"
-		"languages/classes"
-		"languages/messages"
-		"locale"
-		"maintenance"
-		"maintenance/archives"
-		"maintenance/dtrace"
-		"maintenance/language"
-		"maintenance/ora"
-		"maintenance/postgres"
-		"maintenance/postgres/archives"
-		"maintenance/storage"
-		"serialized"
-		"skins"
-		"skins/chick"
-		"skins/common"
-		"skins/common/images"
-		"skins/common/images/icons"
-		"skins/disabled"
-		"skins/htmldump"
-		"skins/monobook"
-		"skins/myskin"
-		"skins/simple"
-	)
-	insinto ${MY_HTDOCSDIR}
-	doins *.php *.inc *.phtml
-	for DIR in ${DIRS[*]}; do
-		dodir ${MY_HTDOCSDIR}/${DIR}
-		insinto ${MY_HTDOCSDIR}/${DIR}
-		doins ${DIR}/*
-		test -f ${DIR}/.htaccess && doins ${DIR}/.htaccess
-	done
-
-	# installing some docs
-	local DOCS=(
-		"AdminSettings.sample"
-		"COPYING"
-		"FAQ"
-		"HISTORY"
-		"INSTALL"
-		"README"
-		"RELEASE-NOTES"
-		"UPGRADE"
-	)
-	for DOC in ${DOCS[*]}; do
-		dodoc "${DOC}"
-		rm -f "${DOC}"
-	done
-	dodoc docs/*.txt
-	rm -f docs/*.txt
-
-	docinto php-memcached
-	dodoc docs/php-memcached/*
-
-	# If imagemagick is enabled then setup for image upload.
-	# We ensure the directory is prepared for writing.  The post-
-	# install instructions guide the user to enable the feature.
-	if use imagemagick; then
-		webapp_serverowned ${MY_HTDOCSDIR}/images
-	fi
-
-	# 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"
-		dodir ${MY_HTDOCSDIR}/math
-		exeinto ${MY_HTDOCSDIR}/math
-		doexe math/texvc
-
-		# Docs
-		docinto math
-		dodoc math/README math/TODO
-
-		# 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
-
-	webapp_postinst_txt en "${FILESDIR}/postinstall-1.5-en.txt"
-	webapp_src_install
-}
diff --git a/www-apps/mediawiki/mediawiki-1.11.0.ebuild b/www-apps/mediawiki/mediawiki-1.11.1.ebuild
index 6ba08c09168d..2a7d11a7f01e 100644
--- a/www-apps/mediawiki/mediawiki-1.11.0.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.11.1.ebuild
@@ -1,38 +1,28 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.11.0.ebuild,v 1.3 2007/11/26 12:00:23 tchiwam Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.11.1.ebuild,v 1.1 2008/02/15 11:04:09 wrobel Exp $
 
-inherit webapp depend.php versionator
+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/.0_/}.tar.gz"
-#SRC_URI="mirror://sourceforge/wikipedia/${P/_/}.tar.gz"
-RESTRICT="mirror"
+SRC_URI="http://download.wikimedia.org/mediawiki/${MY_BRANCH}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="imagemagick math mysql postgres restrict"
-
-S="${WORKDIR}/${P/_/}"
-#S="${WORKDIR}/${P/.0_/}"
+IUSE="imagemagick math mysql postgres restrict +ocamlopt"
 
 DEPEND="math? ( >=dev-lang/ocaml-3.0.6 )"
+RDEPEND="${DEPEND}
+	math? ( virtual/tetex
+		virtual/ghostscript
+		media-gfx/imagemagick )
+	imagemagick? ( media-gfx/imagemagick )"
 
-RDEPEND="
-		>=dev-lang/php-5.1.4-r6
-		math? (
-			virtual/tetex
-			virtual/ghostscript
-			media-gfx/imagemagick
-		)
-		imagemagick? (
-			media-gfx/imagemagick
-		)
-"
-
-need_php
+need_php5
 
 pkg_setup() {
 	webapp_pkg_setup
@@ -41,7 +31,15 @@ pkg_setup() {
 	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"
+			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
 }
 
@@ -61,6 +59,11 @@ src_compile() {
 	if use math; then
 		einfo "Compiling math support"
 		cd math || die
+		if ! use ocamlopt; then
+			sed -i -e "s/ocamlopt/ocamlc/" Makefile
+			sed -i -e "s/cmxa/cma/" Makefile
+			sed -i -e "s/cmx/cmo/g" Makefile
+		fi
 		emake || die
 	else
 		einfo "No math support enabled. Skipping."
@@ -110,32 +113,19 @@ src_install() {
 		"skins/myskin"
 		"skins/simple"
 	)
+
 	insinto ${MY_HTDOCSDIR}
 	doins *.php *.inc *.phtml
 	for DIR in ${DIRS[*]}; do
-		dodir ${MY_HTDOCSDIR}/${DIR}
 		insinto ${MY_HTDOCSDIR}/${DIR}
 		doins ${DIR}/*
-		test -f ${DIR}/.htaccess && doins ${DIR}/.htaccess
+		[[ -f ${DIR}/.htaccess ]] && doins ${DIR}/.htaccess
 	done
 
 	# installing some docs
-	local DOCS=(
-		"AdminSettings.sample"
-		"COPYING"
-		"FAQ"
-		"HISTORY"
-		"INSTALL"
-		"README"
-		"RELEASE-NOTES"
-		"UPGRADE"
-	)
-	for DOC in ${DOCS[*]}; do
-		dodoc "${DOC}"
-		rm -f "${DOC}"
-	done
-	dodoc docs/*.txt
-	rm -f docs/*.txt
+	local DOCS="AdminSettings.sample FAQ HISTORY INSTALL README RELEASE-NOTES UPGRADE"
+	dodoc ${DOCS} docs/*.txt
+	rm -f ${DOCS} COPYING docs/*.txt
 
 	docinto php-memcached
 	dodoc docs/php-memcached/*
@@ -152,13 +142,12 @@ src_install() {
 	# install instructions guide the user to enable the feature.
 	if use math; then
 		einfo "Installing math support"
-		dodir ${MY_HTDOCSDIR}/math
 		exeinto ${MY_HTDOCSDIR}/math
 		doexe math/texvc
 
 		# Docs
 		docinto math
-		dodoc math/README math/TODO
+		dodoc math/{README,TODO}
 
 		# Working directories.  Server writeable.
 		dodir ${MY_HTDOCSDIR}/images/math
@@ -167,6 +156,6 @@ src_install() {
 		webapp_serverowned ${MY_HTDOCSDIR}/images/tmp
 	fi
 
-	webapp_postinst_txt en "${FILESDIR}/postinstall-1.5-en.txt"
+	webapp_postinst_txt en "${FILESDIR}/postinstall-1.11-en.txt"
 	webapp_src_install
 }
diff --git a/www-apps/mediawiki/mediawiki-1.6.10.ebuild b/www-apps/mediawiki/mediawiki-1.6.10.ebuild
deleted file mode 100644
index b7c92567e163..000000000000
--- a/www-apps/mediawiki/mediawiki-1.6.10.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.6.10.ebuild,v 1.3 2007/11/26 12:00:23 tchiwam Exp $
-
-inherit webapp depend.php
-
-DESCRIPTION="The MediaWiki wiki web application (as used on wikipedia.org)"
-HOMEPAGE="http://www.mediawiki.org"
-SRC_URI="mirror://sourceforge/wikipedia/${P/.0_/}.tar.gz"
-RESTRICT="mirror"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="imagemagick math"
-
-S="${WORKDIR}/${P/.0_/}"
-
-DEPEND="math? ( >=dev-lang/ocaml-3.0.6 )"
-
-RDEPEND="
-		>=virtual/mysql-4.0
-		math? (
-			virtual/tetex
-			virtual/ghostscript
-			media-gfx/imagemagick
-		)
-		imagemagick? (
-			media-gfx/imagemagick
-		)
-"
-
-need_php
-
-pkg_setup() {
-	webapp_pkg_setup
-	require_php_with_use pcre session mysql
-	require_gd
-}
-
-src_compile() {
-	if use math; then
-		einfo "Compiling math support"
-		cd math || die
-		emake || die
-	else
-		einfo "No math support enabled. Skipping."
-	fi
-
-	# TODO: think about includes/zhtable/ support
-}
-
-src_install() {
-	webapp_src_preinst
-
-	# copy the app's main files excluding math support, docs, and tests
-	local DIRS=(
-		"bin"
-		"config"
-		"extensions"
-		"images"
-		"includes"
-		"includes/cbt"
-		"includes/normal"
-		"includes/templates"
-		"includes/zhtable"
-		"languages"
-		"locale"
-		"maintenance"
-		"maintenance/archives"
-		"maintenance/dtrace"
-		"maintenance/mysql5"
-		"maintenance/oracle"
-		"maintenance/oracle/archive"
-		"maintenance/storage"
-		"skins"
-		"skins/chick"
-		"skins/common"
-		"skins/common/images"
-		"skins/common/images/icons"
-		"skins/disabled"
-		"skins/htmldump"
-		"skins/monobook"
-		"skins/myskin"
-		"skins/simple"
-	)
-	insinto ${MY_HTDOCSDIR}
-	doins *.php *.inc *.phtml
-	for DIR in ${DIRS[*]}; do
-		dodir ${MY_HTDOCSDIR}/${DIR}
-		insinto ${MY_HTDOCSDIR}/${DIR}
-		doins ${DIR}/*
-		test -f ${DIR}/.htaccess && doins ${DIR}/.htaccess
-	done
-
-	# installing some docs
-	local DOCS=(
-		"AdminSettings.sample"
-		"COPYING"
-		"FAQ"
-		"HISTORY"
-		"INSTALL"
-		"README"
-		"RELEASE-NOTES"
-		"UPGRADE"
-	)
-	for DOC in ${DOCS[*]}; do
-		dodoc "${DOC}"
-		rm -f "${DOC}"
-	done
-	dodoc docs/*.txt
-	rm -f docs/*.txt
-
-	docinto php-memcached
-	dodoc docs/php-memcached/*
-
-	# If imagemagick is enabled then setup for image upload.
-	# We ensure the directory is prepared for writing.  The post-
-	# install instructions guide the user to enable the feature.
-	if use imagemagick; then
-		webapp_serverowned ${MY_HTDOCSDIR}/images
-	fi
-
-	# 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"
-		dodir ${MY_HTDOCSDIR}/math
-		exeinto ${MY_HTDOCSDIR}/math
-		doexe math/texvc
-
-		# Docs
-		docinto math
-		dodoc math/README math/TODO
-
-		# 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
-
-	webapp_postinst_txt en "${FILESDIR}/postinstall-1.5-en.txt"
-	webapp_src_install
-}
diff --git a/www-apps/mediawiki/mediawiki-1.9.4.ebuild b/www-apps/mediawiki/mediawiki-1.9.4.ebuild
deleted file mode 100644
index 7e803e3c6941..000000000000
--- a/www-apps/mediawiki/mediawiki-1.9.4.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.9.4.ebuild,v 1.2 2007/11/26 12:00:23 tchiwam Exp $
-
-inherit webapp depend.php versionator
-
-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/.0_/}.tar.gz"
-RESTRICT="mirror"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="imagemagick math mysql postgres restrict"
-
-S="${WORKDIR}/${P/.0_/}"
-
-DEPEND="math? ( >=dev-lang/ocaml-3.0.6 )"
-
-RDEPEND="
-		>=dev-lang/php-5.1.4-r6
-		math? (
-			virtual/tetex
-			virtual/ghostscript
-			media-gfx/imagemagick
-		)
-		imagemagick? (
-			media-gfx/imagemagick
-		)
-"
-
-need_php
-
-pkg_setup() {
-	webapp_pkg_setup
-	require_php_with_use pcre session
-	if use mysql ; then
-		require_php_with_use mysql
-	fi
-	if use postgres ; then
-		require_php_with_use postgres
-	fi
-	require_gd
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/jobindexlength-mysql.patch"
-	if use restrict ; then
-		epatch "${FILESDIR}/access_restrict.patch"
-	fi
-}
-
-src_compile() {
-	if use math; then
-		einfo "Compiling math support"
-		cd math || die
-		emake || die
-	else
-		einfo "No math support enabled. Skipping."
-	fi
-
-	# TODO: think about includes/zhtable/ support
-}
-
-src_install() {
-	webapp_src_preinst
-
-	# copy the app's main files excluding math support, docs, and tests
-	local DIRS=(
-		"bin"
-		"config"
-		"extensions"
-		"images"
-		"includes"
-		"includes/api"
-		"includes/cbt"
-		"includes/normal"
-		"includes/templates"
-		"includes/zhtable"
-		"languages"
-		"languages/classes"
-		"languages/messages"
-		"locale"
-		"maintenance"
-		"maintenance/archives"
-		"maintenance/postgres"
-		"maintenance/dtrace"
-		"maintenance/mysql5"
-		"maintenance/storage"
-		"serialized"
-		"skins"
-		"skins/chick"
-		"skins/common"
-		"skins/common/images"
-		"skins/common/images/icons"
-		"skins/disabled"
-		"skins/htmldump"
-		"skins/monobook"
-		"skins/myskin"
-		"skins/simple"
-	)
-	insinto ${MY_HTDOCSDIR}
-	doins *.php *.inc *.phtml
-	for DIR in ${DIRS[*]}; do
-		dodir ${MY_HTDOCSDIR}/${DIR}
-		insinto ${MY_HTDOCSDIR}/${DIR}
-		doins ${DIR}/*
-		test -f ${DIR}/.htaccess && doins ${DIR}/.htaccess
-	done
-
-	# installing some docs
-	local DOCS=(
-		"AdminSettings.sample"
-		"COPYING"
-		"FAQ"
-		"HISTORY"
-		"INSTALL"
-		"README"
-		"RELEASE-NOTES"
-		"UPGRADE"
-	)
-	for DOC in ${DOCS[*]}; do
-		dodoc "${DOC}"
-		rm -f "${DOC}"
-	done
-	dodoc docs/*.txt
-	rm -f docs/*.txt
-
-	docinto php-memcached
-	dodoc docs/php-memcached/*
-
-	# If imagemagick is enabled then setup for image upload.
-	# We ensure the directory is prepared for writing.  The post-
-	# install instructions guide the user to enable the feature.
-	if use imagemagick; then
-		webapp_serverowned ${MY_HTDOCSDIR}/images
-	fi
-
-	# 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"
-		dodir ${MY_HTDOCSDIR}/math
-		exeinto ${MY_HTDOCSDIR}/math
-		doexe math/texvc
-
-		# Docs
-		docinto math
-		dodoc math/README math/TODO
-
-		# 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
-
-	webapp_postinst_txt en "${FILESDIR}/postinstall-1.5-en.txt"
-	webapp_src_install
-}