www-apps/wordpress: use flags akismet and examples (bug #544984)

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

4 files changed, 71 insertions, 6 deletions

diff --git a/www-apps/wordpress/ChangeLog b/www-apps/wordpress/ChangeLog
index b82926860311..dba0070c2fed 100644
--- a/www-apps/wordpress/ChangeLog
+++ b/www-apps/wordpress/ChangeLog
@@ -1,6 +1,14 @@
 # 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.167 2015/04/21 17:43:30 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/ChangeLog,v 1.168 2015/04/21 18:22:46 sping Exp $
+
+*wordpress-4.1.2-r1 (21 Apr 2015)
+
+  21 Apr 2015; Sebastian Pipping <sping@gentoo.org> +wordpress-4.1.2-r1.ebuild,
+  metadata.xml:
+  Guard installation of Akismet and Hello Dolly plug-ins behind use flags (bug
+  #544984) with Akismet enabled by default to smooth transition (only); update
+  license from GPLv2 to GPLv2+
 
 *wordpress-4.1.2 (21 Apr 2015)
 
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index 6487fbfd6b4f..21826c21579c 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -13,14 +13,15 @@ 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.ebuild 1127 SHA256 f7646f001b2a4a90c7d47780ff3f82d18b5d4578b903981a44c70fbe4a0a55d4 SHA512 c74ef52c6243b204333780db0b946358c0260b07a08520f1d6ac44f2a4868ea5901c58791706c0c6a1e1d6d4e5505763bb11f71248f6a02761376ca144b1b138 WHIRLPOOL 9cbeefda495cc8b981f48237e0b8f0dd524c33c634246138fc15a763b02b326ba1508efda083625b3216e9484ed5a03f2d1c4e553d3950225dffaeada282fe60
 EBUILD wordpress-4.1.ebuild 1129 SHA256 21f3977e83a4def6f550271d716aa098401f8fb55c69d472a6886e16a8d85f95 SHA512 5c061c4764db67966f9f7d6403c94da121b8e8f3a92c31cbbefc3eef9927775b0cc7bbc82908e754e383f7953b2cf22884eb8e159e5ab8763e22b7a5d0520908 WHIRLPOOL 2cfcc7429e68db2c1d5c065c830aaeed61fb75ef13c9cee31d4a8715946370a474f7f8af1fb779f1a54a2f0256ae3f9a8b05b484bd0ad3170f4de6dfa34fa2fd
-MISC ChangeLog 26579 SHA256 f9fc58c44cf75c89bba1450c18f40754349f86e5e0a46c6c17ac24b054a407de SHA512 d2cf7a528058c44815cc6fa3102dccd1c0c5662d4139a59e57a0ddbf71e3a55ba948e28f420fd6063839694bbe8164b702634caa2236f2c5c6f09a84355a7a44 WHIRLPOOL 0ef53cc08fa77338262503b393fef52d32310ecda6f07bd6d8275b0b09e1295e35116a3c6c8db51b1523f21811d206a00371e226412c7a318d40b323175c227c
-MISC metadata.xml 161 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 SHA512 da8733f12ac4bebcfa485138fd9880683c1196efc0312a588ffce412ed14c1dd831e005129b6598d027af44d381fceb844453a433d0c982348e21f2d9c49f52e WHIRLPOOL 2b56ebef4f0870596c32c35c96e6dfbc911f6a3d8fe0e8c463df76dfa73dde112948c814b9a9ee996b7d71a85e4a723033ee3b92f4cde0f31d0770404d7dba61
+MISC ChangeLog 26900 SHA256 460113ff0de3bea2bc524410482e74b3ac0d1f7453b043c1f12e17b41231693f SHA512 6e47c33cc8bf6bfca89ce3c8c4b32bf0928447ee70545c1d2f2cb4d7fc2329a5f1f6ae3d03fc22df1cde242b88e27475b192222cda5d5611fc1a78c5bc55e21d WHIRLPOOL da3f9d361973022512f8cff5d9f237318f7db4b0399ef1f85e02d47d56af4243706b6ad67273ee493a9ab97f703db9d1dff19b6bae0a5616cac95f4d8d44e258
+MISC metadata.xml 240 SHA256 01316b073e723eba7d70fb8e1bd9a505c5789a3603022628b2079b9b27ea843c SHA512 e2a2a5ce4e82d10a5871e350654c1e4f93e3730a4b01adfeeedafb8ef21c385977b09117ddb690f6ce969f740ca4c1b8dbb30c53b37ce319f56b4337af7ae44a WHIRLPOOL 92d13471c7dba666087c55545f00ff159e78241a2299a5e8e80e907609108e2c79d9cc8cf8307863693947a158464a66f8429e39152a9d3dc96ff1ddd7da3951
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlU2jEkACgkQsAvGakAaFgA+sgCgq2MJaCeNyAEnax0nFYkH/tXq
-jW0Anj65dC7HUMC3zZ89YYErZcYnCzAv
-=ltMz
+iEYEAREIAAYFAlU2lXwACgkQsAvGakAaFgCRdwCgtmD/zblj235r6Ahr9W9E90/z
+IYwAnj5oQKol61N5ab45wdJDqWXPSEF0
+=5MdM
 -----END PGP SIGNATURE-----
diff --git a/www-apps/wordpress/metadata.xml b/www-apps/wordpress/metadata.xml
index 95c06f0095bb..afa853231b57 100644
--- a/www-apps/wordpress/metadata.xml
+++ b/www-apps/wordpress/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>web-apps</herd>
+<use>
+<flag name="akismet">Installs Akismet comment spam plug-in</flag>
+</use>
 </pkgmetadata>
diff --git a/www-apps/wordpress/wordpress-4.1.2-r1.ebuild b/www-apps/wordpress/wordpress-4.1.2-r1.ebuild
new file mode 100644
index 000000000000..9b076fb05092
--- /dev/null
+++ b/www-apps/wordpress/wordpress-4.1.2-r1.ebuild
@@ -0,0 +1,53 @@
+# 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
+}