fix #218051; version bump

Package-Manager: portage-2.1.4.4

6 files changed, 187 insertions, 21 deletions

diff --git a/www-apps/mediawiki/ChangeLog b/www-apps/mediawiki/ChangeLog
index 3a9b7accbfbe..5632fb58869d 100644
--- a/www-apps/mediawiki/ChangeLog
+++ b/www-apps/mediawiki/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/mediawiki
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.109 2008/08/23 04:54:30 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.110 2008/09/01 07:47:36 hollow Exp $
+
+*mediawiki-1.13.0 (01 Sep 2008)
+
+  01 Sep 2008; Benedikt Böhm <hollow@gentoo.org> mediawiki-1.11.1.ebuild,
+  mediawiki-1.11.2.ebuild, mediawiki-1.12.0.ebuild,
+  +mediawiki-1.13.0.ebuild:
+  fix #218051; version bump
 
   23 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index cff15ad4c2e9..367ada744a77 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
@@ -8,15 +5,10 @@ AUX postinstall-1.11-en.txt 2502 RMD160 a72826f3b8e4b6461c50227d4db5ec5da79e710d
 DIST mediawiki-1.11.1.tar.gz 4885712 RMD160 c4ccc87acbbea4868094c83f58cf2142217d2267 SHA1 d452e0013969b064a2166eeae8d03227a8ff1fa3 SHA256 05173b49b73a289ff532baf4088215756804075394268b733ba2ae4265be9476
 DIST mediawiki-1.11.2.tar.gz 4880707 RMD160 e12cda810df8863c7adc84c9c44965335d0e85e0 SHA1 c5d5e99d73e646cff421b3bb92dd638fb93cd575 SHA256 3516fd7f0069e30b1ed6b6fea3794047ac08baf3cf71085c6943605efafd806f
 DIST mediawiki-1.12.0.tar.gz 7188806 RMD160 d4a4bd5b18345623c83aa368f6e5912d87d3589b SHA1 48bf1877f60c317cbe93c072187dfe9c1aa3b857 SHA256 478b38b29f0f6e661b6c632f39e570d654f83c5069b69de2f187b43c20bc8809
-EBUILD mediawiki-1.11.1.ebuild 4287 RMD160 fa38173812823d4a70202f3b0f123a32bb359955 SHA1 1048d0ea43d7b35bde6ecca85a4fa760bedb3224 SHA256 66edaed02817bcddb434d9d232732ad24cc5623457d34c02c3fccd86709c598e
-EBUILD mediawiki-1.11.2.ebuild 4287 RMD160 5934ed66c5d9dcc6ab4eac6e7b356d5c6006f0b1 SHA1 16573c4b97f47bab7f35a7b1befe0ebfaf837baf SHA256 31c19fe7994d20de5bdedb265170238d3cff98e057d1f5da5dc023b205601012
-EBUILD mediawiki-1.12.0.ebuild 4305 RMD160 53e2251d32c7aeca7922a9985c3973bbe4ee8a2c SHA1 194611d397ba7a412521dac32cdae4f6a4e7068e SHA256 12ea17ec84c4463c3bc1a3e0185b9917597e9e72ffc567e4b8952c0db55d0dc6
-MISC ChangeLog 19008 RMD160 78b552de127d5b2abd3bc6570669bf42c2407e48 SHA1 a7c1ff73898e351d6f5aae78e75921faaa4cd174 SHA256 d3342461c381c3922d51f0943f165d6fca70abce7d6c792fffcdd87e882ae00b
+DIST mediawiki-1.13.0.tar.gz 8932822 RMD160 b73d811cd99ec468fb2d8ede3ea26a7f1f0f13ef SHA1 f53f7548510a39fd9f365d3097e8a581fdb14353 SHA256 256e5bdee1ab290d0422a36b45879cc049ecccd5644b1aa0e44eb02baa2a90b4
+EBUILD mediawiki-1.11.1.ebuild 4290 RMD160 40be9715cb7a980403bf03787177470253bbbc4e SHA1 ed33b677d10e21796ac794a38808a6e63ce3e839 SHA256 c3dc1ad61b1fa5c54e8e9cf533775c57657e591017fed0ad00034b10b1198d20
+EBUILD mediawiki-1.11.2.ebuild 4290 RMD160 a388e21da0ab0ded3c9c3e47ad33e0fb9d67b44a SHA1 eb89e22640fe59833298a76c0a9fbfbc4a7adff5 SHA256 d003e85adb4c5121dc28a5abeacf582c4a71b07398e759f29ba87006ac310282
+EBUILD mediawiki-1.12.0.ebuild 4307 RMD160 2c00ef37c5a8d5eb2e55f603349a6f2739d78e2e SHA1 b466824d0738c41a7febbc081a5c4a46e9a3052e SHA256 edf35218a644213f6a9042275aa82d68ab20350cab484a1ea4f77b21b47cb641
+EBUILD mediawiki-1.13.0.ebuild 4307 RMD160 c16b866e54bb172b6d89fd1ab1e8ac2ebbc63fb2 SHA1 cf1b0c306e998cf997729bbae22353ed20c7e964 SHA256 78a9fd729389405b4e44993f8ea30e34e8f68df7ac2c0b18423adf25651798c1
+MISC ChangeLog 19225 RMD160 24e587f459b53b1249bdc1ca3f75994cdf2eb6cf SHA1 1d700a5f59e96f23c3f0255c3026110e93097601 SHA256 9cb48b75c9a711a9f25230010416f3d770433c6d5637f537dfe4026af1bd8e30
 MISC metadata.xml 418 RMD160 337019d783d66bbadf67162c84d6d3b8b3a8f0f4 SHA1 b49b71fd11a91a2e5f8953cf9a1643abee3c67b3 SHA256 68dd9b135528db0c39e306e60b4e910b402ee121fa1b0dc17107d1ba7c66d0eb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkivmAsACgkQoeSe8B0zEfwBSwCgiDT4yQIzXM0zukLZ6/YyMXv1
