Version bump, mainly a bugfix release.

(Portage version: 2.1.4_rc4)

10 files changed, 41 insertions, 194 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/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
-}