www-apps/wordpress: Clean-up

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x401A1600

4 files changed, 9 insertions, 104 deletions

diff --git a/www-apps/wordpress/ChangeLog b/www-apps/wordpress/ChangeLog
index d4fb9ea5c5ba..884f5f1c482c 100644
--- a/www-apps/wordpress/ChangeLog
+++ b/www-apps/wordpress/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/wordpress
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/ChangeLog,v 1.169 2015/04/25 16:42:21 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/ChangeLog,v 1.170 2015/04/25 20:19:01 sping Exp $
+
+  25 Apr 2015; Sebastian Pipping <sping@gentoo.org> -wordpress-4.1.2.ebuild,
+  -wordpress-4.1.2-r1.ebuild:
+  Remove old revisions of 4.1.2
 
 *wordpress-4.1.2-r2 (25 Apr 2015)
 
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index 0e17b000db62..251bfbb53ff3 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -13,16 +13,14 @@ EBUILD wordpress-3.8.5.ebuild 1126 SHA256 e5d01cd4857ee95037576bfb12bc73717922cb
 EBUILD wordpress-3.9.3.ebuild 1126 SHA256 d7fa923a115be48267b23098c1103745aa1c2b2d485ea52d67f2b93849aaa299 SHA512 53ae67ab13342ba54656914840597d363f946cfbbd36705453059ae654cca89d6b8bf14f5e90bc063233fa5f3d8de1ed24190eb74113e36162391abc0916353d WHIRLPOOL 99362ce8f7ec5c1089de6f4d895c9f3ddcb9dde7ae6f097c233b3ba29b48345fd0be2ad9eaedb62410003e307f1ad3eaa245ae6622e644ba76492376b91966d7
 EBUILD wordpress-4.0.1.ebuild 1131 SHA256 ec8aa439aed92a0d503409db4e85d26cd8f1850116f9ca1116ca4a61a3f473cf SHA512 4455f0b4a0e200a8632cc85edc0e1edf2b8cbeca1d2136c4aa84d7157c7fb87e1aa67bc76bb826338845ae0037252f91d71f5f52cf6097bf64fca6ec3a0b66c4 WHIRLPOOL 773ca7f707052b73611a0c2f31212c200cc25cc11efce45006b8c84ffcf86c302b3b79850b0f71d04eb82eae6d0d30366651aab816238392ebe0e03bbdf9b57a
 EBUILD wordpress-4.1.1.ebuild 1131 SHA256 0ac3a52ecc77f680e80c5676ddabc677a47c1a0aca52e65188039d2900b94aea SHA512 bac5e0d591c0fc31a042ca6ab9eeb2b92e372ddd3b2009c5422d87acdf56b66c0c6fe9da4e0576367f5ee18b4cbf152cfb017d54a38fce12953bfea75cabf86a WHIRLPOOL 7b761e2087b569aef6500fdef4893592483eaf8e244fb64df42a781c311158fda8427344aa1ac24afe3fb3202897a51623afaefd6fc2578f3a27a899b9b6216b
-EBUILD wordpress-4.1.2-r1.ebuild 1308 SHA256 5ecaea3178bb7316475d8c06ebc738a8d3a069abf8764db15d1a184aff8e053a SHA512 bf76b9f49f64196cdf963f24acf500e0ef6e6b611a5b8eb0fe69586eb9f2286c98a5c719f26e8b9c394e11309c4cba9ba4f72f71324ba0f94cffb4f1b60085d3 WHIRLPOOL 1cfd65dbc91cfd9eb00ad04bed60eb42c31f34f9a8ff66a6bb35856cbeb49aa45b3da830b0ff67c014e4f60529c54c65f5156d030cf6c6aab51ccabe265636a5
 EBUILD wordpress-4.1.2-r2.ebuild 1455 SHA256 7c65315b8b9e6f197bb1913447cf34e1319bb3aab3d6711ce21b055b475fe558 SHA512 22d46628220ff27d2be8c8256bb2d6080182abfff93d10d22ce41519d7054e36592116f02b4a3e98140c9d67439839d3d46c3421064bd98b0fdcc40442916afe WHIRLPOOL f19b708f63da22026b25074fc66b0227bf3cbbf538dd3a10ac32b319d5eab29a5555a5fd460c2041335a0cf58c1f8d82c1e9adc1cbb425de31958d339aa27cc0