-zYwAnjskIC5de/4sQStIcJoGY25ZCQtS
-=Dwz4
------END PGP SIGNATURE-----
diff --git a/www-apps/mediawiki/mediawiki-1.11.1.ebuild b/www-apps/mediawiki/mediawiki-1.11.1.ebuild
index 59d8561d0655..d5f70eaa16f9 100644
--- a/www-apps/mediawiki/mediawiki-1.11.1.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.11.1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.7 2008/04/03 10:06:02 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.11.1.ebuild,v 1.8 2008/09/01 07:47:36 hollow Exp $
 
 EAPI="1"
 inherit webapp depend.php versionator eutils
@@ -19,7 +19,7 @@ DEPEND="math? ( >=dev-lang/ocaml-3.0.6 )"
 RDEPEND="${DEPEND}
 	math? (
 		app-text/dvipng
-		virtual/tetex
+		virtual/tex-base
 		virtual/ghostscript
 		media-gfx/imagemagick
 	)
diff --git a/www-apps/mediawiki/mediawiki-1.11.2.ebuild b/www-apps/mediawiki/mediawiki-1.11.2.ebuild
index 895a97e5cb58..136c07ca8853 100644
--- a/www-apps/mediawiki/mediawiki-1.11.2.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.11.2.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.6 2008/04/03 10:06:02 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.11.2.ebuild,v 1.7 2008/09/01 07:47:36 hollow Exp $
 
 EAPI="1"
 inherit webapp depend.php versionator eutils
@@ -19,7 +19,7 @@ DEPEND="math? ( >=dev-lang/ocaml-3.0.6 )"
 RDEPEND="${DEPEND}
 	math? (
 		app-text/dvipng
-		virtual/tetex
+		virtual/tex-base
 		virtual/ghostscript
 		media-gfx/imagemagick
 	)
diff --git a/www-apps/mediawiki/mediawiki-1.12.0.ebuild b/www-apps/mediawiki/mediawiki-1.12.0.ebuild
index f6d33beb0997..3d7603e47293 100644
--- a/www-apps/mediawiki/mediawiki-1.12.0.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.12.0.ebuild
@@ -1,6 +1,6 @@
 # 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.12.0.ebuild,v 1.3 2008/06/26 11:15:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.12.0.ebuild,v 1.4 2008/09/01 07:47:36 hollow Exp $
 
 EAPI="1"
 inherit webapp depend.php versionator eutils
@@ -19,7 +19,7 @@ DEPEND="math? ( >=dev-lang/ocaml-3.0.6 )"
 RDEPEND="${DEPEND}
 	math? (
 		app-text/dvipng
-		virtual/tetex
+		virtual/tex-base
 		virtual/ghostscript
 		media-gfx/imagemagick
 	)
diff --git a/www-apps/mediawiki/mediawiki-1.13.0.ebuild b/www-apps/mediawiki/mediawiki-1.13.0.ebuild
new file mode 100644
index 000000000000..67b5212625b8
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.13.0.ebuild
@@ -0,0 +1,167 @@
+# 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.13.0.ebuild,v 1.1 2008/09/01 07:47:36 hollow 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 restrict +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_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_${PV}.patch"
+	fi
+}
+
+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."
+	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/filerepo"
+		"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
+		insinto ${MY_HTDOCSDIR}/${DIR}
+		doins ${DIR}/*
+		[[ -f ${DIR}/.htaccess ]] && doins ${DIR}/.htaccess
+	done
+
+	# installing some docs
+	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/*
+
+	# 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"
+		exeinto ${MY_HTDOCSDIR}/math
+		doexe math/texvc
+
+		# Docs
+		docinto math
+		dodoc math/{README,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.11-en.txt"
+	webapp_src_install
+}