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

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

3 files changed, 81 insertions, 1 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/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
+}