Tidy all vulnerable ebuilds <1.2.2.

(Portage version: 2.0.51.18)

15 files changed, 11 insertions, 648 deletions

diff --git a/www-apps/wordpress/ChangeLog b/www-apps/wordpress/ChangeLog
index efe243932784..c54c6c5d3ffb 100644
--- a/www-apps/wordpress/ChangeLog
+++ b/www-apps/wordpress/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/wordpress
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/ChangeLog,v 1.9 2004/12/19 00:30:03 weeve Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/ChangeLog,v 1.10 2005/03/02 11:36:59 ka0ttic Exp $
+
+  02 Mar 2005; Aaron Walker <ka0ttic@gentoo.org>
+  -files/wordpress-1.0.2.gentoo.diff, -files/1.2/login-patch.diff,
+  -files/1.2/postinstall-en.txt, -files/1.2.1/login-patch.diff,
+  -files/1.2.1/postinstall-en.txt, -wordpress-1.0.2.ebuild,
+  -wordpress-1.2-r1.ebuild, -wordpress-1.2.1.ebuild, -wordpress-1.2.ebuild:
+  Tidy all vulnerable ebuilds <1.2.2.
 
   18 Dec 2004; Jason Wever <weeve@gentoo.org> wordpress-1.2.2.ebuild:
   Stable on sparc wrt security bug #74649.
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index 4b60ba5bb8b1..b83e5286111d 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -1,17 +1,4 @@
-MD5 00abed1388a561c23d2ae4e6b81450e2 ChangeLog 3146
-MD5 4defd726d2b03decc5b7ff21b0aac1a3 metadata.xml 225
-MD5 11ed2b98b5625fc3366ef084526d663e wordpress-1.0.2.ebuild 1959
-MD5 de07e97f74df5ce94f465e7359c76d7f wordpress-1.2-r1.ebuild 1931
-MD5 0aaa512ade97b7734981cc159d205106 wordpress-1.2.ebuild 1932
-MD5 9bbf4af62b26f88c0717357f463f1c7d wordpress-1.2.1.ebuild 1927
 MD5 0ac25997252ba5fa240be54c00823002 wordpress-1.2.2.ebuild 2093
-MD5 3310de51163cfb2a4b23c784003c123d files/digest-wordpress-1.0.2 74
-MD5 60c89171f6db7c359da81d9bd4a78853 files/digest-wordpress-1.2 72
-MD5 60c89171f6db7c359da81d9bd4a78853 files/digest-wordpress-1.2-r1 72
-MD5 8798d44320b59c755a81271d58bd3827 files/wordpress-1.0.2.gentoo.diff 7670
-MD5 ddf9ce79b3f5375fbd1a1d7d7f1ecc0d files/digest-wordpress-1.2.1 67
+MD5 3c33d65c3c0311168feebfde24c083a6 ChangeLog 3501
+MD5 4defd726d2b03decc5b7ff21b0aac1a3 metadata.xml 225
 MD5 623542b78674abcdc33bb18a783739c8 files/digest-wordpress-1.2.2 64
-MD5 bf77b16b46337e5eb66a5fb42c3b263d files/1.2/login-patch.diff 2062
-MD5 c2b531747ebb18f8bc7eed6261710c66 files/1.2/postinstall-en.txt 490
-MD5 6c80f1e7f474c6a87d67fe8095a29e9f files/1.2.1/login-patch.diff 569
-MD5 f0b96513c71003534058d672110de669 files/1.2.1/postinstall-en.txt 573
diff --git a/www-apps/wordpress/files/1.2.1/login-patch.diff b/www-apps/wordpress/files/1.2.1/login-patch.diff
deleted file mode 100644
index 0b53e8d80886..000000000000
--- a/www-apps/wordpress/files/1.2.1/login-patch.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -u --recursive wordpress-orig/wp-admin/auth.php wordpress/wp-admin/auth.php
---- wordpress-orig/wp-admin/auth.php	2004-10-08 20:52:08.184876209 +0100
-+++ wordpress/wp-admin/auth.php	2004-10-08 20:54:31.239067434 +0100
-@@ -25,7 +25,7 @@
- 		return false;

