Add upstream patch to fix build. Patch will be included in KDE SC 4.11.3. kde-base/libkdegames was required in configure phase, but not needed at build and runtime, fixes bug #486828.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)

3 files changed, 54 insertions, 2 deletions

diff --git a/kde-base/libkmahjongg/ChangeLog b/kde-base/libkmahjongg/ChangeLog
index bad3444e2e3e..2b9caefc53e9 100644
--- a/kde-base/libkmahjongg/ChangeLog
+++ b/kde-base/libkmahjongg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/libkmahjongg
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkmahjongg/ChangeLog,v 1.178 2013/10/10 01:27:12 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkmahjongg/ChangeLog,v 1.179 2013/10/20 19:16:21 johu Exp $
+
+  20 Oct 2013; Johannes Huber <johu@gentoo.org>
+  +files/libkmahjongg-4.11.2-no-need-libkdegames.patch,
+  libkmahjongg-4.11.2.ebuild:
+  Add upstream patch to fix build. Patch will be included in KDE SC 4.11.3. kde-
+  base/libkdegames was required in configure phase, but not needed at build and
+  runtime, fixes bug #486828.
 
   10 Oct 2013; Chris Reffett <creffett@gentoo.org> -libkmahjongg-4.11.1.ebuild:
   Drop KDE SC 4.11.1
diff --git a/kde-base/libkmahjongg/files/libkmahjongg-4.11.2-no-need-libkdegames.patch b/kde-base/libkmahjongg/files/libkmahjongg-4.11.2-no-need-libkdegames.patch
new file mode 100644
index 000000000000..ba50fc515274
--- /dev/null
+++ b/kde-base/libkmahjongg/files/libkmahjongg-4.11.2-no-need-libkdegames.patch
@@ -0,0 +1,43 @@
+commit ee0f8f32417138e26d06f1c99cee84c2c8246f83
+Author: Johannes Huber <johu@gentoo.org>
+Date:   Sun Oct 20 20:05:12 2013 +0200
+
+    Drop unneeded configure check on libkdegames
+    
+    It is not needed for build and runtime.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b93bcc1..8db109d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,15 +1,12 @@
+ project(libkmahjongg)
+ 
+-if(NOT COMPILING_KDEGAMES)
+-	find_package(KDE4 REQUIRED)
+-	include(KDE4Defaults)
+-	include(MacroLibrary)
+-	find_package(KDEGames REQUIRED)
++find_package(KDE4 REQUIRED)
++include(KDE4Defaults)
++include(MacroLibrary)
+ 
+-	add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+-	add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
+-	include_directories(${KDE4_INCLUDES} ${CMAKE_SOURCE_DIR}/includes)
+-endif(NOT COMPILING_KDEGAMES)
++add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
++add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
++include_directories(${KDE4_INCLUDES} ${CMAKE_SOURCE_DIR}/includes)
+ 
+ add_subdirectory( tilesets ) 
+ add_subdirectory( backgrounds ) 
+@@ -27,7 +24,7 @@ kde4_add_ui_files(kmahjongg_LIB_SRCS kmahjonggtilesetselector.ui kmahjonggbackgr
+ 
+ kde4_add_library(kmahjongglib SHARED ${kmahjongg_LIB_SRCS})
+ 
+-target_link_libraries(kmahjongglib kdegames ${KDE4_KDEUI_LIBS})
++target_link_libraries(kmahjongglib ${KDE4_KDEUI_LIBS})
+ 
+ set_target_properties(kmahjongglib PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ 
diff --git a/kde-base/libkmahjongg/libkmahjongg-4.11.2.ebuild b/kde-base/libkmahjongg/libkmahjongg-4.11.2.ebuild
index 0633f3351a6d..59ee60973e29 100644
--- a/kde-base/libkmahjongg/libkmahjongg-4.11.2.ebuild
+++ b/kde-base/libkmahjongg/libkmahjongg-4.11.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkmahjongg/libkmahjongg-4.11.2.ebuild,v 1.1 2013/10/09 23:04:28 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkmahjongg/libkmahjongg-4.11.2.ebuild,v 1.2 2013/10/20 19:16:21 johu Exp $
 
 EAPI=5
 
@@ -9,3 +9,5 @@ inherit kde4-base
 DESCRIPTION="LibKMahjongg for KDE"
 KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
+
+PATCHES=( "${FILESDIR}/${P}-no-need-libkdegames.patch" )