* [gentoo-commits] proj/kde:master commit in: kde-base/baloo/files/, kde-base/baloo/
@ 2014-08-11 22:56 Johannes Huber
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Huber @ 2014-08-11 22:56 UTC (permalink / raw
To: gentoo-commits
commit: 533fd6472ce3b76e04dbf9c7c44e3b08b4e16d8b
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 11 22:56:44 2014 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Aug 11 22:56:44 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=533fd647
[kde-base/baloo] Drop alternate kcm hack
We are going stable without it. Decided in last herd meeting.
Package-Manager: portage-2.2.11-r1
---
kde-base/baloo/baloo-4.13.97.ebuild | 8 +-------
kde-base/baloo/baloo-4.14.49.9999.ebuild | 9 +--------
kde-base/baloo/files/baloo-4.13.0-nokcm.patch | 11 -----------
kde-base/baloo/metadata.xml | 3 ---
4 files changed, 2 insertions(+), 29 deletions(-)
diff --git a/kde-base/baloo/baloo-4.13.97.ebuild b/kde-base/baloo/baloo-4.13.97.ebuild
index 3902ee8..f364b11 100644
--- a/kde-base/baloo/baloo-4.13.97.ebuild
+++ b/kde-base/baloo/baloo-4.13.97.ebuild
@@ -8,7 +8,7 @@ inherit kde4-base
DESCRIPTION="Next generation of the Nepomuk project"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+alternatekcm debug minimal"
+IUSE="debug minimal"
DEPEND="
$(add_kdebase_dep kdepimlibs)
@@ -21,15 +21,9 @@ DEPEND="
RDEPEND="
${DEPEND}
"
-PDEPEND="alternatekcm? ( kde-misc/baloo-kcmadv )"
RESTRICT="test"
-src_prepare() {
- kde4-base_src_prepare
- use alternatekcm && epatch "${FILESDIR}/${PN}-4.13.0-nokcm.patch"
-}
-
src_install() {
kde4-base_src_install
diff --git a/kde-base/baloo/baloo-4.14.49.9999.ebuild b/kde-base/baloo/baloo-4.14.49.9999.ebuild
index 0dc7089..a21f0c0 100644
--- a/kde-base/baloo/baloo-4.14.49.9999.ebuild
+++ b/kde-base/baloo/baloo-4.14.49.9999.ebuild
@@ -8,7 +8,7 @@ inherit kde4-base
DESCRIPTION="Next generation of the Nepomuk project"
KEYWORDS=""
-IUSE="+alternatekcm debug minimal"
+IUSE="debug minimal"
DEPEND="
$(add_kdebase_dep kdepimlibs)
@@ -21,15 +21,8 @@ DEPEND="
RDEPEND="
${DEPEND}
"
-PDEPEND="alternatekcm? ( kde-misc/baloo-kcmadv )"
-
RESTRICT="test"
-src_prepare() {
- kde4-base_src_prepare
- use alternatekcm && epatch "${FILESDIR}/${PN}-4.13.0-nokcm.patch"
-}
-
src_install() {
kde4-base_src_install
diff --git a/kde-base/baloo/files/baloo-4.13.0-nokcm.patch b/kde-base/baloo/files/baloo-4.13.0-nokcm.patch
deleted file mode 100644
index 7690b40..0000000
--- a/kde-base/baloo/files/baloo-4.13.0-nokcm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN baloo-4.13.0.orig/src/file/CMakeLists.txt baloo-4.13.0/src/file/CMakeLists.txt
---- baloo-4.13.0.orig/src/file/CMakeLists.txt 2014-04-15 18:30:06.000000000 +0200
-+++ baloo-4.13.0/src/file/CMakeLists.txt 2014-05-04 02:58:00.312192920 +0200
-@@ -66,6 +66,6 @@
- add_subdirectory(autotest)
- add_subdirectory(tests)
- add_subdirectory(extractor)
--add_subdirectory(kcm)
-+#add_subdirectory(kcm)
- add_subdirectory(inotify)
- add_subdirectory(cleaner)
diff --git a/kde-base/baloo/metadata.xml b/kde-base/baloo/metadata.xml
index 2055886..a23f444 100644
--- a/kde-base/baloo/metadata.xml
+++ b/kde-base/baloo/metadata.xml
@@ -2,7 +2,4 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>kde</herd>
- <use>
- <flag name="alternatekcm">Use the alternate Systemsettings module by Lindsay Mathieson for better configurability</flag>
- </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-base/baloo/files/, kde-base/baloo/
@ 2014-05-06 15:04 Andreas Hüttel
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Hüttel @ 2014-05-06 15:04 UTC (permalink / raw
To: gentoo-commits
commit: 43802b32ddc425dd0846298edf179a32bbeff56e
Author: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue May 6 15:03:31 2014 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue May 6 15:03:31 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=43802b32
[kde-base/baloo] use alternate configuration module by default
Package-Manager: portage-2.2.8-r1
---
kde-base/baloo/baloo-4.13.49.9999.ebuild | 12 ++++++++++--
kde-base/baloo/baloo-4.9999.ebuild | 12 ++++++++++--
kde-base/baloo/files/baloo-4.13.0-nokcm.patch | 11 +++++++++++
kde-base/baloo/metadata.xml | 3 +++
4 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/kde-base/baloo/baloo-4.13.49.9999.ebuild b/kde-base/baloo/baloo-4.13.49.9999.ebuild
index 095e00a..7e41536 100644
--- a/kde-base/baloo/baloo-4.13.49.9999.ebuild
+++ b/kde-base/baloo/baloo-4.13.49.9999.ebuild
@@ -8,7 +8,7 @@ inherit kde4-base
DESCRIPTION="Next generation of the Nepomuk project"
KEYWORDS=""
-IUSE="debug"
+IUSE="debug +alternatekcm"
DEPEND="
$(add_kdebase_dep kdepimlibs)
@@ -18,6 +18,14 @@ DEPEND="
sys-apps/attr
!<kde-base/nepomuk-4.12.50
"
-RDEPEND="${DEPEND}"
+RDEPEND="
+ ${DEPEND}
+"
+PDEPEND="alternatekcm? ( kde-misc/baloo-kcmadv )"
RESTRICT="test"
+
+src_prepare() {
+ kde4-base_src_prepare
+ use alternatekcm && epatch "${FILESDIR}/${PN}-4.13.0-nokcm.patch"
+}
diff --git a/kde-base/baloo/baloo-4.9999.ebuild b/kde-base/baloo/baloo-4.9999.ebuild
index 095e00a..7e41536 100644
--- a/kde-base/baloo/baloo-4.9999.ebuild
+++ b/kde-base/baloo/baloo-4.9999.ebuild
@@ -8,7 +8,7 @@ inherit kde4-base
DESCRIPTION="Next generation of the Nepomuk project"
KEYWORDS=""
-IUSE="debug"
+IUSE="debug +alternatekcm"
DEPEND="
$(add_kdebase_dep kdepimlibs)
@@ -18,6 +18,14 @@ DEPEND="
sys-apps/attr
!<kde-base/nepomuk-4.12.50
"
-RDEPEND="${DEPEND}"
+RDEPEND="
+ ${DEPEND}
+"
+PDEPEND="alternatekcm? ( kde-misc/baloo-kcmadv )"
RESTRICT="test"
+
+src_prepare() {
+ kde4-base_src_prepare
+ use alternatekcm && epatch "${FILESDIR}/${PN}-4.13.0-nokcm.patch"
+}
diff --git a/kde-base/baloo/files/baloo-4.13.0-nokcm.patch b/kde-base/baloo/files/baloo-4.13.0-nokcm.patch
new file mode 100644
index 0000000..7690b40
--- /dev/null
+++ b/kde-base/baloo/files/baloo-4.13.0-nokcm.patch
@@ -0,0 +1,11 @@
+diff -ruN baloo-4.13.0.orig/src/file/CMakeLists.txt baloo-4.13.0/src/file/CMakeLists.txt
+--- baloo-4.13.0.orig/src/file/CMakeLists.txt 2014-04-15 18:30:06.000000000 +0200
++++ baloo-4.13.0/src/file/CMakeLists.txt 2014-05-04 02:58:00.312192920 +0200
+@@ -66,6 +66,6 @@
+ add_subdirectory(autotest)
+ add_subdirectory(tests)
+ add_subdirectory(extractor)
+-add_subdirectory(kcm)
++#add_subdirectory(kcm)
+ add_subdirectory(inotify)
+ add_subdirectory(cleaner)
diff --git a/kde-base/baloo/metadata.xml b/kde-base/baloo/metadata.xml
index a23f444..64a27d2 100644
--- a/kde-base/baloo/metadata.xml
+++ b/kde-base/baloo/metadata.xml
@@ -2,4 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>kde</herd>
+ <use>
+ <flag name="alternatekcm">Use the alternate Systemsettings module by Lindsay Mathieson for better configurability</flag>
+ </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-08-11 22:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-11 22:56 [gentoo-commits] proj/kde:master commit in: kde-base/baloo/files/, kde-base/baloo/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2014-05-06 15:04 Andreas Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox