Bug 135883

(Portage version: 2.0.54-r2)

4 files changed, 154 insertions, 2 deletions

diff --git a/www-apps/mediawiki/ChangeLog b/www-apps/mediawiki/ChangeLog
index d4cc34e01dec..01ecc26aaeff 100644
--- a/www-apps/mediawiki/ChangeLog
+++ b/www-apps/mediawiki/ChangeLog
@@ -1,6 +1,11 @@
 # 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.57 2006/05/23 15:53:48 tchiwam Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.58 2006/06/07 11:03:18 tchiwam Exp $
+
+*mediawiki-1.6.7 (07 Jun 2006)
+  07 Jun 2006; Philippe Trottier <tchiwam@gentoo.org>
+  +mediawiki-1.6.6.ebuild:
+  version bump, security bug #135883
 
 *mediawiki-1.6.6 (23 May 2006)
   23 May 2006; Philippe Trottier <tchiwam@gentoo.org>
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index f9a4e00cffce..923886d74602 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -1,4 +1,4 @@
-MD5 d9eaf7cf4be78f4db38475707a437a10 ChangeLog 9473
+MD5 ab695f846a2f67c53c6ef953439156d1 ChangeLog 9623
 MD5 463e35139bff169c5a262ac999d7b16b files/digest-mediawiki-1.3.16 69
 MD5 0cb49c402ac7c5ac958de17c74dda844 files/digest-mediawiki-1.3.17 69
 MD5 f9a834b189520af6979375f918f5f7d8 files/digest-mediawiki-1.3.18 69
@@ -13,6 +13,7 @@ MD5 4317a67804cac69648fa72cbf25d22c5 files/digest-mediawiki-1.5.8 250
 MD5 1d666786db723b5caccc83db0e7d0f23 files/digest-mediawiki-1.6.4 68
 MD5 ec639b9694b19e3a8d65d34c3b4300d1 files/digest-mediawiki-1.6.5 68
 MD5 af06ad7ae2a018da1f398fef6cf3b348 files/digest-mediawiki-1.6.6 68
+MD5 6a545d68d6bf95571e3619196b0f9186 files/digest-mediawiki-1.6.7 66
 MD5 7ec90d807694699cb90d9a56ec2ff67b files/postinstall-1.4-en.txt 1843
 MD5 90f0eb21b7617d28f1c524baabdf6c8c files/postinstall-1.5-en.txt 1842
 MD5 85f32b5fca9afd6479cdcea022c096f2 files/postinstall-en.txt 1731
@@ -30,4 +31,5 @@ MD5 007cec979a4e4d7267fc32d33012e732 mediawiki-1.5.8.ebuild 2948
 MD5 6e22179c8e8866b2ac670fa3c90ff054 mediawiki-1.6.4.ebuild 3142
 MD5 33feaeb08d076c8e6a25dc20999927eb mediawiki-1.6.5.ebuild 3142
 MD5 d94af46a7fa061f6471e94f4e6042a42 mediawiki-1.6.6.ebuild 3143
+MD5 427783166df98b4e46ec4db05d61b577 mediawiki-1.6.7.ebuild 3143
 MD5 6e1b02a80fc901d2eaadf52a50e0b905 metadata.xml 366
diff --git a/www-apps/mediawiki/files/digest-mediawiki-1.6.7 b/www-apps/mediawiki/files/digest-mediawiki-1.6.7
new file mode 100644
index 000000000000..0663064aa3bc
--- /dev/null
+++ b/www-apps/mediawiki/files/digest-mediawiki-1.6.7
@@ -0,0 +1 @@
+MD5 cdc716aed13a14eae28be1d5980769f1 mediawiki-1.6.7.tar.gz 12208
diff --git a/www-apps/mediawiki/mediawiki-1.6.7.ebuild b/www-apps/mediawiki/mediawiki-1.6.7.ebuild
new file mode 100644
index 000000000000..f68cd167de7c
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.6.7.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.6.7.ebuild,v 1.1 2006/06/07 11:03:18 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="
+		>=dev-db/mysql-4.0.14
+		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
+	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
+}