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

Package-Manager: portage-2.2.0_alpha67/cvs/Linux x86_64
RepoMan-Options: --force

7 files changed, 45 insertions, 195 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/Manifest b/kde-misc/knetworkmanager/Manifest
index c66657ad769c..93040dbc5c49 100644
--- a/kde-misc/knetworkmanager/Manifest
+++ b/kde-misc/knetworkmanager/Manifest
@@ -1,33 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX knetworkmanager-nm09version.patch 623 RMD160 7430efb5aa863a4185ac7d5beb3d791aa96a026b SHA1 af9458d705fe5046ae0b6cc128424c6a04ea20a4 SHA256 3c13ada22c4456af6cbd2009a5fa3637758217fa7eac0282d4871e00a94092d0
-DIST knetworkmanager-4.4.0_p20110415.tar.xz 484832 RMD160 0d2437f8c2bb606254246f33269f9ce4abb68f4e SHA1 f0bf02e03daf3ccfc72d455b821b6a54c924af27 SHA256 1600c961e4745b5a92f46ffa79ca3162ac39917cdabb831e1325b52982bba89d
-DIST knetworkmanager-4.4.0_p20110513.tar.xz 504340 RMD160 2766b71f54dcb0dffd802bc062963ec0a81fe474 SHA1 00164307c5d2e0b0563eea2c6b08e505c36f6982 SHA256 675a7377f79a2b471ade36f82a6278d56206654dfa0787a6a71c15a9cc928840
 DIST knetworkmanager-4.4.0_p20110714.tar.xz 510128 RMD160 95f98b66f8101881d6cd5ebf4ec19d47b67306e8 SHA1 0d42041280cc293f623871155a93086a278963c5 SHA256 921db31423c825d87d931771a8ef3f6c77a47b552dbd9cce084e42a5369f595d
-DIST knetworkmanager-4.4.0_p30110815.tar.xz 585960 RMD160 5607e2db45dbe973b308545f16757aefc14747db SHA1 1b8c475309bcb6e5ad79f844e853b949e3210751 SHA256 ebfd8b1a30ad584218e7cd1d8b939591068319ae71b1a7e8f1c3bd5e1006fa0b
-DIST knetworkmanager-4.4.0_p30110909.tar.xz 588164 RMD160 1844a8d47d156951d16efacedec6bdaddeee6f14 SHA1 ef29c0cc515ec011ec79e2f90117b13daf8df3b3 SHA256 f4fc5cabc4ec140049d8f2282e5adcadcf3c03654b4a5396020c0514c25f0557
-EBUILD knetworkmanager-4.4.0_p20110415.ebuild 1112 RMD160 df1595714780b8a1a25f2857e20a48e574a749ca SHA1 3d0afea5a945335347949b53c8257b125086c975 SHA256 a35556e561148ca11b36ec80699f7f519382d7ea788d697207a9dd53aeb69f52
-EBUILD knetworkmanager-4.4.0_p20110513.ebuild 1089 RMD160 3b75bbc043043924c6bb83d430d55f540fadb812 SHA1 e46bc4b7d31505862d9763fd64c6400d3515bfe6 SHA256 89696d426afc60f7599789fe9fba27f57c2868110cff3d700de029785ebc7636
-EBUILD knetworkmanager-4.4.0_p20110714.ebuild 1099 RMD160 255680e0684b9fe4920171dc970f33d42462140e SHA1 786f58200552461b8e5f90a7f9bb2207099aa1dc SHA256 59ca22e8100c4d45e509ebd1caaa063a839f91ad5d42634bed0398331417fab3
-EBUILD knetworkmanager-4.4.0_p30110815.ebuild 1178 RMD160 df16da7b779f3a01cb38f26f32f00e0855827a15 SHA1 f3929c2e6da7154be1e7195db436f24fa18d91c8 SHA256 0600945d0b31f68be57240a4b8cd48004d3b2419140cbba27dee4bbb20ac0e34
-EBUILD knetworkmanager-4.4.0_p30110909.ebuild 1127 RMD160 dfaf89b3bf029f137c3fc0d7a670223d08c5ab0e SHA1 20eba1135ddbaa8d1687725cbaa43f0febb2f0f6 SHA256 c07a45cf6f20d1a799abf8f75f8b90fcd3a696c398133fc2f6f8edfdbb31ece8
-MISC ChangeLog 4554 RMD160 fbdcde9a1fdcfd0c56b63df6709b85d4bc463559 SHA1 389fd9e85263c07c4794bfd52081ebc544ff3e4e SHA256 00cf2c28cb14fae2f337a9c16b5a00f7798375d7cb73862e8b2e4647e573ecc5
+DIST networkmanagement-0.8.80.tar.bz2 1249877 RMD160 980c6fa7039b72e69e4226eaef77c0a927a701ef SHA1 4c60e4cd30f69a2bc47091b7472040e0f69c4404 SHA256 cc49c79976c427053e48415aeda240653343b0ec63285360cb2f8056b7ebc6d2
+EBUILD knetworkmanager-0.8.80.ebuild 1090 RMD160 25c2fb78dcac85d96bb7420806603fcf8f94ec25 SHA1 b55ab2201d00d2e80e6aba702c708df89f7ad699 SHA256 9c891d6231df227dc099fd4196c0af493132ae9edb9eb3737d9dcd4ece9994a1
+EBUILD knetworkmanager-0.8_p20110714.ebuild 1160 RMD160 032efd5a2e0c54e16ce830d723bcac0d37c0cb1b SHA1 092505f5bc25f7baa97aa978df99659fbd14af15 SHA256 e4e896bc421157d5aa31e68101132c17f3c5216502ead217bfb24e2f3b0aefe7
+MISC ChangeLog 5060 RMD160 f9706dc184f61797daf65d43f50f3d9cc3afdd96 SHA1 865664ea2d7fb25cfe7c3d52f969af7b1774062a SHA256 9545dca6ef817060d593aad7dd4b7ca18dd6ad2f780b97a4e6868a6e4897cb20
 MISC metadata.xml 251 RMD160 c5c4d068db64874834210e9d079dc4c0348d158d SHA1 53753c8d7372db5ef3f6cf4466710f4adb88b770 SHA256 81d55ba998d5de47f2c20f34348288325123e94ecf9912337c48a0a7196ac43c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOaU3wAAoJENwGBM22xffeFKIP/iTwYUugDtlV+o93Y0OSioJl
