Adding profiles

svn path=/overlay/; revision=10

12 files changed, 104 insertions, 63 deletions

diff --git a/net-misc/networkmanager-openvpn/Manifest b/net-misc/networkmanager-openvpn/Manifest
index a847fdd..3dfcfb6 100644
--- a/net-misc/networkmanager-openvpn/Manifest
+++ b/net-misc/networkmanager-openvpn/Manifest
@@ -1,21 +1,21 @@
-AUX networkmanager-openvpn-0.3.3_pre20070621-libnm-util-dep.patch 427 RMD160 f1c2c53151ca35265b67168e0b2486a12345d706 SHA1 342b9579b243208c47c6d686df272ae9d3b5adb9 SHA256 44bfb38b63e5c164d449fe9a9a9ee5a19ca4e654f3beb410d59645d5f567bc68
-MD5 86df708bb01c368c825a52040f716530 files/networkmanager-openvpn-0.3.3_pre20070621-libnm-util-dep.patch 427
-RMD160 f1c2c53151ca35265b67168e0b2486a12345d706 files/networkmanager-openvpn-0.3.3_pre20070621-libnm-util-dep.patch 427
-SHA256 44bfb38b63e5c164d449fe9a9a9ee5a19ca4e654f3beb410d59645d5f567bc68 files/networkmanager-openvpn-0.3.3_pre20070621-libnm-util-dep.patch 427
+AUX networkmanager-openvpn-0.3.2_p20070621-service-name.patch 612 RMD160 43736ae448fceebf03511b5c9c94c7ea898d8538 SHA1 b91e195d70383036fb79c59ff99f4fe7fbd2861a SHA256 dd615118e9a2fea251a759a6e49cbaf8da611598e18fd9ab3144f374474252b3
+MD5 53074426f2892d3165e28e70b2a8b412 files/networkmanager-openvpn-0.3.2_p20070621-service-name.patch 612
+RMD160 43736ae448fceebf03511b5c9c94c7ea898d8538 files/networkmanager-openvpn-0.3.2_p20070621-service-name.patch 612
+SHA256 dd615118e9a2fea251a759a6e49cbaf8da611598e18fd9ab3144f374474252b3 files/networkmanager-openvpn-0.3.2_p20070621-service-name.patch 612
+AUX networkmanager-openvpn-0.3.3_pre20070621-libnm-util-dep.patch 481 RMD160 adc564b482e0bb2ab4c3722c00e10ca278663a06 SHA1 ce96a94801a6a83ee53890e31827d305780ff2e8 SHA256 fb54195f24205b3163ba8dc9e63686bec3b78abe5709b7f706ef18c0ef2adca3
+MD5 1d47c0eea0950800391f683799884b48 files/networkmanager-openvpn-0.3.3_pre20070621-libnm-util-dep.patch 481
+RMD160 adc564b482e0bb2ab4c3722c00e10ca278663a06 files/networkmanager-openvpn-0.3.3_pre20070621-libnm-util-dep.patch 481
+SHA256 fb54195f24205b3163ba8dc9e63686bec3b78abe5709b7f706ef18c0ef2adca3 files/networkmanager-openvpn-0.3.3_pre20070621-libnm-util-dep.patch 481
 DIST NetworkManager-openvpn-0.3.2_p20070621.tar.gz 467416 RMD160 8077b3b629e1c003d5ea78ad7c3aa17d4d6a1f15 SHA1 0c9d1ee1db9608ff2fcfc3ae2e1ce3847deb7789 SHA256 e6552cd2180698e304f4a3e0f5db0d945f896931433febac3d88e6e8be2dd22c
 DIST NetworkManager-openvpn-0.3.3_pre20070621.tar.gz 487858 RMD160 5920a26f5b2814bd14c1221311c32effa75ca208 SHA1 f6dfcd4251874e52613148c615365e7e5ab1e789 SHA256 46300661317924f48b5822346f8f0f3276a2b4d0c8e111855432c93bf4f820ad
