Revision bump adds upstream patch to respect CXXFLAGS, bug #508300.

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

4 files changed, 97 insertions, 15 deletions

diff --git a/net-libs/libnm-qt/ChangeLog b/net-libs/libnm-qt/ChangeLog
index 3d1ffc2923e3..d5be55d89971 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnm-qt/ChangeLog,v 1.7 2014/04/13 09:18:35 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnm-qt/ChangeLog,v 1.8 2014/05/25 08:04:02 johu Exp $
+
+*libnm-qt-0.9.8.1-r1 (25 May 2014)
+
+  25 May 2014; Johannes Huber <johu@gentoo.org>
+  +files/libnm-qt-0.9.8.1-cxxflags.patch, +libnm-qt-0.9.8.1-r1.ebuild:
+  Revision bump adds upstream patch to respect CXXFLAGS, bug #508300.
 
   13 Apr 2014; Johannes Huber <johu@gentoo.org> -libnm-qt-0.9.8.0.ebuild:
   Remove old.
diff --git a/net-libs/libnm-qt/Manifest b/net-libs/libnm-qt/Manifest
index e0f9a58d1f23..02bc02f224cf 100644
--- a/net-libs/libnm-qt/Manifest
+++ b/net-libs/libnm-qt/Manifest
@@ -1,24 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX libnm-qt-0.9.8.1-cxxflags.patch 681 SHA256 de48d07a3dc13c7d419f90c24f8817882d4ad0e912c8b40f4d21955e7c418294 SHA512 6da9923b134dfcaa042824b09619dcfd684d86262c9800d48eac54a4e6bef00c340380a48cd0920d45b0a3f2948f4c120174fc1c662c4051ea2c2385f38bdbb8 WHIRLPOOL 4a4f1c1ea16b8085fddb878ab5b5eebedfd6b587cc248b67b43efa6b36412719dcacc320ed8c022aa20394b8c966ed0806b3dbe02459cafd30bbcc2b5c4ee27c
 DIST libnm-qt-0.9.8.1.tar.xz 133268 SHA256 cde8bed2beb57015cb5f6772c1fe0843aab299b9529578c5406ba7fe614af23d SHA512 1039000e5b22d621c288760e6b57235c97b3b5af842628df766fbccf8e217aa998c5998bbe976315e7a76b6daa96a53216f14bb79af22c2d264aa4667bb798c6 WHIRLPOOL b33164e42cba4249b9fb539cd0b89be9ca1b5d8dbc0a2f2235107f8374f701a1e6bd5e217913669bf0e5ba0682a90d843e9836d196c3c334a6ebac7a69d97dc8
+EBUILD libnm-qt-0.9.8.1-r1.ebuild 1297 SHA256 81bd05ab971f356b01f903ae9105b046a377f11ab34555bc31150fdf41ae6839 SHA512 20a3e34cdab28fe9b9a3c20cfeda249c3cd321e839313186048daea36194a8d7fd993d030b5095c02e18584da84c1034d4ca5708b7a3ce6d59c8c38b90a53c57 WHIRLPOOL e90068335c8f4fbdbabf074972fa07788b3fd648244a92138134acd12c43f58ebc81281dd97ab8e25b98e929b984e81011fbb55805e47d0899a29b7adcbcd855
 EBUILD libnm-qt-0.9.8.1.ebuild 1244 SHA256 a76d01fa156d026a28eba5e6d15e468976d8b27515365fe1a490d41bfa961f07 SHA512 f187588a74c94103805a941306ba4f23e816fea3be6c04de5d16ea8ae7324d1e4216b298272cf33b3c421c38ad18d52dd0e287bcc6e3bbdd3373aac2fd474792 WHIRLPOOL 36057a662e83738a05b2a4936eed321c22ca7afc96269d4b69093b6d45a0c650436dec68789a5beaa7823cd5b9da70686989bb6e9387290c17f6488a5160df43
