Fix build for different libmm-qt versions. Thanks to Dennis Schridde. Fixes bug #493340.

Package-Manager: portage-2.2.8/cvs/Linux x86_64

5 files changed, 78 insertions, 4 deletions

diff --git a/net-im/ktp-accounts-kcm/ChangeLog b/net-im/ktp-accounts-kcm/ChangeLog
index ca71a31055db..16d0ea6b64eb 100644
--- a/net-im/ktp-accounts-kcm/ChangeLog
+++ b/net-im/ktp-accounts-kcm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/ktp-accounts-kcm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ktp-accounts-kcm/ChangeLog,v 1.21 2014/01/15 13:10:37 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ktp-accounts-kcm/ChangeLog,v 1.22 2014/01/17 22:27:29 mrueg Exp $
+
+*ktp-accounts-kcm-0.7.1-r1 (17 Jan 2014)
+
+  17 Jan 2014;  <mrueg@gentoo.org>
+  +files/ktp-accounts-kcm-0.7.1-pintxo-plugin.patch,
+  +ktp-accounts-kcm-0.7.1-r1.ebuild, ktp-accounts-kcm-0.7.1.ebuild:
+  Fix build for different libmm-qt versions. Thanks to Dennis Schridde. Fixes
+  bug #493340.
 
 *ktp-accounts-kcm-0.7.1 (15 Jan 2014)
 
diff --git a/net-im/ktp-accounts-kcm/Manifest b/net-im/ktp-accounts-kcm/Manifest
index 57175d4ae5c1..d29ed528d8c8 100644
--- a/net-im/ktp-accounts-kcm/Manifest
+++ b/net-im/ktp-accounts-kcm/Manifest
@@ -1,10 +1,12 @@
 AUX ktp-accounts-kcm-0.7.0-libmm-qt-api.patch 2304 SHA256 bbd5e9747b7c0c52083c62ea3efcfc50b9f4f6eaf74a2ce15408e4ce36cbb25d SHA512 d042b914db977f6b6db38b2403b15ad4252397f24a8dc38d34feeecc72e0de8fc9ae9ad328115d437d3d579d60f9fd25038ee84d92e40c38236cae1d58d3ee96 WHIRLPOOL a702a57138b4297cac4f1122f2bdec1ed85d84d7a4b909023e0a6e370f76a895e33b966ba9885243f8e01bc62b72a826030e2cfd2af43ec324d09fb9bd50d40e
 AUX ktp-accounts-kcm-0.7.0-libmm-qt-optional.patch 885 SHA256 807f063a58fc0c4a0337e84009ad279c40731e1926c0a722849975d0ed82cd75 SHA512 d4d5fe78225ce89b2f658da5874ef473b7494c2a4eeefc0b7b6a347a673a1ff5587cac61616dab8f57704a808cdc95b91322638dbf6bed74c0ba5e42f57caaba WHIRLPOOL 3f02c8f3d3dd1800840f6a20448d298fcc390d116e7d6c25518eee949df936225c88923d395891716d0d7b6cc809f94dcbfa1f11ec3380ebc6b9163dcf2d5e63
