Version bump to svn snapshot with optional (k)ppp dependancy and upstream fixes

(Portage version: 2.1.3.7)

4 files changed, 149 insertions, 1 deletions

diff --git a/kde-misc/knetworkmanager/ChangeLog b/kde-misc/knetworkmanager/ChangeLog
index c7e6ddacdf75..646da5490466 100644
--- a/kde-misc/knetworkmanager/ChangeLog
+++ b/kde-misc/knetworkmanager/ChangeLog
@@ -1,6 +1,13 @@
 # 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.3 2007/08/29 21:32:53 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/knetworkmanager/ChangeLog,v 1.4 2007/08/31 18:38:43 rbu Exp $
+
+*knetworkmanager-0.2_p20070831 (31 Aug 2007)
+
+  31 Aug 2007; Robert Buchholz <rbu@gentoo.org>
+  +files/knetworkmanager-0.2_p20070831-optional-dialup.patch,
+  +knetworkmanager-0.2_p20070831.ebuild:
+  Version bump to svn snapshot with optional (k)ppp dependancy and upstream fixes
 
   29 Aug 2007; Robert Buchholz <rbu@gentoo.org> knetworkmanager-0.2.ebuild:
   Removed stale dep
diff --git a/kde-misc/knetworkmanager/files/digest-knetworkmanager-0.2_p20070831 b/kde-misc/knetworkmanager/files/digest-knetworkmanager-0.2_p20070831
new file mode 100644
index 000000000000..e42bab5ff614
--- /dev/null
+++ b/kde-misc/knetworkmanager/files/digest-knetworkmanager-0.2_p20070831
@@ -0,0 +1,9 @@
+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_p20070831-optional-dialup.patch b/kde-misc/knetworkmanager/files/knetworkmanager-0.2_p20070831-optional-dialup.patch
new file mode 100644
index 000000000000..49b25d47f321
--- /dev/null
+++ b/kde-misc/knetworkmanager/files/knetworkmanager-0.2_p20070831-optional-dialup.patch
@@ -0,0 +1,56 @@
+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_p20070831.ebuild
new file mode 100644
index 000000000000..114b0a05bc2e
--- /dev/null
+++ b/kde-misc/knetworkmanager/knetworkmanager-0.2_p20070831.ebuild
@@ -0,0 +1,76 @@
+# 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 $
+
+inherit kde eutils
+
+MY_P=${PN}-0.2
+
+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"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="cisco openvpn pptp dialup"
+
+DEPEND="net-misc/networkmanager
+	>=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 )
+	dialup? ( || ( kde-base/kppp kde-base/kdenetwork ) )"
+
+S=${WORKDIR}/${MY_P}
+
+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}/${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"
+}
+
+src_compile() {
+	set-kdedir
+	export PREFIX="${KDEDIR}"
+	local myconf="$(use_with cisco vpnc) \
+		$(use_with openvpn) \
+		$(use_with pptp) \
+		$(use_with dialup) \
+		--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
+}