- 

- 	} else {

--		if ($login->user_login == $user_login && md5($login->user_pass) == $user_pass_md5) {

-+		if ($login->user_login == $user_login && $login->user_pass == $user_pass_md5) {

- 			return true;

- 		} else {

- 			return false;

-@@ -46,4 +46,4 @@
- 	exit();

- }

- 

--?>
-\ No newline at end of file
-+?>

diff --git a/www-apps/wordpress/files/1.2.1/postinstall-en.txt b/www-apps/wordpress/files/1.2.1/postinstall-en.txt
deleted file mode 100644
index 1706d7197d2f..000000000000
--- a/www-apps/wordpress/files/1.2.1/postinstall-en.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Install instructions
-====================
-
-1) Open up wp-config-sample.php and fill in your database connection details
-2) Save the file as wp-config.php
-
-3) Launch /wp-admin/install.php in your browser.
-4) Note the password given to you.
-
-The install script should then send you to the login page.
-
-Sign in with the username admin and the password generated during the installation.
-
-You can then click on 'Profile' to change the password.
-
-Upgrade instructions
-====================
-
-If you are upgrading from <= wordpress-1.2, point your browser to
-/wp-admin/upgrade.php
diff --git a/www-apps/wordpress/files/1.2/login-patch.diff b/www-apps/wordpress/files/1.2/login-patch.diff
deleted file mode 100644
index 2ed450fc1705..000000000000
--- a/www-apps/wordpress/files/1.2/login-patch.diff
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -u --recursive wordpress/wp-admin/auth.php diary/wp-admin/auth.php
---- wordpress/wp-admin/auth.php	2004-05-19 08:05:40.000000000 +0100
-+++ diary/wp-admin/auth.php	2004-07-20 21:32:39.048004629 +0100
-@@ -15,9 +15,13 @@
- 	}
- 
- 	if ('' == $user_login)
-+	{
- 		return false;
-+	}
- 	if (!$user_pass_md5)
-+	{
- 		return false;
-+	}
- 
- 	$login = $wpdb->get_row("SELECT user_login, user_pass FROM $tableusers WHERE user_login = '$user_login'");
- 
-@@ -25,7 +29,7 @@
- 		return false;
- 
- 	} else {
--		if ($login->user_login == $user_login && md5($login->user_pass) == $user_pass_md5) {
-+		if ($login->user_login == $user_login && $login->user_pass == $user_pass_md5) {
- 			return true;
- 		} else {
- 			return false;
-@@ -46,4 +50,4 @@
- 	exit();
- }
- 
--?>
-\ No newline at end of file
-+?>
-Only in /srv/stu.gnqs.org/www/htdocs/diary/: wp-config.php
-diff -u --recursive wordpress/wp-login.php diary/wp-login.php
---- wordpress/wp-login.php	2004-05-18 02:29:29.000000000 +0100
-+++ diary/wp-login.php	2004-07-20 22:10:53.836444653 +0100
-@@ -74,8 +74,8 @@
- 		global $wpdb, $log, $pwd, $error, $user_ID;
- 		global $tableusers, $pass_is_md5;
- 		$user_login = &$log;
--		$pwd = md5($pwd);
--		$password = &$pwd;
-+		$password = md5($pwd);
-+
- 		if (!$user_login) {
- 			$error = __('<strong>Error</strong>: the login field is empty.');
- 			return false;
-@@ -95,8 +95,9 @@
- 			$pwd = '';
- 			return false;
- 		} else {
--		$user_ID = $login->ID;
--			if (($pass_is_md5 == 0 && $login->user_login == $user_login && $login->user_pass == $password) || ($pass_is_md5 == 1 && $login->user_login == $user_login && $login->user_pass == md5($password))) {
-+			$user_ID = $login->ID;
-+
-+			if ($login->user_login == $user_login && $login->user_pass == $password) {
- 				return true;
- 			} else {
- 				$error = __('<strong>Error</strong>: wrong login or password.');
-@@ -242,7 +243,7 @@
- 
- 		$userdata = get_userdatabylogin($user_login);
- 
--		if ($user_pass_md5 != md5($userdata->user_pass)) {
-+		if (!$userdata || $user_pass_md5 != $userdata->user_pass) {
- 			return false;
- 		} else {
- 			return true;
diff --git a/www-apps/wordpress/files/1.2/postinstall-en.txt b/www-apps/wordpress/files/1.2/postinstall-en.txt
deleted file mode 100644
index 3ce17f858fcc..000000000000
--- a/www-apps/wordpress/files/1.2/postinstall-en.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Install instructions
-
-1) Open up wp-config-sample.php and fill in your database connection details
-2) Save the file as wp-config.php
-
-3) Launch /wp-admin/install.php in your browser.
-4) Note the password given to you.
-
-The install script should then send you to the login page.
-
-Sign in with the username admin and the password generated during the installation.
-
-You can then click on 'Profile' to change the password.
-
-Upgrade instructions
-
-1) Point your browser to /wp-admin/upgrade.php
diff --git a/www-apps/wordpress/files/digest-wordpress-1.0.2 b/www-apps/wordpress/files/digest-wordpress-1.0.2
deleted file mode 100644
index 3c7092e89fbb..000000000000
--- a/www-apps/wordpress/files/digest-wordpress-1.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 62ffd1a241ba9a1652b9681c53e979de wordpress-1.0.2-blakey.tar.gz 223901
diff --git a/www-apps/wordpress/files/digest-wordpress-1.2 b/www-apps/wordpress/files/digest-wordpress-1.2
deleted file mode 100644
index 8f1647645808..000000000000
--- a/www-apps/wordpress/files/digest-wordpress-1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1ba3cde7b7245d4cadc4a31d067dfa46 wordpress-1.2-mingus.tar.gz 247985
diff --git a/www-apps/wordpress/files/digest-wordpress-1.2-r1 b/www-apps/wordpress/files/digest-wordpress-1.2-r1
deleted file mode 100644
index 8f1647645808..000000000000
--- a/www-apps/wordpress/files/digest-wordpress-1.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1ba3cde7b7245d4cadc4a31d067dfa46 wordpress-1.2-mingus.tar.gz 247985
diff --git a/www-apps/wordpress/files/digest-wordpress-1.2.1 b/www-apps/wordpress/files/digest-wordpress-1.2.1
deleted file mode 100644
index 562cdc1810ac..000000000000
--- a/www-apps/wordpress/files/digest-wordpress-1.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 603226176b30bdfa6dc80f6b815d5ba5 wordpress-1.2.1.tar.gz 238639
diff --git a/www-apps/wordpress/files/wordpress-1.0.2.gentoo.diff b/www-apps/wordpress/files/wordpress-1.0.2.gentoo.diff
deleted file mode 100644
index fe09c068a3ea..000000000000
--- a/www-apps/wordpress/files/wordpress-1.0.2.gentoo.diff
+++ /dev/null
@@ -1,213 +0,0 @@
-diff -u --recursive wordpress-1.0.2/b2rdf.php wordpress-1.0.2-patched/b2rdf.php
---- wordpress-1.0.2/b2rdf.php	2004-03-11 19:15:11.000000000 +0000
-+++ wordpress-1.0.2-patched/b2rdf.php	2004-05-01 11:35:57.924240544 +0100
-@@ -1,7 +1,6 @@
- <?php
--$curpath = dirname(__FILE__).'/';
--require_once ($curpath.'wp-config.php');
--require_once ($curpath.WPINC.'/template-functions.php');
-+require_once ('./wp-config.php');
-+require_once ('wp-includes/template-functions.php');
- if (!empty($_SERVER["QUERY_STRING"])) {
- 	$location = get_bloginfo('rdf_url').'?'.$_SERVER["QUERY_STRING"];
- }
-@@ -11,4 +10,4 @@
- header('HTTP/1.0 301 Moved Permanently');
- header('Location: ' . $location . "\n");
- exit;
--?>
-\ No newline at end of file
-+?>
-diff -u --recursive wordpress-1.0.2/b2rss.php wordpress-1.0.2-patched/b2rss.php
---- wordpress-1.0.2/b2rss.php	2004-03-11 19:15:12.000000000 +0000
-+++ wordpress-1.0.2-patched/b2rss.php	2004-05-01 11:36:22.726470032 +0100
-@@ -1,7 +1,6 @@
- <?php
--$curpath = dirname(__FILE__).'/';
--require_once ($curpath.'wp-config.php');
--require_once ($curpath.WPINC.'/template-functions.php');
-+require_once ('./wp-config.php');
-+require_once ('wp-includes/template-functions.php');
- if (!empty($_SERVER["QUERY_STRING"])) {
- 	$location = get_bloginfo('rss_url').'?'.$_SERVER["QUERY_STRING"];
- }
-@@ -11,4 +10,4 @@
- header('HTTP/1.0 301 Moved Permanently');
- header('Location: ' . $location . "\n");
- exit;
--?>
-\ No newline at end of file
-+?>
-diff -u --recursive wordpress-1.0.2/b2rss2.php wordpress-1.0.2-patched/b2rss2.php
---- wordpress-1.0.2/b2rss2.php	2004-03-11 19:15:12.000000000 +0000
-+++ wordpress-1.0.2-patched/b2rss2.php	2004-05-01 11:36:46.635835256 +0100
-@@ -1,7 +1,6 @@
- <?php
--$curpath = dirname(__FILE__).'/';
--require_once ($curpath.'wp-config.php');
--require_once ($curpath.WPINC.'/template-functions.php');
-+require_once ('./wp-config.php');
-+require_once ('wp-includes/template-functions.php');
- if (!empty($_SERVER["QUERY_STRING"])) {
- 	$location = get_bloginfo('rss2_url').'?'.$_SERVER["QUERY_STRING"];
- }
-@@ -11,4 +10,4 @@
- header('HTTP/1.0 301 Moved Permanently');
- header('Location: ' . $location . "\n");
- exit;
--?>
-\ No newline at end of file
-+?>
-diff -u --recursive wordpress-1.0.2/index.php wordpress-1.0.2-patched/index.php
---- wordpress-1.0.2/index.php	2004-03-11 19:15:12.000000000 +0000
-+++ wordpress-1.0.2-patched/index.php	2004-05-01 11:37:09.586346248 +0100
-@@ -56,7 +56,7 @@
- 	<?php trackback_rdf(); ?>
- 	-->
- 
--<?php include(ABSPATH . 'wp-comments.php'); ?>
-+<?php include('./wp-comments.php'); ?>
- </div>
- 
- <?php } } else { // end foreach, end if any posts ?>
-@@ -114,4 +114,4 @@
- 
- <p class="credit"><!--<?php echo $wpdb->querycount; ?> queries.--> <?php timer_stop(1); ?> || <cite>Powered by <a href="http://wordpress.org" title="Powered by WordPress, state-of-the-art semantic personal publishing platform"><strong>WordPress</strong></a></cite></p>
- </body>
--</html>
-\ No newline at end of file
-+</html>
-diff -u --recursive wordpress-1.0.2/wp-blog-header.php wordpress-1.0.2-patched/wp-blog-header.php
---- wordpress-1.0.2/wp-blog-header.php	2004-03-11 19:15:48.000000000 +0000
-+++ wordpress-1.0.2-patched/wp-blog-header.php	2004-05-01 11:38:12.799736352 +0100
-@@ -3,7 +3,7 @@
- $use_cache = 1; // No reason not to
- 
- /* Including config and functions files */
--$curpath = dirname(__FILE__).'/';
-+$curpath = '.';
- 
- if (!file_exists($curpath . '/wp-config.php'))
- 	die("There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='http://wordpress.org/docs/faq/#wp-config'>We got it</a>. You can <a href='wp-admin/install-config.php'>create a <code>wp-config.php</code> file through a web interface</a>, but this doesn't work for all server setups. The safest way is to manually create the file.");
-@@ -363,4 +363,4 @@
-     	}
- }
- }
--?>
-\ No newline at end of file
-+?>
-diff -u --recursive wordpress-1.0.2/wp-comments-post.php wordpress-1.0.2-patched/wp-comments-post.php
---- wordpress-1.0.2/wp-comments-post.php	2004-03-11 19:15:48.000000000 +0000
-+++ wordpress-1.0.2-patched/wp-comments-post.php	2004-05-01 11:38:32.395757304 +0100
-@@ -1,5 +1,5 @@
- <?php
--require(dirname(__FILE__) . '/wp-config.php');
-+require('./wp-config.php');
- 
- function add_magic_quotes($array) {
- 	foreach ($array as $k => $v) {
-@@ -129,4 +129,4 @@
- 	die('Sorry, you can only post a new comment once every 10 seconds. Slow down cowboy.');
- }
- 
--?>
-\ No newline at end of file
-+?>
-diff -u --recursive wordpress-1.0.2/wp-includes/links-update-xml.php wordpress-1.0.2-patched/wp-includes/links-update-xml.php
---- wordpress-1.0.2/wp-includes/links-update-xml.php	2004-03-11 19:16:07.000000000 +0000
-+++ wordpress-1.0.2-patched/wp-includes/links-update-xml.php	2004-05-01 11:39:00.026556784 +0100
-@@ -3,7 +3,7 @@
- // Copyright (C) 2003 Mike Little -- mike@zed1.com
- 
- // Get the path of our parent directory:
--$parentpath = dirname(dirname(__FILE__));
-+$parentpath = "../";
- 
- require_once($parentpath.'/wp-config.php');
- 
-@@ -171,4 +171,4 @@
- 	//echo('</pre>');
- } // end if updated cache file
- 
--?>
-\ No newline at end of file
-+?>
-diff -u --recursive wordpress-1.0.2/wp-login.php wordpress-1.0.2-patched/wp-login.php
---- wordpress-1.0.2/wp-login.php	2004-03-11 19:16:10.000000000 +0000
-+++ wordpress-1.0.2-patched/wp-login.php	2004-05-01 11:39:15.439213704 +0100
-@@ -1,5 +1,5 @@
- <?php
--require(dirname(__FILE__) . '/wp-config.php');
-+require('./wp-config.php');
- 
- if (!function_exists('add_magic_quotes')) {
- 	function add_magic_quotes($array) {
-diff -u --recursive wordpress-1.0.2/wp-mail.php wordpress-1.0.2-patched/wp-mail.php
---- wordpress-1.0.2/wp-mail.php	2004-03-11 19:16:11.000000000 +0000
-+++ wordpress-1.0.2-patched/wp-mail.php	2004-05-01 11:40:02.043128832 +0100
-@@ -1,7 +1,7 @@
- <?php
--require(dirname(__FILE__) . '/wp-config.php');
-+require('./wp-config.php');
- 
--require_once(ABSPATH.WPINC.'/class-pop3.php');
-+require_once('wp-includes/class-pop3.php');
- 
- 
- timer_start();
-@@ -286,4 +286,4 @@
- timer_stop($output_debugging_info);
- exit;
- 
--?>
-\ No newline at end of file
-+?>
-diff -u --recursive wordpress-1.0.2/wp-pass.php wordpress-1.0.2-patched/wp-pass.php
---- wordpress-1.0.2/wp-pass.php	2004-03-11 19:16:11.000000000 +0000
-+++ wordpress-1.0.2-patched/wp-pass.php	2004-05-01 11:40:17.169829224 +0100
-@@ -4,8 +4,8 @@
-   It doesn't need to connect to the DB, or do anything fancy at all. Yum.
-   -- Matt
- */
--require(dirname(__FILE__) . '/wp-config.php');
-+require('./wp-config.php');
- setcookie('wp-postpass_'.$cookiehash, $HTTP_POST_VARS['post_password'], time()+60*60*24*30);
- header('Location: ' . $HTTP_SERVER_VARS['HTTP_REFERER']);
- 
--?>
-\ No newline at end of file
-+?>
-diff -u --recursive wordpress-1.0.2/wp-register.php wordpress-1.0.2-patched/wp-register.php
---- wordpress-1.0.2/wp-register.php	2004-03-11 19:16:11.000000000 +0000
-+++ wordpress-1.0.2-patched/wp-register.php	2004-05-01 11:40:28.837055536 +0100
-@@ -1,5 +1,5 @@
- <?php
--require(dirname(__FILE__) . '/wp-config.php');
-+require('./wp-config.php');
- 
- function add_magic_quotes($array) {
- 	foreach ($array as $k => $v) {
-@@ -191,4 +191,4 @@
- <?php
- 
- break;
--}
-\ No newline at end of file
-+}
-diff -u --recursive wordpress-1.0.2/wp-trackback.php wordpress-1.0.2-patched/wp-trackback.php
---- wordpress-1.0.2/wp-trackback.php	2004-03-11 19:16:13.000000000 +0000
-+++ wordpress-1.0.2-patched/wp-trackback.php	2004-05-01 11:40:37.655714896 +0100
-@@ -1,5 +1,5 @@
- <?php
--require(dirname(__FILE__) . '/wp-config.php');
-+require('./wp-config.php');
- 
- // trackback is done by a POST
- $request_array = 'HTTP_POST_VARS';
-@@ -84,4 +84,4 @@
- 		trackback_response(0);
- 	}
- }
--?>
-\ No newline at end of file
-+?>
diff --git a/www-apps/wordpress/wordpress-1.0.2.ebuild b/www-apps/wordpress/wordpress-1.0.2.ebuild
deleted file mode 100644
index 9f98e5fe2ff8..000000000000
--- a/www-apps/wordpress/wordpress-1.0.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-1.0.2.ebuild,v 1.2 2004/09/03 17:17:21 pvdabeel Exp $
-# Mostly ripped off from the squirrelmail ebuild!
-# By Peter Westwood <peter.westwood@ftwr.co.uk>
-
-inherit webapp eutils
-
-#Wordpress releases have a release name tagged on the end of the version on the tar.gz files
-MY_EXT="blakey"
-
-DESCRIPTION="Wordpress php and mysql based CMS system."
-HOMEPAGE="http://wordpress.org/"
-SRC_URI="mirror://sourceforge/cafelog/${P}-${MY_EXT}.tar.gz"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ppc ~sparc"
-IUSE=""
-RDEPEND=">=dev-php/mod_php-4.1
-	 >=dev-db/mysql-3.23.23"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}"
-
-src_unpack() {
-	unpack "${A}"
-	cd ${S}
-	epatch ${FILESDIR}/${P}.gentoo.diff
-}
-
-src_compile() {
-	#Do we need to do any random passwd setup?
-
-	#we need to have this empty function ... default compile hangs
-	echo "Nothing to compile"
-}
-
-src_install() {
-	local docs="license.txt readme.html"
-
-	webapp_src_preinst
-
-	einfo "Installing main files"
-	echo ${D}
-	cp -r . ${D}${MY_HTDOCSDIR}
-
-	# handle documentation files
-	#
-	# NOTE that doc files go into /usr/share/doc as normal; they do NOT
-	# get installed per vhost!
-
-	dodoc ${docs}
-	for doc in ${docs} INSTALL; do
-		rm -f ${doc}
-	done
-
-	# Identify the configuration files that this app uses
-	# User can want to make changes to these!
-	webapp_serverowned ${MY_HTDOCSDIR}/index.php
-	webapp_serverowned ${MY_HTDOCSDIR}/wp-layout.css
-	webapp_serverowned ${MY_HTDOCSDIR}/wp-admin/menu.txt
-	webapp_serverowned ${MY_HTDOCSDIR}
-
-	# Identify any script files that need #! headers adding to run under
-	# a CGI script (such as PHP/CGI)
-	#
-	# for wordpress, we *assume* that all .php files need to have CGI/BIN
-	# support added
-
-	for x in `find . -name '*.php' -print ` ; do
-		webapp_runbycgibin php ${MY_HTDOCSDIR}/$x
-	done
-
-	# now strut stuff
-	webapp_src_install
-}
diff --git a/www-apps/wordpress/wordpress-1.2-r1.ebuild b/www-apps/wordpress/wordpress-1.2-r1.ebuild
deleted file mode 100644
index c90b12276b68..000000000000
--- a/www-apps/wordpress/wordpress-1.2-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-1.2-r1.ebuild,v 1.3 2004/12/18 21:03:06 weeve Exp $
-# Mostly ripped off from the squirrelmail ebuild!
-# By Peter Westwood <peter.westwood@ftwr.co.uk>
-
-inherit webapp eutils
-
-#Wordpress releases have a release name tagged on the end of the version on the tar.gz files
-MY_EXT="mingus"
-
-DESCRIPTION="Wordpress php and mysql based CMS system."
-HOMEPAGE="http://wordpress.org/"
-SRC_URI="mirror://sourceforge/cafelog/${P}-${MY_EXT}.tar.gz"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ppc sparc"
-IUSE=""
-RDEPEND=">=dev-php/mod_php-4.1
-	 >=dev-db/mysql-3.23.23"
-
-DEPEND="${DEPEND} ${RDEPEND} >=net-www/webapp-config-1.10-r5"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${PV}/login-patch.diff
-}
-
-src_install() {
-	local docs="license.txt readme.html"
-
-	webapp_src_preinst
-
-	einfo "Installing main files"
-	cp -r * ${D}${MY_HTDOCSDIR}
-	einfo "Done"
-
-	# handle documentation files
-	#
-	# NOTE that doc files go into /usr/share/doc as normal; they do NOT
-	# get installed per vhost!
-
-	dodoc ${docs}
-	for doc in ${docs} INSTALL; do
-		rm -f ${doc}
-	done
-
-	# Identify the configuration files that this app uses
-	# User can want to make changes to these!
-	webapp_serverowned ${MY_HTDOCSDIR}/index.php
-	webapp_serverowned ${MY_HTDOCSDIR}/wp-layout.css
-	webapp_serverowned ${MY_HTDOCSDIR}/wp-admin/menu.php
-	webapp_serverowned ${MY_HTDOCSDIR}
-
-	# Identify any script files that need #! headers adding to run under
-	# a CGI script (such as PHP/CGI)
-	#
-	# for wordpress, we *assume* that all .php files need to have CGI/BIN
-	# support added
-
-	for x in `find . -name '*.php' -print ` ; do
-		webapp_runbycgibin php ${MY_HTDOCSDIR}/$x
-	done
-
-	# post-install instructions
-	webapp_postinst_txt en ${FILESDIR}/1.2/postinstall-en.txt
-
-	# now strut stuff
-	webapp_src_install
-}
diff --git a/www-apps/wordpress/wordpress-1.2.1.ebuild b/www-apps/wordpress/wordpress-1.2.1.ebuild
deleted file mode 100644
index 4ab5929401f7..000000000000
--- a/www-apps/wordpress/wordpress-1.2.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-1.2.1.ebuild,v 1.1 2004/10/08 20:17:13 stuart Exp $
-# Mostly ripped off from the squirrelmail ebuild!
-# By Peter Westwood <peter.westwood@ftwr.co.uk>
-
-inherit webapp eutils
-
-#Wordpress releases have a release name tagged on the end of the version on the tar.gz files
-#MY_EXT="mingus"
-
-DESCRIPTION="Wordpress php and mysql based blog system."
-HOMEPAGE="http://wordpress.org/"
-SRC_URI="mirror://sourceforge/cafelog/${P}.tar.gz"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
-IUSE=""
-RDEPEND=">=dev-php/mod_php-4.1
-	 >=dev-db/mysql-3.23.23"
-
-DEPEND="${DEPEND} ${RDEPEND} >=net-www/webapp-config-1.10-r5"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${PV}/login-patch.diff
-}
-
-src_install() {
-	local docs="license.txt readme.html"
-
-	webapp_src_preinst
-
-	einfo "Installing main files"
-	cp -r * ${D}${MY_HTDOCSDIR}
-	einfo "Done"
-
-	# handle documentation files
-	#
-	# NOTE that doc files go into /usr/share/doc as normal; they do NOT
-	# get installed per vhost!
-
-	dodoc ${docs}
-	for doc in ${docs} INSTALL; do
-		rm -f ${doc}
-	done
-
-	# Identify the configuration files that this app uses
-	# User can want to make changes to these!
-	webapp_serverowned ${MY_HTDOCSDIR}/index.php
-	webapp_serverowned ${MY_HTDOCSDIR}/wp-layout.css
-	webapp_serverowned ${MY_HTDOCSDIR}/wp-admin/menu.php
-	webapp_serverowned ${MY_HTDOCSDIR}
-
-	# Identify any script files that need #! headers adding to run under
-	# a CGI script (such as PHP/CGI)
-	#
-	# for wordpress, we *assume* that all .php files need to have CGI/BIN
-	# support added
-
-	for x in `find . -name '*.php' -print ` ; do
-		webapp_runbycgibin php ${MY_HTDOCSDIR}/$x
-	done
-
-	# post-install instructions
-	webapp_postinst_txt en ${FILESDIR}/${PV}/postinstall-en.txt
-
-	# now strut stuff
-	webapp_src_install
-}
diff --git a/www-apps/wordpress/wordpress-1.2.ebuild b/www-apps/wordpress/wordpress-1.2.ebuild
deleted file mode 100644
index a507ebb9a535..000000000000
--- a/www-apps/wordpress/wordpress-1.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-1.2.ebuild,v 1.2 2004/09/03 17:17:21 pvdabeel Exp $
-# Mostly ripped off from the squirrelmail ebuild!
-# By Peter Westwood <peter.westwood@ftwr.co.uk>
-
-inherit webapp eutils
-
-#Wordpress releases have a release name tagged on the end of the version on the tar.gz files
-MY_EXT="mingus"
-
-DESCRIPTION="Wordpress php and mysql based CMS system."
-HOMEPAGE="http://wordpress.org/"
-SRC_URI="mirror://sourceforge/cafelog/${P}-${MY_EXT}.tar.gz"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ppc ~sparc"
-IUSE=""
-RDEPEND=">=dev-php/mod_php-4.1
-	 >=dev-db/mysql-3.23.23"
-
-DEPEND="${DEPEND} ${RDEPEND} >=net-www/webapp-config-1.10-r5"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${PV}/login-patch.diff
-}
-
-src_install() {
-	local docs="license.txt readme.html"
-
-	webapp_src_preinst
-
-	einfo "Installing main files"
-	cp -r * ${D}${MY_HTDOCSDIR}
-	einfo "Done"
-
-	# handle documentation files
-	#
-	# NOTE that doc files go into /usr/share/doc as normal; they do NOT
-	# get installed per vhost!
-
-	dodoc ${docs}
-	for doc in ${docs} INSTALL; do
-		rm -f ${doc}
-	done
-
-	# Identify the configuration files that this app uses
-	# User can want to make changes to these!
-	webapp_serverowned ${MY_HTDOCSDIR}/index.php
-	webapp_serverowned ${MY_HTDOCSDIR}/wp-layout.css
-	webapp_serverowned ${MY_HTDOCSDIR}/wp-admin/menu.php
-	webapp_serverowned ${MY_HTDOCSDIR}
-
-	# Identify any script files that need #! headers adding to run under
-	# a CGI script (such as PHP/CGI)
-	#
-	# for wordpress, we *assume* that all .php files need to have CGI/BIN
-	# support added
-
-	for x in `find . -name '*.php' -print ` ; do
-		webapp_runbycgibin php ${MY_HTDOCSDIR}/$x
-	done
-
-	# post-install instructions
-	webapp_postinst_txt en ${FILESDIR}/1.2/postinstall-en.txt
-
-	# now strut stuff
-	webapp_src_install
-}