convert most of the USE flag mess to EAPI2

Package-Manager: portage-2.2_rc40/cvs/Linux i686

3 files changed, 15 insertions, 32 deletions

diff --git a/mail-client/roundcube/ChangeLog b/mail-client/roundcube/ChangeLog
index 2c39810ceb1e..da739c806ab2 100644
--- a/mail-client/roundcube/ChangeLog
+++ b/mail-client/roundcube/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-client/roundcube
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/roundcube/ChangeLog,v 1.9 2009/09/17 14:46:36 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/roundcube/ChangeLog,v 1.10 2009/09/17 15:12:57 hollow Exp $
+
+  17 Sep 2009; Benedikt Böhm <hollow@gentoo.org> roundcube-0.3.ebuild:
+  convert most of the USE flag mess to EAPI2
 
   17 Sep 2009; Benedikt Böhm <hollow@gentoo.org> roundcube-0.2.2.ebuild,
   roundcube-0.3.ebuild:
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index 5dad5b25086f..cd8f1188adec 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -2,6 +2,6 @@ AUX postinstall-en.txt 2513 RMD160 c2a04efcdd4007642221797a10877c2fc57ad874 SHA1
 DIST roundcubemail-0.2.2.tar.gz 1703629 RMD160 c813e2bcfc7ba75c23b85ec620f819c1261c1f3f SHA1 ddb2340962bcf3ac24d026a6d97e9bd95cefaa3d SHA256 57df1dfa6b88973f74131adf0262de4fbf5217be3bc6739faeccff77a9dfffa3
 DIST roundcubemail-0.3-stable.tar.gz 1888994 RMD160 1b24903a9f67d200ea7548325ae833d35b3aff5a SHA1 cbc2b08e7d29cfdd455275c26818214eb725a736 SHA256 11b1618692000b82c4fde26527b2cf5c18850eb6f48c6c0004758c39308dfd04
 EBUILD roundcube-0.2.2.ebuild 2595 RMD160 a9b9f30d3307ac3ce63e338b605b1ca6b11afde6 SHA1 19372a008be4e4b64fb670a10c45543c3357e6a1 SHA256 1e1479bca40d04e0993cf2505a21e6dfa196860d839776dcd8af743416fafdca
-EBUILD roundcube-0.3.ebuild 2633 RMD160 d25f985d52b0a6705a3095b3b5f809142290d0b8 SHA1 cd5ed0919a2eb7959d8b249d6eb123af13e9bf97 SHA256 cf23a6066e9799368f37fb0a81afa7a405b377b1ce0308fe19ce14caecfe0550
-MISC ChangeLog 1498 RMD160 346a8b1ca4c10b06082dd0603093691e407fde32 SHA1 3fa3f0c907032e88fcc860cfcabdd9fb8a4e9427 SHA256 0dd6dc4b65095d58d395495bc5462991e6a3a4d8923e0a11dda9df1b6305faa2
+EBUILD roundcube-0.3.ebuild 1904 RMD160 6e304fa03d57a747d0f276817d01fbf8c303b2ed SHA1 8943eef3caba1deed7f68bea0e9be17b7dca45dd SHA256 d5c7723fac0c4c7c1154ad7269aec4a71e1a6f4c006ce93c21094bd22e42a938
+MISC ChangeLog 1617 RMD160 4c8184b2cc074137f0964e82460586dae5032789 SHA1 95ed4e6de20713b0a815485c764a1b0a7560b8dd SHA256 c9feffdf463ea75cde94153a90cb96cf6c289b476f8db54135e7522d8d2ee982
 MISC metadata.xml 161 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b SHA1 5b91a6d8d06d3dca2d774425befba30caca51507 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4
diff --git a/mail-client/roundcube/roundcube-0.3.ebuild b/mail-client/roundcube/roundcube-0.3.ebuild
index 26a93d27d10e..ef2e43fa1478 100644
--- a/mail-client/roundcube/roundcube-0.3.ebuild
+++ b/mail-client/roundcube/roundcube-0.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/roundcube/roundcube-0.3.ebuild,v 1.3 2009/09/17 14:46:36 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/roundcube/roundcube-0.3.ebuild,v 1.4 2009/09/17 15:12:57 hollow Exp $
 
 EAPI="2"
 
 MY_PN="${PN}mail"
 MY_P="${MY_PN}-${PV}-stable"
 
-inherit eutils webapp depend.php depend.apache
+inherit confutils webapp depend.php depend.apache
 
 DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface"
 HOMEPAGE="http://roundcube.net"
@@ -17,10 +17,10 @@ SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
 # for bundled PEAR components, googiespell and utf8.class.php
 LICENSE="GPL-2 BSD PHP-2.02 PHP-3 MIT public-domain"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="ldap mysql postgres sqlite ssl spell"
+IUSE="ldap mysql postgres +sqlite +ssl spell"
 
 DEPEND=""
-RDEPEND="
+RDEPEND="dev-lang/php[crypt,iconv,ldap?,pcre,postgres?,session,spl,ssl?,sqlite?,unicode]
 	spell? ( dev-lang/php[curl,spell] )
 	dev-php/PEAR-PEAR
 "
@@ -31,32 +31,11 @@ need_php_httpd
 S=${WORKDIR}/${MY_P}
 
 pkg_setup() {
-	local flags="crypt iconv pcre session unicode spl"
-	use ldap && flags="${flags} ldap"
-	use ssl && flags="${flags} ssl"
-	use spell && flags="${flags} curl spell"
-
-	# check for required PHP features
-	if ! use mysql && ! use postgres && ! use sqlite ; then
-		local dbflags="mysql mysqli postgres sqlite"
-		if ! PHPCHECKNODIE="yes" require_php_with_use ${flags} || \
-			! PHPCHECKNODIE="yes" require_php_with_any_use ${dbflags} ; then
-				die "Re-install ${PHP_PKG} with ${flags} and at least one of ${dbflags} in USE."
-		fi
-	else
-		for db in postgres sqlite ; do
-			use ${db} && flags="${flags} ${db}"
-		done
-		if ! PHPCHECKNODIE="yes" require_php_with_use ${flags} || \
-			( use mysql && ! PHPCHECKNODIE="yes" require_php_with_any_use mysql mysqli ) ; then
-				local diemsg="Re-install ${PHP_PKG} with ${flags}"
-				use mysql && diemsg="${diemsg} and at least one of mysql mysqli"
-				die "${diemsg} in USE"
-		fi
-	fi
+	confutils_require_any mysql postgres sqlite
+	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
+	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
@@ -74,7 +53,8 @@ src_install () {
 	webapp_src_preinst
 	dodoc CHANGELOG INSTALL README UPGRADING
 
-	cp -R [[:lower:]]* SQL "${D}/${MY_HTDOCSDIR}"
+	insinto "${MY_HTDOCSDIR}"
+	doins -r [[:lower:]]* SQL
 
 	webapp_serverowned "${MY_HTDOCSDIR}"/logs
 	webapp_serverowned "${MY_HTDOCSDIR}"/temp