Intermediate version bump

svn path=/overlay/; revision=16

6 files changed, 153 insertions, 4 deletions

diff --git a/kde-misc/knetworkmanager/ChangeLog b/kde-misc/knetworkmanager/ChangeLog
index 56f8eea..046ac64 100644
--- a/kde-misc/knetworkmanager/ChangeLog
+++ b/kde-misc/knetworkmanager/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Aug 2007; Robert Buchholz <rbu@gentoo.org> +knetworkmanager-0.2.ebuild,
+  +files/knetworkmanager-0.2-kppp.patch,
+  +files/knetworkmanager-0.2-pam_console-fix.patch:
+  Intermediate version bump
+
   29 Jul 2007; Robert Buchholz <rbu@gentoo.org>
   +knetworkmanager-0.2_pre20070621.ebuild,
   +files/knetworkmanager-0.2_pre20070621-kppp.patch,
diff --git a/kde-misc/knetworkmanager/Manifest b/kde-misc/knetworkmanager/Manifest
index c1cb628..04591f7 100644
--- a/kde-misc/knetworkmanager/Manifest
+++ b/kde-misc/knetworkmanager/Manifest
@@ -1,3 +1,11 @@
+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_pre20070621-kppp.patch 1271 RMD160 de439a678a24e831821dbf29d27c5a574bd8b6b0 SHA1 111b34c522d8c72d8838950ed606d20eb081feef SHA256 fb0cbc0d8406ff9d3f2ba458da2efb33cc77375a214402e5f0ef89aae2943216
 MD5 04c01bc30db1e23a7ccb772f8373e195 files/knetworkmanager-0.2_pre20070621-kppp.patch 1271
 RMD160 de439a678a24e831821dbf29d27c5a574bd8b6b0 files/knetworkmanager-0.2_pre20070621-kppp.patch 1271
@@ -6,19 +14,28 @@ AUX knetworkmanager-0.2_pre20070621-pam_console-fix.patch 1278 RMD160 2a03f24479
 MD5 4697022f9923a5a63fa7bf3707006427 files/knetworkmanager-0.2_pre20070621-pam_console-fix.patch 1278
 RMD160 2a03f24479e8bab33bd46db02e5d459ced1ac2bf files/knetworkmanager-0.2_pre20070621-pam_console-fix.patch 1278
 SHA256 9b82aef44002007d51263096b468943bd769234f58b875c6c0141399feca2def files/knetworkmanager-0.2_pre20070621-pam_console-fix.patch 1278
+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_pre20070621.tar.bz2 350019 RMD160 363b7d27943acbb5fbe446e2a35a8e8e731616ad SHA1 d090084b3ea5ea11a75620ab3ba32c53eb09292d SHA256 2d7375a93dbd1a78caae6879288ef9d26fb0c676f53685edf0df8effcb3c6e45
+EBUILD knetworkmanager-0.2.ebuild 1700 RMD160 9c7a68ab6a213f4201d54589be14ef6e91f88f23 SHA1 389e7e60e1fe9d1ff1c503d83cf4103ea6e7fc41 SHA256 ef7423e84bbe4674025dbb2f6b2fd5701ea0443209e5bf58fb9069173ea6a5b0
+MD5 6d7ebe9bba467c32d401fcf2cac58453 knetworkmanager-0.2.ebuild 1700
+RMD160 9c7a68ab6a213f4201d54589be14ef6e91f88f23 knetworkmanager-0.2.ebuild 1700
+SHA256 ef7423e84bbe4674025dbb2f6b2fd5701ea0443209e5bf58fb9069173ea6a5b0 knetworkmanager-0.2.ebuild 1700
 EBUILD knetworkmanager-0.2_pre20070621.ebuild 1760 RMD160 aa3539ee31369b049da69f3332caaa9599b69d38 SHA1 879b4b22f404b90f7efabfe787587405d73ac83c SHA256 3ca18664ce87accc95017f36cbb81c097821076e2d0b1c4714375a83dacd42d7
 MD5 a55d805de5e5ee93d1a09c1f8ef2077c knetworkmanager-0.2_pre20070621.ebuild 1760
 RMD160 aa3539ee31369b049da69f3332caaa9599b69d38 knetworkmanager-0.2_pre20070621.ebuild 1760
 SHA256 3ca18664ce87accc95017f36cbb81c097821076e2d0b1c4714375a83dacd42d7 knetworkmanager-0.2_pre20070621.ebuild 1760
