From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B43FF138330 for ; Fri, 16 Sep 2016 05:13:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0FD07E085C; Fri, 16 Sep 2016 05:13:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1A845E0879 for ; Fri, 16 Sep 2016 05:12:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BD0E5340B5D for ; Fri, 16 Sep 2016 05:12:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2EA2C2483 for ; Fri, 16 Sep 2016 05:12:55 +0000 (UTC) From: "Matthias Maier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" Message-ID: <1474002747.a65770e4e68a2104987adfb42ef4ea52887ccb0e.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-doc/doxygen/doxygen-9999.ebuild X-VCS-Directories: app-doc/doxygen/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: a65770e4e68a2104987adfb42ef4ea52887ccb0e X-VCS-Branch: master Date: Fri, 16 Sep 2016 05:12:55 +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: 28695542-5c61-4437-a112-95ddc34909ed X-Archives-Hash: 243c7db726078d50175375f4f10b44df commit: a65770e4e68a2104987adfb42ef4ea52887ccb0e Author: Bertrand Jacquin jacquin bzh> AuthorDate: Sat Sep 10 18:40:19 2016 +0000 Commit: Matthias Maier gentoo org> CommitDate: Fri Sep 16 05:12:27 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a65770e4 app-doc/doxygen: Move live ebuild to EAPI 6 Replace dodoc with DOCS Replace epatch with PATCHES Drop python 3.3 support Package-Manager: portage-2.2.28 Signed-off-by: Matthias Maier gentoo.org> app-doc/doxygen/doxygen-9999.ebuild | 41 +++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild index ec664ad..97e5148 100644 --- a/app-doc/doxygen/doxygen-9999.ebuild +++ b/app-doc/doxygen/doxygen-9999.ebuild @@ -2,8 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +EAPI=6 +PYTHON_COMPAT=( python{2_7,3_4,3_5} ) inherit cmake-utils eutils fdo-mime flag-o-matic python-any-r1 if [[ ${PV} = *9999* ]]; then @@ -45,33 +45,35 @@ RDEPEND="app-text/ghostscript-gpl REQUIRED_USE="doc? ( latex )" -DEPEND="sys-apps/sed - sys-devel/flex +DEPEND="sys-devel/flex sys-devel/bison doc? ( ${PYTHON_DEPS} ) ${RDEPEND}" # src_test() defaults to make -C testing but there is no such directory (bug #504448) RESTRICT="test" -EPATCH_SUFFIX="patch" + +PATCHES=( "${FILESDIR}/${PN}-1.8.11-link_with_pthread.patch" ) +DOCS=( LANGUAGE.HOWTO README.md ) pkg_setup() { use doc && python-any-r1_pkg_setup } src_prepare() { + default + # Ensure we link to -liconv if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then + local pro for pro in */*.pro.in */*/*.pro.in; do - echo "unix:LIBS += -liconv" >> "${pro}" + echo "unix:LIBS += -liconv" >> "${pro}" || die done fi # Call dot with -Teps instead of -Tps for EPS generation - bug #282150 sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die - epatch "${FILESDIR}"/${PN}-1.8.11-link_with_pthread.patch - # fix pdf doc sed -i.orig -e "s:g_kowal:g kowal:" \ doc/maintainers.txt || die @@ -90,11 +92,11 @@ src_prepare() { src_configure() { local mycmakeargs=( -DDOC_INSTALL_DIR="share/doc/${P}" - $(cmake-utils_use clang use_libclang) - $(cmake-utils_use doc build_doc) - $(cmake-utils_use doxysearch build_search) - $(cmake-utils_use qt5 build_wizard) - $(cmake-utils_use sqlite use_sqlite3) + -Duse_libclang=$(usex clang) + -Dbuild_doc=$(usex doc) + -Dbuild_search=$(usex doxysearch) + -Dbuild_wizard=$(usex qt5) + -Duse_sqlite3=$(usex sqlite) ) cmake-utils_src_configure @@ -103,32 +105,27 @@ src_configure() { src_compile() { cmake-utils_src_compile - # generate html and pdf documents. errors here are not considered - # fatal, hence the ewarn message. - if use doc; then export VARTEXFONTS="${T}/fonts" # bug #564944 if ! use dot; then sed -i -e "s/HAVE_DOT = YES/HAVE_DOT = NO/" \ {Doxyfile,doc/Doxyfile} \ - || ewarn "disabling dot failed" + || die "disabling dot failed" fi - cd "${BUILD_DIR}" && emake docs + emake -C "${BUILD_DIR}" docs fi } src_install() { + cmake-utils_src_install + if use qt5; then doicon "${DISTDIR}/doxywizard.png" make_desktop_entry doxywizard "DoxyWizard ${PV}" \ "/usr/share/pixmaps/doxywizard.png" \ "Development" fi - - dodoc LANGUAGE.HOWTO README.md - - cmake-utils_src_install } pkg_postinst() {