www-apps/wordpress: 4.1.2-r2

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

4 files changed, 75 insertions, 6 deletions

diff --git a/www-apps/wordpress/ChangeLog b/www-apps/wordpress/ChangeLog
index dba0070c2fed..d4fb9ea5c5ba 100644
--- a/www-apps/wordpress/ChangeLog
+++ b/www-apps/wordpress/ChangeLog
@@ -1,6 +1,13 @@
 # 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.168 2015/04/21 18:22:46 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/ChangeLog,v 1.169 2015/04/25 16:42:21 sping Exp $
+
+*wordpress-4.1.2-r2 (25 Apr 2015)
+
+  25 Apr 2015; Sebastian Pipping <sping@gentoo.org> +wordpress-4.1.2-r2.ebuild,
+  metadata.xml:
+  Guard installation of themes by use flag "themes", enabled by default since
+  default theme is affected; polish description; use slot ${PV}
 
 *wordpress-4.1.2-r1 (21 Apr 2015)
 
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index 21826c21579c..0e17b000db62 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -14,14 +14,15 @@ EBUILD wordpress-3.9.3.ebuild 1126 SHA256 d7fa923a115be48267b23098c1103745aa1c2b
 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 26900 SHA256 460113ff0de3bea2bc524410482e74b3ac0d1f7453b043c1f12e17b41231693f SHA512 6e47c33cc8bf6bfca89ce3c8c4b32bf0928447ee70545c1d2f2cb4d7fc2329a5f1f6ae3d03fc22df1cde242b88e27475b192222cda5d5611fc1a78c5bc55e21d WHIRLPOOL da3f9d361973022512f8cff5d9f237318f7db4b0399ef1f85e02d47d56af4243706b6ad67273ee493a9ab97f703db9d1dff19b6bae0a5616cac95f4d8d44e258
-MISC metadata.xml 240 SHA256 01316b073e723eba7d70fb8e1bd9a505c5789a3603022628b2079b9b27ea843c SHA512 e2a2a5ce4e82d10a5871e350654c1e4f93e3730a4b01adfeeedafb8ef21c385977b09117ddb690f6ce969f740ca4c1b8dbb30c53b37ce319f56b4337af7ae44a WHIRLPOOL 92d13471c7dba666087c55545f00ff159e78241a2299a5e8e80e907609108e2c79d9cc8cf8307863693947a158464a66f8429e39152a9d3dc96ff1ddd7da3951
+MISC ChangeLog 27174 SHA256 65f90bb3b9811a26f2524724e346210aeb4ad9f9f5460839796d5316b087fd6a SHA512 5c94048ebd8697bbce1043e20a683bce648b6aa0c2adebe04a2743b51266d3f5748d9ced7f60ca80cfdca1597e27d4aab7eb8f69bb2282c8f66fb9f697a87a0f WHIRLPOOL af4e66c3965f53a4beca76466e58dd7aaf3ec9450a77e4ca7110c20652b7f1e7ecd5b9620b90cc039143d4e5ed4a567921ebcff4d3d55e51cdb751cfa4a724fe
+MISC metadata.xml 309 SHA256 3f3b447a11baf48bd734baf59866271fe7c6be8d2ba93e559eb4ea20ca382491 SHA512 6e0d82fca39121bfb684053febefdecb49cd415c8c45785d7076b8edd9bdd6f5e70b8c7cd2cbe6137ea68e11311aaf1786ee2418db93e37f1b56fdb471ff62b9 WHIRLPOOL 736eed4a2e59b20559e1aee0fe67b7b2c6bf5dc67adc7e6d2a91f058408f71e3fe066106eda3b5264d3c06f6f4281ade2f5f447c3a3c85ea1fb82c7a52e46a6c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlU2lXwACgkQsAvGakAaFgCRdwCgtmD/zblj235r6Ahr9W9E90/z
-IYwAnj5oQKol61N5ab45wdJDqWXPSEF0
-=5MdM
+iEYEAREIAAYFAlU7w/MACgkQsAvGakAaFgB2dgCgxUtN+SqHodkNH3LUjLAQDwB+
+4wYAoLxx8Ecq6MyPzmS0HoB0nFuquWyo
+=wPfV
 -----END PGP SIGNATURE-----
diff --git a/www-apps/wordpress/metadata.xml b/www-apps/wordpress/metadata.xml
index afa853231b57..c9b584fe6f2c 100644
--- a/www-apps/wordpress/metadata.xml
+++ b/www-apps/wordpress/metadata.xml
@@ -4,5 +4,6 @@
 <herd>web-apps</herd>
 <use>
 <flag name="akismet">Installs Akismet comment spam plug-in</flag>
+<flag name="themes">Installs themes (including default theme)</flag>
 </use>
 </pkgmetadata>
diff --git a/www-apps/wordpress/wordpress-4.1.2-r2.ebuild b/www-apps/wordpress/wordpress-4.1.2-r2.ebuild
new file mode 100644
index 000000000000..17b3d2867457
--- /dev/null
+++ b/www-apps/wordpress/wordpress-4.1.2-r2.ebuild
@@ -0,0 +1,60 @@
+# 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-r2.ebuild,v 1.1 2015/04/25 16:42:21 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 +themes vhosts"
+
+# Override default of SLOT="${PVR}"
+WEBAPP_MANUAL_SLOT=yes
+SLOT="${PV}"  
+
+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
+	if ! use themes ; then
+		rm -R wp-content/themes/*/ || 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
+}