-JwMURhNd3T5GLBk3OJu5j6zA+yL/CFgUQrs+wfJvyUC4GIkFUa4BCwh1sOeTeyBz
-+lidTbcdClBrvasZs1T1JNWhL/w0YxlVQ29M7CmC0jmjs+GjqRCbumOCBBLebIT1
-tV6QF+1rQq7gVXlBZpmdfnPBF4umgOO7AQ2AylhYRKmakk73UstjQO6TARGhl7JU
-LYNOyQ2HSqlv7MGOsht4D29g7Dav632s8GaJ2GYUcvawQYSEeum2kcourb12WdZz
-GTJVYOz0jUB3lZnBfa9v8RF4PSdwc5uglh6Vntt8N/Dn3aaRlJLZHHF+ZkWjlYVW
-b88Z0/DAggDvZw1gkl1pJwlxjxLSbzkljojK21rd1fjA2g8j6BYHzieTb11linqz
-/ozmOL3mFMjTXVhe3yRTR2Zs0J+7dXPhD37e/KY2ye6OvvWZw/kA39nuzj7NaBX2
-prNSTqfYIgbrd1HDo8qRTR9D/QOSo8NC+KYZchGFjr8+8HbzAR7KA47Xsp0ivSt0
-SJuFnI/ZmvnWw3EA2zg8ga2X0wpUaK2Q/d56pHX5vpuwqIP0npTBkR0sqkXZz6yx
-Z1FzndsKGB4zt06TdwJRAnuA/ww1kaqQzB4mSP3P7T8QUyrri8ECe8Ey9vulhJp/
-hlFWQ0+PQyul/eVyY//g
-=KUAG
+iQIcBAEBAgAGBQJOmAn5AAoJEOSiRoyO7jvoY94P/iFeMcmhGj/+haAq8jDvqB4c
+4rGwq7z1EGTeMKDhm4MRA2tC+VNV/NmisLFZ1eNE1SKSMSv5hfmNlr+Fcrkoe80q
+5vAMMjmYK3BKMxL3aF4rj/wvfsZEvWxMsrYq42x2cSuXs6yP9geEpS+Yx23WwOaA
+ilKg1pj3bDp+G9Td3l7hKlRo8g5AoW1xUq7mi5JJLqQLMX/dwRLzm9NXK3SBhvRH
+Dm9P606rb+V+NFzMoxVNqdt2D8HborxCNVzlp6SAjVqUpmROri0UbGL71lo1Fskf
+FMB2EPPDzbeYJYnWEX9LPzb4xu3jYLSklcHCPjecqDEaCnWpjGfYuepnFHjN8reV
+gVDU2GzSuQ/RJkn328wDSMwZ6ORHCqUQZYtJIhcPufceFTdDctX6+0BkgiG8fMcF
+hVERNxJttLyXy/DSdjBocqhXgw6sz1rx7dPqiXldldQPBaA27q2tSxwa44DL4/Cy
+tjZkpfegR9F6V886HFcZTzb/ghTI92yAo8xpdlQzHpDREUPac10er1C0yER/WXkY
+cCS/kX7nIH4MibX0X6oq9k48Paa/Ip44/MDGxGfn9+Ghh7q3f89g3PTQb4FXbrA7
+qZDydt4XVCqEptgZTUXqDaLqTHymXiazYX6infF8nT+zIOKvODkBlTxJpV27L13l
+10ys8ekVTIkCO6G6UpZd
+=EZWu
 -----END PGP SIGNATURE-----
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
-}