summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatsuu Takuto <matsuu@gentoo.org>2005-03-19 05:53:01 +0000
committerMatsuu Takuto <matsuu@gentoo.org>2005-03-19 05:53:01 +0000
commit789d15201322d6c53ebd96fa608eaadca695148a (patch)
tree3b6e5538c381469519a4c699f6669a0e96bd683c /dev-lang
parentStable amd64. Revbump to force --libdir option to configure on all archs oth... (diff)
downloadgentoo-2-789d15201322d6c53ebd96fa608eaadca695148a.tar.gz
gentoo-2-789d15201322d6c53ebd96fa608eaadca695148a.tar.bz2
gentoo-2-789d15201322d6c53ebd96fa608eaadca695148a.zip
Version bumped, #83816
(Portage version: 2.0.51.19)
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/tcl/ChangeLog9
-rw-r--r--dev-lang/tcl/Manifest18
-rw-r--r--dev-lang/tcl/files/digest-tcl-8.4.91
-rw-r--r--dev-lang/tcl/tcl-8.3.4.ebuild4
-rw-r--r--dev-lang/tcl/tcl-8.4.9.ebuild101
-rw-r--r--dev-lang/tk/ChangeLog11
-rw-r--r--dev-lang/tk/files/digest-tk-8.4.91
-rw-r--r--dev-lang/tk/files/remove-control-v-8.4.9.diff18
-rw-r--r--dev-lang/tk/files/tk-8.4.9-man.patch29
-rw-r--r--dev-lang/tk/tk-8.3.4-r1.ebuild4
-rw-r--r--dev-lang/tk/tk-8.4.6-r1.ebuild4
-rw-r--r--dev-lang/tk/tk-8.4.6.ebuild4
-rw-r--r--dev-lang/tk/tk-8.4.9.ebuild98
13 files changed, 277 insertions, 25 deletions
diff --git a/dev-lang/tcl/ChangeLog b/dev-lang/tcl/ChangeLog
index 863157e067a0..8e91ac362800 100644
--- a/dev-lang/tcl/ChangeLog
+++ b/dev-lang/tcl/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-lang/tcl
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.46 2004/12/29 22:09:15 ciaranm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.47 2005/03/19 05:51:07 matsuu Exp $
+
+*tcl-8.4.9 (19 Mar 2005)
+
+ 19 Mar 2005; MATSUU Takuto <matsuu@gentoo.org> +tcl-8.4.9.ebuild:
+ Version bumped, #83816
29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest
index 755bd400288b..a9a46e9ea321 100644
--- a/dev-lang/tcl/Manifest
+++ b/dev-lang/tcl/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 889053c13dd0d4a25778704d3823bc8a tcl-8.4.6-r1.ebuild 3329
+MD5 2cfd331c4234b3d109bf51d1697bd461 tcl-8.3.4.ebuild 2538
+MD5 bc90be6bdf58ba1daa7d61bb9edf87d5 tcl-8.4.9.ebuild 3336
MD5 2c4d8bc953f226e5dd76d4ac61c6fd96 ChangeLog 6057
MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
-MD5 2cfd331c4234b3d109bf51d1697bd461 tcl-8.3.4.ebuild 2538
MD5 90748478dfa508929dea3baefdcce7ef tcl-8.4.6.ebuild 2923
-MD5 889053c13dd0d4a25778704d3823bc8a tcl-8.4.6-r1.ebuild 3329
+MD5 cb07b4bc1984a971b376e1da5e478fdc files/digest-tcl-8.4.6-r1 65
MD5 d8691f60be4023222834ccdf6ee6d498 files/digest-tcl-8.3.4 61
MD5 cb07b4bc1984a971b376e1da5e478fdc files/digest-tcl-8.4.6 65
-MD5 cb07b4bc1984a971b376e1da5e478fdc files/digest-tcl-8.4.6-r1 65
+MD5 9c5852717da8c531e22dda3dd4ade696 files/digest-tcl-8.4.9 65
MD5 1209abd340cad17f50f87c58f1c0f9f5 files/tcl-8.4.6-multilib.patch 1070
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.14 (GNU/Linux)
-
-iD8DBQFB7u7XroRuSHgZdywRAgGpAJ4wcgy9MBuS9yyEzw+PAkpJRGrHyQCfRfJ1
-B7VObKkUj2qohVB74pJJqto=
-=DgVg
------END PGP SIGNATURE-----
diff --git a/dev-lang/tcl/files/digest-tcl-8.4.9 b/dev-lang/tcl/files/digest-tcl-8.4.9
new file mode 100644
index 000000000000..d22d43aba438
--- /dev/null
+++ b/dev-lang/tcl/files/digest-tcl-8.4.9
@@ -0,0 +1 @@
+MD5 7e01b409925e4eb59ad44a4c12b9c681 tcl8.4.9-src.tar.gz 3496364
diff --git a/dev-lang/tcl/tcl-8.3.4.ebuild b/dev-lang/tcl/tcl-8.3.4.ebuild
index b63db248e025..448fb004e924 100644
--- a/dev-lang/tcl/tcl-8.3.4.ebuild
+++ b/dev-lang/tcl/tcl-8.3.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.3.4.ebuild,v 1.15 2004/09/06 18:49:51 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.3.4.ebuild,v 1.16 2005/03/19 05:51:07 matsuu Exp $
inherit eutils
diff --git a/dev-lang/tcl/tcl-8.4.9.ebuild b/dev-lang/tcl/tcl-8.4.9.ebuild
new file mode 100644
index 000000000000..95cb7c9bd16a
--- /dev/null
+++ b/dev-lang/tcl/tcl-8.4.9.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.9.ebuild,v 1.1 2005/03/19 05:51:07 matsuu Exp $
+
+inherit eutils
+
+DESCRIPTION="Tool Command Language"
+HOMEPAGE="http://dev.scriptics.com/software/tcltk/"
+SRC_URI="mirror://sourceforge/tcl/${PN}${PV}-src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="threads"
+
+DEPEND="virtual/libc"
+
+S=${WORKDIR}/${PN}${PV}
+
+pkg_setup() {
+ if use threads
+ then
+ ewarn ""
+ ewarn "PLEASE NOTE: You are compiling ${P} with"
+ ewarn "threading enabled."
+ ewarn "Threading is not supported by all applications"
+ ewarn "that compile against tcl. You use threading at"
+ ewarn "your own discretion."
+ ewarn ""
+ epause 5
+ fi
+}
+
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+ epatch ${FILESDIR}/${PN}-8.4.6-multilib.patch
+}
+
+src_compile() {
+ local local_config_use=""
+
+ if use threads
+ then
+ local_config_use="--enable-threads"
+ fi
+
+ cd ${S}/unix
+ econf ${local_config_use} || die
+ emake CFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+ #short version number
+ local v1
+ v1=${PV%.*}
+
+ cd ${S}/unix
+ S= make INSTALL_ROOT=${D} MAN_INSTALL_DIR=${D}/usr/share/man install || die
+
+ # fix the tclConfig.sh to eliminate refs to the build directory
+ sed -e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L${ROOT}/usr/$(get_libdir)," \
+ -e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='${ROOT}/usr/$(get_libdir)/tcl${v1}/include'," \
+ -e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L${ROOT}/usr/$(get_libdir)," \
+ -e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='${ROOT}/usr/$(get_libdir)," \
+ -e "s,^TCL_LIB_FILE='libtcl8.4..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl8.4\$\{TCL_DBGX\}.so\"," \
+ -e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:/usr/$(get_libdir)'," \
+ -e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:/usr/$(get_libdir)'," \
+ ${D}/usr/$(get_libdir)/tclConfig.sh > ${D}/usr/$(get_libdir)/tclConfig.sh.new
+ mv ${D}/usr/$(get_libdir)/tclConfig.sh.new ${D}/usr/$(get_libdir)/tclConfig.sh
+
+ # install private headers
+ dodir /usr/$(get_libdir)/tcl${v1}/include/unix
+ install -c -m0644 ${S}/unix/*.h ${D}/usr/$(get_libdir)/tcl${v1}/include/unix
+ dodir /usr/$(get_libdir)/tcl${v1}/include/generic
+ install -c -m0644 ${S}/generic/*.h ${D}/usr/$(get_libdir)/tcl${v1}/include/generic
+ rm -f ${D}/usr/$(get_libdir)/tcl${v1}/include/generic/tcl.h
+ rm -f ${D}/usr/$(get_libdir)/tcl${v1}/include/generic/tclDecls.h
+ rm -f ${D}/usr/$(get_libdir)/tcl${v1}/include/generic/tclPlatDecls.h
+
+ # install symlink for libraries
+ dosym /usr/$(get_libdir)/libtcl${v1}.so /usr/$(get_libdir)/libtcl.so
+ dosym /usr/$(get_libdir)/libtclstub${v1}.a /usr/$(get_libdir)/libtclstub.a
+
+ ln -sf tclsh${v1} ${D}/usr/bin/tclsh
+
+ cd ${S}
+ dodoc README changes license.terms
+}
+
+pkg_postinst() {
+ ewarn
+ ewarn "If you're upgrading from tcl-8.3, you must recompile the other"
+ ewarn "packages on your system that link with tcl after the upgrade"
+ ewarn "completes. To perform this action, please run revdep-rebuild"
+ ewarn "in package app-portage/gentoolkit."
+ ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should"
+ ewarn "upgrade them before this recompilation, too,"
+ ewarn
+ ewarn ${S}
+}
diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
index 8a524bc0d84b..dfd1861a7639 100644
--- a/dev-lang/tk/ChangeLog
+++ b/dev-lang/tk/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-lang/tk
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.50 2004/12/29 22:09:50 ciaranm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.51 2005/03/19 05:53:01 matsuu Exp $
+
+*tk-8.4.9 (19 Mar 2005)
+
+ 19 Mar 2005; MATSUU Takuto <matsuu@gentoo.org>
+ +files/remove-control-v-8.4.9.diff, +files/tk-8.4.9-man.patch,
+ +tk-8.4.9.ebuild:
+ Version bumped, #83816
29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/dev-lang/tk/files/digest-tk-8.4.9 b/dev-lang/tk/files/digest-tk-8.4.9
new file mode 100644
index 000000000000..257b232ef472
--- /dev/null
+++ b/dev-lang/tk/files/digest-tk-8.4.9
@@ -0,0 +1 @@
+MD5 1b64258abaf258e9a86f331d8de17a71 tk8.4.9-src.tar.gz 3266500
diff --git a/dev-lang/tk/files/remove-control-v-8.4.9.diff b/dev-lang/tk/files/remove-control-v-8.4.9.diff
new file mode 100644
index 000000000000..019659993c75
--- /dev/null
+++ b/dev-lang/tk/files/remove-control-v-8.4.9.diff
@@ -0,0 +1,18 @@
+diff -Naur tk8.4.9.orig/library/text.tcl tk8.4.9/library/text.tcl
+--- tk8.4.9.orig/library/text.tcl 2004-12-07 04:42:11.000000000 +0900
++++ tk8.4.9/library/text.tcl 2005-03-02 23:04:01.729780958 +0900
+@@ -347,14 +347,6 @@
+ catch { %W edit redo }
+ }
+
+-if {$tcl_platform(platform) ne "windows"} {
+-bind Text <Control-v> {
+- if {!$tk_strictMotif} {
+- tk::TextScrollPages %W 1
+- }
+-}
+-}
+-
+ bind Text <Meta-b> {
+ if {!$tk_strictMotif} {
+ tk::TextSetCursor %W [tk::TextPrevPos %W insert tcl_startOfPreviousWord]
diff --git a/dev-lang/tk/files/tk-8.4.9-man.patch b/dev-lang/tk/files/tk-8.4.9-man.patch
new file mode 100644
index 000000000000..bb816f809c84
--- /dev/null
+++ b/dev-lang/tk/files/tk-8.4.9-man.patch
@@ -0,0 +1,29 @@
+diff -Naur tk8.4.9.orig/unix/installManPage tk8.4.9/unix/installManPage
+--- tk8.4.9.orig/unix/installManPage 2004-12-07 04:46:29.000000000 +0900
++++ tk8.4.9/unix/installManPage 2005-03-02 23:36:23.252797867 +0900
+@@ -3,7 +3,7 @@
+ ZIP=:
+ while true; do
+ case $1 in
+- -s | --symlinks ) S="-s ";;
++ -s | --symlinks ) TK_S="-s ";;
+ -z | --compress ) ZIP=$2; shift ;;
+ -e | --extension ) Z=$2; shift ;;
+ -s | --suffix ) SUFFIX=$2; shift ;;
+@@ -18,7 +18,7 @@
+
+ MANPAGE=$1
+ DIR=$2
+-test -z "$S" && S="$DIR/"
++test -z "$TK_S" && TK_S="$DIR/"
+
+ # A sed script to parse the alternative names out of a man page.
+ #
+@@ -62,6 +62,6 @@
+ $ZIP $DIR/$FIRST
+ else
+ rm -f $DIR/$f $DIR/$f.*
+- ln $S$FIRST$Z $DIR/$f$Z
++ ln $TK_S$FIRST$Z $DIR/$f$Z
+ fi
+ done
diff --git a/dev-lang/tk/tk-8.3.4-r1.ebuild b/dev-lang/tk/tk-8.3.4-r1.ebuild
index 2ba7ce5883a0..9c3ae9519256 100644
--- a/dev-lang/tk/tk-8.3.4-r1.ebuild
+++ b/dev-lang/tk/tk-8.3.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.3.4-r1.ebuild,v 1.10 2004/09/06 18:51:12 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.3.4-r1.ebuild,v 1.11 2005/03/19 05:53:01 matsuu Exp $
inherit eutils
diff --git a/dev-lang/tk/tk-8.4.6-r1.ebuild b/dev-lang/tk/tk-8.4.6-r1.ebuild
index 7585053c8fe2..896dfabd317b 100644
--- a/dev-lang/tk/tk-8.4.6-r1.ebuild
+++ b/dev-lang/tk/tk-8.4.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.6-r1.ebuild,v 1.12 2005/03/13 03:13:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.6-r1.ebuild,v 1.13 2005/03/19 05:53:01 matsuu Exp $
inherit eutils
diff --git a/dev-lang/tk/tk-8.4.6.ebuild b/dev-lang/tk/tk-8.4.6.ebuild
index a1f81776ed74..34e10858c544 100644
--- a/dev-lang/tk/tk-8.4.6.ebuild
+++ b/dev-lang/tk/tk-8.4.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.6.ebuild,v 1.13 2004/09/06 18:51:12 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.6.ebuild,v 1.14 2005/03/19 05:53:01 matsuu Exp $
inherit eutils
diff --git a/dev-lang/tk/tk-8.4.9.ebuild b/dev-lang/tk/tk-8.4.9.ebuild
new file mode 100644
index 000000000000..9d2357dbb1c6
--- /dev/null
+++ b/dev-lang/tk/tk-8.4.9.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.9.ebuild,v 1.1 2005/03/19 05:53:01 matsuu Exp $
+
+inherit eutils
+
+DESCRIPTION="Tk Widget Set"
+HOMEPAGE="http://dev.scriptics.com/software/tcltk/"
+SRC_URI="mirror://sourceforge/tcl/${PN}${PV}-src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~ppc64 ~sparc ~hppa ~amd64 ~ppc ~mips ~alpha ~arm ~ia64"
+IUSE="threads"
+
+DEPEND=">=sys-apps/sed-4.0.5
+ >=sys-apps/portage-2.0.47-r10
+ virtual/x11
+ =dev-lang/tcl-${PV}*"
+
+S=${WORKDIR}/${PN}${PV}
+
+pkg_setup() {
+ if use threads
+ then
+ ewarn ""
+ ewarn "PLEASE NOTE: You are compiling ${P} with"
+ ewarn "threading enabled."
+ ewarn "Threading is not supported by all applications"
+ ewarn "that compile against tcl. You use threading at"
+ ewarn "your own discretion."
+ ewarn ""
+ epause 5
+ fi
+}
+
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+ epatch ${FILESDIR}/remove-control-v-${PV}.diff || die
+ epatch ${FILESDIR}/${P}-man.patch || die
+}
+
+src_compile() {
+ cd ${S}/unix
+
+ local local_config_use=""
+
+ if use threads
+ then
+ local_config_use="--enable-threads"
+ fi
+
+ econf \
+ --with-tcl=/usr/$(get_libdir) \
+ ${local_config_use} || die
+
+ emake CFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+ #short version number
+ local v1
+ v1=${PV%.*}
+
+ cd ${S}/unix
+ #make INSTALL_ROOT=${D} MAN_INSTALL_DIR=${D}/usr/share/man install || die
+ make INSTALL_ROOT=${D} install || die
+
+ # fix the tkConfig.sh to eliminate refs to the build directory
+ sed -i \
+ -e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/$(get_libdir)," \
+ -e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/$(get_libdir)/tk${v1}/include'," \
+ -e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/$(get_libdir)," \
+ -e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/$(get_libdir)," \
+ -e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:/usr/$(get_libdir)'," \
+ -e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:/usr/$(get_libdir)'," \
+ ${D}/usr/lib/tkConfig.sh
+
+ # install private headers
+ dodir /usr/$(get_libdir)/tk${v1}/include/unix
+ install -c -m0644 ${S}/unix/*.h ${D}/usr/$(get_libdir)/tk${v1}/include/unix
+ dodir /usr/$(get_libdir)/tk${v1}/include/generic
+ install -c -m0644 ${S}/generic/*.h ${D}/usr/$(get_libdir)/tk${v1}/include/generic
+ rm -f ${D}/usr/$(get_libdir)/tk${v1}/include/generic/tk.h
+ rm -f ${D}/usr/$(get_libdir)/tk${v1}/include/generic/tkDecls.h
+ rm -f ${D}/usr/$(get_libdir)/tk${v1}/include/generic/tkPlatDecls.h
+
+ # install symlink for libraries
+ #dosym /usr/$(get_libdir)/libtk${v1}.a /usr/$(get_libdir)/libtk.a
+ dosym /usr/$(get_libdir)/libtk${v1}.so /usr/$(get_libdir)/libtk.so
+ dosym /usr/$(get_libdir)/libtkstub${v1}.a /usr/$(get_libdir)/libtkstub.a
+
+ ln -sf wish${v1} ${D}/usr/bin/wish
+
+ cd ${S}
+ dodoc README changes license.terms
+}