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

Package-Manager: portage-2.1.3.7

5 files changed, 168 insertions, 8 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/Manifest b/kde-misc/knetworkmanager/Manifest
index 95b38eeae51e..2ae465e9e7ef 100644
--- a/kde-misc/knetworkmanager/Manifest
+++ b/kde-misc/knetworkmanager/Manifest
@@ -17,16 +17,25 @@ AUX knetworkmanager-0.2-pam_console-fix.patch 1290 RMD160 cab71463e5e73b0a05eceb
 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
-MISC ChangeLog 859 RMD160 d32dd3becda2ecd22fa47a5f91e2683759176172 SHA1 bb2bd75930980dad8196ad87519f2d630012cc92 SHA256 2ed902c4c0c1aa2634f6b7588411e63b8a650bca7c329cc5eeecc2ebd8f2725a
-MD5 9d43f5a9398917ada78640a86bd4fbc7 ChangeLog 859
-RMD160 d32dd3becda2ecd22fa47a5f91e2683759176172 ChangeLog 859
-SHA256 2ed902c4c0c1aa2634f6b7588411e63b8a650bca7c329cc5eeecc2ebd8f2725a ChangeLog 859
+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
 MISC metadata.xml 721 RMD160 c82db275287f8f19fba2aec79eddae4141cb0206 SHA1 3814452f446a42a691161a57f65f9c0fb7b736ab SHA256 e19b3ac6b63abff01173041bbe1fc7a958c756abe9d5ed966e1820f436a076b0
 MD5 49e2113c891d920546dcd5b454bab99e metadata.xml 721
 RMD160 c82db275287f8f19fba2aec79eddae4141cb0206 metadata.xml 721
@@ -34,10 +43,13 @@ SHA256 e19b3ac6b63abff01173041bbe1fc7a958c756abe9d5ed966e1820f436a076b0 metadata
 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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFG1eYFyZx3L/ph1soRAlKnAJ4skTXaRn+6tpwcEYMIH5zjWVvKEgCfe2YM
-b2bRWzSsS/Q5w4P2V9kiMZk=
-=5TuG
+iD8DBQFG2GAqyZx3L/ph1soRAsgkAJ9gQoF2bXipHbNk5AaGb2FMwqkqMgCgupB5
+/mlZtqevl6tnFdq0IB4180M=
+=avT3
 -----END PGP SIGNATURE-----
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
+}