+AUX ktp-accounts-kcm-0.7.1-pintxo-plugin.patch 776 SHA256 e8c1f0e2ab922dd87cb68f75a4e681f2e55f6e87a4eea5d1517f1d5a81be9a51 SHA512 13a097560f7eec0695e5b706cd17666bcef034afe35aff9064ab5bea158da89b8cc4ed2f33b28ed86cd1b3449bde4166f3ae6ec57dc5e24095d081f47b6e92b6 WHIRLPOOL db23c177acb65504fa0d42569cf471721935f137535bc94a8d9a07da338ecf578d8d32690a2eb221cd05e85babda5bd363b0e64d53c96e31ede8234dd30006dc
 DIST ktp-accounts-kcm-0.6.3.tar.bz2 238738 SHA256 2a983d1fd2ce5868fec15c61ccf5d32d54598271a559195066c777aaa6c69adb SHA512 b5d5eb47c9827ab15acc9de503b514f1460d47183c3141ffc922d941e7045c1228acfd8264737af3e57ec1f252511ad2ac75a720983579463e887bf3b171a010 WHIRLPOOL e8059ab136db3cb5684cc7268b5633057443f15e49cc32095c594f88eda558c47faaf9ef9ecdfece46650cadc800f1058664d7091d609efcc27e4b160ef261b0
 DIST ktp-accounts-kcm-0.7.0.tar.bz2 247591 SHA256 5f9cb4cf71f6eb5c137f16719147ecbeaf22adee3ba2d2fcec60abb6268ee006 SHA512 e402789224c21053365ae39477ca9aaf681e2bcc982f5909999b69e88e1eef842be0a19b3ff108eabbe9413eac33e932c6f69e5a09977f1f6545596b5b29ec16 WHIRLPOOL 081743409e9be34b51c43c89fd2494f6f8c90ed6c3a97d5a7d7d762626666592ac816654f73f162bacda962616845bb6453860c8813ca4e75fd6a4b5a1915cf6
 DIST ktp-accounts-kcm-0.7.1.tar.bz2 248115 SHA256 5d0b3450c3bb1a8265199e3635bb016e5b89a293ca7ad98823bb6335ac1923d0 SHA512 d9d81780cfa333506097a27d5ea89ab444533a0531322a74399df88d53a756eb14c0fbd61c3a9927db44b01fb1d228ba2c1a8ccac241d92688c80a608c5cafaf WHIRLPOOL 0d550edb672aaedd3cbfa5a6e7ff20941523934ed5648d9428c1ccd708d3d28ff12b923816b5fd212663edd2c59ccc673a537458f5f0bb7975402f6a5e72fa31
 EBUILD ktp-accounts-kcm-0.6.3.ebuild 960 SHA256 b8dd5b0eaa0b3b8f900d5271a7e0322972b39dbd2b84807a97f4b0bef71ef603 SHA512 95d3aa93533d22b1a5cc7f4845f6f98a7792d7b9e8d2a91ec9761c6ba23d4245e3fc09e792971de9f4360243f78cb47d4cff4c57e15e12a9268942dffebdaf06 WHIRLPOOL b43ebc376746c9f8873aacb6357ae1ab5f8f625e1d009914a5dad1cae54bb48829d11811a83e26ba4a55337d42ddb26ef99e209fcb894d1dd975db5af0e3f96b
 EBUILD ktp-accounts-kcm-0.7.0.ebuild 1226 SHA256 7155dd581b9303c86ad67d998a04360eb98ac2c60dde305e411feb4d73d597b7 SHA512 800f1a5122e861883e0474bb4a77c38e1198e930abca16617cc9e422df633e892baa0555c7091f4f7a94790d671b68f4dc565b7071dc989cdd15e237942e42db WHIRLPOOL fbed476bb9c43104322315cdcf4602bf9de6652a29905abe0d25229713e8ab0f8d201dbb1474a45893e19863194227c96475d809911083567aec315b095167a9
-EBUILD ktp-accounts-kcm-0.7.1.ebuild 1131 SHA256 f2223759e27c10ec7d286c518e64a94c154f6af1102449d96edccf760b49b1cf SHA512 33a8445973f1a4cee99b690182c88c2894d7eb2ee908d5a94799d1fcebb8c7d915c477479b79c6d9a688146ccc3d9405ae3ce1c0e73ba816ca9bb86b9d0398f3 WHIRLPOOL 48db7de497abd6d818bba3f91ffac42bffae36f52095c386ffa8292fa4d4902541cdd4a37f53705877773ac6b8c6d9d34e84dc93c89b92b528eac97d27d9523e
-MISC ChangeLog 3501 SHA256 13991428c6bad8d163a4ad97cfbaa869b2b2af183128f81805fd5e331cb717de SHA512 dc0bcfb2326bb34120501ede674dc45a3bc1cc20d4e2a639d814edb58ca941b9c3a6ded51c0f2c2d661e0fb5b42dd8d94fff1e1664f69ea4c3ea1745c5924a32 WHIRLPOOL aa84076a283941e048cdf988a7a0a9c0cc535a2087d7a72f31d774addb0aeaa0c0fbc52c58555f1310333697132d67975fcc653092e916e6a2ac58e9f9a4581f
+EBUILD ktp-accounts-kcm-0.7.1-r1.ebuild 1186 SHA256 caa464f70f2818cb45f7ae717823c5879a894e7338987643a8a12125896519c3 SHA512 971561d585748fdbf8c286a66e1e76eaef3db90f6c1e2b4f2c5c5a9a2b4f153a864af4d6025424cddfc47446572d268b9abdbfae2e04d958084f0e88bbbd0b51 WHIRLPOOL e7907a72f2b4972f24393bd5f5df8919d42a14b090da40a1fa7152d058bbd59ec3c8db52cce5a8327b0e05f2d1a558ef046392be4757c2b3e35abf83cea36a2e
+EBUILD ktp-accounts-kcm-0.7.1.ebuild 1183 SHA256 842731e4e747000700537ddab1a03d6312a30635d3546f2970d579b0ad17936e SHA512 290a95e8bbceefb6c88eb48d48cfd6540477bad1f4a7248f78a270cdc2020680b73259b7066ce69b37cfe46ca9724735a433bbc42fc3bc66137f25e2a18922e6 WHIRLPOOL 641efd65b7110bad7b8d22ef9ffbaa6ec713802d18c1ab119adf16a4c60d4229075e459582a07ce176f1b138e129ee05ecd0185c88a6dbbd8e09d9f5a2c4b92d
+MISC ChangeLog 3793 SHA256 b8f9a29f6135f5a48a7b48b1b6fc383428f1d2489b14500a148d7b4d781ec066 SHA512 ad42e64f3c811a01c3cb6a94f81dea9b7ef0ea89271c77c41d44ae259d19c42874b1c83cb01b91bb4378f160d08e9a5c99616982d6f4b3f7e4b902d7d44dede8 WHIRLPOOL be2ed5f8d61e237c081dc0c65743933cd85e33c1e846b3ce88873ffb51a114325ff579503c83ee5d084f685c2879ee47a067fbcb31b4f4a6bbc5310122cf94e2
 MISC metadata.xml 251 SHA256 7d7875656c10edc58cca61fa5448e1b406a649ef807b2685d0a5f062f46a6bc2 SHA512 a50db5a1dafbf407a8daab12e39958ded6168feb4bea94365a33a0d53b0f450c11dd7e59dab399b5c3b872023609ee2ba71cf02717885ab4a6c53dfe295b73dc WHIRLPOOL 35b454b452be4433d942dd7f2ad26ac9b29086d620966a33399f9bf744b81518a2b895a7633426ea9cdf13d7294d6a0c66a04d34bb8fcb4a5ff573a8bb4ebfef