-MISC ChangeLog 1485 SHA256 e29f7bf4f3637694ded3397ec578861dd47f697e3c9ab73809ea64f6d0e2d30a SHA512 95a881cab89940f33a69aa73e6a508ddaf0686a4a8183d525b9e2be5d18633900c8eb1a3c6519d9fded07ac0d6f3a5585ef2d42373a8ee63723cdc06ef6491fc WHIRLPOOL 526bc023ee671ae1d73df5e2da28ed70e1d956978ec7971bf585c19d9423e874ae8d01600f9f5829c60639db7155f53e98bff01760f65d99ec76ff9b53eb5879
+MISC ChangeLog 1711 SHA256 f483110fbbab9666dc660776422ff64cb8e79c1cb5593171e39921efcc2ca0c7 SHA512 db71a88032bf0eb39f5cf4f78b7ac0d790a9583a2749819e885a3fcd728c8fac782e59c14408d3cac0fa191c14e5a8772a289d7a059c45d784f342c3c5bdae79 WHIRLPOOL 26e1a30091fb2686ec124cfe8131ce1e2ed184407f5e7ef473309e8f06f0cdfe5bcde5b87ed07c23ee2ac2f533318a26c86fe929164168f262c3e885654d760d
 MISC metadata.xml 251 SHA256 7d7875656c10edc58cca61fa5448e1b406a649ef807b2685d0a5f062f46a6bc2 SHA512 a50db5a1dafbf407a8daab12e39958ded6168feb4bea94365a33a0d53b0f450c11dd7e59dab399b5c3b872023609ee2ba71cf02717885ab4a6c53dfe295b73dc WHIRLPOOL 35b454b452be4433d942dd7f2ad26ac9b29086d620966a33399f9bf744b81518a2b895a7633426ea9cdf13d7294d6a0c66a04d34bb8fcb4a5ff573a8bb4ebfef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTSlZvAAoJEGVpnaTzz9K9CxIQALvT6Tx8CBi1jakUOyG7NchN
