Backport upstream patch spotted by Bartosz Brachaczek <b.brachaczek@gmail.com>. Fixes build with USE="-modemmanager" and net-libs/libmm-qt not installed, bug #488238.

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

4 files changed, 45 insertions, 13 deletions

diff --git a/net-libs/libnm-qt/ChangeLog b/net-libs/libnm-qt/ChangeLog
index d0a6b476ab62..3e63a7284b6f 100644
--- a/net-libs/libnm-qt/ChangeLog
+++ b/net-libs/libnm-qt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libnm-qt
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnm-qt/ChangeLog,v 1.1 2013/10/15 22:28:39 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnm-qt/ChangeLog,v 1.2 2013/10/16 18:38:18 johu Exp $
+
+  16 Oct 2013; Johannes Huber <johu@gentoo.org>
+  +files/libnm-qt-0.9.0.1-libmm-optional.patch, libnm-qt-0.9.0.1.ebuild:
+  Backport upstream patch spotted by Bartosz Brachaczek
+  <b.brachaczek@gmail.com>. Fixes build with USE="-modemmanager" and net-libs
+  /libmm-qt not installed, bug #488238.
 
 *libnm-qt-0.9.0.1 (15 Oct 2013)
 
@@ -8,4 +14,3 @@
   +files/libnm-qt-0.9.0.1-tests-optional.patch, +metadata.xml:
   New package. Import from kde overlay, Qt networkmanager abstraction library.
   Will be required for kde-misc/plasma-nm.
-
diff --git a/net-libs/libnm-qt/Manifest b/net-libs/libnm-qt/Manifest
index c9cb8f26248f..ab2497961bb4 100644
--- a/net-libs/libnm-qt/Manifest
+++ b/net-libs/libnm-qt/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX libnm-qt-0.9.0.1-libmm-optional.patch 842 SHA256 1e5afdc64a62def3056c218326095bb01c764e9c0378654dff601b6083982fef SHA512 c018bf0331ece3e42a0981e389dc5f48751866c845c1a14304651754a24a085d715ad56759f072332f3d087c618208893e2e126da18b30fc162d61a9e3d5da3d WHIRLPOOL 2af4155de3e3a7edb66dfa3863a7b7b331c87a21ce6c9256199cb8df26d73bbe4eb32f798dd14af168fada3d87a27ef5003300ad374d401023e04517c5763224
 AUX libnm-qt-0.9.0.1-tests-optional.patch 501 SHA256 20414d1bfd932bb85dad882ba4a02d30cf2d25eb3090730530dd65720276565e SHA512 fdae64d7e3002a5cb0c0b480510ab6320d22ab1d2622dc5e13195ad89d72ee16c0de634b7b6364063ecaebf2da05951ddb448990b8e99ae4b57cd850dbaa1862 WHIRLPOOL f88e0bf3bac95d560e21d13792423084de71f4bdb7f21b813e3c5551f75aed18c7b5adf25c35567da80c120dd61f363a3c3f034d5260495925bec890c191dd29
 DIST libnm-qt-0.9.0.1.tar.xz 131272 SHA256 88239444df7fb7bbbadbe4bff50f68bcb7debe5efb101300aeb1b1e3cbb192cf SHA512 d000ee217de0e52bb4f0afcdcbfb7e25b971a58fc15b08e77b1b989f00fc2351dd354f15696327be068c42f031409c3ead53bc568e77ea59a83368dcb5738ddd WHIRLPOOL 521adf3478462ef4549c719c11ced16a6e681e5b192a1f09ac4d549498a5d3cf07b27d341df5d16bfcd9f4e344bfd86aaa04baeaaeb8912ee97b4193650690da
-EBUILD libnm-qt-0.9.0.1.ebuild 1292 SHA256 050cd466c5bc5b2ebfd96ff65a3e7828d52ab4dcc9e3eea950a9bb79f62abd34 SHA512 d32b8fe267c103edd446a21b38688a70e3a2b0f518b3a140485db56229e3af2d3c7fcd30f69661fbbd624655bf86117e645641d084c58ae158fa7761919becf4 WHIRLPOOL 8f9ced962e001b371e284b41273ef2a0b9a0084e5d8827634ed73e176e47a088ae862d4cd799069070f6d9b511e0aad9a50439492c9f5a8ff7e3bff9be8503cd
-MISC ChangeLog 498 SHA256 46213d70bba5dab46d790407a3bf9fb2619b95c3c444a40c646b46e8ee7838ab SHA512 0bd9f2abc41ad52ffebcabd1a4c48a840ebdb74d7ba6f94582e0b6693e2a85f48fb6c77b0d5fc0fb2e168c25c23b4ef3b8a78fc084225acd559075602fb5bfcc WHIRLPOOL f505b90034f7f1b4c6f5ad75d428e70bf146ba91bc31af7ad34783e2fc6f5079007703d0237287e46c5e92a4491d4e323c3e42ff678148021b61bbbf1b03b357
+EBUILD libnm-qt-0.9.0.1.ebuild 1334 SHA256 0aa234a482040bed532e237e25206857b0813620c66397536b12daaadbbd5ad7 SHA512 8193624cc55948f956242931ef54e562737a71402811092d047fa06ed92c7f4ce4ef644c6fc5d0ef340721481e178e5575db97afffaac76667fc9f63ec40eddc WHIRLPOOL 506008f59fec23ce9c4fd563240e12601fd2862200de9ba97fad6893ebecf7afacd566ed20a54dd2b3535376062f95256deef29bfb24b85317f280de6c74f9d4
+MISC ChangeLog 793 SHA256 a48a998fdcd053ebb7282f86b30b48297b8b23ea65be7c6e3828c9afc02bbe53 SHA512 42c28b8f0dbe8c542c929eccd40a7c0c92f20bf1c696159ee7671fcc94dcecdc49251dc4028fbcae76f84eda1f21326b72e22d8bcc7da6575dc9a2a71b9661b6 WHIRLPOOL 3398d3757956d6cd8843d415aabac30d259a6c55af05fe8748f49662b117af47f09c63382f4b94f981c553dd52400a9c9c862d293e9eda3b05d6837f4d31ad12
 MISC metadata.xml 251 SHA256 7d7875656c10edc58cca61fa5448e1b406a649ef807b2685d0a5f062f46a6bc2 SHA512 a50db5a1dafbf407a8daab12e39958ded6168feb4bea94365a33a0d53b0f450c11dd7e59dab399b5c3b872023609ee2ba71cf02717885ab4a6c53dfe295b73dc WHIRLPOOL 35b454b452be4433d942dd7f2ad26ac9b29086d620966a33399f9bf744b81518a2b895a7633426ea9cdf13d7294d6a0c66a04d34bb8fcb4a5ff573a8bb4ebfef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSXcGZAAoJEO+t9ga+3I3a61cH/R5IpekOTtgBfEKmxAdUfcfr