-EBUILD networkmanager-openvpn-0.3.2_p20070621.ebuild 1283 RMD160 305e26dd45aaefd221038fc508cc7183d6f6fbd1 SHA1 d13ddf7613eae48d40c0727770b6c2ae62545cc0 SHA256 7afcc03b679adedef5a3c34956341610bdc4d22952c1eb4bc2959b71be103f59
-MD5 ec2141f900f0b5e2169f7d8d18f1692c networkmanager-openvpn-0.3.2_p20070621.ebuild 1283
-RMD160 305e26dd45aaefd221038fc508cc7183d6f6fbd1 networkmanager-openvpn-0.3.2_p20070621.ebuild 1283
-SHA256 7afcc03b679adedef5a3c34956341610bdc4d22952c1eb4bc2959b71be103f59 networkmanager-openvpn-0.3.2_p20070621.ebuild 1283
-EBUILD networkmanager-openvpn-0.3.3_pre20070621.ebuild 1410 RMD160 ca14ee8657eff3cfefabcd7e188b55f509617686 SHA1 af7e8210586a952128de84f32efb009036782f42 SHA256 fc3763ce3993aa5865dfd855d5c26c4440468a80dc2c956c8ea303835fb316c8
-MD5 c1b54c7acec4644e130182122f09ec56 networkmanager-openvpn-0.3.3_pre20070621.ebuild 1410
-RMD160 ca14ee8657eff3cfefabcd7e188b55f509617686 networkmanager-openvpn-0.3.3_pre20070621.ebuild 1410
-SHA256 fc3763ce3993aa5865dfd855d5c26c4440468a80dc2c956c8ea303835fb316c8 networkmanager-openvpn-0.3.3_pre20070621.ebuild 1410
-MISC networkmanager-openvpn-0.3.3_pre20070621.ebuild~ 1408 RMD160 64e19f9c765a878dea3f625370c5d356b3958730 SHA1 b9948795a1b2ca100dd513ae32510623024cce50 SHA256 523c40f5ebe50c9c6edf0c5190071b1197108f7b96ef44816909b0c482684a44
-MD5 aebe8b821564cede34ec471b8f2d4804 networkmanager-openvpn-0.3.3_pre20070621.ebuild~ 1408
-RMD160 64e19f9c765a878dea3f625370c5d356b3958730 networkmanager-openvpn-0.3.3_pre20070621.ebuild~ 1408
-SHA256 523c40f5ebe50c9c6edf0c5190071b1197108f7b96ef44816909b0c482684a44 networkmanager-openvpn-0.3.3_pre20070621.ebuild~ 1408
+EBUILD networkmanager-openvpn-0.3.2_p20070621.ebuild 1396 RMD160 59b77748366e859b7ba50fa49a1484011dbbdede SHA1 24038e21a50fe6415f7a01725076a7751d04443f SHA256 2adb08261c5a05e76015f4858e62f0cfdd8fc2ea1c11b52cb8270134848c9595
+MD5 0f389c8f2e96aa2564f84ed2bd2ae150 networkmanager-openvpn-0.3.2_p20070621.ebuild 1396
+RMD160 59b77748366e859b7ba50fa49a1484011dbbdede networkmanager-openvpn-0.3.2_p20070621.ebuild 1396
+SHA256 2adb08261c5a05e76015f4858e62f0cfdd8fc2ea1c11b52cb8270134848c9595 networkmanager-openvpn-0.3.2_p20070621.ebuild 1396
+EBUILD networkmanager-openvpn-0.3.3_pre20070621.ebuild 1408 RMD160 64e19f9c765a878dea3f625370c5d356b3958730 SHA1 b9948795a1b2ca100dd513ae32510623024cce50 SHA256 523c40f5ebe50c9c6edf0c5190071b1197108f7b96ef44816909b0c482684a44
+MD5 aebe8b821564cede34ec471b8f2d4804 networkmanager-openvpn-0.3.3_pre20070621.ebuild 1408
+RMD160 64e19f9c765a878dea3f625370c5d356b3958730 networkmanager-openvpn-0.3.3_pre20070621.ebuild 1408
+SHA256 523c40f5ebe50c9c6edf0c5190071b1197108f7b96ef44816909b0c482684a44 networkmanager-openvpn-0.3.3_pre20070621.ebuild 1408
 MD5 696a3f4c7790a246115d84273003c5e3 files/digest-networkmanager-openvpn-0.3.2_p20070621 316
 RMD160 697ba913d3cde632fca3ffc1995486014544c312 files/digest-networkmanager-openvpn-0.3.2_p20070621 316
 SHA256 8ab6d52ce2d40fa2875d6d0de5ff5ab95c3cfbf85fea2f66fd7312f3aeda0482 files/digest-networkmanager-openvpn-0.3.2_p20070621 316
