Fixing building with -pam and +eap use flags, fixing bug 434128

Package-Manager: portage-2.2.0_alpha123/cvs/Linux i686

4 files changed, 24 insertions, 21 deletions

diff --git a/net-misc/strongswan/ChangeLog b/net-misc/strongswan/ChangeLog
index 15121b547ae9..4d4927a5b0bd 100644
--- a/net-misc/strongswan/ChangeLog
+++ b/net-misc/strongswan/ChangeLog
@@ -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)
 
diff --git a/net-misc/strongswan/Manifest b/net-misc/strongswan/Manifest
index 3923355a6a63..57ad048dffad 100644
--- a/net-misc/strongswan/Manifest
+++ b/net-misc/strongswan/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX ipsec 445 RMD160 9240cf2699984634fae9b0f45c813742fd05e047 SHA1 efcc1bedfbeae8a5b85f85e4926472edbca37be0 SHA256 5ba492de6d612d7def1cb7ceacadf8397e50f8433b91c4f2f09bf216eed34da6
-DIST strongswan-4.6.4.tar.bz2 3504672 RMD160 51406171d60e51866d7b3afd89c1c2c9e3884de1 SHA1 a0bb51ace911dbfb8d4a9560e150b0661ea6220c SHA256 f372b4cc3d6c8a50a0b262e02e6a7fad43f91cc5a80cbd9432eb3c48ab2d4c69
-DIST strongswan-5.0.0.tar.bz2 3087071 RMD160 8f7ab3d0031fc5f8574f07971ae137e885a76e3f SHA1 065efc50cf994fcd6e64279b477aa028f9d5423d SHA256 efc13c86e715b5e596d9d8535640c830f83e977fe521afd2c70d68926c4b573e
-EBUILD strongswan-4.6.4.ebuild 8828 RMD160 48af8b21ed7bf1e25795d173ea373427e638508e SHA1 42f1b0f37ff582312db0513c3b9e1f0a1e8cd256 SHA256 dcfbab1212bfcdefb843993548fa5d96dec06ca3416c42e48f6dd7a078f65646
-EBUILD strongswan-5.0.0.ebuild 8648 RMD160 ef66f2f78846ca0d762ecc48a6d0f251495a1a09 SHA1 8d459a2ed497f974737ba48022aec44183c0b7cd SHA256 76ac2c5fec9242592cdcb37e6f78761ef9dbaa861d9c13f5449a54011494f9fa
-MISC ChangeLog 18027 RMD160 bfe089ebaac2cbfb8368a8635570f9a17deb9f38 SHA1 306caf7938fba47525b43334a16b5beb0aa8a4d7 SHA256 3571376fff8710b0aa589ecaab27d2747634597dffb91b8b7ec941442620c573
-MISC metadata.xml 2830 RMD160 eddcd8e41f609b74ac0ded070426e40a3b2a1275 SHA1 0e4ef010c8ebf3508598ffa98911ecfd0cdfe8ed SHA256 926c2940211ddf2808593eadca3463c05213b2c55370c0bf839bd0abf77e77f0
+AUX ipsec 445 SHA256 5ba492de6d612d7def1cb7ceacadf8397e50f8433b91c4f2f09bf216eed34da6 SHA512 fb786be3c356b22d32b86132d11ebc2eca34414aa0961dc66374697c4cf0fc2fe57e8638b3bbd247f1a0fbf5539bd496200d4c70633a855a88591cf113a69754 WHIRLPOOL d90910b657330b84ab3e89456a1fdc49d8bd6bbae377e883cdd073cdf8e6e44f6f45e7118ac76874fa950ad7245fe2a89876ac6a8ffb3d6e4f6cf75bed39b807
+DIST strongswan-4.6.4.tar.bz2 3504672 SHA256 f372b4cc3d6c8a50a0b262e02e6a7fad43f91cc5a80cbd9432eb3c48ab2d4c69 SHA512 082fadaacfef648452a58fe37893951bf6f4188acc4380f2f4e2cda8b2bd6e51f3e56a685880b24e4112b9e8baf46a2d449bf04e98b89a0aa96b926c581c9c4a WHIRLPOOL 010a1f681f65bf3041e8dc1b5240ffe54d3146322968a4f98e6b29c096d5ce06718d57ed914f08c51eb57b664c26cf7f23ba6c3006ab294172f893d26371696d
+DIST strongswan-5.0.0.tar.bz2 3087071 SHA256 efc13c86e715b5e596d9d8535640c830f83e977fe521afd2c70d68926c4b573e SHA512 93058bc7f84a54799be10547979b48c24ede4144f4e6691aaa08fee9c6c7fd3039f8d31035e72755c37e2436c28796cb5764e97e9cc5cc056d99984d949bc06b WHIRLPOOL 82b67199adaaa03a6972687cd0e009ed3edd410043c03256f3fcc3e7b69d1912c1a26e8da4bc5513abd90c4740b3ddbea390c5b5dd4adee87491ef2bebb43ba8
+EBUILD strongswan-4.6.4.ebuild 8828 SHA256 dcfbab1212bfcdefb843993548fa5d96dec06ca3416c42e48f6dd7a078f65646 SHA512 9006d65ad05bcd17ab7ee1e0adf6052c163bffff3cdda4333b3c1582cb883fa1e6d8f9e1987f4a07644387587380ad7c4f2ce1f5222553a3844f199f907b4e54 WHIRLPOOL 3c859291e7134f471a31f8ad96087f015fe3fde1402d63fe7a3f6fe28d9895c3ef09e10bcf3ffc5c5518744f6d25f0cdae6ee55bfec70a66387dabb2a19e9a30
+EBUILD strongswan-5.0.0.ebuild 8761 SHA256 227dfabb17ba3090d315b3bf7b7f2772325bca7dbb87a84d81822470f3fd6b30 SHA512 ff31c540de3c0f88f2034eda3bb99ae1eb9d0ec8c5f340fb20be90a2dca75512a170482cb7a264e0ac7480fb82956e3ad21ae71f7c3ea533107481d635e22f1c WHIRLPOOL fbfcfdff8814bf006f654c7db0252fb53ecdaff1d7145038a5c0514b7ca9eb6da190eaa2befe02e6315502b06b10ec392b9c1346697030215de4b7ab5b2f9a7f
+MISC ChangeLog 18173 SHA256 74ffede3555e8db9beb477989bedfbdb6e4d575af090d5b9ddea3592016065df SHA512 97057668a44790a650e000365f9bce20668dc47d1335e38316a4deab24018724080973e24fc8daa3ddae269d08c78100a85d33f128fa00cb8bddeb253f85313d WHIRLPOOL 1130ae1b3661c47220c15d4d57f7f7e724c2547f7cf54b425c063d7256d902ac466f3ce4b981802e34ac0383e590e56d3efdc8759cee0bab3e154505de84a67b
+MISC metadata.xml 2655 SHA256 aa343a90e9113a15ef59cab628b7fef1c50f3e776a76ebc47b575349f5878742 SHA512 b3ad93c4b380d33c0c9479d948c4a0d1b83ed5fd3f8267e437aeb8b57706930e75f82ecb14ab3b3674146bc68215c4dc5288229447fdb970991383693cd07719 WHIRLPOOL 0ee848c3e44542a16819cf55825b0847eebd549a0a120c5453616da47f4e2f3ec60960a26e9b2265fb586789a5e6b306f22f64cc040ac18f37e081d534dfd493
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/wKkMACgkQsR7PQhRXYEnW5wCggUhcRk1DWAamWQiBYk+t+EaZ
-kPUAn23huvaKVrcbMWRENS16IuZcxpUZ
-=w95k
+iEYEAREIAAYFAlBI8RYACgkQsR7PQhRXYEnIqwCeJtRHaCG//KksmBxDRcAv9pwa
+M1IAoIVGVry3QT9p7qFsVt4PGMDwLrIz
+=0aCV
 -----END PGP SIGNATURE-----
diff --git a/net-misc/strongswan/metadata.xml b/net-misc/strongswan/metadata.xml
index 81f3e6f4ed68..3ae719bdc6f3 100644
--- a/net-misc/strongswan/metadata.xml
+++ b/net-misc/strongswan/metadata.xml
@@ -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
diff --git a/net-misc/strongswan/strongswan-5.0.0.ebuild b/net-misc/strongswan/strongswan-5.0.0.ebuild
index 5a1042b61be2..a58c75d36c68 100644
--- a/net-misc/strongswan/strongswan-5.0.0.ebuild
+++ b/net-misc/strongswan/strongswan-5.0.0.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/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 @@ SRC_URI="http://download.strongswan.org/${P}.tar.bz2"
 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 @@ COMMON_DEPEND="!net-misc/openswan
 	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 @@ src_configure() {
 	# 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 @@ src_configure() {
 		$(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) \