From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9D54713877A for ; Mon, 11 Aug 2014 22:57:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2396DE0C4D; Mon, 11 Aug 2014 22:57:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AFE34E0C4D for ; Mon, 11 Aug 2014 22:57:00 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 37C183400C8 for ; Mon, 11 Aug 2014 22:56:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id E846018815 for ; Mon, 11 Aug 2014 22:56:57 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1407797804.533fd6472ce3b76e04dbf9c7c44e3b08b4e16d8b.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/baloo/files/, kde-base/baloo/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/baloo/baloo-4.13.97.ebuild kde-base/baloo/baloo-4.14.49.9999.ebuild kde-base/baloo/files/baloo-4.13.0-nokcm.patch kde-base/baloo/metadata.xml X-VCS-Directories: kde-base/baloo/files/ kde-base/baloo/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 533fd6472ce3b76e04dbf9c7c44e3b08b4e16d8b X-VCS-Branch: master Date: Mon, 11 Aug 2014 22:56:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b13657e9-a539-4f30-a408-88b5d0333de1 X-Archives-Hash: 6c479f69e8b5b51e99c96f46d6398566 commit: 533fd6472ce3b76e04dbf9c7c44e3b08b4e16d8b Author: Johannes Huber gentoo org> AuthorDate: Mon Aug 11 22:56:44 2014 +0000 Commit: Johannes Huber gentoo 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 @@ kde - - Use the alternate Systemsettings module by Lindsay Mathieson for better configurability -