diff --git a/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-0.3.2_p20070621-service-name.patch b/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-0.3.2_p20070621-service-name.patch
new file mode 100644
index 0000000..1c127ed
--- /dev/null
+++ b/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-0.3.2_p20070621-service-name.patch
@@ -0,0 +1,17 @@
+Fixes bug http://bugzilla.gnome.org/show_bug.cgi?id=447577
+
+Index: openvpn/nm-openvpn-service.name.in
+===================================================================
+--- openvpn/nm-openvpn-service.name.in  (revision 2653)
++++ openvpn/nm-openvpn-service.name.in  (working copy)
+@@ -1,8 +1,8 @@
+ [VPN Connection]
+ name=openvpn
+ service=org.freedesktop.NetworkManager.openvpn
+-program=@bindir@/nm-openvpn-service
++program=@BINDIR@/nm-openvpn-service
+
+ [GNOME]
+-auth-dialog=@libexecdir@/nm-openvpn-auth-dialog
++auth-dialog=@LIBEXECDIR@/nm-openvpn-auth-dialog
+ properties=@prefix@/${LIB}/libnm-openvpn-properties
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.3.2_p20070621.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.3.2_p20070621.ebuild
index fc7315a..7a066d0 100644
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.3.2_p20070621.ebuild
+++ b/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.3.2_p20070621.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit gnome2 eutils
+inherit gnome2 eutils autotools
 
 # NetworkManager likes itself with capital letters
 MY_P=${P/networkmanager/NetworkManager}
@@ -50,3 +50,11 @@ G2CONF="${G2CONF} \
 	--disable-more-warnings \
 	--with-dbus-sys=/etc/dbus-1/system.d \
 	--enable-notification-icon"
+
+src_unpack () {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-service-name.patch"
+	eautoreconf
+}
diff --git a/net-misc/networkmanager-pptp/Manifest b/net-misc/networkmanager-pptp/Manifest
index 638f2b3..e4537a1 100644
--- a/net-misc/networkmanager-pptp/Manifest
+++ b/net-misc/networkmanager-pptp/Manifest
@@ -1,20 +1,24 @@
-AUX networkmanager-pptp-0.1.0_p20070621-fpic.patch 487 RMD160 9b0a23437c29d136ec8fe6668e44dfa767e7e741 SHA1 9237c3e18fb4b42be4d716d5151acc5f7081cd02 SHA256 d802a34f35524273b7074f849e9c67962f6387a9a8fd23c16b2dc3e98ea76ff9
-MD5 fdc5a5452d9a79d23dbc2f66783ffece files/networkmanager-pptp-0.1.0_p20070621-fpic.patch 487
-RMD160 9b0a23437c29d136ec8fe6668e44dfa767e7e741 files/networkmanager-pptp-0.1.0_p20070621-fpic.patch 487
-SHA256 d802a34f35524273b7074f849e9c67962f6387a9a8fd23c16b2dc3e98ea76ff9 files/networkmanager-pptp-0.1.0_p20070621-fpic.patch 487
+AUX networkmanager-pptp-0.1.0_p20070726-pptp-service-lib.patch 874 RMD160 ea1342b3f815da31fd107aa3fbe1ebbf4f8c0f80 SHA1 2e8c4ca68c89ec05b2495ec207b2aa3cbed7e86d SHA256 938272e2f1e0990ce35a59a3b35caf6efa73a4b419815bbb744e626baeea5c45
+MD5 d3186a391b20885de9cdc4d9f34348d8 files/networkmanager-pptp-0.1.0_p20070726-pptp-service-lib.patch 874
+RMD160 ea1342b3f815da31fd107aa3fbe1ebbf4f8c0f80 files/networkmanager-pptp-0.1.0_p20070726-pptp-service-lib.patch 874
+SHA256 938272e2f1e0990ce35a59a3b35caf6efa73a4b419815bbb744e626baeea5c45 files/networkmanager-pptp-0.1.0_p20070726-pptp-service-lib.patch 874
+AUX networkmanager-pptp-0.1.0_p20070726-service-name.patch 626 RMD160 bca8b62ab1c157af0cd6bf0af77e4b1e71f9d613 SHA1 fcefd2e4b2f8f7f57e62cfa8396c6c3bbc7536a1 SHA256 865ba9173bc1bc3ad9c77b0c82915343fae99e05d74e533d53cfcf09ef78e102
+MD5 190202b23fda3fe50d8797e0507542e1 files/networkmanager-pptp-0.1.0_p20070726-service-name.patch 626
+RMD160 bca8b62ab1c157af0cd6bf0af77e4b1e71f9d613 files/networkmanager-pptp-0.1.0_p20070726-service-name.patch 626
+SHA256 865ba9173bc1bc3ad9c77b0c82915343fae99e05d74e533d53cfcf09ef78e102 files/networkmanager-pptp-0.1.0_p20070726-service-name.patch 626
 DIST NetworkManager-ppp_vpn-0.7.0_pre20070621.tar.gz 568340 RMD160 30b9dafa41e616460045847b97efd0e4b8dd3824 SHA1 7f29ffeafb3767e2909b20305fab67863a2e8aa5 SHA256 ea934673c57a50b094797c677c6a76dba8042f696d02ab379dcd57d1a1f19999
