summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2012-02-05 06:00:52 +0000
committerTim Harder <radhermit@gentoo.org>2012-02-05 06:00:52 +0000
commit3e9778e543b30d8119e361439ba2e87d2371d2ff (patch)
tree49b091ea549078f4d26b3fa0127462d38ba2f39b /www-apps
parentMove to new unpacker eclass for unpack_makeself. (diff)
downloadhistorical-3e9778e543b30d8119e361439ba2e87d2371d2ff.tar.gz
historical-3e9778e543b30d8119e361439ba2e87d2371d2ff.tar.bz2
historical-3e9778e543b30d8119e361439ba2e87d2371d2ff.zip
Drop depend.php eclass usage.
Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64
Diffstat (limited to 'www-apps')
-rw-r--r--www-apps/wordpress/ChangeLog5
-rw-r--r--www-apps/wordpress/Manifest18
-rw-r--r--www-apps/wordpress/wordpress-3.3.1.ebuild8
3 files changed, 17 insertions, 14 deletions
diff --git a/www-apps/wordpress/ChangeLog b/www-apps/wordpress/ChangeLog
index 1e2c5cebefc6..4a73c2570356 100644
--- a/www-apps/wordpress/ChangeLog
+++ b/www-apps/wordpress/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for www-apps/wordpress
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/ChangeLog,v 1.133 2012/02/05 05:57:47 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/ChangeLog,v 1.134 2012/02/05 06:00:52 radhermit Exp $
+
+ 05 Feb 2012; Tim Harder <radhermit@gentoo.org> wordpress-3.3.1.ebuild:
+ Drop depend.php eclass usage.
05 Feb 2012; Tim Harder <radhermit@gentoo.org> -wordpress-3.2.1.ebuild,
-wordpress-3.3.ebuild:
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index 3aafae5a120e..08ca0ad10666 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -4,17 +4,17 @@ Hash: SHA512
AUX postinstall-en.txt 1554 RMD160 0ae328c94560e30f9a8d5c46eb449ed1d2861970 SHA1 45c11b94046bfdff98a60571a36e56680d43a2ab SHA256 85ecf09ffd839186f5aeba6847798827191d56c6fb7798783100b9fecdcf64df
AUX postupgrade-en.txt 1653 RMD160 a41d01174b74c39fa3c9096630904dac6bcbaa90 SHA1 14f54adc507f62a01055a2745d013ff1c8261e36 SHA256 e03f88067a62e5d9cb7e418face5f816b65523f873bfaabdca69efa23377e754
DIST wordpress-3.3.1.tar.gz 3879784 RMD160 956a99348b965c2bc0fa4083e5295425958e90a4 SHA1 c250cf66da88c49c927161172af2264caac6d2d5 SHA256 e884db6e551c155f022533b6653867b048088cd3cbcbfe546b404696dd960dc2
-EBUILD wordpress-3.3.1.ebuild 1167 RMD160 ae3bce4314fa31f4988dc6640f9ad39e88d17737 SHA1 de7f98d327f13604987cb5ee353b80e6ace08d17 SHA256 024ce992727f2915e79a910fb31cc3b95d36c2ed1221a41db830e715650c6f1b
-MISC ChangeLog 22126 RMD160 91497471cfaf339579b6d4e1c0a28d7c2d6530b6 SHA1 cb48c45ed74d29e89afe6d76c45a64e038719481 SHA256 3bdfb7b85ec27c6c92097c50e304527296b2053cb538bfdbdb732bcc16ecb8f4
+EBUILD wordpress-3.3.1.ebuild 1160 RMD160 8dd34c250f23942ad03d90fbd683416a13a44e1f SHA1 06ecf4fed4eda76b911af2e70e84b1f68d640c3d SHA256 c79c6a4d3bfb90b0766e86c5d8bce7ef0246898b0c83cb5a2afb85579666f85b
+MISC ChangeLog 22232 RMD160 303d1e19cb46ec8bf8af9d98650307b6f90a7732 SHA1 26cb0ccfc94c81962ed8ff51d61fc54964b1d9cc SHA256 b2cb643b48dcb698d3a251fa1b328dfb4106d1c384cf87bcb8cf57855ee1d794
MISC metadata.xml 263 RMD160 41bb3e89b142b29faef36e342335a6124945fb7d SHA1 0763d21226bbe03aa13ed8827b74c1af49c1afea SHA256 987a741d5b64ea875cd0ada6d36e949a015742500bf9379b3ec3bbc45186bfac
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQEcBAEBCgAGBQJPLhphAAoJEEqz6FtPBkyjPjUH/2E/JOJRbWsQ2RFuACLqiSmV
-aV7t1ohgMva/Fn8g+WN2Fs6utMDMR71LokCobrieS0JAfETeKgNV3LZUB7FsvMWu
-jUonugM0CqlcPh6NhhWKbdELLsi970EMb5JRZsT3lfYeoV9VmjxsZzZloOaCsQJO
-AeVMCV45jOQ94N4HIBez+4QlLA8fGi5opFKeiA0Ee8mL2NmfkVa4DF8Q2X0EfAyV
-7qEhoCvrj//jEXiuD9N8iPQTjiBj1uVcaZwup3uFs26JlyEhWez01AlyOuJQvHqG
-7/LtRfTUzP/mW5LbXxxlJJT2C6klonUA3B3jAnQ+H61AhYlmrKj66z+b90+utGk=
-=mMTU
+iQEcBAEBCgAGBQJPLhsaAAoJEEqz6FtPBkyjK/cH/02WiE1ikdQ1zKFxVqBUdp1p
+pbc6hLUh/kcAgdsW9JRje0WsJlVPfovzU9GbLpX+zRRylyfH0A94SuHV40biYnmk
+mwpO1B8RbPcDoOeOpLwb5s6IchY3R1sn+kBNGEyS8uhDkuh9EZTtfT10/i3ihwTV
+up7ziwE0gy8XVX6IwHnxi1wpTEshB3vwmZsWErALX581TDkjj+0XPrjDkSTW+C8C
+zTFiqYHuHjOFZ39nzAvNdJM6DREgx8QRkh6e2cLV8YCJiDfqSpwSwg5nFv0QEIFo
+YWzOndvaNB3CI/kcb+RRFnohIYv0/tPv2NXjTmSqrvFdILMpBBUMLz9hY2uKB+4=
+=wwqT
-----END PGP SIGNATURE-----
diff --git a/www-apps/wordpress/wordpress-3.3.1.ebuild b/www-apps/wordpress/wordpress-3.3.1.ebuild
index e32d85442aa3..f0710aaea35b 100644
--- a/www-apps/wordpress/wordpress-3.3.1.ebuild
+++ b/www-apps/wordpress/wordpress-3.3.1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-3.3.1.ebuild,v 1.1 2012/01/06 05:47:59 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-3.3.1.ebuild,v 1.2 2012/02/05 06:00:52 radhermit Exp $
EAPI="4"
-inherit webapp depend.php
+inherit webapp
DESCRIPTION="Wordpress php and mysql based CMS system"
HOMEPAGE="http://wordpress.org/"
@@ -14,13 +14,13 @@ LICENSE="GPL-2"
KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
-RDEPEND="|| ( dev-lang/php[mysql] dev-lang/php[mysqli] )
+RDEPEND="virtual/httpd-php
+ || ( 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