1 |
commit: 68d838966e51132cce3f9fc08caf139730c54386 |
2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Oct 7 19:26:10 2018 +0000 |
4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 7 19:26:10 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68d83896 |
7 |
|
8 |
dev-tcltk/bwidget: bump to 1.9.12 and fix test |
9 |
|
10 |
Closes: https://bugs.gentoo.org/630888 |
11 |
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> |
12 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
13 |
|
14 |
dev-tcltk/bwidget/Manifest | 1 + |
15 |
.../{bwidget-1.9.9.ebuild => bwidget-1.9.12.ebuild} | 16 +++++++--------- |
16 |
dev-tcltk/bwidget/bwidget-1.9.9.ebuild | 4 ++-- |
17 |
3 files changed, 10 insertions(+), 11 deletions(-) |
18 |
|
19 |
diff --git a/dev-tcltk/bwidget/Manifest b/dev-tcltk/bwidget/Manifest |
20 |
index b9cd937923b..f5e7dab4385 100644 |
21 |
--- a/dev-tcltk/bwidget/Manifest |
22 |
+++ b/dev-tcltk/bwidget/Manifest |
23 |
@@ -1,2 +1,3 @@ |
24 |
+DIST bwidget-1.9.12.tar.gz 254905 BLAKE2B 02b206b9d19ec9580003a8549aa14d2bce230f8dc9834fcd2ba327bee2cf1f90c324f1804e175b89055d5f5f8727253132d186e9230efdc8b29e390e3cf2bf6b SHA512 0e01725ec65041a47a32625f2687e22bc42ccd581a26b3ca7be5a969b0b901c07fd5887a47ff846cc1111767a72cfc6e31f4aa99a1c9040a6f08705d97a5970f |
25 |
DIST bwidget-1.9.8.tar.gz 252668 BLAKE2B d7318b3ac932fd0ab9a5fb180e3ca739012e2e6583ba8e3366b6a63c85bfda26ea2f2534540442f9a2047cc27179877658bf492ccfac8106858d049f46f33034 SHA512 437958871809c8ce285cbf4521ff08720d106dca708183ff94234015da2b04ccb3a7b05df13d8e3f46466106c91418607c5983fc4ed8d9c4285ae0a0b1071262 |
26 |
DIST bwidget-1.9.9.tar.gz 243001 BLAKE2B 31935584e5c6737b143e67113f7d5fb34450ea5bf7852f3c72691abcb1545752f1607945377ac1cb68e5bb256aabc8f92aa193d2a63149ab3de0b74c074409d2 SHA512 6374c9127ab37dd2cc3ede30fc525a7d0f226a995e44f7b1c9751e1c5520090bfbbae5cfcb5cbeec4d1c89eb8f4cd7eb2e453ac055d4ae5ef4b7b77512d2e042 |
27 |
|
28 |
diff --git a/dev-tcltk/bwidget/bwidget-1.9.9.ebuild b/dev-tcltk/bwidget/bwidget-1.9.12.ebuild |
29 |
similarity index 68% |
30 |
copy from dev-tcltk/bwidget/bwidget-1.9.9.ebuild |
31 |
copy to dev-tcltk/bwidget/bwidget-1.9.12.ebuild |
32 |
index c7518e156e9..f13b72b2fa6 100644 |
33 |
--- a/dev-tcltk/bwidget/bwidget-1.9.9.ebuild |
34 |
+++ b/dev-tcltk/bwidget/bwidget-1.9.12.ebuild |
35 |
@@ -1,7 +1,7 @@ |
36 |
-# Copyright 1999-2017 Gentoo Foundation |
37 |
+# Copyright 1999-2018 Gentoo Foundation |
38 |
# Distributed under the terms of the GNU General Public License v2 |
39 |
|
40 |
-EAPI=5 |
41 |
+EAPI=6 |
42 |
|
43 |
inherit eutils multilib virtualx |
44 |
|
45 |
@@ -10,7 +10,7 @@ MY_P=${MY_PN}-${PV} |
46 |
|
47 |
DESCRIPTION="High-level widget set for Tcl/Tk" |
48 |
HOMEPAGE="http://tcllib.sourceforge.net/" |
49 |
-SRC_URI="mirror://sourceforge/project/tcllib/${MY_PN}/${PV}/${P}.tar.gz" |
50 |
+SRC_URI="mirror://sourceforge/tcllib/${MY_PN}/${PV}/${P}.tar.gz" |
51 |
|
52 |
LICENSE="tcltk" |
53 |
SLOT="0" |
54 |
@@ -20,13 +20,10 @@ IUSE="doc" |
55 |
DEPEND="dev-lang/tk:0" |
56 |
RDEPEND="${DEPEND}" |
57 |
|
58 |
-src_prepare() { |
59 |
- epatch "${FILESDIR}"/${PN}-1.9.8-test.patch |
60 |
-} |
61 |
+PATCHES=( "${FILESDIR}"/${PN}-1.9.8-test.patch ) |
62 |
|
63 |
src_test() { |
64 |
- VIRTUALX_COMMAND=tclsh |
65 |
- virtualmake tests/entry.test |
66 |
+ TCLLIBPATH=${S} virtx tclsh tests/entry.test |
67 |
} |
68 |
|
69 |
src_install() { |
70 |
@@ -38,5 +35,6 @@ src_install() { |
71 |
doins -r demo |
72 |
dodoc ChangeLog README.txt |
73 |
|
74 |
- use doc && dohtml BWman/* |
75 |
+ docinto html |
76 |
+ use doc && dodoc -r BWman/* |
77 |
} |
78 |
|
79 |
diff --git a/dev-tcltk/bwidget/bwidget-1.9.9.ebuild b/dev-tcltk/bwidget/bwidget-1.9.9.ebuild |
80 |
index c7518e156e9..7b2f79c479e 100644 |
81 |
--- a/dev-tcltk/bwidget/bwidget-1.9.9.ebuild |
82 |
+++ b/dev-tcltk/bwidget/bwidget-1.9.9.ebuild |
83 |
@@ -1,4 +1,4 @@ |
84 |
-# Copyright 1999-2017 Gentoo Foundation |
85 |
+# Copyright 1999-2018 Gentoo Foundation |
86 |
# Distributed under the terms of the GNU General Public License v2 |
87 |
|
88 |
EAPI=5 |
89 |
@@ -26,7 +26,7 @@ src_prepare() { |
90 |
|
91 |
src_test() { |
92 |
VIRTUALX_COMMAND=tclsh |
93 |
- virtualmake tests/entry.test |
94 |
+ TCLLIBPATH="${S}" virtualmake tests/entry.test |
95 |
} |
96 |
|
97 |
src_install() { |