-DIST NetworkManager-pptp-0.1.0_p20070621.tar.gz 443869 RMD160 e5fe71028c97028dd218d277d0da3f52e37affa9 SHA1 52088bc4bd71a110f6b5821a7f5335e6cfbcc771 SHA256 05d38a245502043c81a850ef70aecfe1cc0f2037480c7e0850b967949fb57c3b
-EBUILD networkmanager-pptp-0.1.0_p20070621.ebuild 1322 RMD160 c332cbdde62d75b322b2149f763ba32ed62f7e85 SHA1 af73303ce1e02a0c7a7c21a79a414feae5574f4f SHA256 b3b24d237acf2180a748a4866d98eda9188fa8198a631661b91948bcbdef98ef
-MD5 cbc67b025e5e981b06f140e75eda8263 networkmanager-pptp-0.1.0_p20070621.ebuild 1322
-RMD160 c332cbdde62d75b322b2149f763ba32ed62f7e85 networkmanager-pptp-0.1.0_p20070621.ebuild 1322
-SHA256 b3b24d237acf2180a748a4866d98eda9188fa8198a631661b91948bcbdef98ef networkmanager-pptp-0.1.0_p20070621.ebuild 1322
-EBUILD networkmanager-pptp-0.7.0_pre20070621.ebuild 1259 RMD160 c349f30aee6b25d7a464a9cc25e9b27a51d22e71 SHA1 fe50a44d91f55a9e52915d3445e49f1a8af0d5be SHA256 6ea5453257417ffa56b99059dc6ec774e156767990d41b76dd8f1d77236ca683
-MD5 27369d3faec0aa460d4a9042760ef4b8 networkmanager-pptp-0.7.0_pre20070621.ebuild 1259
-RMD160 c349f30aee6b25d7a464a9cc25e9b27a51d22e71 networkmanager-pptp-0.7.0_pre20070621.ebuild 1259
-SHA256 6ea5453257417ffa56b99059dc6ec774e156767990d41b76dd8f1d77236ca683 networkmanager-pptp-0.7.0_pre20070621.ebuild 1259
-MD5 54de0d1d12b32f71d8e3804748b89d87 files/digest-networkmanager-pptp-0.1.0_p20070621 307
-RMD160 340379579e830f1cdd40fe00edaf42d69d82b451 files/digest-networkmanager-pptp-0.1.0_p20070621 307
-SHA256 4fa598692ab571370339b3923cd68884c6f96287c7acc03740837401154ab7ae files/digest-networkmanager-pptp-0.1.0_p20070621 307
+DIST NetworkManager-pptp-0.1.0_p20070726.tar.gz 444015 RMD160 bbc67e8461e0df687f43f2aee851429ce206e0dd SHA1 be7d88e126e281fa3119f69854b0534e88deab5c SHA256 b90990ee1c17089341b9e4078ee0ed0f4af3b972a26a6639239588ef07335cc6
+EBUILD networkmanager-pptp-0.1.0_p20070726.ebuild 1430 RMD160 034dad4976daeae24582965a0b8be478e88a0c5a SHA1 c2233e41945690efbd46d140fc5b7446ceee56f6 SHA256 6dcf2769327ebf1bf0dad91fcde1273e4d4646e0a6a67b771e01955014f9f7d1
+MD5 26255604470cf574bb79cb5618fee4c6 networkmanager-pptp-0.1.0_p20070726.ebuild 1430
+RMD160 034dad4976daeae24582965a0b8be478e88a0c5a networkmanager-pptp-0.1.0_p20070726.ebuild 1430
+SHA256 6dcf2769327ebf1bf0dad91fcde1273e4d4646e0a6a67b771e01955014f9f7d1 networkmanager-pptp-0.1.0_p20070726.ebuild 1430
+EBUILD networkmanager-pptp-0.7.0_pre20070621.ebuild 1275 RMD160 fd0cd9cf8583de7dbe74db4fad2c38cc081dc38d SHA1 43c9a58cfb23d98789de8e9f1ab03b5c2ecd8f4a SHA256 dc230d3bbcfbb8a6924953c2aac314d99dc86e4ec258b02713dcdf3ca2d4877f
+MD5 9849ee8e3ba24a905570792a3a537bab networkmanager-pptp-0.7.0_pre20070621.ebuild 1275
+RMD160 fd0cd9cf8583de7dbe74db4fad2c38cc081dc38d networkmanager-pptp-0.7.0_pre20070621.ebuild 1275
+SHA256 dc230d3bbcfbb8a6924953c2aac314d99dc86e4ec258b02713dcdf3ca2d4877f networkmanager-pptp-0.7.0_pre20070621.ebuild 1275
+MD5 43eb9e7f5412abe4e86918713ead95eb files/digest-networkmanager-pptp-0.1.0_p20070726 307
+RMD160 3049b8e091c8344fd166357ad27b10bac7757f36 files/digest-networkmanager-pptp-0.1.0_p20070726 307
+SHA256 93f9aadd6031f89abdc1a22eff05c94f8830ed4124822ebca397b151fff69286 files/digest-networkmanager-pptp-0.1.0_p20070726 307
 MD5 229dcb3e57f92f1d6f2c6a8c278fc1db files/digest-networkmanager-pptp-0.7.0_pre20070621 322
 RMD160 5ecfc7814dce68826237b98dc2c1cced77ecd376 files/digest-networkmanager-pptp-0.7.0_pre20070621 322
 SHA256 c320eef5275bebf0bca000b564c10202339e9ddd6ac43f062ac8cb24e9455e41 files/digest-networkmanager-pptp-0.7.0_pre20070621 322
diff --git a/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.1.0_p20070621-fpic.patch b/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.1.0_p20070621-fpic.patch
deleted file mode 100644
index 0f94638..0000000
--- a/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.1.0_p20070621-fpic.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fixes http://bugzilla.gnome.org/show_bug.cgi?id=454723
-
-Index: src/Makefile.am
-===================================================================
---- src/Makefile.am	(revision 2627)
-+++ src/Makefile.am	(working copy)
-@@ -14,7 +14,8 @@
- 	-DLIBDIR=\""$(libdir)"\"				\
- 	-DLIBEXECDIR=\""$(libexecdir)"\"			\
- 	-DLOCALSTATEDIR=\""$(localstatedir)"\"		 	\
--	-DDATADIR=\"$(datadir)\"
-+	-DDATADIR=\"$(datadir)\"				\
-+	-fPIC
- 
- bin_PROGRAMS = nm-pptp-service nm-pptp-service-pppd-plugin.so
- 
diff --git a/net-misc/networkmanager-pptp/networkmanager-pptp-0.1.0_p20070621.ebuild b/net-misc/networkmanager-pptp/networkmanager-pptp-0.1.0_p20070726.ebuild
index 0d960d7..7f5ef1d 100644
--- a/net-misc/networkmanager-pptp/networkmanager-pptp-0.1.0_p20070621.ebuild
+++ b/net-misc/networkmanager-pptp/networkmanager-pptp-0.1.0_p20070726.ebuild
@@ -19,6 +19,7 @@ IUSE="crypt debug doc gnome"
 RDEPEND=">=sys-apps/dbus-0.35.2
 	>=dev-libs/glib-2.8
 	>=net-misc/networkmanager-0.6
