Merge branch 'master' of git@github.com:sjnewbury/multilib-overlay

Conflicts:
	dev-lang/python/Manifest
	gnome-base/gnome-desktop/Manifest

6 files changed, 219 insertions, 3 deletions

diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index e0ed20c45..8c84c173f 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -25,6 +25,6 @@ DIST python-gentoo-patches-2.5.4.tar.bz2 19474 RMD160 00bb0918414db251b11b7f19a9
 DIST python-gentoo-patches-2.6-r5.tar.bz2 7431 RMD160 dbfc0715773446614843b45818d4152ca133140a SHA1 495cbfbf333052faf6860cf2d682f249a787557c SHA256 ef81eac97d933c77afcfd2434f44132717cd0a1550d1092e388e3c2f3dd5f3cf
 DIST python-gentoo-patches-2.6.2.tar.bz2 8848 RMD160 e3cf700fd8966a6bd6e3e4b64534b72e56863819 SHA1 e073af86f27db77d2eb396ff78814f2b8920811b SHA256 9178be1a77893dc2c74e40073095bbc560d02e5456f1e6be6da20930470950f7
 EBUILD python-2.5.2-r7.ebuild 10730 RMD160 93627852adbd2e41c4e5342840ca2b49f2a98405 SHA1 2eb26b8b69f62d5d981c79f6ea7e3a79b7884741 SHA256 986687608226bff47761fb44210e158a83badff0a856fbf89cdb360e0b846e35
-EBUILD python-2.5.4-r2.ebuild 10890 RMD160 35b94ddda2bb5953626c7f6c4e325b6e58e1bbe7 SHA1 fe20c4f6986a9a1183bb13aa13666c29266bab8d SHA256 07eab80bc5c982c4afe8d3195699b2732bf4ee2bdbb2b49dbfa233adf33a2d47
+EBUILD python-2.5.4-r2.ebuild 10879 RMD160 7b6c6cf457995a87c35a1b099391fdca0b94dd59 SHA1 8e2e25d0d7acbca8584c72bb6761be11e51aa15d SHA256 70b58fcc55db7e66e5944e2361b9fb585a1879b722acc76b749f19649d523807
 EBUILD python-2.6.1-r1.ebuild 9268 RMD160 8fe543b70cdf557b504e21b31e0cc6acd111c7ee SHA1 9851b055d3667e49a86449db076e97efca0441a5 SHA256 21570141e43249e646e3a120c4ee47d85f9b2b10b286783192265b0a04bb4e3f
 EBUILD python-2.6.2.ebuild 8807 RMD160 65c8f5acdbb991181afb84722d1b046b2d783a41 SHA1 2157346cd4d5fc574c2b77e5216a8bd6155a53df SHA256 3d0e4bd59cd6e29e1abfa84e0d5e9a8b8363cc5b4995693ee2c69c1b86eb61d8
diff --git a/dev-lang/python/python-2.5.4-r2.ebuild b/dev-lang/python/python-2.5.4-r2.ebuild
index 7ba7eaa59..be6f2a0ab 100644
--- a/dev-lang/python/python-2.5.4-r2.ebuild
+++ b/dev-lang/python/python-2.5.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r2.ebuild,v 1.5 2009/03/26 05:10:31 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r2.ebuild,v 1.10 2009/04/24 14:17:23 armin76 Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -28,7 +28,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2
 
 LICENSE="PSF-2.2"
 SLOT="2.5"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE="+xml ncurses gdbm ssl readline tk berkdb ipv6 build ucs2 sqlite doc +threads examples elibc_uclibc wininst"
 
 # NOTE: dev-python/{elementtree,celementtree,pysqlite,ctypes,cjkcodecs}
diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest
index cd6a49ad3..95928e0da 100644
--- a/dev-lang/tcl/Manifest
+++ b/dev-lang/tcl/Manifest
@@ -8,8 +8,10 @@ AUX tcl-configure-LANG.patch 1686 RMD160 4ff8355af81705058fd411910dfae94887bcd88
 DIST tcl8.4.18-src.tar.gz 3653369 RMD160 735a9cc0575585de70cbd3cb2ff5c97d46c1dfbd SHA1 83b04c3ad092c22507869dec3a5c7ba821f109b0 SHA256 dee273cba588ec9190f0ee3dfe917be49c52ae847f20c3aa72461546451df0a4
 DIST tcl8.4.19-src.tar.gz 3658647 RMD160 6e3d2991e8e44a2e32f0da8fdf7ab07aa9b8202f SHA1 ed25c5a206bcd603c2d5e58790354b9be178f331 SHA256 1c244722fb409e8774c5d45d6a0b21edc3e4541fd016a40afdf53c94a69a3db9
 DIST tcl8.5.6-src.tar.gz 4409651 RMD160 1f3c937a5e77ec2fbf79240d385474eed24f8ea5 SHA1 02c57eea35191f027460c6df289179d03f2e9584 SHA256 246d09da115307c60f1c91fcfcef8518952e166de058b6aef7fbcffa76ca150e
+DIST tcl8.5.7-src.tar.gz 4421720 RMD160 1bb843548c05332eb3404b99b4800613f25a9dbf SHA1 a603d27bf0b854739c99f0d658bfc3f1c485f578 SHA256 67d28d51a8d04c37114030276503bc8859a4b291bc33133556ab2d11303e66f2
 EBUILD tcl-8.4.18.ebuild 3717 RMD160 0b5e954e7857a5b5aada07c547eb1ec8c1ad5c4f SHA1 4ec8b14bb788ccbeb0f01141831ca64ae558cb91 SHA256 406b9975e1e56a6adfa56a44d92e4594ec016c8033374e012b2ead0e3743b958
 EBUILD tcl-8.4.19.ebuild 3733 RMD160 84a9858740de01cc4f0269a93527ef252c1a9068 SHA1 6804d82bfe6b18686b853292b93f647dbc5f8d53 SHA256 f2d519a3b2afd40ce32a1b04b6516d837f0ce5fd50f7a357232346ed2fe6f710
 EBUILD tcl-8.5.6.ebuild 3286 RMD160 b1c526b368f14055d615474c57cf56d412822e62 SHA1 cd5018cd67569b9aa8c27d137d147c3132b5454f SHA256 5a13bcbbb2f3e8223dc30a29c8d46643e79259f3874612817db6f6605089187f
+EBUILD tcl-8.5.7.ebuild 3288 RMD160 74d3c38f6f7aba055df6e76237dd9028cc33b23a SHA1 f1964b6142c479605c28e7ac52f25a64bab98497 SHA256 22b3f906d30214245783edfe83e1e1b581454e6d7f40ac474a0a8cd9b8efc731
 MISC ChangeLog 13507 RMD160 f72b3eadbc756055815d2a75ecd536edab8867f9 SHA1 fc495dc2fd8f3162f838543075b7340d9873ad23 SHA256 b7490f7e53f1cecf0aaa850199ae0dd144b96708ca0cc2a5c40d25e782f1635e
 MISC metadata.xml 264 RMD160 6318855997b3e957f4ad5c59677534993e352c34 SHA1 19fe5fc86133d09d7fcb0b2ce44054eff4fff028 SHA256 01ce19dabf2e53a73d86e4b16f653c6cd2b6c9aca1b79ec095f353315c8b84ee
diff --git a/dev-lang/tcl/tcl-8.5.7.ebuild b/dev-lang/tcl/tcl-8.5.7.ebuild
new file mode 100644
index 000000000..3c0b583dd
--- /dev/null
+++ b/dev-lang/tcl/tcl-8.5.7.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.7.ebuild,v 1.1 2009/04/17 18:56:08 mescalinum Exp $
+
+EAPI="2"
+
+WANT_AUTOCONF=latest
+WANT_AUTOMAKE=latest
+
+inherit autotools eutils multilib toolchain-funcs multilib-native
+
+MY_P="${PN}${PV/_beta/b}"
+DESCRIPTION="Tool Command Language"
+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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="debug threads"
+
+DEPEND=""
+
+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.5_alpha6-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
+	econf \
+		$(use_enable threads) \
+		$(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 tclConfig.sh to eliminate refs to the build directory
+	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
+	sed -i \
+		-e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L$/usr/${mylibdir}," \
+		-e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='/usr/${mylibdir}/tcl${v1}/include'," \
+		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L/usr/${mylibdir}," \
+		-e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='/usr/${mylibdir}," \
+		-e "s,^TCL_LIB_FILE='libtcl${v1}..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl${v1}\$\{TCL_DBGX\}.so\"," \
+		-e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:/usr/${mylibdir}'," \
+		-e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:/usr/${mylibdir}'," \
+		"${D}"/usr/${mylibdir}/tclConfig.sh || die
+
+	# install private headers
+	insinto /usr/${mylibdir}/tcl${v1}/include/unix
+	doins "${S}"/unix/*.h || die
+	insinto /usr/${mylibdir}/tcl${v1}/include/generic
+	doins "${S}"/generic/*.h || die
+	rm -f "${D}"/usr/${mylibdir}/tcl${v1}/include/generic/tcl.h
+	rm -f "${D}"/usr/${mylibdir}/tcl${v1}/include/generic/tclDecls.h
+	rm -f "${D}"/usr/${mylibdir}/tcl${v1}/include/generic/tclPlatDecls.h
+
+	# install symlink for libraries
+	dosym libtcl${v1}.so /usr/${mylibdir}/libtcl.so
+	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a
+
+	dosym tclsh${v1} /usr/bin/tclsh
+
+	cd "${S}"
+	dodoc ChangeLog* README changes
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "If you're upgrading from <dev-lang/tcl-8.5, 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
+}
diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest
index aa3bbff38..52a0fdb9a 100644
--- a/dev-lang/tk/Manifest
+++ b/dev-lang/tk/Manifest
@@ -10,10 +10,12 @@ DIST tk8.4.18-src.tar.gz 3363853 RMD160 9c01ba85575a230231793a9885457c98046e41bb
 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.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 metadata.xml 159 RMD160 117cc289391c0477579de68e7347628756673eac SHA1 37f242cbf27c6e859fc63487487fdcae09d6931f SHA256 2cf13398186ae4abcd9f41c51ffb3bcdcc7da32df2c2af5c2de2e2cc8ad194ce
diff --git a/dev-lang/tk/tk-8.5.7.ebuild b/dev-lang/tk/tk-8.5.7.ebuild
new file mode 100644
index 000000000..17e61408f
--- /dev/null
+++ b/dev-lang/tk/tk-8.5.7.ebuild
@@ -0,0 +1,104 @@
+# 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.7.ebuild,v 1.1 2009/04/17 19:14:15 mescalinum 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() {
+	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
+}