Removed experimental dbus/networkmanager-support.

Package-Manager: portage-2.1.3.12

3 files changed, 19 insertions, 18 deletions

diff --git a/net-misc/strongswan/ChangeLog b/net-misc/strongswan/ChangeLog
index f804222408c1..7de4188c77a0 100644
--- a/net-misc/strongswan/ChangeLog
+++ b/net-misc/strongswan/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/strongswan
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.56 2007/10/02 01:29:55 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.57 2007/10/08 17:50:51 pylon Exp $
+
+  08 Oct 2007; Lars Weiler <pylon@gentoo.org> strongswan-4.1.6.ebuild:
+  Removed experimental dbus/networkmanager-support.
 
 *strongswan-4.1.6 (02 Oct 2007)
 
diff --git a/net-misc/strongswan/Manifest b/net-misc/strongswan/Manifest
index 8e9f1c39d631..a2ee47d2e87f 100644
--- a/net-misc/strongswan/Manifest
+++ b/net-misc/strongswan/Manifest
@@ -33,14 +33,14 @@ EBUILD strongswan-2.8.4.ebuild 3982 RMD160 33f1dea198cf9beddbb897a68400e386a6813
 MD5 418d00dd35dbde23e518e899ee5ed687 strongswan-2.8.4.ebuild 3982
 RMD160 33f1dea198cf9beddbb897a68400e386a6813621 strongswan-2.8.4.ebuild 3982
 SHA256 a900737b6e2ff52c511e15dd5b48aa8e41424a3ad4a80f4d220dcb99e7d3116f strongswan-2.8.4.ebuild 3982
-EBUILD strongswan-4.1.6.ebuild 2483 RMD160 55198133359d6a67cb47b79e5d746c6af74936f1 SHA1 da8575dfd499bfd51f396d8fef5fdee625df7766 SHA256 a0639ab14276ccceec56a18827c85baa0f3d2143e888a59746d80d75a4f81715
-MD5 3afa207bad08c02c5b88f0a5d06df86f strongswan-4.1.6.ebuild 2483
-RMD160 55198133359d6a67cb47b79e5d746c6af74936f1 strongswan-4.1.6.ebuild 2483
-SHA256 a0639ab14276ccceec56a18827c85baa0f3d2143e888a59746d80d75a4f81715 strongswan-4.1.6.ebuild 2483
-MISC ChangeLog 9665 RMD160 e15bd821016b3d9d0e8f6c5160cc66ac37c92db8 SHA1 a64e59ad95055a75b96d065adaceb4f9b8e51b9f SHA256 0e6e6f4b8d839427bed8f4dd91ff7f0d62cd208ac6270df9e11ed09c499f31a4
-MD5 b52991c76325699e838dd65113d9bf63 ChangeLog 9665
-RMD160 e15bd821016b3d9d0e8f6c5160cc66ac37c92db8 ChangeLog 9665
-SHA256 0e6e6f4b8d839427bed8f4dd91ff7f0d62cd208ac6270df9e11ed09c499f31a4 ChangeLog 9665
+EBUILD strongswan-4.1.6.ebuild 2409 RMD160 ef180497548c7a3d15f8b9b9a60a49bacec63983 SHA1 545ace14736958ee135d1df7dd74682f39e08f85 SHA256 8595e5b25b99ce4b52c35969bad15bc295d2269e127a420f4a6e7b6ac467e7e3
+MD5 4b559d7dcf11ad7c82b6915d984f8c4e strongswan-4.1.6.ebuild 2409
+RMD160 ef180497548c7a3d15f8b9b9a60a49bacec63983 strongswan-4.1.6.ebuild 2409
+SHA256 8595e5b25b99ce4b52c35969bad15bc295d2269e127a420f4a6e7b6ac467e7e3 strongswan-4.1.6.ebuild 2409
+MISC ChangeLog 9789 RMD160 1807b7d073716060ae077102910a52199a91d47b SHA1 c4a5029a1b6e81996fbc28edfd6285b83c6c9a9c SHA256 07a4deeb03fb1fe075c870eee47596b03755e1d3802d8341464e26ee79b46343
+MD5 ea5f80b5b075aaccb2a9a7cecb128890 ChangeLog 9789
+RMD160 1807b7d073716060ae077102910a52199a91d47b ChangeLog 9789
+SHA256 07a4deeb03fb1fe075c870eee47596b03755e1d3802d8341464e26ee79b46343 ChangeLog 9789
 MISC metadata.xml 679 RMD160 e5c2f42354e1cbd27e1a57bbbb39611854f8146c SHA1 6d9720b91647becf7bab7d14679b22dd127ecd8b SHA256 659b3be0850b32ab1488f6ef3e6f62fcc082d215dffdb1f495da68e6d0dc2726
 MD5 77ae52509a78f634a55e408d5a18cebb metadata.xml 679
 RMD160 e5c2f42354e1cbd27e1a57bbbb39611854f8146c metadata.xml 679
