diff options
| author |   Johannes Huber <johu@gentoo.org> | 2014-08-11 22:53:20 +0000 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2014-08-11 22:53:20 +0000 |
| commit | 3db25eed9f3fa4c90c3d4113a265ea4cf3c7ba1a (patch) | |
| tree | b2452b1f9664c53074cc60ed126afd9509bbacde /kde-base | |
| parent | Keyword ~ppc, ~ppc64 for bug #519618 (diff) | |
| download | gentoo-2-3db25eed9f3fa4c90c3d4113a265ea4cf3c7ba1a.tar.gz gentoo-2-3db25eed9f3fa4c90c3d4113a265ea4cf3c7ba1a.tar.bz2 gentoo-2-3db25eed9f3fa4c90c3d4113a265ea4cf3c7ba1a.zip | |
Drop alternate kcm hack, we are going stable without it. Decided in last herd meeting.
(Portage version: 2.2.11-r1/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/baloo/ChangeLog | 7 | ||||
| -rw-r--r-- | kde-base/baloo/baloo-4.13.3.ebuild | 11 | ||||
| -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, 8 insertions, 24 deletions
diff --git a/kde-base/baloo/ChangeLog b/kde-base/baloo/ChangeLog index a427d15f915d..55f18c01b3a2 100644 --- a/kde-base/baloo/ChangeLog +++ b/kde-base/baloo/ChangeLog @@ -1,6 +1,11 @@ # 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.16 2014/07/23 16:53:11 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/baloo/ChangeLog,v 1.17 2014/08/11 22:53:20 johu Exp $ + + 11 Aug 2014; Johannes Huber <johu@gentoo.org> -files/baloo-4.13.0-nokcm.patch, + baloo-4.13.3.ebuild, metadata.xml: + Drop alternate kcm hack, we are going stable without it. Decided in last herd + meeting. 23 Jul 2014; Johannes Huber <johu@gentoo.org> -baloo-4.13.2.ebuild: Remove KDE SC 4.13.2 diff --git a/kde-base/baloo/baloo-4.13.3.ebuild b/kde-base/baloo/baloo-4.13.3.ebuild index 1268db6a5fdc..30d3b9966b19 100644 --- a/kde-base/baloo/baloo-4.13.3.ebuild +++ b/kde-base/baloo/baloo-4.13.3.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.3.ebuild,v 1.1 2014/07/16 17:40:39 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/baloo/baloo-4.13.3.ebuild,v 1.2 2014/08/11 22:53:20 johu 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="+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 7690b40715a3..000000000000 --- 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 64a27d28fd6c..a23f444b67d6 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> |