Version bumped, bug #194385.

(Portage version: 2.1.3.19)

11 files changed, 21 insertions, 229 deletions

diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
index ce320a74887a..23111b303911 100644
--- a/dev-lang/tk/ChangeLog
+++ b/dev-lang/tk/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-lang/tk
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.99 2007/11/25 00:29:38 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.100 2007/12/22 03:58:06 matsuu Exp $
+
+*tk-8.5.0 (22 Dec 2007)
+*tk-8.4.16 (22 Dec 2007)
+
+  22 Dec 2007; MATSUU Takuto <matsuu@gentoo.org> -tk-8.4.15.ebuild,
+  +tk-8.4.16.ebuild, -tk-8.5_alpha6.ebuild, -tk-8.5_alpha6-r1.ebuild,
+  -tk-8.5_beta3.ebuild, +tk-8.5.0.ebuild:
+  Version bumped. bug #194385.
+  Removed old versions.
 
 *tk-8.5_beta3 (25 Nov 2007)
 
diff --git a/dev-lang/tk/files/digest-tk-8.4.15 b/dev-lang/tk/files/digest-tk-8.4.15
deleted file mode 100644
index 3a75c3b23a2f..000000000000
--- a/dev-lang/tk/files/digest-tk-8.4.15
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 68777568d818e1980dda4b6b02b92f1a tk8.4.15-src.tar.gz 3340313
-RMD160 8facb8033ce811097a3568373581687a749dda2d tk8.4.15-src.tar.gz 3340313
-SHA256 2205bb0b0172f5553565f9f323ccf4bc122875084abc21a46f86ac560b9cd935 tk8.4.15-src.tar.gz 3340313
diff --git a/dev-lang/tk/files/digest-tk-8.4.16 b/dev-lang/tk/files/digest-tk-8.4.16
new file mode 100644
index 000000000000..4966a97a41fb
--- /dev/null
+++ b/dev-lang/tk/files/digest-tk-8.4.16
@@ -0,0 +1,3 @@
+MD5 24d18fbebe3bb8853e418431be01bf2c tk8.4.16-src.tar.gz 3344618
+RMD160 8545933c172ffcd7024db91f7292190776d3a873 tk8.4.16-src.tar.gz 3344618
+SHA256 0bf2275fd8da88b8df06c22415f9521339bd81062ddeeb7ca97715d0fe569131 tk8.4.16-src.tar.gz 3344618
diff --git a/dev-lang/tk/files/digest-tk-8.5.0 b/dev-lang/tk/files/digest-tk-8.5.0
new file mode 100644
index 000000000000..6547110cd9bb
--- /dev/null
+++ b/dev-lang/tk/files/digest-tk-8.5.0
@@ -0,0 +1,3 @@
+MD5 bc217c45ed6b2f5b8d3120df63fa13bd tk8.5.0-src.tar.gz 3755427
+RMD160 d2bcabd3a125f60842c322839a20bbdc074d0afc tk8.5.0-src.tar.gz 3755427
+SHA256 ef75421a4b7d74d4d934c700d4d7649733cd1ecbbfb233eb6ffadfebe7f412c6 tk8.5.0-src.tar.gz 3755427
diff --git a/dev-lang/tk/files/digest-tk-8.5_alpha6 b/dev-lang/tk/files/digest-tk-8.5_alpha6
deleted file mode 100644
index 62c129565319..000000000000
--- a/dev-lang/tk/files/digest-tk-8.5_alpha6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3903199e8c5ee921f747a5d59174ed68 tk8.5a6-src.tar.gz 3682249
-RMD160 9cb6f2c7665eee8269a69805a3c9b45edd806cda tk8.5a6-src.tar.gz 3682249
-SHA256 67f5022f31d7a8adea7d150caa5c7de56ea0051e287f67fcb15b82f7fd5b8fd6 tk8.5a6-src.tar.gz 3682249
diff --git a/dev-lang/tk/files/digest-tk-8.5_alpha6-r1 b/dev-lang/tk/files/digest-tk-8.5_alpha6-r1
deleted file mode 100644
index 62c129565319..000000000000
--- a/dev-lang/tk/files/digest-tk-8.5_alpha6-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3903199e8c5ee921f747a5d59174ed68 tk8.5a6-src.tar.gz 3682249
-RMD160 9cb6f2c7665eee8269a69805a3c9b45edd806cda tk8.5a6-src.tar.gz 3682249
-SHA256 67f5022f31d7a8adea7d150caa5c7de56ea0051e287f67fcb15b82f7fd5b8fd6 tk8.5a6-src.tar.gz 3682249
diff --git a/dev-lang/tk/files/digest-tk-8.5_beta3 b/dev-lang/tk/files/digest-tk-8.5_beta3
deleted file mode 100644
index 1f4c2d3f4efe..000000000000
--- a/dev-lang/tk/files/digest-tk-8.5_beta3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5c8ff5db8690b866214cd0d63cdecc5a tk8.5b3-src.tar.gz 3751830
-RMD160 3bf415bdead432d3fcfb7f0767e88b81bd86a63b tk8.5b3-src.tar.gz 3751830
-SHA256 188fc88a06747c911195c5883e35ea5e7c92a4c81e5be0d080b72e14e495093b tk8.5b3-src.tar.gz 3751830
diff --git a/dev-lang/tk/tk-8.4.15.ebuild b/dev-lang/tk/tk-8.4.16.ebuild
index 5d7383ff74d6..0052978faa77 100644
--- a/dev-lang/tk/tk-8.4.15.ebuild
+++ b/dev-lang/tk/tk-8.4.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.15.ebuild,v 1.8 2007/08/25 22:58:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.16.ebuild,v 1.1 2007/12/22 03:58:06 matsuu Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=latest
@@ -13,7 +13,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
@@ -45,7 +45,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch
 
 	# Bug 125971
