Fix configuration (bug #321783).

Package-Manager: portage-HEAD/cvs/Linux x86_64

diff --git a/dev-libs/xmlsec/ChangeLog b/dev-libs/xmlsec/ChangeLog
index 3a19cb308e39ef8c826dbec972338ce72ef86689..dc65e683c06130827e0664ff476886c40630f6b3 100644 (file)
--- a/dev-libs/xmlsec/ChangeLog
+++ b/dev-libs/xmlsec/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/xmlsec
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlsec/ChangeLog,v 1.21 2010/05/27 13:39:49 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlsec/ChangeLog,v 1.22 2010/05/28 17:26:54 arfrever Exp $
+
+  28 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  xmlsec-1.2.16.ebuild:
+  Fix configuration (bug #321783).
 
 *xmlsec-1.2.16 (27 May 2010)
 

diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index 947a5e2f3fe17d2045625047acd502e7e17de3e6..eb11d14ddd139f744c3a9ee9d94df688ce2cb4f2 100644 (file)
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -1,4 +1,4 @@
 DIST xmlsec1-1.2.16.tar.gz 1803092 RMD160 15064b3c3ec84c87b271013cb3fa165972f0e2c4 SHA1 ecd220b4498bbe212188fffd0aded92910d4bbd9 SHA256 f62df3315b87d61544d7733e99ceccece046c813b60b898109d98808ca8bd88c
-EBUILD xmlsec-1.2.16.ebuild 2056 RMD160 417032f64c5aa8caf22e2541815dbabcee06dde5 SHA1 b7df9455aca6cf7c7e6a77d91f108011081c372a SHA256 f2e7e968dcbb64927478692195701ddfc33aecf2a7ba5f9efd14a10a0033bb17
-MISC ChangeLog 3535 RMD160 85e628d6f320f6d79269c33518b38d30c2ba1df8 SHA1 2311921eff7cbed85019b91845ea6eada0345440 SHA256 d207241a3ca5bab8555b2f3f2e695fc7fdc0abed456b1692e39e697e5041da0a
+EBUILD xmlsec-1.2.16.ebuild 2067 RMD160 4d4a34b166273622e6fd2fb731e027e33a69fe45 SHA1 2dce0c3f29a9a88cbc8e0e4b018c6e0a5c755d3e SHA256 4ebef0df856c51697335e39edb96906f7d3dcb8f0094aac35bd26531bf59415e
+MISC ChangeLog 3668 RMD160 099428eccd11cf9e236528f346c3acaf8c5be828 SHA1 2c7450260fa372ca8048be373fcffca5d6dd9c1e SHA256 3de435be4559f5f0e47ab35cadb29adcd8b020b13fab7aa99f6c6790e966f0b8
 MISC metadata.xml 407 RMD160 246753d3c438dd121b758cf78d0dfa207d26e2ba SHA1 1968e8443464acbe3df8b3b8bb09f4ecbdfe0d5a SHA256 24ce9d1d2f526604b80756a26b22d11268c0ea34837c4b241ad1cc3b1acde5fb

diff --git a/dev-libs/xmlsec/xmlsec-1.2.16.ebuild b/dev-libs/xmlsec/xmlsec-1.2.16.ebuild
index ec67997608fe3deabba6254c17305fc72a0ac47a..318fca97d31be8fa154f544e25f418581183e856 100644 (file)
--- a/dev-libs/xmlsec/xmlsec-1.2.16.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.2.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlsec/xmlsec-1.2.16.ebuild,v 1.1 2010/05/27 13:39:49 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlsec/xmlsec-1.2.16.ebuild,v 1.2 2010/05/28 17:26:54 arfrever Exp $
 
 EAPI="3"
 
@@ -27,19 +27,6 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${PN}1-${PV}"
 
-# Redefine use_with() until fixed version is available in released versions of Portage.
-# http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a05bba76435d94407fd25549d0552902962baf62
-use_with() {
-       local UW_SUFFIX=${3+=$3}
-       local UWORD=${2:-$1}
-
-       if useq $1; then
-               echo "--with-${UWORD}${UW_SUFFIX}"
-       else
-               echo "--without-${UWORD}"
-       fi
-}
-
 pkg_setup() {
        if ! use gcrypt && ! use gnutls && ! use nss && ! use openssl; then
                die "At least one of the following USE flags must be enabled: gcrypt gnutls nss openssl"
@@ -56,6 +43,19 @@ pkg_setup() {
 #}
 
 src_configure() {
+       # Redefine use_with() until fixed version is available in released versions of Portage.
+       # http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a05bba76435d94407fd25549d0552902962baf62
+       use_with() {
+               local UW_SUFFIX=${3+=$3}
+               local UWORD=${2:-$1}
+
+               if useq $1; then
+                       echo "--with-${UWORD}${UW_SUFFIX}"
+               else
+                       echo "--without-${UWORD}"
+               fi
+       }
+
        econf \
                $(use_with gcrypt gcrypt "") \
                $(use_with gnutls gnutls "") \