Remove old.

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

4 files changed, 6 insertions, 138 deletions

diff --git a/kde-base/marble/ChangeLog b/kde-base/marble/ChangeLog
index 2cd2b635722a..52b985f54552 100644
--- a/kde-base/marble/ChangeLog
+++ b/kde-base/marble/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/marble
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.155 2012/09/03 13:29:28 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.156 2012/09/03 14:31:26 johu Exp $
+
+  03 Sep 2012; Johannes Huber <johu@gentoo.org>
+  -files/marble-4.7-magic-r1.patch, -files/marble-4.8.0-lower-qt48.patch,
+  -files/marble-4.8.0-qt48.patch:
+  Remove old.
 
   03 Sep 2012; Johannes Huber <johu@gentoo.org> -marble-4.7.4.ebuild:
   Remove KDE SC 4.7.4
diff --git a/kde-base/marble/files/marble-4.7-magic-r1.patch b/kde-base/marble/files/marble-4.7-magic-r1.patch
deleted file mode 100644
index 2249884b5ca7..000000000000
--- a/kde-base/marble/files/marble-4.7-magic-r1.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ruN marble-4.7.0.orig/CMakeLists.txt marble-4.7.0/CMakeLists.txt
---- marble-4.7.0.orig/CMakeLists.txt	2011-06-22 16:53:54.000000000 +0200
-+++ marble-4.7.0/CMakeLists.txt	2011-07-31 20:20:44.000000000 +0200
-@@ -38,7 +38,7 @@
-   "Experimental Python binding support for the Marble library. To activate it pass -DEXPERIMENTAL_PYTHON_BINDINGS=TRUE to cmake.")
- endif()
- 
--if(EXPERIMENTAL_PYTHON_BINDINGS)
-+if(NOT QTONLY AND EXPERIMENTAL_PYTHON_BINDINGS)
-     macro_optional_find_package(PythonLibrary)
- 
-     macro_optional_find_package(SIP)
-diff -ruN marble-4.7.0.orig/src/plugins/positionprovider/CMakeLists.txt marble-4.7.0/src/plugins/positionprovider/CMakeLists.txt
---- marble-4.7.0.orig/src/plugins/positionprovider/CMakeLists.txt	2011-07-07 16:05:38.000000000 +0200
-+++ marble-4.7.0/src/plugins/positionprovider/CMakeLists.txt	2011-07-31 20:16:08.000000000 +0200
-@@ -1,3 +1,7 @@
-+# we cannot use macro_optional_find_package here, because we want to be
-+# able to build without kde support
-+
-+IF(WITH_libgps)
- FIND_PACKAGE(libgps)
- IF(LIBGPS_FOUND)
-      MESSAGE( STATUS "Building with gpsd position provider")
-@@ -5,12 +9,19 @@
- ELSE(LIBGPS_FOUND)
-      MESSAGE( STATUS "Not building with gpsd position provider")
- ENDIF(LIBGPS_FOUND)
-+ELSE(WITH_libgps)
-+     SET(LIBGPS_FOUND 0)
-+ENDIF(WITH_libgps)
- 
-+IF(WITH_liblocation)
- FIND_PACKAGE(liblocation)
- IF(liblocation_FOUND)
-      MESSAGE( STATUS "Building with Maemo GPS support")
-      ADD_SUBDIRECTORY( maemo )
- ENDIF(liblocation_FOUND)
-+ELSE(WITH_liblocation)
-+     SET(liblocation_FOUND 0)
-+ENDIF(WITH_liblocation)
- 
- FIND_PACKAGE(QtLocation)
- IF(QTLOCATION_FOUND)
-@@ -19,4 +30,4 @@
- ENDIF(QTLOCATION_FOUND)
- 
- # experimental implementation
--# ADD_SUBDIRECTORY( geoclue )
-\ Kein Zeilenumbruch am Dateiende.
-+# ADD_SUBDIRECTORY( geoclue )
diff --git a/kde-base/marble/files/marble-4.8.0-lower-qt48.patch b/kde-base/marble/files/marble-4.8.0-lower-qt48.patch
deleted file mode 100644
index 9febadeccc4a..000000000000
--- a/kde-base/marble/files/marble-4.8.0-lower-qt48.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit b89ff577fcbd085fbd180f59aa669dded1818082
-Author: Bernhard Beschow <bbeschow@cs.tu-berlin.de>
-Date:   Wed Feb 8 18:14:59 2012 +0100
-
-    compile with Qt < 4.8
-    
-    * take into account the comment in the API doc, which suggests to use QColor::rgb()
-    (cherry picked from commit 6eafb31f509c622e2672c31b73ebcb1b3dafb3e9)
-
-diff --git a/src/lib/TextureColorizer.cpp b/src/lib/TextureColorizer.cpp
-index d0deead..9319a89 100644
---- a/src/lib/TextureColorizer.cpp
-+++ b/src/lib/TextureColorizer.cpp
-@@ -176,7 +176,7 @@ void TextureColorizer::colorize( QImage *origimg, const ViewportParams *viewport
-         m_coastImage = QImage( viewport->size(), QImage::Format_RGB32 );
- 
-     // update coast image
--    m_coastImage.fill( QColor( 0, 0, 255, 0) );
-+    m_coastImage.fill( QColor( 0, 0, 255, 0).rgb() );
- 
-     bool doClip = false; //assume false
-     switch( viewport->projection() ) {
diff --git a/kde-base/marble/files/marble-4.8.0-qt48.patch b/kde-base/marble/files/marble-4.8.0-qt48.patch
deleted file mode 100644
index 5e88fc4b4212..000000000000
--- a/kde-base/marble/files/marble-4.8.0-qt48.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-commit 79c39f45468bace95169d1ba959884ce27087d1e
-Author: Torsten Rahn <rahn@kde.org>
-Date:   Wed Feb 8 17:18:15 2012 +0100
-
-    Fixes for Marble with Qt 4.8:
-    
-    - Provide proper colors for Marble's Atlas, Temperature,
-      Precipitation and Venus/Mars Topography maps.
-      ( due to introduction of QImage::fill( QColor ) overload )
-    
-    - Show proper icons for MarbleLegendBrowser
-      ( due to new interpretation of the "current directory" in
-        QTextBrowser )
-
-diff --git a/src/lib/MarbleLegendBrowser.cpp b/src/lib/MarbleLegendBrowser.cpp
-index 4a25095..ffa0a23 100644
---- a/src/lib/MarbleLegendBrowser.cpp
-+++ b/src/lib/MarbleLegendBrowser.cpp
-@@ -130,26 +130,24 @@ void MarbleLegendBrowser::loadLegend()
-     t.start();
- 
-     // Read the html string.
--    QString finalHtml;
-+    QString legendPath;
- 
-     // Check for a theme specific legend.html first
-     if ( d->m_marbleModel != 0 && d->m_marbleModel->mapTheme() != 0 )
-     {
-         GeoSceneDocument *currentMapTheme = d->m_marbleModel->mapTheme();
- 
--        QString customLegendPath = MarbleDirs::path( "maps/" + 
-+        legendPath = MarbleDirs::path( "maps/" + 
-         currentMapTheme->head()->target() + '/' + 
-         currentMapTheme->head()->theme() + "/legend.html" ); 
--        if ( !customLegendPath.isEmpty() )
--            finalHtml = readHtml( QUrl::fromLocalFile( customLegendPath  ) );
--        else
--            finalHtml.clear();
-     }
--
--    if ( finalHtml.isEmpty() ) {
--        finalHtml = readHtml( QUrl::fromLocalFile( MarbleDirs::path( "legend.html" ) ) );
-+    if ( legendPath.isEmpty() ) {
-+	legendPath = MarbleDirs::path( "legend.html" ); 
-     }
- 
-+    QString finalHtml = readHtml( QUrl::fromLocalFile( legendPath ) );
-+    finalHtml.replace( QString( "./" ), legendPath.section( '/', 0, -2 ) + '/' );
-+
-     // Generate some parts of the html from the MapTheme <Legend> tag. 
-     const QString sectionsHtml = generateSectionsHtml();
- 
-diff --git a/src/lib/TextureColorizer.cpp b/src/lib/TextureColorizer.cpp
-index 4a4f8f3..d0deead 100644
---- a/src/lib/TextureColorizer.cpp
-+++ b/src/lib/TextureColorizer.cpp
-@@ -176,7 +176,7 @@ void TextureColorizer::colorize( QImage *origimg, const ViewportParams *viewport
-         m_coastImage = QImage( viewport->size(), QImage::Format_RGB32 );
- 
-     // update coast image
--    m_coastImage.fill( Qt::transparent );
-+    m_coastImage.fill( QColor( 0, 0, 255, 0) );
- 
-     bool doClip = false; //assume false
-     switch( viewport->projection() ) {