From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id EC9F11381F3 for ; Tue, 15 Oct 2013 21:33:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D5949E08E1; Tue, 15 Oct 2013 21:33:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5826FE08E1 for ; Tue, 15 Oct 2013 21:33:46 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E9A8333EEB4 for ; Tue, 15 Oct 2013 21:33:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 9EEA2E5460 for ; Tue, 15 Oct 2013 21:33:43 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1381872810.2113a7a7bd643f09db1e1277064b645a67f8db32.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: net-libs/libnm-qt/, net-libs/libnm-qt/files/ X-VCS-Repository: proj/kde X-VCS-Files: net-libs/libnm-qt/files/libnm-qt-0.9.0.1-tests-optional.patch net-libs/libnm-qt/libnm-qt-0.9.0.1.ebuild net-libs/libnm-qt/libnm-qt-9999.ebuild X-VCS-Directories: net-libs/libnm-qt/ net-libs/libnm-qt/files/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 2113a7a7bd643f09db1e1277064b645a67f8db32 X-VCS-Branch: master Date: Tue, 15 Oct 2013 21:33:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4c1ffd32-a565-4703-a992-bd20849ee09a X-Archives-Hash: a94819f8e2633615319350f4b75467f7 commit: 2113a7a7bd643f09db1e1277064b645a67f8db32 Author: Johannes Huber gentoo org> AuthorDate: Tue Oct 15 21:33:30 2013 +0000 Commit: Johannes Huber gentoo 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 +}