Version bump, mainly a bugfix release.

Package-Manager: portage-2.1.4_rc4

11 files changed, 60 insertions, 234 deletions

diff --git a/kde-misc/knetworkmanager/ChangeLog b/kde-misc/knetworkmanager/ChangeLog
index 646da5490466..f50b2dcc7354 100644
--- a/kde-misc/knetworkmanager/ChangeLog
+++ b/kde-misc/knetworkmanager/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for kde-misc/knetworkmanager
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/knetworkmanager/ChangeLog,v 1.4 2007/08/31 18:38:43 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/knetworkmanager/ChangeLog,v 1.5 2007/12/03 00:37:30 rbu Exp $
+
+*knetworkmanager-0.2.1_pre20071119 (03 Dec 2007)
+
+  03 Dec 2007; Robert Buchholz <rbu@gentoo.org>
+  -files/knetworkmanager-0.2-fixbuild_u64-hschaa-01.patch,
+  +files/knetworkmanager-0.2.1-fixbuild_u64-hschaa-01.patch,
+  -files/knetworkmanager-0.2-fix-desktop-icon.patch,
+  -files/knetworkmanager-0.2-kppp.patch,
+  -files/knetworkmanager-0.2_p20070831-optional-dialup.patch,
+  -knetworkmanager-0.2.ebuild, -knetworkmanager-0.2_p20070831.ebuild,
+  +knetworkmanager-0.2.1_pre20071119.ebuild:
+  Version bump, mainly a bugfix release. Fix building against
+  >=libnl-1.0_pre6-r1 (bug #201033)
 
 *knetworkmanager-0.2_p20070831 (31 Aug 2007)
 
diff --git a/kde-misc/knetworkmanager/Manifest b/kde-misc/knetworkmanager/Manifest
index 2ae465e9e7ef..e6041d99d57d 100644
--- a/kde-misc/knetworkmanager/Manifest
+++ b/kde-misc/knetworkmanager/Manifest
@@ -1,55 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX knetworkmanager-0.2-fix-desktop-icon.patch 426 RMD160 912bf45eef402b3cdc1e81a158b977bfb43e5382 SHA1 8a0674e9585ff848ad66b6129f9452a2e0d2ecd2 SHA256 aabaae9a1721af57a81eb1c9dafbba1590825e41e2b748188fe5f788f44946e0
-MD5 521d200981e8b16db49760b6bf0b6013 files/knetworkmanager-0.2-fix-desktop-icon.patch 426
-RMD160 912bf45eef402b3cdc1e81a158b977bfb43e5382 files/knetworkmanager-0.2-fix-desktop-icon.patch 426
-SHA256 aabaae9a1721af57a81eb1c9dafbba1590825e41e2b748188fe5f788f44946e0 files/knetworkmanager-0.2-fix-desktop-icon.patch 426
-AUX knetworkmanager-0.2-fixbuild_u64-hschaa-01.patch 566 RMD160 27cd973efbb3a7755c21596da73b661d1c5deea7 SHA1 bd811d5a0e8a16b35d02fdd41ea76564c65a70c7 SHA256 44e6e0043a132daf43744c4853c1a436254bcdc30a52fd0434ae1919d9f112bd
-MD5 4944d32d86f22f4064fcc74feb635131 files/knetworkmanager-0.2-fixbuild_u64-hschaa-01.patch 566
-RMD160 27cd973efbb3a7755c21596da73b661d1c5deea7 files/knetworkmanager-0.2-fixbuild_u64-hschaa-01.patch 566
-SHA256 44e6e0043a132daf43744c4853c1a436254bcdc30a52fd0434ae1919d9f112bd files/knetworkmanager-0.2-fixbuild_u64-hschaa-01.patch 566
-AUX knetworkmanager-0.2-kppp.patch 1361 RMD160 a31b400698ee6b4b8f1b1b84da4168a88ffe88d8 SHA1 9ace96bc81639070e8198c1963fa1385837fbb92 SHA256 80279e19090287e98a4e4604a099018bb0dc068655d0ad3afcdae8415d13f95f
-MD5 c4ccedf6d7db94160341e9740806c487 files/knetworkmanager-0.2-kppp.patch 1361
-RMD160 a31b400698ee6b4b8f1b1b84da4168a88ffe88d8 files/knetworkmanager-0.2-kppp.patch 1361
-SHA256 80279e19090287e98a4e4604a099018bb0dc068655d0ad3afcdae8415d13f95f files/knetworkmanager-0.2-kppp.patch 1361
 AUX knetworkmanager-0.2-pam_console-fix.patch 1290 RMD160 cab71463e5e73b0a05eceb7cc6e98f2f3e2ecdf0 SHA1 3962ebf997fc9e63fe001061f25c4b6c024eab1a SHA256 7b1c8f6dadc18c7809f7bdb988b0085ea1ff63cdc61d1d0044f55f0b7ef738cb
 MD5 eee5d95e3ab443968379a29cdbbf5f4a files/knetworkmanager-0.2-pam_console-fix.patch 1290
 RMD160 cab71463e5e73b0a05eceb7cc6e98f2f3e2ecdf0 files/knetworkmanager-0.2-pam_console-fix.patch 1290
 SHA256 7b1c8f6dadc18c7809f7bdb988b0085ea1ff63cdc61d1d0044f55f0b7ef738cb files/knetworkmanager-0.2-pam_console-fix.patch 1290
-AUX knetworkmanager-0.2_p20070831-optional-dialup.patch 2171 RMD160 fc047c60090ed154c27579b5741396d1536f02ae SHA1 1db17926332451db6df7efcafe637e5193c0d485 SHA256 c1414df1efa2addb7310829a4c60112ffa619b7845acb8838894886ac70228d3
-MD5 63ea374b3f3566263b47a6985a1030fd files/knetworkmanager-0.2_p20070831-optional-dialup.patch 2171
-RMD160 fc047c60090ed154c27579b5741396d1536f02ae files/knetworkmanager-0.2_p20070831-optional-dialup.patch 2171
-SHA256 c1414df1efa2addb7310829a4c60112ffa619b7845acb8838894886ac70228d3 files/knetworkmanager-0.2_p20070831-optional-dialup.patch 2171
-DIST kde-admindir-3.5.5.tar.bz2 187274 RMD160 24528f3bf94e7d1a1036b6e5af180719785839ed SHA1 b640d2606305201b0ec030555c324d326440efff SHA256 1aa56856e432839ec74a67ab33fc21b56ed4f1b4b5c60bfd5b953cb2d3423153
-DIST knetworkmanager-0.2.tar.bz2 225228 RMD160 35d465d152254608d8777435f4b934197cab30f8 SHA1 ce36cab2306cd5a06ca7cd536196628f052e0c4a SHA256 d2fa5215913081301abf5f32603d19d4d66a4c8977c54184dfbdd011cbd5fe08
-DIST knetworkmanager-0.2_p20070831.patch.bz2 8735 RMD160 502baadf338bfde11b0853e9e7f180c1ddc84862 SHA1 6ecc23d40ec5c59b31d4446d7c04743648dd9ecb SHA256 8457bceaff742c769dca77867d6f7de734cff7c078c7e8761ac73c952ff95369
-EBUILD knetworkmanager-0.2.ebuild 1865 RMD160 f7e5140d2396ed0d38def0f28d299e3df0c62f24 SHA1 685675fa59d3d7ba9d5d7f9ddc09f035e67b03bd SHA256 e77e41df24f7455ab8a3357e5cc492a4a0c0f603c368a82fd6bb1b90314be0ee
-MD5 8dd05143daaa2d9732e7b84554403728 knetworkmanager-0.2.ebuild 1865
-RMD160 f7e5140d2396ed0d38def0f28d299e3df0c62f24 knetworkmanager-0.2.ebuild 1865
-SHA256 e77e41df24f7455ab8a3357e5cc492a4a0c0f603c368a82fd6bb1b90314be0ee knetworkmanager-0.2.ebuild 1865
-EBUILD knetworkmanager-0.2_p20070831.ebuild 2117 RMD160 6bda244a169c3e36a3b8cbf4902fb5b5dcfe82c2 SHA1 b344276fa0191af23dc0bcc616dad0fd8c383a30 SHA256 bce332d27649124283e21bef5b1d17d8ca6baad6958dd23d95032470b1527cb4
-MD5 3a44dab45496e69f1acece9ca54a3324 knetworkmanager-0.2_p20070831.ebuild 2117
-RMD160 6bda244a169c3e36a3b8cbf4902fb5b5dcfe82c2 knetworkmanager-0.2_p20070831.ebuild 2117
-SHA256 bce332d27649124283e21bef5b1d17d8ca6baad6958dd23d95032470b1527cb4 knetworkmanager-0.2_p20070831.ebuild 2117
-MISC ChangeLog 1139 RMD160 5c44d89ab65ce5f745e8b1004d86b69d13ac09cb SHA1 14374449b312e5ee64df0f981d49e9cac9fb1247 SHA256 1172df4974cf95efe31c880a731487ea33ea1c7779c5257713ad496c608d43eb
-MD5 c9cfaa52da79187dc456d02c1e5a8a74 ChangeLog 1139
-RMD160 5c44d89ab65ce5f745e8b1004d86b69d13ac09cb ChangeLog 1139
-SHA256 1172df4974cf95efe31c880a731487ea33ea1c7779c5257713ad496c608d43eb ChangeLog 1139
+AUX knetworkmanager-0.2.1-fixbuild_u64-hschaa-01.patch 992 RMD160 7f902644dd583fd4a8019da36f4098aa461e51b2 SHA1 f75bfb1562f6e19bb3953ea85aa0df03ce0bb1a4 SHA256 9a649791eda865f6c0e28c9c3235f338ba9932f08b421c60f7eccbe52ecd1b6a
+MD5 ba108eb11e5d4a700e9b768532fe0b85 files/knetworkmanager-0.2.1-fixbuild_u64-hschaa-01.patch 992
+RMD160 7f902644dd583fd4a8019da36f4098aa461e51b2 files/knetworkmanager-0.2.1-fixbuild_u64-hschaa-01.patch 992
+SHA256 9a649791eda865f6c0e28c9c3235f338ba9932f08b421c60f7eccbe52ecd1b6a files/knetworkmanager-0.2.1-fixbuild_u64-hschaa-01.patch 992
+DIST knetworkmanager-0.2.1r738551.tar.bz2 738965 RMD160 a06220eeff7b301ced61572c8a4c496efc509d9c SHA1 953634b19533a47b9367febde3e8be6955b2b454 SHA256 4b806cb79f8cd4a403a5e6d527c5ad46baf23108be6724282f61babda76623e0
+EBUILD knetworkmanager-0.2.1_pre20071119.ebuild 1934 RMD160 fe52ed4781cca92b7d955f06b4e0135f0ddb5fda SHA1 ebec5fc946ec3089e83bd286bb84a77f3214a5e7 SHA256 dd171927eb09ee5f24c82c3893ae9fa770a57151b911455f9689c6e197a10ab8
+MD5 80ec34dd49a915d905c244956214d569 knetworkmanager-0.2.1_pre20071119.ebuild 1934
+RMD160 fe52ed4781cca92b7d955f06b4e0135f0ddb5fda knetworkmanager-0.2.1_pre20071119.ebuild 1934
+SHA256 dd171927eb09ee5f24c82c3893ae9fa770a57151b911455f9689c6e197a10ab8 knetworkmanager-0.2.1_pre20071119.ebuild 1934
+MISC ChangeLog 1727 RMD160 93a6856c8686aea3fee8186b9a0755c07247a91f SHA1 43f8c31d36e050cdcb9c3123ed6f4084d2e7345e SHA256 108e6ccc37eea6a6b14a75ec2ff0e9d5588ad1e93a0a2b74106c0d6c8ecc02c1
+MD5 d4aa0a5e2709d136d0984879cf58ce3c ChangeLog 1727
+RMD160 93a6856c8686aea3fee8186b9a0755c07247a91f ChangeLog 1727
+SHA256 108e6ccc37eea6a6b14a75ec2ff0e9d5588ad1e93a0a2b74106c0d6c8ecc02c1 ChangeLog 1727
 MISC metadata.xml 721 RMD160 c82db275287f8f19fba2aec79eddae4141cb0206 SHA1 3814452f446a42a691161a57f65f9c0fb7b736ab SHA256 e19b3ac6b63abff01173041bbe1fc7a958c756abe9d5ed966e1820f436a076b0
 MD5 49e2113c891d920546dcd5b454bab99e metadata.xml 721
 RMD160 c82db275287f8f19fba2aec79eddae4141cb0206 metadata.xml 721
 SHA256 e19b3ac6b63abff01173041bbe1fc7a958c756abe9d5ed966e1820f436a076b0 metadata.xml 721
-MD5 7bbfcafb10df9da1026d62b5a7c2466a files/digest-knetworkmanager-0.2 521
-RMD160 018c27a469daf5326cb202ea5004d411aab48f04 files/digest-knetworkmanager-0.2 521
-SHA256 d7c3939e839a7ba1b2a027e1481cae269dbcdac4b26df55e6a5741a0957be766 files/digest-knetworkmanager-0.2 521
-MD5 3d18fde98000131fa23204334edcf63e files/digest-knetworkmanager-0.2_p20070831 813
-RMD160 5825c827eb7f507448159866d483029cc9235f15 files/digest-knetworkmanager-0.2_p20070831 813
-SHA256 0db9deade95a47d9abcba7cb7a8b5737acd9da49c86a13236a29fc18468f6d55 files/digest-knetworkmanager-0.2_p20070831 813
+MD5 74ce7be2b23fdd6e2c808afb24555ae5 files/digest-knetworkmanager-0.2.1_pre20071119 289
+RMD160 3b4a62bb47fb788e7687c954ab9388de93d9e9c0 files/digest-knetworkmanager-0.2.1_pre20071119 289
+SHA256 8d60e9b64d0ddd5e19f41c31223de37df3381c2b85f0cc2f0fecef9b9292c2b9 files/digest-knetworkmanager-0.2.1_pre20071119 289
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFG2GAqyZx3L/ph1soRAsgkAJ9gQoF2bXipHbNk5AaGb2FMwqkqMgCgupB5
-/mlZtqevl6tnFdq0IB4180M=
-=avT3
+iD8DBQFHU0/QyZx3L/ph1soRAiqKAJ0ciZn7RV0r1/66QGz+NfzjWipIWgCfRH3b
+zfh2yMIov0jBtSl70Ar0W0A=
+=wJTZ
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/knetworkmanager/files/digest-knetworkmanager-0.2 b/kde-misc/knetworkmanager/files/digest-knetworkmanager-0.2
deleted file mode 100644
index 2735854ba5df..000000000000
--- a/kde-misc/knetworkmanager/files/digest-knetworkmanager-0.2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 0631502f50688142ae50da2cb136a422 kde-admindir-3.5.5.tar.bz2 187274
-RMD160 24528f3bf94e7d1a1036b6e5af180719785839ed kde-admindir-3.5.5.tar.bz2 187274
-SHA256 1aa56856e432839ec74a67ab33fc21b56ed4f1b4b5c60bfd5b953cb2d3423153 kde-admindir-3.5.5.tar.bz2 187274
-MD5 9e1962bbc060e3dec806ff2463d2aec4 knetworkmanager-0.2.tar.bz2 225228
-RMD160 35d465d152254608d8777435f4b934197cab30f8 knetworkmanager-0.2.tar.bz2 225228
-SHA256 d2fa5215913081301abf5f32603d19d4d66a4c8977c54184dfbdd011cbd5fe08 knetworkmanager-0.2.tar.bz2 225228
diff --git a/kde-misc/knetworkmanager/files/digest-knetworkmanager-0.2.1_pre20071119 b/kde-misc/knetworkmanager/files/digest-knetworkmanager-0.2.1_pre20071119
new file mode 100644
index 000000000000..9619e854401f
--- /dev/null
+++ b/kde-misc/knetworkmanager/files/digest-knetworkmanager-0.2.1_pre20071119
@@ -0,0 +1,3 @@
+MD5 46c34e82e18fb08f5284f74a766fa994 knetworkmanager-0.2.1r738551.tar.bz2 738965
+RMD160 a06220eeff7b301ced61572c8a4c496efc509d9c knetworkmanager-0.2.1r738551.tar.bz2 738965
+SHA256 4b806cb79f8cd4a403a5e6d527c5ad46baf23108be6724282f61babda76623e0 knetworkmanager-0.2.1r738551.tar.bz2 738965
diff --git a/kde-misc/knetworkmanager/files/digest-knetworkmanager-0.2_p20070831 b/kde-misc/knetworkmanager/files/digest-knetworkmanager-0.2_p20070831
deleted file mode 100644
index e42bab5ff614..000000000000
--- a/kde-misc/knetworkmanager/files/digest-knetworkmanager-0.2_p20070831
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 0631502f50688142ae50da2cb136a422 kde-admindir-3.5.5.tar.bz2 187274
-RMD160 24528f3bf94e7d1a1036b6e5af180719785839ed kde-admindir-3.5.5.tar.bz2 187274
-SHA256 1aa56856e432839ec74a67ab33fc21b56ed4f1b4b5c60bfd5b953cb2d3423153 kde-admindir-3.5.5.tar.bz2 187274
-MD5 9e1962bbc060e3dec806ff2463d2aec4 knetworkmanager-0.2.tar.bz2 225228
-RMD160 35d465d152254608d8777435f4b934197cab30f8 knetworkmanager-0.2.tar.bz2 225228
-SHA256 d2fa5215913081301abf5f32603d19d4d66a4c8977c54184dfbdd011cbd5fe08 knetworkmanager-0.2.tar.bz2 225228
-MD5 139da2009316d8ad00cd78de5bd5d199 knetworkmanager-0.2_p20070831.patch.bz2 8735
-RMD160 502baadf338bfde11b0853e9e7f180c1ddc84862 knetworkmanager-0.2_p20070831.patch.bz2 8735
-SHA256 8457bceaff742c769dca77867d6f7de734cff7c078c7e8761ac73c952ff95369 knetworkmanager-0.2_p20070831.patch.bz2 8735
diff --git a/kde-misc/knetworkmanager/files/knetworkmanager-0.2-fix-desktop-icon.patch b/kde-misc/knetworkmanager/files/knetworkmanager-0.2-fix-desktop-icon.patch
deleted file mode 100644
index 3810f4473718..000000000000
--- a/kde-misc/knetworkmanager/files/knetworkmanager-0.2-fix-desktop-icon.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-From suse
-
---- ./knetworkmanager/src/knetworkmanager.desktop	2007/03/09 10:14:59	1.1
-+++ ./knetworkmanager/src/knetworkmanager.desktop	2007/03/09 10:15:08
-@@ -6,7 +6,7 @@
- GenericName[ja]=ネットワークマネージャ
- GenericName[pt]=Gestor de Redes
- Exec=knetworkmanager
--Icon=network
-+Icon=knetworkmanager
- Type=Application
- Comment=A KDE frontend for NetworkManager
- Comment[da]=En KDE-grænseflade for Networkmanager
diff --git a/kde-misc/knetworkmanager/files/knetworkmanager-0.2-kppp.patch b/kde-misc/knetworkmanager/files/knetworkmanager-0.2-kppp.patch
deleted file mode 100644
index 789f0142f6ab..000000000000
--- a/kde-misc/knetworkmanager/files/knetworkmanager-0.2-kppp.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Add Gentoo support for dial-up Dialog.
-
-Sent upstream: http://bugs.kde.org/148951
-
-Index: knetworkmanager-0.2/knetworkmanager/configure.in.in
-===================================================================
---- knetworkmanager-0.2.orig/knetworkmanager/configure.in.in
-+++ knetworkmanager-0.2/knetworkmanager/configure.in.in
-@@ -85,9 +85,10 @@ CPPFLAGS=$safe_CPPFLAGS
- LIBS=$safe_LIBS
- AC_LANG_RESTORE
- 
--AC_ARG_WITH(distro, AC_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: suse]))
-+AC_ARG_WITH(distro, AC_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: suse,gentoo]))
- if test "x$with_distro" = "x"; then
- 	AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse")
-+	AC_CHECK_FILE(/etc/gentoo-release,with_distro="gentoo")
- 	if test "x$with_distro" = "x"; then
- 		with_distro=`lsb_release -is`
- 	fi
-@@ -102,6 +103,9 @@ else
- 		suse)
- 			AC_DEFINE_UNQUOTED(KNETWORKMANAGER_DIALUP_CONFIG, "kdesu --nonewdcop /sbin/yast2 modem", [Command to launch dial up configuration tool])
- 			;;
-+		gentoo)
-+			AC_DEFINE_UNQUOTED(KNETWORKMANAGER_DIALUP_CONFIG, "kdesu --nonewdcop ${KDEDIR}/bin/kppp", [Command to launch dial up configuration tool])
-+			;;
- 		*)
- 			echo "Your distribution (${with_distro}) is not yet supported (e.g. you will not be able to launch a tool to configure dial-up connections.)"
- 			;;
diff --git a/kde-misc/knetworkmanager/files/knetworkmanager-0.2-fixbuild_u64-hschaa-01.patch b/kde-misc/knetworkmanager/files/knetworkmanager-0.2.1-fixbuild_u64-hschaa-01.patch
index b047c9b238ff..1f80beb66c9b 100644
--- a/kde-misc/knetworkmanager/files/knetworkmanager-0.2-fixbuild_u64-hschaa-01.patch
+++ b/kde-misc/knetworkmanager/files/knetworkmanager-0.2.1-fixbuild_u64-hschaa-01.patch
@@ -2,6 +2,9 @@ From Suse.
 
 "This patch won't be submitted to the svn version as it is only an ugly workaround for issues caused by libnl's handling of kernel types (fixed in libnl trunk)."
 
