Bug fix and version bump

(Portage version: 2.1-r2)

3 files changed, 152 insertions, 1 deletions

diff --git a/www-apps/mediawiki/ChangeLog b/www-apps/mediawiki/ChangeLog
index d948294af084..0c10445f5709 100644
--- a/www-apps/mediawiki/ChangeLog
+++ b/www-apps/mediawiki/ChangeLog
@@ -1,6 +1,10 @@
 # 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.60 2006/08/30 14:22:15 tchiwam Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.61 2006/08/30 14:32:50 tchiwam Exp $
+
+*mediawiki-1.6.8 (30 Aug 2006)
+  30 Aug 2006; Philippe Trottier <tchiwam@gentoo.org>
+  +mediawiki-1.6.8.ebuild: Version bump and bug fix.
 
 *mediawiki-1.4.x (30 Aug 2006)
   30 Aug 2006; Philippe Trottier <tchiwam@gentoo.org>
diff --git a/www-apps/mediawiki/files/digest-mediawiki-1.6.8 b/www-apps/mediawiki/files/digest-mediawiki-1.6.8
new file mode 100644
index 000000000000..30e78c4e7b9d
--- /dev/null
+++ b/www-apps/mediawiki/files/digest-mediawiki-1.6.8
@@ -0,0 +1,3 @@
+MD5 4befcbe776f8585efe705b9bd799a488 mediawiki-1.6.8.tar.gz 2728821
+RMD160 a73c03f4e9cb9ca857dcba08eb4addc72d0b67f8 mediawiki-1.6.8.tar.gz 2728821
+SHA256 c2cc2e701007ea7a141567fb86e16a4680b17c03ef617e9d081a7af87aa95a39 mediawiki-1.6.8.tar.gz 2728821
diff --git a/www-apps/mediawiki/mediawiki-1.6.8.ebuild b/www-apps/mediawiki/mediawiki-1.6.8.ebuild
new file mode 100644
index 000000000000..a55277e30b6a
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.6.8.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.8.ebuild,v 1.1 2006/08/30 14:32:50 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 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
+}