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

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x401A1600)

3 files changed, 65 insertions, 1 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/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
+}