New snapshot, cleanup: use add_kdebase_dep, merge with live ebuild, EAPI3

Package-Manager: portage-2.2_rc94/cvs/Linux x86_64

4 files changed, 80 insertions, 10 deletions

diff --git a/kde-misc/knetworkmanager/ChangeLog b/kde-misc/knetworkmanager/ChangeLog
index ef5c7f4c055b..6efc4724090c 100644
--- a/kde-misc/knetworkmanager/ChangeLog
+++ b/kde-misc/knetworkmanager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-misc/knetworkmanager
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/knetworkmanager/ChangeLog,v 1.18 2010/09/08 12:23:18 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/knetworkmanager/ChangeLog,v 1.19 2010/10/12 20:05:45 tampakrap Exp $
+
+*knetworkmanager-4.4.0_p20101012 (12 Oct 2010)
+
+  12 Oct 2010; Theo Chatzimichos <tampakrap@gentoo.org>
+  knetworkmanager-4.4.0_p20100820.ebuild,
+  +knetworkmanager-4.4.0_p20101012.ebuild:
+  New snapshot, cleanup: use add_kdebase_dep, merge with live ebuild, EAPI3
 
   08 Sep 2010; Theo Chatzimichos <tampakrap@gentoo.org>
   -knetworkmanager-4.4.0_p20100331.ebuild:
diff --git a/kde-misc/knetworkmanager/Manifest b/kde-misc/knetworkmanager/Manifest
index d9bde1082b9d..fbfdc23593e4 100644
--- a/kde-misc/knetworkmanager/Manifest
+++ b/kde-misc/knetworkmanager/Manifest
@@ -1,4 +1,6 @@
 DIST knetworkmanager-4.4.0_p20100820.tar.bz2 504078 RMD160 6e4824cdcb10cedf0e12372cfba025f94bb5b33b SHA1 55a5d1a5e9c87dc80e1ba8a88f09a4924fbc6a42 SHA256 aaf439494df64045a1c26a0b5d259ccc6f1e38cc8381f2ae599eec4b9f067b13
-EBUILD knetworkmanager-4.4.0_p20100820.ebuild 1200 RMD160 83b27b599bd32677dea93e48c573cea1de447600 SHA1 ef63a6ac2b5377c3c0f11d1ff038b7d21d99fc05 SHA256 aa04c6b556274550a87aec97698983ad5bf372726a5f65f46519c11dc2153c08
-MISC ChangeLog 1640 RMD160 7b20f73c99249b96bcbad6d2097dedfcee392d0b SHA1 32616bd0d6e3ee2e846ef3cd6f0df9a0dd623110 SHA256 49ebaafda1feac95e44e895dd17a1e85feab361d98feec5dee210e781c1a9016
+DIST knetworkmanager-4.4.0_p20101012.tar.bz2 511788 RMD160 e95375a73d0fca91067c900f9b5e1617dd83551f SHA1 d76e6747b88abb256be14c02b3d4482b520b223e SHA256 8f1fde19d622d6b4757f7155eb84b7ec854fe0c8c8eb3eb0e2b2d160031c4c1f
+EBUILD knetworkmanager-4.4.0_p20100820.ebuild 1290 RMD160 b8e9ca8631fae9e549df57cc73dd159ceb6c3f5f SHA1 756299768630c1742e368e6d259a2fbe9ff3baa1 SHA256 1a4ca7904497a26042405c72a258633eb25fe4e07757461d4c4f0bd9fac2453f
+EBUILD knetworkmanager-4.4.0_p20101012.ebuild 1198 RMD160 89f7e74148c68a76f2acd2897bcbbc7492bfb070 SHA1 830a6b295dd530ea15564840f36c9c8fd619ea08 SHA256 18a263c853d7576ceb4fc3085a58a502fe9a5c0d2274cf6719a7d466ab409a5a
+MISC ChangeLog 1906 RMD160 e41d5907c485b7d9b89f7af464b2fd2e11954046 SHA1 5e10bb808743b93e6bd13fc449835eed921be529 SHA256 8ea7fe414e3534583874632113d82409d145991982e94598fe7e6487897dddca
 MISC metadata.xml 301 RMD160 3e2112d23805982b5fc816bc6fef1f71b4415a2b SHA1 9bb446718c9b5a238a218ee744b0fea754b68ef1 SHA256 a24dfda69e4b52de8c2d46c361a6855da37e98afbd0c6f13e34149c7c0e01ce1
diff --git a/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20100820.ebuild b/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20100820.ebuild
index 880bfc3e5c4f..15abf5143bff 100644
--- a/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20100820.ebuild
+++ b/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20100820.ebuild
@@ -1,16 +1,20 @@
 # 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_p20100820.ebuild,v 1.1 2010/08/20 23:49:34 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20100820.ebuild,v 1.2 2010/10/12 20:05:45 tampakrap Exp $
 
-EAPI="2"
+EAPI=3
 
-QT_MINIMAL="4.6.0_beta"
+KMNAME="extragear/base"
+KMMODULE="networkmanagement"
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+fi
 
 inherit kde4-base
 
 DESCRIPTION="KDE frontend for NetworkManager"
 HOMEPAGE="http://kde.org/"
-SRC_URI="http://dev.gentoo.org/~tampakrap/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS="~amd64 ~x86"
@@ -18,14 +22,16 @@ SLOT="4"
 IUSE="consolekit debug +networkmanager wicd"
 
 DEPEND="
-	!kde-misc/networkmanager-applet
-	>=kde-base/solid-${KDE_MINIMAL}[networkmanager?,wicd?]
-	!wicd? ( >=kde-base/solid-${KDE_MINIMAL}[networkmanager] )
+	$(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
 
@@ -37,6 +43,7 @@ src_prepare() {
 			|| die "Fixing dbus policy failed"
 	fi
 
+	# Makes it KDE 4.4 compatible
 	sed -i -e 's/KCMUTILS/KUTILS/' "${S}/applet/CMakeLists.txt" || die "sed died"
 }
 
diff --git a/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20101012.ebuild b/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20101012.ebuild
new file mode 100644
index 000000000000..e5ec2374111f
--- /dev/null
+++ b/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20101012.ebuild
@@ -0,0 +1,54 @@
+# 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
+}