Version bump and remove old.

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

4 files changed, 18 insertions, 60 deletions

diff --git a/www-apps/wordpress/ChangeLog b/www-apps/wordpress/ChangeLog
index 9152cc39dc31..b2d39b116278 100644
--- a/www-apps/wordpress/ChangeLog
+++ b/www-apps/wordpress/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/wordpress
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/ChangeLog,v 1.125 2011/10/21 05:27:04 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/ChangeLog,v 1.126 2011/11/11 04:52:58 radhermit Exp $
+
+*wordpress-3.3_beta3 (11 Nov 2011)
+
+  11 Nov 2011; Tim Harder <radhermit@gentoo.org> -wordpress-3.3_beta1.ebuild,
+  -wordpress-3.3_beta2.ebuild, +wordpress-3.3_beta3.ebuild:
+  Version bump and remove old.
 
 *wordpress-3.3_beta2 (21 Oct 2011)
 
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index 58a8e6e02bc9..fe367e36157d 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -8,25 +8,23 @@ DIST wordpress-3.1.3.tar.gz 2764167 RMD160 b46c9c52186f815db97d44ec25acf4dcc02d3
 DIST wordpress-3.1.4.tar.gz 2764719 RMD160 a60edf117c7dd385d8400f38722d98aa4118d0ba SHA1 b93ff680a7035378abac1063abebf72a473e8a78 SHA256 ad5368d0beb7646bc1cd152fd08551e158ee0dae61f01f18939cee9c485b00eb
 DIST wordpress-3.2.1.tar.gz 3607522 RMD160 a78f1aec0d142e1de32f214fd65ac2aef256979d SHA1 674bcf0abe80770ac08dfb4c5f21df3303bf771a SHA256 21e3cebd02808f9ee39a979d22e6e10bce5356ddf7068aef182847b12c9b95a9
 DIST wordpress-3.2.tar.gz 3560784 RMD160 517aa89ed46f011607ca056b8a54747bf53af5e2 SHA1 ee2e7e0415e41d1ae0f82a1c1e5583a6ed257802 SHA256 12a94a9226c5387ef41057653d62cf7b1fd47df0ec95e87749b7f085fc05b742
-DIST wordpress-3.3-beta1.tar.gz 3763463 RMD160 f1e8e4b2f3ab0d1c5bfc394bb33a6f66cdd1df76 SHA1 f6c9dbf7dd2c8872ec7987ca2b24a500cc312ee4 SHA256 201033d058126a48378501290c71a45be928122f73a40943d4e9334a68616c41
-DIST wordpress-3.3-beta2.tar.gz 3762763 RMD160 a259f17bb8cfc926f3c1922bf092879f2733a174 SHA1 1860dd41a823aa4bfb5d94a2566f73eac2db80be SHA256 11e43feffb846a9b2015a496c210f38e5e2efa7f6ae10bc3498ab306f36bbe12
+DIST wordpress-3.3-beta3.tar.gz 3767010 RMD160 67a52977d765eeffc3a2954204fb4544b5cef9ca SHA1 f213c8254fb45504b6cd1d95d6c9677d6f0eb246 SHA256 95932185dee3220365ec68e4fffb5ef233438da07c8347f27d6b3db429e539b3
 EBUILD wordpress-3.1.2.ebuild 1174 RMD160 62cb5fae6f13c95482ebe79f53cc0d8ace5f56ea SHA1 4791480fdaed661d82a62320b09e89b617af0653 SHA256 4edcf2304e77a0d2a783a1ef65bb3cd4d2e913549d15374021f8d3073b11fc8e
 EBUILD wordpress-3.1.3.ebuild 1174 RMD160 b873837787cd9ce0fedae3fcfdb581433e38ba98 SHA1 2a256fe5679f928c9ce5c1fec5d971b02b02afec SHA256 75db20b36ea5b686fd315dcc525f6c4258e804d2f089be73914979c740f2ec18
 EBUILD wordpress-3.1.4.ebuild 1174 RMD160 02420c79662165c05bc60baa388a96a532e6f48a SHA1 cb3799cbdee3305121b9c6d52c55161196fa4039 SHA256 010817beb8bc9bbdc7bedbee5b88a89931d426e5c622ce9a158203503ce980cb
 EBUILD wordpress-3.2.1.ebuild 1172 RMD160 83c4fc8ec1db2fb32e78eabc7ab1bad8691e11a5 SHA1 ddacd69f1fa800af04f8a14456093d0ad866282f SHA256 55449dd0466ecfd683034050651fc892dd299f5c6175902a7d8f2d941bc11505
 EBUILD wordpress-3.2.ebuild 1170 RMD160 2c0e5de2c01381ed41c57308cbb0b1caf02e98f5 SHA1 6d00631b5feeceaf91397c718d797012ab367079 SHA256 91f21fa5885e682f0483c8cb8ccbbf85a3fa4bec5f02a3215ef0075b6663acc9
