sping       15/04/21 18:22:46

  Modified:             metadata.xml ChangeLog
  Added:                wordpress-4.1.2-r1.ebuild
  Log:
  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)

Revision  Changes    Path
1.11                 www-apps/wordpress/metadata.xml

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/wordpress/metadata.xml?rev=1.11&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/wordpress/metadata.xml?rev=1.11&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/wordpress/metadata.xml?r1=1.10&r2=1.11

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apps/wordpress/metadata.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- metadata.xml        2 Jan 2014 18:23:17 -0000       1.10
+++ metadata.xml        21 Apr 2015 18:22:46 -0000      1.11
@@ -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>



1.168                www-apps/wordpress/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/wordpress/ChangeLog?rev=1.168&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/wordpress/ChangeLog?rev=1.168&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/wordpress/ChangeLog?r1=1.167&r2=1.168

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apps/wordpress/ChangeLog,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- ChangeLog   21 Apr 2015 17:43:30 -0000      1.167
+++ ChangeLog   21 Apr 2015 18:22:46 -0000      1.168
@@ -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 <sp...@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)
 



1.1                  www-apps/wordpress/wordpress-4.1.2-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/wordpress/wordpress-4.1.2-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/wordpress/wordpress-4.1.2-r1.ebuild?rev=1.1&content-type=text/plain

Index: wordpress-4.1.2-r1.ebuild
===================================================================
# 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
}




Reply via email to