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 9EDD8138334 for ; Mon, 30 Dec 2019 14:11:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 99F2CE0B6F; Mon, 30 Dec 2019 14:11:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 57CB1E0B6F for ; Mon, 30 Dec 2019 14:11:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 B704134DD02 for ; Mon, 30 Dec 2019 14:11:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 35CDE79 for ; Mon, 30 Dec 2019 14:11:05 +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: <1577714993.44d239dced5011645347f89ac291281034025fcf.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.6.57-r1.ebuild X-VCS-Directories: x11-libs/fox/ X-VCS-Committer: zx2c4 X-VCS-Committer-Name: Jason A. Donenfeld X-VCS-Revision: 44d239dced5011645347f89ac291281034025fcf X-VCS-Branch: master Date: Mon, 30 Dec 2019 14:11:05 +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: d6559e82-cbcf-4d2e-8b2d-dfaa0cb44a6c X-Archives-Hash: 70b7849420747e884fcee2a08b08aa57 commit: 44d239dced5011645347f89ac291281034025fcf Author: Jason A. Donenfeld gentoo org> AuthorDate: Mon Dec 30 14:09:53 2019 +0000 Commit: Jason A. Donenfeld gentoo org> CommitDate: Mon Dec 30 14:09:53 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44d239dc x11-libs/fox: port Soap's QA fixes to 1.6 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Jason A. Donenfeld gentoo.org> x11-libs/fox/fox-1.6.57-r1.ebuild | 46 +++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/x11-libs/fox/fox-1.6.57-r1.ebuild b/x11-libs/fox/fox-1.6.57-r1.ebuild index a33093e968d..3b8d8ad7645 100644 --- a/x11-libs/fox/fox-1.6.57-r1.ebuild +++ b/x11-libs/fox/fox-1.6.57-r1.ebuild @@ -14,18 +14,20 @@ SLOT="1.6" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib debug doc profile" -RDEPEND="x11-libs/libXrandr - x11-libs/libXcursor +RDEPEND=" x11-libs/fox-wrapper + x11-libs/libXcursor + x11-libs/libXrandr bzip2? ( app-arch/bzip2 ) 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 ) -" + truetype? ( + media-libs/freetype:2 + x11-libs/libXft + ) + zlib? ( sys-libs/zlib )" DEPEND="${RDEPEND} x11-base/xorg-proto x11-libs/libXt" @@ -36,7 +38,7 @@ src_prepare() { local d for d in utils windows adie calculator pathfinder shutterbug; do - sed -i -e "s:${d}::" Makefile.am + sed -i -e "s:${d}::" Makefile.am || die done # Respect system CXXFLAGS @@ -50,6 +52,7 @@ src_prepare() { src_configure() { econf \ + --disable-static \ --enable-$(usex debug debug release) \ $(use_enable bzip2 bz2lib) \ $(use_enable jpeg) \ @@ -63,7 +66,7 @@ src_configure() { src_compile() { emake - use doc && emake -C "${S}"/doc docs + use doc && emake -C doc docs } src_install() { @@ -73,28 +76,29 @@ src_install() { 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 - mv "${CP}" "${ED}/usr/bin/fox-ControlPanel-${SLOT}" || \ + local CP="${ED}"/usr/bin/ControlPanel + if [[ -f ${CP} ]]; then + mv "${CP}" "${ED}"/usr/bin/fox-ControlPanel-${SLOT} || \ die "Failed to install ControlPanel" fi - for doc in ADDITIONS AUTHORS LICENSE_ADDENDUM README TRACING ; do - [[ -f $doc ]] && dodoc $doc - done + dodoc ADDITIONS AUTHORS LICENSE_ADDENDUM README TRACING - # remove documentation if USE=-doc - use doc || rm -fr "${D}/usr/share/doc/${PF}/html" - - # install class reference docs if USE=doc if use doc; then + # install class reference docs if USE=doc docinto html - dodoc -r "${S}/doc/ref" + dodoc -r doc/ref + else + # remove documentation if USE=-doc + rm -rf "${ED}"/usr/share/doc/${PF}/html || die fi # slot fox-config - if [[ -f ${D}/usr/bin/fox-config ]] ; then - mv "${D}/usr/bin/fox-config" "${D}/usr/bin/fox-${SLOT}-config" \ + if [[ -f ${ED}/usr/bin/fox-config ]] ; then + mv "${ED}"/usr/bin/fox-config "${ED}"/usr/bin/fox-${SLOT}-config \ || die "failed to install fox-config" fi + + # no static archives + find "${D}" -name '*.la' -delete || die }