more cleanup

(Portage version: 2.0.53_rc6)

8 files changed, 6 insertions, 364 deletions

diff --git a/www-apps/mediawiki/ChangeLog b/www-apps/mediawiki/ChangeLog
index d0878e5bc1d5..a4c459fe6a71 100644
--- a/www-apps/mediawiki/ChangeLog
+++ b/www-apps/mediawiki/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/mediawiki
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.38 2005/10/26 16:29:39 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.39 2005/10/26 16:38:06 trapni Exp $
+
+  26 Oct 2005; Christian Parpart <trapni@gentoo.org>
+  -mediawiki-1.5.0_rc2.ebuild, -mediawiki-1.5.0_rc3.ebuild,
+  -mediawiki-1.5.0_rc4.ebuild:
+  more cleanup
 
   26 Oct 2005; Christian Parpart <trapni@gentoo.org>
   -mediawiki-1.5.0_rc4-r1.ebuild:
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index 75cf0f241d36..9eb3c7d094f2 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -28,8 +28,5 @@ MD5 4a5dbf7502c5e1c63b49ca91f378d5d4 mediawiki-1.4.8.ebuild 2788
 MD5 387803dfbebedc5a239cb73beb1c6901 mediawiki-1.4.9-r1.ebuild 2790
 MD5 3219b106dec605bb1d275a0dc4ec1e3c mediawiki-1.4.9.ebuild 2788
 MD5 4e7b0633ddae335dd5cf446016de24d8 mediawiki-1.5.0.ebuild 2936
-MD5 aad0574c17a7b7fe55b6386582073021 mediawiki-1.5.0_rc2.ebuild 2913
-MD5 c5c75d463f4267ce9b1f328e2e2f3fba mediawiki-1.5.0_rc3.ebuild 2913
-MD5 21c484751b38dc6723904c4924630a9c mediawiki-1.5.0_rc4.ebuild 2913
 MD5 c4f2cd2731968301ae318465664bacc7 mediawiki-1.5.1.ebuild 2936
 MD5 4ce25f8911fa68ab85e31b0953266511 metadata.xml 226
