[gentoo-commits] proj/kde:master commit in: kde-base/dolphin-plugins/

[gentoo-commits] proj/kde:master commit in: kde-base/dolphin-plugins/

[Alexey Shvetsov]

commit:     e5599d985203a61467bb6701c1fc34f5530ed0e5
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  7 21:01:26 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Wed Sep  7 21:01:26 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e5599d98

[kde-base/dolphin-plugins] Drop old blockers

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

---
 .../dolphin-plugins-4.7.49.9999.ebuild             |    3 ---
 .../dolphin-plugins/dolphin-plugins-9999.ebuild    |    3 ---
 2 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/kde-base/dolphin-plugins/dolphin-plugins-4.7.49.9999.ebuild b/kde-base/dolphin-plugins/dolphin-plugins-4.7.49.9999.ebuild
index 65f0e2f..c0d728c 100644
--- a/kde-base/dolphin-plugins/dolphin-plugins-4.7.49.9999.ebuild
+++ b/kde-base/dolphin-plugins/dolphin-plugins-4.7.49.9999.ebuild
@@ -20,9 +20,6 @@ RDEPEND="${DEPEND}
 	subversion? ( dev-vcs/subversion )
 "
 
-# SCM plugins moved from dolphin somewhere before 4.4.75
-add_blocker dolphin '<4.4.75'
-
 KMLOADLIBS="libkonq"
 
 #

diff --git a/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild b/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild
index 65f0e2f..c0d728c 100644
--- a/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild
+++ b/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild
@@ -20,9 +20,6 @@ RDEPEND="${DEPEND}
 	subversion? ( dev-vcs/subversion )
 "
 
-# SCM plugins moved from dolphin somewhere before 4.4.75
-add_blocker dolphin '<4.4.75'
-
 KMLOADLIBS="libkonq"
 
 #

[gentoo-commits] proj/kde:master commit in: kde-base/dolphin-plugins/

[Jonathan Callen]

commit:     1200d2dc55f3a6a5591c2fc0f46a2898c56db437
Author:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 11 19:47:04 2011 +0000
Commit:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
CommitDate: Sun Sep 11 19:47:04 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=1200d2dc

[kde-base/dolphin-plugins] Add bzr plugin

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

diff --git a/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild b/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild
index c0d728c..90ba00a 100644
--- a/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild
+++ b/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild
@@ -9,13 +9,14 @@ inherit kde4-meta
 
 DESCRIPTION="Extra Dolphin plugins"
 KEYWORDS=""
-IUSE="debug +git +subversion"
+IUSE="debug +bazaar +git +subversion"
 
 DEPEND="
 	$(add_kdebase_dep libkonq)
 "
 RDEPEND="${DEPEND}
 	$(add_kdebase_dep kompare)
+	bazaar? ( dev-vcs/bzr )
 	git? ( dev-vcs/git )
 	subversion? ( dev-vcs/subversion )
 "
