[gentoo-commits] proj/kde:master commit in: kde-misc/knetworkmanager/

[gentoo-commits] proj/kde:master commit in: kde-misc/knetworkmanager/

[Manuel Nickschas]

commit:     aa86909e4bcbcf86ee41d990abb7705cc14a177d
Author:     Manuel Nickschas <sputnick <AT> quassel-irc <DOT> org>
AuthorDate: Wed Feb  9 10:39:32 2011 +0000
Commit:     Manuel Nickschas <sputnick <AT> quassel-irc <DOT> org>
CommitDate: Wed Feb  9 10:39:32 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=aa86909e

[knetworkmanager:live] Fix and simplify

Our eclasses properly support git now, so we can remove some cruft.
Also, never check out from git.kde.org, always use anongit (eclass does
this automatically)!

---
 .../knetworkmanager/knetworkmanager-9999.ebuild    |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild b/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
index 9a4cc88..f118732 100644
--- a/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
+++ b/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
@@ -6,15 +6,11 @@ EAPI=3
 
 KDE_MINIMAL="4.5"
 
-GIT_ECLASS=
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else
-	EGIT_REPO_URI="git://git.kde.org/networkmanagement"
-	GIT_ECLASS="git"
-fi
-
-inherit kde4-base ${GIT_ECLASS}
+KDE_SCM="git"
+ESCM_REPONAME="networkmanagement"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+inherit kde4-base
 
 DESCRIPTION="KDE frontend for NetworkManager"
 HOMEPAGE="http://kde.org/"

[gentoo-commits] proj/kde:master commit in: kde-misc/knetworkmanager/

[Manuel Nickschas]

commit:     228fbc8ff6602e941b41de0b17cc2b0c38b37fb7
Author:     Manuel Nickschas <sputnick <AT> quassel-irc <DOT> org>
AuthorDate: Wed Feb  9 10:58:55 2011 +0000
Commit:     Manuel Nickschas <sputnick <AT> quassel-irc <DOT> org>
CommitDate: Wed Feb  9 10:58:55 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=228fbc8f

[knetworkmanager:live] Don't set SRC_URI for live

---
 .../knetworkmanager/knetworkmanager-9999.ebuild    |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild b/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
index f118732..85a2312 100644
--- a/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
+++ b/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
@@ -8,7 +8,7 @@ KDE_MINIMAL="4.5"
 
 KDE_SCM="git"
 ESCM_REPONAME="networkmanagement"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
+[[ ${PV} = 9999* ]] && SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 inherit kde4-base
 

[gentoo-commits] proj/kde:master commit in: kde-misc/knetworkmanager/

[Christian Schmitt]

commit:     ff1466532ec4ffe00b7070799e2dea0dff91f62f
Author:     Christian Schmitt <chris <AT> ilovelinux <DOT> de>
AuthorDate: Thu Feb 10 11:45:57 2011 +0000
Commit:     Christian Schmitt <chris <AT> ilovelinux <DOT> de>
CommitDate: Thu Feb 10 11:56:42 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ff146653

[kde-misc/knetworkmanager] we don't have to build the old monolithic version, do we?

---
 .../knetworkmanager/knetworkmanager-9999.ebuild    |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild b/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
