Add knetworkmanager release, reversion to have 0.8 series as older version.

(Portage version: 2.2.0_alpha67/cvs/Linux x86_64, RepoMan options: --force)

6 files changed, 26 insertions, 170 deletions

diff --git a/kde-misc/knetworkmanager/ChangeLog b/kde-misc/knetworkmanager/ChangeLog
index 65268e70a6b3..5787567bb737 100644
--- a/kde-misc/knetworkmanager/ChangeLog
+++ b/kde-misc/knetworkmanager/ChangeLog
@@ -1,6 +1,18 @@
 # 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.34 2011/09/08 23:20:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/knetworkmanager/ChangeLog,v 1.35 2011/10/14 10:08:31 scarabeus Exp $
+
+*knetworkmanager-0.8.80 (14 Oct 2011)
+*knetworkmanager-0.8_p20110714 (14 Oct 2011)
+
+  14 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  +knetworkmanager-0.8_p20110714.ebuild, +knetworkmanager-0.8.80.ebuild,
+  -knetworkmanager-4.4.0_p20110415.ebuild,
+  -knetworkmanager-4.4.0_p20110513.ebuild,
+  -knetworkmanager-4.4.0_p20110714.ebuild,
+  -knetworkmanager-4.4.0_p30110815.ebuild,
+  -knetworkmanager-4.4.0_p30110909.ebuild:
+  Add knetworkmanager release, reversion to have 0.8 series as older version.
 
 *knetworkmanager-4.4.0_p30110909 (08 Sep 2011)
 
diff --git a/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p30110909.ebuild b/kde-misc/knetworkmanager/knetworkmanager-0.8.80.ebuild
index 45f16b90ebca..f01ce59c6e6e 100644
--- a/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p30110909.ebuild
+++ b/kde-misc/knetworkmanager/knetworkmanager-0.8.80.ebuild
@@ -1,24 +1,20 @@
 # 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_p30110909.ebuild,v 1.1 2011/09/08 23:20:58 dilfridge Exp $
-
-#
-# NOTE: the "3" in the patchlevel is not a typo!!!
-#
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/knetworkmanager/knetworkmanager-0.8.80.ebuild,v 1.1 2011/10/14 10:08:31 scarabeus Exp $
 
 EAPI=4
 
 KDE_MINIMAL="4.6"
+MY_PN="networkmanagement"
+MY_P="${MY_PN}-${PV}"
 
 KDE_SCM="git"
-EGIT_REPONAME="networkmanagement"
-EGIT_BRANCH="nm09"
-[[ ${PV} = 9999* ]] || SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz"
-
+EGIT_REPONAME="${MY_PN}"
 inherit kde4-base
 
 DESCRIPTION="KDE frontend for NetworkManager"
 HOMEPAGE="http://kde.org/"
+[[ ${PV} = 9999* ]] || SRC_URI="mirror://kde/unstable/${MY_PN}/${PV}/src/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS="~amd64 ~x86"
@@ -31,7 +27,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-RESTRICT="test"
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	kde4-base_src_prepare
diff --git a/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20110513.ebuild b/kde-misc/knetworkmanager/knetworkmanager-0.8_p20110714.ebuild
index 0c5889767af9..926f9335046a 100644
--- a/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20110513.ebuild
+++ b/kde-misc/knetworkmanager/knetworkmanager-0.8_p20110714.ebuild
@@ -1,14 +1,16 @@
 # 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_p20110513.ebuild,v 1.2 2011/05/22 18:28:02 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/knetworkmanager/knetworkmanager-0.8_p20110714.ebuild,v 1.1 2011/10/14 10:08:31 scarabeus Exp $
 
 EAPI=4
 
 KDE_MINIMAL="4.6"
+MY_PV="4.4.0_p20110714"
 
 KDE_SCM="git"
 EGIT_REPONAME="networkmanagement"
-[[ ${PV} = 9999* ]] || SRC_URI="http://dev.gentoo.org/~scarabeus/${P}.tar.xz"
+[[ ${PV} = 9999* ]] ||
+SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${PN}-${MY_PV}.tar.xz"
 
 inherit kde4-base
 
@@ -16,7 +18,7 @@ DESCRIPTION="KDE frontend for NetworkManager"
 HOMEPAGE="http://kde.org/"
 
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="4"
 IUSE="consolekit debug"
 
@@ -29,6 +31,8 @@ RDEPEND="${DEPEND}"
 
 RESTRICT="test"
 
+S="${WORKDIR}/${PN}-${MY_PV}"
+
 src_prepare() {
 	kde4-base_src_prepare
 
diff --git a/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20110415.ebuild b/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20110415.ebuild
deleted file mode 100644
index b479dce23869..000000000000
--- a/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20110415.ebuild
+++ /dev/null
@@ -1,50 +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_p20110415.ebuild,v 1.3 2011/05/09 23:10:18 hwoarang Exp $
-
-EAPI=4
-
-KDE_MINIMAL="4.6"
-
-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
-
-DESCRIPTION="KDE frontend for NetworkManager"
-HOMEPAGE="http://kde.org/"
-
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="amd64 x86"
-SLOT="4"
-IUSE="consolekit debug"
-
-DEPEND="
-	net-misc/mobile-broadband-provider-info
-	$(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() {
-	local mycmakeargs=(
-		-DDBUS_SYSTEM_POLICY_DIR=/etc/dbus-1/system.d
-	)
-
-	kde4-base_src_configure
-}
diff --git a/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20110714.ebuild b/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20110714.ebuild
deleted file mode 100644
index e5901a07cbc7..000000000000
--- a/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20110714.ebuild
+++ /dev/null
@@ -1,50 +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_p20110714.ebuild,v 1.2 2011/07/16 11:18:11 dilfridge Exp $
-
-EAPI=4
-
-KDE_MINIMAL="4.6"
-
-KDE_SCM="git"
-EGIT_REPONAME="networkmanagement"
-[[ ${PV} = 9999* ]] || SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz"
-
-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"
-
-DEPEND="
-	net-misc/mobile-broadband-provider-info
-	>=net-misc/networkmanager-0.8.2-r10
-	$(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() {
-	local mycmakeargs=(
-		-DDBUS_SYSTEM_POLICY_DIR=/etc/dbus-1/system.d
-	)
-
-	kde4-base_src_configure
-}
diff --git a/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p30110815.ebuild b/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p30110815.ebuild
deleted file mode 100644
index 80117623d682..000000000000
--- a/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p30110815.ebuild
+++ /dev/null
@@ -1,56 +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_p30110815.ebuild,v 1.2 2011/09/07 22:30:44 dilfridge Exp $
-
-#
-# NOTE: the "3" in the patchlevel is not a typo!!!
-#
-
-EAPI=4
-
-KDE_MINIMAL="4.6"
-
-KDE_SCM="git"
-EGIT_REPONAME="networkmanagement"
-EGIT_BRANCH="nm09"
-[[ ${PV} = 9999* ]] || SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz"
-
-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"
-
-DEPEND="
-	net-misc/mobile-broadband-provider-info
-	>=net-misc/networkmanager-0.9.0
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${PN}-nm09version.patch" )
-
-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() {
-	local mycmakeargs=(
-		-DDBUS_SYSTEM_POLICY_DIR=/etc/dbus-1/system.d
-	)
-
-	kde4-base_src_configure
-}