Convert USE="ssl" to IMOBILEDEVICE_BACKEND USE_EXPAND to clarify it's exactly-one-of from gnutls or openssl.

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

3 files changed, 22 insertions, 15 deletions

diff --git a/app-pda/libimobiledevice/ChangeLog b/app-pda/libimobiledevice/ChangeLog
index 3e03c6cf8923..ff55287b4a10 100644
--- a/app-pda/libimobiledevice/ChangeLog
+++ b/app-pda/libimobiledevice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-pda/libimobiledevice
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/ChangeLog,v 1.24 2012/04/03 04:35:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/ChangeLog,v 1.25 2012/04/03 04:56:34 ssuominen Exp $
+
+  03 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
+  libimobiledevice-1.1.2.ebuild:
+  Convert USE="ssl" to IMOBILEDEVICE_BACKEND USE_EXPAND to clarify it's
+  exactly-one-of from gnutls or openssl.
 
   03 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
   libimobiledevice-1.1.1.ebuild:
diff --git a/app-pda/libimobiledevice/Manifest b/app-pda/libimobiledevice/Manifest
index 2cb2d8fdd43a..7a23428c5cff 100644
--- a/app-pda/libimobiledevice/Manifest
+++ b/app-pda/libimobiledevice/Manifest
@@ -4,17 +4,17 @@ Hash: SHA1
 DIST libimobiledevice-1.1.1.tar.bz2 459976 RMD160 7cc2860efc3b7d14686b776e6e9a5237804b3fc4 SHA1 eb81cb8c66beb68987fbc4126e9ca84cd19199c9 SHA256 c544d7bf0e7d6a97f3c446b2fb4597f19aac7b184ea806e16cd6a7852fd25f67
 DIST libimobiledevice-1.1.2.tar.bz2 508281 RMD160 d37acd947e104b06b7fddc8a635c92abf87ce871 SHA1 1046f29382855fc5f5a01f33e5efe3726ac65d50 SHA256 67afab6fca70f5ba7071cc7b27cd52564aac64b3a48b6b551739131382a61818
 EBUILD libimobiledevice-1.1.1.ebuild 1590 RMD160 69315fb44c79419948c3336c473235807d7734aa SHA1 a693a3ff53a9da1e8f8d8098a2b2495baf372c27 SHA256 72a63a614c0a3dad8f2966e3b9f0a9f59a47f50396b46f420eef1bc6504845fd
-EBUILD libimobiledevice-1.1.2.ebuild 1270 RMD160 a01be8bcd8dae042a1a6da8bf5628f60e383f87d SHA1 de3ba3c6da9ed28a8ee4a21992d37b578e1b36e1 SHA256 33d5ea2fa365ffce544e06ff2212d37ac079d71a5828913faf0ffe55ae2d4ae0
-MISC ChangeLog 3806 RMD160 6a0b87dfa3793ac497142caed076a95ced362626 SHA1 0733af793bdea0511a697e1a9cfe2ee0e0fc755e SHA256 d5e28f2b738362fff285dd704c129902d8df33d89f497690f07afe3031bb0f4f
+EBUILD libimobiledevice-1.1.2.ebuild 1484 RMD160 f6a03132771d67712064771481d52482c8165d89 SHA1 32f0083582ec62c7d7814b15633382387e18898e SHA256 c6cbd95e4adb4b1598d0478e5f573caf8822cbd5d26b9e0ea574701e1e1a3605
+MISC ChangeLog 4007 RMD160 38e666ff5c7f3a44e467b5c64c02dc83756f67f7 SHA1 47cac2942a6dcf78448899eaaac9aa1f40687d81 SHA256 e7ba2f3988615841680ba826fb7d8c73b0c3856c3ea40253e7421f3297fac852
 MISC metadata.xml 218 RMD160 dcf0864821f82cd4da3e0da4d518166f6045b7b5 SHA1 ca615ae28fbffc0e7e3d1e51e189fbd245fddcc4 SHA256 983941334731e33b40df7a8643ee1f0e415ff4a4e2c90e1a4ac80a852792fb47
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPen3pAAoJEEdUh39IaPFNXCoIAKIRkFK2QDS6xoRaQq1vOkD5
-0YwWBhhQEpgh9aJHCTxR1JAi1XLWEwMrVgtNvy/hqnd3GhKDTKxdBnoR4kLws8sy
-R46tIzOd8diCpPJW9muW/1PWGGX4cR+gsKnC0TFyyOvRtIB0AOJ2mayxhG45MSWc
-7Y1jj6jZrsyU5z6/I9OnIpYub10rUa8WfJ6vHCNctG9W6K9knbZtSe92CvzYu9iZ
-YWma2AQmBoVx29i/xKdUcuiW8DDJkWuQ5GY480j8Vdzxj8xXEyB+tzCTOHVcstjS
-gUyt6lqBHnPuurm1wICnrUBXSI82wTS4uasPcG0HZKBzHuOCKzdMGGIQTsvsRoY=
-=fkxJ
+iQEcBAEBAgAGBQJPeoLnAAoJEEdUh39IaPFN3FcH+QF9tsHJMP1vyLi/lVj67g5i
+BpDsBgU5WLoJ2cw54uMq+bFNSEWDh0OSTV9gg4UOiCJYFL8kbqSPVJmOnGQscmUo
+zhfGICiATO1tBUsC6E3i5uZMWU+8WiIbloplVwX7e9DpmG0ICpjV5cZf/LvESvM2
+irTU5WMgn9zWlM7DpJNcNfSy4pbV+j8L5NZJ1LCLjJxFtLB6faAAiC/kakgY/QNA
+/fpDiZsiskrTqlBoLkwcXbJL339m8QeAEQR14Mi8LDedum7T1XmV3GzzziZL2GNR
+MHkWbKHo2vEWMwv271PdrROJMU4lGN612DUpaLizXiCW1TNcGgpFT9ZjCVorOB8=
+=w22N
 -----END PGP SIGNATURE-----
diff --git a/app-pda/libimobiledevice/libimobiledevice-1.1.2.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.1.2.ebuild
index 6c04a4eb0e9b..0c7d35c7fb7d 100644
--- a/app-pda/libimobiledevice/libimobiledevice-1.1.2.ebuild
+++ b/app-pda/libimobiledevice/libimobiledevice-1.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/libimobiledevice-1.1.2.ebuild,v 1.2 2012/03/31 15:39:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/libimobiledevice-1.1.2.ebuild,v 1.3 2012/04/03 04:56:34 ssuominen Exp $
 
 EAPI=4
 
@@ -15,12 +15,12 @@ SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="python ssl static-libs"
+IUSE="imobiledevice_backend_gnutls +imobiledevice_backend_openssl python static-libs"
 
 RDEPEND=">=app-pda/libplist-1.8-r1[python?]
 	>=app-pda/usbmuxd-0.1.4
-	ssl? ( dev-libs/openssl:0 )
-	!ssl? (
+	imobiledevice_backend_openssl? ( dev-libs/openssl:0 )
+	imobiledevice_backend_gnutls? (
 		dev-libs/libgcrypt
 		>=dev-libs/libtasn1-1.1
 		>=net-libs/gnutls-2.2.0
@@ -29,6 +29,8 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	python? ( >=dev-python/cython-0.13 )"
 
+REQUIRED_USE="^^ ( imobiledevice_backend_openssl imobiledevice_backend_gnutls )"
+
 DOCS=( AUTHORS NEWS README )
 
 pkg_setup() {
@@ -45,7 +47,7 @@ src_prepare() {
 src_configure() {
 	local myconf
 	use python || myconf+=' --without-cython'
-	use ssl || myconf+=' --disable-openssl'
+	use imobiledevice_backend_openssl || myconf+=' --disable-openssl'
 
 	econf \
 		$(use_enable static-libs static) \