diff options
| -rw-r--r-- | kde-base/kdelibs/kdelibs-4.8.80.ebuild | 6 | ||||
| -rw-r--r-- | 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/kdelibs-4.8.80.ebuild index 0f7dfd473c1..47f65f32f17 100644 --- a/kde-base/kdelibs/kdelibs-4.8.80.ebuild +++ b/kde-base/kdelibs/kdelibs-4.8.80.ebuild @@ -111,7 +111,7 @@ PDEPEND=" >=kde-misc/polkit-kde-kcmodules-0.98_pre20101127 >=sys-auth/polkit-kde-agent-0.99 ) - semantic-desktop? ( $(add_kdebase_dep nepomuk) ) + semantic-desktop? ( $(add_kdebase_dep nepomuk-core) ) " # Force the upgrade of plasma-workspace to a version that explicitly depends on kactivities @@ -278,6 +278,10 @@ 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 c8f90971b75..9417cf16cc3 100644 --- a/kde-base/kdelibs/kdelibs-9999.ebuild +++ b/kde-base/kdelibs/kdelibs-9999.ebuild @@ -111,7 +111,7 @@ PDEPEND=" >=kde-misc/polkit-kde-kcmodules-0.98_pre20101127 >=sys-auth/polkit-kde-agent-0.99 ) - semantic-desktop? ( $(add_kdebase_dep nepomuk) ) + semantic-desktop? ( $(add_kdebase_dep nepomuk-core) ) " # Force the upgrade of plasma-workspace to a version that explicitly depends on kactivities @@ -278,6 +278,10 @@ 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() { |