summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2014-05-25 07:56:04 +0000
committerJohannes Huber <johu@gentoo.org>2014-05-25 07:56:04 +0000
commit32e13a2452972d0b4336275d375093ec3562b8ae (patch)
tree1e21ab88022dcab123874af12242e4cc707ff3a3 /net-libs/libmm-qt
parentAdd ruby20, ruby21. (diff)
downloadgentoo-2-32e13a2452972d0b4336275d375093ec3562b8ae.tar.gz
gentoo-2-32e13a2452972d0b4336275d375093ec3562b8ae.tar.bz2
gentoo-2-32e13a2452972d0b4336275d375093ec3562b8ae.zip
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)
Diffstat (limited to 'net-libs/libmm-qt')
-rw-r--r--net-libs/libmm-qt/ChangeLog8
-rw-r--r--net-libs/libmm-qt/files/libmm-qt-1.0.1-cxxflags.patch19
-rw-r--r--net-libs/libmm-qt/libmm-qt-1.0.1-r1.ebuild32
3 files changed, 58 insertions, 1 deletions
diff --git a/net-libs/libmm-qt/ChangeLog b/net-libs/libmm-qt/ChangeLog
index 6698d10af8d2..bdc3b94f2a9e 100644
--- a/net-libs/libmm-qt/ChangeLog
+++ b/net-libs/libmm-qt/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-libs/libmm-qt
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libmm-qt/ChangeLog,v 1.6 2014/04/13 09:19:28 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libmm-qt/ChangeLog,v 1.7 2014/05/25 07:56:04 johu Exp $
+
+*libmm-qt-1.0.1-r1 (25 May 2014)
+
+ 25 May 2014; Johannes Huber <johu@gentoo.org>
+ +files/libmm-qt-1.0.1-cxxflags.patch, +libmm-qt-1.0.1-r1.ebuild:
+ Revision bump adds upstream patch to respect CXXFLAGS, bug #508300.
13 Apr 2014; Johannes Huber <johu@gentoo.org> -libmm-qt-1.0.0.ebuild:
Remove old.
diff --git a/net-libs/libmm-qt/files/libmm-qt-1.0.1-cxxflags.patch b/net-libs/libmm-qt/files/libmm-qt-1.0.1-cxxflags.patch
new file mode 100644
index 000000000000..c09af04fd258
--- /dev/null
+++ b/net-libs/libmm-qt/files/libmm-qt-1.0.1-cxxflags.patch
@@ -0,0 +1,19 @@
+commit 70697ac8327955a488d79aea1bfd6100f400377a
+Author: Lamarque V. Souza <lamarque@kde.org>
+Date: Sat May 24 14:21:30 2014 -0300
+
+ Respect external CMAKE_CXX_FLAGS values.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5bcf7e2..40ee9c0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,7 +20,7 @@ add_definitions(${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/libmm-qt/libmm-qt-1.0.1-r1.ebuild b/net-libs/libmm-qt/libmm-qt-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..b30bfbcb2b8c
--- /dev/null
+++ b/net-libs/libmm-qt/libmm-qt-1.0.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libmm-qt/libmm-qt-1.0.1-r1.ebuild,v 1.1 2014/05/25 07:56:04 johu Exp $
+
+EAPI=5
+
+KDE_REQUIRED="never"
+inherit kde4-base
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ KEYWORDS="~amd64 ~x86"
+ SRC_URI="mirror://kde/unstable/modemmanager-qt/${PV}/src/${P}.tar.xz"
+else
+ KEYWORDS=""
+fi
+
+DESCRIPTION="Modemmanager bindings for Qt"
+HOMEPAGE="https://projects.kde.org/projects/extragear/libs/libmm-qt"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="debug"
+
+RDEPEND="
+ dev-qt/qtcore:4
+ dev-qt/qtdbus:4
+ net-misc/mobile-broadband-provider-info
+ >=net-misc/networkmanager-0.9.8[modemmanager]
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-cxxflags.patch" )