net-misc/aria2: Changed the handling of ssl/gnutls/bittorrent USE-flags

svn path=/sunrise/; revision=490

diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest
index 4fd4e366bb67f1d5edf0c0cd9aeb871bf23fbe6e..caeae5b15aa1f9064716f718e810b9b44da77c58 100644 (file)
--- a/net-misc/aria2/Manifest
+++ b/net-misc/aria2/Manifest
@@ -1,8 +1,8 @@
 DIST aria2-0.5.2.tar.bz2 323937 RMD160 385bf4029f80c55600a7fcaa3d81a5355038a9f2 SHA1 a96cf3f0266b91d87d5124cf94326422800b627d SHA256 8702928be47641f553d06007594f0ab8ed7ef719edd324266779f72f6b08e4cb
-EBUILD aria2-0.5.2.ebuild 960 RMD160 80886f7437ded0eaaefecc6dfae4f66e695dd16a SHA1 46db87daa8ad84e46f54cb165ac283221b7f0c3b SHA256 fffd204e1b3e2c00d4c7f771dcb8015c47d7a79f81a12e48989b82e7a7df01df
-MD5 14a0c30aa2fd69ad6043b3153a682492 aria2-0.5.2.ebuild 960
-RMD160 80886f7437ded0eaaefecc6dfae4f66e695dd16a aria2-0.5.2.ebuild 960
-SHA256 fffd204e1b3e2c00d4c7f771dcb8015c47d7a79f81a12e48989b82e7a7df01df aria2-0.5.2.ebuild 960
+EBUILD aria2-0.5.2.ebuild 808 RMD160 0df04c7d968b80495a43cad1a40c75578d5d0116 SHA1 bd13978e989e1fd4c484c30ac72b41b062dfa2a7 SHA256 a77f7941627f6ce98f3916e7bb0ef3ece3cf23545d4a9ab63171df6fe78855fa
+MD5 eba9ac94cf6e7b38002d447d73c06f91 aria2-0.5.2.ebuild 808
+RMD160 0df04c7d968b80495a43cad1a40c75578d5d0116 aria2-0.5.2.ebuild 808
+SHA256 a77f7941627f6ce98f3916e7bb0ef3ece3cf23545d4a9ab63171df6fe78855fa aria2-0.5.2.ebuild 808
 MISC ChangeLog 303 RMD160 25a43880621a0ce9d49d029e23e59d9a68e8cfc9 SHA1 6338722dfbce511d9b7e57b2ccb2cc8661b192a0 SHA256 f1b94b054568387702665af5c16f80037768814367d8f260ed73ebf4b7659c5f
 MD5 3b2e277c2c8f7d562fb717b9c9340121 ChangeLog 303
 RMD160 25a43880621a0ce9d49d029e23e59d9a68e8cfc9 ChangeLog 303

diff --git a/net-misc/aria2/aria2-0.5.2.ebuild b/net-misc/aria2/aria2-0.5.2.ebuild
index d37823f93bc74858fa54ce38ac8aaffd9415f630..d9fd6c41c9a6b6e9da3c51edc4c2692b467219ca 100644 (file)
--- a/net-misc/aria2/aria2-0.5.2.ebuild
+++ b/net-misc/aria2/aria2-0.5.2.ebuild
@@ -9,27 +9,21 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="bittorrent crypt gnutls nls ssl"
+IUSE="bittorrent gnutls nls ssl"
 
-RDEPEND="gnutls? ( net-libs/gnutls )
-        ssl? ( dev-libs/openssl )
-        crypt? ( dev-libs/libgcrypt )
+RDEPEND="ssl? ( gnutls? ( net-libs/gnutls )
+               !gnutls? ( dev-libs/openssl )
+               )
+        bittorrent? ( gnutls? ( dev-libs/libgcrypt ) )
         nls? ( virtual/libiconv virtual/libintl )"
 DEPEND="${RDEPEND}"
 
-pkg_setup() {
-       if use bittorrent && ! use openssl && ! ( use gnutls && use crypt ); then
-               eerror "For bittorrent, you need either openssl or gnutls and grypt"
-               eerror "use flags enabled"
-               die "use flag inconsistency"
-       fi
-}
-
 src_compile() {
+       use ssl && \
+               myconf="${myconf} $(use_enable gnutls) $(use_enable !gnutls openssl)"
        econf \
                $(use_enable nls) \
-               $(use_with gnutls) \
-               $(use_with ssl openssl) \
+               ${myconf} \
                || die "econf failed"
        emake || die "emake failed"
 }