From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1048938-garchives=archives.gentoo.org@lists.gentoo.org>
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 D5447138334
for <garchives@archives.gentoo.org>; Wed, 26 Sep 2018 23:01:34 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 2C358E08C0;
Wed, 26 Sep 2018 23:01:34 +0000 (UTC)
Received: from smtp.gentoo.org (dev.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 01BC9E08C0
for <gentoo-commits@lists.gentoo.org>; Wed, 26 Sep 2018 23:01:32 +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 C3621335CCB
for <gentoo-commits@lists.gentoo.org>; Wed, 26 Sep 2018 23:01:30 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 8A1B13F8
for <gentoo-commits@lists.gentoo.org>; Wed, 26 Sep 2018 23:01:28 +0000 (UTC)
From: "Patrice Clement" <monsieurp@gentoo.org>
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" <monsieurp@gentoo.org>
Message-ID: <1538002876.5757f98d00cb5c484bd3b7d386f15d28d16ef774.monsieurp@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/dillo/
X-VCS-Repository: repo/gentoo
X-VCS-Files: www-client/dillo/dillo-9999.ebuild
X-VCS-Directories: www-client/dillo/
X-VCS-Committer: monsieurp
X-VCS-Committer-Name: Patrice Clement
X-VCS-Revision: 5757f98d00cb5c484bd3b7d386f15d28d16ef774
X-VCS-Branch: master
Date: Wed, 26 Sep 2018 23:01:28 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: a8e4ca21-8916-445a-a585-882181dd70ad
X-Archives-Hash: 0ae7a433eff5f38e7069208ece2d7195
commit: 5757f98d00cb5c484bd3b7d386f15d28d16ef774
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Sep 11 17:58:59 2018 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Sep 26 23:01:16 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5757f98d
www-client/dillo: EAPI7 and improve ebuild.
Closes: https://bugs.gentoo.org/665720
Closes: https://github.com/gentoo/gentoo/pull/9830
www-client/dillo/dillo-9999.ebuild | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/www-client/dillo/dillo-9999.ebuild b/www-client/dillo/dillo-9999.ebuild
index 0d478f4ab15..b0388a0b17e 100644
--- a/www-client/dillo/dillo-9999.ebuild
+++ b/www-client/dillo/dillo-9999.ebuild
@@ -1,8 +1,9 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit autotools eutils mercurial multilib toolchain-funcs
+EAPI=7
+
+inherit autotools desktop mercurial toolchain-funcs
DESCRIPTION="Lean FLTK based web browser"
HOMEPAGE="https://www.dillo.org/"
@@ -29,6 +30,8 @@ PATCHES=(
"${FILESDIR}"/${PN}2-inbuf.patch
)
+DOCS="AUTHORS ChangeLog README NEWS doc/*.txt doc/README"
+
src_prepare() {
default
eautoreconf
@@ -52,12 +55,12 @@ src_compile() {
}
src_install() {
- dodir /etc
default
- use doc && dohtml html/*
- dodoc AUTHORS ChangeLog README NEWS
- dodoc doc/*.txt doc/README
+ if use doc; then
+ docinto html
+ dodoc -r html/
+ fi
doicon "${DISTDIR}"/${PN}.png
make_desktop_entry ${PN} Dillo