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.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

4 files changed, 65 insertions, 10 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/Manifest b/kde-base/libkmahjongg/Manifest
index 15e0dabf4e5f..5d8748d07127 100644
--- a/kde-base/libkmahjongg/Manifest
+++ b/kde-base/libkmahjongg/Manifest
@@ -1,18 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX libkmahjongg-4.11.2-no-need-libkdegames.patch 1506 SHA256 71a50394c3713d883872e9afdef4f9914507a1d801051b28a0a84b0e5902ce68 SHA512 9f578b95cf995b5666e175cfd0d9e8abdd880fb1c5db86cf1355a57eec789ce39090f77171afe0bdfe3583befb0ec456a7687a61063ef1166b910f254aa96134 WHIRLPOOL d626aade5e349d5c62085de046d444192b6ea9f6f8d47f2c3f4b3e1bea64bcadf49c4da9aa88cf092ef4681ef1bfcc2b94a1dbfb31721342bb81b5acb89e74d0
 DIST libkmahjongg-4.10.5.tar.xz 1675132 SHA256 c444268da143d540585bdf52ec28db4236e09d7801deea873db9f4aedef4171b SHA512 43e2944963acccbda7cfddcf6bd262be5002369c7fa7b3e2916c5f07846c23aef96aa6584920ed09827900ab2e1cb6281d30f78129f28827bd1cb940d5be9806 WHIRLPOOL 8ad08e40a170a342f1a2d5daa24c30c32c07fe31ddc9a36a276c108bb643873a0fd7370eac957b1ea859ccbe5eeb6b985192bfa5563e25a0c785c4d7c0e7cdb1
 DIST libkmahjongg-4.11.2.tar.xz 1675064 SHA256 5031415e54116d5b760eed720fb426f23f20d56b36d9d93379f2dffc7cfb8fe8 SHA512 cf891cac5e26d75431fb5b73e470ea52983f285fb90d6de816d8e017e54a349db171220f8a24a1a5506f43168576b6d412a1cae706f910c7f317c4325229ac54 WHIRLPOOL 888849b8e4ec0ed8415e29c5d88c44afd992c83171316c4f529695a846d256eb87dfad8128140fb41e1dd12410186c927b8c4a493070d1f9028c3b33cb5da75c
 EBUILD libkmahjongg-4.10.5.ebuild 389 SHA256 e822f50e27f3eed10151afb27932db698402d7edac1b3ae7c9b6dfad71da2a64 SHA512 cde047725042df8a210fad76757e061cb7295417b90eb00e2ea674762bc5532413913a6bf87341848b96098b299b1ae446f7580590e1e5e203d4edfa276f6859 WHIRLPOOL 1dcf738804da1448423ff6c8f4bcdd8d4fdd47833386704b63ce50c41d7537c48641ecd5ff5f2f96a09d854975ab3131d6997f55d93a0d91a0689976f667d7d6
-EBUILD libkmahjongg-4.11.2.ebuild 373 SHA256 402fd5d16d21717519c96fdc1859c338a427090dbe3c1d407b79a45a5e68945d SHA512 49761b866b7fdd052a05e1849461713fe567a43ab3c3e92f105bf8d932fb0cf33dab4a2cddfb361da17a5a179269a74b15bf9123d6e55d0f303439a424098cfb WHIRLPOOL 64f834233de44e8c2d67c32f17faed2fb446a10dba3645673e3f4ea152726c045c0e74c6596615a5baca0d5cd00d83e4f41d3af365fc4bd018d7e411679ec6d5
-MISC ChangeLog 22435 SHA256 4f44ef858ad92ecf2b0259d5317dd4552cdcbe26c9ba29e41b26b271fb669078 SHA512 0024740ff6b2b9ecb1bd2fe75497c757aaf3eb4d4d13d96fd208399dcc7aa34acaf2107faf4857400f58ec2ba3366bc533c1eb7ffd02234306d7823ab218088c WHIRLPOOL de505da22a5acfc1520cc9d19bfb2361b184087aa4fa2846cbc6d5893b6c12e0da4ea97350cea7ae7c44cd11a5baa5cca0ec128a1d2c6a387877c6ecdf7aca33
+EBUILD libkmahjongg-4.11.2.ebuild 427 SHA256 0d679c989d790018fbd4ad04d074bd529fbcf950af02a7b8e2bd37e2bb11b811 SHA512 e59b9fd413e9e503c391e29e1514052ea0ea4e0bb7ba7aa4c137e4d9dba366de0679ee580318605e7e75bb25d5eab30b5a7baa2a296a7d57648d723ea8bb25d9 WHIRLPOOL d11e0bb7aecdcaedb534a5cfe3af42cef3fd1eed5268ed2fa7f35ac7b4d91050b4eacb5218381b54853ce86145e9bc03e3dec0971c62b476fd460e81e6633a70
+MISC ChangeLog 22757 SHA256 cb67686703cd1a9e1a1c69f55872c466d67436b7eae47ca18603dae9a0506b26 SHA512 7c06085fe837db88dea17f9d81a9f30135c1a9a1929a365624d983131c565c677f9fe30d794f030d4c7dd03da612dfed27bd08a723ad1dcfd161dc1fdf2689db WHIRLPOOL 65a835a99ed01be49500f3c014af287c76aac5858e87398a45e3e5789011e131547c7f31d52b8bd85716b69b7ffda5bc54cd1fc20347351adb859f11356f7230
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iKYEAREIAGYFAlJWAndfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2NzU5RjUyMDczREJDQkVDQTBDRkE1NERC
-Nzk1QThBNDI2MTgzNTQACgkQ23laikJhg1ReawCeKi3qEh9fJTNvxla4Lv4Rw6X7
-PiEAoIv80HJYYYyEA1K0ydYVnk4dlXOV
-=UTxa
+iQEcBAEBCAAGBQJSZCwJAAoJEO+t9ga+3I3atYIH/iEmxaNSl/fifkgWKU38yVTN
+WMQGNL7fRxpepTuUqnAUmN8Lx1fyIfDhCHHW1B+Vo0lFoTqqb9GYeNxrNm7gUNV1
+nBGU6eqmpCO1my00RY5ZgS6TpmFQNuqgiaLkj3QZaY4HcNBgBYiWszD/dFgTxr3l
++GbxqLbySBU1657AIqNiSqYeW3QAhLNdK5D3qlNrf5WFTeenGYT4CsT20L81EOcb
+4SxMSbee/GS14CzFIPOJGiQ6DHSBeRPumF2NfNdXA2R1GVDCzX09iaDXGHlW3hKe
+bPWx3Dhu3E5AE/5fyTD6a/GbbfED8MU3DMOSMXMc7fTp8j3UU/WJsIBP6yviJyM=
+=E5tC
 -----END PGP SIGNATURE-----
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" )