Gentoo Archives: gentoo-commits

From: "Andreas K. Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/dejagnu/files/, dev-util/dejagnu/
Date: Tue, 04 Jun 2019 05:14:54
Message-Id: 1559625253.3eebda9213b450a9bcb9859672da5d286143bab4.dilfridge@gentoo
1 commit: 3eebda9213b450a9bcb9859672da5d286143bab4
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jun 4 05:14:13 2019 +0000
4 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 4 05:14:13 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eebda92
7
8 dev-util/dejagnu: remove old
9
10 Package-Manager: Portage-2.3.67, Repoman-2.3.13
11 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
12
13 dev-util/dejagnu/Manifest | 2 -
14 dev-util/dejagnu/dejagnu-1.4.4-r3.ebuild | 39 -------------------
15 dev-util/dejagnu/dejagnu-1.5.ebuild | 29 --------------
16 .../dejagnu/files/dejagnu-1.4.4-rsh-username.patch | 45 ----------------------
17 .../files/dejagnu-1.4.4-testglue-protos.patch | 21 ----------
18 .../dejagnu/files/dejagnu-ignore-libwarning.patch | 23 -----------
19 6 files changed, 159 deletions(-)
20
21 diff --git a/dev-util/dejagnu/Manifest b/dev-util/dejagnu/Manifest
22 index dfe30ea08b2..4e59d378ad9 100644
23 --- a/dev-util/dejagnu/Manifest
24 +++ b/dev-util/dejagnu/Manifest
25 @@ -1,3 +1 @@
26 -DIST dejagnu-1.4.4.tar.gz 1080346 BLAKE2B 183566795c2ba9cf4acbc9c39e93a45b50409eefef0ae2039cbdf56135e367552d190e5b01b5bceab4e26b3b05c0ea68e892b7c6bd419bc38bcfc7c5be27645e SHA512 fae08d4801b6a815af8771896e6e5eb12b297b773faa89743eac28d08c7eac6ed7e530921acdba1b9a7903990060c520497d281651d29d98ab0def1dbfab392e
27 -DIST dejagnu-1.5.tar.gz 576269 BLAKE2B df7767e5b8adbad7315e3489d3f8a267043e2bf27ed120ad7e534b9a6dc8c5ae2fa5fdbf7ff6fe530605998af4a09cc3b4b94881837b5f3c6336a9c515b5c7e2 SHA512 a9486e28f7ce25c34b59d00c0e4862bbb4b7a01d8faae0d1f28669b9d3ded9ed233b892aa27c34e1d06911f071d894aba7c1469e2fd0bddaa5611c2383e4974f
28 DIST dejagnu-1.6.tar.gz 523969 BLAKE2B 1cc9498aacd681570cd8d8834cd2fe0594bb49e6664cfe934b824dba0bd4a6766f977de6a1dc4596095a11d68844873f5687000423f4928f0432981023d26451 SHA512 a494dd5cde8d275b397116049c93e183f5f1731d63660ee8d2f4263b099fc5be7fbddde927fab3ccd5f000c43d50242f94bbb4d95497b915ea53be418bc145bc
29
30 diff --git a/dev-util/dejagnu/dejagnu-1.4.4-r3.ebuild b/dev-util/dejagnu/dejagnu-1.4.4-r3.ebuild
31 deleted file mode 100644
32 index d1e7f9a820b..00000000000
33 --- a/dev-util/dejagnu/dejagnu-1.4.4-r3.ebuild
34 +++ /dev/null
35 @@ -1,39 +0,0 @@
36 -# Copyright 1999-2018 Gentoo Foundation
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=0
40 -
41 -inherit eutils
42 -
43 -DESCRIPTION="framework for testing other programs"
44 -HOMEPAGE="https://www.gnu.org/software/dejagnu/"
45 -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
46 -
47 -LICENSE="GPL-2"
48 -SLOT="0"
49 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
50 -IUSE="doc"
51 -
52 -DEPEND="dev-lang/tcl
53 - dev-tcltk/expect"
54 -
55 -src_unpack() {
56 - unpack ${A}
57 - cd "${S}"
58 - epatch "${FILESDIR}"/dejagnu-ignore-libwarning.patch
59 - epatch "${FILESDIR}"/${P}-rsh-username.patch
60 - epatch "${FILESDIR}"/${P}-testglue-protos.patch
61 -}
62 -
63 -src_test() {
64 - # if you dont have dejagnu emerged yet, you cant
65 - # run the tests ... crazy aint it :)
66 - type -p runtest || return 0
67 - emake check || die "check failed :("
68 -}
69 -
70 -src_install() {
71 - emake -j1 install DESTDIR="${D}" || die
72 - dodoc AUTHORS ChangeLog NEWS README TODO
73 - use doc && dohtml -r doc/html/
74 -}
75
76 diff --git a/dev-util/dejagnu/dejagnu-1.5.ebuild b/dev-util/dejagnu/dejagnu-1.5.ebuild
77 deleted file mode 100644
78 index 5b3deb69ffc..00000000000
79 --- a/dev-util/dejagnu/dejagnu-1.5.ebuild
80 +++ /dev/null
81 @@ -1,29 +0,0 @@
82 -# Copyright 1999-2018 Gentoo Foundation
83 -# Distributed under the terms of the GNU General Public License v2
84 -
85 -EAPI=0
86 -
87 -DESCRIPTION="framework for testing other programs"
88 -HOMEPAGE="https://www.gnu.org/software/dejagnu/"
89 -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
90 -
91 -LICENSE="GPL-3"
92 -SLOT="0"
93 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
94 -IUSE="doc"
95 -
96 -DEPEND="dev-lang/tcl
97 - dev-tcltk/expect"
98 -
99 -src_test() {
100 - # if you dont have dejagnu emerged yet, you cant
101 - # run the tests ... crazy aint it :)
102 - type -p runtest || return 0
103 - emake check || die "check failed :("
104 -}
105 -
106 -src_install() {
107 - emake install DESTDIR="${D}" || die
108 - dodoc AUTHORS ChangeLog NEWS README TODO
109 - use doc && dohtml -r doc/html/
110 -}
111
112 diff --git a/dev-util/dejagnu/files/dejagnu-1.4.4-rsh-username.patch b/dev-util/dejagnu/files/dejagnu-1.4.4-rsh-username.patch
113 deleted file mode 100644
114 index ff4e970a4fd..00000000000
115 --- a/dev-util/dejagnu/files/dejagnu-1.4.4-rsh-username.patch
116 +++ /dev/null
117 @@ -1,45 +0,0 @@
118 -fix from upstream:
119 -
120 -2004-03-05 Daniel Jacobowitz <drow@××××××.com>
121 -
122 - * lib/remote.exp (standard_spawn): Fix rsh username support.
123 -
124 -diff --git a/lib/remote.exp b/lib/remote.exp
125 -index b57276e..cdec0d2 100644
126 ---- a/lib/remote.exp
127 -+++ b/lib/remote.exp
128 -@@ -860,19 +860,18 @@ proc standard_spawn { dest commandline } {
129 - set RSH [board_info $dest rsh_prog]
130 - }
131 -
132 -- if ![board_info $dest exists username] {
133 -- set rsh_useropts ""
134 -- } else {
135 -- set rsh_useropts "-l $username"
136 -- }
137 --
138 - if [board_info $dest exists hostname] {
139 - set remote [board_info $dest hostname]
140 - } else {
141 - set remote $dest
142 - }
143 -
144 -- spawn $RSH $rsh_useropts $remote $commandline
145 -+ if ![board_info $dest exists username] {
146 -+ spawn $RSH $remote $commandline
147 -+ } else {
148 -+ spawn $RSH -l [board_info $dest username] $remote $commandline
149 -+ }
150 -+
151 - set board_info($dest,fileid) $spawn_id
152 - return $spawn_id
153 - }
154 -@@ -1257,6 +1256,8 @@ proc remote_expect { board timeout args } {
155 - }
156 -
157 - if {$code == 1} {
158 -+ if {[info exists string]} {send_user "ERROR OCCURED: $errorInfo $errorCode $string"}
159 -+
160 - if { $error_sect != "" } {
161 - set code [catch {uplevel $error_sect} string]
162 - } else {
163
164 diff --git a/dev-util/dejagnu/files/dejagnu-1.4.4-testglue-protos.patch b/dev-util/dejagnu/files/dejagnu-1.4.4-testglue-protos.patch
165 deleted file mode 100644
166 index 4ddaffb1c66..00000000000
167 --- a/dev-util/dejagnu/files/dejagnu-1.4.4-testglue-protos.patch
168 +++ /dev/null
169 @@ -1,21 +0,0 @@
170 -fix from upstream:
171 -
172 -2004-08-20 Daniel Jacobowitz <dan@××××××.org>
173 -
174 - * testglue.c: Prototype abort(3) and exit(3).
175 -
176 -diff --git a/testglue.c b/testglue.c
177 -index 55a7f92..4ede6eb 100644
178 ---- a/testglue.c
179 -+++ b/testglue.c
180 -@@ -40,6 +40,10 @@
181 - #define ORIG_ABORT __wrap_abort
182 - #define ORIG_MAIN __wrap_main
183 - #endif
184 -+
185 -+extern void abort (void);
186 -+extern void exit (int);
187 -+
188 - #endif
189 -
190 - #ifdef REAL_MAIN
191
192 diff --git a/dev-util/dejagnu/files/dejagnu-ignore-libwarning.patch b/dev-util/dejagnu/files/dejagnu-ignore-libwarning.patch
193 deleted file mode 100644
194 index f4af06e6ff8..00000000000
195 --- a/dev-util/dejagnu/files/dejagnu-ignore-libwarning.patch
196 +++ /dev/null
197 @@ -1,23 +0,0 @@
198 -dejagnu/ChangeLog
199 - * lib/target.exp (prune_warnings): Correct pic/PIC regexp.
200 - Ignore incompatible library warning.
201 -
202 -Index: dejagnu/lib/target.exp
203 -===================================================================
204 -RCS file: /cvs/src/src/dejagnu/lib/target.exp,v
205 -retrieving revision 1.12
206 -diff -u -p -r1.12 target.exp
207 ---- dejagnu/lib/target.exp 21 Apr 2002 08:47:07 -0000 1.12
208 -+++ dejagnu/lib/target.exp 9 Jun 2003 07:34:06 -0000
209 -@@ -279,7 +279,10 @@ proc prune_warnings { text } {
210 - regsub -all "(^|\n)\[^\n\]*: warning: as it has already been specified\[^\n\]*" $text "" text
211 -
212 - # Cygwin cc1 warns about -fpic and -fPIC
213 -- regsub -all ".*: warning: -f(pic|PIC) ignored for target .*" $text "" text
214 -+ regsub -all "(^|\n)\[^\n\]*: warning: -f(pic|PIC) ignored for target \[^\n\]*" $text "" text
215 -+
216 -+ # Ignore linker warning when searching 64bit libraries in /lib.
217 -+ regsub -all "(^|\n)\[^\n\]*: skipping incompatible \[^\n\]* when searching for \[^\n\]*" $text "" text
218 -
219 - # It might be tempting to get carried away and delete blank lines, etc.
220 - # Just delete *exactly* what we're ask to, and that's it.