@@ -60,7 +60,7 @@ SHA256 ab5afe08d3a1b87bcd9a89d1d90f43bb07b25fd559121e5f374a58e3f9c2f71d files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHAZ8s6IPkARlRZfQRAuSTAKCV07+OYk3dQrFIzec7MLWWkchVzACePeXj
-nC7AIcAHgQ/9AQFM6G+I0Bw=
-=CnWA
+iD8DBQFHCm4O6IPkARlRZfQRAjBUAJ9nDa0P7mgreGrpTdbbe/1wlaBFfwCdGwJu
+fhvRlisHZlkPHTs737s5idw=
+=cLAE
 -----END PGP SIGNATURE-----
diff --git a/net-misc/strongswan/strongswan-4.1.6.ebuild b/net-misc/strongswan/strongswan-4.1.6.ebuild
index b9a623fe1efe..79b6b548019c 100644
--- a/net-misc/strongswan/strongswan-4.1.6.ebuild
+++ b/net-misc/strongswan/strongswan-4.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-4.1.6.ebuild,v 1.1 2007/10/02 01:29:55 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-4.1.6.ebuild,v 1.2 2007/10/08 17:50:51 pylon Exp $
 
 inherit eutils linux-info
 
@@ -13,7 +13,7 @@ SRC_URI="http://download.strongswan.org/${P}.tar.bz2"
 LICENSE="GPL-2 RSA-MD2 RSA-MD5 RSA-PKCS11 DES"
 SLOT="0"
 KEYWORDS="~ppc ~x86"
-IUSE="cisco curl dbus debug ldap nat smartcard static xml"
+IUSE="cisco curl debug ldap nat smartcard static xml"
 
 COMMON_DEPEND="!net-misc/openswan
 	dev-libs/gmp"
@@ -21,7 +21,6 @@ DEPEND="${COMMON_DEPEND}
 	virtual/linux-sources
 	sys-kernel/linux-headers
 	curl? ( net-misc/curl )
-	dbus? ( sys-apps/dbus net-misc/networkmanager )
 	ldap? ( net-nds/openldap )
 	smartcard? ( dev-libs/opensc )
 	xml? ( dev-libs/libxml2 )"
@@ -41,7 +40,7 @@ pkg_setup() {
 		die "Install an IPsec enabled 2.6 kernel."
 	fi
 
-	# install strongswan non-root by default
+	# change to an unprivileged user by default
 	enewgroup ${UGID}
 	enewuser ${UGID} -1 -1 -1 ${UGID}
 }
@@ -49,7 +48,7 @@ pkg_setup() {
 src_compile() {
 	local myconf=""
 
-	# change to an unauthorised user by default
+	# change to an unprivileged user by default
 	myconf="${myconf} --with-uid=$(id -u ${UGID}) --with-gid=$(id -g ${UGID})"
 	# strongswan enables both by default; switch to the user's wish
 	if use static; then
@@ -61,7 +60,6 @@ src_compile() {
 	econf \
 		$(use_enable curl http) \
 		$(use_enable ldap) \
-		$(use_enable dbus) \
 		$(use_enable xml) \
 		$(use_enable smartcard) \
 		$(use_enable cisco cisco-quirks) \