Remove old. Add json USE flag dependency for php (bug #360035 by Jaak Ristioja).

(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)

5 files changed, 12 insertions, 140 deletions

diff --git a/mail-client/roundcube/ChangeLog b/mail-client/roundcube/ChangeLog
index faf97b9a10c9..78c06aee8c06 100644
--- a/mail-client/roundcube/ChangeLog
+++ b/mail-client/roundcube/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/roundcube
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/roundcube/ChangeLog,v 1.41 2011/03/06 11:14:07 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/roundcube/ChangeLog,v 1.42 2011/03/24 06:59:00 radhermit Exp $
+
+  24 Mar 2011; Tim Harder <radhermit@gentoo.org> -roundcube-0.4.ebuild,
+  roundcube-0.4.2.ebuild, -roundcube-0.5.ebuild, roundcube-0.5.1.ebuild:
+  Remove old. Add json USE flag dependency for php (bug #360035 by Jaak
+  Ristioja).
 
   06 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> roundcube-0.4.2.ebuild:
   ppc/ppc64 stable wrt #345931
diff --git a/mail-client/roundcube/roundcube-0.4.2.ebuild b/mail-client/roundcube/roundcube-0.4.2.ebuild
index acfa943e3867..d522b53d43f7 100644
--- a/mail-client/roundcube/roundcube-0.4.2.ebuild
+++ b/mail-client/roundcube/roundcube-0.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/roundcube/roundcube-0.4.2.ebuild,v 1.5 2011/03/06 11:14:07 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/roundcube/roundcube-0.4.2.ebuild,v 1.6 2011/03/24 06:59:00 radhermit Exp $
 
 EAPI="2"
 
@@ -20,8 +20,8 @@ KEYWORDS="amd64 arm ppc ppc64 ~sparc x86"
 IUSE="ldap mysql postgres ssl spell"
 
 DEPEND=""
-RDEPEND="|| ( <dev-lang/php-5.3[crypt,iconv,ldap?,pcre,postgres?,session,spl,ssl?,unicode]
-		>=dev-lang/php-5.3[crypt,iconv,ldap?,postgres?,session,ssl?,unicode] )
+RDEPEND="|| ( <dev-lang/php-5.3[crypt,iconv,json,ldap?,pcre,postgres?,session,spl,ssl?,unicode]
+		>=dev-lang/php-5.3[crypt,iconv,json,ldap?,postgres?,session,ssl?,unicode] )
 	!postgres? ( !mysql? ( dev-lang/php[sqlite] ) )
 	spell? ( dev-lang/php[curl,spell] )
 	dev-php/PEAR-PEAR"
diff --git a/mail-client/roundcube/roundcube-0.4.ebuild b/mail-client/roundcube/roundcube-0.4.ebuild
deleted file mode 100644
index 17f321b3ca3a..000000000000
--- a/mail-client/roundcube/roundcube-0.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/roundcube/roundcube-0.4.ebuild,v 1.6 2010/10/10 20:51:04 maekke Exp $
-
-EAPI="2"
-
-MY_PN="${PN}mail"
-MY_P="${MY_PN}-${PV}"
-
-inherit webapp depend.php depend.apache
-
-DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface"
-HOMEPAGE="http://roundcube.net"
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
-
-# roundcube is GPL-licensed, the rest of the licenses here are
-# for bundled PEAR components, googiespell and utf8.class.php
-LICENSE="GPL-2 BSD PHP-2.02 PHP-3 MIT public-domain"
-KEYWORDS="amd64 arm ppc ppc64 ~sparc x86"
-IUSE="ldap mysql postgres ssl spell"
-
-DEPEND=""
-RDEPEND="|| ( <dev-lang/php-5.3[crypt,iconv,ldap?,pcre,postgres?,session,spl,ssl?,unicode]
-		>=dev-lang/php-5.3[crypt,iconv,ldap?,postgres?,session,ssl?,unicode] )
-	!postgres? ( !mysql? ( dev-lang/php[sqlite] ) )
-	spell? ( dev-lang/php[curl,spell] )
-	dev-php/PEAR-PEAR"
-
-need_httpd_cgi
-need_php_httpd
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	use mysql && require_php_with_any_use mysql mysqli
-
-	# add some warnings about optional functionality
-	if ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external; then
-		ewarn "IMAP quota display will not work correctly without GD support in PHP."
-		ewarn "Recompile PHP with either gd or gd-external in USE if you want this feature."
-		ewarn
-	fi
-
-	webapp_pkg_setup
-}
-
-src_prepare() {
-	cp config/db.inc.php{.dist,}
-	cp config/main.inc.php{.dist,}
-}
-
-src_install () {
-	webapp_src_preinst
-	dodoc CHANGELOG INSTALL README UPGRADING
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r [[:lower:]]* SQL
-	doins .htaccess
-
-	webapp_serverowned "${MY_HTDOCSDIR}"/logs
-	webapp_serverowned "${MY_HTDOCSDIR}"/temp
-
-	webapp_configfile "${MY_HTDOCSDIR}"/config/{db,main}.inc.php
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_postupgrade_txt en UPGRADING
-	webapp_src_install
-}
diff --git a/mail-client/roundcube/roundcube-0.5.1.ebuild b/mail-client/roundcube/roundcube-0.5.1.ebuild
index ace2c7a96f94..7bc77bd338b9 100644
--- a/mail-client/roundcube/roundcube-0.5.1.ebuild
+++ b/mail-client/roundcube/roundcube-0.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/roundcube/roundcube-0.5.1.ebuild,v 1.1 2011/02/10 11:13:13 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/roundcube/roundcube-0.5.1.ebuild,v 1.2 2011/03/24 06:59:00 radhermit Exp $
 
 EAPI="2"
 
