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 34B071395E2 for ; Mon, 28 Nov 2016 18:37:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 941D0E0B24; Mon, 28 Nov 2016 18:37:47 +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 6AEC9E0B24 for ; Mon, 28 Nov 2016 18:37:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 97273340F43 for ; Mon, 28 Nov 2016 18:37:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 67E3A49A for ; Mon, 28 Nov 2016 18:37:45 +0000 (UTC) From: "Patrice Clement" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrice Clement" Message-ID: <1480358262.a31ab215029444fca12882e0a3571211f0180102.monsieurp@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/links/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/links/links-2.14.ebuild X-VCS-Directories: www-client/links/ X-VCS-Committer: monsieurp X-VCS-Committer-Name: Patrice Clement X-VCS-Revision: a31ab215029444fca12882e0a3571211f0180102 X-VCS-Branch: master Date: Mon, 28 Nov 2016 18:37:45 +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: e2f8899a-2d37-4be1-b23e-4df9a6e98a3c X-Archives-Hash: 633508831302c0958263101c90a8a054 commit: a31ab215029444fca12882e0a3571211f0180102 Author: Patrice Clement gentoo org> AuthorDate: Mon Nov 28 15:47:33 2016 +0000 Commit: Patrice Clement gentoo org> CommitDate: Mon Nov 28 18:37:42 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a31ab215 www-client/links: minor fixes. * Sort USE flags in RDEPEND. * Add missing dies in src_install() phase. Package-Manager: portage-2.3.0 www-client/links/links-2.14.ebuild | 53 ++++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 17 deletions(-) diff --git a/www-client/links/links-2.14.ebuild b/www-client/links/links-2.14.ebuild index 0ad18e4..607bc77 100644 --- a/www-client/links/links-2.14.ebuild +++ b/www-client/links/links-2.14.ebuild @@ -20,21 +20,34 @@ IUSE="bzip2 directfb fbcon gpm ipv6 jpeg libevent libressl livecd lzma ssl suid GRAPHICS_DEPEND="media-libs/libpng:0=" -RDEPEND="bzip2? ( app-arch/bzip2 ) +RDEPEND=" + bzip2? ( + app-arch/bzip2 + ) directfb? ( ${GRAPHICS_DEPEND} dev-libs/DirectFB - ) - fbcon? ( ${GRAPHICS_DEPEND} ) - gpm? ( sys-libs/gpm ) - jpeg? ( virtual/jpeg:0 ) - libevent? ( dev-libs/libevent:0= ) + ) + fbcon? ( + ${GRAPHICS_DEPEND} + ) + gpm? ( + sys-libs/gpm + ) + jpeg? ( + virtual/jpeg:0 + ) + libevent? ( + dev-libs/libevent:0= + ) livecd? ( ${GRAPHICS_DEPEND} sys-libs/gpm virtual/jpeg:0 - ) - lzma? ( app-arch/xz-utils ) + ) + lzma? ( + app-arch/xz-utils + ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) @@ -42,13 +55,17 @@ RDEPEND="bzip2? ( app-arch/bzip2 ) svga? ( ${GRAPHICS_DEPEND} media-libs/svgalib - ) - tiff? ( media-libs/tiff:0 ) + ) + tiff? ( + media-libs/tiff:0 + ) X? ( ${GRAPHICS_DEPEND} x11-libs/libXext - ) - zlib? ( sys-libs/zlib )" + ) + zlib? ( + sys-libs/zlib + )" DEPEND="${RDEPEND} virtual/pkgconfig @@ -64,10 +81,10 @@ src_prepare() { default if use unicode; then - pushd intl >/dev/null + pushd intl > /dev/null || die ./gen-intl || die ./synclang || die - popd >/dev/null + popd > /dev/null || die fi # error: conditional "am__fastdepCXX" was never defined (for eautoreconf) @@ -120,9 +137,11 @@ src_install() { newicon Links_logo.png links.png make_desktop_entry 'links -g %u' Links links 'Network;WebBrowser' local d="${ED}"/usr/share/applications - echo 'MimeType=x-scheme-handler/http;' >> "${d}"/*.desktop - use ssl && sed -i -e 's:x-scheme-handler/http;:&x-scheme-handler/https;:' \ - "${d}"/*.desktop + echo 'MimeType=x-scheme-handler/http;' >> "${d}"/*.desktop || die + if use ssl; then + sed -i -e 's:x-scheme-handler/http;:&x-scheme-handler/https;:' \ + "${d}"/*.desktop || die + fi fi use suid && fperms 4755 /usr/bin/links