-+3nU+57HhcXCXwg4syWdZMERJbPE/+AYN7cOlnkViykigH+1Us8dmc2ndvSx1jrc
-JteH7jexwwHAE+S4X5roPLjp46czzx1LOP24NU76Rz35SQrX6UmSA0RAzvin4H93
-m6+JkZeN/1Y0cYB4fS4YVSzqzkipiHaVZk2AIX93wykkBoGOibflIzKnNLNFmXZi
-715IYyh8FtmqG7eYGABCzZYLm48c7ANjk8GD0zHIEJkHw/6dvwhKyJolZ2e5/Nu8
-wclwOZB6rR2qJRYCYzIxac3q0PJ+OJUk5FCsJ4oLI4pCZtT3PW77yLRb6yz8Ci8k
-IOKKy8fJpTEq9ZNLDLA+xeK1u6KjwpV5U45nYpoQV8yJX7I3rBpsmT9pguHYD1xu
-qBLQ7nF2b1n+oDNT8Ed7ZQFz9ivySoPRbWhOjdXBf41aQMaTcRT6LcKWmcuyP/mB
-+/k4jdJYcVQ7JiKRev+MaCwuYHNdU4AppfogKfr91OQ9U030YE5TTD9/jGwLwy30
-17RlL1ySV/BKiu+7S2iX7JEKC3mna/+pS5pJqgceXLFz2xmy0YZyRQGP60+gO275
-7tXZT2b3bf1e9Kk/oKaaSZZ2zKOFyg2Q2UQ9av0AscnV/+c81cD4CFxu6kmUm/Zi
-H4rBkbYsiofsn4OHrT94
-=4C/v
+iQIcBAEBCAAGBQJTgYe7AAoJEGVpnaTzz9K9CcMQAMHibS1msRQCwusN6oqvg4OY
+whSkJcVWeN3oKuydOd5i6+UAVxF0nfG52IGDDiDUlH+ujQGimI5Td4GxBeMRtTXs
+mOyDTOpUXHbKrUCqx1mkiePh3r4L5x788C3qCL86rrSKZEUcx9xNnsHQw8LsUMsa
+igoobVDT8lOMj08HuF7XF/nHhJg/+8DKk8r59PgiLiVHWo/W9Hi+UKpLKAC77lSH
+OORHaZJKSrAm4IqKtijVpG+yO8KGAbcOuO1CPH1a3LatZgVkTthHFGVA8yiggbUx
+JIgMd/8gaRAPX9IyXLeaw4c2A7eU2IEGpoyrOIdhTKpJqr92weFh0xo0H+rzQITN
+OAXPDH0aT3inxoxlWn/pj7VIse+d3Rdi3YoP5k0fIqFYnA/HCKjr4jQ6nzHR2CLf
+CF7ChthKv7DLDXADA5LXr6WT/zur0ni0PPc+UYp2J0GNgl8VaPfH5sL1ABEGhJ69
+CUkHBjhuw0NOCeabvXrpvgDZ6lBGJgu1dEQjddvyDA9zesw3b+OVg2L+Wq4jz3K6
+EUYRIzDNamOTFjAbZo5xLK2uudzvxs2WI68JCG+gYQjAT2RgsPZ1KdVQOgBg3aOn
+CQ4/29okVk04FXpAft7md4obK+OD6YpLD+ElCQ9RD+S/SjDw49QV9IwnI+sD24tf
+o0wXyrNpjiCmCTHum2RF
+=wXZ6
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libnm-qt/files/libnm-qt-0.9.8.1-cxxflags.patch b/net-libs/libnm-qt/files/libnm-qt-0.9.8.1-cxxflags.patch
new file mode 100644
index 000000000000..29172cf004b8
--- /dev/null
+++ b/net-libs/libnm-qt/files/libnm-qt-0.9.8.1-cxxflags.patch
@@ -0,0 +1,19 @@
+commit c1fa14e924066c540b28765f9ee58a44a876562e
+Author: Lamarque V. Souza <lamarque@kde.org>
+Date:   Sat May 24 14:23:15 2014 -0300
+
+    Respect external CMAKE_CXX_FLAGS values.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 73e92a4..8e36337 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -33,7 +33,7 @@ add_definitions(-DWITH_MODEMMANAGERQT=${WITH_MODEMMANAGERQT} ${QT_DEFINITIONS})
+ include(CheckCXXCompilerFlag)
+ check_cxx_compiler_flag("-Werror=return-type" HAVE_GCC_ERROR_RETURN_TYPE)
+ if (HAVE_GCC_ERROR_RETURN_TYPE)
+-    set(CMAKE_CXX_FLAGS "-Werror=return-type")
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type")
+ endif()
+ 
+ include_directories(
diff --git a/net-libs/libnm-qt/libnm-qt-0.9.8.1-r1.ebuild b/net-libs/libnm-qt/libnm-qt-0.9.8.1-r1.ebuild
new file mode 100644
index 000000000000..a52a0a709dbc
--- /dev/null
+++ b/net-libs/libnm-qt/libnm-qt-0.9.8.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 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.8.1-r1.ebuild,v 1.1 2014/05/25 08:04:02 johu Exp $
+
+EAPI=5
+
+KDE_REQUIRED="never"
+inherit kde4-base
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://kde/unstable/networkmanager-qt/${PV}/src/${P}.tar.xz"
+else
+	KEYWORDS=""
+fi
+
+DESCRIPTION="NetworkManager bindings for Qt"
+HOMEPAGE="https://projects.kde.org/projects/extragear/libs/libnm-qt"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="debug doc modemmanager test"
+
+RDEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtdbus:4
+	net-misc/mobile-broadband-provider-info
+	>=net-misc/networkmanager-0.9.8.0
+	modemmanager? ( >=net-libs/libmm-qt-1.0.0 )
+"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+"
+
+PATCHES=( "${FILESDIR}/${P}-cxxflags.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=OFF
+		$(cmake-utils_use_find_package doc Doxygen)
+		$(cmake-utils_use !modemmanager DISABLE_MODEMMANAGERQT)
+		$(cmake-utils_use !test DISABLE_TESTING)
+	)
+
+	kde4-base_src_configure
+}
+
+src_install() {
+	if use doc; then
+		{ cd "${BUILD_DIR}" && doxygen; } || die "Generating documentation failed"
+		HTML_DOCS=( "${BUILD_DIR}/doc/html/" )
+	fi
+
+	cmake-utils_src_install
+}