+Additional patch required for compilation against latest libnl.
+
+
 --- knetworkmanager/src/Makefile.am
 +++ knetworkmanager/src/Makefile.am
 @@ -31,7 +31,7 @@
@@ -13,3 +16,15 @@ From Suse.
  
  # the application source, library search path, and link libraries
  knetworkmanager_la_SOURCES = main.cpp knetworkmanager.cpp knetworkmanager-dbus.cpp \
+diff --git a/knetworkmanager/src/knetworkmanager-devicestore.cpp b/knetworkmanager/src/knetworkmanager-devicestore.cpp
+index b83f604..5111ea6 100644
+--- knetworkmanager/src/knetworkmanager-devicestore.cpp
++++ knetworkmanager/src/knetworkmanager-devicestore.cpp
+@@ -29,6 +29,7 @@
+ 
+ extern "C"
+ {
++#include <linux/types.h>
+ #include <netlink/route/link.h>
+ }
+ 
diff --git a/kde-misc/knetworkmanager/files/knetworkmanager-0.2_p20070831-optional-dialup.patch b/kde-misc/knetworkmanager/files/knetworkmanager-0.2_p20070831-optional-dialup.patch
deleted file mode 100644
index 49b25d47f321..000000000000
--- a/kde-misc/knetworkmanager/files/knetworkmanager-0.2_p20070831-optional-dialup.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Index: configure.in.in
-===================================================================
---- configure.in.in	(revision 706976)
-+++ configure.in.in	(working copy)
-@@ -97,23 +97,34 @@
- 
- with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]' `
- 
--if test "x$with_distro" = "x"; then
--	echo "Linux distribution autodetection failed, you must specify the distribution to target using --with-distro=DISTRO"
--else
--	case $with_distro in
--		suse)
--			AC_DEFINE_UNQUOTED(KNETWORKMANAGER_DIALUP_CONFIG, "kdesu --nonewdcop /sbin/yast2 modem", [Command to launch dial up configuration tool])
--			;;
--		gentoo)
--			AC_DEFINE_UNQUOTED(KNETWORKMANAGER_DIALUP_CONFIG, "kdesu --nonewdcop ${KDEDIR}/bin/kppp", [Command to launch dial up configuration tool])
--			;;
--    fedora)
--			AC_DEFINE_UNQUOTED(KNETWORKMANAGER_DIALUP_CONFIG, "kdesu --nonewdcop /usr/bin/kppp", [Command to launch dial up configuration tool])
--			;; 
--		*)
--			echo "Your distribution (${with_distro}) is not yet supported (e.g. you will not be able to launch a tool to configure dial-up connections.)"
--			;;
--	esac
-+# Compile dialup support
-+
-+AC_ARG_WITH(dialup, AC_HELP_STRING([--with-dialup], [Build KNetworkManager with Dialup support (default)]))
-+if test "x$with_dialup" != "xno"; then
-+	if test "x$with_distro" = "x"; then
-+		echo "Linux distribution autodetection failed, you must specify the distribution to target using --with-distro=DISTRO"
-+	else
-+		case $with_distro in
-+			suse)
-+				AC_DEFINE_UNQUOTED(KNETWORKMANAGER_DIALUP_CONFIG,
-+					"kdesu --nonewdcop /sbin/yast2 modem",
-+					[Command to launch dial up configuration tool])
-+				;;
-+			gentoo)
-+				AC_DEFINE_UNQUOTED(KNETWORKMANAGER_DIALUP_CONFIG,
-+					"kdesu --nonewdcop ${KDEDIR}/bin/kppp",
-+					[Command to launch dial up configuration tool])
-+				;;
-+			fedora)
-+				AC_DEFINE_UNQUOTED(KNETWORKMANAGER_DIALUP_CONFIG,
-+					"kdesu --nonewdcop /usr/bin/kppp",
-+					[Command to launch dial up configuration tool])
-+				;; 
-+			*)
-+				echo "Your distribution (${with_distro}) is not yet supported (e.g. you will not be able to launch a tool to configure dial-up connections.)"
-+				;;
-+		esac
-+	fi
- fi
- 
- # openvpn support
diff --git a/kde-misc/knetworkmanager/knetworkmanager-0.2_p20070831.ebuild b/kde-misc/knetworkmanager/knetworkmanager-0.2.1_pre20071119.ebuild
index 114b0a05bc2e..92e8e8f8f820 100644
--- a/kde-misc/knetworkmanager/knetworkmanager-0.2_p20070831.ebuild
+++ b/kde-misc/knetworkmanager/knetworkmanager-0.2.1_pre20071119.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/knetworkmanager/knetworkmanager-0.2_p20070831.ebuild,v 1.1 2007/08/31 18:38:43 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/knetworkmanager/knetworkmanager-0.2.1_pre20071119.ebuild,v 1.1 2007/12/03 00:37:30 rbu Exp $
 
 inherit kde eutils
 
