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

[Johannes Huber]

commit:     5f82bf876da2ee46e45806b94360fe704f0c947b
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed May 30 14:45:13 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed May 30 14:45:13 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5f82bf87

[kde-base/kdelibs] Remove custom file collision handling.

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

---
 kde-base/kdelibs/kdelibs-4.8.80.ebuild |    4 ----
 kde-base/kdelibs/kdelibs-9999.ebuild   |    4 ----
 2 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/kde-base/kdelibs/kdelibs-4.8.80.ebuild b/kde-base/kdelibs/kdelibs-4.8.80.ebuild
index 47f65f3..b01bb2b 100644
--- a/kde-base/kdelibs/kdelibs-4.8.80.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.8.80.ebuild
@@ -278,10 +278,6 @@ src_install() {
 	echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde"
 	echo "QT_PLUGIN_PATH=${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" || die
 }
 
 pkg_postinst() {

diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild
index 9417cf1..e744a19 100644
--- a/kde-base/kdelibs/kdelibs-9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-9999.ebuild
@@ -278,10 +278,6 @@ src_install() {
 	echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde"
 	echo "QT_PLUGIN_PATH=${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" || die
 }
 
 pkg_postinst() {