summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Fischer <vlooe@web.de>2009-05-17 00:37:09 +0200
committerFlorian Fischer <vlooe@web.de>2009-05-17 00:37:09 +0200
commit2500f07ab2efde51529bb8f5a93eb68e026a93be (patch)
tree15211344189857943ee7a163f35f4d019009ae0c /dev-lang
parentsynced dev-lang/tcl with main tree (diff)
downloadmultilib-portage-2500f07ab2efde51529bb8f5a93eb68e026a93be.tar.gz
multilib-portage-2500f07ab2efde51529bb8f5a93eb68e026a93be.tar.bz2
multilib-portage-2500f07ab2efde51529bb8f5a93eb68e026a93be.zip
synced dev-lang/tk with main tree
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/tk/ChangeLog26
-rw-r--r--dev-lang/tk/Manifest8
-rw-r--r--dev-lang/tk/tk-8.4.18-r1.ebuild6
-rw-r--r--dev-lang/tk/tk-8.5.1.ebuild105
-rw-r--r--dev-lang/tk/tk-8.5.6.ebuild105
5 files changed, 30 insertions, 220 deletions
diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
index 77b2bd6c5..7eeadba5e 100644
--- a/dev-lang/tk/ChangeLog
+++ b/dev-lang/tk/ChangeLog
@@ -1,6 +1,30 @@
# ChangeLog for dev-lang/tk
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.115 2009/02/25 15:17:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.122 2009/05/07 19:08:18 klausman Exp $
+
+ 07 May 2009; Tobias Klausmann <klausman@gentoo.org> tk-8.4.18-r1.ebuild:
+ Stable on alpha, bug #268174
+
+ 06 May 2009; Kenneth Prugh <ken69267@gentoo.org> tk-8.4.18-r1.ebuild:
+ amd64 stable, bug #268174
+
+ 06 May 2009; Jeroen Roovers <jer@gentoo.org> tk-8.4.18-r1.ebuild:
+ Stable for HPPA (bug #268174).
+
+ 06 May 2009; Ferris McCormick <fmccor@gentoo.org> tk-8.4.18-r1.ebuild:
+ Sparc stable, bug #268174.
+
+ 06 May 2009; Christian Faulhammer <fauli@gentoo.org> tk-8.4.18-r1.ebuild:
+ stable x86, bug 268174
+
+ 06 May 2009; Brent Baude <ranger@gentoo.org> tk-8.4.18-r1.ebuild:
+ Marking tk-8.4.18-r1 ppc64 and ppc for bug 268174
+
+*tk-8.5.7 (17 Apr 2009)
+
+ 17 Apr 2009; Federico Ferri <mescalinum@gentoo.org> -tk-8.5.1.ebuild,
+ -tk-8.5.6.ebuild, +tk-8.5.7.ebuild:
+ bump to version 8.5.7
25 Feb 2009; Raúl Porcel <armin76@gentoo.org> tk-8.4.19-r1.ebuild,
tk-8.5.6.ebuild:
diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest
index 52a0fdb9a..afb3e3736 100644
--- a/dev-lang/tk/Manifest
+++ b/dev-lang/tk/Manifest
@@ -8,14 +8,10 @@ AUX tk-CVE-2007-4851.patch 405 RMD160 bfc884fbe1f0f2facb892ff0100f59dae0fe5256 S
AUX tk-configure-LANG.patch 1686 RMD160 4ff8355af81705058fd411910dfae94887bcd884 SHA1 67ae0deff73689cb39cd6e7451262bdda9c25a39 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea
DIST tk8.4.18-src.tar.gz 3363853 RMD160 9c01ba85575a230231793a9885457c98046e41bb SHA1 c1032f3cacd40406065fc1f46ecd217f50329273 SHA256 1757b0daff8a8bb962e612691236ae838e353521e7184464a5d32225905eac18
DIST tk8.4.19-src.tar.gz 3362694 RMD160 c963297655740ad4b29a99c489c35a64e5e817ce SHA1 56d09be8a7670b2686d76b7526ff24b0240ca120 SHA256 d056fe6c204ac31539616e1069522dd5864a580b64e521fe1a49bc895ca8699f
-DIST tk8.5.1-src.tar.gz 3759545 RMD160 5e1196db5415771e5a7bf38425cacd7cb0ee1cd8 SHA1 3280ca4572f19c5dd379380e9a02d382127f3378 SHA256 d25126147f5fa8423de35cefd07b37583cf9c281a396f49450de42251e095fe7
-DIST tk8.5.6-src.tar.gz 3778532 RMD160 1b3d9166cc8d0c2f3c11ca98bf80a7f53447343b SHA1 3b1453d1efb47a5c600fa6b4825fed6afa3a32ad SHA256 dc918b89039d21cab4c09eddaf60abcc41e57f7bff4216a811237c1de3505907
DIST tk8.5.7-src.tar.gz 3779867 RMD160 8ff412f84ffb76b9b0da5a32f7404c37a5337003 SHA1 b5def6871e53c78354ac01b27abd523bb4295158 SHA256 d9366ed397c4bde96550ec9d30a8fcf67878cf26937cae93e580726a87d7af30
-EBUILD tk-8.4.18-r1.ebuild 3412 RMD160 b365c068e2834c1941aa9ffef29aaeed232b88c7 SHA1 8ec2444b24345a5fb97d203f502d16689c00b490 SHA256 c374fbbe60a620d1c85b63118c32aa2824debd33ef7d9eb4ce6480cf6572ee3e
+EBUILD tk-8.4.18-r1.ebuild 3403 RMD160 f693bcd7fd68553b477daa245a12639cb55485a4 SHA1 df529fdb42929b1d046f4f20b74c6a4f5c59e678 SHA256 310a91c979e709447a13e5755f721f20f6cd4ce2f1260a5dc4a787d2cd3bbc03
EBUILD tk-8.4.18.ebuild 3323 RMD160 6015f18d6688c364fc09c8a886ca029a1d5e3f68 SHA1 cdbe78e34b95f59fa42ae8f3ee134ce3ffab7f41 SHA256 143a71085d3309af68d5041a3468eb860f7e0ebe510886ac4a1e3754450d1411
EBUILD tk-8.4.19-r1.ebuild 3415 RMD160 eea52253fbf3371d33bb707b15a84e8a56dbdcd5 SHA1 8581f919bce0ffda92232369d8096aef30659b93 SHA256 dfba2ad76b8d0b6f86a9026770a9eae321cf05816fc2101502b8ca44798175bc
-EBUILD tk-8.5.1.ebuild 2940 RMD160 c6f68502777d00ed110695387afbb0c10feefcf3 SHA1 dee0ff35e8af17ccffcc3d0ba9222ae4ad947f8a SHA256 d478fd2a1bbd5218b85d78a3a1f8429f1fc83298675e0d3b1f4dadacc3d38750
-EBUILD tk-8.5.6.ebuild 2947 RMD160 14f12e5678b86d2421043eb73ced0b1378dc3481 SHA1 d109b3ff76ad2b12448ff212b50191837939393b SHA256 d9bf76ada7dc39bc7f0a5b7a484063d78a996e0b0755593478baab6c1ec58e8f
EBUILD tk-8.5.7.ebuild 2939 RMD160 2f2ecd6ab78f455cce86f40d60c2761b4c5ae074 SHA1 f451b50eb8e59a2c13af3089bd5909325c9ca403 SHA256 3c59c39805ab0b6ee91e6c644584f3072cb744acd9c3da30c686b460cbf97559
-MISC ChangeLog 16006 RMD160 c983340af35ab1d8edbfc6f0a00369395f17b634 SHA1 6c46c04279d381f074d6263fcf4feda5fd24be2a SHA256 52bef9439904439940233bd58e93086dada06a8d77d4b95b39ebc760dbf0c2db
+MISC ChangeLog 16803 RMD160 8734d678b25764580ca901ef16353bc6ed63c97f SHA1 48e83cc18ddb87d149b74a219fd6f013d66bd507 SHA256 92edfaaf94799fb8f6b9e03184552948cf45f6d6b3b5cab51bcd32e783a95063
MISC metadata.xml 159 RMD160 117cc289391c0477579de68e7347628756673eac SHA1 37f242cbf27c6e859fc63487487fdcae09d6931f SHA256 2cf13398186ae4abcd9f41c51ffb3bcdcc7da32df2c2af5c2de2e2cc8ad194ce
diff --git a/dev-lang/tk/tk-8.4.18-r1.ebuild b/dev-lang/tk/tk-8.4.18-r1.ebuild
index 28099b73f..2d2eec1d8 100644
--- a/dev-lang/tk/tk-8.4.18-r1.ebuild
+++ b/dev-lang/tk/tk-8.4.18-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.18-r1.ebuild,v 1.1 2008/10/27 20:27:07 mescalinum Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.18-r1.ebuild,v 1.7 2009/05/07 19:08:18 klausman Exp $
EAPI="2"
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/tcl/${PN}${PV}-src.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
IUSE="debug threads"
RDEPEND="x11-libs/libX11[lib32?]
diff --git a/dev-lang/tk/tk-8.5.1.ebuild b/dev-lang/tk/tk-8.5.1.ebuild
deleted file mode 100644
index 49f0cbe7a..000000000
--- a/dev-lang/tk/tk-8.5.1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.1.ebuild,v 1.1 2008/02/16 04:43:32 matsuu Exp $
-
-EAPI="2"
-
-WANT_AUTOCONF=latest
-WANT_AUTOMAKE=latest
-
-inherit autotools eutils multilib toolchain-funcs multilib-native
-
-MY_P="${PN}${PV/_beta/b}"
-DESCRIPTION="Tk Widget Set"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug threads truetype"
-
-RDEPEND="x11-libs/libX11[lib32?]
- ~dev-lang/tcl-${PV}[lib32?]"
-DEPEND="${RDEPEND}
- truetype? ( x11-libs/libXft[lib32?] )
- x11-libs/libXt[lib32?]
- x11-proto/xproto"
-
-S="${WORKDIR}/${MY_P}"
-
-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
-}
-
-multilib-native_src_prepare_internal() {
- cd "${S}"
- epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch
-
- # Bug 125971
- epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch
-
- cd "${S}"/unix
- eautoreconf
-}
-
-multilib-native_src_configure_internal() {
- tc-export CC
- cd "${S}"/unix
-
- local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
-
- econf \
- --with-tcl=/usr/${mylibdir} \
- $(use_enable threads) \
- $(use_enable truetype xft) \
- $(use_enable debug symbols) || die
-}
-
-multilib-native_src_install_internal() {
- #short version number
- local v1
- v1=${PV%.*}
-
- cd "${S}"/unix
- S= emake DESTDIR="${D}" install || die
-
- # fix the tkConfig.sh to eliminate refs to the build directory
- local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
- sed -i \
- -e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
- -e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/${mylibdir}/tk${v1}/include'," \
- -e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
- -e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/${mylibdir}," \
- -e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
- -e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
- "${D}"/usr/${mylibdir}/tkConfig.sh || die
-
- # install private headers
- insinto /usr/${mylibdir}/tk${v1}/include/unix
- doins "${S}"/unix/*.h || die
- insinto /usr/${mylibdir}/tk${v1}/include/generic
- doins "${S}"/generic/*.h || die
- rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tk.h
- rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h
- rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h
-
- # install symlink for libraries
- #dosym libtk${v1}.a /usr/${mylibdir}/libtk.a
- dosym libtk${v1}.so /usr/${mylibdir}/libtk.so
- dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
-
- dosym wish${v1} /usr/bin/wish
-
- cd "${S}"
- dodoc ChangeLog* README changes
-}
diff --git a/dev-lang/tk/tk-8.5.6.ebuild b/dev-lang/tk/tk-8.5.6.ebuild
deleted file mode 100644
index 133390788..000000000
--- a/dev-lang/tk/tk-8.5.6.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.6.ebuild,v 1.2 2009/02/25 15:17:11 armin76 Exp $
-
-EAPI="2"
-
-WANT_AUTOCONF=latest
-WANT_AUTOMAKE=latest
-
-inherit autotools eutils multilib toolchain-funcs multilib-native
-
-MY_P="${PN}${PV/_beta/b}"
-DESCRIPTION="Tk Widget Set"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug threads truetype"
-
-RDEPEND="x11-libs/libX11[lib32?]
- ~dev-lang/tcl-${PV}[lib32?]"
-DEPEND="${RDEPEND}
- truetype? ( x11-libs/libXft[lib32?] )
- x11-libs/libXt[lib32?]
- x11-proto/xproto"
-
-S="${WORKDIR}/${MY_P}"
-
-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
-}
-
-multilib-native_src_prepare_internal() {
- cd "${S}"
- epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch
-
- # Bug 125971
- epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch
-
- cd "${S}"/unix
- eautoreconf
-}
-
-multilib-native_src_configure_internal() {
- tc-export CC
- cd "${S}"/unix
-
- local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
-
- econf \
- --with-tcl=/usr/${mylibdir} \
- $(use_enable threads) \
- $(use_enable truetype xft) \
- $(use_enable debug symbols) || die
-}
-
-multilib-native_src_install_internal() {
- #short version number
- local v1
- v1=${PV%.*}
-
- cd "${S}"/unix
- S= emake DESTDIR="${D}" install || die
-
- # fix the tkConfig.sh to eliminate refs to the build directory
- local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
- sed -i \
- -e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
- -e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/${mylibdir}/tk${v1}/include'," \
- -e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
- -e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/${mylibdir}," \
- -e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
- -e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
- "${D}"/usr/${mylibdir}/tkConfig.sh || die
-
- # install private headers
- insinto /usr/${mylibdir}/tk${v1}/include/unix
- doins "${S}"/unix/*.h || die
- insinto /usr/${mylibdir}/tk${v1}/include/generic
- doins "${S}"/generic/*.h || die
- rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tk.h
- rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h
- rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h
-
- # install symlink for libraries
- #dosym libtk${v1}.a /usr/${mylibdir}/libtk.a
- dosym libtk${v1}.so /usr/${mylibdir}/libtk.so
- dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
-
- dosym wish${v1} /usr/bin/wish
-
- cd "${S}"
- dodoc ChangeLog* README changes
-}