diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2014-05-04 01:17:06 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2014-05-04 01:17:06 +0000 |
| commit | aa7a76f234c86d21b3aeb9c7ee404ab4a8bb256b (patch) | |
| tree | 244826ea641c2038c52cb90e4162b35cbd0e9f2f /kde-base/baloo | |
| parent | Fix baloo useflags (diff) | |
| download | gentoo-2-aa7a76f234c86d21b3aeb9c7ee404ab4a8bb256b.tar.gz gentoo-2-aa7a76f234c86d21b3aeb9c7ee404ab4a8bb256b.tar.bz2 gentoo-2-aa7a76f234c86d21b3aeb9c7ee404ab4a8bb256b.zip | |
Use alternate configuration module by default
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)
Diffstat (limited to 'kde-base/baloo')
| -rw-r--r-- | kde-base/baloo/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/baloo/baloo-4.13.0.ebuild | 14 | ||||
| -rw-r--r-- | kde-base/baloo/files/baloo-4.13.0-nokcm.patch | 11 | ||||
| -rw-r--r-- | kde-base/baloo/metadata.xml | 3 |
4 files changed, 30 insertions, 4 deletions
diff --git a/kde-base/baloo/ChangeLog b/kde-base/baloo/ChangeLog index dcf7943ad8df..4fee81847495 100644 --- a/kde-base/baloo/ChangeLog +++ b/kde-base/baloo/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/baloo # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/baloo/ChangeLog,v 1.5 2014/05/03 14:17:11 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/baloo/ChangeLog,v 1.6 2014/05/04 01:17:05 dilfridge Exp $ + + 04 May 2014; Andreas K. Huettel <dilfridge@gentoo.org> baloo-4.13.0.ebuild, + +files/baloo-4.13.0-nokcm.patch, metadata.xml: + Use alternate configuration module by default 03 May 2014; Markus Meier <maekke@gentoo.org> baloo-4.13.0.ebuild: add ~arm, bug #507896 diff --git a/kde-base/baloo/baloo-4.13.0.ebuild b/kde-base/baloo/baloo-4.13.0.ebuild index 9e8439993a16..8aac2ef41ba7 100644 --- a/kde-base/baloo/baloo-4.13.0.ebuild +++ b/kde-base/baloo/baloo-4.13.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/baloo/baloo-4.13.0.ebuild,v 1.5 2014/05/03 14:17:11 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/baloo/baloo-4.13.0.ebuild,v 1.6 2014/05/04 01:17:05 dilfridge Exp $ EAPI=5 @@ -8,7 +8,7 @@ inherit kde4-base DESCRIPTION="Next generation of the Nepomuk project" KEYWORDS=" ~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" -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} + alternatekcm? ( kde-misc/baloo-kcmadv ) +" RESTRICT="test" + +src_prepare() { + kde4-base_src_prepare + use alternatekcm && epatch "${FILESDIR}/${P}-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 000000000000..7690b40715a3 --- /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 a23f444b67d6..64a27d28fd6c 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> |