3 files changed, 8 insertions, 52 deletions
diff --git a/www-apps/wordpress/ChangeLog b/www-apps/wordpress/ChangeLog
index 4b3c78450166..0ef0a1510324 100644
--- a/www-apps/wordpress/ChangeLog
+++ b/www-apps/wordpress/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/wordpress
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/ChangeLog,v 1.93 2008/08/01 17:24:58 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/ChangeLog,v 1.94 2008/09/21 13:28:32 wrobel Exp $
+
+*wordpress-2.6.2 (21 Sep 2008)
+
+  21 Sep 2008; wrobel@gentoo.org -wordpress-2.5.1.ebuild,
+  -wordpress-2.6.ebuild, +wordpress-2.6.2.ebuild:
+  Removed vulnerable wordpress-2.5.1, -2.6, added 2.6.2 (#237406).
 
 *wordpress-2.6 (01 Aug 2008)
 
diff --git a/www-apps/wordpress/wordpress-2.5.1.ebuild b/www-apps/wordpress/wordpress-2.6.2.ebuild
index 8e431ab9dbb9..b5f53fbfb2d9 100644
--- a/www-apps/wordpress/wordpress-2.5.1.ebuild
+++ b/www-apps/wordpress/wordpress-2.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-2.5.1.ebuild,v 1.1 2008/04/27 06:03:25 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-2.6.2.ebuild,v 1.1 2008/09/21 13:28:32 wrobel Exp $
 
 inherit webapp depend.php
 
diff --git a/www-apps/wordpress/wordpress-2.6.ebuild b/www-apps/wordpress/wordpress-2.6.ebuild
deleted file mode 100644
index da1f719ba720..000000000000
--- a/www-apps/wordpress/wordpress-2.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-2.6.ebuild,v 1.1 2008/08/01 17:24:58 wrobel Exp $
-
-inherit webapp depend.php
-
-DESCRIPTION="Wordpress php and mysql based CMS system."
-HOMEPAGE="http://wordpress.org/"
-SRC_URI="http://www.wordpress.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}"/${PN}
-
-need_httpd_cgi
-need_php_httpd
-
-pkg_setup() {
-	webapp_pkg_setup
-	require_php_with_any_use mysql mysqli
-	require_php_with_use pcre
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dohtml readme.html
-	rm -f readme.html license.txt
-
-	cp wp-config-sample.php wp-config.php
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_serverowned "${MY_HTDOCSDIR}"/index.php
-	webapp_serverowned "${MY_HTDOCSDIR}"/wp-admin/menu.php
-	webapp_serverowned "${MY_HTDOCSDIR}"
-
-	webapp_configfile  "${MY_HTDOCSDIR}"/wp-config.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt
-
-	webapp_src_install
-}