Remove old.

(Portage version: 2.2.0_alpha124/cvs/Linux x86_64)

3 files changed, 6 insertions, 111 deletions

diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index abed467059d9..2fc1a12e702f 100644
--- a/kde-base/kwin/ChangeLog
+++ b/kde-base/kwin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kwin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.288 2012/09/03 13:29:34 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.289 2012/09/03 14:24:57 johu Exp $
+
+  03 Sep 2012; Johannes Huber <johu@gentoo.org>
+  -files/kwin-4.4.2-xinerama_cmake_automagic.patch,
+  -files/kwin-4.8.1-fix-opengl-disabled-build.patch:
+  Remove old.
 
   03 Sep 2012; Johannes Huber <johu@gentoo.org> -kwin-4.7.4.ebuild:
   Remove KDE SC 4.7.4
@@ -1100,4 +1105,3 @@
   +kwin-3.4.0_beta1.ebuild:
   Adding the split ebuilds to portage. For KDE 3.4, we've created separate
   ebuilds for all the KDE apps.
-
diff --git a/kde-base/kwin/files/kwin-4.4.2-xinerama_cmake_automagic.patch b/kde-base/kwin/files/kwin-4.4.2-xinerama_cmake_automagic.patch
deleted file mode 100644
index 5596f415d848..000000000000
--- a/kde-base/kwin/files/kwin-4.4.2-xinerama_cmake_automagic.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -r -u kdebase-workspace-4.4.2-orig/ConfigureChecks.cmake kdebase-workspace-4.4.2/ConfigureChecks.cmake
---- kdebase-workspace-4.4.2-orig/ConfigureChecks.cmake	2009-11-21 10:44:36.000000000 +0100
-+++ kdebase-workspace-4.4.2/ConfigureChecks.cmake	2010-04-02 00:04:32.000000000 +0200
-@@ -71,7 +71,14 @@
- macro_bool_to_01(X11_Xcursor_FOUND HAVE_XCURSOR) # many uses
- macro_bool_to_01(X11_Xdamage_FOUND HAVE_XDAMAGE) # kwin
- macro_bool_to_01(X11_Xfixes_FOUND HAVE_XFIXES) # klipper, kicker, kwin
-+
-+if(NOT WITH_X11_Xinerama)
-+  set(X11_Xinerama_FOUND FALSE)
-+  MESSAGE(STATUS "Disabling Xinerama as requested on commandline.")
-+endif(NOT WITH_X11_Xinerama)
-+
- macro_bool_to_01(X11_Xinerama_FOUND HAVE_XINERAMA)
-+
- macro_bool_to_01(X11_Xrandr_FOUND HAVE_XRANDR) # kwin
- macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER) # kcontrol/style, kicker
- macro_bool_to_01(X11_xf86misc_FOUND HAVE_XF86MISC) # kdesktop and kcontrol/lock
diff --git a/kde-base/kwin/files/kwin-4.8.1-fix-opengl-disabled-build.patch b/kde-base/kwin/files/kwin-4.8.1-fix-opengl-disabled-build.patch
deleted file mode 100644
index a44ee077a93c..000000000000
--- a/kde-base/kwin/files/kwin-4.8.1-fix-opengl-disabled-build.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 1554ba408633397066d31c3d565c217b5a385fb8 Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@astralcloak.net>
-Date: Sun, 15 Apr 2012 04:55:03 +1000
-Subject: [PATCH] Fix KWin build failure when OpenGL is disabled and OpenGLES
- is enabled.
-
-Some old restructuring caused -DKWIN_HAVE_OPENGLES to no longer be
-passed to the compiler, causing OpenGL-specific code to be built
-while the libraries to link it were not available.
-
-REVIEW: 104558
----
- kwin/effects/CMakeLists.txt                 |    4 ++--
- kwin/kcmkwin/kwincompositing/CMakeLists.txt |    8 ++++----
- kwin/kcmkwin/kwinscreenedges/CMakeLists.txt |    8 ++++----
- 3 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/kwin/effects/CMakeLists.txt b/kwin/effects/CMakeLists.txt
-index a9eea1d..88c8b32 100644
---- a/kwin/effects/CMakeLists.txt
-+++ b/kwin/effects/CMakeLists.txt
-@@ -113,9 +113,9 @@ if( NOT KWIN_MOBILE_EFFECTS )
-     include( windowgeometry/CMakeLists.txt )
-     include( zoom/CMakeLists.txt )
- 
--    if( NOT KWIN_HAVE_OPENGLES_COMPOSITING )
-+    if( NOT OPENGLES_FOUND )
-     include( logout/CMakeLists.txt )
--    endif( NOT KWIN_HAVE_OPENGLES_COMPOSITING )
-+    endif( NOT OPENGLES_FOUND )
- endif( NOT KWIN_MOBILE_EFFECTS )
- 
- # OpenGL-specific effects
-diff --git a/kwin/kcmkwin/kwincompositing/CMakeLists.txt b/kwin/kcmkwin/kwincompositing/CMakeLists.txt
-index 2d420c0..decc6b7 100644
---- a/kwin/kcmkwin/kwincompositing/CMakeLists.txt
-+++ b/kwin/kcmkwin/kwincompositing/CMakeLists.txt
-@@ -18,7 +18,7 @@ target_link_libraries(kcm_kwincompositing ${KDE4_KCMUTILS_LIBS} ${KDE4_KDEUI_LIB
- install(TARGETS kcm_kwincompositing  DESTINATION ${PLUGIN_INSTALL_DIR} )
- 
- # CompositingPrefs uses OpenGL
--if(OPENGL_FOUND AND NOT KWIN_HAVE_OPENGLES_COMPOSITING)
-+if(OPENGL_FOUND)
-   target_link_libraries(kcm_kwincompositing kwinglutils ${OPENGL_gl_LIBRARY})
-   set_target_properties(kcm_kwincompositing PROPERTIES COMPILE_FLAGS -DKWIN_HAVE_OPENGL)
-   # -ldl used by OpenGL code
-@@ -26,11 +26,11 @@ if(OPENGL_FOUND AND NOT KWIN_HAVE_OPENGLES_COMPOSITING)
-   if (DL_LIBRARY)
-     target_link_libraries(kcm_kwincompositing ${DL_LIBRARY})
-   endif(DL_LIBRARY)
--endif(OPENGL_FOUND AND NOT KWIN_HAVE_OPENGLES_COMPOSITING)
--if(KWIN_HAVE_OPENGLES_COMPOSITING)
-+endif(OPENGL_FOUND)
-+if(OPENGLES_FOUND)
-   target_link_libraries(kcm_kwincompositing kwinglesutils ${OPENGLES_LIBRARIES})
-   set_target_properties(kcm_kwincompositing PROPERTIES COMPILE_FLAGS "-DKWIN_HAVE_OPENGL -DKWIN_HAVE_OPENGLES")
--endif(KWIN_HAVE_OPENGLES_COMPOSITING)
-+endif(OPENGLES_FOUND)
- if (X11_Xrender_FOUND)
-   target_link_libraries(kcm_kwincompositing ${X11_Xrender_LIB})
- endif (X11_Xrender_FOUND)
-diff --git a/kwin/kcmkwin/kwinscreenedges/CMakeLists.txt b/kwin/kcmkwin/kwinscreenedges/CMakeLists.txt
-index 2827350..cecff7c 100644
---- a/kwin/kcmkwin/kwinscreenedges/CMakeLists.txt
-+++ b/kwin/kcmkwin/kwinscreenedges/CMakeLists.txt
-@@ -14,7 +14,7 @@ target_link_libraries( kcm_kwinscreenedges ${X11_LIBRARIES} kworkspace ${KDE4_PL
- install( TARGETS kcm_kwinscreenedges  DESTINATION ${PLUGIN_INSTALL_DIR} )
- 
- # CompositingPrefs uses OpenGL
--if( OPENGL_FOUND AND NOT KWIN_HAVE_OPENGLES_COMPOSITING )
-+if( OPENGL_FOUND )
-   target_link_libraries( kcm_kwinscreenedges kwinglutils ${OPENGL_gl_LIBRARY} )
-   set_target_properties(kcm_kwinscreenedges PROPERTIES COMPILE_FLAGS -DKWIN_HAVE_OPENGL)
- # -ldl used by OpenGL code
-@@ -22,11 +22,11 @@ if( OPENGL_FOUND AND NOT KWIN_HAVE_OPENGLES_COMPOSITING )
-   if( DL_LIBRARY )
-     target_link_libraries( kcm_kwinscreenedges ${DL_LIBRARY} )
-   endif( DL_LIBRARY )
--endif( OPENGL_FOUND AND NOT KWIN_HAVE_OPENGLES_COMPOSITING )
--if(KWIN_HAVE_OPENGLES_COMPOSITING)
-+endif( OPENGL_FOUND )
-+if(OPENGLES_FOUND)
-   target_link_libraries(kcm_kwinscreenedges kwinglesutils ${OPENGLES_LIBRARIES})
-   set_target_properties(kcm_kwinscreenedges PROPERTIES COMPILE_FLAGS "-DKWIN_HAVE_OPENGL -DKWIN_HAVE_OPENGLES")
--endif(KWIN_HAVE_OPENGLES_COMPOSITING)
-+endif(OPENGLES_FOUND)
- if( X11_Xrender_FOUND )
-   target_link_libraries( kcm_kwinscreenedges ${X11_Xrender_LIB} )
- endif( X11_Xrender_FOUND )
--- 
-1.7.10
\ No newline at end of file