[gentoo-commits] gentoo-x86 commit in net-misc/strongswan: metadata.xml ChangeLog strongswan-5.0.0.ebuild

[gentoo-commits] gentoo-x86 commit in net-misc/strongswan: metadata.xml ChangeLog strongswan-5.0.0.ebuild

[Bjarke Istrup Pedersen (gurligebis)]

gurligebis    12/09/06 18:53:41

  Modified:             metadata.xml ChangeLog strongswan-5.0.0.ebuild
  Log:
  Fixing building with -pam and +eap use flags, fixing bug 434128
  
  (Portage version: 2.2.0_alpha123/cvs/Linux i686)

Revision  Changes    Path
1.14                 net-misc/strongswan/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/strongswan/metadata.xml?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/strongswan/metadata.xml?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/strongswan/metadata.xml?r1=1.13&r2=1.14

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/strongswan/metadata.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- metadata.xml	24 Sep 2011 10:09:43 -0000	1.13
+++ metadata.xml	6 Sep 2012 18:53:41 -0000	1.14
@@ -9,11 +9,6 @@
     <email>gurligebis@gentoo.org</email>
     <name>Bjarke Istrup Pedersen</name>
   </maintainer>
-  <maintainer>
-    <email>ua_bugz_gentoo@mortal-soul.de</email>
-    <name>Matthias Dahl</name>
-    <description>Proxy Maintainer, CC on all bugs</description>
-  </maintainer>
   <longdescription lang="en">
     StrongSwan is direct descendant of the discontinued FreeS/WAN project.
     As an IPsec based VPN solution which is focused on security and ease of



1.97                 net-misc/strongswan/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/strongswan/ChangeLog?rev=1.97&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/strongswan/ChangeLog?rev=1.97&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/strongswan/ChangeLog?r1=1.96&r2=1.97

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- ChangeLog	1 Jul 2012 10:45:17 -0000	1.96
+++ ChangeLog	6 Sep 2012 18:53:41 -0000	1.97
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/strongswan
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.96 2012/07/01 10:45:17 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.97 2012/09/06 18:53:41 gurligebis Exp $
+
+  06 Sep 2012; <gurligebis@gentoo.org> strongswan-5.0.0.ebuild, metadata.xml:
+  Fixing building with -pam and +eap use flags, fixing bug #434128
 
 *strongswan-5.0.0 (01 Jul 2012)
 



1.2                  net-misc/strongswan/strongswan-5.0.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/strongswan/strongswan-5.0.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/strongswan/strongswan-5.0.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/strongswan/strongswan-5.0.0.ebuild?r1=1.1&r2=1.2

Index: strongswan-5.0.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-5.0.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- strongswan-5.0.0.ebuild	1 Jul 2012 10:45:17 -0000	1.1
+++ strongswan-5.0.0.ebuild	6 Sep 2012 18:53:41 -0000	1.2
@@ -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/net-misc/strongswan/strongswan-5.0.0.ebuild,v 1.1 2012/07/01 10:45:17 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-5.0.0.ebuild,v 1.2 2012/09/06 18:53:41 gurligebis Exp $
 
 EAPI=2
 inherit eutils linux-info user
@@ -12,7 +12,7 @@
 LICENSE="GPL-2 RSA-MD5 RSA-PKCS11 DES"
 SLOT="0"
 KEYWORDS="~arm ~amd64 ~ppc ~sparc ~x86"
-IUSE="+caps curl debug dhcp eap farp gcrypt ldap +ikev1 +ikev2 mysql +non-root +openssl sqlite"
+IUSE="+caps curl debug dhcp eap pam farp gcrypt ldap +ikev1 +ikev2 mysql +non-root +openssl sqlite"
 
 COMMON_DEPEND="!net-misc/openswan
 	>=dev-libs/gmp-4.1.5
@@ -22,7 +22,8 @@
 	ldap? ( net-nds/openldap )
 	openssl? ( >=dev-libs/openssl-0.9.8[-bindist] )
 	mysql? ( virtual/mysql )
-	sqlite? ( >=dev-db/sqlite-3.3.1 )"
+	sqlite? ( >=dev-db/sqlite-3.3.1 )
+	pam? ( sys-libs/pam )"
 DEPEND="${COMMON_DEPEND}
 	virtual/linux-sources
 	sys-kernel/linux-headers"
@@ -108,6 +109,11 @@
 	# strongSwan builds and installs static libs by default which are
 	# useless to the user (and to strongSwan for that matter) because no
 	# header files or alike get installed... so disabling them is safe.
+	if use pam && use eap; then
+		myconf="${myconf} --enable-eap-gtc"
+	else
+		myconf="${myconf} --disable-eap-gtc"
+	fi
 	econf \
 		--disable-static \
 		$(use_with caps capabilities libcap) \
@@ -121,7 +127,6 @@
 		$(use_enable eap eap-simaka-reauth) \
 		$(use_enable eap eap-identity) \
 		$(use_enable eap eap-md5) \
-		$(use_enable eap eap-gtc) \
 		$(use_enable eap eap-aka) \
 		$(use_enable eap eap-aka-3gpp2) \
 		$(use_enable eap eap-mschapv2) \