Add new tarball that allows setting system wide connections. Drop older. Sync with live ebuild.

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

4 files changed, 20 insertions, 122 deletions

diff --git a/kde-misc/knetworkmanager/ChangeLog b/kde-misc/knetworkmanager/ChangeLog
index de8a2e4de8f2..c3ef63165854 100644
--- a/kde-misc/knetworkmanager/ChangeLog
+++ b/kde-misc/knetworkmanager/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for kde-misc/knetworkmanager
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/knetworkmanager/ChangeLog,v 1.23 2011/04/10 16:33:59 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/knetworkmanager/ChangeLog,v 1.24 2011/04/15 13:40:25 scarabeus Exp $
+
+*knetworkmanager-4.4.0_p20110415 (15 Apr 2011)
+
+  15 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -knetworkmanager-4.4.0_p20101012.ebuild,
+  -knetworkmanager-4.4.0_p20110204.ebuild,
+  -knetworkmanager-4.4.0_p20110410.ebuild,
+  +knetworkmanager-4.4.0_p20110415.ebuild:
+  Add new tarball that allows setting system wide connections. Drop older. Sync
+  with live ebuild.
 
 *knetworkmanager-4.4.0_p20110410 (10 Apr 2011)
 
diff --git a/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20101012.ebuild b/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20101012.ebuild
deleted file mode 100644
index e5ec2374111f..000000000000
--- a/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20101012.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20101012.ebuild,v 1.1 2010/10/12 20:05:45 tampakrap Exp $
-
-EAPI=3
-
-KMNAME="extragear/base"
-KMMODULE="knetworkmanagement"
-KDE_MINIMAL="4.5"
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-fi
-
-inherit kde4-base
-
-DESCRIPTION="KDE frontend for NetworkManager"
-HOMEPAGE="http://kde.org/"
-
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="consolekit debug +networkmanager wicd"
-
-DEPEND="
-	$(add_kdebase_dep solid 'networkmanager?,wicd?')
-	net-misc/mobile-broadband-provider-info
-	>=net-misc/networkmanager-0.7
-	consolekit? ( sys-auth/consolekit )
-	!wicd? ( $(add_kdebase_dep solid 'networkmanager') )
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	if ! use consolekit; then
-		# Fix dbus policy
-		sed -i \
-			-e 's/at_console=".*"/group="plugdev"/' \
-			"${S}/NetworkManager-kde4.conf" \
-			|| die "Fixing dbus policy failed"
-	fi
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DDBUS_SYSTEM_POLICY_DIR=/etc/dbus-1/system.d
-	)
-
-	kde4-base_src_configure
-}
diff --git a/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20110204.ebuild b/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20110204.ebuild
deleted file mode 100644
index 3943dfc5dd45..000000000000
--- a/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20110204.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20110204.ebuild,v 1.1 2011/02/04 15:41:41 tampakrap Exp $
-
-EAPI=3
-
-KMNAME="extragear/base"
-KMMODULE="knetworkmanagement"
-KDE_MINIMAL="4.5"
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="http://dev.gentoo.org/~tampakrap/tarballs/${P}.tar.bz2"
-fi
-
-inherit kde4-base
-
-DESCRIPTION="KDE frontend for NetworkManager"
-HOMEPAGE="http://kde.org/"
-
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="consolekit debug +networkmanager wicd"
-
-DEPEND="
-	$(add_kdebase_dep solid 'networkmanager?,wicd?')
-	net-misc/mobile-broadband-provider-info
-	>=net-misc/networkmanager-0.7
-	consolekit? ( sys-auth/consolekit )
-	!wicd? ( $(add_kdebase_dep solid 'networkmanager') )
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	if ! use consolekit; then
-		# Fix dbus policy
-		sed -i \
-			-e 's/at_console=".*"/group="plugdev"/' \
-			"${S}/NetworkManager-kde4.conf" \
-			|| die "Fixing dbus policy failed"
-	fi
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DDBUS_SYSTEM_POLICY_DIR=/etc/dbus-1/system.d
-	)
-
-	kde4-base_src_configure
-}
diff --git a/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20110410.ebuild b/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20110415.ebuild
index 7b2a6672c3a4..7fc66240da93 100644
--- a/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20110410.ebuild
+++ b/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20110415.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20110410.ebuild,v 1.1 2011/04/10 16:33:59 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20110415.ebuild,v 1.1 2011/04/15 13:40:25 scarabeus Exp $
 
-EAPI=3
+EAPI=4
 
-KMNAME="extragear/base"
-KMMODULE="knetworkmanagement"
 KDE_MINIMAL="4.6"
 
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="http://dev.gentoo.org/~tampakrap/tarballs/${P}.tar.bz2"
-fi
+KDE_SCM="git"
+EGIT_REPONAME="networkmanagement"
+[[ ${PV} = 9999* ]] || SRC_URI="mirror://gentoo/${P}.tar.xz"
+[[ ${PV} = 9999* ]] || SRC_URI+=" http://dev.gentoo.org/~scarabeus/${P}.tar.xz"
 
 inherit kde4-base
 
@@ -20,14 +19,11 @@ HOMEPAGE="http://kde.org/"
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS="~amd64 ~x86"
 SLOT="4"
-IUSE="consolekit debug +networkmanager wicd"
+IUSE="consolekit debug"
 
 DEPEND="
-	$(add_kdebase_dep solid 'networkmanager?,wicd?')
 	net-misc/mobile-broadband-provider-info
-	>=net-misc/networkmanager-0.7
-	consolekit? ( sys-auth/consolekit )
-	!wicd? ( $(add_kdebase_dep solid 'networkmanager') )
+	$(add_kdebase_dep solid 'networkmanager')
 "
 RDEPEND="${DEPEND}"
 
@@ -46,7 +42,7 @@ src_prepare() {
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DDBUS_SYSTEM_POLICY_DIR=/etc/dbus-1/system.d
 	)