commit: 0f837ca0ba9f4de664745ea41b8081b726433294
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo
<DOT> org>
AuthorDate: Mon Jul 21 08:08:54 2014 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Mon Jul 21 08:08:54 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=0f837ca0
Sync drupal with tree.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT>
gentoo.org>
---
www-apps/drupal/Manifest | 4 +-
.../{drupal-7.24.ebuild => drupal-6.31.ebuild} | 54 ++++++----------------
.../{drupal-7.23.ebuild => drupal-7.27.ebuild} | 12 ++---
www-apps/drupal/metadata.xml | 8 +++-
4 files changed, 27 insertions(+), 51 deletions(-)
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index 8806383..252d5e8 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,2 +1,2 @@
-DIST drupal-7.23.tar.gz 3191695 SHA256
79f2ae06aac349b86fc0f6cd100f3fc34b72e9f46068ddf704d575778aae1f99 SHA512
e5f1b8a79de2fc02c3dfa15345800d369db4bc9e80333410a7ea3e97f680c2478633ac094a709a2b5a6a9f6b65ff7a142ff5d12e9b6085141684f0b1cad2507f
WHIRLPOOL
874ea3457d3bd9f4ee262d98ff364a471aa1cd1d0a1e94db60213aec6360aabbf0bd38f71562335c2f91df03c8a8d3707a5fbd475506e62de5162277d46a6b65
-DIST drupal-7.24.tar.gz 3195735 SHA256
5ce593bc86f48bb1923f9256de86c47162c54ba578e4ebe9211690b7349d5c40 SHA512
87b30a4c37c1ba451b9d6321351c60880d800a3ade796fc6038d67186c356ec241e0bc34aeaaebfd7524d6df4950495b1d24c2d81a21f1afff9760f5f8aef7a6
WHIRLPOOL
d5747262dfbcdf24bfb48db1ad8b989d4dad3c017ae757ddbe261bd58157dc41d0c04e31c8e61c4f49a38ba87ad1716c3fe206461c5d28078dae3ce6b3d3abbd
+DIST drupal-6.31.tar.gz 1102375 SHA256
09d2acae0c5d606b08a59ecffbe47e7273f02ff5d0e8d6580d5d26c0563006a8 SHA512
3294ceee615d8b421f968dc040a3555fe155d632061dd37ed476501460bf3f305a28b8e3b1afafa27869d209e9e1f4c4e7cbcdb80a3bb04f0204986c6e404982
WHIRLPOOL
35076d49c04c7576ebb5db1fcda7c602309c6c1a166e2ce02661773df9295c0599005e69c78cdd811e8d573761ae104876f3dcb416595f46bd96ef30b89d075f
+DIST drupal-7.27.tar.gz 3207398 SHA256
9a04062618acdebdaf8ee1e0291c6f3d6808483b9aec9b315e4f15db080a19e2 SHA512
108e671ac9d396ed4905d7513f6788d5866a0d8241f142ec64163a149a11b8aebcf5ecd27caaa7e353d5fd91dc4b185b5df3749e5527b41b31e6ca08fa3eede2
WHIRLPOOL
3e45003d9b4efbba32673747afe1bb698b966db64f63431eb5d1ebff352b8ef38f84c9b67707f50492e80103776b4a88582cf24abf989403c6c0494fe6ca42d8
diff --git a/www-apps/drupal/drupal-7.24.ebuild
b/www-apps/drupal/drupal-6.31.ebuild
similarity index 54%
rename from www-apps/drupal/drupal-7.24.ebuild
rename to www-apps/drupal/drupal-6.31.ebuild
index 62a29bf..2966ac1 100644
--- a/www-apps/drupal/drupal-7.24.ebuild
+++ b/www-apps/drupal/drupal-6.31.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-7.22.ebuild,v 1.1
2013/04/06 10:02:02 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-6.31.ebuild,v 1.1
2014/04/25 07:55:09 radhermit Exp $
EAPI=5
@@ -14,52 +14,24 @@ SRC_URI="http://drupal.org/files/projects/${P}.tar.gz";
LICENSE="GPL-2"
KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE="+accelerator +mysql postgres sqlite +uploadprogress"
-
-RDEPEND="
- dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml]
- virtual/httpd-php
- accelerator? ( ||
- (
- (
- <dev-lang/php-5.5
- dev-php/pecl-apc
- )
- dev-php/xcache
- dev-php/eaccelerator
- (
- >=dev-lang/php-5.5[opcache]
- dev-php/pecl-apcu
- )
- )
- )
- uploadprogress? ( dev-php/pecl-uploadprogress )
- mysql? (
- || (
- dev-lang/php[mysql]
- dev-lang/php[mysqli]
- )
- )
- sqlite? (
- || (
- dev-lang/php[sqlite]
- dev-lang/php[sqlite3]
- )
- )
-"
+IUSE="+mysql postgres"
+
+RDEPEND="virtual/httpd-php
+ dev-lang/php[gd,pdo,postgres?,xml]
+ mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) )"
need_httpd_cgi
-REQUIRED_USE="|| ( mysql postgres sqlite )"
+REQUIRED_USE="|| ( mysql postgres )"
src_install() {
webapp_src_preinst
- local docs="MAINTAINERS.txt LICENSE.txt INSTALL.txt CHANGELOG.txt
INSTALL.mysql.txt INSTALL.pgsql.txt INSTALL.sqlite.txt UPGRADE.txt "
+ local docs="MAINTAINERS.txt LICENSE.txt INSTALL.txt CHANGELOG.txt
INSTALL.mysql.txt INSTALL.pgsql.txt UPGRADE.txt "
dodoc ${docs}
- rm -f ${docs} INSTALL COPYRIGHT.txt
+ rm -f ${docs} INSTALL COPYRIGHT.txt || die
- cp sites/default/{default.settings.php,settings.php}
+ cp sites/default/{default.settings.php,settings.php} || die
insinto "${MY_HTDOCSDIR}"
doins -r .
@@ -77,9 +49,9 @@ src_install() {
}
pkg_postinst() {
- ewarn
+ echo
ewarn "SECURITY NOTICE"
ewarn "If you plan on using SSL on your Drupal site, please consult the
postinstall information:"
ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
- ewarn
+ echo
}
diff --git a/www-apps/drupal/drupal-7.23.ebuild
b/www-apps/drupal/drupal-7.27.ebuild
similarity index 86%
rename from www-apps/drupal/drupal-7.23.ebuild
rename to www-apps/drupal/drupal-7.27.ebuild
index 62a29bf..6e4e38a 100644
--- a/www-apps/drupal/drupal-7.23.ebuild
+++ b/www-apps/drupal/drupal-7.27.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-7.22.ebuild,v 1.1
2013/04/06 10:02:02 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-7.27.ebuild,v 1.1
2014/04/25 07:55:09 radhermit Exp $
EAPI=5
@@ -57,9 +57,9 @@ src_install() {
local docs="MAINTAINERS.txt LICENSE.txt INSTALL.txt CHANGELOG.txt
INSTALL.mysql.txt INSTALL.pgsql.txt INSTALL.sqlite.txt UPGRADE.txt "
dodoc ${docs}
- rm -f ${docs} INSTALL COPYRIGHT.txt
+ rm -f ${docs} INSTALL COPYRIGHT.txt || die
- cp sites/default/{default.settings.php,settings.php}
+ cp sites/default/{default.settings.php,settings.php} || die
insinto "${MY_HTDOCSDIR}"
doins -r .
@@ -77,9 +77,9 @@ src_install() {
}
pkg_postinst() {
- ewarn
+ echo
ewarn "SECURITY NOTICE"
ewarn "If you plan on using SSL on your Drupal site, please consult the
postinstall information:"
ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
- ewarn
+ echo
}
diff --git a/www-apps/drupal/metadata.xml b/www-apps/drupal/metadata.xml
index 575c9a5..da84442 100644
--- a/www-apps/drupal/metadata.xml
+++ b/www-apps/drupal/metadata.xml
@@ -2,7 +2,11 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
<maintainer>
- <email>jmbsvice...@gentoo.org</email>
- <name>Jorge Manuel B. S. Vicetto</name>
+ <email>jmbsvice...@gentoo.org</email>
+ <name>Jorge Manuel B. S. Vicetto</name>
</maintainer>
+<use>
+ <flag name='accelerator'>Add dependency on a php accelerator</flag>
+ <flag name='uploadprogress'>Install
<pkg>dev-php/pecl-uploadprogress</pkg> package</flag>
+</use>
</pkgmetadata>