-MY_P=${PN}-0.2
+MY_PV="0.2.1r738551"
+MY_P=${PN}-${MY_PV}
 
 DESCRIPTION="A KDE frontend for NetworkManager"
 HOMEPAGE="http://en.opensuse.org/Projects/KNetworkManager"
 LICENSE="GPL-2"
-SRC_URI="ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/network/${MY_P}.tar.bz2
-	mirror://gentoo/${P}.patch.bz2
-	mirror://gentoo/kde-admindir-3.5.5.tar.bz2"
+#SRC_URI="ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/network/${P}.tar.bz2"
+SRC_URI="http://beta1.suse.com/private/hschaa/knetworkmanager/${MY_P}.tar.bz2"
 KEYWORDS="~amd64 ~x86"
 
 IUSE="cisco openvpn pptp dialup"
@@ -21,13 +21,13 @@ DEPEND="net-misc/networkmanager
 	>=dev-libs/dbus-qt3-old-0.70
 	sys-apps/hal
 	net-wireless/wireless-tools
-	dev-libs/libnl
+	>=dev-libs/libnl-1.0_pre6-r1
 	cisco?   ( <net-misc/networkmanager-vpnc-0.7.0 )
 	openvpn? ( <net-misc/networkmanager-openvpn-0.3.3 )
 	pptp?    ( <net-misc/networkmanager-pptp-0.7.0 )
 	dialup? ( || ( kde-base/kppp kde-base/kdenetwork ) )"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
 	kde_pkg_setup
