diff options
author | Ingmar Vanhassel <ingmar@gentoo.org> | 2008-02-17 02:01:33 +0000 |
---|---|---|
committer | Ingmar Vanhassel <ingmar@gentoo.org> | 2008-02-17 02:01:33 +0000 |
commit | 0cafed3201a65eae781a887cac1ebcd410e3d22c (patch) | |
tree | 556cc293ec4d272cc52d71a24fda73c1a366e64e /kde-base/dolphin | |
parent | Version bump #209960. (diff) | |
download | gentoo-2-0cafed3201a65eae781a887cac1ebcd410e3d22c.tar.gz gentoo-2-0cafed3201a65eae781a887cac1ebcd410e3d22c.tar.bz2 gentoo-2-0cafed3201a65eae781a887cac1ebcd410e3d22c.zip |
Spring cleaning.
(Portage version: 2.1.4.4)
Diffstat (limited to 'kde-base/dolphin')
-rw-r--r-- | kde-base/dolphin/ChangeLog | 8 | ||||
-rw-r--r-- | kde-base/dolphin/dolphin-4.0.0.ebuild | 40 | ||||
-rw-r--r-- | kde-base/dolphin/files/dolphin-4.0.0-linkage.patch | 21 | ||||
-rw-r--r-- | kde-base/dolphin/files/dolphin-4.0.0-make-semantic-desktop-optional.patch | 35 |
4 files changed, 7 insertions, 97 deletions
diff --git a/kde-base/dolphin/ChangeLog b/kde-base/dolphin/ChangeLog index 29cee76188ce..60db5ebcdd21 100644 --- a/kde-base/dolphin/ChangeLog +++ b/kde-base/dolphin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-base/dolphin # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/ChangeLog,v 1.3 2008/02/07 00:10:54 philantrop Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/ChangeLog,v 1.4 2008/02/17 02:01:33 ingmar Exp $ + + 16 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> + -files/dolphin-4.0.0-linkage.patch, + -files/dolphin-4.0.0-make-semantic-desktop-optional.patch, + -dolphin-4.0.0.ebuild: + Spring cleaning *dolphin-4.0.1 (06 Feb 2008) diff --git a/kde-base/dolphin/dolphin-4.0.0.ebuild b/kde-base/dolphin/dolphin-4.0.0.ebuild deleted file mode 100644 index f0e1f48d19b8..000000000000 --- a/kde-base/dolphin/dolphin-4.0.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/dolphin-4.0.0.ebuild,v 1.1 2008/01/17 23:29:54 philantrop Exp $ - -EAPI="1" - -KMNAME=kdebase -KMMODULE=apps/${PN} -inherit kde4-meta - -DESCRIPTION="A KDE filemanager focusing on usability" -KEYWORDS="~amd64 ~x86" -IUSE="debug htmlhandbook +semantic-desktop" - -DEPEND=" - >=kde-base/libkonq-${PV}:${SLOT} - semantic-desktop? ( >=kde-base/nepomuk-${PV}:${SLOT} )" -RDEPEND="${DEPEND}" - -KMEXTRA="apps/doc/${PN}" - -# Without this patch, things don't link properly, -# unless we recompile lib/konq here too. -PATCHES=" -${FILESDIR}/${P}-linkage.patch -${FILESDIR}/${P}-make-semantic-desktop-optional.patch" - -pkg_setup() { - if use semantic-desktop; then - KDE4_BUILT_WITH_USE_CHECK="--missing false kde-base/kdelibs:${SLOT} semantic-desktop" - fi - kde4-meta_pkg_setup -} - -src_compile() { - mycmakeargs="${mycmakeargs} - $(cmake-utils_use_with semantic-desktop Nepomuk) - $(cmake-utils_use_with semantic-desktop Soprano)" - kde4-meta_src_compile -} diff --git a/kde-base/dolphin/files/dolphin-4.0.0-linkage.patch b/kde-base/dolphin/files/dolphin-4.0.0-linkage.patch deleted file mode 100644 index dabf3e76368d..000000000000 --- a/kde-base/dolphin/files/dolphin-4.0.0-linkage.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur kdebase-3.97.0/apps/dolphin/src/CMakeLists.txt kdebase-3.97.0.patched/apps/dolphin/src/CMakeLists.txt ---- kdebase-3.97.0/apps/dolphin/src/CMakeLists.txt 2007-11-20 23:01:04.000000000 +0100 -+++ kdebase-3.97.0.patched/apps/dolphin/src/CMakeLists.txt 2007-12-10 13:23:37.000000000 +0100 -@@ -59,7 +59,7 @@ - - kde4_add_plugin(dolphinpart ${dolphinpart_SRCS}) - --target_link_libraries(dolphinpart dolphinprivate) -+target_link_libraries(dolphinpart dolphinprivate ${KDE4_KPARTS_LIBS}) - - install(TARGETS dolphinpart DESTINATION ${PLUGIN_INSTALL_DIR} ) - -@@ -113,7 +113,7 @@ - dolphinmainwindow.h DolphinMainWindow) - kde4_add_executable(dolphin ${dolphin_SRCS}) - --target_link_libraries(dolphin ${KDE4_KDEPRINT_LIBS} ${KDE4_KFILE_LIBS} konq dolphinprivate) -+target_link_libraries(dolphin ${KDE4_KDEPRINT_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KPARTS_LIBS} konq dolphinprivate) - - if (Nepomuk_FOUND) - target_link_libraries(dolphin ${NEPOMUK_LIBRARIES}) diff --git a/kde-base/dolphin/files/dolphin-4.0.0-make-semantic-desktop-optional.patch b/kde-base/dolphin/files/dolphin-4.0.0-make-semantic-desktop-optional.patch deleted file mode 100644 index d9c1efb26978..000000000000 --- a/kde-base/dolphin/files/dolphin-4.0.0-make-semantic-desktop-optional.patch +++ /dev/null @@ -1,35 +0,0 @@ -commit b5a2927b633d2ad357febe13efc717b02f04a5ba -Author: Ingmar Vanhassel <ingmar.vanhassel@gmail.com> -Date: Sat Jan 12 15:28:44 2008 +0100 - - Make Nepomuk & Soprano optional dependencies. - Move the macro_optional_find_package({nepomuk,soprano}) statements before checking the results.r ---- - kdebase/apps/dolphin/src/CMakeLists.txt | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/kdebase/apps/dolphin/src/CMakeLists.txt b/kdebase/apps/dolphin/src/CMakeLists.txt -index f9902dc..c379e95 100644 ---- a/kdebase/apps/dolphin/src/CMakeLists.txt -+++ b/kdebase/apps/dolphin/src/CMakeLists.txt -@@ -1,3 +1,8 @@ -+macro_optional_find_package(Nepomuk) -+macro_optional_find_package(Soprano) -+macro_bool_to_01(Nepomuk_FOUND HAVE_NEPOMUK) -+ -+configure_file(config-nepomuk.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-nepomuk.h ) - - add_subdirectory( pics ) - add_subdirectory( tests ) -@@ -40,11 +45,6 @@ kde4_add_kcfg_files(dolphinprivate_LIB_SRCS - - kde4_add_library(dolphinprivate SHARED ${dolphinprivate_LIB_SRCS}) - --find_package(Nepomuk) --find_package(Soprano) --macro_bool_to_01(Nepomuk_FOUND HAVE_NEPOMUK) -- --configure_file(config-nepomuk.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-nepomuk.h ) - - target_link_libraries(dolphinprivate ${KDE4_KFILE_LIBS} konq ${BLITZ_LIBRARIES}) - if (Nepomuk_FOUND) |