From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SXy4m-0005fC-Ge for garchives@archives.gentoo.org; Fri, 25 May 2012 17:13:20 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5514AE0605; Fri, 25 May 2012 17:13:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 25307E0605 for ; Fri, 25 May 2012 17:13:07 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 877741B4005 for ; Fri, 25 May 2012 17:13:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 50B0BE542A for ; Fri, 25 May 2012 17:13:05 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1337964820.8f9ff2d00a6d5fc9ed8deb704a60513a04671fe7.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdelibs/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/kdelibs/kdelibs-4.8.80.ebuild kde-base/kdelibs/kdelibs-9999.ebuild X-VCS-Directories: kde-base/kdelibs/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 8f9ff2d00a6d5fc9ed8deb704a60513a04671fe7 X-VCS-Branch: master Date: Fri, 25 May 2012 17:13:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: f1f3e747-fa87-4df8-a44d-f634f083d7f3 X-Archives-Hash: e396d021a995a975130c1c0e99191433 commit: 8f9ff2d00a6d5fc9ed8deb704a60513a04671fe7 Author: Johannes Huber gentoo org> AuthorDate: Fri May 25 16:53:40 2012 +0000 Commit: Johannes Huber gentoo org> CommitDate: Fri May 25 16:53:40 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D8f9ff2d0 [kde-base/kdelibs] Fix file collision with nepomuk-core. (Portage version: 2.2.0_alpha108/git/Linux x86_64, unsigned Manifest comm= it) --- kde-base/kdelibs/kdelibs-4.8.80.ebuild | 6 +++++- kde-base/kdelibs/kdelibs-9999.ebuild | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/kde-base/kdelibs/kdelibs-4.8.80.ebuild b/kde-base/kdelibs/kd= elibs-4.8.80.ebuild index 0f7dfd4..47f65f3 100644 --- a/kde-base/kdelibs/kdelibs-4.8.80.ebuild +++ b/kde-base/kdelibs/kdelibs-4.8.80.ebuild @@ -111,7 +111,7 @@ PDEPEND=3D" >=3Dkde-misc/polkit-kde-kcmodules-0.98_pre20101127 >=3Dsys-auth/polkit-kde-agent-0.99 ) - semantic-desktop? ( $(add_kdebase_dep nepomuk) ) + semantic-desktop? ( $(add_kdebase_dep nepomuk-core) ) " =20 # Force the upgrade of plasma-workspace to a version that explicitly dep= ends on kactivities @@ -278,6 +278,10 @@ src_install() { echo "COLON_SEPARATED=3DQT_PLUGIN_PATH" > "${T}/77kde" echo "QT_PLUGIN_PATH=3D${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "$= {T}/77kde" doenvd "${T}/77kde" + + # Fix file collisions with nepomuk-core + rm -f "${ED}/usr/bin/nepomuk-rcgen" || die + rm -f "${ED}/usr/$(get_libdir)/debug/usr/bin/nepomuk-rcgen.debug" || di= e } =20 pkg_postinst() { diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdel= ibs-9999.ebuild index c8f9097..9417cf1 100644 --- a/kde-base/kdelibs/kdelibs-9999.ebuild +++ b/kde-base/kdelibs/kdelibs-9999.ebuild @@ -111,7 +111,7 @@ PDEPEND=3D" >=3Dkde-misc/polkit-kde-kcmodules-0.98_pre20101127 >=3Dsys-auth/polkit-kde-agent-0.99 ) - semantic-desktop? ( $(add_kdebase_dep nepomuk) ) + semantic-desktop? ( $(add_kdebase_dep nepomuk-core) ) " =20 # Force the upgrade of plasma-workspace to a version that explicitly dep= ends on kactivities @@ -278,6 +278,10 @@ src_install() { echo "COLON_SEPARATED=3DQT_PLUGIN_PATH" > "${T}/77kde" echo "QT_PLUGIN_PATH=3D${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "$= {T}/77kde" doenvd "${T}/77kde" + + # Fix file collisions with nepomuk-core + rm -f "${ED}/usr/bin/nepomuk-rcgen" || die + rm -f "${ED}/usr/$(get_libdir)/debug/usr/bin/nepomuk-rcgen.debug" || di= e } =20 pkg_postinst() {