diff --git a/net-im/ktp-accounts-kcm/files/ktp-accounts-kcm-0.7.1-pintxo-plugin.patch b/net-im/ktp-accounts-kcm/files/ktp-accounts-kcm-0.7.1-pintxo-plugin.patch
new file mode 100644
index 000000000000..810f2ccbbf80
--- /dev/null
+++ b/net-im/ktp-accounts-kcm/files/ktp-accounts-kcm-0.7.1-pintxo-plugin.patch
@@ -0,0 +1,19 @@
+commit d08d4142ec75d931b364a002c8eaae91223f1ac5
+Author: Anant Kamath <kamathanant@gmail.com>
+Date:   Sat Dec 7 19:06:33 2013 +0530
+
+    Build pintxo plugin only if MMQt 0.5.1 is found, higher/lower versions break the plugin
+
+diff --git a/plugins/pintxo/CMakeLists.txt b/plugins/pintxo/CMakeLists.txt
+index aeb5b62..ba74b84 100644
+--- a/plugins/pintxo/CMakeLists.txt
++++ b/plugins/pintxo/CMakeLists.txt
+@@ -2,7 +2,7 @@ project (ktpaccountskcm-plugin-pintxo)
+ 
+ INCLUDE(FindPkgConfig)
+ 
+-pkg_check_modules(LIBMODEMMANAGERQT ModemManagerQt>=0.5.1)
++pkg_check_modules(LIBMODEMMANAGERQT ModemManagerQt=0.5.1)
+ if (LIBMODEMMANAGERQT_FOUND)
+     MESSAGE("ModemManagerQt >= 0.5.1 found, building pintxo plugin for SMS messaging")
+     include_directories (${CMAKE_CURRENT_BINARY_DIR}
diff --git a/net-im/ktp-accounts-kcm/ktp-accounts-kcm-0.7.1-r1.ebuild b/net-im/ktp-accounts-kcm/ktp-accounts-kcm-0.7.1-r1.ebuild
new file mode 100644
index 000000000000..b2f4fc78730b
--- /dev/null
+++ b/net-im/ktp-accounts-kcm/ktp-accounts-kcm-0.7.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/ktp-accounts-kcm/ktp-accounts-kcm-0.7.1-r1.ebuild,v 1.1 2014/01/17 22:27:29 mrueg Exp $
+
+EAPI=5
+
+KDE_MINIMAL="4.7"
+KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB eo es et fi fr ga gl hu ia it
+ja kk km lt mai mr nb nds nl pa pl pt pt_BR ro ru sk sl sr sr@ijekavian
+sr@ijekavianlatin sr@latin sv tr ug uk vi wa zh_CN zh_TW"
+inherit kde4-base
+
+DESCRIPTION="KDE Telepathy account management kcm"
+HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="mirror://kde/stable/kde-telepathy/${PV}/src/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	KEYWORDS=""
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="4"
+IUSE="debug modemmanager"
+
+DEPEND="
+	>=net-im/ktp-common-internals-${PV}
+	net-im/telepathy-mission-control
+	net-libs/telepathy-glib
+	>=net-libs/telepathy-qt-0.9.3
+	modemmanager? ( net-libs/libmm-qt )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-pintxo-plugin.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_build modemmanager pintxo)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/net-im/ktp-accounts-kcm/ktp-accounts-kcm-0.7.1.ebuild b/net-im/ktp-accounts-kcm/ktp-accounts-kcm-0.7.1.ebuild
index 7920551ae8f0..3a4cd85978ca 100644
--- a/net-im/ktp-accounts-kcm/ktp-accounts-kcm-0.7.1.ebuild
+++ b/net-im/ktp-accounts-kcm/ktp-accounts-kcm-0.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ktp-accounts-kcm/ktp-accounts-kcm-0.7.1.ebuild,v 1.1 2014/01/15 13:10:37 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ktp-accounts-kcm/ktp-accounts-kcm-0.7.1.ebuild,v 1.2 2014/01/17 22:27:29 mrueg Exp $
 
 EAPI=5
 
@@ -32,6 +32,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-pintxo-plugin.patch )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_build modemmanager pintxo)