-EBUILD wordpress-3.3_beta1.ebuild 1169 RMD160 c89cc73c4f137df03f76cd1ee72d0ff8a6d4c147 SHA1 4d5023b82482b16642791df8d4b12f2166555b5a SHA256 b58610afdb9a51dae51f095aaebaeb25406d7ad3679de9ee5377fc489e20da9e
-EBUILD wordpress-3.3_beta2.ebuild 1167 RMD160 06982a2ce15e112ba7abb7ea4561c37aa56d9e25 SHA1 2540c06067bee73fe4019344215818271c4c3908 SHA256 e8442945fb4f819baf36e471959b3c4ea8714a25382b5370c09f8b57e4d7c407
-MISC ChangeLog 20850 RMD160 d3df92d2ff0d6aade0c9bd24dbe2643c5398c18c SHA1 0110dbe382f32342f50d988e0e875b206dfd65e0 SHA256 f9c8f9760a969ae61d1f637e31d860c07b82b29b2156c9bebbc9d2c71ca659d9
+EBUILD wordpress-3.3_beta3.ebuild 1167 RMD160 162448a6c7534c43004962f90cb06930f8be87ff SHA1 d0541915967cef6a4e1dfff9704626ff450cebab SHA256 8ba053cf3ca2f4ad0b2485776169835d38d77db829979a5fa2d6d6a202340702
+MISC ChangeLog 21056 RMD160 ae283ddf672d883eb8a92e162caee84d71c91bc7 SHA1 9a15564f84b50c7c34761f6054638afb88ffe274 SHA256 5f03cb0961f5d5e38d04ad8c374c3df9c6c711320f0a93b7cd78b2925a4461b6
 MISC metadata.xml 263 RMD160 41bb3e89b142b29faef36e342335a6124945fb7d SHA1 0763d21226bbe03aa13ed8827b74c1af49c1afea SHA256 987a741d5b64ea875cd0ada6d36e949a015742500bf9379b3ec3bbc45186bfac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOoQKxAAoJEEqz6FtPBkyj7EgIAJ6rxaKSk4hcYEqzexsA0/51
-HVcwlmDHhFEtstLL3RZa0sOA7hCXVf9IUotSmocoPCnPIe4bTwQBy7eojcOmHmBH
-nzyX+TUxUu7+lKgxtnHAopXCMetj568AfJPed3+3AYw7xWjpFjQPum3DYncrJ9XB
-8x0jRK4LpRaTqeiv4QZ+l8Rn+uXzbLDvVoZw+1LHWd5CvqEH4hfbNEq35fgnqfLA
-5LiUffi59Fu0KFHhBa3uz28ZYpDqeCZrjwMEOtuocJK7T6RDUCDtZnkaLeQ2RRfm
-InexagfBXcAa357Mc1A+JBnoa/wwA4RZAia/VhJxIrkThaxUFbZ/GC+jaQTRKqc=
-=C4KJ
+iQEcBAEBCgAGBQJOvKo2AAoJEEqz6FtPBkyjDlkIALWM1Rjl6/lop5jz/dts3l7w
+/jmmjQjkH7VPH0iecrPoXQJpp45TSX+drKUMXcRbfdN/BMQ2CZ2RWuA5jL+r2+FX
+wTiyx8+yoBztHf2LA0WEn0U77F9ryn/cmLnbX09Yc/FCOdvwvg9VPEKZzqHd4IWh
+BnTJ0WgMuxm9EMW4B+122Z2dt01JHrbhXRRFWgZWJOYXUTy3ta4XJYr6KnbFRS0U
+K/bcEM1MwvzXLmHpbB12neBUTyl9MvE3qbNXy/mcGafRi5fdoetbT3U3nheuzML5
+C1wRNsBzV8497OCujRuXFjImIV2HD/K8s9pc++wIvw+F6Wb8S0DyaAk65oOu5fc=
+=rKzY
 -----END PGP SIGNATURE-----
diff --git a/www-apps/wordpress/wordpress-3.3_beta1.ebuild b/www-apps/wordpress/wordpress-3.3_beta1.ebuild
deleted file mode 100644
index f361db06cd9b..000000000000
--- a/www-apps/wordpress/wordpress-3.3_beta1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-3.3_beta1.ebuild,v 1.1 2011/10/11 06:08:45 radhermit Exp $
-
-EAPI="4"
-
-inherit webapp depend.php
-
-DESCRIPTION="Wordpress php and mysql based CMS system"
-HOMEPAGE="http://wordpress.org/"
-SRC_URI="http://wordpress.org/${P/_/-}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="|| ( dev-lang/php[mysql] dev-lang/php[mysqli] )
-		 || ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )"
-
-S=${WORKDIR}/${PN}
-
-need_httpd_cgi
-need_php_httpd
-
-src_install() {
-	webapp_src_preinst
-
-	dohtml readme.html
-	rm -f readme.html license.txt
-
-	[ -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.3_beta2.ebuild b/www-apps/wordpress/wordpress-3.3_beta3.ebuild
index 911e5f980a7f..495ead34383b 100644
--- a/www-apps/wordpress/wordpress-3.3_beta2.ebuild
+++ b/www-apps/wordpress/wordpress-3.3_beta3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-3.3_beta2.ebuild,v 1.1 2011/10/21 05:27:04 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-3.3_beta3.ebuild,v 1.1 2011/11/11 04:52:58 radhermit Exp $
 
 EAPI="4"