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

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64

6 files changed, 22 insertions, 152 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/Manifest b/mail-client/roundcube/Manifest
index 7ad8b9e0490c..1fd9e93b3f99 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -3,21 +3,19 @@ Hash: SHA1
 
 AUX postinstall-en.txt 2513 RMD160 c2a04efcdd4007642221797a10877c2fc57ad874 SHA1 8bc888b2944694bbbadeddfe6f193c3a8a995a87 SHA256 5c1fa9d43f29158521188aae417654f968fb41662c46721b8183728df37eb4c4
 DIST roundcubemail-0.4.2.tar.gz 2172565 RMD160 300daa39eb036236fbcddb4be66fbf8d4b206ff4 SHA1 73200648012894a0e524969317268fc2da2b9272 SHA256 0863ef8324d77033142d66a997bcd9b0c6d675320e9f4a926cb3e03d624d93e4
-DIST roundcubemail-0.4.tar.gz 2159645 RMD160 fe2bee3104c7f0371fe76374e727fb5cb9b17112 SHA1 1ec80c6ff57a8913a53d3d8bb6eace0d20490ecc SHA256 1da2a57f0fa866cabc179d01c2a29c80dcf6108d45e415210129ef90ff8b2c1c
 DIST roundcubemail-0.5.1.tar.gz 2268849 RMD160 7b7d5a618552a4a0d3389fff998f91ba1ca23c57 SHA1 61ed0186e934a679b463fabe7f36c677b56c3042 SHA256 a1d8bce93713775088f7a6bc494f7127755ca90a6c7f3f94589182a65e31479c
-DIST roundcubemail-0.5.tar.gz 2254703 RMD160 ab778a015b02f79feb5fb333f4f4cd058d8cd1b6 SHA1 8a351d64188b89be5b4de4b744de8ad7d9567175 SHA256 2bb776eac21edbfbc4679775acfa517f6e3a790ec0f7105dedd8693b69ef65b9
-EBUILD roundcube-0.4.2.ebuild 1986 RMD160 00195dfcf6e843b6086ccc92bff59659a1d586eb SHA1 e1fbb46485a60ce22edd66e8c1125a51143e5749 SHA256 26ebfc38d7b27c973fbcc3f79860466b52f39adec44b2a27d42931d86b299271
-EBUILD roundcube-0.4.ebuild 1980 RMD160 2382508e9246f9464d39dc9d237f0ad879290083 SHA1 07eb15271784a9d85dfa482b6dd96f4211d46b8a SHA256 77b7fa156e2de8e29a1ee3225fa4198a1d16d8a5d32e0172fd8b6a9a088f1753
-EBUILD roundcube-0.5.1.ebuild 1955 RMD160 80adf331b31d27874cd7b614434b38887f6a06be SHA1 f7236bf5481e22b6e00743508c1671c71877771c SHA256 eb87426f08f054c03b99042714064667066b675fb60585c22a5aa8b8f42fb7d4
-EBUILD roundcube-0.5.ebuild 1955 RMD160 60fde83b67b59a60619ceb312a5f5686124b2ba2 SHA1 aa40336e69f4d63e3febbafdff76a55dc829a248 SHA256 7e4ed741d1f383d2da4b1006389b0150ecf7db2f5809f1312d763e7ffef8bf8a
-MISC ChangeLog 6300 RMD160 109e0b61ce786aad6320d5378ac9e1ead10cd388 SHA1 849eba0616fce3aec069c98ad91d1997d92127fa SHA256 9d913926c07be94a1298f507c210c59bcc6b32c64df08178ca1f5b18a5d6efbd
+EBUILD roundcube-0.4.2.ebuild 1995 RMD160 a529136d7d42b232334ef81520c643f1a168c764 SHA1 b27660672c93ffcf3bc295fbd6ab8da6ecc8ad5d SHA256 23a3e6443ddb8cd0cdc4fdb7958c931a6fed641ce630792deedbf7b3c7ca16fa
+EBUILD roundcube-0.5.1.ebuild 1965 RMD160 9b70a135ea9c1eded893a8d4024fee9708d83e52 SHA1 4218cd41196bb3c75665319b3d3b7fa149de50bb SHA256 c54a0332a0b8095c3611fd27ef40b62a23b40a8d64d6c5b212d0f6009a8d2986
+MISC ChangeLog 6530 RMD160 9059e014bfba8de3a34f43af7dbe8fffb324434c SHA1 af2c081887823318598562da81321ad55db24415 SHA256 4bc363751b003684dd0ae3c9754ac0306d434f1b5d3e8cb48b359a210bc6650f
 MISC metadata.xml 161 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b SHA1 5b91a6d8d06d3dca2d774425befba30caca51507 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk1zbIwACgkQIiMqcbOVdxRRqgP+O88VE0xpGnUCKneomKtnc1Yf
-1tly3LZ6LJ1wHnstPHv6YJEH+MqMna7yre02wMvobAcDHf3qsvmIFFnhITeQgKnE
-voKkBlIh+W+nmIzf7owCaxWrE6qMPvk3CbngJ82CQHEfiMBJJNcdYjyRuJnO3J7f
-5WLitj6mTr8k6g9sn5Y=
-=o3C3
+iQEcBAEBAgAGBQJNiuu+AAoJEEqz6FtPBkyjzzIIAJzANPV2c8STu+7p79+OCk0D
+AIBbLlhJxoR9C8EEz43sYGaklySgxVTmtE7BCwq0mhh41V5oEIFWqIdDwcA3fL68
+UNYUt3dvGTp0izS+aOjx+x6sMSgk4p3ipcPPuJ2M1SedHBSHBBxOfipI1PXJYgFq
+LNW0nOIjSUqW0dXr/5Oni9hiy091NtH2lauH15hZ4O7IyWhKisoR0pSu1ex0YVpu
+alpZr5RizzBjTjX7fusjD5ryrCJ7nN7Xb5j7Kaf3LwxGOqs/lsOWngt8RZbHPEph
+ZmsAVJVYoUcrRjXE4vhfmGPraf4CW3GbSXAf3qP+0jD5jwgv3Ml1I2KgLFqDimM=
+=ZiKa
 -----END PGP SIGNATURE-----
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
-}