@@ -41,17 +41,10 @@ pkg_setup() {
 
 src_unpack() {
 	kde_src_unpack
-	ln -s "${WORKDIR}/admin" "${S}/admin"
 	cd "${S}"
 
-	#epatch "${FILESDIR}/${MY_P}-kppp.patch"
-	epatch "${FILESDIR}/${MY_P}-pam_console-fix.patch"
-	epatch "${FILESDIR}/${MY_P}-fix-desktop-icon.patch"
-	epatch "${FILESDIR}/${MY_P}-fixbuild_u64-hschaa-01.patch"
-
-	cd knetworkmanager
-	epatch "${WORKDIR}/${P}.patch"
-	epatch "${FILESDIR}/${P}-optional-dialup.patch"
+	epatch "${FILESDIR}/${PN}-0.2-pam_console-fix.patch"
+	epatch "${FILESDIR}/${PN}-0.2.1-fixbuild_u64-hschaa-01.patch"
 }
 
 src_compile() {
diff --git a/kde-misc/knetworkmanager/knetworkmanager-0.2.ebuild b/kde-misc/knetworkmanager/knetworkmanager-0.2.ebuild
deleted file mode 100644
index a6534e9f9619..000000000000
--- a/kde-misc/knetworkmanager/knetworkmanager-0.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/knetworkmanager/knetworkmanager-0.2.ebuild,v 1.3 2007/08/29 21:32:53 rbu Exp $
-
-inherit kde eutils
-
-DESCRIPTION="A KDE frontend for NetworkManager"
-HOMEPAGE="http://en.opensuse.org/Projects/KNetworkManager"
-LICENSE="GPL-2"
-SRC_URI="ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/network/${P}.tar.bz2
-	mirror://gentoo/kde-admindir-3.5.5.tar.bz2"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="cisco openvpn pptp"
-
-DEPEND="net-misc/networkmanager
-	|| ( kde-base/kppp kde-base/kdenetwork )
-	>=kde-base/kdelibs-3.2
-	>=dev-libs/dbus-qt3-old-0.70
-	sys-apps/hal
-	net-wireless/wireless-tools
-	dev-libs/libnl
-	cisco?   ( <net-misc/networkmanager-vpnc-0.7.0 )
-	openvpn? ( <net-misc/networkmanager-openvpn-0.3.3 )
-	pptp?    ( <net-misc/networkmanager-pptp-0.7.0 )"
-
-pkg_setup() {
-	kde_pkg_setup
-
-	if has_version "<sys-apps/dbus-0.9*" && ! built_with_use sys-apps/dbus qt3 ; then
-		echo
-		eerror "You must rebuild sys-apps/dbus with USE=\"qt3\" or use a newer version of dbus"
-		die "sys-apps/dbus not built with qt3 bindings"
-	fi
-}
-
-src_unpack() {
-	kde_src_unpack
-	ln -s "${WORKDIR}/admin" "${S}/admin"
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-kppp.patch"
-	epatch "${FILESDIR}/${P}-pam_console-fix.patch"
-	epatch "${FILESDIR}/${P}-fix-desktop-icon.patch"
-	epatch "${FILESDIR}/${P}-fixbuild_u64-hschaa-01.patch"
-}
-
-src_compile() {
-	set-kdedir
-	export PREFIX="${KDEDIR}"
-	local myconf="$(use_with cisco vpnc) $(use_with openvpn) $(use_with pptp) --with-distro=gentoo --disable-rpath"
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-
-	# kde.eclass sets sysconfdir too weird for us, delete conf from there and reinstall to /etc
-	set-kdedir
-	rm -rf "${D}/${KDEDIR}/etc"
-	insinto /etc/dbus-1/system.d/
-	doins knetworkmanager/knetworkmanager.conf
-}