-EBUILD wordpress-4.1.2.ebuild 1127 SHA256 f7646f001b2a4a90c7d47780ff3f82d18b5d4578b903981a44c70fbe4a0a55d4 SHA512 c74ef52c6243b204333780db0b946358c0260b07a08520f1d6ac44f2a4868ea5901c58791706c0c6a1e1d6d4e5505763bb11f71248f6a02761376ca144b1b138 WHIRLPOOL 9cbeefda495cc8b981f48237e0b8f0dd524c33c634246138fc15a763b02b326ba1508efda083625b3216e9484ed5a03f2d1c4e553d3950225dffaeada282fe60
 EBUILD wordpress-4.1.ebuild 1129 SHA256 21f3977e83a4def6f550271d716aa098401f8fb55c69d472a6886e16a8d85f95 SHA512 5c061c4764db67966f9f7d6403c94da121b8e8f3a92c31cbbefc3eef9927775b0cc7bbc82908e754e383f7953b2cf22884eb8e159e5ab8763e22b7a5d0520908 WHIRLPOOL 2cfcc7429e68db2c1d5c065c830aaeed61fb75ef13c9cee31d4a8715946370a474f7f8af1fb779f1a54a2f0256ae3f9a8b05b484bd0ad3170f4de6dfa34fa2fd
-MISC ChangeLog 27174 SHA256 65f90bb3b9811a26f2524724e346210aeb4ad9f9f5460839796d5316b087fd6a SHA512 5c94048ebd8697bbce1043e20a683bce648b6aa0c2adebe04a2743b51266d3f5748d9ced7f60ca80cfdca1597e27d4aab7eb8f69bb2282c8f66fb9f697a87a0f WHIRLPOOL af4e66c3965f53a4beca76466e58dd7aaf3ec9450a77e4ca7110c20652b7f1e7ecd5b9620b90cc039143d4e5ed4a567921ebcff4d3d55e51cdb751cfa4a724fe
+MISC ChangeLog 27314 SHA256 451abfda4459c1a8f420d00eaf5eb303a02a8f0dff8e450c8a43f8fe9a162cd2 SHA512 6aa52a173dd0897d35aa6250a47fa5558435ee0ea1a6285d4170cae77d14012d97e92b6070d832722ef2397a0ec2749a0a755a6bf74fd5caf53edadb29664838 WHIRLPOOL fc5e49020a99b3471ce4f07bb5e76230b1cc02e700bc7af266e5afde1b4dacb2c78c6861bb6e80f3b7e01e25c56f455b561e1a6cad3c33e52588e63d602785ce
 MISC metadata.xml 309 SHA256 3f3b447a11baf48bd734baf59866271fe7c6be8d2ba93e559eb4ea20ca382491 SHA512 6e0d82fca39121bfb684053febefdecb49cd415c8c45785d7076b8edd9bdd6f5e70b8c7cd2cbe6137ea68e11311aaf1786ee2418db93e37f1b56fdb471ff62b9 WHIRLPOOL 736eed4a2e59b20559e1aee0fe67b7b2c6bf5dc67adc7e6d2a91f058408f71e3fe066106eda3b5264d3c06f6f4281ade2f5f447c3a3c85ea1fb82c7a52e46a6c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlU7w/MACgkQsAvGakAaFgB2dgCgxUtN+SqHodkNH3LUjLAQDwB+
-4wYAoLxx8Ecq6MyPzmS0HoB0nFuquWyo
-=wPfV
+iEYEAREIAAYFAlU79rkACgkQsAvGakAaFgAw8QCfReNcqf72P0rdxkWTx9sOZrk0
+IwIAoKz3t4vjAMcTWrfZjDKCE3jfWKS5
+=y4ZS
 -----END PGP SIGNATURE-----
diff --git a/www-apps/wordpress/wordpress-4.1.2-r1.ebuild b/www-apps/wordpress/wordpress-4.1.2-r1.ebuild
deleted file mode 100644
index 9b076fb05092..000000000000
--- a/www-apps/wordpress/wordpress-4.1.2-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-4.1.2-r1.ebuild,v 1.1 2015/04/21 18:22:46 sping 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 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="virtual/httpd-php
-	|| ( dev-lang/php[mysql] dev-lang/php[mysqli] )"
-
-S=${WORKDIR}/${PN}
-
-need_httpd_cgi
-
-IUSE="+akismet examples vhosts"
-
-src_install() {
-	webapp_src_preinst
-
-	dohtml readme.html
-	rm readme.html license.txt || die
-
-	if ! use akismet ; then
-		rm -R wp-content/plugins/akismet/ || die
-	fi
-	if ! use examples ; then
-		rm wp-content/plugins/hello.php || die
-	fi
-
-	[[ -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.1.2.ebuild b/www-apps/wordpress/wordpress-4.1.2.ebuild
deleted file mode 100644
index 467c34d559e5..000000000000
--- a/www-apps/wordpress/wordpress-4.1.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-4.1.2.ebuild,v 1.1 2015/04/21 17:43:30 sping 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 ~arm ~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
-}