summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngmar Vanhassel <ingmar@gentoo.org>2008-02-17 03:25:58 +0000
committerIngmar Vanhassel <ingmar@gentoo.org>2008-02-17 03:25:58 +0000
commit962132a650d2ad6365ee01f79a77fa32f049f1f6 (patch)
tree2434b4ba4132f0e715d611d358349e4bb4523a72
parentSpring cleaning. (diff)
downloadgentoo-2-962132a650d2ad6365ee01f79a77fa32f049f1f6.tar.gz
gentoo-2-962132a650d2ad6365ee01f79a77fa32f049f1f6.tar.bz2
gentoo-2-962132a650d2ad6365ee01f79a77fa32f049f1f6.zip
Spring cleaning.
(Portage version: 2.1.4.4)
-rw-r--r--kde-base/krunner/ChangeLog7
-rw-r--r--kde-base/krunner/files/krunner-4.0.0-linkage.patch22
-rw-r--r--kde-base/krunner/files/krunner-4.0.0-opengl.patch23
-rw-r--r--kde-base/krunner/krunner-4.0.0.ebuild46
4 files changed, 6 insertions, 92 deletions
diff --git a/kde-base/krunner/ChangeLog b/kde-base/krunner/ChangeLog
index c65190199458..90d0e0212ad2 100644
--- a/kde-base/krunner/ChangeLog
+++ b/kde-base/krunner/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for kde-base/krunner
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/ChangeLog,v 1.4 2008/02/16 11:10:42 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/ChangeLog,v 1.5 2008/02/17 03:25:57 ingmar Exp $
+
+ 17 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+ -files/krunner-4.0.0-linkage.patch, -files/krunner-4.0.0-opengl.patch,
+ -krunner-4.0.0.ebuild:
+ Spring cleaning
*krunner-4.0.1-r1 (16 Feb 2008)
diff --git a/kde-base/krunner/files/krunner-4.0.0-linkage.patch b/kde-base/krunner/files/krunner-4.0.0-linkage.patch
deleted file mode 100644
index 1cb90a92bb72..000000000000
--- a/kde-base/krunner/files/krunner-4.0.0-linkage.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 4f68e8ffcb5adfc2f020f2cc58cbf0aa92e8be18
-Author: Ingmar Vanhassel <ingmar.vanhassel@gmail.com>
-Date: Wed Jan 9 23:35:56 2008 +0100
-
- Fix linkage in krunner.
----
- kdebase/workspace/krunner/CMakeLists.txt | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/kdebase/workspace/krunner/CMakeLists.txt b/kdebase/workspace/krunner/CMakeLists.txt
-index 732496e..422bea8 100644
---- a/kdebase/workspace/krunner/CMakeLists.txt
-+++ b/kdebase/workspace/krunner/CMakeLists.txt
-@@ -40,7 +40,7 @@ kde4_add_ui_files(krunner_SRCS runners/shell/shellOptions.ui)
- kde4_add_kdeinit_executable(krunner ${krunner_SRCS})
- # needs qt3support for Q3ListView in lockdlg
- target_link_libraries(kdeinit_krunner plasma kworkspace processui ${KDE4_THREADWEAVER_LIBRARIES} ${X11_Xrender_LIB} ${KDE4_KDEUI_LIBS}
--${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBRARY} )
-+${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBRARY} ${KDE4_KIO_LIBS} )
- if(X11_Xss_LIB)
- target_link_libraries(kdeinit_krunner ${X11_Xss_LIB})
- endif(X11_Xss_LIB)
diff --git a/kde-base/krunner/files/krunner-4.0.0-opengl.patch b/kde-base/krunner/files/krunner-4.0.0-opengl.patch
deleted file mode 100644
index 7ab619e561ae..000000000000
--- a/kde-base/krunner/files/krunner-4.0.0-opengl.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- workspace/CMakeLists.txt (revision 767202)
-+++ workspace/CMakeLists.txt (working copy)
-@@ -16,8 +16,6 @@
- include (MacroLibrary)
- include (KDE4Defaults)
-
--macro_optional_find_package(OpenGL)
--
- include(ConfigureChecks.cmake)
- configure_file(config-unix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-unix.h )
- configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h )
---- workspace/krunner/lock/CMakeLists.txt (revision 766878)
-+++ workspace/krunner/lock/CMakeLists.txt (working copy)
-@@ -5,7 +5,9 @@
- ########### next target ###############
-
- check_library_exists(Xxf86misc XF86MiscSetGrabKeysState "" HAVE_XF86MISCSETGRABKEYSSTATE)
-+if(WITH_OpenGL)
- check_library_exists(GL glXChooseVisual "" HAVE_GLXCHOOSEVISUAL)
-+endif(WITH_OpenGL)
-
- configure_file(config-krunner-lock.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-krunner-lock.h)
-
diff --git a/kde-base/krunner/krunner-4.0.0.ebuild b/kde-base/krunner/krunner-4.0.0.ebuild
deleted file mode 100644
index 312f85dfb7b7..000000000000
--- a/kde-base/krunner/krunner-4.0.0.ebuild
+++ /dev/null
@@ -1,46 +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/krunner/krunner-4.0.0.ebuild,v 1.2 2008/01/27 15:21:21 zlin Exp $
-
-EAPI="1"
-
-KMNAME=kdebase-workspace
-inherit kde4-meta
-
-DESCRIPTION="KDE Command Runner"
-IUSE="debug opengl xcomposite xscreensaver"
-KEYWORDS="~amd64 ~x86"
-
-COMMONDEPEND="
- >=kde-base/ksmserver-${PV}:${SLOT}
- >=kde-base/ksysguard-${PV}:${SLOT}
- >=kde-base/libkworkspace-${PV}:${SLOT}
- >=kde-base/libplasma-${PV}:${SLOT}
- >=kde-base/plasma-${PV}:${SLOT}
- x11-libs/libXxf86misc
- opengl? ( virtual/opengl )
- xcomposite? ( x11-libs/libXcomposite )"
-DEPEND="${COMMONDEPEND}
- x11-proto/xf86miscproto
- xcomposite? ( x11-proto/compositeproto )"
-RDEPEND="${COMMONDEPEND}
- >=kde-base/kdebase-data-${PV}:${SLOT}"
-
-KMEXTRACTONLY="
- libs/kdm/
- libs/ksysguard/
- libs/kworkspace/
- kcontrol/
- ksysguard/
- ksmserver/org.kde.KSMServerInterface.xml
- kcheckpass/"
-
-PATCHES="${FILESDIR}/${P}-linkage.patch
- ${FILESDIR}/${P}-opengl.patch"
-
-src_compile() {
- mycmakeargs="${mycmakeargs}
- $(cmake-utils_use_with opengl OpenGL)
- $(cmake-utils_use_with xcomposite X11_Xcomposite)"
- kde4-meta_src_compile
-}