diff --git a/www-apps/mediawiki/files/digest-mediawiki-1.5.0_rc2 b/www-apps/mediawiki/files/digest-mediawiki-1.5.0_rc2
deleted file mode 100644
index 69e98037aa22..000000000000
--- a/www-apps/mediawiki/files/digest-mediawiki-1.5.0_rc2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d3855d011ad3e860d98e2e9ae5178cbd mediawiki-1.5rc2.tar.gz 2217612
diff --git a/www-apps/mediawiki/files/digest-mediawiki-1.5.0_rc3 b/www-apps/mediawiki/files/digest-mediawiki-1.5.0_rc3
deleted file mode 100644
index e9d82cfdbd80..000000000000
--- a/www-apps/mediawiki/files/digest-mediawiki-1.5.0_rc3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fd051830057a1b5e7ea7032933a9cd6c mediawiki-1.5rc3.tar.gz 2217807
diff --git a/www-apps/mediawiki/files/digest-mediawiki-1.5.0_rc4 b/www-apps/mediawiki/files/digest-mediawiki-1.5.0_rc4
deleted file mode 100644
index e9d99d906e11..000000000000
--- a/www-apps/mediawiki/files/digest-mediawiki-1.5.0_rc4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5a27beedfa4107813296307fe52b20ad mediawiki-1.5rc4.tar.gz 2216391
diff --git a/www-apps/mediawiki/mediawiki-1.5.0_rc2.ebuild b/www-apps/mediawiki/mediawiki-1.5.0_rc2.ebuild
deleted file mode 100644
index 05a535db1a47..000000000000
--- a/www-apps/mediawiki/mediawiki-1.5.0_rc2.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.5.0_rc2.ebuild,v 1.1 2005/08/24 07:09:31 trapni Exp $
-
-inherit webapp
-
-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 ~x86"
-IUSE="imagemagick math"
-
-S="${WORKDIR}/${P/.0_/}"
-
-DEPEND="math? ( >=dev-lang/ocaml-3.0.6 )"
-
-RDEPEND="virtual/php
-		 >=dev-db/mysql-4
-		 math? ( virtual/tetex
-		 		 app-text/ghostscript
-				 media-gfx/imagemagick )
-		 imagemagick? ( media-gfx/imagemagick )"
-
-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="
-		config
-		extensions
-		images
-		includes
-		includes/normal
-		includes/templates
-		includes/zhtable
-		languages
-		maintenance
-		maintenance/archives
-		maintenance/dtrace
-		maintenance/oracle
-		maintenance/oracle/archives
-		maintenance/postgresql
-		maintenance/storage
-		skins
-		skins/amethyst
-		skins/chick
-		skins/common
-		skins/common/images
-		skins/common/images/icons
-		skins/disabled
-		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.4-en.txt
-	webapp_src_install
-}
diff --git a/www-apps/mediawiki/mediawiki-1.5.0_rc3.ebuild b/www-apps/mediawiki/mediawiki-1.5.0_rc3.ebuild
deleted file mode 100644
index 121c9d0c8274..000000000000
--- a/www-apps/mediawiki/mediawiki-1.5.0_rc3.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.5.0_rc3.ebuild,v 1.1 2005/08/25 22:20:37 trapni Exp $
-
-inherit webapp
-
-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 ~x86"
-IUSE="imagemagick math"
-
-S="${WORKDIR}/${P/.0_/}"
-
-DEPEND="math? ( >=dev-lang/ocaml-3.0.6 )"
-
-RDEPEND="virtual/php
-		 >=dev-db/mysql-4
-		 math? ( virtual/tetex
-		 		 app-text/ghostscript
-				 media-gfx/imagemagick )
-		 imagemagick? ( media-gfx/imagemagick )"
-
-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="
-		config
-		extensions
-		images
-		includes
-		includes/normal
-		includes/templates
-		includes/zhtable
-		languages
-		maintenance
-		maintenance/archives
-		maintenance/dtrace
-		maintenance/oracle
-		maintenance/oracle/archives
-		maintenance/postgresql
-		maintenance/storage
-		skins
-		skins/amethyst
-		skins/chick
-		skins/common
-		skins/common/images
-		skins/common/images/icons
-		skins/disabled
-		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.4-en.txt
-	webapp_src_install
-}
diff --git a/www-apps/mediawiki/mediawiki-1.5.0_rc4.ebuild b/www-apps/mediawiki/mediawiki-1.5.0_rc4.ebuild
deleted file mode 100644
index eae69e84d63d..000000000000
--- a/www-apps/mediawiki/mediawiki-1.5.0_rc4.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.5.0_rc4.ebuild,v 1.1 2005/08/30 22:40:16 trapni Exp $
-
-inherit webapp
-
-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 ~x86"
-IUSE="imagemagick math"
-
-S="${WORKDIR}/${P/.0_/}"
-
-DEPEND="math? ( >=dev-lang/ocaml-3.0.6 )"
-
-RDEPEND="virtual/php
-		 >=dev-db/mysql-4
-		 math? ( virtual/tetex
-		 		 app-text/ghostscript
-				 media-gfx/imagemagick )
-		 imagemagick? ( media-gfx/imagemagick )"
-
-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="
-		config
-		extensions
-		images
-		includes
-		includes/normal
-		includes/templates
-		includes/zhtable
-		languages
-		maintenance
-		maintenance/archives
-		maintenance/dtrace
-		maintenance/oracle
-		maintenance/oracle/archives
-		maintenance/postgresql
-		maintenance/storage
-		skins
-		skins/amethyst
-		skins/chick
-		skins/common
-		skins/common/images
-		skins/common/images/icons
-		skins/disabled
-		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.4-en.txt
-	webapp_src_install
-}