* [gentoo-commits] proj/kde:master commit in: net-libs/libnm-qt/, net-libs/libnm-qt/files/
@ 2013-10-15 21:33 Johannes Huber
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Huber @ 2013-10-15 21:33 UTC (permalink / raw
To: gentoo-commits
commit: 2113a7a7bd643f09db1e1277064b645a67f8db32
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 15 21:33:30 2013 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Oct 15 21:33:30 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=2113a7a7
[net-libs/libnm-qt] Add doc + test USE flag, fix LICENSE.
Package-Manager: portage-2.2.7
---
.../files/libnm-qt-0.9.0.1-tests-optional.patch | 20 ++++++++++++++++++
net-libs/libnm-qt/libnm-qt-0.9.0.1.ebuild | 24 ++++++++++++++++++----
net-libs/libnm-qt/libnm-qt-9999.ebuild | 22 ++++++++++++++++----
3 files changed, 58 insertions(+), 8 deletions(-)
diff --git a/net-libs/libnm-qt/files/libnm-qt-0.9.0.1-tests-optional.patch b/net-libs/libnm-qt/files/libnm-qt-0.9.0.1-tests-optional.patch
new file mode 100644
index 0000000..5816808
--- /dev/null
+++ b/net-libs/libnm-qt/files/libnm-qt-0.9.0.1-tests-optional.patch
@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3f76283..cc05451 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -50,8 +50,13 @@ if (BUILD_EXAMPLES)
+ add_subdirectory(examples)
+ endif(BUILD_EXAMPLES)
+
+-enable_testing(true)
+-add_subdirectory(tests)
++option(DISABLE_TESTING "Disable unit tests" FALSE)
++if (DISABLE_TESTING)
++ message(STATUS "Disabling unit tests")
++else()
++ enable_testing(true)
++ add_subdirectory(tests)
++endif()
+
+ set(NetworkManagerQt_HEADERS
+ accesspoint.h
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 1ff5834..58ab082 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
@@ -17,23 +17,39 @@ fi
DESCRIPTION="NetworkManager bindings for Qt"
HOMEPAGE="https://projects.kde.org/projects/extragear/libs/libnm-qt"
-LICENSE="GPL-2 LGPL-2"
+LICENSE="LGPL-2"
SLOT="4"
-IUSE="debug modemmanager"
+IUSE="debug doc modemmanager test"
-DEPEND="
+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 )
"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+"
+
+PATCHES=( "${FILESDIR}/${P}-tests-optional.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
+}
diff --git a/net-libs/libnm-qt/libnm-qt-9999.ebuild b/net-libs/libnm-qt/libnm-qt-9999.ebuild
index 1ff5834..0bba858 100644
--- a/net-libs/libnm-qt/libnm-qt-9999.ebuild
+++ b/net-libs/libnm-qt/libnm-qt-9999.ebuild
@@ -17,23 +17,37 @@ fi
DESCRIPTION="NetworkManager bindings for Qt"
HOMEPAGE="https://projects.kde.org/projects/extragear/libs/libnm-qt"
-LICENSE="GPL-2 LGPL-2"
+LICENSE="LGPL-2"
SLOT="4"
-IUSE="debug modemmanager"
+IUSE="debug doc modemmanager test"
-DEPEND="
+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 )
"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+"
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
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/kde:master commit in: net-libs/libnm-qt/, net-libs/libnm-qt/files/
@ 2013-10-15 22:39 Johannes Huber
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Huber @ 2013-10-15 22:39 UTC (permalink / raw
To: gentoo-commits
commit: 005b92832d074e35b74f2f6d16852650f79314e4
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 15 22:30:24 2013 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Oct 15 22:30:24 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=005b9283
[net-libs/libnm-qt] Moved to tree.
Package-Manager: portage-2.2.7
---
.../files/libnm-qt-0.9.0.1-tests-optional.patch | 20 --------
net-libs/libnm-qt/libnm-qt-0.9.0.1.ebuild | 55 ----------------------
2 files changed, 75 deletions(-)
diff --git a/net-libs/libnm-qt/files/libnm-qt-0.9.0.1-tests-optional.patch b/net-libs/libnm-qt/files/libnm-qt-0.9.0.1-tests-optional.patch
deleted file mode 100644
index 5816808..0000000
--- a/net-libs/libnm-qt/files/libnm-qt-0.9.0.1-tests-optional.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3f76283..cc05451 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -50,8 +50,13 @@ if (BUILD_EXAMPLES)
- add_subdirectory(examples)
- endif(BUILD_EXAMPLES)
-
--enable_testing(true)
--add_subdirectory(tests)
-+option(DISABLE_TESTING "Disable unit tests" FALSE)
-+if (DISABLE_TESTING)
-+ message(STATUS "Disabling unit tests")
-+else()
-+ enable_testing(true)
-+ add_subdirectory(tests)
-+endif()
-
- set(NetworkManagerQt_HEADERS
- accesspoint.h
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
deleted file mode 100644
index a19a1c0..0000000
--- a/net-libs/libnm-qt/libnm-qt-0.9.0.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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 )
-"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
-"
-
-PATCHES=( "${FILESDIR}/${P}-tests-optional.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
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-10-15 22:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-15 22:39 [gentoo-commits] proj/kde:master commit in: net-libs/libnm-qt/, net-libs/libnm-qt/files/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2013-10-15 21:33 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox