From 2cffbb27724f260eae77cecb6b9eab5cd81185c8 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sat, 2 Mar 2013 17:49:02 +0000 Subject: dev-tcltk/tcllib: Fix test, #458454; remove colliding manpages, #458544 Package-Manager: portage-2.2.0_alpha164/cvs/Linux x86_64 Manifest-Sign-Key: 0x8009D6F070EB7916 --- dev-tcltk/tcllib/ChangeLog | 7 +- dev-tcltk/tcllib/Manifest | 18 +- dev-tcltk/tcllib/files/tcllib-1.14-test.patch | 39 ++ .../tcllib/files/tcllib-1.15-tcl8.6-test.patch | 411 +++++++++++++++++++++ dev-tcltk/tcllib/tcllib-1.14.ebuild | 10 +- dev-tcltk/tcllib/tcllib-1.15.ebuild | 15 +- 6 files changed, 483 insertions(+), 17 deletions(-) create mode 100644 dev-tcltk/tcllib/files/tcllib-1.14-test.patch create mode 100644 dev-tcltk/tcllib/files/tcllib-1.15-tcl8.6-test.patch (limited to 'dev-tcltk') diff --git a/dev-tcltk/tcllib/ChangeLog b/dev-tcltk/tcllib/ChangeLog index 755f9ef6ba79..cd58cf4d80f2 100644 --- a/dev-tcltk/tcllib/ChangeLog +++ b/dev-tcltk/tcllib/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-tcltk/tcllib # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcllib/ChangeLog,v 1.35 2013/02/20 15:37:43 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcllib/ChangeLog,v 1.36 2013/03/02 17:49:01 jlec Exp $ + + 02 Mar 2013; Justin Lecher tcllib-1.14.ebuild, + +files/tcllib-1.14-test.patch, tcllib-1.15.ebuild, + +files/tcllib-1.15-tcl8.6-test.patch: + Fix test, #458454; remove colliding manpages, #458544 *tcllib-1.15 (20 Feb 2013) diff --git a/dev-tcltk/tcllib/Manifest b/dev-tcltk/tcllib/Manifest index e59e56a3fd6c..c5a7f33b9823 100644 --- a/dev-tcltk/tcllib/Manifest +++ b/dev-tcltk/tcllib/Manifest @@ -1,16 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - +AUX tcllib-1.14-test.patch 1374 SHA256 86b2665a5507d879fac178f51fe5115855d162a54cf597580e0ebbd0524d9e9d SHA512 388a5dd5be63b24f0043097f873c375a2bfafa19946038b83f86bdd627335ab18ad7cd6f57481eb9f08429e6f61e77a4ba172b5d5d43ab0212fc5821a837665b WHIRLPOOL 658e8f09ae2e3bae6c87f83d54e909c5317713ccce160389667a20786367ad4c11057c9b192251e76cc3a5157ea5dd8cef11e225fb14bda05a2f75a8fc96f4e0 +AUX tcllib-1.15-tcl8.6-test.patch 12441 SHA256 613fcb1e6a738ee90e5f0fe93604444a8da7cb3c58c5cfd6550ee632f19d81d4 SHA512 76e1a4f3a18a357bbff8e0b1d997842b3a5ba1ab96079bea046cd82c0aa3ca8c8933b63f284ef5a50968a54bd2d31ecbc951f1b6605d359eca0bcfe70955373c WHIRLPOOL f862a9ccf81490a54b2aa22f12ba06a96d495d7bb74dce5bc5cec9f0d0c37ffed891e6e6053b0b15a2b9da2b11d805dee135bca198a0d7523f115e8c27c1ffcc DIST tcllib-1.14.tar.gz 5384078 SHA256 dd149fcb37ceb04da83531276a9d7563827807dcee49f9b9f63bedea9e130584 SHA512 ebaad3e269fbb22e518bc45671e49b5b1b0347e1fc4058c8a4432e19e533c6aa9cac71dbcd4bb3bbad94335a91d24f894bf01776a94c44cf89434ad204675003 WHIRLPOOL 7e638988ae7dba02d4a246364f93f474f4602bb98c9911191cfb48aba9cd61ecb75672f9e1e87693b6f437c2029cccf1f1ef0a66c33bbb1004cf3fa6707a3be0 DIST tcllib-1.15.tar.bz2 5030648 SHA256 7a1e27f6d2e625af15d13df6117958815c8482e662a914fc1cbd7f0b0e780e71 SHA512 544b1193266e860eb59a4c313645376bba8488711b2afc629d99d0e719252db79caae73022ae1dc21dc123f949fa8930f81112c3f80328fc83952b64f93ca3c4 WHIRLPOOL 75ef40710859c0f669fdac96ee7ed5d76d6a10081649d890cadc970c21478b2daddd8289853e38239d68ad9aae0dd9ee5ee94827f1bf0e4b5b511134024e062c -EBUILD tcllib-1.14.ebuild 772 SHA256 13ae1a2d369e8aeefafea7dd7e54a1a69b6fcf0b88dbe3b8bac7d17a0616cc7d SHA512 d8f08b9d3df4aea3ae7fb3276b986f49cbbe410aea793d432f72aaa21369eb5b02dc1cf96f6e1f2ecef933d5c732c0a4b4b0465a6c0cba7273e35093826070f5 WHIRLPOOL 9ec0fd1c47a867046a7962599efdb798ef3d58ead67f103a93be09b24a72a453d516890d6888957548f08af11fd0e8c5f75c502d837055f0a9ee1b63a9fb19d3 -EBUILD tcllib-1.15.ebuild 781 SHA256 692aaaace59c8e0fb1bc139076c8c3a42475481c125955fd4c0b1b143e3a91ad SHA512 51ee6d32360794a032dd16b3c986a53af99f5785509e2cfee4b272b14122c15151196ff0c5153564c16580542fc7ed3d1e25e1416593594739e5003b8ab81abc WHIRLPOOL 3f23e0369c2187f88ec9639678edd78df28314ffc655a5e66a254d508a1cac7db20a21aa1caec3e2d44c6ea3019ac3c9552f35ad4e7fba8444bc9656db504795 -MISC ChangeLog 4448 SHA256 04cb17767f6359110df136c7ac0f367227b324dcb76ab96de559b98e3e25a239 SHA512 d77ac494d00adad60beb22d896b389377607e7eb912b029cbbf38cd15c8b1e4d74a64d33c65de8943aed647e1a2224967492a58be0c4085acc31ec370d585f95 WHIRLPOOL a29fbf28f020eac0801c9e01d91caacd4acd46cadd4c8f6365981b505d4c73c86c2b57bd95f2246c0a4761e70f03d38a2c73c8ba45446f2f8acb8ea01648d02a +EBUILD tcllib-1.14.ebuild 845 SHA256 eeec6ca5d871590f5fe7a4bb27f9fb0253261ff6ee2a0fdbc5aab87014c75f88 SHA512 613d4ae5a0ccee239e82af2363dc9f2b274899d1d405fcb52782ee244689c1925de7c49021baee859973416e7669567a7473d41403907a856a7e1ff92cbf5e24 WHIRLPOOL 7660e72d2273a04b0660899b49ccc16e07ade2028cabfeaf2748ff82e42795d6dd7deaed788868ce6366a6145bd54f398403d39a2b58d9217c3d624f63ee886f +EBUILD tcllib-1.15.ebuild 988 SHA256 56aa7e72bf7825272702da84e6a2153c882917910610b027ea91310915d14df5 SHA512 656a5a743bca385a67beb20a9fe5f0b689f9c34cc9ee73ae3a39b990540dba1676046dd2ab2b5e67eef01ddf1c9e4eec0ca5e8e239e4ad18a81ddb1f479717f3 WHIRLPOOL 6e24f15c410097df5b66b381b6b43d270259055e0078fbf7334535aa1484c530f1b0a7934b1bc450bd6bff2b61cce7546c1a983b3f3cb3cba59dac4341cb5f9a +MISC ChangeLog 4665 SHA256 a41afe890efa711d64dc0b4f7426f144d6cc6d3ec1e2d39cd6ee5e1ed2f864c5 SHA512 f86d7a308677511e9c462c871c9b37692e2416eef7a7710b5e30e60f7ab5c62eaf8dd4a8687f5dadba380a156a1f919b0394a3284223de5fcf4910ad655c8c6e WHIRLPOOL 77cfebf818dbb442f15449d8f7514b6a2def3c70a6a8ee2fc35ac23abe8cac46bebb88d5f7a9a6b63ad8a4fb5da985964af097abd066aac6110c5d374c48e4e4 MISC metadata.xml 160 SHA256 225a6f78d287329cdf2f4ed57468be28bd6565fd9a62207c2cc48e25ac9d3537 SHA512 a50627bda9ed953daf422b5a2e89b5b64e296d1a023d767c8a4ebb2cd51cd0036cecce455762a54e7d669f94d17d9de21052bac94fc08b1365ef42eb2f267742 WHIRLPOOL 61fa22d50aaf2bdecc467e26c9675cf7949ad55a4a8821730c91d1bd73f83fc4c35660851961310efa450e337a7ef572a925e186b8b05984d6315efc509fd365 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) - -iEYEAREIAAYFAlEk7cgACgkQgAnW8HDreRYhsQCeKpr7ERiryAmqcdhvK5vFyQpu -s00AoLLd25K/yiLjM1b/W3wCHq/ycF3l -=VFEq ------END PGP SIGNATURE----- diff --git a/dev-tcltk/tcllib/files/tcllib-1.14-test.patch b/dev-tcltk/tcllib/files/tcllib-1.14-test.patch new file mode 100644 index 000000000000..b8c83fd5a1f7 --- /dev/null +++ b/dev-tcltk/tcllib/files/tcllib-1.14-test.patch @@ -0,0 +1,39 @@ +Index: support/devel/sak/validate/syntax.tcl +================================================================== +--- support/devel/sak/validate/syntax.tcl ++++ support/devel/sak/validate/syntax.tcl +@@ -192,11 +192,13 @@ + if {[string equal $c rename]} continue + if {[string equal $c namespace]} continue + interp eval $ip [list ::rename $c {}] + } + +- interp eval $ip [list ::namespace delete ::tcl] ++ if {![package vsatisfies [package present Tcl] 8.6]} { ++ interp eval $ip [list ::namespace delete ::tcl] ++ } + interp eval $ip [list ::rename namespace {}] + interp eval $ip [list ::rename rename {}] + + foreach m { + pcx::register unknown + +Index: support/devel/sak/validate/testsuites.tcl +================================================================== +--- support/devel/sak/validate/testsuites.tcl ++++ support/devel/sak/validate/testsuites.tcl +@@ -137,11 +137,13 @@ + if {[string equal $c rename]} continue + if {[string equal $c namespace]} continue + interp eval $ip [list ::rename $c {}] + } + +- interp eval $ip [list ::namespace delete ::tcl] ++ if {![package vsatisfies [package present Tcl] 8.6]} { ++ interp eval $ip [list ::namespace delete ::tcl] ++ } + interp eval $ip [list ::rename namespace {}] + interp eval $ip [list ::rename rename {}] + + foreach m { + testing unknown useLocal useLocalKeep useAccel diff --git a/dev-tcltk/tcllib/files/tcllib-1.15-tcl8.6-test.patch b/dev-tcltk/tcllib/files/tcllib-1.15-tcl8.6-test.patch new file mode 100644 index 000000000000..2256c5a50a0d --- /dev/null +++ b/dev-tcltk/tcllib/files/tcllib-1.15-tcl8.6-test.patch @@ -0,0 +1,411 @@ + modules/clock/iso8601.test | 5 ++--- + modules/doctools/mpformats/_nroff.tcl | 18 ++++++++++-------- + modules/doctools/mpformats/fmt.nroff | 4 ++-- + modules/doctools/tests/nroff/00 | 8 ++++---- + modules/doctools/tests/nroff/01 | 4 ++-- + modules/doctools/tests/nroff/02 | 10 +++++----- + modules/doctools/tests/nroff/03 | 16 ++++++++-------- + modules/doctools/tests/nroff/04 | 8 ++++---- + modules/doctools/tests/nroff/05 | 8 ++++---- + modules/doctools/tests/nroff/06 | 8 ++++---- + modules/doctools/tests/nroff/07 | 8 ++++---- + modules/doctools/tests/nroff/08 | 18 +++++++++--------- + support/devel/sak/validate/syntax.tcl | 4 +++- + support/devel/sak/validate/testsuites.tcl | 4 +++- + 14 files changed, 64 insertions(+), 59 deletions(-) + +diff --git a/modules/clock/iso8601.test b/modules/clock/iso8601.test +index 85d6416..6fce938 100644 +--- a/modules/clock/iso8601.test ++++ b/modules/clock/iso8601.test +@@ -40,9 +40,8 @@ test clock-iso8601-2.0 {parse_date, bad input} -body { + } -returnCodes error -result {not an iso8601 date string} + + test clock-iso8601-2.1 {parse_date} -body { +- clock::iso8601 parse_date 1994-11-05 +- # It is unclear if this is influenced by TZ. +-} -result 784022400 ++ clock format [clock::iso8601 parse_date 1994-11-05] -format %D ++} -result 11/05/1994 + + # ------------------------------------------------------------------------- + +diff --git a/modules/doctools/mpformats/_nroff.tcl b/modules/doctools/mpformats/_nroff.tcl +index be73a02..7669d07 100644 +--- a/modules/doctools/mpformats/_nroff.tcl ++++ b/modules/doctools/mpformats/_nroff.tcl +@@ -15,7 +15,7 @@ + + + proc nr_lp {} {return \n\1.LP} +-proc nr_ta {{text {}}} {return ".ta$text"} ++proc nr_ta {{text {}}} {return "\1.ta$text"} + proc nr_bld {} {return \1\\fB} + proc nr_bldt {t} {return "\n\1.B $t\n"} + proc nr_ul {} {return \1\\fI} +@@ -75,6 +75,7 @@ set finalMap [list \ + "\1\\" "\\" \ + "\1'" "'" \ + "\1." "." \ ++ "." "\\&." \ + "\\" "\\\\"] + global textMap + set textMap [list "\\" "\\\\"] +@@ -103,8 +104,8 @@ proc nroff_postprocess {nroff} { + # - Exceptions to the above: Keep empty lines and leading + # whitespace when in verbatim sections (no-fill-mode) + +- set nfMode [list .nf .CS] ; # commands which start no-fill mode +- set fiMode [list .fi .CE] ; # commands which terminate no-fill mode ++ set nfMode [list \1.nf \1.CS] ; # commands which start no-fill mode ++ set fiMode [list \1.fi \1.CE] ; # commands which terminate no-fill mode + set lines [list] ; # Result buffer + set verbatim 0 ; # Automaton mode/state + +@@ -139,7 +140,7 @@ proc nroff_postprocess {nroff} { + set lines [lreplace $lines end end] + set line "$last $line" + } +- } elseif {[string match {['.]*} $line]} { ++ } elseif {[string match {[']*} $line]} { + # Apostrophes or periods at the beginning of a line have to + # quoted to prevent misinterpretation as comments or directives. + # The true comments and directive are quoted with \1 +@@ -166,10 +167,11 @@ proc nroff_postprocess {nroff} { + # Remove superfluous .IP commands (empty paragraph). The first + # identity mapping is there to avoid smashing a man macro + # definition. +- set lines [string map [list \ +- \n\1.IP\n\1..\n \n\1.IP\n\1..\n \ +- \n\1.IP\n\1. \n\1.] \ +- $lines] ++ ++ lappend map \n\1.IP\n\1.\1.\n \n\1.IP\n\1.\1.\n ++ lappend map \n\1.IP\n\1. \n\1. ++ ++ set lines [string map $map $lines] + + # Return the modified result buffer + return [string map $finalMap $lines] +diff --git a/modules/doctools/mpformats/fmt.nroff b/modules/doctools/mpformats/fmt.nroff +index e844dbf..5230688 100644 +--- a/modules/doctools/mpformats/fmt.nroff ++++ b/modules/doctools/mpformats/fmt.nroff +@@ -269,11 +269,11 @@ proc fmt_image {text {label {}}} { + + set img [dt_imgdata $text {pic}] + if {$img ne {}} { +- return \n.PS\n$img\n.PE\n ++ return \n\1.PS\n$img\n\1.PE\n + } + set img [dt_imgdata $text {txt}] + if {$img ne {}} { +- return \n.PS\n.nf\n$img\n.fi\n.PE\n ++ return \n\1.PS\n\1.nf\n$img\n\1.fi\n\1.PE\n + } + if {$label eq {}} { + return "IMAGE: $text" +diff --git a/modules/doctools/tests/nroff/00 b/modules/doctools/tests/nroff/00 +index 8ac0ebf..8f68ee1 100644 +--- a/modules/doctools/tests/nroff/00 ++++ b/modules/doctools/tests/nroff/00 +@@ -1,15 +1,15 @@ + '\" +-'\" Generated from file '.FILE.' by tcllib/doctools with format 'nroff' +-'\" Copyright (c) .COPYRIGHT. ++'\" Generated from file '\&.FILE\&.' by tcllib/doctools with format 'nroff' ++'\" Copyright (c) \&.COPYRIGHT\&. + '\" + .so man.macros +-.TH "TEST" z 3.14.15.926 .MODULE. "" ++.TH "TEST" z 3\&.14\&.15\&.926 \&.MODULE\&. "" + .BS + .SH NAME + TEST \- + .SH DESCRIPTION + .SH COPYRIGHT + .nf +-Copyright (c) .COPYRIGHT. ++Copyright (c) \&.COPYRIGHT\&. + + .fi +\ No newline at end of file +diff --git a/modules/doctools/tests/nroff/01 b/modules/doctools/tests/nroff/01 +index 3a4563f..588894a 100644 +--- a/modules/doctools/tests/nroff/01 ++++ b/modules/doctools/tests/nroff/01 +@@ -1,9 +1,9 @@ + '\" +-'\" Generated from file '.FILE.' by tcllib/doctools with format 'nroff' ++'\" Generated from file '\&.FILE\&.' by tcllib/doctools with format 'nroff' + '\" Copyright (c) **Copyright** + '\" + .so man.macros +-.TH "TEST" z 3.14.15.926 .MODULE. "" ++.TH "TEST" z 3\&.14\&.15\&.926 \&.MODULE\&. "" + .BS + .SH NAME + TEST \- +diff --git a/modules/doctools/tests/nroff/02 b/modules/doctools/tests/nroff/02 +index 89d6cb7..49fbf18 100644 +--- a/modules/doctools/tests/nroff/02 ++++ b/modules/doctools/tests/nroff/02 +@@ -1,12 +1,12 @@ + '\" +-'\" Generated from file '.FILE.' by tcllib/doctools with format 'nroff' +-'\" Copyright (c) .COPYRIGHT. ++'\" Generated from file '\&.FILE\&.' by tcllib/doctools with format 'nroff' ++'\" Copyright (c) \&.COPYRIGHT\&. + '\" + .so man.macros +-.TH "TEST" z 3.14.15.926 .MODULE. "..THE_MODULE.." ++.TH "TEST" z 3\&.14\&.15\&.926 \&.MODULE\&. "\&.\&.THE_MODULE\&.\&." + .BS + .SH NAME +-TEST \- ..THE_TITLE.. ++TEST \- \&.\&.THE_TITLE\&.\&. + .SH SYNOPSIS + package require \fBAAA \fR + .sp +@@ -20,6 +20,6 @@ ELSE, OTHER + KEYA, KEYZ + .SH COPYRIGHT + .nf +-Copyright (c) .COPYRIGHT. ++Copyright (c) \&.COPYRIGHT\&. + + .fi +\ No newline at end of file +diff --git a/modules/doctools/tests/nroff/03 b/modules/doctools/tests/nroff/03 +index eb0bdd3..6393ecb 100644 +--- a/modules/doctools/tests/nroff/03 ++++ b/modules/doctools/tests/nroff/03 +@@ -1,9 +1,9 @@ + '\" +-'\" Generated from file '.FILE.' by tcllib/doctools with format 'nroff' +-'\" Copyright (c) .COPYRIGHT. ++'\" Generated from file '\&.FILE\&.' by tcllib/doctools with format 'nroff' ++'\" Copyright (c) \&.COPYRIGHT\&. + '\" + .so man.macros +-.TH "TEST" z 3.14.15.926 .MODULE. "" ++.TH "TEST" z 3\&.14\&.15\&.926 \&.MODULE\&. "" + .BS + .SH NAME + TEST \- +@@ -12,18 +12,18 @@ TEST \- + 1 + .SH BBB + 22 +-.SS BBB.CCC ++.SS BBB\&.CCC + 333 +-.SS BBB.DDD ++.SS BBB\&.DDD + 4444 + .SH EEE + 5555 + .PP +-At \fBAaA\fR. ++At \fBAaA\fR\&. + .PP +-At \fB__undefined__\fR. ++At \fB__undefined__\fR\&. + .SH COPYRIGHT + .nf +-Copyright (c) .COPYRIGHT. ++Copyright (c) \&.COPYRIGHT\&. + + .fi +\ No newline at end of file +diff --git a/modules/doctools/tests/nroff/04 b/modules/doctools/tests/nroff/04 +index ee22d7a..27aa037 100644 +--- a/modules/doctools/tests/nroff/04 ++++ b/modules/doctools/tests/nroff/04 +@@ -1,9 +1,9 @@ + '\" +-'\" Generated from file '.FILE.' by tcllib/doctools with format 'nroff' +-'\" Copyright (c) .COPYRIGHT. ++'\" Generated from file '\&.FILE\&.' by tcllib/doctools with format 'nroff' ++'\" Copyright (c) \&.COPYRIGHT\&. + '\" + .so man.macros +-.TH "TEST" z 3.14.15.926 .MODULE. "" ++.TH "TEST" z 3\&.14\&.15\&.926 \&.MODULE\&. "" + .BS + .SH NAME + TEST \- +@@ -27,6 +27,6 @@ Next Line + FERTIG + .SH COPYRIGHT + .nf +-Copyright (c) .COPYRIGHT. ++Copyright (c) \&.COPYRIGHT\&. + + .fi +\ No newline at end of file +diff --git a/modules/doctools/tests/nroff/05 b/modules/doctools/tests/nroff/05 +index c25c179..3df0180 100644 +--- a/modules/doctools/tests/nroff/05 ++++ b/modules/doctools/tests/nroff/05 +@@ -1,9 +1,9 @@ + '\" +-'\" Generated from file '.FILE.' by tcllib/doctools with format 'nroff' +-'\" Copyright (c) .COPYRIGHT. ++'\" Generated from file '\&.FILE\&.' by tcllib/doctools with format 'nroff' ++'\" Copyright (c) \&.COPYRIGHT\&. + '\" + .so man.macros +-.TH "BASIC" a 5 .MODULE. "" ++.TH "BASIC" a 5 \&.MODULE\&. "" + .BS + .SH NAME + BASIC \- +@@ -91,6 +91,6 @@ caramel + KO + .SH COPYRIGHT + .nf +-Copyright (c) .COPYRIGHT. ++Copyright (c) \&.COPYRIGHT\&. + + .fi +\ No newline at end of file +diff --git a/modules/doctools/tests/nroff/06 b/modules/doctools/tests/nroff/06 +index e7fee7c..10fed25 100644 +--- a/modules/doctools/tests/nroff/06 ++++ b/modules/doctools/tests/nroff/06 +@@ -1,9 +1,9 @@ + '\" +-'\" Generated from file '.FILE.' by tcllib/doctools with format 'nroff' +-'\" Copyright (c) .COPYRIGHT. ++'\" Generated from file '\&.FILE\&.' by tcllib/doctools with format 'nroff' ++'\" Copyright (c) \&.COPYRIGHT\&. + '\" + .so man.macros +-.TH "TEST" z 3.14.15.926 .MODULE. "" ++.TH "TEST" z 3\&.14\&.15\&.926 \&.MODULE\&. "" + .BS + .SH NAME + TEST \- +@@ -50,6 +50,6 @@ c + .PP + .SH COPYRIGHT + .nf +-Copyright (c) .COPYRIGHT. ++Copyright (c) \&.COPYRIGHT\&. + + .fi +\ No newline at end of file +diff --git a/modules/doctools/tests/nroff/07 b/modules/doctools/tests/nroff/07 +index 696a715..08ff9ee 100644 +--- a/modules/doctools/tests/nroff/07 ++++ b/modules/doctools/tests/nroff/07 +@@ -1,9 +1,9 @@ + '\" +-'\" Generated from file '.FILE.' by tcllib/doctools with format 'nroff' +-'\" Copyright (c) .COPYRIGHT. ++'\" Generated from file '\&.FILE\&.' by tcllib/doctools with format 'nroff' ++'\" Copyright (c) \&.COPYRIGHT\&. + '\" + .so man.macros +-.TH "TEST" z 3.14.15.926 .MODULE. "" ++.TH "TEST" z 3\&.14\&.15\&.926 \&.MODULE\&. "" + .BS + .SH NAME + TEST \- +@@ -40,6 +40,6 @@ a + .PP + .SH COPYRIGHT + .nf +-Copyright (c) .COPYRIGHT. ++Copyright (c) \&.COPYRIGHT\&. + + .fi +\ No newline at end of file +diff --git a/modules/doctools/tests/nroff/08 b/modules/doctools/tests/nroff/08 +index b1bc4ea..50cecb6 100644 +--- a/modules/doctools/tests/nroff/08 ++++ b/modules/doctools/tests/nroff/08 +@@ -1,12 +1,12 @@ + '\" +-'\" Generated from file '.FILE.' by tcllib/doctools with format 'nroff' ++'\" Generated from file '\&.FILE\&.' by tcllib/doctools with format 'nroff' + '\" Copyright (c) **Copyright** + '\" + .so man.macros +-.TH "ALL" a 5 .MODULE. "..THE_MODULE.." ++.TH "ALL" a 5 \&.MODULE\&. "\&.\&.THE_MODULE\&.\&." + .BS + .SH NAME +-ALL \- ..THE_TITLE.. ++ALL \- \&.\&.THE_TITLE\&.\&. + .SH SYNOPSIS + package require \fBAAA \fR + .sp +@@ -14,11 +14,11 @@ package require \fBBBB VVV\fR + .sp + package require \fBCCC ?VVV?\fR + .sp +-CMDNAME ... ++CMDNAME \&.\&.\&. + .sp +-CMDNAME ... ++CMDNAME \&.\&.\&. + .sp +-CMDNAME ... ++CMDNAME \&.\&.\&. + .sp + .BE + .SH DESCRIPTION +@@ -75,7 +75,7 @@ DESCRIPTION ::\fBMethod\fR:: + TERM + DESCRIPTION + .TP +-CMDNAME ... ++CMDNAME \&.\&.\&. + DESCRIPTION ::\fBNamespace\fR:: + .RS + .TP +@@ -96,10 +96,10 @@ DESCRIPTION ::?Optional?:: + .CE + .RE + .TP +-CMDNAME ... ++CMDNAME \&.\&.\&. + DESCRIPTION ::\fBPackage\fR:: + .TP +-CMDNAME ... ++CMDNAME \&.\&.\&. + DESCRIPTION ::\fBSystemCommand\fR:: + .RS + .TP +diff --git a/support/devel/sak/validate/syntax.tcl b/support/devel/sak/validate/syntax.tcl +index 20b7d33..24e06d2 100644 +--- a/support/devel/sak/validate/syntax.tcl ++++ b/support/devel/sak/validate/syntax.tcl +@@ -194,7 +194,9 @@ proc ::sak::validate::syntax::Setup {} { + interp eval $ip [list ::rename $c {}] + } + +- interp eval $ip [list ::namespace delete ::tcl] ++ if {![package vsatisfies [package present Tcl] 8.6]} { ++ interp eval $ip [list ::namespace delete ::tcl] ++ } + interp eval $ip [list ::rename namespace {}] + interp eval $ip [list ::rename rename {}] + +diff --git a/support/devel/sak/validate/testsuites.tcl b/support/devel/sak/validate/testsuites.tcl +index 7072662..71ea694 100644 +--- a/support/devel/sak/validate/testsuites.tcl ++++ b/support/devel/sak/validate/testsuites.tcl +@@ -139,7 +139,9 @@ proc ::sak::validate::testsuites::Setup {} { + interp eval $ip [list ::rename $c {}] + } + +- interp eval $ip [list ::namespace delete ::tcl] ++ if {![package vsatisfies [package present Tcl] 8.6]} { ++ interp eval $ip [list ::namespace delete ::tcl] ++ } + interp eval $ip [list ::rename namespace {}] + interp eval $ip [list ::rename rename {}] + diff --git a/dev-tcltk/tcllib/tcllib-1.14.ebuild b/dev-tcltk/tcllib/tcllib-1.14.ebuild index 2df1fcedf56f..75d42c9da9ae 100644 --- a/dev-tcltk/tcllib/tcllib-1.14.ebuild +++ b/dev-tcltk/tcllib/tcllib-1.14.ebuild @@ -1,9 +1,11 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcllib/tcllib-1.14.ebuild,v 1.2 2012/06/19 15:35:14 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcllib/tcllib-1.14.ebuild,v 1.3 2013/03/02 17:49:01 jlec Exp $ EAPI=4 +inherit eutils + DESCRIPTION="Tcl Standard Library" HOMEPAGE="http://www.tcl.tk/software/tcllib/" SRC_URI="mirror://sourceforge/tcllib/${P}.tar.gz" @@ -18,6 +20,10 @@ DEPEND="${RDEPEND}" DOCS=( DESCRIPTION.txt STATUS ) +src_prepare() { + epatch "${FILESDIR}"/${P}-test.patch +} + src_install() { default diff --git a/dev-tcltk/tcllib/tcllib-1.15.ebuild b/dev-tcltk/tcllib/tcllib-1.15.ebuild index 30147ab76567..8d32e426a610 100644 --- a/dev-tcltk/tcllib/tcllib-1.15.ebuild +++ b/dev-tcltk/tcllib/tcllib-1.15.ebuild @@ -1,9 +1,11 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcllib/tcllib-1.15.ebuild,v 1.1 2013/02/20 15:37:43 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcllib/tcllib-1.15.ebuild,v 1.2 2013/03/02 17:49:01 jlec Exp $ EAPI=5 +inherit eutils + DESCRIPTION="Tcl Standard Library" HOMEPAGE="http://www.tcl.tk/software/tcllib/" SRC_URI="mirror://sourceforge/tcllib/${P}.tar.bz2" @@ -18,9 +20,20 @@ DEPEND="${RDEPEND}" DOCS=( DESCRIPTION.txt STATUS ) +src_prepare() { + epatch "${FILESDIR}"/${P}-tcl8.6-test.patch +} + +src_test() { +# emake test_interactive + emake test_batch +} + src_install() { default + rm "${ED}"/usr/share/man/mann/{try,string,variable,zlib}.n || die + dodoc devdoc/*.txt dohtml devdoc/*.html -- cgit v1.2.3-65-gdbad