Sync with portage [Fri Nov 30 09:52:14 MSK 2012].

12 years ago · 15edee4543
parent 2871d891d6
commit 15edee4543
6347 changed files with 13604 additions and 11995 deletions
--- a/app-admin/eclean-kernel/Manifest
+++ b/app-admin/eclean-kernel/Manifest
@ -1,2 +1 @@
 DIST eclean-kernel-0.3.1.tar.bz2 8576 SHA256 c4e1dba9cd5d91f507f1a179256b88d2d93986703c8d022b354ed28be3c834de SHA512 9761fce8d34e6b98052e5d5bef45fb39b5f1d00272d696afbcf2ab1f6f44a247680eb415732708474417b8e2a970ea8ff9042792467e52bb8cd937efb07eca85 WHIRLPOOL d7694e7c82967b1e4ccf4b4a2f0baac38354a24cca980cfc48e89f155d6b5bfab5ad34f420864178693f80e6e1e93002cd71308679a578f144e4ea7a3fee75e1
-DIST eclean-kernel-0.3.tar.bz2 8555 SHA256 e3439e856c1be2958c45aedb1cb4ec680a50a769d62eb6f89c25a0c64fd92a26 SHA512 473d755db959b9c382b365fbe82b15e6fa953db6114ff2d33675f4a0cfda6786ced7436827ce6f094c81d145b315964beb1300326457d898b0ad8be4fbc4f655 WHIRLPOOL f6e86379eb6883d9b1052cdcc12bda60c15e803454179da01a2f7ef45aeb4fdf5363f57f393b98024cf00d48ac5eb17ce699dec74283035da2ae76bab427fd53
--- a/app-admin/eclean-kernel/eclean-kernel-0.3.ebuild
+++ b/app-admin/eclean-kernel/eclean-kernel-0.3.ebuild
@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eclean-kernel/eclean-kernel-0.3.ebuild,v 1.1 2012/05/11 17:35:25 mgorny Exp $
-
-EAPI=4
-
-PYTHON_COMPAT='python2_6 python2_7'
-inherit base python-distutils-ng
-
-DESCRIPTION="Remove outdated built kernels"
-HOMEPAGE="https://bitbucket.org/mgorny/eclean-kernel/"
-SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd"
-IUSE=""
-
-PDEPEND="kernel_linux? ( dev-python/pymountboot )"
-
-python_prepare_all() {
-	base_src_prepare
-}
-
-python_install_all() {
-	dodoc README
-}
--- a/app-admin/eselect-sh/eselect-sh-0.3.ebuild
+++ b/app-admin/eselect-sh/eselect-sh-0.3.ebuild
@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-sh/eselect-sh-0.3.ebuild,v 1.10 2012/05/28 16:46:58 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-sh/eselect-sh-0.3.ebuild,v 1.11 2012/11/29 09:14:22 mgorny Exp $

 EAPI=4

 DESCRIPTION="Manages the /bin/sh (POSIX shell) symlink"
-HOMEPAGE="https://github.com/mgorny/eselect-sh/"
-SRC_URI="mirror://github/mgorny/${PN}/${P}.tar.gz"
+HOMEPAGE="https://bitbucket.org/mgorny/eselect-sh/"
+SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
--- a/app-admin/eselect-sh/metadata.xml
+++ b/app-admin/eselect-sh/metadata.xml
@ -10,6 +10,6 @@
 			<email>mgorny@gentoo.org</email>
 			<name>Michał Górny</name>
 		</maintainer>
-		<bugs-to>https://github.com/mgorny/eselect-sh/issues/</bugs-to>
+		<bugs-to>https://bitbucket.org/mgorny/eselect-sh/issues/</bugs-to>
 	</upstream>
 </pkgmetadata>
--- a/app-admin/salt/salt-0.10.0.ebuild
+++ b/app-admin/salt/salt-0.10.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-0.10.0.ebuild,v 1.1 2012/07/06 23:16:24 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-0.10.0.ebuild,v 1.2 2012/11/29 11:39:19 mgorny Exp $

 EAPI=4

@ -31,6 +31,9 @@ RDEPEND="${DEPEND}
 		mysql? ( dev-python/mysql-python )
 		redis? ( dev-python/redis-py )"

