commit:     68d838966e51132cce3f9fc08caf139730c54386
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  7 19:26:10 2018 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Oct  7 19:26:10 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68d83896

dev-tcltk/bwidget: bump to 1.9.12 and fix test

Closes: https://bugs.gentoo.org/630888
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 dev-tcltk/bwidget/Manifest                               |  1 +
 .../{bwidget-1.9.9.ebuild => bwidget-1.9.12.ebuild}      | 16 +++++++---------
 dev-tcltk/bwidget/bwidget-1.9.9.ebuild                   |  4 ++--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/dev-tcltk/bwidget/Manifest b/dev-tcltk/bwidget/Manifest
index b9cd937923b..f5e7dab4385 100644
--- a/dev-tcltk/bwidget/Manifest
+++ b/dev-tcltk/bwidget/Manifest
@@ -1,2 +1,3 @@
+DIST bwidget-1.9.12.tar.gz 254905 BLAKE2B 
02b206b9d19ec9580003a8549aa14d2bce230f8dc9834fcd2ba327bee2cf1f90c324f1804e175b89055d5f5f8727253132d186e9230efdc8b29e390e3cf2bf6b
 SHA512 
0e01725ec65041a47a32625f2687e22bc42ccd581a26b3ca7be5a969b0b901c07fd5887a47ff846cc1111767a72cfc6e31f4aa99a1c9040a6f08705d97a5970f
 DIST bwidget-1.9.8.tar.gz 252668 BLAKE2B 
d7318b3ac932fd0ab9a5fb180e3ca739012e2e6583ba8e3366b6a63c85bfda26ea2f2534540442f9a2047cc27179877658bf492ccfac8106858d049f46f33034
 SHA512 
437958871809c8ce285cbf4521ff08720d106dca708183ff94234015da2b04ccb3a7b05df13d8e3f46466106c91418607c5983fc4ed8d9c4285ae0a0b1071262
 DIST bwidget-1.9.9.tar.gz 243001 BLAKE2B 
31935584e5c6737b143e67113f7d5fb34450ea5bf7852f3c72691abcb1545752f1607945377ac1cb68e5bb256aabc8f92aa193d2a63149ab3de0b74c074409d2
 SHA512 
6374c9127ab37dd2cc3ede30fc525a7d0f226a995e44f7b1c9751e1c5520090bfbbae5cfcb5cbeec4d1c89eb8f4cd7eb2e453ac055d4ae5ef4b7b77512d2e042

diff --git a/dev-tcltk/bwidget/bwidget-1.9.9.ebuild 
b/dev-tcltk/bwidget/bwidget-1.9.12.ebuild
similarity index 68%
copy from dev-tcltk/bwidget/bwidget-1.9.9.ebuild
copy to dev-tcltk/bwidget/bwidget-1.9.12.ebuild
index c7518e156e9..f13b72b2fa6 100644
--- a/dev-tcltk/bwidget/bwidget-1.9.9.ebuild
+++ b/dev-tcltk/bwidget/bwidget-1.9.12.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit eutils multilib virtualx
 
@@ -10,7 +10,7 @@ MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="High-level widget set for Tcl/Tk"
 HOMEPAGE="http://tcllib.sourceforge.net/";
-SRC_URI="mirror://sourceforge/project/tcllib/${MY_PN}/${PV}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/tcllib/${MY_PN}/${PV}/${P}.tar.gz"
 
 LICENSE="tcltk"
 SLOT="0"
@@ -20,13 +20,10 @@ IUSE="doc"
 DEPEND="dev-lang/tk:0"
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-       epatch "${FILESDIR}"/${PN}-1.9.8-test.patch
-}
+PATCHES=( "${FILESDIR}"/${PN}-1.9.8-test.patch )
 
 src_test() {
-       VIRTUALX_COMMAND=tclsh
-       virtualmake tests/entry.test
+       TCLLIBPATH=${S} virtx tclsh tests/entry.test
 }
 
 src_install() {
@@ -38,5 +35,6 @@ src_install() {
        doins -r demo
        dodoc ChangeLog README.txt
 
-       use doc && dohtml BWman/*
+       docinto html
+       use doc && dodoc -r BWman/*
 }

diff --git a/dev-tcltk/bwidget/bwidget-1.9.9.ebuild 
b/dev-tcltk/bwidget/bwidget-1.9.9.ebuild
index c7518e156e9..7b2f79c479e 100644
--- a/dev-tcltk/bwidget/bwidget-1.9.9.ebuild
+++ b/dev-tcltk/bwidget/bwidget-1.9.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,7 +26,7 @@ src_prepare() {
 
 src_test() {
        VIRTUALX_COMMAND=tclsh
-       virtualmake tests/entry.test
+       TCLLIBPATH="${S}" virtualmake tests/entry.test
 }
 
 src_install() {

Reply via email to