-u3+s+414L2139Iq6GI+kdKnUAFNsaR9f5uzP/4PKz00PbUPOOQADp0wj73nFir9n
-gG/UHK+R+xI74/GfW8s3fK+XFJSSpd2LcmNpQoHJzSNO2w3h7wJEb3wJk6Ppq7hx
-brLsrkRHa7AUp7m+8votGAImgrCDYLFAYA4YLzfcvGCFhNPkzAUHm3UVoo2vKUMU
-RlSZMyrpkLNgzoBXchflOSYWjCAcabQD5KgxcUhl1ZfQ21Of59r9KLUIIww6Te6t
-pwF3F8HgGmoUCdNJVIxpZ3AV5rtxjyUUSzPr8GdLGcRBpSe7uTPQgFYDhp+XW/A=
-=TzMD
+iQEcBAEBCAAGBQJSXt0hAAoJEO+t9ga+3I3admwIALPGFI5Rr5OhTh2kfxML3MsC
+8324JSYOVcqu8rd4P4e1Hf1pPxXngHfuifGmHyVZDTrLEJegHvLWjm858nr+y8iY
+0QcpQ40Lw5pzT+vsnuEgomhDvE8Pp/Nm6wilzHyWK1cJ+qkUTr5ubAgfWUWlHkm1
+VWWpiPWE5/HxOyav+rjqht+h/3gGATcsgNwHPZEZgqBP2hrr4jYOHAjLRIvknqiR
+chGVkQXdS6odbwY0TOcuUhPqywXgM0j5Bx42WHIGC+SGM5QL30RRyUUFsKYza2gM
+ilzxLtOYb2UG4U3wsR/oFWVoQnhHGB+Ztr4Ed6XBxcoLz63FvnASla6rbXZH5UU=
+=aUfs
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libnm-qt/files/libnm-qt-0.9.0.1-libmm-optional.patch b/net-libs/libnm-qt/files/libnm-qt-0.9.0.1-libmm-optional.patch
new file mode 100644
index 000000000000..3ce02c0c91a7
--- /dev/null
+++ b/net-libs/libnm-qt/files/libnm-qt-0.9.0.1-libmm-optional.patch
@@ -0,0 +1,23 @@
+commit 607b9338a40cdde705f91c5cd95d715e5514f4cb
+Author: Jan Grulich <jgrulich@redhat.com>
+Date:   Fri Oct 11 16:56:49 2013 +0200
+
+    Fix build without libmm-qt
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f6b0fcb..b660b38 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -218,7 +218,12 @@ qt4_automoc(${DBUS_INTERFACE_SRCS})
+ 
+ add_library(NetworkManagerQt SHARED ${NetworkManagerQt_PART_SRCS} ${DBUS_INTERFACE_SRCS} ${CONNECTIONS_SETTINGS_SRCS} ${NetworkManagerQt_MOC} )
+ 
++if (MODEMMANAGERQT_FOUND)
+ target_link_libraries(NetworkManagerQt ModemManagerQt ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTNETWORK_LIBRARY})
++else()
++target_link_libraries(NetworkManagerQt ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTNETWORK_LIBRARY})
++endif()
++
+ install(TARGETS NetworkManagerQt DESTINATION lib${LIB_SUFFIX})
+ 
+ install( FILES
diff --git a/net-libs/libnm-qt/libnm-qt-0.9.0.1.ebuild b/net-libs/libnm-qt/libnm-qt-0.9.0.1.ebuild
index 9ff8746e4263..7ce77ae8ef3e 100644
--- a/net-libs/libnm-qt/libnm-qt-0.9.0.1.ebuild
+++ b/net-libs/libnm-qt/libnm-qt-0.9.0.1.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/net-libs/libnm-qt/libnm-qt-0.9.0.1.ebuild,v 1.1 2013/10/15 22:28:39 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnm-qt/libnm-qt-0.9.0.1.ebuild,v 1.2 2013/10/16 18:38:18 johu Exp $
 
 EAPI=5
 
@@ -32,7 +32,10 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 "
 
-PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-libmm-optional.patch"
+	"${FILESDIR}/${P}-tests-optional.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(