@@ -19,8 +19,8 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 IUSE="ldap mysql postgres ssl spell +sqlite"
 
 DEPEND=""
-RDEPEND="|| ( <dev-lang/php-5.3[crypt,iconv,ldap?,pcre,postgres?,session,spl,sqlite?,ssl?,unicode]
-		>=dev-lang/php-5.3[crypt,iconv,ldap?,postgres?,session,sqlite?,ssl?,unicode] )
+RDEPEND="|| ( <dev-lang/php-5.3[crypt,iconv,json,ldap?,pcre,postgres?,session,spl,sqlite?,ssl?,unicode]
+		>=dev-lang/php-5.3[crypt,iconv,json,ldap?,postgres?,session,sqlite?,ssl?,unicode] )
 	spell? ( dev-lang/php[curl,spell] )
 	dev-php/PEAR-PEAR"
 
diff --git a/mail-client/roundcube/roundcube-0.5.ebuild b/mail-client/roundcube/roundcube-0.5.ebuild
deleted file mode 100644
index cb877882c74c..000000000000
--- a/mail-client/roundcube/roundcube-0.5.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/roundcube/roundcube-0.5.ebuild,v 1.1 2011/01/12 23:40:37 radhermit Exp $
-
-EAPI="2"
-
-MY_PN="${PN}mail"
-MY_P="${MY_PN}-${PV/_/-}"
-
-inherit webapp depend.php
-
-DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface"
-HOMEPAGE="http://roundcube.net"
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
-
-# roundcube is GPL-licensed, the rest of the licenses here are
-# for bundled PEAR components, googiespell and utf8.class.php
-LICENSE="GPL-2 BSD PHP-2.02 PHP-3 MIT public-domain"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ldap mysql postgres ssl spell +sqlite"
-
-DEPEND=""
-RDEPEND="|| ( <dev-lang/php-5.3[crypt,iconv,ldap?,pcre,postgres?,session,spl,sqlite?,ssl?,unicode]
-		>=dev-lang/php-5.3[crypt,iconv,ldap?,postgres?,session,sqlite?,ssl?,unicode] )
-	spell? ( dev-lang/php[curl,spell] )
-	dev-php/PEAR-PEAR"
-
-need_httpd_cgi
-need_php_httpd
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	use mysql && require_php_with_any_use mysql mysqli
-
-	# add some warnings about optional functionality
-	if ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external; then
-		ewarn "IMAP quota display will not work correctly without GD support in PHP."
-		ewarn "Recompile PHP with either gd or gd-external in USE if you want this feature."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	cp config/db.inc.php{.dist,}
-	cp config/main.inc.php{.dist,}
-}
-
-src_install () {
-	webapp_src_preinst
-	dodoc CHANGELOG INSTALL README UPGRADING
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r [[:lower:]]* SQL
-	doins .htaccess
-
-	webapp_serverowned "${MY_HTDOCSDIR}"/logs
-	webapp_serverowned "${MY_HTDOCSDIR}"/temp
-
-	webapp_configfile "${MY_HTDOCSDIR}"/config/{db,main}.inc.php
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_postupgrade_txt en UPGRADING
-	webapp_src_install
-}