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 4660D138334 for ; Sat, 12 Oct 2019 14:19:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 83BB0E0855; Sat, 12 Oct 2019 14:19:49 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 5AA78E0855 for ; Sat, 12 Oct 2019 14:19:49 +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 866EF34BC4F for ; Sat, 12 Oct 2019 14:19:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CDBE5838 for ; Sat, 12 Oct 2019 14:19:46 +0000 (UTC) From: "Alfredo Tupone" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alfredo Tupone" Message-ID: <1570889971.87346ea1a3c87960bab9e2dbaf4c9089859f03b3.tupone@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/vtcl/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-tcltk/vtcl/vtcl-1.6.0-r1.ebuild dev-tcltk/vtcl/vtcl-1.6.0-r2.ebuild X-VCS-Directories: dev-tcltk/vtcl/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: 87346ea1a3c87960bab9e2dbaf4c9089859f03b3 X-VCS-Branch: master Date: Sat, 12 Oct 2019 14:19:46 +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: 443df827-dc1b-4e0c-8537-2b141d9f398e X-Archives-Hash: 4133e9cdda3e17f314425ee999b663e3 commit: 87346ea1a3c87960bab9e2dbaf4c9089859f03b3 Author: Tupone Alfredo gentoo org> AuthorDate: Sat Oct 12 14:19:31 2019 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Sat Oct 12 14:19:31 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87346ea1 dev-tcltk/vtcl: EAPI 7 Closes: https://bugs.gentoo.org/697338 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Alfredo Tupone gentoo.org> dev-tcltk/vtcl/vtcl-1.6.0-r1.ebuild | 3 ++- .../{vtcl-1.6.0-r1.ebuild => vtcl-1.6.0-r2.ebuild} | 23 ++++++++++++---------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dev-tcltk/vtcl/vtcl-1.6.0-r1.ebuild b/dev-tcltk/vtcl/vtcl-1.6.0-r1.ebuild index 596e52294e4..6b09343c421 100644 --- a/dev-tcltk/vtcl/vtcl-1.6.0-r1.ebuild +++ b/dev-tcltk/vtcl/vtcl-1.6.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=0 @@ -11,6 +11,7 @@ SLOT="0" KEYWORDS="amd64 ppc x86" IUSE="doc" DEPEND="dev-lang/tk" +RDEPEND="${DEPEND}" MY_DESTDIR=/usr/share/${PN} src_compile() { diff --git a/dev-tcltk/vtcl/vtcl-1.6.0-r1.ebuild b/dev-tcltk/vtcl/vtcl-1.6.0-r2.ebuild similarity index 68% copy from dev-tcltk/vtcl/vtcl-1.6.0-r1.ebuild copy to dev-tcltk/vtcl/vtcl-1.6.0-r2.ebuild index 596e52294e4..5080e7e70cc 100644 --- a/dev-tcltk/vtcl/vtcl-1.6.0-r1.ebuild +++ b/dev-tcltk/vtcl/vtcl-1.6.0-r2.ebuild @@ -1,29 +1,32 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=0 +EAPI=7 DESCRIPTION="Visual Tcl is a high-quality application development environment" HOMEPAGE="http://vtcl.sf.net" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc x86" +KEYWORDS="~amd64 ~ppc ~x86" IUSE="doc" -DEPEND="dev-lang/tk" +DEPEND="dev-lang/tk:*" +RDEPEND="${DEPEND}" MY_DESTDIR=/usr/share/${PN} + src_compile() { - ./configure || die sed -i 's,^\(VTCL_HOME=\).*,\1'${MY_DESTDIR}',g' vtcl || die "Path fixing failed." sed -i 's,package require -exact Tk ,package require Tk ,' lib/tkcon.tcl || die "Tcl8.5 patch failed" } src_install() { - dodir ${MY_DESTDIR} || die "Directory creation failed." - dobin vtcl || die + dodir ${MY_DESTDIR} + dobin vtcl cp -r ./{demo,images,lib,sample,vtcl.tcl} "${D}/${MY_DESTDIR}" || die "Data installation failed." - dodoc ChangeLog README - use doc && dodoc doc/tutorial.txt - use doc && dohtml doc/*html + if use doc; then + DOCS=( ChangeLog README doc/tutorial.txt ) + HTML_DOCS=( doc/*html ) + fi + einstalldocs }