[gentoo-commits] repo/gentoo:master commit in: dev-cpp/commoncpp2/

[David Seifert]

commit:     1b8beeec1cfe80b8203081d214b98b4e3f4952d2
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 18 08:15:59 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Nov 18 08:16:23 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b8beeec

dev-cpp/commoncpp2: Pin subslots and remove REQUIRED_USE

Package-Manager: portage-2.3.2

 dev-cpp/commoncpp2/commoncpp2-1.8.1-r2.ebuild | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/dev-cpp/commoncpp2/commoncpp2-1.8.1-r2.ebuild 
b/dev-cpp/commoncpp2/commoncpp2-1.8.1-r2.ebuild
index 4cf6353..7fbd5cc 100644
--- a/dev-cpp/commoncpp2/commoncpp2-1.8.1-r2.ebuild
+++ b/dev-cpp/commoncpp2/commoncpp2-1.8.1-r2.ebuild
@@ -13,14 +13,18 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug doc examples ipv6 gnutls ssl static-libs"
-REQUIRED_USE="gnutls? ( ssl )"
 
-RDEPEND="ssl? ( gnutls? ( dev-libs/libgcrypt:0
-                       net-libs/gnutls )
-               !gnutls? ( dev-libs/openssl:0 ) )
-       sys-libs/zlib"
-DEPEND="doc? ( >=app-doc/doxygen-1.3.6 )
-       ${RDEPEND}"
+RDEPEND="
+       sys-libs/zlib
+       ssl? (
+               gnutls? (
+                       dev-libs/libgcrypt:0=
+                       net-libs/gnutls:=
+               )
+               !gnutls? ( dev-libs/openssl:0= )
+       )"
+DEPEND="${RDEPEND}
+       doc? ( >=app-doc/doxygen-1.3.6 )"
 
 PATCHES=(
        "${FILESDIR}/1.8.1-configure_detect_netfilter.patch"
@@ -38,19 +42,14 @@ src_prepare() {
 }
 
 src_configure() {
-       local myconf
-       if use gnutls; then
-               myconf+="--with-gnutls"
-       else
-               use ssl && myconf+="--with-openssl"
-       fi
+       use ssl && local myconf=( $(usex gnutls '--with-gnutls' 
'--with-openssl') )
 
        econf \
                $(use_enable debug) \
                $(use_with ipv6) \
                $(use_enable static-libs static) \
                $(use_with doc doxygen) \
-               ${myconf}
+               "${myconf[@]}"
 }
 
 src_install () {