-MISC ChangeLog 371 RMD160 650f369d9b9c88b50a5293feedfef27e2ddcdfb3 SHA1 d098c5060de1286c94814ed7d7430f4bce8a857b SHA256 ec0d0d8b65384a0e9222a5e0c2095a4a8587e09950e710371e078fe7b4a9e358
-MD5 b5e001270d2f5beecc8f8a3f08264323 ChangeLog 371
-RMD160 650f369d9b9c88b50a5293feedfef27e2ddcdfb3 ChangeLog 371
-SHA256 ec0d0d8b65384a0e9222a5e0c2095a4a8587e09950e710371e078fe7b4a9e358 ChangeLog 371
+MISC ChangeLog 570 RMD160 b6ea14726263464f5e5bbb9e330f6390eeb64da7 SHA1 0ea66ffc396c7dfca0fd8ee0ffb9f1d5daace90c SHA256 3292f2167fa402dcbe8a39e8acab2dd73dcee4c1369b94ba568de782a0405fdd
+MD5 3e87973a2e4a6dec03ee3ee4df9dcb59 ChangeLog 570
+RMD160 b6ea14726263464f5e5bbb9e330f6390eeb64da7 ChangeLog 570
+SHA256 3292f2167fa402dcbe8a39e8acab2dd73dcee4c1369b94ba568de782a0405fdd ChangeLog 570
 MISC metadata.xml 881 RMD160 8608a638e5bffd8305d41bf8d09334456cbbe38a SHA1 43e6a124de8058a738d8b2562e9dd8b36983dc13 SHA256 a59e53d5e665e795ce8da297eb0c63ab2a52b88025eb83d968b370b727d83967
 MD5 cde19aea2ad5bbd47a8660b625acbd60 metadata.xml 881
 RMD160 8608a638e5bffd8305d41bf8d09334456cbbe38a metadata.xml 881
 SHA256 a59e53d5e665e795ce8da297eb0c63ab2a52b88025eb83d968b370b727d83967 metadata.xml 881
+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 7a9499d91754da7cc556f0f6bec0491c files/digest-knetworkmanager-0.2_pre20070621 298
 RMD160 8e9a337fd8cee08a673d6d470c9a1c2eee3b0afd files/digest-knetworkmanager-0.2_pre20070621 298
 SHA256 dd7291bdae43d8bf04b2c875a57fb5f1ee98291ed4df1a1abad6f5a51c873c96 files/digest-knetworkmanager-0.2_pre20070621 298
diff --git a/kde-misc/knetworkmanager/files/digest-knetworkmanager-0.2 b/kde-misc/knetworkmanager/files/digest-knetworkmanager-0.2
new file mode 100644
index 0000000..2735854
--- /dev/null
+++ b/kde-misc/knetworkmanager/files/digest-knetworkmanager-0.2
@@ -0,0 +1,6 @@
+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/knetworkmanager-0.2-kppp.patch b/kde-misc/knetworkmanager/files/knetworkmanager-0.2-kppp.patch
new file mode 100644
index 0000000..789f014
--- /dev/null
+++ b/kde-misc/knetworkmanager/files/knetworkmanager-0.2-kppp.patch
@@ -0,0 +1,30 @@
+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-pam_console-fix.patch b/kde-misc/knetworkmanager/files/knetworkmanager-0.2-pam_console-fix.patch
new file mode 100644
index 0000000..87d5ffb
--- /dev/null
+++ b/kde-misc/knetworkmanager/files/knetworkmanager-0.2-pam_console-fix.patch
@@ -0,0 +1,29 @@
+Name: knetworkmanager-pam_console-fix.patch
+URL: svn://svn.gentoo-xeffects.org/xeffects/trunk/kde-misc/knetworkmanager/files/knetworkmanager-pam_console-fix.patch
+Repository Root: svn://svn.gentoo-xeffects.org/xeffects
+Repository UUID: 293eb232-8020-0410-9bbe-a7a9c2f1b3fa
+
+Last Changed Author: roderick
+Last Changed Rev: 540
+Last Changed Date: 2007-03-17 22:17:12 +0100 (Sat, 17 Mar 2007)
+
+------------------------------------------------------------------------
+r540 | roderick | 2007-03-17 22:17:12 +0100 (Sat, 17 Mar 2007) | 1 line
+
+Fix to use group permissions plugdev rather than require pam console.
+------------------------------------------------------------------------
+
+
+Index: knetworkmanager-0.2/knetworkmanager/knetworkmanager.conf
+===================================================================
+--- knetworkmanager-0.2.orig/knetworkmanager/knetworkmanager.conf
++++ knetworkmanager-0.2/knetworkmanager/knetworkmanager.conf
+@@ -8,7 +8,7 @@
+ 		<allow send_destination="org.freedesktop.NetworkManagerInfo"/>
+                 <allow send_interface="org.freedesktop.NetworkManagerInfo"/>
+ 	</policy>
+-	<policy at_console="true">
++	<policy group="plugdev">
+ 		<allow own="org.freedesktop.NetworkManagerInfo"/>
+ 
+ 		<allow send_destination="org.freedesktop.NetworkManagerInfo"/>
diff --git a/kde-misc/knetworkmanager/knetworkmanager-0.2.ebuild b/kde-misc/knetworkmanager/knetworkmanager-0.2.ebuild
new file mode 100644
index 0000000..d4e39a8
--- /dev/null
+++ b/kde-misc/knetworkmanager/knetworkmanager-0.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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/kdelibs-3.2
+	|| ( >=dev-libs/dbus-qt3-old-0.70 =sys-apps/dbus-0.62-r1 )
+	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"
+}
+
+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 make
+	dodoc knetworkmanager/{AUTHORS,NEWS,README}
+
+	# 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
+}