+# Tests try to remove system files (bug #437268).
+RESTRICT=test
+
 src_prepare() {
 	sed -i '/install_requires=/ d' setup.py || die "sed failed"

--- a/app-admin/salt/salt-0.10.5.ebuild
+++ b/app-admin/salt/salt-0.10.5.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-0.10.5.ebuild,v 1.1 2012/11/16 18:25:06 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-0.10.5.ebuild,v 1.2 2012/11/29 11:39:19 mgorny Exp $

 EAPI=4

@ -33,6 +33,9 @@ RDEPEND="${DEPEND}
 		mysql? ( dev-python/mysql-python )
 		redis? ( dev-python/redis-py )"

+# Tests try to remove system files (bug #437268).
+RESTRICT=test
+
 src_prepare() {
 	sed -i '/install_requires=/ d' setup.py || die "sed failed"

--- a/app-admin/salt/salt-0.9.8.ebuild
+++ b/app-admin/salt/salt-0.9.8.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-0.9.8.ebuild,v 1.1 2012/04/24 23:37:27 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-0.9.8.ebuild,v 1.2 2012/11/29 11:39:19 mgorny Exp $

 EAPI=4

@ -31,6 +31,9 @@ RDEPEND="${DEPEND}
 		mysql? ( dev-python/mysql-python )
 		redis? ( dev-python/redis-py )"

+# Tests try to remove system files (bug #437268).
+RESTRICT=test
+
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-syndic-resolution-of-master.patch
 	sed -i '/install_requires=/ d' setup.py || die "sed failed"
--- a/app-admin/webalizer/Manifest
+++ b/app-admin/webalizer/Manifest
@ -1,7 +1,5 @@
-DIST geolizer_2.01-10-patch.20050520.tar.bz2 35836 SHA256 0914ec2a2401e8f8ae2735984d18714f5331d864c03347ca56ac3c22fb860378 SHA512 9bc011236ae5d28fae5ed50b99e74baa7de00fabf47ea26f2f111ac035c0c90921ba70dc1290170e4a29b6b6931dc849ed65b0d56d2d282c1cb84dc12447e1f8 WHIRLPOOL 14107f8c8ff74859c9dab9b10bd905cc12f899c7dd43cc7c844bb3609c0b6cc3e8e104aa30fea203c6d6fb849e72e699d6072c16399cffa505b2166919faf2dc
-DIST geolizer_2.01-10-patch.20070115.tar.gz 76862 SHA256 a619f863c9a65a06580080702e770251b8b4dc635e2ebf0fdb56a40b0f7eb1b3 SHA512 bf9434187d0d6b9889bd23d765dcfc2177d03179f692fa6c5994fa5ab4a6565415362eb7cfe6f0ac044e669be2075bef716f912dcec75f55adbace8be89738c4 WHIRLPOOL 82e3808f5bc232ba6681fc125cf3ce226ecaf6ebcc12b4ee83ebc2e3742c0214e9ddd5ab79ca21d0aa41fa9e09231775bf49ed3ef2be74751574d1ed46f82750
-DIST webalizer-2.01-10-RB17-patch.tar.gz 65343 SHA256 4cca8e09c51963caf0b498bc83d0a741ab097aed0b8c093bb69c31d6fa4f4d73 SHA512 f99bca9e406db43e02ef486df1cb963c1411049d5585a1b6ab2893b0bf255a09c50351ebf425e8da1aae6df4066c4f6359c2a584f56175be9ebd84773a9d600e WHIRLPOOL 9ba6cf33f48dfa9415bf199b78fdf00b076b4fd229338603405bfc23958c846b5ae34cf91d6fac293b717f1f492d344925b7e89a6ad36179ce3fa2775c6f6953
-DIST webalizer-2.01-10-RB21-patch.tar.gz 585340 SHA256 6ac3bfcba695e0c124ea3bc23581e0d7a14d2cda05caf47beb6b09bdfcf3541d SHA512 01d9975facbf284de6c80314cb89d3c5982e50745e89b2f1b9b7ade663e1ef6476f0973770f063d254c78874c67b332805afcadb8f47e5ab605c2fdba17c13f5 WHIRLPOOL 7b735d3880a0808b69d138762fc32b9f5ef3108168eba557da081229fc1f1df345aaebba21ac82583f898ad329fadbcdc9f36c83a4ce044a30bbadb7c1538403
-DIST webalizer-2.01-10-src.tar.bz2 252664 SHA256 f339e4b8879aeade0f889b7bc7eb85854a7746a16b267c4aa985cd5b8a112262 SHA512 5eb0c6344d99f92f8b2f72db533b61e7f79f18b94b1adbadc704f0a0b72998042d53daa1a2b8c92975be91ed25252f21ba99a1852365bccdc2338eb5041d6ff9 WHIRLPOOL ecae01667eb7ea163f8e2b66e9fc02f4fe57178eff067b24114633e1d7fc977097eb094b8ac2c2204ac4b7f72a8bc2cc68387b3a25d6a1653dc119acd7b5ccb1
 DIST webalizer-2.21-02-src.tar.bz2 304926 SHA256 f2663d67f5820644a0b1c0b7dee4a5c764d829166fa28d5880442c28886729d9 SHA512 5bca43a36523d246d39338df22c25e554185863c54bc8a06018c1c20bf4292ad62ea122cb99b4a64fd72c43c9403e8e7119a3aac2898dba851c059dbda6a3780 WHIRLPOOL 9ed8131a8a4fa9706d2d5af23ff7b5f917aad4aa153b9967f6017f410fa83a02e2217f0f061b6c529498988ffc0a19476f6e0fbb73bc05630a4101f3d8526349
+DIST webalizer-2.23-05-RB29-patch.tar.gz 45853 SHA256 e212d1928315805b655bcb2614cf9e128373c80601ed6b7ee82ae6d050232a44 SHA512 967a5418e858adb5be8b64bac7edb52ac6eca8bce567269866f2ae7ac6e34c09d2d0ab1d7e7cfcbd92972cf5ea05ac2abaea2058e6fa9273e27cf10aacfb4759 WHIRLPOOL 2ac54d38f160e4311b240e00e6b33c0523341418a32190a3fdd2ba13a226fd53c986ea6d8e127f3444dec03c2801d984964f08141ee8e329e198dde520a6e76c
+DIST webalizer-2.23-05-src.tar.bz2 308238 SHA256 afc88b8ee0927d9ed004962cb7e3d3054ef7628c7bc8a7b2e3ea1d758a47885a SHA512 4840c2ba25e34d5e276c724c311d2c2d7a0223dcbf6dec567960f56bc4cdfe4f6a1e412e3fcab53395d6357377f4f8d2b3bcc4b23c46a3ec6a895813a681cd4b WHIRLPOOL 82e092ae6e21e3bd3f70cd53a2dc6b71ed3903f640d7e4d2aa5be81ad43cf8aea54f0dd1d3fc02f55a615b1b9208ec339ccadcfa342737e61ebb0404f7fddfe1
+DIST webalizer-geodb-latest.tgz 639447 SHA256 f2a1bd7fcc9c93ed6a627bd15f2c31866d5a6c6b7dd48852d84a129386327218 SHA512 0f32d1249902e17f37cd0e7680004262bbe5b4a34a00d882319258c6aed80503e89ed192d8365731ab507fa54560082ae16c7023d0bc2232350709106be24117 WHIRLPOOL 26f1edf87ea6102c5047b41702fd273d40360bde7c481183a3303e2c89af3d6ba7470cd942d4af1574bed8822b776a26ea13c2388b7654fffccee856cc99e571
 DIST webalizer.conf.gz 8986 SHA256 b7da31865a8c13a66756247d68242d6478900f2c2b9b5698ed35c0c613fb9a71 SHA512 ec7f815e0215116d72e6d93b471a4b86a1c152a8ebae7c374144cabeeb06750d3a39fde65faf069e9aeb133f27b0b4cdee16bed5442e7fbd4eb4f45a4f3cd84b WHIRLPOOL 58c2ced08eeba65e1c7acf951e2e0e1806af58fcd37997c4d824504235303d7f75cf6c05c7ce051e2e2f3b3abff9a929f0dfd7722a995a8ab65232cfb549e83a
--- a/app-admin/webalizer/files/geolizer-2.01.10_p20070115-strip.patch
+++ b/app-admin/webalizer/files/geolizer-2.01.10_p20070115-strip.patch
@ -1,10 +0,0 @@
--- webalizer-2.01-10/Makefile.in_BACKUP	2010-09-17 08:39:52.000000000 +0200
-+++ webalizer-2.01-10/Makefile.in	2010-09-17 08:40:02.000000000 +0200
-@@ -45,7 +45,6 @@
-                 output.o output.h graphs.o graphs.h lang.h   \
- 		webalizer_lang.h
- 	$(CC) ${LDFLAGS} -o webalizer webalizer.o hashtab.o linklist.o preserve.o parser.o output.o dns_resolv.o graphs.o ${LIBS}
-	strip webalizer
- 	rm -f webazolver
- 	@LN_S@ webalizer webazolver
- 
--- a/app-admin/webalizer/files/webalizer-db4.2.patch
+++ b/app-admin/webalizer/files/webalizer-db4.2.patch
@ -1,13 +0,0 @@
-Index: webalizer-2.01-10/configure.in
-===================================================================
--- webalizer-2.01-10.orig/configure.in
-+++ webalizer-2.01-10/configure.in
-@@ -71,7 +71,7 @@ if test "$USE_DNS" = "yes"; then
-   if test "$HAVE_DB" = ""; then
-     AC_CHECK_FUNCS(dbopen)
-     if test $ac_cv_func_dbopen = no; then
-      AC_SEARCH_LIBS(dbopen, db db1, OPTS="-DUSE_DNS ${OPTS}"; HAVE_DB="yes")
-+      OPTS="-DUSE_DNS ${OPTS}"; HAVE_DB="yes"; LIBS="-ldb ${LIBS}"
-       if test "$HAVE_DB" = ""; then
-         AC_MSG_WARN(You must have a V1.85 compatable DB library!)
-         AC_MSG_WARN(DNS lookup code will be disabled...)
--- a/app-admin/webalizer/files/webalizer-storage-size.patch
+++ b/app-admin/webalizer/files/webalizer-storage-size.patch
@ -1,17 +0,0 @@
-Index: webalizer-2.01-10/webalizer.h
-===================================================================
--- webalizer-2.01-10.orig/webalizer.h
-+++ webalizer-2.01-10/webalizer.h
-@@ -17,10 +17,10 @@
- #define MAXURLH  128                   /* Max URL field size in htab       */
- #define MAXREF   1024                  /* Max referrer field size          */
- #define MAXREFH  128                   /* Max referrer field size in htab  */
-#define MAXAGENT 64                    /* Max user agent field size        */
-+#define MAXAGENT 128                   /* Max user agent field size        */
- #define MAXCTRY  48                    /* Max country name size            */
- #define MAXSRCH  256                   /* Max size of search string buffer */
-#define MAXSRCHH 64                    /* Max size of search str in htab   */
-+#define MAXSRCHH 128                   /* Max size of search str in htab   */
- #define MAXIDENT 64                    /* Max size of ident string (user)  */
- 
- #define SLOP_VAL 3600                  /* out of sequence slop (seconds)   */
--- a/app-admin/webalizer/webalizer-2.01.10-r15.ebuild
+++ b/app-admin/webalizer/webalizer-2.01.10-r15.ebuild
@ -1,137 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r15.ebuild,v 1.14 2010/10/28 03:35:18 sping Exp $
-
-EAPI="2"
-
-# uses webapp.eclass to create directories with right permissions
-# probably slight overkill but works well
-inherit eutils webapp db-use autotools
-
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-
-MY_PV=${PV/.10/-10}
-MY_P=${PN}-${MY_PV}
-S="${WORKDIR}"/${MY_P}
-XTENDED_VER="RB17"
-XTENDED_URL="rb17"
-DESCRIPTION="Webserver log file analyzer"
-HOMEPAGE="http://www.mrunix.net/webalizer/"
-SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/old/${MY_P}-src.tar.bz2
-	geoip? ( http://sysd.org/proj/geolizer_${MY_PV}-patch.20050520.tar.bz2 )
-	xtended? (
-	http://www.irc.unizh.ch/users/pfrei/webalizer/${XTENDED_URL}/${PN}-${MY_PV}-${XTENDED_VER}-patch.tar.gz )
-	mirror://gentoo/${PN}.conf.gz
-"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="apache2 geoip nls xtended"
-
-DEPEND=">=sys-libs/db-4.2
-	>=sys-libs/zlib-1.1.4
-	>=media-libs/libpng-1.2
-	>=media-libs/gd-1.8.3[png]
-	geoip? ( dev-libs/geoip )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	# USE=nls has no real meaning if LINGUAS isn't set
-	if use nls && [ -z "${LINGUAS}" ]; then
-		ewarn "you must set LINGUAS in /etc/make.conf"
-		ewarn "if you want to USE=nls"
-		die "please either set LINGUAS or do not use nls"
-	fi
-}
-
-src_prepare() {
-	if use geoip; then
-		epatch "${WORKDIR}"/geolizer_${MY_PV}-patch/geolizer.patch \
-				"${FILESDIR}"/geolizer-2.01.10_p20070115-strip.patch
-		use xtended && elog "Xtended doesn't work with geolizer, skipping"
-	else
-		epatch "${FILESDIR}"/${PN}-db4.2.patch || die
-		if use xtended; then
-			epatch "${WORKDIR}"/${PN}-${MY_PV}-${XTENDED_VER}-patch || die
-		fi
-	fi
-
-	# bug 121816: prevent truncated useragent fields
-	sed -i -e 's:^#define MAXAGENT 64:#define MAXAGENT 128:' webalizer.h
-
-	# stupid broken configuration file
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=" --enable-dns \
-		--with-db=$(db_includedir) \
-		--with-dblib=$(db_libname)"
-	use geoip && myconf="${myconf} --enable-geoip"
-
-	# really dirty hack; necessary due to a really gross ./configure
-	# basically, it just sets the natural language the program uses
-	# unfortunatly, this program only allows for one lang, so only the first
-	# entry in LINGUAS is used
-	if use nls; then
-		local longlang
-		longlang="$(grep ^${LINGUAS:0:2} ${FILESDIR}/webalizer-language-list.txt)"
-		myconf="${myconf} --with-language=${longlang:3}"
-	else
-		myconf="${myconf} --with-language=english"
-	fi
-
-	econf ${myconf} || die "econf failed"
-}
-
-src_install() {
-	webapp_src_preinst
-
-	into /usr
-	dobin webalizer
-	dosym webalizer /usr/bin/webazolver
-	doman webalizer.1
-
-	insinto /etc
-	doins "${WORKDIR}"/${PN}.conf
-	use apache2 && sed -i -e "s/apache/apache2/g" "${D}"/etc/webalizer.conf
-
-	dodoc *README* CHANGES Copyright sample.conf "${FILESDIR}"/apache.webalizer
-	webapp_src_install
-}
-
-pkg_postinst(){
-	elog
-	elog "It is suggested that you restart apache before using webalizer"
-	elog "You may want to review /etc/webalizer.conf and ensure that"
-	elog "OutputDir is set correctly"
-	elog
-	elog "Then just type webalizer to generate your stats."
-	elog "You can also use cron to generate them e.g. every day."
-	elog "They can be accessed via http://localhost/webalizer"
-	elog
-	elog "A sample Apache config file has been installed into"
-	elog "/usr/share/doc/${PF}/apache.webalizer"
-	elog "Please edit and install it as necessary"
-	elog
-
-	if [ ${#LINGUAS} -gt 2 ] && use nls; then
-		ewarn
-		ewarn "You have more than one language in LINGUAS"
-		ewarn "Due to the limitations of this packge, it was built"
-		ewarn "only with ${LINGUAS:0:2} support. If this is not what"
-		ewarn "you intended, please place the language you desire"
-		ewarn "_first_ in the list of LINGUAS in /etc/make.conf"
-		ewarn
-	fi
-
-	if use xtended; then
-		elog "Read http://www.irc.unizh.ch/users/pfrei/webalizer/${XTENDED_URL}/INSTALL"
-		elog "if you are switching from stock webalizer to xtended"
-	fi
-
-	webapp_pkg_postinst
-}
--- a/app-admin/webalizer/webalizer-2.01.10-r17.ebuild
+++ b/app-admin/webalizer/webalizer-2.01.10-r17.ebuild
@ -1,143 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r17.ebuild,v 1.6 2010/10/28 03:35:18 sping Exp $
-
-EAPI="2"
-
-# uses webapp.eclass to create directories with right permissions
-# probably slight overkill but works well
-inherit confutils eutils webapp db-use autotools
-
-WEBAPP_MANUAL_SLOT="yes"
-
-MY_PV=${PV/.10/-10}
-MY_P=${PN}-${MY_PV}
-
-XTENDED_VER="RB21"
-XTENDED_URL="rb21"
-GEOLIZER_VER="20070115"
-
-DESCRIPTION="Webserver log file analyzer"
-HOMEPAGE="http://www.mrunix.net/webalizer/"
-SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/old/${MY_P}-src.tar.bz2
-	geoip? (
-	http://sysd.org/stas/files/active/0/geolizer_${MY_PV}-patch.${GEOLIZER_VER}.tar.gz )
-	xtended? ( http://patrickfrei.ch/webalizer/${XTENDED_URL}/${PN}-${MY_PV}-${XTENDED_VER}-patch.tar.gz )
-	mirror://gentoo/${PN}.conf.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="geoip nls xtended"
-SLOT="0"
-
-DEPEND=">=sys-libs/db-4.2
-	>=sys-libs/zlib-1.1.4
-	>=media-libs/libpng-1.2
-	>=media-libs/gd-1.8.3
-	geoip? ( dev-libs/geoip )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	webapp_pkg_setup
-	confutils_require_built_with_all media-libs/gd png
-
-	# USE=nls has no real meaning if LINGUAS isn't set
-	if use nls && [[ -z "${LINGUAS}" ]]; then
-		ewarn "you must set LINGUAS in /etc/make.conf"
-		ewarn "if you want to USE=nls"
-		die "please either set LINGUAS or do not use nls"
-	fi
-}
-
-src_prepare() {
-	if use geoip && ! use xtended; then
-		epatch "${WORKDIR}"/geolizer_${MY_PV}-patch/geolizer.patch \
-				"${FILESDIR}"/geolizer-2.01.10_p20070115-strip.patch
-	else
-		epatch "${FILESDIR}"/${PN}-db4.2.patch
-		if use xtended; then
-			epatch "${WORKDIR}"/${PN}-${MY_PV}-${XTENDED_VER}-patch
-		else
-			epatch "${FILESDIR}"/${PN}-storage-size.patch
-		fi
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	# really dirty hack; necessary due to a really gross ./configure
-	# basically, it just sets the natural language the program uses
-	# unfortunatly, this program only allows for one lang, so only the first
-	# entry in LINGUAS is used
-	if use nls; then
-		local longlang="$(grep ^${LINGUAS:0:2} "${FILESDIR}"/webalizer-language-list.txt)"
-		local myconf="${myconf} --with-language=${longlang:3}"
-	else
-		local myconf="${myconf} --with-language=english"
-	fi
-
-	if use xtended && use geoip ; then
-		# Rationale:
-		# 1. --enable-geoip broken on geolizer
-		# 2. --disable-geoip broken on webalizer xtended
-		myconf="${myconf} --enable-geoip"
-	fi
-
-	econf --enable-dns \
-		--with-db=$(db_includedir) \
-		--with-dblib=$(db_libname) \
-		${myconf} \
-		|| die "econf failed"
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dobin webalizer
-	dosym webalizer /usr/bin/webazolver
-	doman webalizer.1
-
-	insinto /etc
-	doins "${WORKDIR}"/${PN}.conf
-	dosed "s/apache/apache2/g" /etc/webalizer.conf
-
-	dodoc CHANGES *README* INSTALL sample.conf "${FILESDIR}"/apache.webalizer
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	elog
-	elog "It is suggested that you restart apache before using webalizer"
-	elog "You may want to review /etc/webalizer.conf and ensure that"
-	elog "OutputDir is set correctly"
-	elog
-	elog "Then just type webalizer to generate your stats."
-	elog "You can also use cron to generate them e.g. every day."
-	elog "They can be accessed via http://localhost/webalizer"
-	elog
-	elog "A sample Apache config file has been installed into"
-	elog "/usr/share/doc/${PF}/apache.webalizer"
-	elog "Please edit and install it as necessary"
-	elog
-
-	if [[ ${#LINGUAS} -gt 2 ]] && use nls; then
-		ewarn
-		ewarn "You have more than one language in LINGUAS"
-		ewarn "Due to the limitations of this packge, it was built"
-		ewarn "only with ${LINGUAS:0:2} support. If this is not what"
-		ewarn "you intended, please place the language you desire"
-		ewarn "_first_ in the list of LINGUAS in /etc/make.conf"
-		ewarn
-	fi
-
-	if use xtended; then
-		elog "Read http://patrickfrei.ch/webalizer/${XTENDED_URL}/INSTALL"
-		elog "if you are switching from stock webalizer to xtended"
-	fi
-
-	webapp_pkg_postinst
-}
--- a/app-admin/webalizer/webalizer-2.21.02.ebuild
+++ b/app-admin/webalizer/webalizer-2.21.02.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.21.02.ebuild,v 1.11 2012/10/28 20:13:19 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.21.02.ebuild,v 1.12 2012/11/29 12:25:08 blueness Exp $

 # uses webapp.eclass to create directories with right permissions
 # probably slight overkill but works well
@ -15,7 +15,7 @@ MY_PV="$(get_version_component_range 1-2)-$(get_version_component_range 3)"
 MY_P="${PN}-${MY_PV}"

 DESCRIPTION="Webserver log file analyzer"
-HOMEPAGE="http://www.mrunix.net/webalizer/"
+HOMEPAGE="http://www.webalizer.org/"
 SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/${MY_P}-src.tar.bz2
 	mirror://gentoo/${PN}.conf.gz"

--- a/app-admin/webalizer/webalizer-2.01.10-r16.ebuild
+++ b/app-admin/webalizer/webalizer-2.01.10-r16.ebuild
@ -1,32 +1,30 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r16.ebuild,v 1.5 2010/10/28 03:35:18 sping Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.23.05.ebuild,v 1.2 2012/11/29 12:25:08 blueness Exp $

 # uses webapp.eclass to create directories with right permissions
 # probably slight overkill but works well
-inherit confutils eutils webapp db-use autotools

-WEBAPP_MANUAL_SLOT="yes"
+EAPI="2"

-MY_PV=${PV/.10/-10}
-MY_P=${PN}-${MY_PV}
+inherit versionator confutils eutils webapp db-use

-XTENDED_VER="RB21"
-XTENDED_URL="rb21"
-GEOLIZER_VER="20070115"
+WEBAPP_MANUAL_SLOT="yes"
+XTENDED_VER="RB29"
+XTENDED_URL="rb29"
+
+MY_PV="$(get_version_component_range 1-2)-$(get_version_component_range 3)"
+MY_P="${PN}-${MY_PV}"

 DESCRIPTION="Webserver log file analyzer"
-HOMEPAGE="http://www.mrunix.net/webalizer/"
-SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/old/${MY_P}-src.tar.bz2
-	geoip? (
-	http://sysd.org/stas/files/active/0/geolizer_${MY_PV}-patch.${GEOLIZER_VER}.tar.gz )
+HOMEPAGE="http://www.webalizer.org/"
+SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/${MY_P}-src.tar.bz2
 	xtended? ( http://patrickfrei.ch/webalizer/${XTENDED_URL}/${PN}-${MY_PV}-${XTENDED_VER}-patch.tar.gz )
+	ftp://ftp.mrunix.net/pub/webalizer/webalizer-geodb-latest.tgz
 	mirror://gentoo/${PN}.conf.gz"

 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="geoip nls xtended"
 SLOT="0"

@ -34,7 +32,7 @@ DEPEND=">=sys-libs/db-4.2
 	>=sys-libs/zlib-1.1.4
 	>=media-libs/libpng-1.2
 	>=media-libs/gd-1.8.3
-	geoip? ( dev-libs/geoip )"
+	dev-libs/geoip"
 RDEPEND="${DEPEND}"

 S="${WORKDIR}"/${MY_P}
@ -52,19 +50,9 @@ pkg_setup() {
 }

 src_prepare() {
-	if use geoip && ! use xtended; then
-		epatch "${WORKDIR}"/geolizer_${MY_PV}-patch/geolizer.patch \
-				"${FILESDIR}"/geolizer-2.01.10_p20070115-strip.patch
-	else
-		epatch "${FILESDIR}"/${PN}-db4.2.patch
-		if use xtended; then
-			epatch "${WORKDIR}"/${PN}-${MY_PV}-${XTENDED_VER}-patch
-		else
-			epatch "${FILESDIR}"/${PN}-storage-size.patch
-		fi
+	if use xtended; then
+		epatch "${WORKDIR}"/${PN}-${MY_PV}-${XTENDED_VER}-patch
 	fi
-
-	eautoreconf
 }

 src_configure() {
@ -82,8 +70,9 @@ src_configure() {
 	econf --enable-dns \
 		--with-db=$(db_includedir) \
 		--with-dblib=$(db_libname) \
-		$(use_enable geoip) \
 		${myconf} \
+		$(use_enable geoip) \
+		--with-geodb=/usr/share/webalizer/geodb \
 		|| die "econf failed"
 }

@ -98,6 +87,9 @@ src_install() {
 	doins "${WORKDIR}"/${PN}.conf
 	dosed "s/apache/apache2/g" /etc/webalizer.conf

+	insinto /usr/share/webalizer/geodb
+	doins "${WORKDIR}"/GeoDB.dat
+
 	dodoc CHANGES *README* INSTALL sample.conf "${FILESDIR}"/apache.webalizer

 	webapp_src_install
@ -128,10 +120,5 @@ pkg_postinst() {
 		ewarn
 	fi

-	if use xtended; then
-		elog "Read http://patrickfrei.ch/webalizer/${XTENDED_URL}/INSTALL"
-		elog "if you are switching from stock webalizer to xtended"
-	fi
-
 	webapp_pkg_postinst
 }
--- a/app-arch/libpar2/libpar2-0.2.1.ebuild
+++ b/app-arch/libpar2/libpar2-0.2.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libpar2/libpar2-0.2.1.ebuild,v 1.3 2012/11/25 10:54:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libpar2/libpar2-0.2.1.ebuild,v 1.4 2012/11/29 20:33:50 ranger Exp $

 EAPI=4

@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/${PN}/${PV:0:3}/${PV}/+download/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc ~x86"
 IUSE="static-libs"

 RDEPEND="dev-libs/libsigc++:2"
--- a/app-editors/nano/files/gentoo.nanorc
+++ b/app-editors/nano/files/gentoo.nanorc
@ -17,9 +17,9 @@ color magenta "\<use(_(with|enable))?\> [!a-zA-Z0-9_+ -]*" "inherit.*"
 color brightblue "\<e(begin|end|conf|install|make|warn|infon?|error|log|patch|new(group|user))\>"
 color brightblue "\<die\>" "\<use(_(with|enable))?\>" "\<inherit\>" "\<has\>" "\<(has|best)_version\>" "\<unpack\>"
 color brightblue "\<(do|new)(ins|s?bin|doc|lib(|\.so|\.a)|man|info|exe|initd|confd|envd|pam|menu|icon)\>"
-color brightblue "\<do(python|sed|dir|hard|sym|html|jar|mo)\>" "\<keepdir\>"
+color brightblue "\<do(header|python|sed|dir|hard|sym|html|jar|mo)\>" "\<keepdir\>"
 color brightblue "prepall(|docs|info|man|strip)" "prep(info|lib|lib\.(so|a)|man|strip)"
-color brightblue "\<(|doc|ins|exe)into\>" "\<f(owners|perms)\>" "\<(exe|ins|dir)opts\>"
+color brightblue "\<(|doc|ins|exe)into\>" "\<f(owners|perms)\>" "\<(exe|ins|dir)opts\>" "\<usex\>"
 ## Highlight common commands used in ebuilds
 color blue "\<make\>" "\<(cat|cd|chmod|chown|cp|echo|env|export|grep|let|ln|mkdir|mv|rm|sed|set|tar|touch|unset)\>"
 ## Highlight comments (doesnt work that well)
--- a/app-emulation/simh/simh-3.3.0.ebuild
+++ b/app-emulation/simh/simh-3.3.0.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/simh/simh-3.3.0.ebuild,v 1.3 2007/07/12 06:39:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/simh/simh-3.3.0.ebuild,v 1.4 2012/11/29 11:31:35 pinkbyte Exp $

 inherit eutils versionator

@ -9,7 +9,7 @@ DESCRIPTION="a simulator for historical computers such as Vax, PDP-11 etc.)"
 HOMEPAGE="http://simh.trailing-edge.com/"
 SRC_URI="http://simh.trailing-edge.com/sources/${MY_P}.zip"

-LICENSE="as-is"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="x86"

--- a/app-emulation/simh/simh-3.8.1.ebuild
+++ b/app-emulation/simh/simh-3.8.1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/simh/simh-3.8.1.ebuild,v 1.2 2010/11/21 19:54:26 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/simh/simh-3.8.1.ebuild,v 1.3 2012/11/29 11:31:35 pinkbyte Exp $

 inherit eutils toolchain-funcs versionator

@ -9,7 +9,7 @@ DESCRIPTION="a simulator for historical computers such as Vax, PDP-11 etc.)"
 HOMEPAGE="http://simh.trailing-edge.com/"
 SRC_URI="http://simh.trailing-edge.com/sources/${MY_P}.zip"

-LICENSE="as-is"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
--- a/app-emulation/simh/simh-3.9.0-r1.ebuild
+++ b/app-emulation/simh/simh-3.9.0-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/simh/simh-3.9.0-r1.ebuild,v 1.1 2012/06/23 19:10:37 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/simh/simh-3.9.0-r1.ebuild,v 1.2 2012/11/29 11:31:35 pinkbyte Exp $

 EAPI=4

@ -11,7 +11,7 @@ DESCRIPTION="a simulator for historical computers such as Vax, PDP-11 etc.)"
 HOMEPAGE="http://simh.trailing-edge.com/"
 SRC_URI="http://simh.trailing-edge.com/sources/${MY_P}.zip"

-LICENSE="as-is"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
--- a/app-misc/sl/sl-3.03-r3.ebuild
+++ b/app-misc/sl/sl-3.03-r3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/sl/sl-3.03-r3.ebuild,v 1.5 2012/11/21 10:43:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sl/sl-3.03-r3.ebuild,v 1.6 2012/11/29 20:48:08 ranger Exp $

 EAPI=4

@ -18,7 +18,7 @@ SRC_URI="http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/sl/${PN}.tar

 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 hppa ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="debug linguas_ja vanilla"

 REQUIRED_USE="debug? ( !vanilla )"
--- a/app-portage/diffmask/diffmask-0.3.3-r1.ebuild
+++ b/app-portage/diffmask/diffmask-0.3.3-r1.ebuild
@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/diffmask/diffmask-0.3.3-r1.ebuild,v 1.1 2012/08/30 22:56:56 mgorny Exp $
-
-EAPI=4
-PYTHON_COMPAT='python2_6 python2_7 python3_1 python3_2'
-
-inherit base python-distutils-ng
-
-DESCRIPTION="A utility to maintain package.unmask entries up-to-date with masks"
-HOMEPAGE="https://bitbucket.org/mgorny/diffmask/"
-SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=sys-apps/portage-2.1.8.3"
-
-python_prepare_all() {
-	base_src_prepare
-}
-
-python_install_all() {
-	dodoc README
-}
--- a/app-portage/emerge-delta-webrsync/Manifest
+++ b/app-portage/emerge-delta-webrsync/Manifest
@ -1,2 +1,2 @@
 DIST emerge-delta-webrsync-3.5.1 13289 SHA256 663ce5e800dec988ba5e1bb283ca243205d1ebdc27e3d0c269e5c0bb198f7d4a SHA512 a19a39d21b2065d0d31f54cf983066a80b7ce24cbcceb51f9bfeeb83c4e31027048082f10f900144b67392bacc365de17e6c0a599fe1d6aff6ffde3970a1c72c WHIRLPOOL 05343ffa87aad99d59b6894d770c26f0afcca5313a67ccf667a82623a2f73edfe1f439a8c2cc043f625dfc5dabe30eaf3298a51cc28832e4f41ed0856d8ebd4d
-DIST emerge-delta-webrsync-3.6.1 16817 SHA256 e57863cf59cca37765d6aa92e09374fb57450cdcb0240d2245e346b1aee405cb SHA512 e3917b2ee69fe15a052dbceb0e3b3cb2a969d866378f0ac63a3a4be5b1777f2ba8a9043236524b822bfed9891f9a6c1fce26dccbe2540aa89ca914795cbbe048 WHIRLPOOL a30a5516123bae521075bda2676bbf18c042f27559df94c47bd687f1cd2c181ef21231f65bc6feb7d28c1fa662261c0eb43bca34be70922351726c81a7b2e496
+DIST emerge-delta-webrsync-3.6.2 16837 SHA256 962f41b3e0ec64fce0e23e2365e8e2d18c5fdb762542cf5d1d2a23e072a19c30 SHA512 734598326dbdd588f5b62e2117ca377ad443161feca73a50dfe5740c20afb59ee9e8cd056bcaa0555f7276172db19d572a9a32023c5a311a6aa309d11f3dde86 WHIRLPOOL 1822a0e028e3c4f9e053b951e8e8c98268baf38f1da488e43a41f54089440f7ec8d1427c17e297e72bd5f1628611f3a46811231470fbe16997d97a18909593fb
--- a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.6.2.ebuild
+++ b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.6.2.ebuild
@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.6.1.ebuild,v 1.1 2012/09/14 07:54:53 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.6.2.ebuild,v 1.1 2012/11/30 00:11:33 zmedico Exp $

 EAPI=4
 DESCRIPTION="emerge-webrsync using patches to minimize bandwidth"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
-SRC_URI="http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=blob_plain;f=misc/emerge-delta-webrsync;hb=bb9186cd81d707593ea386d17321bd594d847126 -> ${P}"
+SRC_URI="http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=blob_plain;f=misc/emerge-delta-webrsync;hb=228a860476d7543608b469c569ec1d4e70aa7f59 -> ${P}"

 LICENSE="GPL-2"
 SLOT="0"
--- a/app-portage/flaggie/flaggie-0.2-r1.ebuild
+++ b/app-portage/flaggie/flaggie-0.2-r1.ebuild
@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/flaggie/flaggie-0.2-r1.ebuild,v 1.1 2012/08/31 09:13:52 mgorny Exp $
-
-EAPI=4
-PYTHON_COMPAT='python2_6 python2_7 python3_1 python3_2'
-
-inherit base bash-completion-r1 python-distutils-ng
-
-DESCRIPTION="A smart CLI mangler for package.* files"
-HOMEPAGE="https://bitbucket.org/mgorny/flaggie/"
-SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=sys-apps/portage-2.1.8.3"
-
-python_prepare_all() {
-	base_src_prepare
-}
-
-python_install_all() {
-	dodoc README
-	newbashcomp contrib/bash-completion/${PN}.bash-completion ${PN}
-}
-
-pkg_postinst() {
-	ewarn "Please denote that flaggie creates backups of your package.* files"
-	ewarn "before performing each change through appending a single '~'."
-	ewarn "If you'd like to keep your own backup of them, please use another"
-	ewarn "naming scheme (or even better some VCS)."
-	elog
-	elog "bash-completion support requires:"
-	elog "	app-shells/gentoo-bashcomp"
-	has_version app-shells/gentoo-bashcomp && \
-		elog "(installed already)"
-}
--- a/app-portage/flaggie/flaggie-0.2-r2.ebuild
+++ b/app-portage/flaggie/flaggie-0.2-r2.ebuild
@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/flaggie/flaggie-0.2-r2.ebuild,v 1.5 2012/11/21 13:17:39 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/flaggie/flaggie-0.2-r2.ebuild,v 1.6 2012/11/29 12:17:04 mgorny Exp $

 EAPI=4
-PYTHON_COMPAT=(python2_6 python2_7 python3_1 python3_2 pypy1_9)
+PYTHON_COMPAT=(python2_6 python2_7 python3_1 python3_2)

 inherit bash-completion-r1 distutils-r1

--- a/app-portage/install-mask/install-mask-0.0.2-r1.ebuild
+++ b/app-portage/install-mask/install-mask-0.0.2-r1.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/install-mask/install-mask-0.0.2-r1.ebuild,v 1.2 2012/09/07 10:47:31 mgorny Exp $
-
-EAPI=4
-PYTHON_COMPAT='python2_6 python2_7 python3_1 python3_2'
-
-inherit base python-distutils-ng
-
-DESCRIPTION="Handle INSTALL_MASK setting in make.conf"
-HOMEPAGE="https://bitbucket.org/mgorny/install-mask/"
-SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="app-portage/flaggie
-	dev-python/lxml"
-
-python_prepare_all() {
-	base_src_prepare
-}
--- a/app-shells/rssh/Manifest
+++ b/app-shells/rssh/Manifest
@ -1 +1,2 @@
 DIST rssh-2.3.3.tar.gz 119510 SHA256 1940912c2485f8531e4461de06bd2aebc607d2a89805debb7ac81002fa6fd07f SHA512 a5aeeca30217224830ca96acbf257a59c0da602ed541120d7a69695a352dfe6617b9fd8df7340f3363f4f807b47d1db20b60c10dcc8ef3a208968e3f9cb1c3ee WHIRLPOOL 2db29c430880bf37b7daceece8510fef54662cc3d10e75b693c425231d00b55c4d39c75cd539a088c8547d6caf10ff7c3b994c3ff2eb7e606bb3dcecd3362f05
+DIST rssh-2.3.4.tar.gz 113315 SHA256 f30c6a760918a0ed39cf9e49a49a76cb309d7ef1c25a66e77a41e2b1d0b40cd9 SHA512 c1a77abdf4abe5f936fb1c9c008fc81fabf7b624d69ed31fe2ae5619dfa4a79f1d4a4f2daa5291a36d40353fa2168e74e5ba61294230d702fcdc88ae0d520487 WHIRLPOOL a2fa86922780bdc5f34536aa5840a76902841024b0bc35220098e9d40e087c28578c37417c92ffca5035898c47f50d5de5d18609a3087ceb25eb532bd6b26092
--- a/app-shells/rssh/rssh-2.3.4.ebuild
+++ b/app-shells/rssh/rssh-2.3.4.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/rssh/rssh-2.3.4.ebuild,v 1.1 2012/11/29 19:35:47 hwoarang Exp $
+
+EAPI=4
+inherit eutils multilib
+
+DESCRIPTION="Restricted shell for SSHd"
+HOMEPAGE="http://rssh.sourceforge.net/"
+SRC_URI="mirror://sourceforge/rssh/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="static"
+
+RDEPEND="virtual/ssh"
+
+src_prepare() {
+	sed -i 's:chmod u+s $(:chmod u+s $(DESTDIR)$(:' Makefile.in || die
+}
+
+src_configure() {
+	econf \
+		--libexecdir="/usr/$(get_libdir)/misc" \
+		--with-scp=/usr/bin/scp \
+		--with-sftp-server="/usr/$(get_libdir)/misc/sftp-server" \
+		$(use_enable static)
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+	dodoc AUTHORS ChangeLog CHROOT INSTALL README TODO
+}
--- a/app-text/mupdf/mupdf-1.1.ebuild
+++ b/app-text/mupdf/mupdf-1.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.1.ebuild,v 1.4 2012/11/27 13:17:23 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.1.ebuild,v 1.5 2012/11/29 13:11:52 blueness Exp $

 EAPI=4

@ -12,7 +12,7 @@ SRC_URI=" http://${PN}.googlecode.com/files/${P/_rc/-rc}-source.tar.gz"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X vanilla"

 RDEPEND="media-libs/freetype:2
--- a/dev-db/ctdb/ctdb-1.13.ebuild
+++ b/dev-db/ctdb/ctdb-1.13.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/ctdb/ctdb-1.13.ebuild,v 1.2 2012/11/26 11:59:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/ctdb/ctdb-1.13.ebuild,v 1.3 2012/11/29 15:04:59 jer Exp $

 EAPI=4

@ -14,7 +14,7 @@ SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.xz"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""

 DEPEND="dev-libs/popt"
--- a/dev-lang/swig/swig-2.0.8.ebuild
+++ b/dev-lang/swig/swig-2.0.8.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swig/swig-2.0.8.ebuild,v 1.5 2012/11/24 01:01:19 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swig/swig-2.0.8.ebuild,v 1.6 2012/11/29 14:58:22 jer Exp $

 EAPI=4

@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"

 LICENSE="GPL-3 as-is"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="ccache doc pcre"
 RESTRICT="test"

--- a/dev-lang/tcl/Manifest
+++ b/dev-lang/tcl/Manifest
@ -1,7 +1,4 @@
-DIST tcl8.4.18-src.tar.gz 3653369 SHA256 dee273cba588ec9190f0ee3dfe917be49c52ae847f20c3aa72461546451df0a4 SHA512 1029f85ec517d0c54525265effedf29335f7ee4927aac561870ecf2fa0defac4dedced998786ada324c4fad15a596096cee8c484b74cad69afa6d24dc105b75c WHIRLPOOL 83dd042886649304fa842a43238a0c1df6db348b7ba91fcbce37b3467e9d62698b3d733183249393d9cb4a28d4c0de310aade104d579f325894c5fca5fd05849
 DIST tcl8.4.19-src.tar.gz 3658647 SHA256 1c244722fb409e8774c5d45d6a0b21edc3e4541fd016a40afdf53c94a69a3db9 SHA512 9a3d17ff952e7f6184ee3849e7f8212cf5d917f112b53c72df03bedfc33014a46d2603bcbbb82458e4ae91364a02e976f38a9ce96299d89fab45b192f5097a7f WHIRLPOOL 0559329820d68670a8903895af37a37c7cda9b46449d4bcaf07f230762d0b8e4445e61ad2e8ec902579d23e91a5151e983e04d3b7334e74a81fbdfbcc35ed0ca
 DIST tcl8.5.10-src.tar.gz 4498413 SHA256 f582063edd5419a39ee8f7b5c8f95d557b5daad13efb0ed2f0967ca185613bb7 SHA512 d48c5e74e1dcdae92cf71d9f557eee581fadbc552b458d50034d412a07434b58a3302f64d4ef0af91e92cab10f3f86a18cd64bc9e5be906e1807f40cc20cb344 WHIRLPOOL 0e7d2ae1a275c1f0e669beaf5a55dceced34829f43c0e3e275e1cbb99b4fd2325a1fa43993959dcbed2abd27d6317a0eca2702115068a2d35ebacda9d5e56a8c
 DIST tcl8.5.11-src.tar.gz 4484001 SHA256 8addc385fa6b5be4605e6d68fbdc4c0e674c5af1dc1c95ec5420390c4b08042a SHA512 1696a3375de2f1ee436d475ada39c6d3c2aac4128bf7c0410650cbecdc11dddb77282c4fe2882692e50c70cdbe3b2dd9970082b812c3b2c27d34f76de2776bfc WHIRLPOOL ff3b40952fccac2e5f82f7adbd1e9aaf25ea4f665947cb569ae0c1809558325ec3c8b72027a71ca5174bbf95a6a531eedfe29b6892bbfd777fb9ad2397720b39
-DIST tcl8.5.7-src.tar.gz 4421720 SHA256 67d28d51a8d04c37114030276503bc8859a4b291bc33133556ab2d11303e66f2 SHA512 374c457324dff568b849e558d7360949c23f01e824f8e47b7af648b469c3b6738daecd44bd8d5d65f356e57c263b4008e138606919013e11d5be81a6bc7d8973 WHIRLPOOL 03c0a666b3079ee1bec603cf5ba3901b78b0eade4740573a0a20967f932df7c954ad747d07276df623f29418d2184d92c8eabf99d7f3312773edc95044cef73a
-DIST tcl8.5.8-src.tar.gz 4452127 SHA256 6b090c1024038d0381e1ccfbd6d5c0f0e6ef205269ceb9d28bd7bd7ac5bbf4a7 SHA512 b84869dea1b4f6e78dd4b066cc38f9a2b87211f02ffed4751976998aa55d768efdb733f3ed9a6736f718a046210616b6d384b7288193ee81c2b0b955abe501aa WHIRLPOOL 796219df5486f20431fae164abb0c376df2f95e3cdc2c2a75ffe7b7068c48908361f715e3829eeed9ef234ad8e1cff944b6486a8ccd8ba2afeff66806bac7bc8
-DIST tcl8.5.9-src.tar.gz 4469603 SHA256 3ab671b417e3eeb41b9cef626d742d8f7f57425101e83e5fcad1d552cd99237d SHA512 ee79ad6e4e2c87b1749e71b2e5f8b5ce2020e056433dfec73e8f16d6427d938fbde3f3f3330ba8268ba2c0d02518b2b8d79646d6996a465d5c0ffd8967204a4a WHIRLPOOL 5e42d3a2308f8604864eb3ebb093c0a36ae3d3ba5ac0a3bdbe03fecdeba11fc94973b1fab2c6f2fd3800be51d200ce5fa21d5ed9046cd7336ea167a2ff8476ad
+DIST tcl8.5.13-src.tar.gz 4513204 SHA256 9b868dd563e65671a26fcf518b6b86c1bb1b6756f48fdc90f04301d4f3a6596a SHA512 e1c9f36dd0e1afd81f42d249fe0191f10d6e0eab73042e32c9c0af09063ebf19bc2a24364743fa7b6798c588e77fa81654e6e7eb7591e1aaf4b222e20ecc6c84 WHIRLPOOL f1c1b67508c5d5c85de7d76d075a577ef14b5df05ca5bb0a0d0d78261134e8d85accb82a27f135877585820d52f0d363ebde74cfd890dbfafbf3766985315b61
--- a/dev-lang/tcl/files/tcl-8.4.11-multilib.patch
+++ b/dev-lang/tcl/files/tcl-8.4.11-multilib.patch
@ -1,42 +0,0 @@
-diff -Naur tcl8.4.11.orig/unix/configure tcl8.4.11/unix/configure
--- tcl8.4.11.orig/unix/configure	2005-06-30 01:40:33.000000000 +0900
-+++ tcl8.4.11/unix/configure	2005-07-02 20:23:23.000000000 +0900
-@@ -7664,7 +7664,7 @@
- DBGX='${TCL_DBGX}'
- eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
- 
-TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
-+TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
- PRIVATE_INCLUDE_DIR='$(includedir)'
- HTML_DIR='$(DISTDIR)/html'
- 
-@@ -7788,7 +7788,7 @@
- 
- if test "$FRAMEWORK_BUILD" = "1" ; then
-     TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /Network/Library/Frameworks /System/Library/Frameworks"
-elif test "$prefix" != "$exec_prefix"; then
-+elif test "$prefix" != "$exec_prefix" -o "${libdir}" != "${prefix}/lib"; then
-     TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
- else
-     TCL_PACKAGE_PATH="${prefix}/lib"
-diff -Naur tcl8.4.11.orig/unix/configure.in tcl8.4.11/unix/configure.in
--- tcl8.4.11.orig/unix/configure.in	2005-06-30 01:40:33.000000000 +0900
-+++ tcl8.4.11/unix/configure.in	2005-07-02 20:23:12.000000000 +0900
-@@ -459,7 +459,7 @@
- DBGX='${TCL_DBGX}'
- eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
- 
-TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
-+TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
- PRIVATE_INCLUDE_DIR='$(includedir)'
- HTML_DIR='$(DISTDIR)/html'
- 
-@@ -552,7 +552,7 @@
- 
- if test "$FRAMEWORK_BUILD" = "1" ; then
-     TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /Network/Library/Frameworks /System/Library/Frameworks"
-elif test "$prefix" != "$exec_prefix"; then
-+elif test "$prefix" != "$exec_prefix" -o "${libdir}" != "${prefix}/lib"; then
-     TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
- else
-     TCL_PACKAGE_PATH="${prefix}/lib"
--- a/dev-lang/tcl/files/tcl-8.5.10-conf.patch
+++ b/dev-lang/tcl/files/tcl-8.5.10-conf.patch
@ -0,0 +1,26 @@
+--- tcl8.5.0/unix/tcl.m4.conf	2007-12-20 10:48:05.000000000 +0100
+++ tcl8.5.0/unix/tcl.m4	2007-12-20 10:48:52.000000000 +0100
+@@ -1427,12 +1427,12 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    # get rid of the warnings.
+ 	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
+ 
+-	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
+	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS} -fPIC -Wl,-soname,${@}'
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+ 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+ 	    AS_IF([test $doRpath = yes], [
+-		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
+		CC_SEARCH_FLAGS=''])
+ 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ 	    AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"])
+ 	    AS_IF([test $do64bit = yes], [
+@@ -1464,7 +1464,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    SHLIB_CFLAGS="-fPIC"
+ 	    SHLIB_SUFFIX=".so"
+ 
+-	    SHLIB_LD='${CC} -shared'
+	    SHLIB_LD='${CC} ${CFLAGS} -shared -fPIC'
+ 	    DL_OBJS=""
+ 	    DL_LIBS="-ldl"
+ 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
--- a/dev-lang/tcl/files/tcl-8.5.13-autopath.patch
+++ b/dev-lang/tcl/files/tcl-8.5.13-autopath.patch
@ -0,0 +1,19 @@
+ unix/configure.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/unix/configure.in b/unix/configure.in
+index 65f712a..b606b74 100755
+--- a/unix/configure.in
+++ b/unix/configure.in
+@@ -840,9 +840,9 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
+     test -z "$TCL_MODULE_PATH"  && \
+ 	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl"
+ elif test "$prefix/lib" != "$libdir"; then
+-    TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
+    TCL_PACKAGE_PATH="${libdir}/tcl8.5 ${prefix}/share/tcl8.5 ${libdir}/tk8.5 ${prefix}/share/tk8.5 ${TCL_PACKAGE_PATH}"
+ else
+-    TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"
+    TCL_PACKAGE_PATH="${libdir}/tcl8.5 ${prefix}/share/tcl8.5 ${libdir}/tk8.5 ${prefix}/share/tk8.5 ${TCL_PACKAGE_PATH}"
+ fi
+ 
+ #--------------------------------------------------------------------
--- a/dev-lang/tcl/files/tcl-8.5.8-fortify.patch
+++ b/dev-lang/tcl/files/tcl-8.5.8-fortify.patch
@ -1,16 +0,0 @@
-Fix buffer overflow with GCC 4.5 -D_FORTIFY_SOURCE=2.
-https://bugs.gentoo.org/317727
-
-https://sourceforge.net/tracker/?func=detail&aid=3048354&group_id=10894&atid=310894
-
--- a/generic/tclTrace.c
-+++ b/generic/tclTrace.c
-@@ -909,7 +909,7 @@ TraceVariableObjCmd(
- 	    }
- 	    ctvarPtr->traceCmdInfo.length = length;
- 	    flags |= TCL_TRACE_UNSETS | TCL_TRACE_RESULT_OBJECT;
-	    strcpy(ctvarPtr->traceCmdInfo.command, command);
-+	    memcpy(ctvarPtr->traceCmdInfo.command, command, length + 1);
- 	    ctvarPtr->traceInfo.traceProc = TraceVarProc;
- 	    ctvarPtr->traceInfo.clientData = (ClientData)
- 		    &ctvarPtr->traceCmdInfo;
--- a/dev-lang/tcl/tcl-8.4.18.ebuild
+++ b/dev-lang/tcl/tcl-8.4.18.ebuild
@ -1,119 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.18.ebuild,v 1.13 2010/12/23 18:37:30 mattst88 Exp $
-
-inherit autotools eutils multilib toolchain-funcs
-
-DESCRIPTION="Tool Command Language"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${PN}${PV}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="debug threads"
-
-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.16-multilib.patch
-
-	# Bug 125971
-	epatch "${FILESDIR}"/${PN}-8.4.15-tclm4-soname.patch
-	# cross-compile fix from buildroot.
-	epatch "${FILESDIR}"/${PN}-8.4.9-strtod.patch
-
-	local d
-	for d in */configure ; do
-		cd "${S}"/${d%%/*}
-		EPATCH_SINGLE_MSG="Patching nls cruft in ${d}" \
-		epatch "${FILESDIR}"/tcl-configure-LANG.patch
-	done
-
-	cd "${S}"/unix
-	eautoreconf
-}
-
-src_compile() {
-	tc-export CC
-	local local_config_use=""
-
-	if use threads ; then
-		local_config_use="--enable-threads"
-	fi
-
-	cd "${S}"/unix
-	econf \
-		$(use_enable threads) \
-		$(use_enable debug symbols)
-	emake || die
-}
-
-src_install() {
-	#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
-	if use debug ; then
-		dosym libtcl${v1}g.so /usr/${mylibdir}/libtcl${v1}.so
-		dosym libtclstub${v1}g.a /usr/${mylibdir}/libtclstub${v1}.a
-	fi
-	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 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
-}
--- a/dev-lang/tcl/tcl-8.5.13.ebuild
+++ b/dev-lang/tcl/tcl-8.5.13.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.11.ebuild,v 1.6 2012/04/26 16:15:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.13.ebuild,v 1.3 2012/11/29 14:48:36 jlec Exp $

 EAPI=4

@ -35,11 +35,13 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-8.5_alpha6-multilib.patch

 	# Bug 125971
-	epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch
+	epatch "${FILESDIR}"/${PN}-8.5.10-conf.patch

 	# Bug 354067
 	epatch "${FILESDIR}"/${PN}-8.5.9-gentoo-fbsd.patch

+	epatch "${FILESDIR}"/${P}-autopath.patch
+
 	cd "${S}"/unix
 	eautoreconf
 }
@ -59,7 +61,11 @@ src_configure() {
 }

 src_compile() {
-	cd "${S}"/unix &&	emake
+	cd "${S}"/unix && emake
+}
+
+src_test() {
+	cd "${S}"/unix && emake test
 }

 src_install() {
@ -71,13 +77,16 @@ src_install() {
 	S= emake DESTDIR="${D}" install

 	# fix the tclConfig.sh to eliminate refs to the build directory
-	local mylibdir=$(get_libdir)
+	# and drop unnecessary -L inclusion to default system libdir
+	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
 	sed -i \
-		-e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir}," \
+		-e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix ,TCL_BUILD_LIB_SPEC='," \
 		-e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='${EPREFIX}/usr/${mylibdir}/tcl${v1}/include'," \
-		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir}," \
+		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix ,TCL_BUILD_STUB_LIB_SPEC='," \
 		-e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='${EPREFIX}/usr/${mylibdir}," \
 		-e "s,^TCL_LIB_FILE='libtcl${v1}..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl${v1}\$\{TCL_DBGX\}.so\"," \
+		-e "s,^TCL_STUB_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir} ,TCL_STUB_LIB_SPEC='," \
+		-e "s,^TCL_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir} ,TCL_LIB_SPEC='," \
 		"${ED}"/usr/${mylibdir}/tclConfig.sh || die
 	if [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
 		sed -i \
--- a/dev-lang/tcl/tcl-8.5.7.ebuild
+++ b/dev-lang/tcl/tcl-8.5.7.ebuild
@ -1,107 +0,0 @@
-# Copyright 1999-2010 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.15 2010/12/23 18:37:30 mattst88 Exp $
-
-inherit autotools eutils flag-o-matic multilib toolchain-funcs
-
-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 ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="debug threads"
-
-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
-}
-
-src_compile() {
-	# workaround stack check issues, bug #280934
-	if use hppa; then
-		append-cflags "-DTCL_NO_STACK_CHECK=1"
-	fi
-
-	tc-export CC
-
-	cd "${S}"/unix
-	econf \
-		$(use_enable threads) \
-		$(use_enable debug symbols)
-	emake || die
-}
-
-src_install() {
-	#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
-}
--- a/dev-lang/tcl/tcl-8.5.8-r1.ebuild
+++ b/dev-lang/tcl/tcl-8.5.8-r1.ebuild
@ -1,112 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.8-r1.ebuild,v 1.13 2011/01/13 20:02:06 xarthisius Exp $
-
-EAPI="3"
-
-inherit autotools eutils flag-o-matic multilib toolchain-funcs
-
-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 ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="debug threads"
-
-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 ""
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-8.5_alpha6-multilib.patch
-
-	# Bug 125971
-	epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch
-
-	cd "${S}"/unix
-	eautoreconf
-}
-
-src_configure() {
-	# workaround stack check issues, bug #280934
-	if use hppa; then
-		append-cflags "-DTCL_NO_STACK_CHECK=1"
-	fi
-
-	tc-export CC
-
-	cd "${S}"/unix
-	econf \
-		$(use_enable threads) \
-		$(use_enable debug symbols)
-}
-
-src_compile() {
-	cd "${S}"/unix
-	emake || die
-}
-
-src_install() {
-	#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${EPREFIX}/usr/${mylibdir}," \
-		-e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='${EPREFIX}/usr/${mylibdir}/tcl${v1}/include'," \
-		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir}," \
-		-e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='${EPREFIX}/usr/${mylibdir}," \
-		-e "s,^TCL_LIB_FILE='libtcl${v1}..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl${v1}\$\{TCL_DBGX\}.so\"," \
-		"${ED}"/usr/${mylibdir}/tclConfig.sh || die
-	[[ ${CHOST} != *-darwin* ]] && sed -i \
-		-e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:${EPREFIX}/usr/${mylibdir}'," \
-		-e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:${EPREFIX}/usr/${mylibdir}'," \
-		"${ED}"/usr/${mylibdir}/tclConfig.sh
-
-	# 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 "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tcl.h
-	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tclDecls.h
-	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tclPlatDecls.h
-
-	# install symlink for libraries
-	dosym libtcl${v1}.so /usr/${mylibdir}/libtcl.so || die
-	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a || die
-
-	dosym tclsh${v1} /usr/bin/tclsh || die
-
-	cd "${S}"
-	dodoc ChangeLog* README changes || die
-}
-
-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
-}
--- a/dev-lang/tcl/tcl-8.5.8-r2.ebuild
+++ b/dev-lang/tcl/tcl-8.5.8-r2.ebuild
@ -1,113 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.8-r2.ebuild,v 1.4 2010/12/23 18:37:30 mattst88 Exp $
-
-EAPI="3"
-
-inherit autotools eutils flag-o-matic multilib toolchain-funcs
-
-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 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="debug threads"
-
-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 ""
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-8.5_alpha6-multilib.patch
-
-	# Bug 125971
-	epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch
-	epatch "${FILESDIR}"/${P}-fortify.patch # 317727
-
-	cd "${S}"/unix
-	eautoreconf
-}
-
-src_configure() {
-	# workaround stack check issues, bug #280934
-	if use hppa; then
-		append-cflags "-DTCL_NO_STACK_CHECK=1"
-	fi
-
-	tc-export CC
-
-	cd "${S}"/unix
-	econf \
-		$(use_enable threads) \
-		$(use_enable debug symbols)
-}
-
-src_compile() {
-	cd "${S}"/unix
-	emake || die
-}
-
-src_install() {
-	#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${EPREFIX}/usr/${mylibdir}," \
-		-e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='${EPREFIX}/usr/${mylibdir}/tcl${v1}/include'," \
-		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir}," \
-		-e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='${EPREFIX}/usr/${mylibdir}," \
-		-e "s,^TCL_LIB_FILE='libtcl${v1}..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl${v1}\$\{TCL_DBGX\}.so\"," \
-		"${ED}"/usr/${mylibdir}/tclConfig.sh || die
-	[[ ${CHOST} != *-darwin* ]] && sed -i \
-		-e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:${EPREFIX}/usr/${mylibdir}'," \
-		-e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:${EPREFIX}/usr/${mylibdir}'," \
-		"${ED}"/usr/${mylibdir}/tclConfig.sh
-
-	# 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 "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tcl.h
-	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tclDecls.h
-	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tclPlatDecls.h
-
-	# install symlink for libraries
-	dosym libtcl${v1}.so /usr/${mylibdir}/libtcl.so || die
-	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a || die
-
-	dosym tclsh${v1} /usr/bin/tclsh || die
-
-	cd "${S}"
-	dodoc ChangeLog* README changes || die
-}
-
-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
-}
--- a/dev-lang/tcl/tcl-8.5.9.ebuild
+++ b/dev-lang/tcl/tcl-8.5.9.ebuild
@ -1,116 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.9.ebuild,v 1.9 2011/08/05 08:20:20 naota Exp $
-
-EAPI="3"
-
-inherit autotools eutils flag-o-matic multilib toolchain-funcs
-
-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 x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="debug threads"
-
-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 ""
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-8.5_alpha6-multilib.patch
-
-	# Bug 125971
-	epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch
-
-	# Bug 354067
-	epatch "${FILESDIR}"/${PN}-8.5.9-gentoo-fbsd.patch
-
-	cd "${S}"/unix
-	eautoreconf
-}
-
-src_configure() {
-	# workaround stack check issues, bug #280934
-	if use hppa; then
-		append-cflags "-DTCL_NO_STACK_CHECK=1"
-	fi
-
-	tc-export CC
-
-	cd "${S}"/unix
-	econf \
-		$(use_enable threads) \
-		$(use_enable debug symbols)
-}
-
-src_compile() {
-	cd "${S}"/unix
-	emake || die
-}
-
-src_install() {
-	#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${EPREFIX}/usr/${mylibdir}," \
-		-e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='${EPREFIX}/usr/${mylibdir}/tcl${v1}/include'," \
-		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir}," \
-		-e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='${EPREFIX}/usr/${mylibdir}," \
-		-e "s,^TCL_LIB_FILE='libtcl${v1}..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl${v1}\$\{TCL_DBGX\}.so\"," \
-		"${ED}"/usr/${mylibdir}/tclConfig.sh || die
-	[[ ${CHOST} != *-darwin* ]] && sed -i \
-		-e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:${EPREFIX}/usr/${mylibdir}'," \
-		-e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:${EPREFIX}/usr/${mylibdir}'," \
-		"${ED}"/usr/${mylibdir}/tclConfig.sh
-
-	# 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 "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tcl.h
-	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tclDecls.h
-	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tclPlatDecls.h
-
-	# install symlink for libraries
-	dosym libtcl${v1}.so /usr/${mylibdir}/libtcl.so || die
-	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a || die
-
-	dosym tclsh${v1} /usr/bin/tclsh || die
-
-	cd "${S}"
-	dodoc ChangeLog* README changes || die
-}
-
-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
-}
--- a/dev-lang/tk/Manifest
+++ b/dev-lang/tk/Manifest
@ -1,7 +1,4 @@
-DIST tk8.4.18-src.tar.gz 3363853 SHA256 1757b0daff8a8bb962e612691236ae838e353521e7184464a5d32225905eac18 SHA512 a8d5f509e688e8768c9e56dfdb09b00501bd67d9385ac71e18f86d4ed9f6c623650d55f33d4f9521b69611e2992aff3b55d5112a8eef630f00b041ff5a5c6c2c WHIRLPOOL 5038e1a075c7e5b7c8eac0f720db0627b63de56422f1cf8863540aa5a9ee25ab2f635777d71f1bd0fba5144a3a08e5973302ab98c18b7bc50191e6dcd3b430d9
 DIST tk8.4.19-src.tar.gz 3362694 SHA256 d056fe6c204ac31539616e1069522dd5864a580b64e521fe1a49bc895ca8699f SHA512 314cc4b52dc27c0b9fab103e69890c160f55ab5d90c8114a0735cb07d4b24dc23506532555f5efeb5a30f208a1b615763d40c3c6ad2e1bcb23e51fc066c2f032 WHIRLPOOL a570eb87dc522c3ac5683bbe925035e2b2bc9ee1e204ba3e3704a651d2c132acfe8aff43edec7269203730af4c58927d287790e590b0113f2b5a3377c46591dd
 DIST tk8.5.10-src.tar.gz 3807862 SHA256 f6ac59a3414a0989c9ca30237b3c14ceee95733eb486739ffc271c8055e37c9f SHA512 c5261dabd12994d6f5eeab1b13aaab53c846608bf33a73b5d92a38868ba4a2c386fe28ec903347d00186266a75646a418fdd9705e7a41e7e6d46e7928067ae72 WHIRLPOOL f73cc598c84b9ad2210c9618827cf49b977b0ca79efca13c948cfc70ad85b3c34b929e6471e8101376252be22ab63994c22ad8e619b77919c0fd1810c3e9105c
 DIST tk8.5.11-src.tar.gz 3809826 SHA256 d35810b33a0931656f1d128e7e0776cc0c4d8b9c72af322cab5a7ee30485eb70 SHA512 c00cc0cdaafbee24d104fb55c90f61143090ad38b47cc5e77e724638ac357dce83417da3adeca7afc881262cd145b286ad5e9957e53338639f2b2426a81750ec WHIRLPOOL adf52b59e26a9458cf47e2acf90ec1cd3d0b072829b96fb1473cfb2a7fa40fadc393fce884a3262e881a77c66b5b4ef1fab0d084a65b1ca8a712a9f4f3122ca1
-DIST tk8.5.7-src.tar.gz 3779867 SHA256 d9366ed397c4bde96550ec9d30a8fcf67878cf26937cae93e580726a87d7af30 SHA512 e783ef8e8d54d74677eec105558b30b7aeebbec27b7c603ff2b43a749f9d61973fafb994ea1ef81ef7279e50cbca664462b85d0cd1a773e0b89a3a7383ec6f74 WHIRLPOOL 1fc1851a34fbf77b06eb496ee09a6cc4814be751cdf00206790cf9e15f7c3138f506f72c41b23b1a4937e64431bf17ffe9acbdffaa970f55dd539410a26fa3d4
-DIST tk8.5.8-src.tar.gz 3789533 SHA256 9737da5c30e631281062b6acbb4753840f9e95657c78e37657d9c520589ab2d4 SHA512 b2ed480bf7f402c8c36e706b4b1179160f207f2a5db340d3a75ac4718c8699f5ed9a71c1b26a0f8b4c5fd51afccddb1104642cf50e2855de4f2140cd21cc8e06 WHIRLPOOL 3c15ee93f842d5d4f8940de3c551fac31c8bde6a47fa3f0f68bbb9dec4685ad3c328a03c64a9346c9784ea07e2c958559a17b2bea6e8f1feca00fb0f6feb645f
-DIST tk8.5.9-src.tar.gz 3825659 SHA256 f46b33d41e71ef533140f1814961f0dc22d62aac316df4a4fd3357e1fd788b83 SHA512 0b8f4bc091950b6e7182c7e4a5a0120e5ffca6e173b9165cd9a9715122ac033215930b6f7e4f3f4c032efa379815466e4c07754801494bdbab7fca010b21b549 WHIRLPOOL 6d5ff697923c7aec537bd5db0fa1021569aabae5e8d25d52614b48e86865ca2764fd36ec260636919416d784da56b81b234388546582e0ec9cf8a06a397d9743
+DIST tk8.5.13-src.tar.gz 4086092 SHA256 9e83ba2704ad73a65986eb7cdc51e432a5db6eca8d8691e33caceef40ed0c563 SHA512 5b705026d3d80c35bd60311c3df5489a7970c1648f98d843d6ee57c9336de5e63aed488f670f15f2c0bffccbc2402cc98c383c057b7d86f1db4c36340e34e209 WHIRLPOOL e523bfa0ce407f4d5157df7fee93c6d60012bf5b46a4cbd4e4692ad0ce872650563d12db11bfa94ba19b0a5aad1ef9fdd4b02dfb11f0de253839c69adb26a718
--- a/dev-lang/tk/files/remove-control-v-8.4.9.diff
+++ b/dev-lang/tk/files/remove-control-v-8.4.9.diff
@ -1,18 +0,0 @@
-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]
--- a/dev-lang/tk/files/tk-8.4.15-aqua.patch
+++ b/dev-lang/tk/files/tk-8.4.15-aqua.patch
@ -1,14 +1,5 @@
 --- unix/Makefile.in
 +++ unix/Makefile.in
-@@ -280,7 +280,7 @@
- TK_RSRC_FILE		= @TK_RSRC_FILE@
- WISH_RSRC_FILE		= @WISH_RSRC_FILE@
- REZ			= @REZ@
-REZ_SWITCHES = @REZ_FLAGS@ -i $(GENERIC_DIR) -i $(TCL_GENERIC_DIR)
-+REZ_SWITCHES = @REZ_FLAGS@ -i $(GENERIC_DIR) -i $(TCL_GENERIC_DIR) -i @GENTOO_PORTAGE_EPREFIX@/usr/include
- 
- #----------------------------------------------------------------
- # The information below is modified by the configure script when
@@ -468,7 +468,7 @@
 
 AQUA_HDRS = $(MAC_OSX_DIR)/tkMacOSX.h $(GENERIC_DIR)/tkIntXlibDecls.h
--- a/dev-lang/tk/files/tk-8.5.10-conf.patch
+++ b/dev-lang/tk/files/tk-8.5.10-conf.patch
@ -0,0 +1,31 @@
+ unix/tcl.m4 | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/unix/tcl.m4 b/unix/tcl.m4
+index 3974753..9c36eb5 100644
+--- a/unix/tcl.m4
+++ b/unix/tcl.m4
+@@ -1420,12 +1420,12 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
+ 	    # get rid of the warnings.
+ 	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
+ 
+-	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
+	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS} -Wl,-soname,${@}'
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+ 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+ 	    AS_IF([test $doRpath = yes], [
+-		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
+		CC_SEARCH_FLAGS=''])
+ 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ 	    AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"])
+ 	    AS_IF([test $do64bit = yes], [
+@@ -1452,7 +1452,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
+ 	    SHLIB_CFLAGS="-fPIC"
+ 	    SHLIB_SUFFIX=".so"
+ 
+-	    SHLIB_LD='${CC} -shared'
+	    SHLIB_LD='${CC} ${CFLAGS} -shared'
+ 	    DL_OBJS=""
+ 	    DL_LIBS="-ldl"
+ 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
--- a/dev-lang/tk/files/tk-CVE-2007-4851.patch
+++ b/dev-lang/tk/files/tk-CVE-2007-4851.patch
@ -1,12 +0,0 @@
-diff -Naur tk8.4.15.orig/generic/tkImgGIF.c tk8.4.15/generic/tkImgGIF.c
--- tk8.4.15.orig/generic/tkImgGIF.c	2006-03-27 21:13:56.000000000 +0900
-+++ tk8.4.15/generic/tkImgGIF.c	2007-09-16 09:56:25.000000000 +0900
-@@ -995,7 +995,7 @@
- 	 */
- 	if (interlace) {
- 	    ypos += interlaceStep[pass];
-	    while (ypos >= height) {
-+	    while (ypos >= rows) {
- 		pass++;
- 		if (pass > 3) {
- 		    return TCL_OK;
--- a/dev-lang/tk/tk-8.4.18-r1.ebuild
+++ b/dev-lang/tk/tk-8.4.18-r1.ebuild
@ -1,117 +0,0 @@
-# Copyright 1999-2010 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.10 2010/12/06 17:16:55 jlec Exp $
-
-inherit autotools eutils multilib toolchain-funcs
-
-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="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-7.0.13"
-
-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-8.4.9.diff
-	epatch "${FILESDIR}"/${PN}-8.4.9-man.patch
-	epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch
-
-	# Bug 125971
-	epatch "${FILESDIR}"/${PN}-8.4.15-tclm4-soname.patch
-
-	# Bug 225999
-	epatch "${FILESDIR}"/${PN}-8.4-lastevent.patch
-
-	local d
-	for d in */configure ; do
-		cd "${S}"/${d%%/*}
-		EPATCH_SINGLE_MSG="Patching nls cruft in ${d}" \
-		epatch "${FILESDIR}"/tk-configure-LANG.patch
-	done
-
-	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)
-
-	emake || die
-}
-
-src_install() {
-	#short version number
-	local v1
-	v1=${PV%.*}
-
-	cd "${S}"/unix
-	make 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
-	if use debug ; then
-		dosym libtk${v1}g.so /usr/${mylibdir}/libtk${v1}.so
-		dosym libtkstub${v1}g.a /usr/${mylibdir}/libtkstub${v1}.a
-		dosym ../tk${v1}g/pkgIndex.tcl /usr/${mylibdir}/tk${v1}/pkgIndex.tcl
-	fi
-	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 license.terms
-}
--- a/dev-lang/tk/tk-8.4.18.ebuild
+++ b/dev-lang/tk/tk-8.4.18.ebuild
@ -1,114 +0,0 @@
-# Copyright 1999-2010 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.ebuild,v 1.11 2010/12/06 17:16:55 jlec Exp $
-
-inherit autotools eutils multilib toolchain-funcs
-
-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="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}/${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-8.4.9.diff
-	epatch "${FILESDIR}"/${PN}-8.4.9-man.patch
-	epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch
-
-	# Bug 125971
-	epatch "${FILESDIR}"/${PN}-8.4.15-tclm4-soname.patch
-
-	local d
-	for d in */configure ; do
-		cd "${S}"/${d%%/*}
-		EPATCH_SINGLE_MSG="Patching nls cruft in ${d}" \
-		epatch "${FILESDIR}"/tk-configure-LANG.patch
-	done
-
-	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)
-
-	emake || die
-}
-
-src_install() {
-	#short version number
-	local v1
-	v1=${PV%.*}
-
-	cd "${S}"/unix
-	make 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
-	if use debug ; then
-		dosym libtk${v1}g.so /usr/${mylibdir}/libtk${v1}.so
-		dosym libtkstub${v1}g.a /usr/${mylibdir}/libtkstub${v1}.a
-		dosym ../tk${v1}g/pkgIndex.tcl /usr/${mylibdir}/tk${v1}/pkgIndex.tcl
-	fi
-	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 license.terms
-}
--- a/dev-lang/tk/tk-8.5.13.ebuild
+++ b/dev-lang/tk/tk-8.5.13.ebuild
@ -1,10 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.11.ebuild,v 1.6 2012/11/04 18:35:32 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.13.ebuild,v 1.1 2012/11/29 15:23:01 jlec Exp $

 EAPI=4

 inherit autotools eutils multilib toolchain-funcs prefix
+inherit autotools eutils multilib prefix toolchain-funcs virtualx

 MY_P="${PN}${PV/_beta/b}"

@ -19,10 +20,12 @@ IUSE="debug threads truetype aqua xscreensaver"

 RDEPEND="
 	!aqua? (
+		media-libs/fontconfig
 		x11-libs/libX11
 		x11-libs/libXt
 		truetype? ( x11-libs/libXft )
-		xscreensaver? ( x11-libs/libXScrnSaver ) )
+		xscreensaver? ( x11-libs/libXScrnSaver )
+	)
 	~dev-lang/tcl-${PV}"
 DEPEND="${RDEPEND}
 	!aqua? ( x11-proto/xproto )"
@ -30,30 +33,35 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"

 src_prepare() {
-	epatch "${FILESDIR}"/${P}-fedora-xft.patch
-	epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch
+	tc-export CC
+
+	epatch \
+		"${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch \
+		"${FILESDIR}"/${PN}-8.4.11-multilib.patch

 	epatch "${FILESDIR}"/${PN}-8.4.15-aqua.patch
 	eprefixify unix/Makefile.in

 	# Bug 125971
-	epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch
+	epatch "${FILESDIR}"/${PN}-8.5.10-conf.patch

 	# Bug 354067 : the same applies to tk, since the patch is about tcl.m4, just
 	# copy the tcl patch
 	epatch "${FILESDIR}"/tcl-8.5.9-gentoo-fbsd.patch

-	# Bug 441630
-	epatch "${FILESDIR}"/${PN}-8.5.11-fix-name-collision-uclibc.patch
-
-	sed -i 's/FT_New_Face/XftFontOpen/g' unix/configure.in || die
+	# Make sure we use the right pkg-config, and link against fontconfig
+	# (since the code base uses Fc* functions).
+	sed \
+		-e 's/FT_New_Face/XftFontOpen/g' \
+		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
+		-e 's:xft freetype2:xft freetype2 fontconfig:' \
+		-i unix/configure.in || die

 	cd "${S}"/unix
 	eautoreconf
 }

 src_configure() {
-	tc-export CC
 	cd "${S}"/unix

 	local mylibdir=$(get_libdir)
@ -71,6 +79,10 @@ src_compile() {
 	cd "${S}"/unix && emake
 }

+src_test() {
+	cd "${S}"/unix && Xemake test
+}
+
 src_install() {
 	#short version number
 	local v1
@ -83,15 +95,17 @@ src_install() {
 	local nS="$(cd "${S}"; pwd)"

 	# fix the tkConfig.sh to eliminate refs to the build directory
-	local mylibdir=$(get_libdir)
+	local mylibdir=$(get_libdir); mylibdir=${mylibdir//\/}
 	sed -i \
-		-e "s,^\(TK_BUILD_LIB_SPEC='-L\)${nS}/unix,\1${EPREFIX}/usr/${mylibdir}," \
-		-e "s,^\(TK_SRC_DIR='\)${nS}',\1${EPREFIX}/usr/${mylibdir}/tk${v1}/include'," \
-		-e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${nS}/unix,\1${EPREFIX}/usr/${mylibdir}," \
-		-e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${nS}/unix,\1${EPREFIX}/usr/${mylibdir}," \
+		-e "s,^TK_BUILD_LIB_SPEC='-L.*/unix ,TK_BUILD_LIB_SPEC='," \
+		-e "s,^TK_SRC_DIR='.*',TK_SRC_DIR='${EPREFIX}/usr/${mylibdir}/tk${v1}/include'," \
+		-e "s,^TK_BUILD_STUB_LIB_SPEC='-L.*/unix ,TK_BUILD_STUB_LIB_SPEC='," \
+		-e "s,^TK_BUILD_STUB_LIB_PATH='.*/unix,TK_BUILD_STUB_LIB_PATH='${EPREFIX}/usr/${mylibdir}," \
+		-e "s,^TK_LIB_FILE='libtk${v1}..TK_DBGX..so',TK_LIB_FILE=\"libtk${v1}\$\{TK_DBGX\}.so\"," \
+		-e "s,^TK_STUB_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir} ,TK_STUB_LIB_SPEC='," \
+		-e "s,^TK_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir} ,TK_LIB_SPEC='," \
 		"${ED}"/usr/${mylibdir}/tkConfig.sh || die
-
-	if [[ ${CHOST} != *-darwin* ]]; then
+	if [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
 		sed -i \
 				-e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:${EPREFIX}/usr/${mylibdir}'," \
 				-e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:${EPREFIX}/usr/${mylibdir}'," \
--- a/dev-lang/tk/tk-8.5.7-r1.ebuild
+++ b/dev-lang/tk/tk-8.5.7-r1.ebuild
@ -1,106 +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.7-r1.ebuild,v 1.3 2010/06/16 00:10:30 mr_bones_ Exp $
-
-inherit autotools eutils multilib toolchain-funcs
-
-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
-	~dev-lang/tcl-${PV}"
-DEPEND="${RDEPEND}
-	truetype? ( x11-libs/libXft )
-	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}"/${PN}-8.5_alpha6-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 truetype xft) \
-		$(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
-
-	# normalize $S path, bug #280766 (pkgcore)
-	local nS="$(cd "${S}"; pwd)"
-
-	# 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\)${nS}/unix,\1/usr/${mylibdir}," \
-		-e "s,^\(TK_SRC_DIR='\)${nS}',\1/usr/${mylibdir}/tk${v1}/include'," \
-		-e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${nS}/unix,\1/usr/${mylibdir}," \
-		-e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${nS}/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
-}
--- a/dev-lang/tk/tk-8.5.7.ebuild
+++ b/dev-lang/tk/tk-8.5.7.ebuild
@ -1,103 +0,0 @@
-# Copyright 1999-2010 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.12 2010/12/06 17:16:55 jlec Exp $
-
-inherit autotools eutils multilib toolchain-funcs
-
-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
-	~dev-lang/tcl-${PV}"
-DEPEND="${RDEPEND}
-	truetype? ( x11-libs/libXft )
-	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}"/${PN}-8.5_alpha6-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 truetype xft) \
-		$(use_enable debug symbols)
-
-	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
-}
--- a/dev-lang/tk/tk-8.5.8-r1.ebuild
+++ b/dev-lang/tk/tk-8.5.8-r1.ebuild
@ -1,112 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.8-r1.ebuild,v 1.14 2011/01/13 20:03:15 xarthisius Exp $
-
-EAPI="3"
-
-inherit autotools eutils multilib toolchain-funcs prefix
-
-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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug threads truetype aqua xscreensaver"
-
-RDEPEND="
-	!aqua? (
-		x11-libs/libX11
-		x11-libs/libXt
-		truetype? ( x11-libs/libXft )
-		xscreensaver? ( x11-libs/libXScrnSaver ) )
-	~dev-lang/tcl-${PV}"
-DEPEND="${RDEPEND}
-	!aqua? ( x11-proto/xproto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch
-
-	epatch "${FILESDIR}"/${PN}-8.4.15-aqua.patch
-	eprefixify unix/Makefile.in
-
-	# Bug 125971
-	epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch
-
-	sed -i 's/FT_New_Face/XftFontOpen/g' unix/configure.in || die
-
-	cd "${S}"/unix
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-	cd "${S}"/unix
-
-	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
-
-	econf \
-		--with-tcl="${EPREFIX}/usr/${mylibdir}" \
-		$(use_enable threads) \
-		$(use_enable aqua) \
-		$(use_enable truetype xft) \
-		$(use_enable xscreensaver xss) \
-		$(use_enable debug symbols)
-}
-
-src_compile() {
-	cd "${S}"/unix
-	emake || die
-}
-
-src_install() {
-	#short version number
-	local v1
-	v1=${PV%.*}
-
-	cd "${S}"/unix
-	S= emake DESTDIR="${D}" install || die
-
-	# normalize $S path, bug #280766 (pkgcore)
-	local nS="$(cd "${S}"; pwd)"
-
-	# 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\)${nS}/unix,\1${EPREFIX}/usr/${mylibdir}," \
-		-e "s,^\(TK_SRC_DIR='\)${nS}',\1${EPREFIX}/usr/${mylibdir}/tk${v1}/include'," \
-		-e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${nS}/unix,\1${EPREFIX}/usr/${mylibdir}," \
-		-e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${nS}/unix,\1${EPREFIX}/usr/${mylibdir}," \
-		"${ED}"/usr/${mylibdir}/tkConfig.sh || die
-
-	if [[ ${CHOST} != *-darwin* ]]; then
-		sed -i \
-				-e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:${EPREFIX}/usr/${mylibdir}'," \
-				-e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:${EPREFIX}/usr/${mylibdir}'," \
-				"${ED}"/usr/${mylibdir}/tkConfig.sh || die
-	fi
-
-	# 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 "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/tk.h
-	rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h
-	rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h
-
-	# install symlink for libraries
-	#dosym libtk${v1}.a /usr/${mylibdir}/libtk.a
-	dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname) || die
-	dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a || die
-
-	dosym wish${v1} /usr/bin/wish || die
-
-	cd "${S}"
-	dodoc ChangeLog* README changes || die
-}
--- a/dev-lang/tk/tk-8.5.9-r1.ebuild
+++ b/dev-lang/tk/tk-8.5.9-r1.ebuild
@ -1,112 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.9-r1.ebuild,v 1.8 2011/03/23 19:05:54 xarthisius Exp $
-
-EAPI="3"
-
-inherit autotools eutils multilib toolchain-funcs prefix
-
-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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug threads truetype aqua xscreensaver"
-
-RDEPEND="
-	!aqua? (
-		x11-libs/libX11
-		x11-libs/libXt
-		truetype? ( x11-libs/libXft )
-		xscreensaver? ( x11-libs/libXScrnSaver ) )
-	~dev-lang/tcl-${PV}"
-DEPEND="${RDEPEND}
-	!aqua? ( x11-proto/xproto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch
-
-	epatch "${FILESDIR}"/${PN}-8.4.15-aqua.patch
-	eprefixify unix/Makefile.in
-
-	# Bug 125971
-	epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch
-
-	sed -i 's/FT_New_Face/XftFontOpen/g' unix/configure.in || die
-
-	cd "${S}"/unix
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-	cd "${S}"/unix
-
-	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
-
-	econf \
-		--with-tcl="${EPREFIX}/usr/${mylibdir}" \
-		$(use_enable threads) \
-		$(use_enable aqua) \
-		$(use_enable truetype xft) \
-		$(use_enable xscreensaver xss) \
-		$(use_enable debug symbols)
-}
-
-src_compile() {
-	cd "${S}"/unix
-	emake || die
-}
-
-src_install() {
-	#short version number
-	local v1
-	v1=${PV%.*}
-
-	cd "${S}"/unix
-	S= emake DESTDIR="${D}" install || die
-
-	# normalize $S path, bug #280766 (pkgcore)
-	local nS="$(cd "${S}"; pwd)"
-
-	# 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\)${nS}/unix,\1${EPREFIX}/usr/${mylibdir}," \
-		-e "s,^\(TK_SRC_DIR='\)${nS}',\1${EPREFIX}/usr/${mylibdir}/tk${v1}/include'," \
-		-e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${nS}/unix,\1${EPREFIX}/usr/${mylibdir}," \
-		-e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${nS}/unix,\1${EPREFIX}/usr/${mylibdir}," \
-		"${ED}"/usr/${mylibdir}/tkConfig.sh || die
-
-	if [[ ${CHOST} != *-darwin* ]]; then
-		sed -i \
-				-e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:${EPREFIX}/usr/${mylibdir}'," \
-				-e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:${EPREFIX}/usr/${mylibdir}'," \
-				"${ED}"/usr/${mylibdir}/tkConfig.sh || die
-	fi
-
-	# 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 "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/tk.h
-	rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h
-	rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h
-
-	# install symlink for libraries
-	#dosym libtk${v1}.a /usr/${mylibdir}/libtk.a
-	dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname) || die
-	dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a || die
-
-	dosym wish${v1} /usr/bin/wish || die
-
-	cd "${S}"
-	dodoc ChangeLog* README changes || die
-}
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r3.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r3.ebuild,v 1.2 2012/11/05 21:56:02 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r3.ebuild,v 1.4 2012/11/29 20:44:46 ranger Exp $

 EAPI=4
 inherit eutils flag-o-matic multilib autotools pam java-pkg-opt-2 db-use
@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"

 LICENSE="BSD-4"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite
 srp ssl static-libs urandom"

--- a/dev-libs/libdnsres/libdnsres-0.1a-r1.ebuild
+++ b/dev-libs/libdnsres/libdnsres-0.1a-r1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdnsres/libdnsres-0.1a-r1.ebuild,v 1.9 2010/12/02 17:27:28 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdnsres/libdnsres-0.1a-r1.ebuild,v 1.10 2012/11/29 05:03:35 pinkbyte Exp $

 inherit eutils autotools

@ -8,7 +8,7 @@ DESCRIPTION="A non-blocking DNS resolver library"
 HOMEPAGE="http://www.monkey.org/~provos/libdnsres/"
 SRC_URI="http://www.monkey.org/~provos/${P}.tar.gz"

-LICENSE="|| ( as-is BSD )"
+LICENSE="BSD-4"
 SLOT="0"
 KEYWORDS="amd64 ~ppc sparc x86"
 IUSE=""
--- a/dev-libs/libdnsres/libdnsres-0.1a-r2.ebuild
+++ b/dev-libs/libdnsres/libdnsres-0.1a-r2.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdnsres/libdnsres-0.1a-r2.ebuild,v 1.1 2012/11/29 05:09:54 pinkbyte Exp $
+
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=1
+inherit autotools-utils
+
+DESCRIPTION="A non-blocking DNS resolver library"
+HOMEPAGE="http://www.monkey.org/~provos/libdnsres/"
+SRC_URI="http://www.monkey.org/~provos/${P}.tar.gz"
+
+LICENSE="BSD-4"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-libs/libevent"
+RDEPEND="${DEPEND}"
+
+DOCS=( README )
+PATCHES=( "${FILESDIR}/${P}-autotools.patch" )
--- a/dev-libs/libelf/libelf-0.8.13-r1.ebuild
+++ b/dev-libs/libelf/libelf-0.8.13-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libelf/libelf-0.8.13-r1.ebuild,v 1.11 2012/07/14 14:06:00 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libelf/libelf-0.8.13-r1.ebuild,v 1.13 2012/11/29 13:42:25 blueness Exp $

 EAPI="3"

@ -12,7 +12,7 @@ SRC_URI="http://www.mr511.de/software/${P}.tar.gz"

 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug nls elibc_FreeBSD"

 RDEPEND="!dev-libs/elfutils"
--- a/dev-libs/libnl/libnl-3.2.14.ebuild
+++ b/dev-libs/libnl/libnl-3.2.14.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.14.ebuild,v 1.8 2012/11/27 22:13:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.14.ebuild,v 1.10 2012/11/29 20:43:45 ranger Exp $

 EAPI=4
 inherit eutils libtool multilib
@ -13,7 +13,7 @@ SRC_URI="
 "
 LICENSE="LGPL-2.1 doc? ( GPL-2 ) utils? ( GPL-2 )"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="doc static-libs utils"

 DEPEND="
--- a/dev-libs/libx86emu/libx86emu-1.1.ebuild
+++ b/dev-libs/libx86emu/libx86emu-1.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libx86emu/libx86emu-1.1.ebuild,v 1.9 2012/06/21 14:26:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libx86emu/libx86emu-1.1.ebuild,v 1.10 2012/11/29 21:23:04 ulm Exp $

 EAPI=4

@ -10,7 +10,7 @@ DESCRIPTION="A library for emulating x86"
 HOMEPAGE="http://www.opensuse.org/"
 SRC_URI="http://download.opensuse.org/source/factory/repo/oss/suse/src/${P}-9.8.src.rpm"

-LICENSE="as-is"
+LICENSE="HPND"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
--- a/dev-libs/libxml2/libxml2-2.8.0-r3.ebuild
+++ b/dev-libs/libxml2/libxml2-2.8.0-r3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.8.0-r3.ebuild,v 1.5 2012/11/27 16:49:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.8.0-r3.ebuild,v 1.6 2012/11/29 17:00:30 ago Exp $

 EAPI="4"
 PYTHON_DEPEND="python? 2"
@ -16,7 +16,7 @@ HOMEPAGE="http://www.xmlsoft.org/"

 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug doc examples icu ipv6 lzma python readline static-libs test"

 XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@ -1,2 +1,2 @@
-DIST libxslt-1.1.26.tar.gz 3401513 SHA256 55dd52b42861f8a02989d701ef716d6280bfa02971e967c285016f99c66e3db1 SHA512 f09aa039d2addd3cf45dfeb3b22fe5e756757e2e801275384342fdfc297acf78b557d310e30262986a1af7825da8f1d66bc0ce9f132e474d4c32e322aa72f11e WHIRLPOOL a71ffc6ec16114277e393de9fe6a6c3476febef2551b537abd013862caa247804f53e82f2de716cdfdce101ebc081e877379c5e3c890ba6e7df4ba3ad67f1d6c
 DIST libxslt-1.1.27.tar.gz 3427310 SHA256 b6a8d9a421f2630999ca91d9f8c091ee8ea2d580e6be84c1d21b2a45e11e7e26 SHA512 4bfab92b151892c04cc5291f0bdf845681ef07a7f4c406cb0a23c20561c059354422a94392b6a91dab3a79cfaf958be6f623c55d80399829a97f52f79a575ebb WHIRLPOOL bf180d09a9b4717dfd434b9867cf2d66a92772a800db3f36ab70df1cdef9b4c0a76bbc63d8364e70ceff1a6abbb5b4b4c47b107cd63d372b887b859ea01465f1
+DIST libxslt-1.1.28.tar.gz 3435907 SHA256 5fc7151a57b89c03d7b825df5a0fae0a8d5f05674c0e7cf2937ecec4d54a028c SHA512 20b65bdaceaac5bd11d509bf683ce8e344030bc95164639266ae705d41659bcba47b5be1b059d0d67681e6428b0710db675d1749c06aa531bc2212ed3d0511b1 WHIRLPOOL 7f059d7d6b02fc5982c31d3239188ff0a6d211f722635ac3d3cd77bedf54ef9b1a9433ef1c55a9335f353ce618f3dd93a9e1e19c117988358ab31857edff1843
--- a/dev-libs/libxslt/files/libxslt-1.1.23-parallel-install.patch
+++ b/dev-libs/libxslt/files/libxslt-1.1.23-parallel-install.patch
@ -1,16 +0,0 @@
-http://bugs.gentoo.org/212784
-
--- libxslt-1.1.22/work/libxslt-1.1.22/python/Makefile.am 
-+++ libxslt-1.1.23/work/libxslt-1.1.23/python/Makefile.am 
-@@ -42,9 +42,9 @@
- 	cat $(srcdir)/libxsl.py $(srcdir)/libxsltclass.py > libxslt.py
- 
- install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(pythondir)
-+	-$(mkinstalldirs) $(DESTDIR)$(pythondir)
- 	@INSTALL@ -m 0644 libxslt.py $(DESTDIR)$(pythondir)
-	$(mkinstalldirs) $(DESTDIR)$(DOCS_DIR)
-+	-$(mkinstalldirs) $(DESTDIR)$(DOCS_DIR)
- 	@(for doc in $(DOCS) ; \
- 	   do @INSTALL@ -m 0644 $(srcdir)/$$doc $(DESTDIR)$(DOCS_DIR) ; done)
- 
--- a/dev-libs/libxslt/files/libxslt-1.1.26-generate-id-crash.patch
+++ b/dev-libs/libxslt/files/libxslt-1.1.26-generate-id-crash.patch
@ -1,51 +0,0 @@
-From 4da0f7e207f14a03daad4663865c285eb27f93e9 Mon Sep 17 00:00:00 2001
-From: Chris Evans <cevans@chromium.org>
-Date: Mon, 3 Sep 2012 18:16:44 +0800
-Subject: [PATCH] Avoid a heap use after free error
-
-For https://code.google.com/p/chromium/issues/detail?id=140368
---
- libxslt/functions.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/libxslt/functions.c b/libxslt/functions.c
-index 5a8eb79..fe2f1ca 100644
--- a/libxslt/functions.c
-+++ b/libxslt/functions.c
-@@ -660,6 +660,7 @@ xsltFormatNumberFunction(xmlXPathParserContextPtr ctxt, int nargs)
- void
- xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){
-     xmlNodePtr cur = NULL;
-+    xmlXPathObjectPtr obj = NULL;
-     long val;
-     xmlChar str[30];
-     xmlDocPtr doc;
-@@ -667,7 +668,6 @@ xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){
-     if (nargs == 0) {
- 	cur = ctxt->context->node;
-     } else if (nargs == 1) {
-	xmlXPathObjectPtr obj;
- 	xmlNodeSetPtr nodelist;
- 	int i, ret;
- 
-@@ -690,7 +690,6 @@ xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){
- 	    if (ret == -1)
- 	        cur = nodelist->nodeTab[i];
- 	}
-	xmlXPathFreeObject(obj);
-     } else {
- 	xsltTransformError(xsltXPathGetTransformContext(ctxt), NULL, NULL,
- 		"generate-id() : invalid number of args %d\n", nargs);
-@@ -713,6 +712,9 @@ xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){
- 
-     }
- 
-+    if (obj)
-+        xmlXPathFreeObject(obj);
-+
-     val = (long)((char *)cur - (char *)doc);
-     if (val >= 0) {
-       sprintf((char *)str, "idp%ld", val);
-- 
-1.7.12
-
--- a/dev-libs/libxslt/files/libxslt-1.1.26-id-generation.patch
+++ b/dev-libs/libxslt/files/libxslt-1.1.26-id-generation.patch
@ -1,56 +0,0 @@
-From ecb6bcb8d1b7e44842edde3929f412d46b40c89f Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Tue, 22 Feb 2011 02:14:23 +0000
-Subject: Fix generate-id() to not expose object addresses
-
-As pointed out by Chris Evans <scarybeasts@gmail.com> it's better
-security wise to not expose object addresses directly, use a diff
-w.r.t. the document root own address to avoid this
-* libxslt/functions.c: fix IDs generation code
---
-diff --git a/libxslt/functions.c b/libxslt/functions.c
-index 4720c7a..de962f4 100644
--- a/libxslt/functions.c
-+++ b/libxslt/functions.c
-@@ -654,8 +654,9 @@ xsltFormatNumberFunction(xmlXPathParserContextPtr ctxt, int nargs)
- void
- xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){
-     xmlNodePtr cur = NULL;
-    unsigned long val;
-    xmlChar str[20];
-+    long val;
-+    xmlChar str[30];
-+    xmlDocPtr doc;
- 
-     if (nargs == 0) {
- 	cur = ctxt->context->node;
-@@ -694,9 +695,24 @@ xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){
-      * Okay this is ugly but should work, use the NodePtr address
-      * to forge the ID
-      */
-    val = (unsigned long)((char *)cur - (char *)0);
-    val /= sizeof(xmlNode);
-    sprintf((char *)str, "id%ld", val);
-+    if (cur->type != XML_NAMESPACE_DECL)
-+        doc = cur->doc;
-+    else {
-+        xmlNsPtr ns = (xmlNsPtr) cur;
-+
-+        if (ns->context != NULL)
-+            doc = ns->context;
-+        else
-+            doc = ctxt->context->doc;
-+
-+    }
-+
-+    val = (long)((char *)cur - (char *)doc);
-+    if (val >= 0) {
-+      sprintf((char *)str, "idp%ld", val);
-+    } else {
-+      sprintf((char *)str, "idm%ld", -val);
-+    }
-     valuePush(ctxt, xmlXPathNewString(str));
- }
- 
--
-cgit v0.8.3.4
--- a/dev-libs/libxslt/files/libxslt-1.1.26-node-type-1.patch
+++ b/dev-libs/libxslt/files/libxslt-1.1.26-node-type-1.patch
@ -1,37 +0,0 @@
-From 937ba2a3eb42d288f53c8adc211bd1122869f0bf Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Wed, 8 Aug 2012 15:31:05 +0800
-Subject: [PATCH] Fix default template processing on namespace nodes
-
---
- libxslt/transform.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/libxslt/transform.c b/libxslt/transform.c
-index 53eefcc..c6df19e 100644
--- a/libxslt/transform.c
-+++ b/libxslt/transform.c
-@@ -4895,7 +4895,10 @@ xsltApplyTemplates(xsltTransformContextPtr ctxt, xmlNodePtr node,
- 	list = xmlXPathNodeSetCreate(NULL);
- 	if (list == NULL)
- 	    goto error;
-	cur = node->children;
-+	if (node->type != XML_NAMESPACE_DECL)
-+	    cur = node->children;
-+	else
-+	    cur = NULL;
- 	while (cur != NULL) {
- 	    switch (cur->type) {
- 		case XML_TEXT_NODE:
-@@ -4944,6 +4947,8 @@ xsltApplyTemplates(xsltTransformContextPtr ctxt, xmlNodePtr node,
- 		    if (cur->prev != NULL)
- 			cur->prev->next = cur->next;
- 		    break;
-+		case XML_NAMESPACE_DECL:
-+		    break;
- 		default:
- #ifdef WITH_XSLT_DEBUG_PROCESS
- 		    XSLT_TRACE(ctxt,XSLT_TRACE_APPLY_TEMPLATES,xsltGenericDebug(xsltGenericDebugContext,
-- 
-1.7.12
-
--- a/dev-libs/libxslt/files/libxslt-1.1.26-node-type-2.patch
+++ b/dev-libs/libxslt/files/libxslt-1.1.26-node-type-2.patch
@ -1,590 +0,0 @@
-From 1564b30e994602a95863d9716be83612580a2fed Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Thu, 9 Aug 2012 16:18:51 +0800
-Subject: [PATCH] Hardening of code checking node types in various entry point
-
---
- libxslt/attributes.c |  5 +++--
- libxslt/preproc.c    | 45 +++++++++++++++++++++++----------------------
- libxslt/templates.c  | 15 ++++++++++-----
- libxslt/transform.c  |  2 +-
- libxslt/variables.c  | 10 +++++-----
- libxslt/xslt.c       | 43 +++++++++++++++++++++++++------------------
- libxslt/xsltutils.c  | 27 +++++++++++++++++++--------
- 7 files changed, 86 insertions(+), 61 deletions(-)
-
-diff --git a/libxslt/attributes.c b/libxslt/attributes.c
-index ce47df7..11d558b 100644
--- a/libxslt/attributes.c
-+++ b/libxslt/attributes.c
-@@ -293,7 +293,7 @@ xsltParseStylesheetAttributeSet(xsltStylesheetPtr style, xmlNodePtr cur) {
-     xmlNodePtr child;
-     xsltAttrElemPtr attrItems;
- 
-    if ((cur == NULL) || (style == NULL))
-+    if ((cur == NULL) || (style == NULL) || (cur->type != XML_ELEMENT_NODE))
- 	return;
- 
-     value = xmlGetNsProp(cur, (const xmlChar *)"name", NULL);
-@@ -656,7 +656,8 @@ xsltAttributeInternal(xsltTransformContextPtr ctxt,
-     xmlNsPtr ns = NULL;
-     xmlAttrPtr attr;    
- 
-    if ((ctxt == NULL) || (contextNode == NULL) || (inst == NULL))
-+    if ((ctxt == NULL) || (contextNode == NULL) || (inst == NULL) ||
-+        (inst->type != XML_ELEMENT_NODE) )
-         return;
- 
-     /* 
-diff --git a/libxslt/preproc.c b/libxslt/preproc.c
-index f5d265d..4d483ff 100644
--- a/libxslt/preproc.c
-+++ b/libxslt/preproc.c
-@@ -680,7 +680,7 @@ xsltSortComp(xsltStylesheetPtr style, xmlNodePtr inst) {
- #else
-     xsltStylePreCompPtr comp;
- #endif
-    if ((style == NULL) || (inst == NULL))
-+    if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
- 	return;
- 
- #ifdef XSLT_REFACTORED
-@@ -788,7 +788,7 @@ xsltCopyComp(xsltStylesheetPtr style, xmlNodePtr inst) {
-     xsltStylePreCompPtr comp;
- #endif
- 
-    if ((style == NULL) || (inst == NULL))
-+    if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
- 	return;
- #ifdef XSLT_REFACTORED
-     comp = (xsltStyleItemCopyPtr) xsltNewStylePreComp(style, XSLT_FUNC_COPY);
-@@ -832,7 +832,7 @@ xsltTextComp(xsltStylesheetPtr style, xmlNodePtr inst) {
- #endif
-     const xmlChar *prop;
- 
-    if ((style == NULL) || (inst == NULL))
-+    if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
- 	return;
- 
- #ifdef XSLT_REFACTORED
-@@ -885,7 +885,7 @@ xsltElementComp(xsltStylesheetPtr style, xmlNodePtr inst) {
-     *   <!-- Content: template -->
-     * </xsl:element>
-     */
-    if ((style == NULL) || (inst == NULL))
-+    if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
- 	return;
- 
- #ifdef XSLT_REFACTORED
-@@ -1002,7 +1002,7 @@ xsltAttributeComp(xsltStylesheetPtr style, xmlNodePtr inst) {
-     *   <!-- Content: template -->
-     * </xsl:attribute>
-     */
-    if ((style == NULL) || (inst == NULL))
-+    if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
- 	return;
- 
- #ifdef XSLT_REFACTORED
-@@ -1122,7 +1122,7 @@ xsltCommentComp(xsltStylesheetPtr style, xmlNodePtr inst) {
-     xsltStylePreCompPtr comp;
- #endif
- 
-    if ((style == NULL) || (inst == NULL))
-+    if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
- 	return;
- 
- #ifdef XSLT_REFACTORED
-@@ -1152,7 +1152,7 @@ xsltProcessingInstructionComp(xsltStylesheetPtr style, xmlNodePtr inst) {
-     xsltStylePreCompPtr comp;
- #endif
- 
-    if ((style == NULL) || (inst == NULL))
-+    if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
- 	return;
- 
- #ifdef XSLT_REFACTORED
-@@ -1186,7 +1186,7 @@ xsltCopyOfComp(xsltStylesheetPtr style, xmlNodePtr inst) {
-     xsltStylePreCompPtr comp;
- #endif
- 
-    if ((style == NULL) || (inst == NULL))
-+    if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
- 	return;
- 
- #ifdef XSLT_REFACTORED
-@@ -1233,7 +1233,7 @@ xsltValueOfComp(xsltStylesheetPtr style, xmlNodePtr inst) {
- #endif
-     const xmlChar *prop;
- 
-    if ((style == NULL) || (inst == NULL))
-+    if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
- 	return;
- 
- #ifdef XSLT_REFACTORED
-@@ -1358,7 +1358,7 @@ xsltWithParamComp(xsltStylesheetPtr style, xmlNodePtr inst) {
-     xsltStylePreCompPtr comp;
- #endif
- 
-    if ((style == NULL) || (inst == NULL))
-+    if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
- 	return;
- 
- #ifdef XSLT_REFACTORED
-@@ -1417,7 +1417,7 @@ xsltNumberComp(xsltStylesheetPtr style, xmlNodePtr cur) {
- #endif
-     const xmlChar *prop;
- 
-    if ((style == NULL) || (cur == NULL))
-+    if ((style == NULL) || (cur == NULL) || (cur->type != XML_ELEMENT_NODE))
- 	return;
- 
- #ifdef XSLT_REFACTORED
-@@ -1543,7 +1543,7 @@ xsltApplyImportsComp(xsltStylesheetPtr style, xmlNodePtr inst) {
-     xsltStylePreCompPtr comp;
- #endif
- 
-    if ((style == NULL) || (inst == NULL))
-+    if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
- 	return;
- 
- #ifdef XSLT_REFACTORED
-@@ -1573,7 +1573,7 @@ xsltCallTemplateComp(xsltStylesheetPtr style, xmlNodePtr inst) {
-     xsltStylePreCompPtr comp;
- #endif
- 
-    if ((style == NULL) || (inst == NULL))
-+    if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
- 	return;
- 
- #ifdef XSLT_REFACTORED
-@@ -1612,7 +1612,7 @@ xsltApplyTemplatesComp(xsltStylesheetPtr style, xmlNodePtr inst) {
-     xsltStylePreCompPtr comp;
- #endif
- 
-    if ((style == NULL) || (inst == NULL))
-+    if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
- 	return;
- 
- #ifdef XSLT_REFACTORED
-@@ -1664,7 +1664,7 @@ xsltChooseComp(xsltStylesheetPtr style, xmlNodePtr inst) {
-     xsltStylePreCompPtr comp;
- #endif
- 
-    if ((style == NULL) || (inst == NULL))
-+    if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
- 	return;
- 
- #ifdef XSLT_REFACTORED
-@@ -1695,7 +1695,7 @@ xsltIfComp(xsltStylesheetPtr style, xmlNodePtr inst) {
-     xsltStylePreCompPtr comp;
- #endif
- 
-    if ((style == NULL) || (inst == NULL))
-+    if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
- 	return;
- 
- #ifdef XSLT_REFACTORED
-@@ -1741,7 +1741,7 @@ xsltWhenComp(xsltStylesheetPtr style, xmlNodePtr inst) {
-     xsltStylePreCompPtr comp;
- #endif
- 
-    if ((style == NULL) || (inst == NULL))
-+    if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
- 	return;
- 
- #ifdef XSLT_REFACTORED
-@@ -1787,7 +1787,7 @@ xsltForEachComp(xsltStylesheetPtr style, xmlNodePtr inst) {
-     xsltStylePreCompPtr comp;
- #endif
- 
-    if ((style == NULL) || (inst == NULL))
-+    if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
- 	return;
- 
- #ifdef XSLT_REFACTORED
-@@ -1835,7 +1835,7 @@ xsltVariableComp(xsltStylesheetPtr style, xmlNodePtr inst) {
-     xsltStylePreCompPtr comp;
- #endif
- 
-    if ((style == NULL) || (inst == NULL))
-+    if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
- 	return;
- 
- #ifdef XSLT_REFACTORED
-@@ -1914,7 +1914,7 @@ xsltParamComp(xsltStylesheetPtr style, xmlNodePtr inst) {
-     xsltStylePreCompPtr comp;
- #endif
- 
-    if ((style == NULL) || (inst == NULL))
-+    if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
- 	return;
- 
- #ifdef XSLT_REFACTORED
-@@ -2006,7 +2006,7 @@ xsltStylePreCompute(xsltStylesheetPtr style, xmlNodePtr node) {
-     *  the parsing mechanism for all elements in the XSLT namespace.
-     */
-     if (style == NULL) {
-	if (node != NULL)
-+	if ((node != NULL) && (node->type == XML_ELEMENT_NODE))
- 	    node->psvi = NULL;
- 	return;
-     }
-@@ -2221,7 +2221,8 @@ xsltStylePreCompute(xsltStylesheetPtr style, xmlNodePtr inst) {
-     *   namespace- and local-name of the node, but can evaluate this
-     *   using cctxt->style->inode->category;
-     */
-    if (inst->psvi != NULL)
-+    if ((inst == NULL) || (inst->type != XML_ELEMENT_NODE) ||
-+        (inst->psvi != NULL))
- 	return;
- 
-     if (IS_XSLT_ELEM(inst)) {
-diff --git a/libxslt/templates.c b/libxslt/templates.c
-index 52bb3cf..169afd9 100644
--- a/libxslt/templates.c
-+++ b/libxslt/templates.c
-@@ -198,7 +198,8 @@ xsltEvalTemplateString(xsltTransformContextPtr ctxt,
-     xmlNodePtr oldInsert, insert = NULL;
-     xmlChar *ret;
- 
-    if ((ctxt == NULL) || (contextNode == NULL) || (inst == NULL))
-+    if ((ctxt == NULL) || (contextNode == NULL) || (inst == NULL) ||
-+        (inst->type != XML_ELEMENT_NODE))
- 	return(NULL);
- 
-     if (inst->children == NULL)
-@@ -390,7 +391,8 @@ xsltEvalAttrValueTemplate(xsltTransformContextPtr ctxt, xmlNodePtr inst,
-     xmlChar *ret;
-     xmlChar *expr;
- 
-    if ((ctxt == NULL) || (inst == NULL) || (name == NULL))
-+    if ((ctxt == NULL) || (inst == NULL) || (name == NULL) ||
-+        (inst->type != XML_ELEMENT_NODE))
- 	return(NULL);
- 
-     expr = xsltGetNsProp(inst, name, ns);
-@@ -434,7 +436,8 @@ xsltEvalStaticAttrValueTemplate(xsltStylesheetPtr style, xmlNodePtr inst,
-     const xmlChar *ret;
-     xmlChar *expr;
- 
-    if ((style == NULL) || (inst == NULL) || (name == NULL))
-+    if ((style == NULL) || (inst == NULL) || (name == NULL) ||
-+        (inst->type != XML_ELEMENT_NODE))
- 	return(NULL);
- 
-     expr = xsltGetNsProp(inst, name, ns);
-@@ -475,7 +478,8 @@ xsltAttrTemplateProcess(xsltTransformContextPtr ctxt, xmlNodePtr target,
-     const xmlChar *value;
-     xmlAttrPtr ret;
- 
-    if ((ctxt == NULL) || (attr == NULL) || (target == NULL))
-+    if ((ctxt == NULL) || (attr == NULL) || (target == NULL) ||
-+        (target->type != XML_ELEMENT_NODE))
- 	return(NULL);
-     
-     if (attr->type != XML_ATTRIBUTE_NODE)
-@@ -632,7 +636,8 @@ xsltAttrListTemplateProcess(xsltTransformContextPtr ctxt,
-     const xmlChar *value;
-     xmlChar *valueAVT;
- 
-    if ((ctxt == NULL) || (target == NULL) || (attrs == NULL))
-+    if ((ctxt == NULL) || (target == NULL) || (attrs == NULL) ||
-+        (target->type != XML_ELEMENT_NODE))
- 	return(NULL);
- 
-     oldInsert = ctxt->insert;
-diff --git a/libxslt/transform.c b/libxslt/transform.c
-index c6df19e..bc6d851 100644
--- a/libxslt/transform.c
-+++ b/libxslt/transform.c
-@@ -777,7 +777,7 @@ xsltCopyTextString(xsltTransformContextPtr ctxt, xmlNodePtr target,
- #endif
- 
-     /*
-    * Play save and reset the merging mechanism for every new
-+    * Play safe and reset the merging mechanism for every new
-     * target node.
-     */
-     if ((target == NULL) || (target->children == NULL)) {
-diff --git a/libxslt/variables.c b/libxslt/variables.c
-index cb0d4b0..2d26872 100644
--- a/libxslt/variables.c
-+++ b/libxslt/variables.c
-@@ -1935,7 +1935,7 @@ xsltParseStylesheetCallerParam(xsltTransformContextPtr ctxt, xmlNodePtr inst)
-                                the instruction itself. */
-     xsltStackElemPtr param = NULL;
-     
-    if ((ctxt == NULL) || (inst == NULL))
-+    if ((ctxt == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
- 	return(NULL);
- 
- #ifdef XSLT_REFACTORED
-@@ -1994,7 +1994,7 @@ xsltParseGlobalVariable(xsltStylesheetPtr style, xmlNodePtr cur)
-     xsltStylePreCompPtr comp;
- #endif
- 
-    if ((cur == NULL) || (style == NULL))
-+    if ((cur == NULL) || (style == NULL) || (cur->type != XML_ELEMENT_NODE))
- 	return;
-     
- #ifdef XSLT_REFACTORED
-@@ -2056,7 +2056,7 @@ xsltParseGlobalParam(xsltStylesheetPtr style, xmlNodePtr cur) {
-     xsltStylePreCompPtr comp;
- #endif
- 
-    if ((cur == NULL) || (style == NULL))
-+    if ((cur == NULL) || (style == NULL) || (cur->type != XML_ELEMENT_NODE))
- 	return;
-     
- #ifdef XSLT_REFACTORED
-@@ -2119,7 +2119,7 @@ xsltParseStylesheetVariable(xsltTransformContextPtr ctxt, xmlNodePtr inst)
-     xsltStylePreCompPtr comp;
- #endif
- 
-    if ((inst == NULL) || (ctxt == NULL))
-+    if ((inst == NULL) || (ctxt == NULL) || (inst->type != XML_ELEMENT_NODE))
- 	return;
- 
-     comp = inst->psvi;
-@@ -2161,7 +2161,7 @@ xsltParseStylesheetParam(xsltTransformContextPtr ctxt, xmlNodePtr cur)
-     xsltStylePreCompPtr comp;
- #endif
- 
-    if ((cur == NULL) || (ctxt == NULL))
-+    if ((cur == NULL) || (ctxt == NULL) || (cur->type != XML_ELEMENT_NODE))
- 	return;
- 
-     comp = cur->psvi;
-diff --git a/libxslt/xslt.c b/libxslt/xslt.c
-index 6293bb3..2bc8af5 100644
--- a/libxslt/xslt.c
-+++ b/libxslt/xslt.c
-@@ -1162,9 +1162,9 @@ xsltParseStylesheetOutput(xsltStylesheetPtr style, xmlNodePtr cur)
-     xmlChar *element,
-      *end;
- 
-    if ((cur == NULL) || (style == NULL))
-+    if ((cur == NULL) || (style == NULL) || (cur->type != XML_ELEMENT_NODE))
-         return;
-   
-+
-     prop = xmlGetNsProp(cur, (const xmlChar *) "version", NULL);
-     if (prop != NULL) {
-         if (style->version != NULL)
-@@ -1377,12 +1377,12 @@ xsltParseStylesheetDecimalFormat(xsltStylesheetPtr style, xmlNodePtr cur)
-     xmlChar *prop;
-     xsltDecimalFormatPtr format;
-     xsltDecimalFormatPtr iter;
-    
-    if ((cur == NULL) || (style == NULL))
-+
-+    if ((cur == NULL) || (style == NULL) || (cur->type != XML_ELEMENT_NODE))
- 	return;
- 
-     format = style->decimalFormat;
-    
-+
-     prop = xmlGetNsProp(cur, BAD_CAST("name"), NULL);
-     if (prop != NULL) {
- 	format = xsltDecimalFormatGetByName(style, prop);
-@@ -1484,7 +1484,7 @@ xsltParseStylesheetPreserveSpace(xsltStylesheetPtr style, xmlNodePtr cur) {
-     xmlChar *elements;
-     xmlChar *element, *end;
- 
-    if ((cur == NULL) || (style == NULL))
-+    if ((cur == NULL) || (style == NULL) || (cur->type != XML_ELEMENT_NODE))
- 	return;
- 
-     elements = xmlGetNsProp(cur, (const xmlChar *)"elements", NULL);
-@@ -1558,7 +1558,7 @@ xsltParseStylesheetExtPrefix(xsltStylesheetPtr style, xmlNodePtr cur,
-     xmlChar *prefixes;
-     xmlChar *prefix, *end;
- 
-    if ((cur == NULL) || (style == NULL))
-+    if ((cur == NULL) || (style == NULL) || (cur->type != XML_ELEMENT_NODE))
- 	return;
- 
-     if (isXsltElem) {
-@@ -1623,7 +1623,7 @@ xsltParseStylesheetStripSpace(xsltStylesheetPtr style, xmlNodePtr cur) {
-     xmlChar *elements;
-     xmlChar *element, *end;
- 
-    if ((cur == NULL) || (style == NULL))
-+    if ((cur == NULL) || (style == NULL) || (cur->type != XML_ELEMENT_NODE))
- 	return;
- 
-     elements = xmlGetNsProp(cur, (const xmlChar *)"elements", NULL);
-@@ -1696,7 +1696,7 @@ xsltParseStylesheetExcludePrefix(xsltStylesheetPtr style, xmlNodePtr cur,
-     xmlChar *prefixes;
-     xmlChar *prefix, *end;
- 
-    if ((cur == NULL) || (style == NULL))
-+    if ((cur == NULL) || (style == NULL) || (cur->type != XML_ELEMENT_NODE))
- 	return(0);
- 
-     if (isXsltElem)
-@@ -4287,7 +4287,7 @@ static int
- xsltParseUnknownXSLTElem(xsltCompilerCtxtPtr cctxt,
- 			    xmlNodePtr node)
- {
-    if ((cctxt == NULL) || (node == NULL))
-+    if ((cctxt == NULL) || (node == NULL) || (node->type != XML_ELEMENT_NODE))
- 	return(-1);
- 
-     /*
-@@ -4384,7 +4384,7 @@ xsltParseSequenceConstructor(xsltCompilerCtxtPtr cctxt, xmlNodePtr cur)
-     if (cctxt->inode->category == XSLT_ELEMENT_CATEGORY_EXTENSION) {
- 	cctxt->inode->extContentHandled = 1;
-     }
-    if (cur == NULL)
-+    if ((cur == NULL) || (cur->type == XML_NAMESPACE_DECL))
- 	return;
-     /*
-     * This is the content reffered to as a "template".
-@@ -4789,7 +4789,8 @@ xsltParseSequenceConstructor(xsltCompilerCtxtPtr cctxt, xmlNodePtr cur)
-  */
- void
- xsltParseTemplateContent(xsltStylesheetPtr style, xmlNodePtr templ) {
-    if ((style == NULL) || (templ == NULL))
-+    if ((style == NULL) || (templ == NULL) ||
-+        (templ->type == XML_NAMESPACE_DECL))
- 	return;
- 
-     /*
-@@ -4838,6 +4839,10 @@ xsltParseTemplateContent(xsltStylesheetPtr style, xmlNodePtr templ) {
- void
- xsltParseTemplateContent(xsltStylesheetPtr style, xmlNodePtr templ) {
-     xmlNodePtr cur, delete;
-+
-+    if ((style == NULL) || (templ == NULL) ||
-+        (templ->type == XML_NAMESPACE_DECL)) return;
-+
-     /*
-      * This content comes from the stylesheet
-      * For stylesheets, the set of whitespace-preserving
-@@ -5057,7 +5062,7 @@ xsltParseStylesheetKey(xsltStylesheetPtr style, xmlNodePtr key) {
-     xmlChar *name = NULL;
-     xmlChar *nameURI = NULL;
- 
-    if ((style == NULL) || (key == NULL))
-+    if ((style == NULL) || (key == NULL) || (key->type != XML_ELEMENT_NODE))
- 	return;
- 
-     /*
-@@ -5147,7 +5152,8 @@ xsltParseXSLTTemplate(xsltCompilerCtxtPtr cctxt, xmlNodePtr templNode) {
-     xmlChar *prop;    
-     double  priority;    
- 
-    if ((cctxt == NULL) || (templNode == NULL))
-+    if ((cctxt == NULL) || (templNode == NULL) ||
-+        (templNode->type != XML_ELEMENT_NODE))
- 	return;
- 
-     /*
-@@ -5308,7 +5314,8 @@ xsltParseStylesheetTemplate(xsltStylesheetPtr style, xmlNodePtr template) {
-     xmlChar *modeURI = NULL;
-     double  priority;
- 
-    if (template == NULL)
-+    if ((style == NULL) || (template == NULL) ||
-+        (template->type != XML_ELEMENT_NODE))
- 	return;
- 
-     /*
-@@ -5440,7 +5447,7 @@ static xsltStyleItemIncludePtr
- xsltCompileXSLTIncludeElem(xsltCompilerCtxtPtr cctxt, xmlNodePtr node) {
-     xsltStyleItemIncludePtr item;
- 
-    if ((cctxt == NULL) || (node == NULL))
-+    if ((cctxt == NULL) || (node == NULL) || (node->type != XML_ELEMENT_NODE))
- 	return(NULL);
- 
-     node->psvi = NULL;
-@@ -5960,7 +5967,7 @@ xsltParseXSLTStylesheetElem(xsltCompilerCtxtPtr cctxt, xmlNodePtr node)
- {
-     xmlNodePtr cur, start;
- 
-    if ((cctxt == NULL) || (node == NULL))
-+    if ((cctxt == NULL) || (node == NULL) || (node->type != XML_ELEMENT_NODE))
- 	return(-1);
-     
-     if (node->children == NULL)
-@@ -6048,7 +6055,7 @@ xsltParseStylesheetTop(xsltStylesheetPtr style, xmlNodePtr top) {
-     int templates = 0;
- #endif
- 
-    if (top == NULL)
-+    if ((top == NULL) || (top->type != XML_ELEMENT_NODE))
- 	return;
- 
-     prop = xmlGetNsProp(top, (const xmlChar *)"version", NULL);
-diff --git a/libxslt/xsltutils.c b/libxslt/xsltutils.c
-index 7a4caf0..6a0e8f2 100644
--- a/libxslt/xsltutils.c
-+++ b/libxslt/xsltutils.c
-@@ -91,10 +91,15 @@ xsltGetCNsProp(xsltStylesheetPtr style, xmlNodePtr node,
-     if ((node == NULL) || (style == NULL) || (style->dict == NULL))
- 	return(NULL);
- 
-    prop = node->properties;
-    if (nameSpace == NULL) {
-+    if (nameSpace == NULL)
-         return xmlGetProp(node, name);
-    }
-+
-+    if (node->type == XML_NAMESPACE_DECL)
-+        return(NULL);
-+    if (node->type == XML_ELEMENT_NODE)
-+	prop = node->properties;
-+    else
-+	prop = NULL;
-     while (prop != NULL) {
- 	/*
- 	 * One need to have
-@@ -131,7 +136,7 @@ xsltGetCNsProp(xsltStylesheetPtr style, xmlNodePtr node,
- 	    attrDecl = xmlGetDtdAttrDesc(doc->intSubset, node->name, name);
- 	    if ((attrDecl == NULL) && (doc->extSubset != NULL))
- 		attrDecl = xmlGetDtdAttrDesc(doc->extSubset, node->name, name);
-		
-+
- 	    if ((attrDecl != NULL) && (attrDecl->prefix != NULL)) {
- 	        /*
- 		 * The DTD declaration only allows a prefix search
-@@ -173,7 +178,15 @@ xsltGetNsProp(xmlNodePtr node, const xmlChar *name, const xmlChar *nameSpace) {
-     if (node == NULL)
- 	return(NULL);
- 
-    prop = node->properties;
-+    if (nameSpace == NULL)
-+        return xmlGetProp(node, name);
-+
-+    if (node->type == XML_NAMESPACE_DECL)
-+        return(NULL);
-+    if (node->type == XML_ELEMENT_NODE)
-+	prop = node->properties;
-+    else
-+	prop = NULL;
-     /*
-     * TODO: Substitute xmlGetProp() for xmlGetNsProp(), since the former
-     * is not namespace-aware and will return an attribute with equal
-@@ -183,8 +196,6 @@ xsltGetNsProp(xmlNodePtr node, const xmlChar *name, const xmlChar *nameSpace) {
-     *   So this would return "myName" even if an attribute @name
-     *   in the XSLT was requested.
-     */
-    if (nameSpace == NULL)
-	return(xmlGetProp(node, name));
-     while (prop != NULL) {
- 	/*
- 	 * One need to have
-@@ -217,7 +228,7 @@ xsltGetNsProp(xmlNodePtr node, const xmlChar *name, const xmlChar *nameSpace) {
- 	    attrDecl = xmlGetDtdAttrDesc(doc->intSubset, node->name, name);
- 	    if ((attrDecl == NULL) && (doc->extSubset != NULL))
- 		attrDecl = xmlGetDtdAttrDesc(doc->extSubset, node->name, name);
-		
-+
- 	    if ((attrDecl != NULL) && (attrDecl->prefix != NULL)) {
- 	        /*
- 		 * The DTD declaration only allows a prefix search
-- 
-1.7.12
-
--- a/dev-libs/libxslt/files/libxslt-1.1.26-node-type-3.patch
+++ b/dev-libs/libxslt/files/libxslt-1.1.26-node-type-3.patch
@ -1,38 +0,0 @@
-From 24653072221e76d2f1f06aa71225229b532f8946 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Thu, 16 Aug 2012 15:51:35 +0800
-Subject: [PATCH] Hardening of code checking node types in EXSLT
-
---
- libexslt/functions.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/libexslt/functions.c b/libexslt/functions.c
-index 13fd06e..4c68cea 100644
--- a/libexslt/functions.c
-+++ b/libexslt/functions.c
-@@ -459,10 +459,9 @@ exsltFuncFunctionComp (xsltStylesheetPtr style, xmlNodePtr inst) {
-     xmlHashTablePtr data;
-     exsltFuncFunctionData *func;
- 
-    if ((style == NULL) || (inst == NULL))
-+    if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
- 	return;
- 
-
-     {
- 	xmlChar *qname;
- 
-@@ -546,6 +545,9 @@ exsltFuncResultComp (xsltStylesheetPtr style, xmlNodePtr inst,
-     xmlChar *sel;
-     exsltFuncResultPreComp *ret;
- 
-+    if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
-+        return (NULL);
-+
-     /*
-      * "Validity" checking
-      */
-- 
-1.7.12
-
--- a/dev-libs/libxslt/files/libxslt-1.1.26-pattern-compile-crash.patch
+++ b/dev-libs/libxslt/files/libxslt-1.1.26-pattern-compile-crash.patch
@ -1,209 +0,0 @@
-From 8566ab4a10158d195adb5f1f61afe1ee8bfebd12 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Thu, 9 Aug 2012 15:31:07 +0800
-Subject: [PATCH] Cleanup of the pattern compilation code
-
-Avoid potential crashes and memory leaks
---
- libxslt/pattern.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++------
- 1 file changed, 47 insertions(+), 6 deletions(-)
-
-diff --git a/libxslt/pattern.c b/libxslt/pattern.c
-index 1155b54..a6140cb 100644
--- a/libxslt/pattern.c
-+++ b/libxslt/pattern.c
-@@ -303,6 +303,10 @@ xsltCompMatchAdd(xsltParserContextPtr ctxt, xsltCompMatchPtr comp,
- 	     "xsltCompMatchAdd: memory re-allocation failure.\n");
- 	    if (ctxt->style != NULL)
- 		ctxt->style->errors++;
-+	    if (value)
-+	        xmlFree(value);
-+	    if (value2)
-+	        xmlFree(value2);
- 	    return (-1);
- 	}
-         comp->maxStep *= 2;
-@@ -1384,17 +1388,22 @@ xsltCompileIdKeyPattern(xsltParserContextPtr ctxt, xmlChar *name,
- 	NEXT;
- 	SKIP_BLANKS;
-         lit = xsltScanLiteral(ctxt);
-	if (ctxt->error)
-+	if (ctxt->error) {
-+	    xsltTransformError(NULL, NULL, NULL,
-+		    "xsltCompileIdKeyPattern : Literal expected\n");
- 	    return;
-+	}
- 	SKIP_BLANKS;
- 	if (CUR != ')') {
- 	    xsltTransformError(NULL, NULL, NULL,
- 		    "xsltCompileIdKeyPattern : ) expected\n");
-+	    xmlFree(lit);
- 	    ctxt->error = 1;
- 	    return;
- 	}
- 	NEXT;
- 	PUSH(XSLT_OP_ID, lit, NULL, novar);
-+	lit = NULL;
-     } else if ((aid) && (xmlStrEqual(name, (const xmlChar *)"key"))) {
- 	if (axis != 0) {
- 	    xsltTransformError(NULL, NULL, NULL,
-@@ -1405,8 +1414,11 @@ xsltCompileIdKeyPattern(xsltParserContextPtr ctxt, xmlChar *name,
- 	NEXT;
- 	SKIP_BLANKS;
-         lit = xsltScanLiteral(ctxt);
-	if (ctxt->error)
-+	if (ctxt->error) {
-+	    xsltTransformError(NULL, NULL, NULL,
-+		    "xsltCompileIdKeyPattern : Literal expected\n");
- 	    return;
-+	}
- 	SKIP_BLANKS;
- 	if (CUR != ',') {
- 	    xsltTransformError(NULL, NULL, NULL,
-@@ -1417,25 +1429,36 @@ xsltCompileIdKeyPattern(xsltParserContextPtr ctxt, xmlChar *name,
- 	NEXT;
- 	SKIP_BLANKS;
-         lit2 = xsltScanLiteral(ctxt);
-	if (ctxt->error)
-+	if (ctxt->error) {
-+	    xsltTransformError(NULL, NULL, NULL,
-+		    "xsltCompileIdKeyPattern : Literal expected\n");
-+	    xmlFree(lit);
- 	    return;
-+	}
- 	SKIP_BLANKS;
- 	if (CUR != ')') {
- 	    xsltTransformError(NULL, NULL, NULL,
- 		    "xsltCompileIdKeyPattern : ) expected\n");
-+	    xmlFree(lit);
-+	    xmlFree(lit2);
- 	    ctxt->error = 1;
- 	    return;
- 	}
- 	NEXT;
- 	/* URGENT TODO: support namespace in keys */
- 	PUSH(XSLT_OP_KEY, lit, lit2, novar);
-+	lit = NULL;
-+	lit2 = NULL;
-     } else if (xmlStrEqual(name, (const xmlChar *)"processing-instruction")) {
- 	NEXT;
- 	SKIP_BLANKS;
- 	if (CUR != ')') {
- 	    lit = xsltScanLiteral(ctxt);
-	    if (ctxt->error)
-+	    if (ctxt->error) {
-+		xsltTransformError(NULL, NULL, NULL,
-+			"xsltCompileIdKeyPattern : Literal expected\n");
- 		return;
-+	    }
- 	    SKIP_BLANKS;
- 	    if (CUR != ')') {
- 		xsltTransformError(NULL, NULL, NULL,
-@@ -1446,6 +1469,7 @@ xsltCompileIdKeyPattern(xsltParserContextPtr ctxt, xmlChar *name,
- 	}
- 	NEXT;
- 	PUSH(XSLT_OP_PI, lit, NULL, novar);
-+	lit = NULL;
-     } else if (xmlStrEqual(name, (const xmlChar *)"text")) {
- 	NEXT;
- 	SKIP_BLANKS;
-@@ -1496,8 +1520,7 @@ xsltCompileIdKeyPattern(xsltParserContextPtr ctxt, xmlChar *name,
- 	return;
-     }
- error:
-    if (name != NULL)
-	xmlFree(name);
-+    return;
- }
- 
- /**
-@@ -1560,6 +1583,8 @@ parse_node_test:
-     SKIP_BLANKS;
-     if (CUR == '(') {
- 	xsltCompileIdKeyPattern(ctxt, token, 0, novar, axis);
-+	xmlFree(token);
-+	token = NULL;
- 	if (ctxt->error)
- 	    goto error;
-     } else if (CUR == ':') {
-@@ -1578,20 +1603,24 @@ parse_node_test:
- 	    "xsltCompileStepPattern : no namespace bound to prefix %s\n",
- 				 prefix);
- 		xmlFree(prefix);
-+		prefix=NULL;
- 		ctxt->error = 1;
- 		goto error;
- 	    } else {
- 		URL = xmlStrdup(ns->href);
- 	    }
- 	    xmlFree(prefix);
-+	    prefix=NULL;
- 	    if (token == NULL) {
- 		if (CUR == '*') {
- 		    NEXT;
-                     if (axis == AXIS_ATTRIBUTE) {
-                         PUSH(XSLT_OP_ATTR, NULL, URL, novar);
-+			URL = NULL;
-                     }
-                     else {
-                         PUSH(XSLT_OP_NS, URL, NULL, novar);
-+			URL = NULL;
-                     }
- 		} else {
- 		    xsltTransformError(NULL, NULL, NULL,
-@@ -1602,9 +1631,13 @@ parse_node_test:
- 	    } else {
-                 if (axis == AXIS_ATTRIBUTE) {
-                     PUSH(XSLT_OP_ATTR, token, URL, novar);
-+		    token = NULL;
-+		    URL = NULL;
-                 }
-                 else {
-                     PUSH(XSLT_OP_ELEM, token, URL, novar);
-+		    token = NULL;
-+		    URL = NULL;
-                 }
- 	    }
- 	} else {
-@@ -1626,6 +1659,7 @@ parse_node_test:
- 		goto error;
- 	    }
- 	    xmlFree(token);
-+	    token = NULL;
-             SKIP_BLANKS;
-             token = xsltScanNCName(ctxt);
- 	    goto parse_node_test;
-@@ -1640,9 +1674,13 @@ parse_node_test:
- 	    URL = xmlStrdup(URI);
-         if (axis == AXIS_ATTRIBUTE) {
-             PUSH(XSLT_OP_ATTR, token, URL, novar);
-+	    token = NULL;
-+	    URL = NULL;
-         }
-         else {
-             PUSH(XSLT_OP_ELEM, token, URL, novar);
-+	    token = NULL;
-+	    URL = NULL;
-         }
-     }
- parse_predicate:
-@@ -1682,6 +1720,7 @@ parse_predicate:
-         }
- 	ret = xmlStrndup(q, CUR_PTR - q);
- 	PUSH(XSLT_OP_PREDICATE, ret, NULL, novar);
-+	ret = NULL;
- 	/* push the predicate lower than local test */
- 	SWAP();
- 	NEXT;
-@@ -1790,6 +1829,8 @@ xsltCompileLocationPathPattern(xsltParserContextPtr ctxt, int novar) {
- 	SKIP_BLANKS;
- 	if ((CUR == '(') && !xmlXPathIsNodeType(name)) {
- 	    xsltCompileIdKeyPattern(ctxt, name, 1, novar, 0);
-+	    xmlFree(name);
-+	    name = NULL;
- 	    if ((CUR == '/') && (NXT(1) == '/')) {
- 		PUSH(XSLT_OP_ANCESTOR, NULL, NULL, novar);
- 		NEXT;
-- 
-1.7.12
-
--- a/dev-libs/libxslt/files/libxslt-1.1.26-pattern-out-of-bounds-read.patch
+++ b/dev-libs/libxslt/files/libxslt-1.1.26-pattern-out-of-bounds-read.patch
@ -1,27 +0,0 @@
-From fe5a4fa33eb85bce3253ed3742b1ea6c4b59b41b Mon Sep 17 00:00:00 2001
-From: Abhishek Arya <inferno@chromium.org>
-Date: Sun, 22 Jan 2012 17:47:50 +0800
-Subject: [PATCH] Fix some case of pattern parsing errors
-
-We could accidentally hit an off by one string array access
-due to improper loop exit when parsing patterns
---
- libxslt/pattern.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/libxslt/pattern.c b/libxslt/pattern.c
-index 6161376..1155b54 100644
--- a/libxslt/pattern.c
-+++ b/libxslt/pattern.c
-@@ -1867,6 +1867,8 @@ xsltCompilePatternInternal(const xmlChar *pattern, xmlDocPtr doc,
- 		while ((pattern[end] != 0) && (pattern[end] != '"'))
- 		    end++;
- 	    }
-+	    if (pattern[end] == 0)
-+	        break;
- 	    end++;
- 	}
- 	if (current == end) {
-- 
-1.7.8.4
-
--- a/dev-libs/libxslt/files/libxslt-1.1.26-posix-comparison.patch
+++ b/dev-libs/libxslt/files/libxslt-1.1.26-posix-comparison.patch
@ -1,15 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=420335
-
-diff --git a/configure.in b/configure.in
-index 756003d..46e8e8f 100644
--- a/configure.in
-+++ b/configure.in
-@@ -130,7 +130,7 @@ dnl
- VERSION_SCRIPT_FLAGS=
- $(/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null) && \
-     VERSION_SCRIPT_FLAGS=-Wl,--version-script=
-test "`uname`" == "SunOS" && \
-+test "`uname`" = "SunOS" && \
-     VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,"
- AC_SUBST(VERSION_SCRIPT_FLAGS)
- AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -n "$VERSION_SCRIPT_FLAGS"])
--- a/dev-libs/libxslt/files/libxslt-1.1.26-undefined.patch
+++ b/dev-libs/libxslt/files/libxslt-1.1.26-undefined.patch
@ -1,17 +0,0 @@
-http://bugs.gentoo.org/246748
-
-This patch can be removed for next release as per:
-
-http://bugzilla.gnome.org/show_bug.cgi?id=610666#c2
-
--- python/Makefile.am
-+++ python/Makefile.am
-@@ -36,7 +36,7 @@
- python_LTLIBRARIES = libxsltmod.la
- 
- libxsltmod_la_SOURCES = libxslt.c types.c libxslt-py.c
-libxsltmod_la_LIBADD = $(mylibs) 
-+libxsltmod_la_LIBADD = $(mylibs)  -lpython$(PYTHON_VERSION)
- 
- libxslt.py: $(srcdir)/libxsl.py $(srcdir)/libxsltclass.py
- 	cat $(srcdir)/libxsl.py $(srcdir)/libxsltclass.py > libxslt.py
--- a/dev-libs/libxslt/libxslt-1.1.26-r4.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.26-r4.ebuild
@ -1,137 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.26-r4.ebuild,v 1.5 2012/09/23 17:30:21 armin76 Exp $
-
-EAPI="4"
-PYTHON_DEPEND="python? 2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*"
-
-inherit autotools eutils python toolchain-funcs
-
-DESCRIPTION="XSLT libraries and tools"
-HOMEPAGE="http://www.xmlsoft.org/"
-SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="crypt debug python static-libs"
-
-DEPEND=">=dev-libs/libxml2-2.6.27:2
-	crypt?  ( >=dev-libs/libgcrypt-1.1.42 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if use python; then
-		python_pkg_setup
-	fi
-	DOCS="AUTHORS ChangeLog FEATURES NEWS README TODO"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/libxslt.m4-${P}.patch \
-		"${FILESDIR}"/${PN}-1.1.23-parallel-install.patch \
-		"${FILESDIR}"/${P}-undefined.patch \
-		"${FILESDIR}"/${P}-disable_static_modules.patch
-
-	# Python bindings are built/tested/installed manually.
-	sed -e "s/@PYTHON_SUBDIR@//" -i Makefile.am || die "sed failed"
-
-	# Fix generate-id() to not expose object addresses, bug #358615
-	epatch "${FILESDIR}/${P}-id-generation.patch"
-
-	# Fix off-by-one in xsltCompilePatternInternal, bug #402861
-	epatch "${FILESDIR}/${P}-pattern-out-of-bounds-read.patch"
-
-	# Namespace nodes require special treatment, bug #433603
-	epatch "${FILESDIR}/${P}-node-type-"{1,2,3}.patch
-
-	# Use-after-free errors, bug #433603
-	epatch "${FILESDIR}/${P}-pattern-compile-crash.patch"
-	epatch "${FILESDIR}/${P}-generate-id-crash.patch"
-
-	# Build fix for freebsd, bug #420335
-	epatch "${FILESDIR}/${P}-posix-comparison.patch"
-
-	eautoreconf
-	epunt_cxx
-}
-
-src_configure() {
-	# libgcrypt is missing pkg-config file, so fixing cross-compile
-	# here. see bug 267503.
-	if tc-is-cross-compiler; then
-		export LIBGCRYPT_CONFIG="${SYSROOT}/usr/bin/libgcrypt-config"
-	fi
-
-	econf \
-		--disable-dependency-tracking \
-		--with-html-dir=/usr/share/doc/${PF} \
-		--with-html-subdir=html \
-		$(use_with crypt crypto) \
-		$(use_with python) \
-		$(use_with debug) \
-		$(use_with debug mem-debug) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	default
-
-	if use python; then
-		python_copy_sources python
-		building() {
-			emake PYTHON_INCLUDES="$(python_get_includedir)" \
-				PYTHON_SITE_PACKAGES="$(python_get_sitedir)" \
-				PYTHON_VERSION="$(python_get_version)"
-		}
-		python_execute_function -s --source-dir python building
-	fi
-}
-
-src_test() {
-	default
-
-	if use python; then
-		testing() {
-			emake test
-		}
-		python_execute_function -s --source-dir python testing
-	fi
-}
-
-src_install() {
-	default
-
-	if use python; then
-		installation() {
-			emake DESTDIR="${D}" \
-				PYTHON_SITE_PACKAGES="$(python_get_sitedir)" \
-				install
-		}
-		python_execute_function -s --source-dir python installation
-
-		python_clean_installation_image
-	fi
-
-	mv -vf "${ED}"/usr/share/doc/${PN}-python-${PV} \
-		"${ED}"/usr/share/doc/${PF}/python
-
-	if ! use static-libs; then
-		# Remove useless .la files
-		find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
-	fi
-}
-
-pkg_postinst() {
-	if use python; then
-		python_mod_optimize libxslt.py
-	fi
-}
-
-pkg_postrm() {
-	if use python; then
-		python_mod_cleanup libxslt.py
-	fi
-}
--- a/dev-libs/libxslt/libxslt-1.1.26-r3.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.26-r3.ebuild
@ -1,9 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.26-r3.ebuild,v 1.8 2012/04/26 17:11:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.28.ebuild,v 1.1 2012/11/29 13:20:30 ssuominen Exp $

-EAPI="4"
-PYTHON_DEPEND="python? 2"
+EAPI=5
+
+PYTHON_DEPEND="python? 2:2.5"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*"

@ -15,34 +16,30 @@ SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="crypt debug python static-libs"

-DEPEND=">=dev-libs/libxml2-2.6.27:2
+RDEPEND=">=dev-libs/libxml2-2.8.0
 	crypt?  ( >=dev-libs/libgcrypt-1.1.42 )"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog FEATURES NEWS README TODO"

 pkg_setup() {
-	if use python; then
-		python_pkg_setup
-	fi
-	DOCS="AUTHORS ChangeLog FEATURES NEWS README TODO"
+	use python && python_pkg_setup
 }

 src_prepare() {
-	epatch "${FILESDIR}"/libxslt.m4-${P}.patch \
-		"${FILESDIR}"/${PN}-1.1.23-parallel-install.patch \
-		"${FILESDIR}"/${P}-undefined.patch \
-		"${FILESDIR}"/${P}-disable_static_modules.patch
+	# https://bugzilla.gnome.org/show_bug.cgi?id=684621
+	epatch "${FILESDIR}"/${PN}.m4-${PN}-1.1.26.patch

-	# Python bindings are built/tested/installed manually.
-	sed -e "s/@PYTHON_SUBDIR@//" -i Makefile.am || die "sed failed"
+	epatch "${FILESDIR}"/${PN}-1.1.26-disable_static_modules.patch

-	# Fix generate-id() to not expose object addresses, bug #358615
-	epatch "${FILESDIR}/${P}-id-generation.patch"
+	# Use python-config, not python2.7-config
+	epatch "${FILESDIR}"/${PN}-1.1.27-python-config.patch

-	# Fix off-by-one in xsltCompilePatternInternal, bug #402861
-	epatch "${FILESDIR}/${P}-pattern-out-of-bounds-read.patch"
+	# Python bindings are built/tested/installed manually.
+	sed -i -e 's/$(PYTHON_SUBDIR)//' Makefile.am || die

 	eautoreconf
 	epunt_cxx
@ -51,19 +48,17 @@ src_prepare() {
 src_configure() {
 	# libgcrypt is missing pkg-config file, so fixing cross-compile
 	# here. see bug 267503.
-	if tc-is-cross-compiler; then
-		export LIBGCRYPT_CONFIG="${SYSROOT}/usr/bin/libgcrypt-config"
-	fi
+	tc-is-cross-compiler && \
+		export LIBGCRYPT_CONFIG="${SYSROOT}"/usr/bin/libgcrypt-config

 	econf \
-		--disable-dependency-tracking \
+		$(use_enable static-libs static) \
 		--with-html-dir=/usr/share/doc/${PF} \
 		--with-html-subdir=html \
 		$(use_with crypt crypto) \
 		$(use_with python) \
 		$(use_with debug) \
-		$(use_with debug mem-debug) \
-		$(use_enable static-libs static)
+		$(use_with debug mem-debug)
 }

 src_compile() {
@ -103,25 +98,17 @@ src_install() {
 		python_execute_function -s --source-dir python installation

 		python_clean_installation_image
-	fi
-
-	mv -vf "${ED}"/usr/share/doc/${PN}-python-${PV} \
-		"${ED}"/usr/share/doc/${PF}/python

-	if ! use static-libs; then
-		# Remove useless .la files
-		find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
+		mv "${ED}"/usr/share/doc/${PN}-python-${PV} "${ED}"/usr/share/doc/${PF}/python
 	fi
+
+	prune_libtool_files
 }

 pkg_postinst() {
-	if use python; then
-		python_mod_optimize libxslt.py
-	fi
+	use python && python_mod_optimize ${PN}.py
 }

 pkg_postrm() {
-	if use python; then
-		python_mod_cleanup libxslt.py
-	fi
+	use python && python_mod_cleanup ${PN}.py
 }
--- a/dev-libs/nspr/nspr-4.9.2.ebuild
+++ b/dev-libs/nspr/nspr-4.9.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.2.ebuild,v 1.7 2012/11/25 19:07:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.2.ebuild,v 1.8 2012/11/29 23:40:13 blueness Exp $

 EAPI=3
 WANT_AUTOCONF="2.1"
@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar

 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug"

 src_prepare() {
--- a/dev-libs/nss/nss-3.14.ebuild
+++ b/dev-libs/nss/nss-3.14.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.14.ebuild,v 1.6 2012/11/25 19:09:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.14.ebuild,v 1.8 2012/11/29 23:41:51 blueness Exp $

 EAPI=3
 inherit eutils flag-o-matic multilib toolchain-funcs
@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}

 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="utils"

 DEPEND="virtual/pkgconfig
--- a/dev-libs/openct/openct-0.6.20-r3.ebuild
+++ b/dev-libs/openct/openct-0.6.20-r3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openct/openct-0.6.20-r3.ebuild,v 1.1 2012/11/28 22:39:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openct/openct-0.6.20-r3.ebuild,v 1.3 2012/11/29 16:24:23 jer Exp $

 EAPI=5

@ -10,7 +10,7 @@ DESCRIPTION="library for accessing smart card terminals"
 HOMEPAGE="http://www.opensc-project.org/openct/"

 SRC_URI="http://www.opensc-project.org/files/${PN}/${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"

 LICENSE="LGPL-2.1"
 SLOT="0"
--- a/dev-lua/lgi/lgi-0.6.2.ebuild
+++ b/dev-lua/lgi/lgi-0.6.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lua/lgi/lgi-0.6.2.ebuild,v 1.1 2012/11/27 20:20:48 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/lgi/lgi-0.6.2.ebuild,v 1.2 2012/11/29 16:29:47 mr_bones_ Exp $

 EAPI=4

@ -36,4 +36,3 @@ src_install() {
 	dohtml -r docs/*
 	dodoc README.md
 }
-
--- a/dev-perl/Math-Calc-Units/Math-Calc-Units-1.70.0.ebuild
+++ b/dev-perl/Math-Calc-Units/Math-Calc-Units-1.70.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Math-Calc-Units/Math-Calc-Units-1.70.0.ebuild,v 1.3 2012/11/25 13:09:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Math-Calc-Units/Math-Calc-Units-1.70.0.ebuild,v 1.4 2012/11/29 15:43:55 jer Exp $

 EAPI=4

@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Human-readable unit-aware calculator"

 SLOT="0"
-KEYWORDS="amd64 ~hppa ~x86"
+KEYWORDS="amd64 hppa ~x86"
 IUSE=""

 DEPEND="virtual/perl-Time-Local"
--- a/dev-perl/Nagios-Plugin/Nagios-Plugin-0.360.0.ebuild
+++ b/dev-perl/Nagios-Plugin/Nagios-Plugin-0.360.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Nagios-Plugin/Nagios-Plugin-0.360.0.ebuild,v 1.2 2012/11/25 13:09:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Nagios-Plugin/Nagios-Plugin-0.360.0.ebuild,v 1.3 2012/11/29 15:44:17 jer Exp $

 EAPI=4

@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A family of perl modules to streamline writing Nagios plugins"

 SLOT="0"
-KEYWORDS="amd64 ~hppa ~x86"
+KEYWORDS="amd64 hppa ~x86"
 IUSE=""

 DEPEND="dev-perl/Class-Accessor
--- a/dev-python/argh/Manifest
+++ b/dev-python/argh/Manifest
@ -1,2 +1,3 @@
 DIST argh-0.15.1.tar.gz 14878 SHA256 8cca1201af8c15b7e77577ecddbca7cc867f943cb0bd2fb5c38461662b1aa80b SHA512 a1f64d9fd72e5e501e6dedf22e07a15d6a9abd392c6a3153c7a420ab13227af340b8a121069c7e33863c59dd61d19d65d3fe7d48ebcb5d429e2057626905a9c6 WHIRLPOOL 49913581270f2dcbf0cb8757edcafbe324ac0b1b8184466e20aaeb7e45ca3001f765be1e4f91a370f6801a165a70e1c0c11dfdbf21e2108eeea22508a19015f1
 DIST argh-0.16.0.tar.gz 15441 SHA256 97588a444b2a44a48e6d37b98850bb1a86f9597d2a355f4bd4b89e6107f4b43f SHA512 82444d5823be14ec1219d801fbe9e49276a09bf15dd9b20e2eccb50defe1eef1e540ed97e26c5ecc091e30675a71742eb30a106677de5502861e8d50b1adb953 WHIRLPOOL cd6b8a81067d5f5d52ad3fd46a0d08426440a32d9a7b2d676a11c89edb1edddf3cee490f246c40a0efc8b5e06cc1a92227e76f3f5d936e4e987cd8106071a207
+DIST argh-0.17.2.tar.gz 15750 SHA256 bcc8f0b7b2173abaa8558746a71910de2c718ef758f7f17742e884482ad436cf SHA512 63be5493f819399cfeb09755cf590d254d888b4b646aaa21b2ae247bf028e9f1feea30ecc61316d421706cdca9a68ae7e0fb283bc90504ed3dd621abaf50ee6a WHIRLPOOL da7f189c679aa68c7184ccadcca7f148e4a810ecd25208340bb6b9f20fc905c0be2354714a2284fe477d75145b30b3cfa293432a4d5a1554d68f6455bf5c35a5
--- a/dev-python/argh/argh-0.17.2.ebuild
+++ b/dev-python/argh/argh-0.17.2.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/argh/argh-0.17.2.ebuild,v 1.1 2012/11/29 08:43:32 patrick Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.6"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.5 2.5-jython"
+PYTHON_MODNAME="argh"
+
+inherit distutils
+
+DESCRIPTION="A simple argparse wrapper."
+HOMEPAGE="http://packages.python.org/argh/"
+SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LICENSE="LGPL-3"
+
+RDEPEND=""
+DEPEND=""
--- a/dev-python/autopep8/Manifest
+++ b/dev-python/autopep8/Manifest
@ -1,4 +1,5 @@
 DIST autopep8-0.5.2.tar.gz 10049 SHA256 a9a808bac49605036bdeaa4bf5b50a9bbf87088a54b9a2e54e18c85abcecb70f SHA512 9d27a9b2c7cf90a7ea420732ac13675c6bc93435d9d9dc4e437e3e2e121d4b2931b995da77d751e2dbcf4c2c5379fda6c4c3c0f6cc222b461d4daa95e9ec2564 WHIRLPOOL 5b4f6ca08695da516f6579399de1decb3a1be6b2520a636812f1b68cb6ee7e05cb546fe7537513deb3f9a3f914808ffeaa956d1daa2c4e0bcf14f22071e9e7c8
 DIST autopep8-0.8.1.tar.gz 30427 SHA256 9ab32bd3fdb68045ba9dbac5a9be46ee17a4fc0c19fce567175f3ad1263c934b SHA512 33db363e813e9a123c049f88628faa159fd31523dcd88f98c71e756c4b409a52aedfe0d74324e28868aa712984827e4e543a5355047a3c4f3490b67182902855 WHIRLPOOL 4db9c32c1b067b7685abdf23d1b39f255a4cb2c9fc17e1c6fc16a809fc9e731e0496c422469984c54d18d4901be25a739a8591530f738a98e7efb653c92063f9
 DIST autopep8-0.8.2.tar.gz 41880 SHA256 0d96ffb6f74e92673a30d8530fc0e78d8061fdd079ab7ac0278692dbec6074ce SHA512 9afb3392cfd97f9676f2b2ff568d1ac062139480027232c47e2cdbe6e9a6c7659b24ac3fc5b151f1fc6ccf7749c269e4e8e27b4d8d9a1fa1c1df10f4d545eb20 WHIRLPOOL 8e916ad10462c591fb34d3e411cbc2774d3187d763ccaca6e21c35d93bd2a4ee1da66ee17c59af3e211fa9c517d04f5cb8049b0db3f524f6332870ed165dac27
+DIST autopep8-0.8.3.tar.gz 44951 SHA256 c62611db6bb343ccb42d61bc02b6dfc446796cf80a1fd621b4d7628926309546 SHA512 0f33ae853b3c530f8e49e06203c1e9d71f127b4fedf85b3a90eda374de0d041af81332cd950d087a1013b8dc65fa6cc405924fd5f48003a3b30b87c8488ccb90 WHIRLPOOL c7276549c42bab428b97da7ba9cf90d34eda453a31b75cce9589816fb191fab580cf9557dc1210b6c05fe08c652b4862bd2a43fddb9e49aa79c1019ad4af0bdd
 DIST autopep8-0.8.tar.gz 29999 SHA256 145786841d9028f21f9d38654d58c30fc84ff2b67199a125e81586063ff23d5a SHA512 efd3da07f3ed352bba0429376efdf11f0bdc817ec43ac6257ae1cd6860c8f89a272c1d830ed4edfa26e6231b08d6eed7b2bb708e7fe9ec18195b5cdaca3d9f8f WHIRLPOOL 3beff5f2912f9b236a17cb4f3f8f0f5583b7ca9dcbd5a1307350605f4245525cacd17d17f57662f203da4508b2f1eacca82d177224f115b3d012ed2688f47675
--- a/dev-python/autopep8/autopep8-0.8.3.ebuild
+++ b/dev-python/autopep8/autopep8-0.8.3.ebuild
@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/autopep8/autopep8-0.8.3.ebuild,v 1.1 2012/11/29 09:37:50 patrick Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="*:2.6"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.5"
+
+inherit distutils vcs-snapshot
+
+DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
+HOMEPAGE="https://github.com/hhatto/autopep8 http://pypi.python.org/pypi/autopep8"
+SRC_URI="https://github.com/hhatto/${PN}/tarball/ver${PV} -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=dev-python/pep8-1.3.2
+	dev-python/setuptools"
+DEPEND="${RDEPEND}"
+
+PYTHON_MODNAME=${PN}.py
+
+src_test() {
+	testing() {
+		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" test/test_${PN}.py
+	}
+	python_execute_function testing
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+	ewarn "Since this version of autopep depends on >=dev-python/pep8-1.3"
+	ewarn "it is affected by https://github.com/jcrocholl/pep8/issues/45"
+	ewarn "(indentation checks inside triple-quotes)."
+	ewarn "If you do not want to be affected by this, then add the"
+	ewarn "following lines to your local package.mask:"
+	ewarn "  >=dev-python/pep8-1.3"
+	ewarn "  >=dev-python/autopep8-0.6"
+}
--- a/dev-python/chameleon/Manifest
+++ b/dev-python/chameleon/Manifest
@ -1,3 +1,4 @@
 DIST Chameleon-2.10.tar.gz 156547 SHA256 3a9ea188a0acfab469152834fe909ef8691f2fe65950cd6d3c8d09be31f8b44d SHA512 9233041b602ed03cc579a87c1f8e0ffe297e27b8c4c7915b056eed97806f11f647137c0ee0e3979a9e8b2e21de25a637da5e72639dff03537507bf0f7a1f712c WHIRLPOOL 0ad0a03fbdb17f6dfc9ee89c12de4d99b51f97e3c0c29030fe95825a97d23442a6624b462de4b505726bec0fc5a63ca1ff097784b6903fc3fe9b39117077c35b
+DIST Chameleon-2.11.tar.gz 157097 SHA256 4bebbc129c84344fff58ad032130ab85f1891b1f06f6da0b6623aab527f34bb8 SHA512 3c30af9e79fa2101fa5a4504a0b793a834169d3a4b90b7199754129ca0ae02faae6ec2cb77ef9e48f03a1d9ec4a3936e2385c06ff8e7ab098aeaa678833f7a26 WHIRLPOOL 29794244d3fb07aa2b98e1109c6e7d3e379c5f73e430f488beeef2af9a79d79ee8e1138210f6321d77bd6cbb850d8ac58816319153e9cc7627f8bf1fa6e069ea
 DIST Chameleon-2.8.3.tar.gz 148662 SHA256 273811890999a5fee966298192311cc57f15b594d0fe370009df5d48d3e56a2b SHA512 627470f93c7be844f4dacebf2213cb27c9d5deba1dd49cc244b4df6c0118d2604b395f1b040352de90169841cff862c22b4ae31dd835537906e4a30ad4543b09 WHIRLPOOL 875267f4763e3cdfdb79a11fb045591d88e0453af944ce6b48a9c7573a9697d1b5bf22440612bc93475dc5e0f7ee4f29fa674defa99ead0abb04ffff2db4e7bb
 DIST Chameleon-2.9.2.tar.gz 151036 SHA256 92ff7b6bef0655033005257200d05dfa35a124c5b0b8e0a1ddde339d84668be0 SHA512 120486f72cf3b363fe7fdacd059e969604bb7fe6854ad786aa67afcc5934e86f7fb02259fa4af39f35f305f2259fe575361b9a92791bf2e6952954f0799d1ea8 WHIRLPOOL 891c9b1c64f502b92778e93eb68c7a009b2709aba3e2a00cf52f02b39f99bb4c58c51f27d7f9b538303f1fc19944de591309821a485756c32db67c48ee08a6be
--- a/dev-python/chameleon/chameleon-2.11.ebuild
+++ b/dev-python/chameleon/chameleon-2.11.ebuild
@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/chameleon/chameleon-2.11.ebuild,v 1.1 2012/11/29 08:40:57 patrick Exp $
+
+EAPI=3
+
+SUPPORT_PYTHON_ABIS=1
+DISTUTILS_SRC_TEST="setup.py"
+
+inherit distutils
+
+MY_PN="Chameleon"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Fast HTML/XML template compiler for Python"
+HOMEPAGE="http://chameleon.repoze.org http://pypi.python.org/pypi/Chameleon"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="dev-python/setuptools
+	doc? ( dev-python/sphinx )"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	distutils_src_compile
+
+	if use doc ; then
+		emake html || die "make html failed"
+	fi
+}
+
+src_install() {
+	distutils_src_install
+
+	delete_tests_and_incompatible_modules() {
+		rm -fr "${ED}$(python_get_sitedir)/chameleon/tests"
+
+		if [[ "$(python_get_version -l --major)" == "3" ]]; then
+			rm -f "${ED}$(python_get_sitedir)/chameleon/"{benchmark.py,py25.py}
+		fi
+
+		if [[ $(python_get_version -l) == "2.5" ]]; then
+			echo "raise SyntaxError" > \
+				"${ED}$(python_get_sitedir -b)/chameleon/py26.py"
+		fi
+	}
+	python_execute_function -q delete_tests_and_incompatible_modules
+
+	if use doc; then
+		pushd _build/html > /dev/null
+		insinto /usr/share/doc/${PF}/html
+		doins -r [a-z]* _static
+		popd > /dev/null
+	fi
+}
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@ -2,3 +2,4 @@ DIST Cython-0.14.1.tar.gz 1315824 SHA256 89e3f64ea0f97cd29b28d0831a7022dc1f8cf4f
 DIST Cython-0.15.1.tar.gz 1796536 SHA256 248123f2f02f2701a28d9452132ac835533b396a273cda9d361cb65c26067edc SHA512 8da1b0af98203254a1cf776d73d09433f15b5090871f9fd6d712cea32bcd44446b7323ae1069b28907d2728e77944a642825c61bc3b54ceb46c91897cc4f6051 WHIRLPOOL 9c0f5bec9f8c9e9789d581b15c6940b0555e454d42dca06b4161bce5789a7d9907d6fea1a3c36b8235699a58de984f0c328701dde60e7b9282b7e632f55a96d9
 DIST Cython-0.16.tar.gz 1240372 SHA256 971651fc5d3c943b0ecf7bc4df86a977bf62623d94542bf2aaa5f7223697e6fb SHA512 2c1933ab31246b4f4eba049d3288156e0a72f1730604e3ed7357849967cdd329e4647cf236c9442ecfb06d0aff03e6fc892a7ba2a5c1cf5c011b7ab9c619acec WHIRLPOOL 3d16dfd2b885e44270c0592b9cec7e43d1cf5ccfe1ecc59881042d21be4ba0d8d8eee729ce6f20b8a00db69f51d7278b99545b1cb6195157683c00d5a833d5ae
 DIST Cython-0.17.1.tar.gz 1283146 SHA256 0d631b67d73aece33eb98c70257adf946e1e5b31633d701c3fcac2dcf42f0e84 SHA512 eda1b8090e5e21e7e039ef4dd03de186a7b416df9d5a4e4422abeeb4d51383b9a6858e1ac4902d8e5010f661b295bbb2452c43c8738be668379b4eb4835d0f61 WHIRLPOOL d40628c9344adf389ce8493abedb767b4b083c3f6f03c7ec87d782caba4abb346f587dd770b2ee72521e3fda6b87f3cbaeed063f97d3eb45b06a52bfc559772d
+DIST Cython-0.17.2.tar.gz 1288282 SHA256 ea1a3147d4d952e793a1043d8802ea67747892fefe7fb7e5c0cfb8bf51883be6 SHA512 03b4d03ff848b660b9a0e0c39bb48173945c013b7bfc8b32638633d7bbeaaae6ac1cb2c26ddd6ae3f15303cae8c49b611501cc7dbc23def193b4dfada7efd4fa WHIRLPOOL 72bf126a1088dd73c85a964f329ab6874944cba5f6be9a096740d7197f1ddc9fa89a64b1beab816afef0d3203161e7766eeaadcde9a97133cd9e79a848470cf8
--- a/dev-python/cython/cython-0.17.2.ebuild
+++ b/dev-python/cython/cython-0.17.2.ebuild
@ -0,0 +1,53 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/cython-0.17.2.ebuild,v 1.1 2012/11/29 08:30:11 patrick Exp $
+
+EAPI="3"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
+
+inherit distutils
+
+MY_PN="Cython"
+MY_P="${MY_PN}-${PV/_/}"
+
+DESCRIPTION="Compiler for writing C extensions for the Python language"
+HOMEPAGE="http://www.cython.org/ http://pypi.python.org/pypi/Cython"
+SRC_URI="http://www.cython.org/release/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="doc examples numpy"
+
+DEPEND="numpy? ( >=dev-python/numpy-1.6.1-r1 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV%_*}"
+
+PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+
+DOCS="README.txt ToDo.txt USAGE.txt"
+PYTHON_MODNAME="Cython cython.py pyximport"
+
+src_test() {
+	testing() {
+		"$(PYTHON)" runtests.py -vv --work-dir tests-${PYTHON_ABI}
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+	python_generate_wrapper_scripts -E -f -q "${ED}usr/bin/cython"
+
+	if use doc; then
+		# "-A c" is for ignoring of "Doc/primes.c".
+		dohtml -A c -r Doc/* || die "Installation of documentation failed"
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r Demos/* || die "Installation of examples failed"
+	fi
+}
--- a/dev-python/enable/Manifest
+++ b/dev-python/enable/Manifest
@ -1,5 +1,6 @@
 DIST Enable-3.4.0.tar.gz 2703753 SHA256 f536541227f3aa7f2d74e24228f9e25a4aed910d10811205c106555b7ee0341c SHA512 9b753caa1aaea3e6b3d434a2b21b4d3ee1e053cd2132e7ddd0fde2c5dd8b33a14fa7eb1a515510d0186fb133d4c35e2a9dde19268cc6ebb08b458a357f9dfdfd WHIRLPOOL 419d3b691caaeb904ec726e009a0a6367c2ac55f8c6db5e0de71df89fd6e4c535e371528d0a108edbfb1dd2b3af6dc73eba32a80e3fc28240fc7ee2bc48c37f2
 DIST Enable-3.4.1.tar.gz 2726048 SHA256 0b17c7764bb8e31b0d0c5ba439b6cf9e43810688e869afff826889e0ae3b8b8c SHA512 8635912bb8ea91aeb441b235aa8be773bfaf5f56924dd5eb4996304e8d51fe898ef6d37b207b36ba755bcafcc66201558ffad033c9ae7e57bec98f570748a6ce WHIRLPOOL ea42c0f59ccc30657984da28d2a5600bfcb801a1a29dfb6728823580310a8058fecef1908a315efb2a4668487dcfe04f483af22f1cbf338719f27c063d80881a
+DIST enable-4-TestsPaths.patch 20524 SHA256 481643dd38d5b20efcfbf6bc5256f00c45a3adcb3b73ee9b492d2cc97c140a67 SHA512 c49b9c3fce8b2ea601407f9698e2a12f4b3eeac4d6f6dc4da77fccb75d99d8668008d688c8e5a268da96c7b8cc522892c794aae6fa97e3878b9439b6ea832942 WHIRLPOOL df0f5448d4458cd9b0f94478973ac24fa001ecf65b0852a66188701d0c32509075998211b80734ec3312bde92cba7b5489a78f328a56d34502ff1927df4db1ca
 DIST enable-4.0.0.tar.gz 2471266 SHA256 c3ec3043fd2ac5837de2575efec985a6fc0ae597aa70d96f6734c78ce3cde01a SHA512 2101f1b7b6cce840815224d1fcbc80b72f41df5fea26617f4889c3d32787e8df06cad6948ade3c1a3ddedf1811f2708e3a2c36cf4c8b42611a8cc27481e40ffd WHIRLPOOL 94c4cbd0a2d7ded06a2c7f430de2f60138c88f86dbafc69fe4c8d154652d9fb704a3499b377c8df23febf9791988eacb6d1bbb3913de230f794af34826c4577c
 DIST enable-4.1.0.tar.gz 2472676 SHA256 b0de7a3eda78c5c527d58a98627c8cabadc71c7f1ee4e360fa3a6d8b087da264 SHA512 b21b267f207ab8770e96044f10610c1557b3ce7a4e8b688889684a371dd98ac70a03177e53bebbfad1da5f6416f3c08b33d96c49494fc625a48c9d2080076582 WHIRLPOOL 9af634d0534b3e2a659f74c4f62a0d65a972b7ee773d38d9cb3c0d31deb31a579d3367a64c767b001630dc04d565302afe3395c5b019434235aba98a2b330881
 DIST enable-4.2.0.tar.gz 2477946 SHA256 48c510bb833cbc9142babcb1914feac2cf64d5133a8ba7cdcdf0d1d782fafbd7 SHA512 10e401dbd96dbceee9ff3c83a3186845255d319d1750d310fb1601499603bb2fed460834ad10877e7bc343e60ddb08419d9192d0b9a9734ac4a3dc01332c78d1 WHIRLPOOL 8865dfd84b7237fb6df9664b6e5167de47fd915bbf58a8c8f352469d6055aa2fc43f7bee4f05392baab6ecf58900d311d2f5ae29418f6b186d35d10d49b4a872
--- a/dev-python/enable/enable-4.1.0.ebuild
+++ b/dev-python/enable/enable-4.1.0.ebuild
@ -1,18 +1,20 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/enable/enable-4.1.0.ebuild,v 1.3 2012/08/07 04:03:10 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/enable/enable-4.1.0.ebuild,v 1.5 2012/11/29 16:30:12 mr_bones_ Exp $

 EAPI=4
-
+PYTHON_DEPEND="2:2.6"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-* 2.5"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
+PYTHON_TESTS_RESTRICTED_ABIS="2.6"
 DISTUTILS_SRC_TEST="nosetests"

 inherit distutils eutils virtualx

 DESCRIPTION="Enthought Tool Suite: Drawing and interaction packages"
 HOMEPAGE="http://code.enthought.com/projects/enable/ http://pypi.python.org/pypi/enable"
-SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
+SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz
+	http://dev.gentoo.org/~idella4/${PN}-4-TestsPaths.patch"

 LICENSE="BSD"
 SLOT="0"
@ -37,13 +39,23 @@ DEPEND="dev-python/setuptools

 DOCS="docs/*.txt"

+src_prepare() {
+	distutils_src_prepare
+
+	# Remove check for Darwin systems, set py.test style xfails,
+	# Re-set import paths in tests, 'enabling' enable to find its own in source modules!!?!
+	epatch "${DISTDIR}"/${PN}-4-TestsPaths.patch \
+		"${FILESDIR}"/${PN}-4-rogue-tests.patch
+}
+
 src_compile() {
 	distutils_src_compile
 	use doc && emake -C docs html
 }

 src_test() {
-	VIRTUALX_COMMAND="distutils_src_test" virtualmake
+	# Hardcoding build-2.7, 2.7 being the only fully capable candidate
+	VIRTUALX_COMMAND="python_execute_nosetests -P $(ls -d build-2.7/lib.linux-*/):." virtualmake
 }

 src_install() {
--- a/dev-python/enable/enable-4.2.0.ebuild
+++ b/dev-python/enable/enable-4.2.0.ebuild
@ -1,18 +1,20 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/enable/enable-4.2.0.ebuild,v 1.1 2012/10/09 09:22:56 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/enable/enable-4.2.0.ebuild,v 1.3 2012/11/29 16:30:12 mr_bones_ Exp $

 EAPI=4
-
+PYTHON_DEPEND="2:2.6"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-* 2.5"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
+PYTHON_TESTS_RESTRICTED_ABIS="2.6"
 DISTUTILS_SRC_TEST="nosetests"

 inherit distutils eutils virtualx

 DESCRIPTION="Enthought Tool Suite: Drawing and interaction packages"
 HOMEPAGE="http://code.enthought.com/projects/enable/ http://pypi.python.org/pypi/enable"
-SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
+SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz
+	http://dev.gentoo.org/~idella4/${PN}-4-TestsPaths.patch"

 LICENSE="BSD"
 SLOT="0"
@ -37,13 +39,23 @@ DEPEND="dev-python/setuptools

 DOCS="docs/*.txt"

+src_prepare() {
+	distutils_src_prepare
+
+	# Remove check for Darwin systems, set py.test style xfails,
+	# Re-set import paths in tests, 'enabling' enable to find its own in source modules!!?!
+	epatch "${DISTDIR}"/${PN}-4-TestsPaths.patch \
+		"${FILESDIR}"/${PN}-4-rogue-tests.patch
+}
+
 src_compile() {
 	distutils_src_compile
 	use doc && emake -C docs html
 }

 src_test() {
-	VIRTUALX_COMMAND="distutils_src_test" virtualmake
+	# Hardcoding build-2.7, 2.7 being the only fully capable candidate
+	VIRTUALX_COMMAND="python_execute_nosetests -P $(ls -d build-2.7/lib.linux-*/):." virtualmake
 }

 src_install() {
--- a/dev-python/enable/files/enable-4-rogue-tests.patch
+++ b/dev-python/enable/files/enable-4-rogue-tests.patch
@ -0,0 +1,53 @@
+tests skipped that; access the network, are expected fails, target Darwin system. 
+diff -ur enable-4.2.0.orig/enable/savage/svg/tests/test_document.py enable-4.2.0/enable/savage/svg/tests/test_document.py
+--- enable/savage/svg/tests/test_document.py	2011-12-22 07:11:25.000000000 +0800
+++ enable/savage/svg/tests/test_document.py	2012-11-29 10:01:51.449181783 +0800
+@@ -61,6 +61,8 @@
+             self.document.getBrushFromState().color[-1],
+             0
+         )
+
+    @unittest.skip("This tests accesses the internet")
+     def testURLFallback(self):
+         self.document.state["fill"] = "url(http://google.com) red"
+         self.assertEqual(
+@@ -73,6 +75,7 @@
+     def testDefault(self):
+         got = document.valueToPixels("12")
+         self.assertEqual(got, 12)
+    @unittest.expectedFailure
+     def testPointConversion(self):
+         got = document.valueToPixels('14pt')
+         self.assertEqual(got, 22)
+diff -ur enable-4.2.0.orig/enable/tests/kiva_graphics_context_test_case.py enable-4.2.0/enable/tests/kiva_graphics_context_test_case.py
+--- enable/tests/kiva_graphics_context_test_case.py	2011-12-22 07:11:25.000000000 +0800
+++ enable/tests/kiva_graphics_context_test_case.py	2012-11-29 13:22:15.262079475 +0800
+@@ -7,7 +7,7 @@
+ 
+ class TestGCErrors(unittest.TestCase):
+     """Test some cases where a ValueError should be raised."""
+-
+    @unittest.expectedFailure	
+     def test_bad_image_size(self):
+         arr = np.array([[1, 2], [3, 4]], dtype=np.uint8)
+         gc = GraphicsContext((50, 50))
+diff -ur enable-4.2.0.orig/kiva/quartz/__init__.py enable-4.2.0/kiva/quartz/__init__.py
+--- kiva/quartz/__init__.py	2011-12-22 07:11:26.000000000 +0800
+++ kiva/quartz/__init__.py	2012-11-29 15:23:35.641412031 +0800
+@@ -2,10 +2,10 @@
+ # :Copyright: 2004, Enthought, Inc.
+ # :License:   BSD Style
+ 
+-from macport import get_macport as _get_macport
+#from macport import get_macport as _get_macport
+ 
+-def get_macport(dc):
+-    """
+-    Returns the m_macPort of a wxDC (or child class) instance.
+-    """
+-    return _get_macport(str(dc.this))
+#def get_macport(dc):
+    #"""
+    #Returns the m_macPort of a wxDC (or child class) instance.
+    #"""
+    #return _get_macport(str(dc.this))
--- a/dev-python/irc/Manifest
+++ b/dev-python/irc/Manifest
@ -1,2 +1,3 @@
 DIST irc-3.2.2.zip 84701 SHA256 b597ac3f0713386ba122f608a24e9f6fecd53ddac5ddb7889547ecab392ada1b SHA512 63a64626137617b14f401a6eb51a98b85db14db884faa9355b430df0f5fe8f9391139bb6e50fbbc985b5fd873844c8febe54685af679a847692175c366e8a6c7 WHIRLPOOL e6cc90191a242a2f1777b34550ffefafac0cb37890e593da29b61958a250eb93755e5d9301c6b5b727d42c0de74d2017884169024827cb3524f6ff21ecc3dcff
 DIST irc-3.4.2.zip 87053 SHA256 671e20e39a1684aeef5e006334dd4d3a5ed10fc1142bd9e91a50a861f51c2d75 SHA512 d48997f98deae30b554b29618155a827702a2e333d907483157c1d48894ab3beea999c2c7f89571552a1ff54e62964f80afbb7374e693fec4afa9faa1570ce2b WHIRLPOOL 751b31f213878505b9e104fdd2c984b2c8d7059c062a9b073f0b197db897021dada82010c1f7fcd49a8069dc641a04f95ce2a519fb2dfa0d050c16f4494c741f
+DIST irc-5.0.1.zip 88039 SHA256 c7262b21a4b6f713913aaddcd6e1c73920a07903feda9758065699d6d5fc3796 SHA512 3633d55908f5df5f296cdbc3a87d46139b0b69bae9dabd31acce6b1fc47bb8e0cd4464993e0df536957546b9c0562cff223b3a1d266c58ce6fe0009d0b15ae03 WHIRLPOOL 21c829651f299ba56ad133eca976c5e4b3b09cd865f0470290bafadfb39291171c864f13a2eab5c5953dffef0b258f960c42f8d03d90f267b943e30b5641de8d
--- a/dev-python/irc/irc-5.0.1.ebuild
+++ b/dev-python/irc/irc-5.0.1.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/irc/irc-5.0.1.ebuild,v 1.1 2012/11/29 07:32:03 patrick Exp $
+
+EAPI="4"
+PYTHON_DEPEND="*:2.6"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.5"
+
+inherit distutils eutils
+
+DESCRIPTION="IRC client framework written in Python."
+HOMEPAGE="https://bitbucket.org/jaraco/irc http://pypi.python.org/pypi/irc"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="app-arch/unzip
+	app-text/dos2unix"
+
+RDEPEND="!>=dev-python/python-irclib-3.2.2"
+
+src_prepare() {
+	# Prevent setup from downloading hgtools package
+	dos2unix setup.py || die "Oops :("
+	epatch "${FILESDIR}/irc-setup.py.3.4.2.patch"
+
+	# Don't rely on hgtools for version
+	sed -e "s/use_hg_version=True/version=\"${PV}\"/" -i setup.py || die
+	sed -e "/^tag_/d" -i setup.cfg || die
+
+	distutils_src_prepare
+}
+
+src_install() {
+	distutils_src_install
+
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		insinto "/usr/share/doc/${PF}/examples"
+		doins scripts/*
+	fi
+}
--- a/dev-python/joblib/joblib-0.6.5.ebuild
+++ b/dev-python/joblib/joblib-0.6.5.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/joblib/joblib-0.6.5.ebuild,v 1.1 2012/10/09 09:31:08 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/joblib/joblib-0.6.5.ebuild,v 1.2 2012/11/29 20:18:33 bicatali Exp $

 EAPI=4

@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""

 DEPEND="dev-python/setuptools"
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@ -1,2 +1,3 @@
+DIST kombu-2.4.10.tar.gz 291204 SHA256 211cb68b133578338aac0990d31d9255ed54b5f1861fb2cd54c1bb28bdbc8a6e SHA512 e2d10d2d3c13072b079e29f12094b9a88e55f58e1368da1ebc0eedface3c1e0bdd5d3d7ac00469027051b61c3285a30f7b6d47a0fe8345d8bf04cb2a7b1f8748 WHIRLPOOL 6e4324dbabc1a61c7f4596e6bd54d750fc6f39f28e364c13213f130149a070153bd36fd76e2fef3ceaea4ded4cd79b3cc1c3708a2da20be4c5f1d06a2fa3bc6c
 DIST kombu-2.4.8.tar.gz 290975 SHA256 c6613158dcb21d630300dbb53fb76dabdc28c21ba2b13386ce39fda136c5907e SHA512 cc340c14e7d081ebfb59c439db39b13aeceb62e803c8738072e4626ee8f23cf1ea73e012f25dd972b11a06520b86831261ace8ff878b0a1ee8e905e3f3f9f5a0 WHIRLPOOL c7a41aea5e99ed4a8f33fb620e8ff177b764484112b1c7ad980f7cb8bcc8bffe8c1a6df5ea7a904e7135e9c53e5ae3393b3591d0056bbf930c6b74e05fffa698
 DIST kombu-2.4.9.tar.gz 291187 SHA256 94ee2160adbc377fccfa9dc156056103ba566536b831e75c9569815b9f4a9598 SHA512 695aa7750542136227f00e39713de24397ad58279c510afd49070ae1f3d1fec470a64abe8bf67be75800c70ba03adeb40c6cf1f9e412434e4d039eb51acb3e6f WHIRLPOOL a66e5638fcd9404fbe95f282b68ada58e19b509f0240592b10ffcea369839dd4417bd7be3297a94174119c7758c93317f60c7f0c054fc80f376170dac1c8fae3
--- a/dev-python/kombu/kombu-2.4.10.ebuild
+++ b/dev-python/kombu/kombu-2.4.10.ebuild
@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-2.4.10.ebuild,v 1.1 2012/11/29 07:28:36 patrick Exp $
+
+EAPI="4"
+
+PYTHON_TESTS_RESTRICTED_ABIS="3.* 2.7-pypy-*"
+PYTHON_DEPEND="*:2.7"
+RESTRICT_PYTHON_ABIS="2.[4-6]"
+SUPPORT_PYTHON_ABIS="1"
+DISTUTILS_SRC_TEST="nosetests"
+
+inherit distutils
+
+DESCRIPTION="AMQP Messaging Framework for Python"
+HOMEPAGE="http://pypi.python.org/pypi/kombu https://github.com/celery/kombu"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND=">=dev-python/anyjson-0.3.3
+	>=dev-python/amqplib-1.0.2"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose-cover3
+	dev-python/mock
+	>=dev-python/unittest2-0.5.0
+	dev-python/simplejson
+	dev-python/anyjson
+	dev-python/redis-py
+	dev-python/pymongo
+	dev-python/msgpack )
+	doc? ( dev-python/sphinx
+	dev-python/beanstalkc
+	dev-python/couchdb-python )
+	dev-python/setuptools"
+
+src_compile() {
+	distutils_src_compile
+	use doc && emake -C docs html
+}
+
+src_test() {
+	testing() {
+		nosetests --py3where build-${PYTHON_ABI}/lib/${PN}/tests
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+	if use examples; then
+		docompress -x usr/share/doc/${P}/examples/
+		insinto usr/share/doc/${P}/
+		doins -r examples/
+	fi
+	use doc && dohtml -r docs/.build/html/
+}
--- a/dev-python/libcloud/Manifest
+++ b/dev-python/libcloud/Manifest
@ -1,2 +1,3 @@
 DIST apache-libcloud-0.11.1.tar.bz2 312092 SHA256 3f97d61a823df3bfa1d1c26be1cb6b302f5c73a19d7aa7674943f4c9b15d972f SHA512 2d89b00752c1f83093f24198d6b1b7e0068b5a2a8ff8cf139da43f7add6b0e7fd1a36982058dae2518c27d3920729ccee60b1f017b1fc018d754a370687737bb WHIRLPOOL 58334513442902c0a3f777094932468adeb46853b867432fba33f81add50a842b6d1451d10fce3cdd4b2a396f9459b4a4de18f6710dcc05aa75acf7080549de9
 DIST apache-libcloud-0.11.3.tar.bz2 320092 SHA256 a37cc4f36730915078b06fb6d6ad45aaab5458b0c7df2a7d7e380b848f2b0933 SHA512 36b5aea4e8b13bc4214c27af3eb4591ca5de6286b49de8fe2518c4b390ba3c2fbdbc9c9efb97a5aba1dfd83de8a4e8c440c2db896e9c261943b65823fbbe9cb2 WHIRLPOOL 272f20a3638cc0053a784f9598ddd2967167cf3065a4146e8d428eb43de326032ce9820c7f262bd63fdd4ea7ee3387b800faf23a9abc484221fe4a2e06130a36
+DIST apache-libcloud-0.11.4.tar.bz2 319227 SHA256 5987f20c256608ee757b1a097b6392afbd18058cfc21ce761c078b44da95c532 SHA512 b761e6b1d29f60c382602b552c48268f1cf0a27e2a51bdf6603179f085a160b10c51eaa2d089bc868ae2147dc246ada43d0142edf03a786de20ef3468e23db1e WHIRLPOOL 3cd5984d0c83c79c540951f7b5653093a292e26c03ce0a436c9b55207432957bae64753d3e71d398a7fe313389853d945ea807cd0525827e7a08ce3e530e8e50
--- a/dev-python/libcloud/libcloud-0.11.4.ebuild
+++ b/dev-python/libcloud/libcloud-0.11.4.ebuild
@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/libcloud/libcloud-0.11.4.ebuild,v 1.1 2012/11/29 06:56:59 patrick Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="2:2.6 3"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.[45] *-jython"
+DISTUTILS_SRC_TEST="setup.py"
+PYTHON_TESTS_RESTRICTED_ABIS="3.*"
+PYTHON_USE_WITH="ssl"
+
+inherit distutils
+
+DESCRIPTION="Unified Interface to the Cloud - python support libs"
+HOMEPAGE="http://libcloud.apache.org/index.html"
+SRC_URI="mirror://apache/${PN}/apache-${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+
+RDEPEND=""
+DEPEND="test? ( dev-python/mock )"
+
+S="${WORKDIR}/apache-${P}"
+
+src_test() {
+	cp libcloud/test/secrets.py-dist libcloud/test/secrets.py || die
+	distutils_src_test
+}
+
+src_install() {
+	distutils_src_install
+	if use examples ; then
+		docinto examples/
+		dodoc "${S}"/example_*.py || die
+	fi
+}
--- a/Show More
+++ b/Show More