Security bumps (bug #530018), remove old.

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

6 files changed, 16 insertions, 94 deletions

diff --git a/www-apps/wordpress/ChangeLog b/www-apps/wordpress/ChangeLog
index 1879658d7ad3..a21878a5b863 100644
--- a/www-apps/wordpress/ChangeLog
+++ b/www-apps/wordpress/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for www-apps/wordpress
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/ChangeLog,v 1.163 2014/10/23 19:44:00 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/ChangeLog,v 1.164 2014/11/22 02:00:49 radhermit Exp $
+
+*wordpress-4.0.1 (22 Nov 2014)
+*wordpress-3.9.3 (22 Nov 2014)
+*wordpress-3.8.5 (22 Nov 2014)
+
+  22 Nov 2014; Tim Harder <radhermit@gentoo.org> -wordpress-3.8.3.ebuild,
+  +wordpress-3.8.5.ebuild, -wordpress-3.9.ebuild, -wordpress-3.9.1.ebuild,
+  -wordpress-3.9.2.ebuild, +wordpress-3.9.3.ebuild, -wordpress-4.0.ebuild,
+  +wordpress-4.0.1.ebuild:
+  Security bumps (bug #530018), remove old.
 
   23 Oct 2014; Markus Meier <maekke@gentoo.org> wordpress-4.0.ebuild:
   add ~arm, bug #524380
diff --git a/www-apps/wordpress/wordpress-3.8.3.ebuild b/www-apps/wordpress/wordpress-3.8.5.ebuild
index 87e11f911807..5caa66048d7c 100644
--- a/www-apps/wordpress/wordpress-3.8.3.ebuild
+++ b/www-apps/wordpress/wordpress-3.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-3.8.3.ebuild,v 1.1 2014/04/15 17:51:38 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-3.8.5.ebuild,v 1.1 2014/11/22 02:00:49 radhermit Exp $
 
 EAPI="5"
 
diff --git a/www-apps/wordpress/wordpress-3.9.2.ebuild b/www-apps/wordpress/wordpress-3.9.2.ebuild
deleted file mode 100644
index db4665f1bca3..000000000000
--- a/www-apps/wordpress/wordpress-3.9.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-3.9.2.ebuild,v 1.1 2014/08/13 04:44:39 radhermit Exp $
-
-EAPI="5"
-
-inherit webapp
-
-DESCRIPTION="Wordpress php and mysql based content management system (CMS)"
-HOMEPAGE="http://wordpress.org/"
-SRC_URI="http://wordpress.org/${P/_rc/-RC}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="virtual/httpd-php
-	|| ( dev-lang/php[mysql] dev-lang/php[mysqli] )"
-
-S=${WORKDIR}/${PN}
-
-need_httpd_cgi
-
-src_install() {
-	webapp_src_preinst
-
-	dohtml readme.html
-	rm readme.html license.txt || die
-
-	[ -f wp-config.php ] || 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
-}
diff --git a/www-apps/wordpress/wordpress-3.9.1.ebuild b/www-apps/wordpress/wordpress-3.9.3.ebuild
index 5db62bbc14e6..e4125e76e2f3 100644
--- a/www-apps/wordpress/wordpress-3.9.1.ebuild
+++ b/www-apps/wordpress/wordpress-3.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-3.9.1.ebuild,v 1.1 2014/05/11 02:54:00 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-3.9.3.ebuild,v 1.1 2014/11/22 02:00:49 radhermit Exp $
 
 EAPI="5"
 
diff --git a/www-apps/wordpress/wordpress-3.9.ebuild b/www-apps/wordpress/wordpress-3.9.ebuild
deleted file mode 100644
index 324e234fb94b..000000000000
--- a/www-apps/wordpress/wordpress-3.9.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-3.9.ebuild,v 1.1 2014/04/25 07:46:58 radhermit Exp $
-
-EAPI="5"
-
-inherit webapp
-
-DESCRIPTION="Wordpress php and mysql based content management system (CMS)"
-HOMEPAGE="http://wordpress.org/"
-SRC_URI="http://wordpress.org/${P/_rc/-RC}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="virtual/httpd-php
-	|| ( dev-lang/php[mysql] dev-lang/php[mysqli] )"
-
-S=${WORKDIR}/${PN}
-
-need_httpd_cgi
-
-src_install() {
-	webapp_src_preinst
-
-	dohtml readme.html
-	rm readme.html license.txt || die
-
-	[ -f wp-config.php ] || 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
-}
diff --git a/www-apps/wordpress/wordpress-4.0.ebuild b/www-apps/wordpress/wordpress-4.0.1.ebuild
index 13e4987acdd4..5b878abdcfdc 100644
--- a/www-apps/wordpress/wordpress-4.0.ebuild
+++ b/www-apps/wordpress/wordpress-4.0.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-4.0.ebuild,v 1.2 2014/10/23 19:44:00 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-4.0.1.ebuild,v 1.1 2014/11/22 02:00:49 radhermit Exp $
 
-EAPI="5"
+EAPI=5
 
 inherit webapp
 
@@ -26,7 +26,7 @@ src_install() {
 	dohtml readme.html
 	rm readme.html license.txt || die
 
-	[ -f wp-config.php ] || cp wp-config-sample.php wp-config.php
+	[[ -f wp-config.php ]] || cp wp-config-sample.php wp-config.php
 
 	insinto "${MY_HTDOCSDIR}"
 	doins -r .