@@ -28,6 +29,7 @@ KMLOADLIBS="libkonq"
 src_prepare() {
 	echo 'macro_optional_add_subdirectory ( dolphin-plugins )' >> CMakeLists.txt || die
 	echo > dolphin-plugins/CMakeLists.txt || die
+	use bazaar && echo 'add_subdirectory ( bazaar )' >> dolphin-plugins/CMakeLists.txt
 	use git && echo 'add_subdirectory ( git )' >> dolphin-plugins/CMakeLists.txt
 	use subversion && echo 'add_subdirectory ( svn )' >> dolphin-plugins/CMakeLists.txt
 
@@ -35,5 +37,5 @@ src_prepare() {
 }
 
 src_install() {
-	{ use git || use subversion; } && kde4-meta_src_install
+	{ use bazaar || use git || use subversion; } && kde4-meta_src_install
 }

[gentoo-commits] proj/kde:master commit in: kde-base/dolphin-plugins/

[Johannes Huber]

commit:     dfbe933dc2b315323a45d51a49dc579906c4160b
Author:     Johannes Huber <johu <AT> gmx <DOT> de>
AuthorDate: Fri Sep 23 18:48:22 2011 +0000
Commit:     Johannes Huber <johu <AT> gmx <DOT> de>
CommitDate: Fri Sep 23 18:48:22 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=dfbe933d

[kde-base/dolphin-plugins] Fix repoman error

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

---
 kde-base/dolphin-plugins/metadata.xml |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/kde-base/dolphin-plugins/metadata.xml b/kde-base/dolphin-plugins/metadata.xml
index ae1e2aa..b15760a 100644
--- a/kde-base/dolphin-plugins/metadata.xml
+++ b/kde-base/dolphin-plugins/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 <herd>kde</herd>
 <use>
+<flag name="bazaar">Enable support for the bazaar VCS</flag>
 <flag name="git">Enable support for the git VCS</flag>
 </use>
 </pkgmetadata>

[gentoo-commits] proj/kde:master commit in: kde-base/dolphin-plugins/

[Jonathan Callen]

commit:     ffa92ce58e609a1ce7fae6dd8926bde856c961ab
Author:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 20:33:58 2011 +0000
Commit:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
CommitDate: Mon Nov  7 02:24:19 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ffa92ce5

[kde-base/dolphin-plugins] Upstream added hg support

---
 .../dolphin-plugins/dolphin-plugins-9999.ebuild    |    6 ++++--
 kde-base/dolphin-plugins/metadata.xml              |    1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild b/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild
index 90ba00a..a52f9fb 100644
--- a/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild
+++ b/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild
@@ -9,7 +9,7 @@ inherit kde4-meta
 
 DESCRIPTION="Extra Dolphin plugins"
 KEYWORDS=""
-IUSE="debug +bazaar +git +subversion"
+IUSE="debug +bazaar +git +mercurial +subversion"
 
 DEPEND="
 	$(add_kdebase_dep libkonq)
@@ -18,6 +18,7 @@ RDEPEND="${DEPEND}
 	$(add_kdebase_dep kompare)
 	bazaar? ( dev-vcs/bzr )
 	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
 	subversion? ( dev-vcs/subversion )
 "
 
@@ -31,11 +32,12 @@ src_prepare() {
 	echo > dolphin-plugins/CMakeLists.txt || die
 	use bazaar && echo 'add_subdirectory ( bazaar )' >> dolphin-plugins/CMakeLists.txt
 	use git && echo 'add_subdirectory ( git )' >> dolphin-plugins/CMakeLists.txt
+	use mercurial && echo 'add_subdirectory ( hg )' >> dolphin-plugins/CMakeLists.txt
 	use subversion && echo 'add_subdirectory ( svn )' >> dolphin-plugins/CMakeLists.txt
 
 	kde4-meta_src_prepare
 }
 
 src_install() {
-	{ use bazaar || use git || use subversion; } && kde4-meta_src_install
+	{ use bazaar || use git || use mercurial || use subversion; } && kde4-meta_src_install
 }

diff --git a/kde-base/dolphin-plugins/metadata.xml b/kde-base/dolphin-plugins/metadata.xml
index b15760a..d043f22 100644
--- a/kde-base/dolphin-plugins/metadata.xml
+++ b/kde-base/dolphin-plugins/metadata.xml
@@ -5,5 +5,6 @@
 <use>
 <flag name="bazaar">Enable support for the bazaar VCS</flag>
 <flag name="git">Enable support for the git VCS</flag>
+<flag name="mercurial">Enable support for the mercurial VCS</flag>
 </use>
 </pkgmetadata>

[gentoo-commits] proj/kde:master commit in: kde-base/dolphin-plugins/

[Johannes Huber]

commit:     43eae5d4ea7c40009b2ac40b40c8a8a91dd2bc2a
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 14 15:57:41 2011 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Dec 14 16:00:40 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=43eae5d4

[kde-base/dolphin-plugins] Drop all default enabled vcs use flags, display a message if nothing is selected instead.

(Portage version: 2.2.0_alpha80/git/Linux x86_64, unsigned Manifest commit)

---
 .../dolphin-plugins/dolphin-plugins-9999.ebuild    |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild b/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild
index a52f9fb..dba2d1f 100644
--- a/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild
+++ b/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild
@@ -9,7 +9,7 @@ inherit kde4-meta
 
 DESCRIPTION="Extra Dolphin plugins"
 KEYWORDS=""
-IUSE="debug +bazaar +git +mercurial +subversion"
+IUSE="debug bazaar git mercurial subversion"
 
 DEPEND="
 	$(add_kdebase_dep libkonq)
@@ -41,3 +41,12 @@ src_prepare() {
 src_install() {
 	{ use bazaar || use git || use mercurial || use subversion; } && kde4-meta_src_install
 }
+
+pkg_postinst() {
+	if ! use bazaar && ! use git && ! use mercurial && ! use subversion ; then
+		einfo
+		einfo "You have disabled all plugin use flags. If you want to have vcs"
+		einfo "integration in dolphin, enable those of your needs."
+		einfo
+	fi
+}

[gentoo-commits] proj/kde:master commit in: kde-base/dolphin-plugins/

[Andreas Hüttel]

commit:     026626b750d323fb5072d4d6e92d693d3c6acabb
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Fri Jun  8 18:01:12 2012 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Jun  8 18:01:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=026626b7

[kde-base/dolphin-plugins] This hack does not work anymore. Fixed in eclass now.

(Portage version: 2.2.0_alpha110/git/Linux x86_64, unsigned Manifest commit)

---
 .../dolphin-plugins/dolphin-plugins-4.8.90.ebuild  |   14 --------------
 .../dolphin-plugins/dolphin-plugins-9999.ebuild    |   14 --------------
 2 files changed, 0 insertions(+), 28 deletions(-)

diff --git a/kde-base/dolphin-plugins/dolphin-plugins-4.8.90.ebuild b/kde-base/dolphin-plugins/dolphin-plugins-4.8.90.ebuild
index 391e455..f0dc5cc 100644
--- a/kde-base/dolphin-plugins/dolphin-plugins-4.8.90.ebuild
+++ b/kde-base/dolphin-plugins/dolphin-plugins-4.8.90.ebuild
@@ -24,20 +24,6 @@ RDEPEND="${DEPEND}
 
 KMLOADLIBS="libkonq"
 
-#
-# See bug 351147 for why this is necessary
-#
-src_prepare() {
-	echo 'macro_optional_add_subdirectory ( dolphin-plugins )' >> CMakeLists.txt || die
-	echo > dolphin-plugins/CMakeLists.txt || die
-	use bazaar && echo 'add_subdirectory ( bazaar )' >> dolphin-plugins/CMakeLists.txt
-	use git && echo 'add_subdirectory ( git )' >> dolphin-plugins/CMakeLists.txt
-	use mercurial && echo 'add_subdirectory ( hg )' >> dolphin-plugins/CMakeLists.txt
-	use subversion && echo 'add_subdirectory ( svn )' >> dolphin-plugins/CMakeLists.txt
-
-	kde4-meta_src_prepare
-}
-
 src_install() {
 	{ use bazaar || use git || use mercurial || use subversion; } && kde4-meta_src_install
 }

diff --git a/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild b/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild
index e189af5..a017ebd 100644
--- a/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild
+++ b/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild
@@ -24,20 +24,6 @@ RDEPEND="${DEPEND}
 
 KMLOADLIBS="libkonq"
 
-#
-# See bug 351147 for why this is necessary
-#
-src_prepare() {
-	echo 'macro_optional_add_subdirectory ( dolphin-plugins )' >> CMakeLists.txt || die
-	echo > dolphin-plugins/CMakeLists.txt || die
-	use bazaar && echo 'add_subdirectory ( bazaar )' >> dolphin-plugins/CMakeLists.txt
-	use git && echo 'add_subdirectory ( git )' >> dolphin-plugins/CMakeLists.txt
-	use mercurial && echo 'add_subdirectory ( hg )' >> dolphin-plugins/CMakeLists.txt
-	use subversion && echo 'add_subdirectory ( svn )' >> dolphin-plugins/CMakeLists.txt
-
-	kde4-meta_src_prepare
-}
-
 src_install() {
 	{ use bazaar || use git || use mercurial || use subversion; } && kde4-meta_src_install
 }

[gentoo-commits] proj/kde:master commit in: kde-base/dolphin-plugins/

[Jonathan Callen]

commit:     294d82de40fdd086bc36cc661798cfe71451aa10
Author:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 10 23:05:21 2013 +0000
Commit:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
CommitDate: Mon Feb 11 01:02:08 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=294d82de

[kde-base/dolphin-plugins] Moved to git

Package-Manager: portage-2.2.0_alpha161

---
 .../dolphin-plugins-4.10.49.9999.ebuild            |   12 ++++++++----
 .../dolphin-plugins/dolphin-plugins-9999.ebuild    |    6 ++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/kde-base/dolphin-plugins/dolphin-plugins-4.10.49.9999.ebuild b/kde-base/dolphin-plugins/dolphin-plugins-4.10.49.9999.ebuild
index 476537b..e5be0ce 100644
--- a/kde-base/dolphin-plugins/dolphin-plugins-4.10.49.9999.ebuild
+++ b/kde-base/dolphin-plugins/dolphin-plugins-4.10.49.9999.ebuild
@@ -4,9 +4,13 @@
 
 EAPI=5
 
-KMNAME="kdesdk"
-KDE_SCM="svn"
-inherit kde4-meta
+if [[ ${PV} == *9999 ]]; then
+	eclass="kde4-base"
+else
+	eclass="kde4-meta"
+	KMNAME="kdesdk"
+fi
+inherit ${eclass}
 
 DESCRIPTION="Extra Dolphin plugins"
 KEYWORDS=""
@@ -26,7 +30,7 @@ RDEPEND="${DEPEND}
 KMLOADLIBS="libkonq"
 
 src_install() {
-	{ use bazaar || use git || use mercurial || use subversion; } && kde4-meta_src_install
+	{ use bazaar || use git || use mercurial || use subversion; } && ${eclass}_src_install
 }
 
 pkg_postinst() {

diff --git a/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild b/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild
index 476537b..d8f3409 100644
--- a/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild
+++ b/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild
@@ -4,9 +4,7 @@
 
 EAPI=5
 
-KMNAME="kdesdk"
-KDE_SCM="svn"
-inherit kde4-meta
+inherit kde4-base
 
 DESCRIPTION="Extra Dolphin plugins"
 KEYWORDS=""
@@ -26,7 +24,7 @@ RDEPEND="${DEPEND}
 KMLOADLIBS="libkonq"
 
 src_install() {
-	{ use bazaar || use git || use mercurial || use subversion; } && kde4-meta_src_install
+	{ use bazaar || use git || use mercurial || use subversion; } && kde4-base_src_install
 }
 
 pkg_postinst() {

[gentoo-commits] proj/kde:master commit in: kde-base/dolphin-plugins/

[Michael Palimaka]

commit:     ea2ae194716b5564278edde703dcb9b76c266f06
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 27 16:51:54 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Aug 27 16:51:54 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ea2ae194

[kde-base/dolphin-plugins] Remove obsolete KMLOADLIBS.

Package-Manager: portage-2.2.1

---
 kde-base/dolphin-plugins/dolphin-plugins-4.11.49.9999.ebuild | 2 --
 kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild         | 2 --
 2 files changed, 4 deletions(-)

diff --git a/kde-base/dolphin-plugins/dolphin-plugins-4.11.49.9999.ebuild b/kde-base/dolphin-plugins/dolphin-plugins-4.11.49.9999.ebuild
index d8f3409..67ab83e 100644
--- a/kde-base/dolphin-plugins/dolphin-plugins-4.11.49.9999.ebuild
+++ b/kde-base/dolphin-plugins/dolphin-plugins-4.11.49.9999.ebuild
@@ -21,8 +21,6 @@ RDEPEND="${DEPEND}
 	subversion? ( dev-vcs/subversion )
 "
 
-KMLOADLIBS="libkonq"
-
 src_install() {
 	{ use bazaar || use git || use mercurial || use subversion; } && kde4-base_src_install
 }

diff --git a/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild b/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild
index d8f3409..67ab83e 100644
--- a/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild
+++ b/kde-base/dolphin-plugins/dolphin-plugins-9999.ebuild
@@ -21,8 +21,6 @@ RDEPEND="${DEPEND}
 	subversion? ( dev-vcs/subversion )
 "
 
-KMLOADLIBS="libkonq"
-
 src_install() {
 	{ use bazaar || use git || use mercurial || use subversion; } && kde4-base_src_install
 }