jlec 15/03/20 10:13:29
Modified: tcllib-1.16.ebuild tcllib-1.15-r2.ebuild
tcllib-1.15-r1.ebuild ChangeLog
Log:
Fix test problem with tcl 8.5 vs 8.6, bug #543640; fix tcl SLOT usage
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key
B9D4F231BD1558AB!)
Revision Changes Path
1.3 dev-tcltk/tcllib/tcllib-1.16.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tcllib/tcllib-1.16.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tcllib/tcllib-1.16.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tcllib/tcllib-1.16.ebuild?r1=1.2&r2=1.3
Index: tcllib-1.16.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-tcltk/tcllib/tcllib-1.16.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tcllib-1.16.ebuild 13 Mar 2015 11:57:45 -0000 1.2
+++ tcllib-1.16.ebuild 20 Mar 2015 10:13:29 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcllib/tcllib-1.16.ebuild,v 1.2
2015/03/13 11:57:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcllib/tcllib-1.16.ebuild,v 1.3
2015/03/20 10:13:29 jlec Exp $
EAPI=5
@@ -19,7 +19,7 @@
KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux
~x86-linux ~x86-macos"
RDEPEND="
- dev-lang/tcl
+ dev-lang/tcl:0=
dev-tcltk/tdom
"
DEPEND="${RDEPEND}"
@@ -28,15 +28,19 @@
S="${WORKDIR}"/${MY_P}
+PATCHES=( "${FILESDIR}"/${P}-XSS-vuln.patch )
+
src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-test.patch \
- "${FILESDIR}"/${P}-XSS-vuln.patch
+ has_version ">=dev-lang/tcl-8.6" && \
+ PATCHES+=( "${FILESDIR}"/${P}-test.patch )
+ epatch ${PATCHES[@]}
+
+ sed \
+ -e '/testsNeedTcl/s:8.5:8.6:g' \
+ -i modules/tar/tar.test || die
}
src_test() {
-# emake test_interactive
- #emake test_batch
Xemake test_batch
}
1.5 dev-tcltk/tcllib/tcllib-1.15-r2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tcllib/tcllib-1.15-r2.ebuild?rev=1.5&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tcllib/tcllib-1.15-r2.ebuild?rev=1.5&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tcllib/tcllib-1.15-r2.ebuild?r1=1.4&r2=1.5
Index: tcllib-1.15-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-tcltk/tcllib/tcllib-1.15-r2.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tcllib-1.15-r2.ebuild 8 Mar 2015 14:01:54 -0000 1.4
+++ tcllib-1.15-r2.ebuild 20 Mar 2015 10:13:29 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcllib/tcllib-1.15-r2.ebuild,v
1.4 2015/03/08 14:01:54 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcllib/tcllib-1.15-r2.ebuild,v
1.5 2015/03/20 10:13:29 jlec Exp $
EAPI=5
@@ -18,18 +18,22 @@
IUSE="examples"
KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc s390 ~sparc ~x86 ~x86-fbsd
~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
-RDEPEND="dev-lang/tcl"
+RDEPEND="dev-lang/tcl:0="
DEPEND="${RDEPEND}"
DOCS=( DESCRIPTION.txt STATUS )
+PATCHES=(
+ "${FILESDIR}"/${P}-tcl8.6-test.patch
+ "${WORKDIR}"/${P}-test.patch
+ "${WORKDIR}"/${P}-manpage-rename.patch
+ "${FILESDIR}"/${P}-XSS-vuln.patch
+)
+
src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-tcl8.6-test.patch \
- "${WORKDIR}"/${P}-test.patch \
- "${WORKDIR}"/${P}-manpage-rename.patch \
- "${FILESDIR}"/${P}-XSS-vuln.patch \
- "${FILESDIR}"/${P}-test.patch
+ has_version ">=dev-lang/tcl-8.6" && \
+ PATCHES+=( "${FILESDIR}"/${P}-test.patch )
+ epatch ${PATCHES[@]}
}
src_test() {
1.10 dev-tcltk/tcllib/tcllib-1.15-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tcllib/tcllib-1.15-r1.ebuild?rev=1.10&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tcllib/tcllib-1.15-r1.ebuild?rev=1.10&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tcllib/tcllib-1.15-r1.ebuild?r1=1.9&r2=1.10
Index: tcllib-1.15-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-tcltk/tcllib/tcllib-1.15-r1.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tcllib-1.15-r1.ebuild 30 Jun 2013 18:07:31 -0000 1.9
+++ tcllib-1.15-r1.ebuild 20 Mar 2015 10:13:29 -0000 1.10
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcllib/tcllib-1.15-r1.ebuild,v
1.9 2013/06/30 18:07:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcllib/tcllib-1.15-r1.ebuild,v
1.10 2015/03/20 10:13:29 jlec Exp $
EAPI=5
@@ -18,7 +18,7 @@
IUSE="examples"
KEYWORDS="alpha amd64 hppa ia64 ~mips ppc s390 sparc x86 ~x86-fbsd
~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
-RDEPEND="dev-lang/tcl"
+RDEPEND="dev-lang/tcl:0="
DEPEND="${RDEPEND}"
DOCS=( DESCRIPTION.txt STATUS )
1.53 dev-tcltk/tcllib/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tcllib/ChangeLog?rev=1.53&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tcllib/ChangeLog?rev=1.53&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tcllib/ChangeLog?r1=1.52&r2=1.53
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-tcltk/tcllib/ChangeLog,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- ChangeLog 13 Mar 2015 11:57:45 -0000 1.52
+++ ChangeLog 20 Mar 2015 10:13:29 -0000 1.53
@@ -1,6 +1,10 @@
# ChangeLog for dev-tcltk/tcllib
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcllib/ChangeLog,v 1.52
2015/03/13 11:57:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcllib/ChangeLog,v 1.53
2015/03/20 10:13:29 jlec Exp $
+
+ 20 Mar 2015; Justin Lecher <[email protected]> tcllib-1.15-r1.ebuild,
+ tcllib-1.15-r2.ebuild, tcllib-1.16.ebuild:
+ Fix test problem with tcl 8.5 vs 8.6, bug #543640; fix tcl SLOT usage
13 Mar 2015; Jeroen Roovers <[email protected]> tcllib-1.16.ebuild:
Marked ~hppa (bug #541980).
