[gentoo-commits] proj/kde:master commit in: kde-base/nepomuk/

["Johannes Huber" <johu@gentoo.org>]

commit:     1a8cf90a2fa69ebbc1c6c5b4a814e66900360839
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri May 25 17:47:46 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri May 25 17:47:46 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=1a8cf90a

[kde-base/nepomuk] Fix file collision with nepomuk-core.

(Portage version: 2.2.0_alpha108/git/Linux x86_64, unsigned Manifest commit)

---
 kde-base/nepomuk/nepomuk-4.8.80.ebuild |   10 ++++++++++
 kde-base/nepomuk/nepomuk-9999.ebuild   |   10 ++++++++++
 2 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/kde-base/nepomuk/nepomuk-4.8.80.ebuild b/kde-base/nepomuk/nepomuk-4.8.80.ebuild
index 6ddbde4..7b31928 100644
--- a/kde-base/nepomuk/nepomuk-4.8.80.ebuild
+++ b/kde-base/nepomuk/nepomuk-4.8.80.ebuild
@@ -22,3 +22,13 @@ RDEPEND="${DEPEND}"
 
 RESTRICT="test"
 # bug 392989
+
+src_install() {
+	kde4-base_src_install
+
+	# Fix file collisions with nepomuk-core
+	rm -f \
+	 "${ED}/usr/$(get_libdir)/debug/usr/$(get_libdir)/libnepomukcommon.so.debug" \
+	 || die
+	rm -f "${ED}/usr/$(get_libdir)/libnepomukcommon.so" || die
+}

diff --git a/kde-base/nepomuk/nepomuk-9999.ebuild b/kde-base/nepomuk/nepomuk-9999.ebuild
index 1c5592c..121af95 100644
--- a/kde-base/nepomuk/nepomuk-9999.ebuild
+++ b/kde-base/nepomuk/nepomuk-9999.ebuild
@@ -22,3 +22,13 @@ RDEPEND="${DEPEND}"
 
 RESTRICT="test"
 # bug 392989
+
+src_install() {
+	kde4-base_src_install
+
+	# Fix file collisions with nepomuk-core
+	rm -f \
+	 "${ED}/usr/$(get_libdir)/debug/usr/$(get_libdir)/libnepomukcommon.so.debug" \
+	 || die
+	rm -f "${ED}/usr/$(get_libdir)/libnepomukcommon.so" || die
+}