-	epatch "${FILESDIR}"/${P}-tclm4-soname.patch
+	epatch "${FILESDIR}"/${PN}-8.4.15-tclm4-soname.patch
 
 	local d
 	for d in */configure ; do
diff --git a/dev-lang/tk/tk-8.5_beta3.ebuild b/dev-lang/tk/tk-8.5.0.ebuild
index 4be9d18025bb..0cbf6edd2932 100644
--- a/dev-lang/tk/tk-8.5_beta3.ebuild
+++ b/dev-lang/tk/tk-8.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5_beta3.ebuild,v 1.1 2007/11/25 00:29:38 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.0.ebuild,v 1.1 2007/12/22 03:58:06 matsuu Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=latest
@@ -67,7 +67,7 @@ src_compile() {
 src_install() {
 	#short version number
 	local v1
-	v1=${PV%_*}
+	v1=${PV%.*}
 
 	cd "${S}"/unix
 	S= emake DESTDIR="${D}" install || die
diff --git a/dev-lang/tk/tk-8.5_alpha6-r1.ebuild b/dev-lang/tk/tk-8.5_alpha6-r1.ebuild
deleted file mode 100644
index 2a30d761f2b3..000000000000
--- a/dev-lang/tk/tk-8.5_alpha6-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5_alpha6-r1.ebuild,v 1.1 2007/09/16 02:23:57 matsuu Exp $
-
-WANT_AUTOCONF=latest
-WANT_AUTOMAKE=latest
-
-inherit autotools eutils multilib toolchain-funcs
-
-MY_P="${PN}${PV/_alpha/a}"
-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"
-
-RDEPEND="x11-libs/libX11
-	~dev-lang/tcl-${PV}"
-DEPEND="${RDEPEND}
-	x11-libs/libXt
-	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
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch
-
-	# Bug 125971
-	epatch "${FILESDIR}"/${P}-tclm4-soname.patch
-
-	# Bug 192539
-	epatch "${FILESDIR}"/${PN}-CVE-2007-4851.patch
-
-	cd "${S}"/unix
-	eautoreconf
-}
-
-src_compile() {
-	tc-export CC
-	cd "${S}"/unix
-
-	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
-
-	econf \
-		--with-tcl=/usr/${mylibdir} \
-		$(use_enable threads) \
-		$(use_enable debug symbols) || die
-
-	emake || die
-}
-
-src_install() {
-	#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_alpha6.ebuild b/dev-lang/tk/tk-8.5_alpha6.ebuild
deleted file mode 100644
index cfe507566ad9..000000000000
--- a/dev-lang/tk/tk-8.5_alpha6.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5_alpha6.ebuild,v 1.1 2007/07/20 18:39:46 matsuu Exp $
-
-WANT_AUTOCONF=latest
-WANT_AUTOMAKE=latest
-
-inherit autotools eutils multilib toolchain-funcs
-
-MY_P="${PN}${PV/_alpha/a}"
-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"
-
-RDEPEND="x11-libs/libX11
-	~dev-lang/tcl-${PV}"
-DEPEND="${RDEPEND}
-	x11-libs/libXt
-	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
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch
-
-	# Bug 125971
-	epatch "${FILESDIR}"/${P}-tclm4-soname.patch
-
-	cd "${S}"/unix
-	eautoreconf
-}
-
-src_compile() {
-	tc-export CC
-	cd "${S}"/unix
-
-	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
-
-	econf \
-		--with-tcl=/usr/${mylibdir} \
-		$(use_enable threads) \
-		$(use_enable debug symbols) || die
-
-	emake || die
-}
-
-src_install() {
-	#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
-}