bug 161091

(Portage version: 2.1.1-r2)

8 files changed, 489 insertions, 4 deletions

diff --git a/www-apps/mediawiki/ChangeLog b/www-apps/mediawiki/ChangeLog
index 372128380ed1..05edf6a8a851 100644
--- a/www-apps/mediawiki/ChangeLog
+++ b/www-apps/mediawiki/ChangeLog
@@ -1,6 +1,26 @@
-# ChangeLog for www-apps/mediawiki
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.71 2006/12/13 00:21:58 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.72 2007/01/09 10:27:00 tchiwam Exp $
+
+*mediawiki-1.8.3 (08 Jan 2007)
+  08 Jan 2007; Philippe Trottier <tchiwam@gentoo.org> +mediawiki-1.8.3:
+  Security update and upstream bug fixes. bug#161091
+  Will not pull the database anymore bug#159781.
+
+*mediawiki-1.7.2 (08 Jan 2007)
+  08 Jan 2007; Philippe Trottier <tchiwam@gentoo.org> +mediawiki-1.7.2:
+  Security update, bug fixes upstream. bug#161091
+
+*mediawiki-1.6.9 (08 Jan 2007)
+  08 Jan 2007; Philippe Trottier <tchiwam@gentoo.org> +mediawiki-1.6.9:
+  Security update bug#161091
+
+*mediawiki-1.5.8 (08 Jan 2007)
+  08 Jan 2007; Philippe Trottier <tchiwam@gentoo.org> -mediawiki-1.5.8:
+  mediawiki-1.6.8 can support the dbase used by 1.5.x.
+
+*mediawiki-1.4.15 (08 Jan 2007)
+  08 Jan 2007; Philippe Trottier <tchiwam@gentoo.org> -mediawiki-1.4.15:
+  Too hard to support security update on that old version.
 
   13 Dec 2006; Michael Sterrett <mr_bones_@gentoo.org>
   mediawiki-1.8.2.ebuild:
diff --git a/www-apps/mediawiki/files/digest-mediawiki-1.6.9 b/www-apps/mediawiki/files/digest-mediawiki-1.6.9
new file mode 100644
index 000000000000..33b8c9921133
--- /dev/null
+++ b/www-apps/mediawiki/files/digest-mediawiki-1.6.9
@@ -0,0 +1,3 @@
+MD5 1ce42061b5f7ea6e4101826b969d2ee4 mediawiki-1.6.9.tar.gz 2729054
+RMD160 869c0f382b833937926e27193dc73818867f7a4c mediawiki-1.6.9.tar.gz 2729054
+SHA256 faa5a0b03a96555f25b7d9a12d2d1fab646a75486cab4107117e282559a89c53 mediawiki-1.6.9.tar.gz 2729054
diff --git a/www-apps/mediawiki/files/digest-mediawiki-1.7.2 b/www-apps/mediawiki/files/digest-mediawiki-1.7.2
new file mode 100644
index 000000000000..7b26c422d885
--- /dev/null
+++ b/www-apps/mediawiki/files/digest-mediawiki-1.7.2
@@ -0,0 +1,3 @@
+MD5 ef33231cb1689dc813f4b08e955f4b18 mediawiki-1.7.2.tar.gz 3256639
+RMD160 722354c5da8efe3c753f7ed2a2adce921ec10e24 mediawiki-1.7.2.tar.gz 3256639
+SHA256 4323abd31c1d5d149bee1f74fa70173d0cc651bd5fe8bf0b1452705ede4743e0 mediawiki-1.7.2.tar.gz 3256639
diff --git a/www-apps/mediawiki/files/digest-mediawiki-1.8.3 b/www-apps/mediawiki/files/digest-mediawiki-1.8.3
new file mode 100644
index 000000000000..c9dcba41e90d
--- /dev/null
+++ b/www-apps/mediawiki/files/digest-mediawiki-1.8.3
@@ -0,0 +1,3 @@
+MD5 9ef825abfcf0888b22571bbb097480f0 mediawiki-1.8.3.tar.gz 3492474
+RMD160 bcee8bec9fbb7d9189c39e32ccc0c1ed3601305c mediawiki-1.8.3.tar.gz 3492474
+SHA256 0fe4d5177e75a52e2a68090813944a283e9c5178305bea1852f410edc93879d3 mediawiki-1.8.3.tar.gz 3492474
diff --git a/www-apps/mediawiki/mediawiki-1.6.9.ebuild b/www-apps/mediawiki/mediawiki-1.6.9.ebuild
new file mode 100644
index 000000000000..5277cf5d2e2a
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.6.9.ebuild
@@ -0,0 +1,144 @@
+# 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.9.ebuild,v 1.1 2007/01/09 10:27:00 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="nomirror"
+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.7.2.ebuild b/www-apps/mediawiki/mediawiki-1.7.2.ebuild
new file mode 100644
index 000000000000..882a084c6aaa
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.7.2.ebuild
@@ -0,0 +1,151 @@
+# 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.7.2.ebuild,v 1.1 2007/01/09 10:27:00 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="nomirror"
+LICENSE="GPL-2"
+#KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE="imagemagick math"
+
+S="${WORKDIR}/${P/.0_/}"
+
+DEPEND="math? ( >=dev-lang/ocaml-3.0.6 )"
+
+RDEPEND="
+		>=dev-lang/php-5.1.4-r6
+		>=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_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/jobindexlength-mysql4.patch
+	epatch ${FILESDIR}/jobindexlength-mysql5.patch
+}
+
+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/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.8.2.ebuild b/www-apps/mediawiki/mediawiki-1.8.2.ebuild
index 85df2e501671..27898bc65347 100644
--- a/www-apps/mediawiki/mediawiki-1.8.2.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.8.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.8.2.ebuild,v 1.6 2006/12/13 00:21:58 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.8.2.ebuild,v 1.7 2007/01/09 10:27:00 tchiwam Exp $
 
 inherit webapp depend.php
 
diff --git a/www-apps/mediawiki/mediawiki-1.8.3.ebuild b/www-apps/mediawiki/mediawiki-1.8.3.ebuild
new file mode 100644
index 000000000000..769d213206fa
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.8.3.ebuild
@@ -0,0 +1,161 @@
+# 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.8.3.ebuild,v 1.1 2007/01/09 10:27:00 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="nomirror"
+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"
+		"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
+}