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 52340138350 for ; Wed, 25 Mar 2020 12:18:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 936BAE09D5; Wed, 25 Mar 2020 12:18:05 +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 5AD05E09D5 for ; Wed, 25 Mar 2020 12:18:05 +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 DF1E634F35A for ; Wed, 25 Mar 2020 12:18:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 55834186 for ; Wed, 25 Mar 2020 12:18:02 +0000 (UTC) From: "Ben Kohler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ben Kohler" Message-ID: <1585138641.1bc13772e779f278b24c72a115535ff904d30d83.bkohler@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.20.2-r1.ebuild X-VCS-Directories: www-client/links/ X-VCS-Committer: bkohler X-VCS-Committer-Name: Ben Kohler X-VCS-Revision: 1bc13772e779f278b24c72a115535ff904d30d83 X-VCS-Branch: master Date: Wed, 25 Mar 2020 12:18:02 +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: 7f390aae-3105-46b0-a5e4-848cf900be06 X-Archives-Hash: 15808e3a87006f01731edf2e6d440970 commit: 1bc13772e779f278b24c72a115535ff904d30d83 Author: Ben Kohler gentoo org> AuthorDate: Wed Mar 25 12:15:43 2020 +0000 Commit: Ben Kohler gentoo org> CommitDate: Wed Mar 25 12:17:21 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bc13772 Revert "www-client/links: make inherits conditional." This change is very illegal: https://dev.gentoo.org/~ulm/pms/head/pms.html#x1-10500010.1 https://devmanual.gentoo.org/ebuild-writing/using-eclasses/index.html This reverts commit a76f277c5df141247cf5fec4afda4c38361f97d2. Signed-off-by: Ben Kohler gentoo.org> www-client/links/links-2.20.2-r1.ebuild | 183 -------------------------------- 1 file changed, 183 deletions(-) diff --git a/www-client/links/links-2.20.2-r1.ebuild b/www-client/links/links-2.20.2-r1.ebuild deleted file mode 100644 index f98e0e8aa12..00000000000 --- a/www-client/links/links-2.20.2-r1.ebuild +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -DESCRIPTION="A fast and lightweight web browser running in both graphics and text mode" -HOMEPAGE="http://links.twibright.com/" -SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="brotli bzip2 fbcon freetype gpm ipv6 jpeg libevent libressl livecd lzip lzma ssl suid svga tiff unicode X zlib zstd" - -GRAPHICS_DEPEND="media-libs/libpng:0=" - -RDEPEND=" - brotli? ( - app-arch/brotli - ) - bzip2? ( - app-arch/bzip2 - ) - fbcon? ( - ${GRAPHICS_DEPEND} - ) - freetype? ( - media-libs/fontconfig - media-libs/freetype - ) - gpm? ( - sys-libs/gpm - ) - jpeg? ( - virtual/jpeg:0 - ) - libevent? ( - dev-libs/libevent:0= - ) - livecd? ( - ${GRAPHICS_DEPEND} - sys-libs/gpm - virtual/jpeg:0 - ) - lzip? ( - app-arch/lzip - ) - lzma? ( - app-arch/xz-utils - ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - svga? ( - ${GRAPHICS_DEPEND} - media-libs/svgalib - ) - tiff? ( - media-libs/tiff:0 - ) - X? ( - ${GRAPHICS_DEPEND} - x11-libs/libXext - ) - zlib? ( - sys-libs/zlib - ) - zstd? ( - app-arch/zstd - )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - fbcon? ( virtual/os-headers ) - livecd? ( virtual/os-headers )" - -REQUIRED_USE="!livecd? ( fbcon? ( gpm ) ) - svga? ( suid )" - -DOCS=( AUTHORS BRAILLE_HOWTO ChangeLog KEYS NEWS README SITES ) - -src_prepare() { - if use X; then - inherit xdg - xdg_src_prepare - fi - - if use unicode; then - pushd intl > /dev/null || die - ./gen-intl || die - ./synclang || die - popd > /dev/null || die - fi - - # error: conditional "am__fastdepCXX" was never defined (for eautoreconf) - sed -i \ - -e '/AC_PROG_CXX/s:dnl ::' \ - -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \ - configure.in || die #467020 - - # Upstream configure produced by broken autoconf-2.13. This also fixes - # toolchain detection. - mv configure.in configure.ac || die - eautoreconf #131440 and #103483#c23 -} - -src_configure() { - local myconf - - if use livecd; then - export ac_cv_lib_gpm_Gpm_Open=yes - myconf+=' --with-fb --with-libjpeg' - else - export ac_cv_lib_gpm_Gpm_Open=$(usex gpm) - fi - - if use X || use fbcon || use svga || use livecd; then - myconf+=' --enable-graphics' - fi - - econf \ - --without-directfb \ - --without-librsvg \ - $(use_with brotli) \ - $(use_with bzip2) \ - $(use_with fbcon fb) \ - $(use_with freetype) \ - $(use_with ipv6) \ - $(use_with jpeg libjpeg) \ - $(use_with libevent) \ - $(use_with lzip) \ - $(use_with lzma) \ - $(use_with ssl) \ - $(use_with svga svgalib) \ - $(use_with tiff libtiff) \ - $(use_with X x) \ - $(use_with zlib) \ - $(use_with zstd) \ - ${myconf} -} - -src_install() { - HTML_DOCS="doc/links_cal/*" - default - - if use X; then - inherit desktop - 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 || 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 -} - -pkg_preinst() { - if use X; then - inherit xdg - xdg_pkg_preinst - fi -} - -pkg_postinst() { - if use X; then - inherit xdg - xdg_pkg_postinst - fi -} - -pkg_postrm() { - if use X; then - inherit xdg - xdg_pkg_postrm - fi -}