+	net-dialup/ppp
 	gnome? ( >=x11-libs/gtk+-2.8
 		>=gnome-base/libglade-2
 		>=gnome-base/gnome-keyring-0.4
@@ -34,6 +35,7 @@ RDEPEND=">=sys-apps/dbus-0.35.2
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-util/intltool"
+RDEPEND="net-dialup/pptpclient"
 
 S=${WORKDIR}/${MY_P}
 
@@ -51,6 +53,7 @@ src_unpack () {
 	unpack ${A}
 	cd "${S}"
 
-	epatch ${FILESDIR}/${P}-fpic.patch
+	epatch "${FILESDIR}/${P}-service-name.patch"
+	epatch "${FILESDIR}/${P}-pptp-service-lib.patch"
 	eautoreconf
 }
diff --git a/net-misc/networkmanager-pptp/networkmanager-pptp-0.7.0_pre20070621.ebuild b/net-misc/networkmanager-pptp/networkmanager-pptp-0.7.0_pre20070621.ebuild
index e2fc1b5..bea2cbb 100644
--- a/net-misc/networkmanager-pptp/networkmanager-pptp-0.7.0_pre20070621.ebuild
+++ b/net-misc/networkmanager-pptp/networkmanager-pptp-0.7.0_pre20070621.ebuild
@@ -20,6 +20,7 @@ IUSE="crypt debug doc gnome"
 RDEPEND=">=sys-apps/dbus-0.35.2
 	>=dev-libs/glib-2.8
 	>=net-misc/networkmanager-0.7.0_pre20070627
+	net-dialup/ppp
 	gnome? ( >=x11-libs/gtk+-2.8
 		>=gnome-base/libglade-2
 		>=gnome-base/gnome-keyring-0.4
diff --git a/net-misc/networkmanager-vpnc/Manifest b/net-misc/networkmanager-vpnc/Manifest
index 0fcc6d9..acad5d4 100644
--- a/net-misc/networkmanager-vpnc/Manifest
+++ b/net-misc/networkmanager-vpnc/Manifest
@@ -1,3 +1,7 @@
+AUX networkmanager-vpnc-0.6.4_p20070621-service-name.patch 585 RMD160 75379b2000169189f1a8e179d041e71d39151326 SHA1 3a228568089d9906f707f95c47aaf7a8cda2146a SHA256 d440538dbbaa226ceebff4661b508c03ed812f30d4efe72dedc54c6576c23963
+MD5 069739897ceb1c35cf7edee0312ce8bc files/networkmanager-vpnc-0.6.4_p20070621-service-name.patch 585
+RMD160 75379b2000169189f1a8e179d041e71d39151326 files/networkmanager-vpnc-0.6.4_p20070621-service-name.patch 585
+SHA256 d440538dbbaa226ceebff4661b508c03ed812f30d4efe72dedc54c6576c23963 files/networkmanager-vpnc-0.6.4_p20070621-service-name.patch 585
 AUX nm-vpnc-dbus_conf.patch 715 RMD160 ba8ee121d330cd704272a9f220b1f2c3983b329c SHA1 0e2799e9f9a8d56ee882af8afc6afe0d3e5a12e1 SHA256 1d4f08479ef0bf5f222f18717f5d3ed7329fb2f09f1118c95a576c995bfee02d
 MD5 9ddbcbc13c483a8c115828a7408a0e4f files/nm-vpnc-dbus_conf.patch 715
 RMD160 ba8ee121d330cd704272a9f220b1f2c3983b329c files/nm-vpnc-dbus_conf.patch 715
@@ -8,10 +12,10 @@ RMD160 cf6138d9847db1310e095e559822f13956a9fc6b files/nm-vpnc-path.patch 418
 SHA256 5557a9956d3dd9921b2722045d5dbb675f8e17dca1de8603cf6adb7fc3fa3672 files/nm-vpnc-path.patch 418
 DIST NetworkManager-vpnc-0.6.4_p20070621.tar.gz 435524 RMD160 0849848fe6311eb1ec0b18d64607fe5388370fb6 SHA1 16c7697598ef76a3b338bbb75693d800b96862a0 SHA256 bff3d3ef3f9140095554b0aa57db7f6fe12176675f5016f51e247a9c4990f979
 DIST NetworkManager-vpnc-0.7.0_pre20070621.tar.gz 452352 RMD160 bdd360b2ba1bdabf9c46ca17e80e5352f720a81f SHA1 60763c9614920bfb87b526d23dc9b967befec759 SHA256 9a0e68e580911ba75fcdc0aff833aa2d3f62d7b28b1f850696b082c8d140e7fd
-EBUILD networkmanager-vpnc-0.6.4_p20070621.ebuild 1550 RMD160 b74cf6227bdb5ef0ff2988fe31281c719072b18c SHA1 d7cb4e7ae23e8fa9d8626e11ea51364741d28e97 SHA256 ebc0afbe2aa820a4c18fe25c39306d6f816976b9c90be5d2f4b6e63fc5a3affa
-MD5 ec9ddaaa50bd989e7f61c0e71e12e534 networkmanager-vpnc-0.6.4_p20070621.ebuild 1550
-RMD160 b74cf6227bdb5ef0ff2988fe31281c719072b18c networkmanager-vpnc-0.6.4_p20070621.ebuild 1550
-SHA256 ebc0afbe2aa820a4c18fe25c39306d6f816976b9c90be5d2f4b6e63fc5a3affa networkmanager-vpnc-0.6.4_p20070621.ebuild 1550
+EBUILD networkmanager-vpnc-0.6.4_p20070621.ebuild 1620 RMD160 792448cfd9b70665c7661d0efffec4315a26875f SHA1 8cb1478fad64c348a82613a31f6f519652f88a75 SHA256 cd1beca9c2caff7bd1f99718c28b6c4a07d62fa1316e341717be554a9c331fb1
+MD5 0167e1754edc2a21f7d616dfac897932 networkmanager-vpnc-0.6.4_p20070621.ebuild 1620
+RMD160 792448cfd9b70665c7661d0efffec4315a26875f networkmanager-vpnc-0.6.4_p20070621.ebuild 1620
+SHA256 cd1beca9c2caff7bd1f99718c28b6c4a07d62fa1316e341717be554a9c331fb1 networkmanager-vpnc-0.6.4_p20070621.ebuild 1620
 EBUILD networkmanager-vpnc-0.7.0_pre20070621.ebuild 1562 RMD160 16755b1f80b34625fe330802822fb774605b6959 SHA1 1bfe3f030c92795fb2c36b1538c78cff82527f85 SHA256 5db6a9789c19a73506b0e4b16a942cd3937df6ce8107de2ac7fc19a79dc95b0f
 MD5 0916727e7b366cafb8e1b1301bbec44e networkmanager-vpnc-0.7.0_pre20070621.ebuild 1562
 RMD160 16755b1f80b34625fe330802822fb774605b6959 networkmanager-vpnc-0.7.0_pre20070621.ebuild 1562
diff --git a/net-misc/networkmanager-vpnc/files/networkmanager-vpnc-0.6.4_p20070621-service-name.patch b/net-misc/networkmanager-vpnc/files/networkmanager-vpnc-0.6.4_p20070621-service-name.patch
new file mode 100644
index 0000000..83b2a7b
--- /dev/null
+++ b/net-misc/networkmanager-vpnc/files/networkmanager-vpnc-0.6.4_p20070621-service-name.patch
@@ -0,0 +1,17 @@
+Fixes bug http://bugzilla.gnome.org/show_bug.cgi?id=447577
+
+Index: vpnc/nm-vpnc-service.name.in
+===================================================================
+--- vpnc/nm-vpnc-service.name.in        (revision 2653)
++++ vpnc/nm-vpnc-service.name.in        (working copy)
+@@ -1,8 +1,8 @@
+ [VPN Connection]
+ name=vpnc
+ service=org.freedesktop.NetworkManager.vpnc
+-program=@bindir@/nm-vpnc-service
++program=@BINDIR@/nm-vpnc-service
+
+ [GNOME]
+-auth-dialog=@libexecdir@/nm-vpnc-auth-dialog
++auth-dialog=@LIBEXECDIR@/nm-vpnc-auth-dialog
+ properties=@prefix@/${LIB}/libnm-vpnc-properties
diff --git a/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.6.4_p20070621.ebuild b/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.6.4_p20070621.ebuild
index d732752..7262797 100644
--- a/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.6.4_p20070621.ebuild
+++ b/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.6.4_p20070621.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit gnome2 eutils
+inherit gnome2 eutils autotools
 
 # NetworkManager likes itself with capital letters
 MY_P=${P/networkmanager/NetworkManager}
@@ -58,4 +58,7 @@ src_unpack () {
 	epatch ${FILESDIR}/nm-vpnc-path.patch
 	# Match the same dbus permissions as NetworkManager
 	epatch ${FILESDIR}/nm-vpnc-dbus_conf.patch
+
+	epatch "${FILESDIR}/${P}-service-name.patch"
+	eautoreconf
 }
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 00220bc..691de9c 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -18,19 +18,19 @@ AUX networkmanager-use-kernel-headers.patch 466 RMD160 cd16279966d4e3594a20aa0b8
 MD5 e9879921dd5b0669337e27ca2196cfd4 files/networkmanager-use-kernel-headers.patch 466
 RMD160 cd16279966d4e3594a20aa0b89d08f3baa3c2e58 files/networkmanager-use-kernel-headers.patch 466
 SHA256 952948f41676fafcf76210cbef46728cbb219d6c851d5417d892b984fd725402 files/networkmanager-use-kernel-headers.patch 466
-DIST NetworkManager-0.6.5_p20070627.tar.gz 959971 RMD160 c5b255260affcdc927d8a4624dcd1aa12a713ef8 SHA1 925ec31253fb7c5cd4a8ce3363187897393bbbba SHA256 1939511e20d7fc3a1acc11a777c5b64c6a99783cb28c5bffcb2e13184fce9eac
+DIST NetworkManager-0.6.5_p20070726.tar.gz 962168 RMD160 1bf911081dea52e05cbf4afd80ca09331ba5b43a SHA1 0008e7fab140e8bb134c6421760feb09b94dcda7 SHA256 ad43d02c2d072da63817bff5e070609f255a086ce290ac9af01523f82ae1f2d7
 DIST NetworkManager-0.7.0_pre20070627.tar.gz 1056932 RMD160 088ecbf8ca416bfece76dd1e4d85afd9e389848b SHA1 bf7edf6070fc8036096006e82f0101add2deefdf SHA256 f831920a7b8c5e3c6ed9af63a66f22edf41c34eac0846773324e74544610f316
-EBUILD networkmanager-0.6.5_p20070627.ebuild 2475 RMD160 5a932ff46e2ca7673c32454b043d74019bfb0215 SHA1 3283e3d84ce96bb8c93975ab93501bc1895811d9 SHA256 342de9858801ac82fa7d35675246f0efb5428a67a57169a1c4f2b29e60e5e0c1
-MD5 0a8803bb0bea9ab17cda6007469180bc networkmanager-0.6.5_p20070627.ebuild 2475
-RMD160 5a932ff46e2ca7673c32454b043d74019bfb0215 networkmanager-0.6.5_p20070627.ebuild 2475
-SHA256 342de9858801ac82fa7d35675246f0efb5428a67a57169a1c4f2b29e60e5e0c1 networkmanager-0.6.5_p20070627.ebuild 2475
+EBUILD networkmanager-0.6.5_p20070726.ebuild 2475 RMD160 5a932ff46e2ca7673c32454b043d74019bfb0215 SHA1 3283e3d84ce96bb8c93975ab93501bc1895811d9 SHA256 342de9858801ac82fa7d35675246f0efb5428a67a57169a1c4f2b29e60e5e0c1
+MD5 0a8803bb0bea9ab17cda6007469180bc networkmanager-0.6.5_p20070726.ebuild 2475
+RMD160 5a932ff46e2ca7673c32454b043d74019bfb0215 networkmanager-0.6.5_p20070726.ebuild 2475
+SHA256 342de9858801ac82fa7d35675246f0efb5428a67a57169a1c4f2b29e60e5e0c1 networkmanager-0.6.5_p20070726.ebuild 2475
 EBUILD networkmanager-0.7.0_pre20070627.ebuild 2473 RMD160 c206caf45e6b4a503e77554d7f9f6094b8caa25d SHA1 82a304c41539d85f6b8ca056478b664a60c63b73 SHA256 ecab6e58c82b3b13817971f987051836b6a309ed4918d619ad06948d64ce337c
 MD5 d233e5c9d0cb00b4c279062fc20277e7 networkmanager-0.7.0_pre20070627.ebuild 2473
 RMD160 c206caf45e6b4a503e77554d7f9f6094b8caa25d networkmanager-0.7.0_pre20070627.ebuild 2473
 SHA256 ecab6e58c82b3b13817971f987051836b6a309ed4918d619ad06948d64ce337c networkmanager-0.7.0_pre20070627.ebuild 2473
-MD5 d0bbbcd9fd828030742f775fc0bb2344 files/digest-networkmanager-0.6.5_p20070627 292
-RMD160 3ddae8b33b6807a00d772348abb55d136f9bf9ba files/digest-networkmanager-0.6.5_p20070627 292
-SHA256 32ec47d06bea02181d3434cd6ee0351b5f62f7b6c2f05818f2e82e69b6950a76 files/digest-networkmanager-0.6.5_p20070627 292
+MD5 915cc07a6cb148b9f6421f490240d767 files/digest-networkmanager-0.6.5_p20070726 292
+RMD160 6bcb3fb0148c2bdaa0206af4d46bd536c71072c6 files/digest-networkmanager-0.6.5_p20070726 292
+SHA256 b4f5803e23f1fa4fb21673307f4b678dbb9969e266a4ea9faceaaaf00839b09a files/digest-networkmanager-0.6.5_p20070726 292
 MD5 ca1329ea43ac13dfaff35a2ea2a28e76 files/digest-networkmanager-0.7.0_pre20070627 301
 RMD160 4be01818633f5fb780084696ecde6e4ca5c984b0 files/digest-networkmanager-0.7.0_pre20070627 301
 SHA256 fcf59a00a4ee405da77597895d7df804c29dc4384f5bd5765ce65fcf00eb4a13 files/digest-networkmanager-0.7.0_pre20070627 301
diff --git a/net-misc/networkmanager/networkmanager-0.6.5_p20070627.ebuild b/net-misc/networkmanager/networkmanager-0.6.5_p20070726.ebuild
index 7233358..7233358 100644
--- a/net-misc/networkmanager/networkmanager-0.6.5_p20070627.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.6.5_p20070726.ebuild