commit: 87346ea1a3c87960bab9e2dbaf4c9089859f03b3 Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> AuthorDate: Sat Oct 12 14:19:31 2019 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> 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 <tupone <AT> 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 }
