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 54418138334 for ; Sat, 28 Dec 2019 08:24:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 831D6E0B13; Sat, 28 Dec 2019 08:23:59 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5AC38E0B13 for ; Sat, 28 Dec 2019 08:23:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3B34B34D47C for ; Sat, 28 Dec 2019 08:23:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 895AD40 for ; Sat, 28 Dec 2019 08:23:55 +0000 (UTC) From: "Jason A. Donenfeld" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason A. Donenfeld" Message-ID: <1577521420.cc01c70cace6af11209ee41efbb97230d26939c8.zx2c4@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/fox/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-libs/fox/fox-1.7.67.ebuild X-VCS-Directories: x11-libs/fox/ X-VCS-Committer: zx2c4 X-VCS-Committer-Name: Jason A. Donenfeld X-VCS-Revision: cc01c70cace6af11209ee41efbb97230d26939c8 X-VCS-Branch: master Date: Sat, 28 Dec 2019 08:23: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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 97a70e6a-7550-4e21-a98e-8a9f5ce96dee X-Archives-Hash: a7a120fd0a56316d499ce817860ecfa2 commit: cc01c70cace6af11209ee41efbb97230d26939c8 Author: Jason A. Donenfeld gentoo org> AuthorDate: Sat Dec 28 08:23:40 2019 +0000 Commit: Jason A. Donenfeld gentoo org> CommitDate: Sat Dec 28 08:23:40 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc01c70c x11-libs/fox: address QA nits This wasn't my ebuild originally. Indeed it was quite hairy. Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Jason A. Donenfeld gentoo.org> x11-libs/fox/fox-1.7.67.ebuild | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/x11-libs/fox/fox-1.7.67.ebuild b/x11-libs/fox/fox-1.7.67.ebuild index 0f09d1a6053..564900ecba7 100644 --- a/x11-libs/fox/fox-1.7.67.ebuild +++ b/x11-libs/fox/fox-1.7.67.ebuild @@ -5,6 +5,10 @@ EAPI=7 inherit autotools +DESCRIPTION="C++ Toolkit for developing Graphical User Interfaces easily and effectively" +HOMEPAGE="http://www.fox-toolkit.org/" +SRC_URI="ftp://ftp.fox-toolkit.org/pub/${P}.tar.gz" + LICENSE="LGPL-2.1" SLOT="1.7" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" @@ -14,22 +18,18 @@ RDEPEND="x11-libs/libXrandr x11-libs/libXcursor x11-libs/fox-wrapper bzip2? ( app-arch/bzip2 ) - jpeg? ( virtual/jpeg:= ) + jpeg? ( virtual/jpeg ) opengl? ( virtual/glu virtual/opengl ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= ) truetype? ( media-libs/freetype:2 x11-libs/libXft ) zlib? ( sys-libs/zlib ) - doc? ( app-doc/doxygen ) " DEPEND="${RDEPEND} x11-base/xorg-proto x11-libs/libXt" - -DESCRIPTION="C++ Toolkit for developing Graphical User Interfaces easily and effectively" -HOMEPAGE="http://www.fox-toolkit.org/" -SRC_URI="ftp://ftp.fox-toolkit.org/pub/${P}.tar.gz" +BDEPEND="doc? ( app-doc/doxygen )" PATCHES=( "${FILESDIR}"/"${PN}"-1.7.67-no-truetype.patch ) @@ -53,7 +53,7 @@ src_prepare() { src_configure() { econf \ - $(use debug && echo --enable-debug || echo --enable-release) \ + --enable-$(usex debug debug release) \ $(use_enable bzip2 bz2lib) \ $(use_enable jpeg) \ $(use_with opengl) \ @@ -65,16 +65,16 @@ src_configure() { } src_compile() { - emake || die "compile error" + emake use doc && emake -C "${S}"/doc docs } src_install() { emake install \ DESTDIR="${D}" \ - htmldir=/usr/share/doc/${PF}/html \ - artdir=/usr/share/doc/${PF}/html/art \ - screenshotsdir=/usr/share/doc/${PF}/html/screenshots + htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ + artdir="${EPREFIX}"/usr/share/doc/${PF}/html/art \ + screenshotsdir="${EPREFIX}"/usr/share/doc/${PF}/html/screenshots CP="${ED}/usr/bin/ControlPanel" if [[ -f ${CP} ]] ; then @@ -83,7 +83,7 @@ src_install() { fi for doc in ADDITIONS AUTHORS LICENSE_ADDENDUM README TRACING ; do - [ -f $doc ] && dodoc $doc + [[ -f $doc ]] && dodoc $doc done # remove documentation if USE=-doc @@ -91,7 +91,8 @@ src_install() { # install class reference docs if USE=doc if use doc && [[ -z ${FOX_COMPONENT} ]] ; then - dohtml -r "${S}/doc/ref" + docinto html + dodoc -r "${S}/doc/ref" fi # slot fox-config