index 85a2312..8c871b2 100644
--- a/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
+++ b/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
@@ -34,6 +34,10 @@ RESTRICT="test"
 src_prepare() {
 	kde4-base_src_prepare
 
+	#removing monolithic version
+	sed -e "s:add_subdirectory(monolithic):#add_subdirectory(monolithic):" \
+		-i CMakeLists.txt || die "removing monolithic NM failed"
+
 	if ! use consolekit; then
 		# Fix dbus policy
 		sed -i \

[gentoo-commits] proj/kde:master commit in: kde-misc/knetworkmanager/

[Tomas Chvatal]

commit:     5e7a32c79bc94338c598e84e990deedbe48ec833
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 12 09:08:59 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 09:09:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5e7a32c7

Drop wicd and networkmanager useflags. Fix dependencies for 0.9 nm series.

---
 .../knetworkmanager/knetworkmanager-9999.ebuild    |   19 +++++++------------
 1 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild b/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
index d23ad3c..7262161 100644
--- a/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
+++ b/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=3
 
-KDE_MINIMAL="4.5"
+KDE_MINIMAL="4.6"
 
 KDE_SCM="git"
 EGIT_REPONAME="networkmanagement"
@@ -18,26 +18,21 @@ HOMEPAGE="http://kde.org/"
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS=""
 SLOT="4"
-IUSE="consolekit debug +networkmanager wicd"
+IUSE="consolekit debug"
 
+# From 0.9 networkmanager the solid is not used
 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') )
+	|| (
+		>=net-misc/networkmanager-0.8.80
+		$(add_kdebase_dep solid 'networkmanager')
+	)
 "
 RDEPEND="${DEPEND}"
 
-RESTRICT="test"
-
 src_prepare() {
 	kde4-base_src_prepare
 
-	#removing monolithic version
-	sed -e "s:add_subdirectory(monolithic):#add_subdirectory(monolithic):" \
-		-i CMakeLists.txt || die "removing monolithic NM failed"
-
 	if ! use consolekit; then
 		# Fix dbus policy
 		sed -i \

[gentoo-commits] proj/kde:master commit in: kde-misc/knetworkmanager/

[Tomas Chvatal]

commit:     c9cb4ddbe677da64c2d3cd2e88cdd78379a0bbd5
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 12 09:20:41 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 09:20:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c9cb4ddb

[knetworkmanager] restrict tests again, wrongly dropped.

---
 .../knetworkmanager/knetworkmanager-9999.ebuild    |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild b/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
index 7262161..6ca39b7 100644
--- a/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
+++ b/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
@@ -30,6 +30,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+RESTRICT="test"
+
 src_prepare() {
 	kde4-base_src_prepare
 

[gentoo-commits] proj/kde:master commit in: kde-misc/knetworkmanager/

[Tomas Chvatal]

commit:     277ff53e803d000b6d1f50fe736899d1acf08c9a
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 15 13:38:11 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 13:38:11 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=277ff53e

[knetworkmanager] declare cmakelists local.

---
 .../knetworkmanager/knetworkmanager-9999.ebuild    |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild b/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
index 6ca39b7..561d6db 100644
--- a/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
+++ b/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KDE_MINIMAL="4.6"
 
@@ -45,7 +45,7 @@ src_prepare() {
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DDBUS_SYSTEM_POLICY_DIR=/etc/dbus-1/system.d
 	)
 

[gentoo-commits] proj/kde:master commit in: kde-misc/knetworkmanager/

[Alexey Shvetsov]

commit:     92aa9ebbe48f8d92c54789edd04e417aa95ea4fe
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 19 14:05:06 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sun Jun 19 14:05:06 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=92aa9ebb

[kde-misc/knetworkmanager] Make use of nm09

(Portage version: 2.2.0_alpha41/git/Linux x86_64, signed Manifest commit with key F82F92E6)

---
 .../knetworkmanager/knetworkmanager-9999.ebuild    |   10 ++++++++--
 kde-misc/knetworkmanager/metadata.xml              |    2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild b/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
index dc1e6b4..3b6af95 100644
--- a/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
+++ b/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
@@ -9,6 +9,12 @@ KDE_MINIMAL="4.6"
 KDE_SCM="git"
 EGIT_REPONAME="networkmanagement"
 
+if use nm09; then
+	EGIT_BRANCH="nm09"
+else
+	EGIT_BRANCH="master"
+fi
+
 inherit kde4-base
 
 DESCRIPTION="KDE frontend for NetworkManager"
@@ -18,13 +24,13 @@ HOMEPAGE="http://kde.org/"
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS=""
 SLOT="4"
-IUSE="consolekit debug"
+IUSE="consolekit nm09 debug"
 
 # From 0.9 networkmanager the solid is not used
 DEPEND="
 	net-misc/mobile-broadband-provider-info
 	|| (
-		>=net-misc/networkmanager-0.8.80
+		>=net-misc/networkmanager-0.8.9997
 		$(add_kdebase_dep solid 'networkmanager')
 	)
 "

diff --git a/kde-misc/knetworkmanager/metadata.xml b/kde-misc/knetworkmanager/metadata.xml
index 1a29261..7e5b287 100644
--- a/kde-misc/knetworkmanager/metadata.xml
+++ b/kde-misc/knetworkmanager/metadata.xml
@@ -4,6 +4,6 @@
 <herd>kde</herd>
 <use>
 	<flag name='consolekit'>Enable support for <pkg>sys-auth/consolekit</pkg></flag>
-	<flag name='wicd'>Enable the wicd backend</flag>
+	<flag name='nm09'>Enable support for NetworkManager-0.9</flag>
 </use>
 </pkgmetadata>

[gentoo-commits] proj/kde:master commit in: kde-misc/knetworkmanager/

[David Heidelberger]

commit:     a8659c68c0db17e43701d6d36a4828f0a1041ef6
Author:     David Heidelberger <d.okias <AT> gmail <DOT> com>
AuthorDate: Wed Jun 22 09:25:40 2011 +0000
Commit:     David Heidelberger <d.okias <AT> gmail <DOT> com>
CommitDate: Wed Jun 22 09:25:40 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=a8659c68

[kde-misc/knetworkmanager] fix DEPEND for nm09 USE

---
 .../knetworkmanager/knetworkmanager-9999.ebuild    |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild b/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
index 3b6af95..40e05ff 100644
--- a/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
+++ b/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
@@ -29,10 +29,8 @@ IUSE="consolekit nm09 debug"
 # From 0.9 networkmanager the solid is not used
 DEPEND="
 	net-misc/mobile-broadband-provider-info
-	|| (
-		>=net-misc/networkmanager-0.8.9997
-		$(add_kdebase_dep solid 'networkmanager')
-	)
+	nm09?	( >=net-misc/networkmanager-0.8.9997 )
+	!nm09?	( $(add_kdebase_dep solid 'networkmanager') )
 "
 RDEPEND="${DEPEND}"
 

[gentoo-commits] proj/kde:master commit in: kde-misc/knetworkmanager/

[Jonathan Callen]

commit:     6a1979845e66dccb0a61b5161ff32e6e4629f170
Author:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 11 07:20:10 2011 +0000
Commit:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
CommitDate: Sun Sep 11 07:20:10 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6a197984

[kde-misc/knetworkmanager] Bump NM dep for USE=nm09

---
 .../knetworkmanager/knetworkmanager-9999.ebuild    |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild b/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
index 40e05ff..4e2a328 100644
--- a/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
+++ b/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
@@ -29,7 +29,7 @@ IUSE="consolekit nm09 debug"
 # From 0.9 networkmanager the solid is not used
 DEPEND="
 	net-misc/mobile-broadband-provider-info
-	nm09?	( >=net-misc/networkmanager-0.8.9997 )
+	nm09?	( >=net-misc/networkmanager-0.9.0 )
 	!nm09?	( $(add_kdebase_dep solid 'networkmanager') )
 "
 RDEPEND="${DEPEND}"

[gentoo-commits] proj/kde:master commit in: kde-misc/knetworkmanager/

[Johannes Huber]

commit:     a7f71069e07c7d178b95fc36c699015079d2c1b7
Author:     Johannes Huber <johu <AT> gmx <DOT> de>
AuthorDate: Fri Oct 14 22:55:36 2011 +0000
Commit:     Johannes Huber <johu <AT> gmx <DOT> de>
CommitDate: Fri Oct 14 22:55:36 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=a7f71069

[kde-misc/knetworkmanager] Remove nm08 support for easier maintaining. All upcomming releases will depend on nm09.

(Portage version: 2.2.0_alpha67/git/Linux i686, signed Manifest commit with key DF018462)

---
 .../knetworkmanager/knetworkmanager-9999.ebuild    |   26 +++++++++----------
 kde-misc/knetworkmanager/metadata.xml              |    1 -
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild b/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
index 4e2a328..5682929 100644
--- a/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
+++ b/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
@@ -5,36 +5,34 @@
 EAPI=4
 
 KDE_MINIMAL="4.6"
+KDE_LINGUAS="ar ast bs ca ca@valencia cs da de el en_GB eo es et fi fr ga gl hr
+hu is it ja km ko lt lv mai ms nb nds nl nn pa pl pt pt_BR ro ru sk sl sq sv th
+tr ug uk wa zh_CN zh_TW"
 
-KDE_SCM="git"
-EGIT_REPONAME="networkmanagement"
-
-if use nm09; then
-	EGIT_BRANCH="nm09"
-else
-	EGIT_BRANCH="master"
-fi
+MY_PN="networkmanagement"
+MY_P="${MY_PN}-${PV}"
 
+KDE_SCM="git"
+EGIT_REPONAME="${MY_PN}"
+EGIT_BRANCH="nm09"
 inherit kde4-base
 
 DESCRIPTION="KDE frontend for NetworkManager"
 HOMEPAGE="http://kde.org/"
-[[ ${PV} != 9999* ]] && SRC_URI="mirror://gentoo/${P}.tar.bz2"
+[[ ${PV} = 9999* ]] || SRC_URI="mirror://kde/unstable/${MY_PN}/${PV}/src/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS=""
 SLOT="4"
-IUSE="consolekit nm09 debug"
+IUSE="consolekit debug"
 
-# From 0.9 networkmanager the solid is not used
 DEPEND="
 	net-misc/mobile-broadband-provider-info
-	nm09?	( >=net-misc/networkmanager-0.9.0 )
-	!nm09?	( $(add_kdebase_dep solid 'networkmanager') )
+	>=net-misc/networkmanager-0.9.0
 "
 RDEPEND="${DEPEND}"
 
-RESTRICT="test"
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	kde4-base_src_prepare

diff --git a/kde-misc/knetworkmanager/metadata.xml b/kde-misc/knetworkmanager/metadata.xml
index 7e5b287..07f1d8d 100644
--- a/kde-misc/knetworkmanager/metadata.xml
+++ b/kde-misc/knetworkmanager/metadata.xml
@@ -4,6 +4,5 @@
 <herd>kde</herd>
 <use>
 	<flag name='consolekit'>Enable support for <pkg>sys-auth/consolekit</pkg></flag>
-	<flag name='nm09'>Enable support for NetworkManager-0.9</flag>
 </use>
 </pkgmetadata>

[gentoo-commits] proj/kde:master commit in: kde-misc/knetworkmanager/

[Alexey Shvetsov]

commit:     88c68e3ca7756871b38931fd02d0194fddfe360d
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 24 23:31:40 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Mon Oct 24 23:31:40 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=88c68e3c

[kde-misc/knetworkmanager] Now it uses libnm-qt & libmm-qt

(Portage version: 2.2.0_alpha71/git/Linux x86_64, signed Manifest commit with key F82F92E6)

---
 .../knetworkmanager/knetworkmanager-9999.ebuild    |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild b/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
index 5682929..1cd4df1 100644
--- a/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
+++ b/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
@@ -14,7 +14,6 @@ MY_P="${MY_PN}-${PV}"
 
 KDE_SCM="git"
 EGIT_REPONAME="${MY_PN}"
-EGIT_BRANCH="nm09"
 inherit kde4-base
 
 DESCRIPTION="KDE frontend for NetworkManager"
@@ -27,6 +26,8 @@ SLOT="4"
 IUSE="consolekit debug"
 
 DEPEND="
+	kde-misc/libmm-qt
+	kde-misc/libnm-qt
 	net-misc/mobile-broadband-provider-info
 	>=net-misc/networkmanager-0.9.0
 "