Sync with portage [Thu Jun 12 17:57:42 MSK 2014].

10 years ago · 035812ac76
parent e687abd16c
commit 035812ac76
6781 changed files with 10940 additions and 9478 deletions
--- a/app-accessibility/espeak/Manifest
+++ b/app-accessibility/espeak/Manifest
@ -1 +1,2 @@
 DIST espeak-1.47.11-source.zip 2813649 SHA256 9bd4d0569af48a2cb13fa76704dec3124d27025a3f21c87598457976472b360c SHA512 77c3989fbd0e4aadae0da2d7f1c587854895ae103633704ee5b4042b0618897d01edffa80b1f13e6cbf356f2f31beaf4fdb7e90e4ab641d5286d559aaefe932b WHIRLPOOL c26f481d4c3c485ba0eb3fe7ae3bcf36e7001d49e0e27a6f0934fdb9c91cfef4974c1d34daebd0286694346a44c647cfb96769da54536e0b4380778af755673c
+DIST espeak-1.48.04-source.zip 3019245 SHA256 bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659 SHA512 f0759e6ace2604c8cbb19e8c3fd4b106edf4dcece247a6677f6b734af7746c35a367126edfbe585396c98f6c54f07e25d64bfab35e258e64f09bd2c0833247fa WHIRLPOOL 259fe408a2d3808f4b1ecec6850262f3b7c0e9a4511fa1bcca414da7d6608e2a0b847a3abb19687ea1cb4e21ca8334fdf0b66b6a78bd363882891b3ebdfb06fc
--- a/app-accessibility/espeak/espeak-1.48.04.ebuild
+++ b/app-accessibility/espeak/espeak-1.48.04.ebuild
@ -0,0 +1,98 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/espeak-1.48.04.ebuild,v 1.1 2014/06/12 09:35:23 teiresias Exp $
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+MY_P="${P}-source"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+DESCRIPTION="Speech synthesizer for English and other languages"
+HOMEPAGE="http://espeak.sourceforge.net/"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="portaudio pulseaudio"
+
+COMMON_DEPEND=" portaudio? ( >=media-libs/portaudio-19_pre20071207 )
+	pulseaudio? ( media-sound/pulseaudio )"
+
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip"
+
+RDEPEND="${COMMON_DEPEND}
+	media-sound/sox"
+
+S=${WORKDIR}/${MY_P}/src
+
+get_audio() {
+	if use portaudio && use pulseaudio; then
+		echo runtime
+	elif use portaudio; then
+		echo portaudio
+	elif use pulseaudio; then
+		echo pulseaudio
+	else
+		echo none
+	fi
+}
+
+src_prepare() {
+	# gentoo uses portaudio 19.
+	mv -f portaudio19.h portaudio.h
+}
+
+src_compile() {
+	emake \
+		PREFIX="${EPREFIX}/usr" \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		CXX="$(tc-getCXX)" \
+		CXXFLAGS="${CXXFLAGS}" \
+		AR="$(tc-getAR)" \
+		AUDIO="$(get_audio)" \
+		all
+
+	einfo "Fixing byte order of phoneme data files"
+	pushd ../platforms/big_endian > /dev/null
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}"
+	./espeak-phoneme-data \
+		../../espeak-data \
+		. \
+		../../espeak-data/phondata-manifest
+	cp -f phondata phonindex phontab "../../espeak-data"
+}
+
+src_install() {
+	emake \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="\$(PREFIX)/$(get_libdir)" \
+		DESTDIR="${D}" \
+		AUDIO="$(get_audio)" \
+		install
+
+	cd ..
+	insinto /usr/share/espeak-data
+	doins -r dictsource
+	dodoc ChangeLog.txt ReadMe
+	dohtml -r docs/*
+}
+
+pkg_preinst() {
+	local voicedir="${ROOT}/usr/share/${PN}-data/voices/en"
+	if [ -d "${voicedir}" ]; then
+		rm -rf "${voicedir}"
+	fi
+}
+
+pkg_postinst() {
+	if ! use portaudio && ! use pulseaudio; then
+		ewarn "Since portaudio and pulseaudio are not in your use flags,"
+		ewarn "espeak will only be able to create wav files."
+		ewarn "If this is not what you want, please reemerge ${CATEGORY}/${PN}"
+		ewarn "with either portaudio or pulseaudio USE flag enabled."
+	fi
+}
--- a/app-accessibility/flite/flite-1.4-r4.ebuild
+++ b/app-accessibility/flite/flite-1.4-r4.ebuild
@ -0,0 +1,75 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/flite-1.4-r4.ebuild,v 1.1 2014/06/11 20:09:35 mgorny Exp $
+
+EAPI=5
+inherit autotools eutils multilib-minimal
+
+DESCRIPTION="Flite text to speech engine"
+HOMEPAGE="http://www.speech.cs.cmu.edu/flite/index.html"
+SRC_URI=" http://www.speech.cs.cmu.edu/${PN}/packed/${P}/${P}-release.tar.bz2"
+
+LICENSE="BSD freetts public-domain regexp-UofT BSD-2"
+SLOT="0"
+KEYWORDS=" ~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa oss static-libs"
+
+DEPEND="alsa? ( >=media-libs/alsa-lib-1.0.24.1[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P}-release
+
+get_audio() {
+	if use alsa; then
+		echo alsa
+	elif use oss; then
+		echo oss
+	else
+		echo none
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-tempfile.patch
+	epatch "${FILESDIR}"/${P}-fix-parallel-builds.patch
+	epatch "${FILESDIR}"/${P}-respect-destdir.patch
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+	epatch "${FILESDIR}"/${P}-audio-interface.patch
+	sed -i main/Makefile \
+		-e '/-rpath/s|$(LIBDIR)|$(INSTALLLIBDIR)|g' \
+		|| die
+	eautoreconf
+
+	# custom makefiles
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=()
+	if ! use static-libs; then
+		myconf+=( --enable-shared )
+	fi
+	myconf+=( --with-audio=$(get_audio) )
+
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+multilib_src_install_all() {
+	dodoc ACKNOWLEDGEMENTS README
+
+	if ! use static-libs; then
+		rm -rf "${D}"/usr/lib*/*.a
+	fi
+}
+
+pkg_postinst() {
+	if [[ "$(get_audio)" = "none" ]]; then
+		ewarn "you have built flite without audio support."
+		ewarn "If you want audio support, re-emerge"
+		ewarn "flite with alsa or oss in your use flags."
+	fi
+}
--- a/app-cdr/isomaster/isomaster-1.3.11.ebuild
+++ b/app-cdr/isomaster/isomaster-1.3.11.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/isomaster/isomaster-1.3.11.ebuild,v 1.2 2014/06/10 21:28:19 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/isomaster/isomaster-1.3.11.ebuild,v 1.3 2014/06/11 18:11:23 sping Exp $

 EAPI=4
 inherit eutils fdo-mime toolchain-funcs
@ -18,7 +18,7 @@ RDEPEND=">=dev-libs/iniparser-3.0.0
 	x11-libs/gtk+:2"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
+	nls? ( >=sys-devel/gettext-0.19.1 )"  # bug 512448

 pkg_setup() {
 	myisoconf=(
--- a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r6.ebuild
+++ b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r6.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r6.ebuild,v 1.1 2014/06/10 18:34:27 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r6.ebuild,v 1.2 2014/06/12 07:34:16 mgorny Exp $

 EAPI=5
 inherit emul-linux-x86
@ -66,7 +66,9 @@ RDEPEND="${RDEPEND}
 		>=media-libs/taglib-1.9.1-r1[abi_x86_32(-)]
 		>=media-libs/libofa-0.9.3-r1[abi_x86_32(-)]
 		>=virtual/ffmpeg-9-r1[abi_x86_32(-)]
-		>=media-libs/libpostproc-10.20140517-r1[abi_x86_32(-)]
+		|| (
+			>=media-video/ffmpeg-2.2.3-r1[abi_x86_32(-)]
+			>=media-libs/libpostproc-10.20140517-r1[abi_x86_32(-)] )
 		>=media-video/mjpegtools-2.1.0-r2[abi_x86_32(-)]
 		>=media-libs/gstreamer-0.10.36-r1:0.10[abi_x86_32(-)]
 		>=media-libs/gst-plugins-base-0.10.36-r1:0.10[abi_x86_32(-)]
--- a/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.64-wireless-sysfsattr.patch
+++ b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.64-wireless-sysfsattr.patch
@ -0,0 +1,41 @@
+commit b340a340256c8fc97ec35a1df9e67ab033765480
+Author: Alon Bar-Lev <alon.barlev@gmail.com>
+Date:   Sat May 24 12:59:21 2014 +0300
+
+    wireless: support both sysfs attr enable/enabled
+    
+    backport of commit 8e8a88373079dffdf7196e2e622c5ade209b4439
+    
+    Starting with linux kernel 3.13, the sysfs attribute 'enable' for pci
+    devices was renambed to 'enabled'.
+    
+    Support the two notations to allow seamless migration.
+    
+    Signed-off-by: Stefan Huber <shuber@sthu.org>
+
+diff --git a/usr/share/laptop-mode-tools/modules/wireless-ipw-power b/usr/share/laptop-mode-tools/modules/wireless-ipw-power
+index 3fd93ec..1579c1f 100755
+--- a/usr/share/laptop-mode-tools/modules/wireless-ipw-power
+++ b/usr/share/laptop-mode-tools/modules/wireless-ipw-power
+@@ -71,7 +71,7 @@ if [ x$CONTROL_IPW_POWER = x1 ] || [ x$ENABLE_AUTO_MODULES = x1 -a x$CONTROL_IPW
+ 				# the driver.
+ 				LINK_TARGET=`readlink $DEVICE/device/driver`
+ 				LINK_TARGET=${LINK_TARGET##*/}
+-                                ENABLED=`cat $DEVICE/device/enable`
+				ENABLED=`[ -r $DEVICE/device/enabled ] && cat $DEVICE/device/enabled || cat $DEVICE/device/enable`
+ 
+ 				if [ $ENABLED -eq 1 -a "$LINK_TARGET" = "$1" ]; then
+ 					# add the interface name to the list
+diff --git a/usr/share/laptop-mode-tools/modules/wireless-iwl-power b/usr/share/laptop-mode-tools/modules/wireless-iwl-power
+index ffdedec..ce82e1d 100755
+--- a/usr/share/laptop-mode-tools/modules/wireless-iwl-power
+++ b/usr/share/laptop-mode-tools/modules/wireless-iwl-power
+@@ -24,7 +24,7 @@ findWifiIfsByDriver () {
+ 			# the driver.
+ 			LINK_TARGET=`readlink $DEVICE/device/driver`
+ 			LINK_TARGET=${LINK_TARGET##*/}
+-			ENABLED=`cat $DEVICE/device/enable` 
+			ENABLED=`[ -r $DEVICE/device/enabled ] && cat $DEVICE/device/enabled || cat $DEVICE/device/enable`
+ 			
+ 			if [ $ENABLED -eq 1 -a "$LINK_TARGET" = "$1" ] ; then
+ 				# add the interface name to the list
--- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.64-r2.ebuild
+++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.64-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/laptop-mode-tools-1.64-r1.ebuild,v 1.3 2014/06/07 17:13:16 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/laptop-mode-tools-1.64-r2.ebuild,v 1.1 2014/06/11 22:29:13 alonbl Exp $

 EAPI=5
 inherit eutils multilib systemd udev
@ -31,6 +31,7 @@ S=${WORKDIR}/${MY_P}

 src_prepare() {
 	epatch "${FILESDIR}/${P}-ethernet-power.patch"
+	epatch "${FILESDIR}/${P}-wireless-sysfsattr.patch"

 	# This should avoid conflict with pm-powersave wrt #327443 and #396703
 	cat <<-EOF > "${T}"/${PN}
--- a/app-text/kpaste/Manifest
+++ b/app-text/kpaste/Manifest
@ -1 +1,2 @@
 DIST kpaste-0.1.tar.gz 21031 SHA256 17d6d928dac531a310591d329ebc9ab335dadeea2f02f457eb9e38946359ebed SHA512 92afd613e94d413107a812ddd51de0a2b4de8ef2b6339ff236c822f15e93c1132cc8dbcfe6697f0d5083f8c168dae56b817e281b65f6d6a74d5fabd1484a56d1 WHIRLPOOL 65e2e6342bb08366894145308fcda3e98a611e10852aadff942c2ca45b778d58152a0dedace7e954c3bc7e02b8d9cfc747fa3373ae74a7136f29c6ef79b5b9f1
+DIST kpaste-1.0.tar.bz2 19607 SHA256 3fda8aa0efa8231b81ab863f6884999d0c1fbbc729f64979fd49a48c1651e801 SHA512 ba1e2b10192e3f5a2f8fa11ca57ec274a6b277195ba8ec41c64ea0ea4552f477c785c7894ea653137094cf3a6d041f04260006326978993d00cab1edd6c93918 WHIRLPOOL 98fa7c4d9e2eb753f1d49bf9f62dca1f80a4042a84cc3795773133b109cce95c9abf42ae080d9d2fe66448ff02d833aa6d19770f770ece618269b30f19d9d861
--- a/app-text/kpaste/kpaste-1.0.ebuild
+++ b/app-text/kpaste/kpaste-1.0.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/kpaste/kpaste-1.0.ebuild,v 1.1 2014/06/12 11:23:48 kensington Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1
+
+DESCRIPTION="Command-line tool to paste to paste.kde.org"
+HOMEPAGE="http://projects.kde.org/projects/playground/utils/kpaste"
+SRC_URI="http://dev.gentoo.org/~kensington/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_compile() {
+	:
+}
+
+src_install() {
+	dobin kpaste
+	dodoc README
+
+	python_fix_shebang "${ED}"usr/bin/kpaste
+}
--- a/app-text/kpaste/metadata.xml
+++ b/app-text/kpaste/metadata.xml
@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>floppym@gentoo.org</email>
-		<name>Mike Gilbert</name>
-	</maintainer>
+	<herd>kde</herd>
 </pkgmetadata>
--- a/dev-lang/rubinius/Manifest
+++ b/dev-lang/rubinius/Manifest
@ -1,2 +1,3 @@
 DIST rubinius-1.2.4-20110705.tar.gz 9880126 SHA256 d474fb6f50292bff5211aaa80b1cead1fb3ed5c7c49223c51fddb8ffc5c3f23d SHA512 8211bfe88f7646dcf4fe696686cc3d0dd06ed02a11f261368c8431257061aed6f5d5bb87197fc9d0c71fca6f2b7671145984104d2e96cc5bf1a9651f1e6fb1c0 WHIRLPOOL 5cbcbc7975cd9032b750dc48b94b5377ff33d87bfb89175d783e899443ef33b6f9bcf476ff476e71e42ec046f492b046994e1c1137e758512e58b97af840c754
 DIST rubinius-2.2.7.tar.bz2 11409167 SHA256 e1244b60ed790a3a33a7126a587c35acd041dcb2022b894833518490e872dc3d SHA512 adc022d76958c8e62b849c5ab0c744d7ae8309264516a82156061f10010fff72d37d73928530faaf5dcc18c1771db78f785e52efd3a813b0d4bf577162c0aefb WHIRLPOOL 2a0894ce657b1911282dec14679a4a7b6197bc37a004adc34b86293d6e2c73c08870879a6ef0e69b3a66804535ce209b140c01e8769d5cc8e4c68d6263fcd9eb
+DIST rubinius-2.2.9.tar.bz2 11409258 SHA256 7b01a7f2508167e73b5273b4e55e6616fc7fd975e79c84c4d2e3ef83d849d2ce SHA512 d2e4c87ec53d3ccb0e7e4ad54d1bd5532a31dea90868cfe78f0d00d6efd844a11025c282952d4d5e9d6faf380d3afc50c8dee643efe0c381f5d88f291ca127d7 WHIRLPOOL 2d0dc7477d959556004f94a101009ccbdbda5dc0012e90e5f1ffb07b1eb02541fc8e12440f4d5098d81ad17dc0bf409ef6bec565776b95e70b816ba44ab8aab3
--- a/dev-lang/rubinius/rubinius-2.2.9.ebuild
+++ b/dev-lang/rubinius/rubinius-2.2.9.ebuild
@ -0,0 +1,81 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/rubinius/rubinius-2.2.9.ebuild,v 1.1 2014/06/12 06:17:02 graaff Exp $
+
+EAPI=5
+inherit eutils flag-o-matic multilib versionator
+
+DESCRIPTION="A re-implementation of the Ruby VM designed for speed"
+HOMEPAGE="http://rubini.us"
+SRC_URI="http://releases.rubini.us/${P}.tar.bz2"
+
+LICENSE="BSD"
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="+llvm"
+
+RDEPEND="
+	llvm? ( >=sys-devel/llvm-3.2 )
+	dev-libs/openssl
+	sys-libs/ncurses
+	sys-libs/readline
+	dev-libs/libyaml
+	virtual/libffi
+	sys-libs/zlib
+"
+
+DEPEND="${RDEPEND}
+	=dev-ruby/rake-10*
+	dev-ruby/bundler
+"
+
+pkg_setup() {
+	unset RUBYOPT
+}
+
+src_prepare() {
+	# src_test will wait until all processes are reaped, so tune down
+	# the long sleep process a bit.
+	sed -i -e 's/sleep 1000/sleep 300/' spec/ruby/core/io/popen_spec.rb || die
+
+	# Drop error CFLAGS per Gentoo policy.
+	sed -i -e '/Werror/ s:^:#:' rakelib/blueprint.rb || die
+
+	bundle --local || die
+}
+
+src_configure() {
+	#Rubinius uses a non-autoconf ./configure script which balks at econf
+	INSTALL="${EPREFIX}/usr/bin/install -c" ./configure --skip-prebuilt \
+		--prefix /usr/$(get_libdir) \
+		--mandir /usr/share/man \
+		--without-rpath \
+		--with-vendor-zlib \
+		$(use_enable llvm) \
+		|| die "Configure failed"
+}
+
+src_compile() {
+	rake build || die "Compilation failed"
+}
+
+src_test() {
+	rake spec || die "Tests failed"
+	einfo "Waiting for forked processes to die"
+}
+
+src_install() {
+	# The install phase tries to determine if there are relevant
+	addpredict /usr/local/lib64/ruby
+
+	local minor_version=$(get_version_component_range 1-2)
+	local librbx="usr/$(get_libdir)/rubinius"
+
+	DESTDIR="${D}" rake install || die "Installation failed"
+
+	dosym /${librbx}/${minor_version}/bin/rbx /usr/bin/rbx || die "Couldn't make rbx symlink"
+
+	insinto /${librbx}/${minor_version}/site
+	doins "${FILESDIR}/auto_gem.rb" || die "Couldn't install rbx auto_gem.rb"
+	RBX_RUNTIME="${S}/runtime" RBX_LIB="${S}/lib" bin/rbx compile "${D}/${librbx}/${minor_version}/site/auto_gem.rb" || die "Couldn't bytecompile auto_gem.rb"
+}
--- a/dev-libs/angelscript/Manifest
+++ b/dev-libs/angelscript/Manifest
@ -4,3 +4,4 @@ DIST angelscript_2.27.1.zip 1448313 SHA256 125a8c4fd432f71dc3b375683d0530e88e6bb
 DIST angelscript_2.28.0.zip 1476511 SHA256 ff6ebce580ece45f1fa2a3dc9cece16540670ea3b54b1acb5cafcc1a43479ede SHA512 b388c48a54d847ae0cfcbdfc1c0064e43337c4c93ea5c9d38df23ef7ecb28a05cd127000a068111afde8052b80483e15cb16c1b0abd6c35d4ff762562aeb0e8a WHIRLPOOL e87e3c589a452fe41bb6844818b067723de9a3878d5cda564eeb6eb9f11240f1077d3d3bce52fe94e0fbc01cbe42fa57aefe118fd8b7c66f1d1b787cf869926e
 DIST angelscript_2.28.1.zip 1494049 SHA256 d17f1e9ba784098c86b7b6f8ae57efde153dcada29d0b970b9712e33ec56d034 SHA512 76d1d90b11e322a4632177ec8be290ca6ba2e26f5264c716260399692e2d23d4b2c842e1f8c2485881e632309f4b888622449a14d5310dc445c5f814491051ce WHIRLPOOL 8c465efb6e746f770e59efeea4fe7095305d9f274c4aed332e4d39e0b291ac9038e73f31505f55964f2fc90808053a162752f2370f39b24bf00b00718d47858c
 DIST angelscript_2.28.2.zip 1508937 SHA256 54bc6126d2ba2509f3916ff139758d3c3c2185dddb521fc040110c5afde6000a SHA512 11ce2f6258ffb0844b0e42b479c4cee0227dcc6d4a71c309d1cf8786c4f838acb0eef502026c9eefb02fcc5c912737adcf0673b1ce602f1f4f1f9e54ee9bf3b3 WHIRLPOOL dfdefc088acfd80619a65fdc85a157a9fd0d023081112d384c2f95f9d6928bc043c1790ee015148209585a78a5db5c8222cd174c8f99f9c3a2c0bff3e7c189a8
+DIST angelscript_2.29.0.zip 1558139 SHA256 bd1a76a7c89a4313ab1d85fe65d9c1e32be76cf572e41c421a5a0cd41b8a0bbc SHA512 414444da46ac78e97565a58577604a3df63de143088ed0d52d6059a682cdbfe1b64454262715d9afee526eabc96d4a089b437177e763ccb6ceeae3d8435ab4ca WHIRLPOOL d96839149dbe6ef74d318495a3e82f67df2fedac06bd09be44296238633a568e73f86b582d8447b0c89feb2793c3edde7ce37bf620c5db593932676268d4ddc9
--- a/dev-libs/angelscript/angelscript-2.29.0.ebuild
+++ b/dev-libs/angelscript/angelscript-2.29.0.ebuild
@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/angelscript/angelscript-2.29.0.ebuild,v 1.1 2014/06/11 18:43:29 hasufell Exp $
+
+EAPI=5
+
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="A flexible, cross-platform scripting library"
+HOMEPAGE="http://www.angelcode.com/angelscript/"
+SRC_URI="http://www.angelcode.com/angelscript/sdk/files/angelscript_${PV}.zip"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc static-libs"
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/sdk
+S2=${WORKDIR}/sdk_static
+
+pkg_setup() {
+	tc-export CXX AR RANLIB
+}
+
+src_prepare() {
+	if use static-libs ; then
+		cp -pR "${WORKDIR}"/sdk "${S2}"/ || die
+	fi
+	epatch "${FILESDIR}"/${PN}-2.28.2-execstack.patch
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	einfo "Shared build"
+	emake -C ${PN}/projects/gnuc SHARED=1 VERSION=${PV}
+
+	if use static-libs ; then
+		einfo "Static build"
+		emake -C ${PN}/projects/gnuc
+	fi
+}
+
+multilib_src_install() {
+	doheader ${PN}/include/angelscript.h
+	dolib.so ${PN}/lib/libangelscript-${PV}.so
+	dosym libangelscript-${PV}.so /usr/$(get_libdir)/libangelscript.so
+
+	if use static-libs ; then
+		 dolib.a ${PN}/lib/libangelscript.a
+	fi
+}
+
+multilib_src_install_all() {
+	use doc && dohtml -r "${WORKDIR}"/sdk/docs/*
+}
--- a/dev-libs/check/Manifest
+++ b/dev-libs/check/Manifest
@ -1,5 +1,4 @@
-DIST check-0.9.10.tar.gz 650135 SHA256 823819235753e94ae0bcab3c46cc209de166c32ff2f52cefe120597db4403e6d SHA512 418686a2473de5a11400278213a260769876571735b60cd2ac553780ac93266bb55b344a36ac1e7fd4dfc0491114c7779874d4837f99cc42e3b4ec0e8ddf3ae1 WHIRLPOOL 2abfa475c014b19b9d0134f6644fe90d2a8bcc7f3339c4d6f9dfc7a80f4a53fb45fec2b3fb2c9f7fe51e2c090c87e115568c715423dda12682deeea661f95322
 DIST check-0.9.11.tar.gz 691146 SHA256 ea4e8c7ffb00bb4ffb3f59f11744a71f1cc4212c79f3083c7d9a4b0953976936 SHA512 10883709463b76f6650197db989c348d9d07ccaa2cacc0bd6bd177bbcc1e9e0d88746c2e110e620ab18c23cb5f41b95797d60d77de279af1a810a42b355b742e WHIRLPOOL 9559104a68b2f1215e9b00affb4711a69bf3e4e94e0ec894de66f0f77b5637187bb183560e29d0a889ff04d0e07f2785fc407128dee1ba74d584ce9a0ff9a3b1
 DIST check-0.9.12.tar.gz 730404 SHA256 c7d47e55e133a0ca19a52e08a99333ac55cb22618b53719b7f4117a1875b1ea3 SHA512 698e6cfdf24b07340fb4fa77f49811053f8307d3baca8bdcdde5e3dfe1f910bbadb6a393f03020d8b18c22e7e164d40f6bbbeb9659908b0df8459e5c4850fa50 WHIRLPOOL 4994c444532e1337bcda5e632d532ffd6aae59de866009b5bce3d1f25988dd203d04136dd451b6d24c6e32775159772d1c98097ff618a5cc559fca9725ad18ed
+DIST check-0.9.13.tar.gz 752880 SHA256 ca6589c34f9c60ffd4c3e198ce581e944a9f040ca9352ed54068dd61bebb5cb7 SHA512 a0ff64110c52fd600a8a956c2d56589e6e65ff0072b34f33e0299b4f9a2ac0a93a330b0c8cbf3645c02d0c9c748c71704bd3a8825eec22eb2f22ad99bcffa551 WHIRLPOOL 9f7f42ca4106deabe57051e84cec4f0a838847c45308baaf8cb4441e30667016fa95b1b2705b42dc494af8e9a22aea5d6733de71cd99ec0025652da53756275d
 DIST check-0.9.8.tar.gz 558943 SHA256 82acf956bb07584ffea2bf04d5989fe939c3e74ecf93133a21037fd0f7996a7f SHA512 a8ef659411c18f8af77006a51fe14741b990e7486c3e5c1e97cd2a100a603483ba9854c2f23bd9a5e834e133ca0dcc3ae15f41856339ab3b82a75ad769a872a2 WHIRLPOOL fdc06bd44f041153f655c577c55825afb2d2b79ff066427cd224b5a6d351f9da076d39807f434d2e22e1b6b54c6bc774744c8210dc318e493b9241bb5d7ded84
-DIST check-0.9.9.tar.gz 602679 SHA256 1a7a9abb9d051e1b9da4149ce651436a29e20135a40bdb202bd7b2bef3878ac9 SHA512 baf986eed3ad74e24a27cae56c52c06f457022b4b627e122f80df88e648cab42d8918b0aa5d8fc1366ed533141b39d07f0ebe984756289f684b22f63cea2d46b WHIRLPOOL 60423d21afbc0a34953ee1ae5ace2551ee46fb62ebcee413746c8a5ec948ae43fb29b09b55a6be3dc7b333f2197204097dd66e20457c0a6191f6d843eb51a9f7
--- a/dev-libs/check/check-0.9.13.ebuild
+++ b/dev-libs/check/check-0.9.13.ebuild
@ -1,9 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/check/check-0.9.10.ebuild,v 1.2 2014/01/20 07:07:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/check/check-0.9.13.ebuild,v 1.2 2014/06/12 06:05:39 binki Exp $

-EAPI=4
-inherit autotools autotools-utils eutils
+EAPI=5
+
+AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
+
+inherit autotools autotools-multilib eutils

 DESCRIPTION="A unit test framework for C"
 HOMEPAGE="http://sourceforge.net/projects/check/"
@ -17,10 +20,13 @@ IUSE="static-libs subunit"
 DEPEND="subunit? ( dev-python/subunit )"
 RDEPEND="${DEPEND}"

-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-0.9.10-AM_PATH_CHECK.patch
+pkg_setup() {
+	# See multilib_src_test(), disable sleep()-based tests because they
+	# just take a long time doing pretty much nothing.
+	export CPPFLAGS="-DTIMEOUT_TESTS_ENABLED=0 ${CPPFLAGS}"
+}

+src_prepare() {
 	sed -i -e '/^docdir =/d' {.,doc}/Makefile.am || die

 	# fix out-of-sourcedir build having inconsistent check.h files, for
@ -39,13 +45,19 @@ src_configure() {
 		$(use_enable subunit)
 		--docdir="${EPREFIX}"/usr/share/doc/${PF}
 	)
-	autotools-utils_src_configure
+	autotools-multilib_src_configure
+}
+
+multilib_src_test() {
+	elog "-DTIMEOUT_TESTS_ENABLED=0 has been prepended to CPPFLAGS. To run the"
+	elog "entire testsuite for dev-libs/check, ensure that"
+	elog "-DTIMEOUT_TESTS_ENABLED=1 is in your CPPFLAGS."
+	default_src_test
 }

 src_install() {
-	autotools-utils_src_install
+	autotools-multilib_src_install
 	dodoc AUTHORS *ChangeLog* NEWS README THANKS TODO

 	rm -f "${ED}"/usr/share/doc/${PF}/COPYING* || die
-	prune_libtool_files --all
 }
--- a/dev-libs/check/check-0.9.9.ebuild
+++ b/dev-libs/check/check-0.9.9.ebuild
@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/check/check-0.9.9.ebuild,v 1.2 2014/01/20 07:07:13 vapier Exp $
-
-EAPI=4
-inherit autotools autotools-utils eutils
-
-DESCRIPTION="A unit test framework for C"
-HOMEPAGE="http://sourceforge.net/projects/check/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs subunit"
-
-DEPEND="subunit? ( dev-python/subunit )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-0.9.6-AM_PATH_CHECK.patch
-
-	sed -i -e '/^docdir =/d' {.,doc}/Makefile.am || die
-
-	# fix out-of-sourcedir build having inconsistent check.h files, for
-	# example breaks USE=subunit.
-	rm src/check.h || die
-
-	# Fix automake warnings being treated as errors, bug #420373
-	sed -i -e s/-Werror// configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-dependency-tracking
-		$(use_enable subunit)
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	dodoc AUTHORS *ChangeLog* NEWS README THANKS TODO
-
-	rm -f "${ED}"/usr/share/doc/${PF}/COPYING* || die
-	find "${ED}" -name '*.la' -exec rm -f {} + || die
-}
--- a/dev-libs/tntnet/Manifest
+++ b/dev-libs/tntnet/Manifest
@ -1,3 +1,2 @@
 DIST tntnet-1.6.3.tar.gz 1952122 SHA256 1c16547e4fe6c07f8fe1b9d2eeb750cb2061032f31880f93f2080b049d54a3a4 SHA512 e1652b7c0165aacb6b53502df6b56bdc14cf5c582bce7952a0ec515c0468104b8b9aab75cc8ae355af7438a9df8419cfe2dc035bae340f4b3e692198e3981602 WHIRLPOOL 83d4bbcf4109578e8cf68c13a530c8455c2b43b8a508e6d1401dcd5278ae59ae3c2e2613403414cd66d27172bcb517d5c45f02c9ffd6165052d481ccd8d40dd9
 DIST tntnet-2.2.1.tar.gz 1127500 SHA256 c83170d08ef04c5868051e1c28c74b9562fe71e9e8263828e755ad5bd3547521 SHA512 78a26713498fd6eabb0b4a247bb20c130ce967ed22ce5c54da4b1300534dd40155aa62a2dc770be4eca720cadeceac283978a5dc3ce418728994af72e4d8eac1 WHIRLPOOL 7429d49b0c48456fb1540c1528cb4edfd629f94a0719688efd771ea85f027d6b8c2fb3d20be3e8f17543339d0cbdf20df3c3c5799351070c8665a5b022bbccf7
-DIST tntnet-2.2.tar.gz 1126784 SHA256 9bc09b0ea4e31b4cc6318ba6ada5bae5deadcfad3d9c0ad9466d8586cdc728f4 SHA512 6f6f8c6cd325d62e2fe8d1be5f85d374251735db9da9c4495b52888638c2cbe0ab4fccaaaadb9e1a92581a1b45bed0d8c0e43316dba60d4d141dd5c5202988f7 WHIRLPOOL 40b943e5c22c77bae1152073a68e4a7e7a654b7f83ccbfca9b6798d36d19b2d37b3d5659c8eb1b4ed94639bef5177a36bd5dc055b62eb523109c01aa07d6b390
--- a/dev-libs/tntnet/files/tntnet-2.0-as-needed.patch
+++ b/dev-libs/tntnet/files/tntnet-2.0-as-needed.patch
@ -1,429 +0,0 @@
-From a43a952135bd8b657b455ff88bae640ad8d104e9 Mon Sep 17 00:00:00 2001
-From: Christian Ruppert <idl0r@gentoo.org>
-Date: Thu, 20 Jan 2011 18:20:45 +0100
-Subject: [PATCH] Fix LDFLAGS usage
-
---
- framework/cgi/Makefile.am          |    4 ++--
- framework/common/Makefile.am       |    7 ++++---
- framework/defcomp/Makefile.am      |    4 ++--
- framework/runtime/Makefile.am      |    3 +--
- sdk/demos/Makefile.am              |    4 ++--
- sdk/demos/calc/Makefile.am         |    4 ++--
- sdk/demos/calcajax/Makefile.am     |    4 ++--
- sdk/demos/calci18n/Makefile.am     |    4 ++--
- sdk/demos/calcmvc/Makefile.am      |    4 ++--
- sdk/demos/chat/Makefile.am         |    4 ++--
- sdk/demos/comp/Makefile.am         |    8 ++++----
- sdk/demos/config/Makefile.am       |    4 ++--
- sdk/demos/controls/Makefile.am     |    4 ++--
- sdk/demos/cookie/Makefile.am       |    4 ++--
- sdk/demos/hello/Makefile.am        |    4 ++--
- sdk/demos/rajax-jquery/Makefile.am |    4 ++--
- sdk/demos/savepoint/Makefile.am    |    4 ++--
- sdk/demos/session/Makefile.am      |    4 ++--
- sdk/demos/sprintf/Makefile.am      |    4 ++--
- sdk/demos/strings/Makefile.am      |    4 ++--
- sdk/demos/upload/Makefile.am       |    4 ++--
- sdk/tools/common/Makefile.am       |    3 ++-
- sdk/tools/ecppc/Makefile.am        |    3 +--
- sdk/tools/ecppl/Makefile.am        |    3 +--
- sdk/tools/ecppll/Makefile.am       |    3 +--
- utest/Makefile.am                  |    3 +--
- 26 files changed, 51 insertions(+), 54 deletions(-)
-
-diff --git a/framework/cgi/Makefile.am b/framework/cgi/Makefile.am
-index 4912e19..0bc02f4 100644
--- a/framework/cgi/Makefile.am
-+++ b/framework/cgi/Makefile.am
-@@ -7,5 +7,5 @@ libtntnet_cgi_la_SOURCES = \
- 	tnt/cgi.h
- 
- libtntnet_cgi_la_CXXFLAGS = $(PTHREAD_CFLAGS)
-libtntnet_cgi_la_LDFLAGS = -version-info @sonumber@ $(PTHREAD_LIBS)
-libtntnet_cgi_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la -lcxxtools
-+libtntnet_cgi_la_LDFLAGS = -version-info @sonumber@
-+libtntnet_cgi_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la -lcxxtools $(PTHREAD_LIBS)
-diff --git a/framework/common/Makefile.am b/framework/common/Makefile.am
-index d2de886..84c4297 100644
--- a/framework/common/Makefile.am
-+++ b/framework/common/Makefile.am
-@@ -114,7 +114,8 @@ noinst_HEADERS = \
- 	tnt/util.h
- 
- libtntnet_la_CXXFLAGS = -DPKGLIBDIR=\"@libdir@/@PACKAGE@\" $(PTHREAD_CFLAGS)
-libtntnet_la_LDFLAGS = -version-info @sonumber@ -lz -lcxxtools $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
-+libtntnet_la_LDFLAGS = -version-info @sonumber@ @SHARED_LIB_FLAG@
-+libtntnet_la_LIBADD = -lz -lcxxtools $(PTHREAD_LIBS)
- 
- if MAKE_GNUTLS
- libtntnet_la_SOURCES += \
-@@ -125,7 +126,7 @@ noinst_HEADERS += \
- 	tnt/gcryptinit.h \
- 	tnt/gnutls.h
- 
-libtntnet_la_LDFLAGS += -lgnutls -lgcrypt
-+libtntnet_la_LIBADD += -lgnutls -lgcrypt
- endif
- 
- if MAKE_OPENSSL
-@@ -135,7 +136,7 @@ libtntnet_la_SOURCES += \
- noinst_HEADERS += \
- 	tnt/openssl.h
- 
-libtntnet_la_LDFLAGS += -lssl -lcrypto
-+libtntnet_la_LIBADD += -lssl -lcrypto
- endif
- 
- if MAKE_STRESSJOB
-diff --git a/framework/defcomp/Makefile.am b/framework/defcomp/Makefile.am
-index a053e1a..2f33529 100644
--- a/framework/defcomp/Makefile.am
-+++ b/framework/defcomp/Makefile.am
-@@ -14,5 +14,5 @@ tntnet_la_SOURCES = \
- 	static.h
- 
- tntnet_la_CXXFLAGS = $(PTHREAD_CFLAGS)
-tntnet_la_LDFLAGS = -module -version-info @sonumber@ $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
-tntnet_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
-+tntnet_la_LDFLAGS = -module -version-info @sonumber@ @SHARED_LIB_FLAG@
-+tntnet_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
-diff --git a/framework/runtime/Makefile.am b/framework/runtime/Makefile.am
-index e318ab7..4c59be4 100644
--- a/framework/runtime/Makefile.am
-+++ b/framework/runtime/Makefile.am
-@@ -9,7 +9,6 @@ tntnet_SOURCES = \
- nobase_include_HEADERS = \
- 	tnt/process.h
- 
-tntnet_LDFLAGS = $(PTHREAD_LIBS)
-tntnet_LDADD = $(top_builddir)/framework/common/libtntnet.la
-+tntnet_LDADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
- tntnet_CXXFLAGS=-DTNTNET_CONF=\"@sysconfdir@/tntnet/tntnet.conf\" -DTNTNET_PID=\"@localstatedir@/tntnet.pid\" $(PTHREAD_CFLAGS)
- 
-diff --git a/sdk/demos/Makefile.am b/sdk/demos/Makefile.am
-index f6a93f8..cea7468 100644
--- a/sdk/demos/Makefile.am
-+++ b/sdk/demos/Makefile.am
-@@ -10,8 +10,8 @@ EXTRA_DIST = \
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-alldemos_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
-alldemos_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
-+alldemos_la_LDFLAGS = -module @SHARED_LIB_FLAG@
-+alldemos_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
- 
- noinst_DATA = tntnet.properties
- CLEANFILES = alldemos.cpp tntnet.properties
-diff --git a/sdk/demos/calc/Makefile.am b/sdk/demos/calc/Makefile.am
-index 7b14f3c..339b12a 100644
--- a/sdk/demos/calc/Makefile.am
-+++ b/sdk/demos/calc/Makefile.am
-@@ -8,8 +8,8 @@ EXTRA_DIST = \
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-calc_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
-calc_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
-+calc_la_LDFLAGS = -module @SHARED_LIB_FLAG@
-+calc_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
- 
- noinst_DATA = tntnet.conf tntnet.properties
- CLEANFILES = calc.cpp tntnet.conf tntnet.properties
-diff --git a/sdk/demos/calcajax/Makefile.am b/sdk/demos/calcajax/Makefile.am
-index c569868..020df8b 100644
--- a/sdk/demos/calcajax/Makefile.am
-+++ b/sdk/demos/calcajax/Makefile.am
-@@ -12,8 +12,8 @@ EXTRA_DIST = \
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-calcajax_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
-calcajax_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
-+calcajax_la_LDFLAGS = -module @SHARED_LIB_FLAG@
-+calcajax_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
- 
- noinst_DATA = tntnet.conf tntnet.properties
- CLEANFILES = calcajax.cpp calcajax_js.cpp docalc.cpp tntnet.conf tntnet.properties
-diff --git a/sdk/demos/calci18n/Makefile.am b/sdk/demos/calci18n/Makefile.am
-index d334ffe..2952da4 100644
--- a/sdk/demos/calci18n/Makefile.am
-+++ b/sdk/demos/calci18n/Makefile.am
-@@ -16,8 +16,8 @@ EXTRA_DIST = \
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-calci18n_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
-calci18n_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
-+calci18n_la_LDFLAGS = -module @SHARED_LIB_FLAG@
-+calci18n_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
- 
- noinst_DATA = tntnet.conf tntnet.properties calci18n.txt calci18n.fi calci18n.de
- CLEANFILES = calci18n.cpp tntnet.conf tntnet.properties \
-diff --git a/sdk/demos/calcmvc/Makefile.am b/sdk/demos/calcmvc/Makefile.am
-index 9b4baaa..bc37b2a 100644
--- a/sdk/demos/calcmvc/Makefile.am
-+++ b/sdk/demos/calcmvc/Makefile.am
-@@ -18,8 +18,8 @@ EXTRA_DIST = \
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-calcmvc_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
-calcmvc_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
-+calcmvc_la_LDFLAGS = -module @SHARED_LIB_FLAG@
-+calcmvc_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
- 
- noinst_DATA = tntnet.conf tntnet.properties
- CLEANFILES = calcController.cpp calcModel.cpp calcView.cpp calcmvc.cpp \
-diff --git a/sdk/demos/chat/Makefile.am b/sdk/demos/chat/Makefile.am
-index 72fa35c..7816390 100644
--- a/sdk/demos/chat/Makefile.am
-+++ b/sdk/demos/chat/Makefile.am
-@@ -21,8 +21,8 @@ EXTRA_DIST = \
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-chat_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
-chat_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
-+chat_la_LDFLAGS = -module @SHARED_LIB_FLAG@
-+chat_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
- 
- noinst_DATA = tntnet.conf tntnet.properties
- CLEANFILES = chat.cpp ajax.cpp getchat.cpp putchat.cpp \
-diff --git a/sdk/demos/comp/Makefile.am b/sdk/demos/comp/Makefile.am
-index e60bdb1..be56430 100644
--- a/sdk/demos/comp/Makefile.am
-+++ b/sdk/demos/comp/Makefile.am
-@@ -14,10 +14,10 @@ EXTRA_DIST = \
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-comp_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
-comp_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
-extlib_la_LDFLAGS = -module $(PTHREAD_LIBS)
-extlib_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
-+comp_la_LDFLAGS = -module @SHARED_LIB_FLAG@
-+comp_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
-+extlib_la_LDFLAGS = -module
-+extlib_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
- 
- noinst_DATA = tntnet.conf tntnet.properties
- CLEANFILES = comp.cpp subcomp.cpp extcomp.cpp \
-diff --git a/sdk/demos/config/Makefile.am b/sdk/demos/config/Makefile.am
-index 824341c..94282df 100644
--- a/sdk/demos/config/Makefile.am
-+++ b/sdk/demos/config/Makefile.am
-@@ -8,8 +8,8 @@ nodist_config_la_SOURCES = \
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-config_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
-config_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
-+config_la_LDFLAGS = -module @SHARED_LIB_FLAG@
-+config_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
- 
- noinst_DATA = tntnet.conf tntnet.properties
- CLEANFILES = config.cpp tntnet.conf tntnet.properties
-diff --git a/sdk/demos/controls/Makefile.am b/sdk/demos/controls/Makefile.am
-index 34dabd3..f7f414b 100644
--- a/sdk/demos/controls/Makefile.am
-+++ b/sdk/demos/controls/Makefile.am
-@@ -35,8 +35,8 @@ EXTRA_DIST = \
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-controls_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
-controls_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
-+controls_la_LDFLAGS = -module @SHARED_LIB_FLAG@
-+controls_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
- 
- noinst_DATA = tntnet.conf tntnet.properties
- CLEANFILES = tntnet.properties \
-diff --git a/sdk/demos/cookie/Makefile.am b/sdk/demos/cookie/Makefile.am
-index a604e47..6360e8f 100644
--- a/sdk/demos/cookie/Makefile.am
-+++ b/sdk/demos/cookie/Makefile.am
-@@ -8,8 +8,8 @@ EXTRA_DIST = \
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-cookie_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
-cookie_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
-+cookie_la_LDFLAGS = -module @SHARED_LIB_FLAG@
-+cookie_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
- 
- noinst_DATA = tntnet.conf tntnet.properties
- CLEANFILES = cookie.cpp tntnet.conf tntnet.properties
-diff --git a/sdk/demos/hello/Makefile.am b/sdk/demos/hello/Makefile.am
-index cb4c246..639894d 100644
--- a/sdk/demos/hello/Makefile.am
-+++ b/sdk/demos/hello/Makefile.am
-@@ -10,8 +10,8 @@ EXTRA_DIST = \
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-hello_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
-hello_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
-+hello_la_LDFLAGS = -module @SHARED_LIB_FLAG@
-+hello_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
- 
- noinst_DATA = tntnet.conf tntnet.properties
- CLEANFILES = hello.cpp tntnet.cpp tntnet.conf tntnet.properties
-diff --git a/sdk/demos/rajax-jquery/Makefile.am b/sdk/demos/rajax-jquery/Makefile.am
-index 259eac5..a1832fd 100644
--- a/sdk/demos/rajax-jquery/Makefile.am
-+++ b/sdk/demos/rajax-jquery/Makefile.am
-@@ -18,8 +18,8 @@ EXTRA_DIST = \
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-message_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
-message_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
-+message_la_LDFLAGS = -module @SHARED_LIB_FLAG@
-+message_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
- 
- noinst_DATA = tntnet.conf tntnet.properties
- CLEANFILES = get.cpp jquery.cpp message.cpp put.cpp tntnet.conf tntnet.properties
-diff --git a/sdk/demos/savepoint/Makefile.am b/sdk/demos/savepoint/Makefile.am
-index 0f4a5a2..a357d56 100644
--- a/sdk/demos/savepoint/Makefile.am
-+++ b/sdk/demos/savepoint/Makefile.am
-@@ -8,8 +8,8 @@ EXTRA_DIST = \
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-savepoint_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
-savepoint_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
-+savepoint_la_LDFLAGS = -module @SHARED_LIB_FLAG@
-+savepoint_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
- 
- noinst_DATA = tntnet.conf tntnet.properties
- CLEANFILES = savepoint.cpp tntnet.conf tntnet.properties
-diff --git a/sdk/demos/session/Makefile.am b/sdk/demos/session/Makefile.am
-index 1809d64..b30dd03 100644
--- a/sdk/demos/session/Makefile.am
-+++ b/sdk/demos/session/Makefile.am
-@@ -10,8 +10,8 @@ EXTRA_DIST = \
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-session_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
-session_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
-+session_la_LDFLAGS = -module @SHARED_LIB_FLAG@
-+session_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
- 
- noinst_DATA = tntnet.conf tntnet.properties
- CLEANFILES = session.cpp appsession.cpp \
-diff --git a/sdk/demos/sprintf/Makefile.am b/sdk/demos/sprintf/Makefile.am
-index bd0ac73..7b0a0af 100644
--- a/sdk/demos/sprintf/Makefile.am
-+++ b/sdk/demos/sprintf/Makefile.am
-@@ -10,8 +10,8 @@ EXTRA_DIST = \
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-sprintf_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
-sprintf_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
-+sprintf_la_LDFLAGS = -module @SHARED_LIB_FLAG@
-+sprintf_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
- 
- noinst_DATA = tntnet.conf tntnet.properties
- CLEANFILES = sprintf.cpp subcomp.cpp tntnet.conf tntnet.properties
-diff --git a/sdk/demos/strings/Makefile.am b/sdk/demos/strings/Makefile.am
-index 804a177..4f8b876 100644
--- a/sdk/demos/strings/Makefile.am
-+++ b/sdk/demos/strings/Makefile.am
-@@ -8,8 +8,8 @@ EXTRA_DIST = \
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-strings_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
-strings_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
-+strings_la_LDFLAGS = -module @SHARED_LIB_FLAG@
-+strings_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
- 
- noinst_DATA = tntnet.conf tntnet.properties
- CLEANFILES = strings.cpp tntnet.conf tntnet.properties
-diff --git a/sdk/demos/upload/Makefile.am b/sdk/demos/upload/Makefile.am
-index 7082caa..da4ea88 100644
--- a/sdk/demos/upload/Makefile.am
-+++ b/sdk/demos/upload/Makefile.am
-@@ -8,8 +8,8 @@ EXTRA_DIST = \
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-upload_la_LDFLAGS = -module $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
-upload_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la
-+upload_la_LDFLAGS = -module @SHARED_LIB_FLAG@
-+upload_la_LIBADD = $(top_builddir)/framework/common/libtntnet.la $(PTHREAD_LIBS)
- 
- noinst_DATA = tntnet.conf tntnet.properties
- CLEANFILES = upload.cpp tntnet.conf tntnet.properties
-diff --git a/sdk/tools/common/Makefile.am b/sdk/tools/common/Makefile.am
-index a107070..d1b68a8 100644
--- a/sdk/tools/common/Makefile.am
-+++ b/sdk/tools/common/Makefile.am
-@@ -16,4 +16,5 @@ libtntnet_sdk_la_SOURCES = \
- 	tnt/stringescaper.h
- 
- libtntnet_sdk_la_CXXFLAGS = $(PTHREAD_CFLAGS)
-libtntnet_sdk_la_LDFLAGS = -version-info @sonumber@ -lcxxtools $(PTHREAD_LIBS) @SHARED_LIB_FLAG@
-+libtntnet_sdk_la_LDFLAGS = -version-info @sonumber@ @SHARED_LIB_FLAG@
-+libtntnet_sdk_la_LIBADD = -lcxxtools $(PTHREAD_LIBS)
-diff --git a/sdk/tools/ecppc/Makefile.am b/sdk/tools/ecppc/Makefile.am
-index d740df6..e4b1166 100644
--- a/sdk/tools/ecppc/Makefile.am
-+++ b/sdk/tools/ecppc/Makefile.am
-@@ -20,8 +20,7 @@ ecppc_SOURCES = \
- 	tnt/ecppc/subcomponent.h \
- 	tnt/ecppc/variable.h
- 
-ecppc_LDADD = $(top_builddir)/framework/common/libtntnet.la $(top_builddir)/sdk/tools/common/libtntnet_sdk.la
-+ecppc_LDADD = $(top_builddir)/framework/common/libtntnet.la $(top_builddir)/sdk/tools/common/libtntnet_sdk.la -lcxxtools $(PTHREAD_LIBS)
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common -I$(top_srcdir)/sdk/tools/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-AM_LDFLAGS = -lcxxtools $(PTHREAD_LIBS)
-diff --git a/sdk/tools/ecppl/Makefile.am b/sdk/tools/ecppl/Makefile.am
-index b658f40..64d8a9f 100644
--- a/sdk/tools/ecppl/Makefile.am
-+++ b/sdk/tools/ecppl/Makefile.am
-@@ -5,8 +5,7 @@ ecppl_SOURCES = \
- 	ecpplang.cpp \
- 	ecpplang.h
- 
-ecppl_LDADD = $(top_builddir)/sdk/tools/common/libtntnet_sdk.la
-+ecppl_LDADD = $(top_builddir)/sdk/tools/common/libtntnet_sdk.la -lcxxtools $(PTHREAD_LIBS)
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common -I$(top_srcdir)/sdk/tools/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-AM_LDFLAGS = -lcxxtools $(PTHREAD_LIBS)
-diff --git a/sdk/tools/ecppll/Makefile.am b/sdk/tools/ecppll/Makefile.am
-index 3782acb..85b24d1 100644
--- a/sdk/tools/ecppll/Makefile.am
-+++ b/sdk/tools/ecppll/Makefile.am
-@@ -3,8 +3,7 @@ bin_PROGRAMS = ecppll
- ecppll_SOURCES = \
- 	ecppll.cpp
- 
-ecppll_LDADD = $(top_builddir)/sdk/tools/common/libtntnet_sdk.la
-+ecppll_LDADD = $(top_builddir)/sdk/tools/common/libtntnet_sdk.la -lcxxtools $(PTHREAD_LIBS)
- 
- AM_CPPFLAGS = -I$(top_srcdir)/framework/common -I$(top_srcdir)/sdk/tools/common
- AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-AM_LDFLAGS = -lcxxtools $(PTHREAD_LIBS)
-diff --git a/utest/Makefile.am b/utest/Makefile.am
-index 2f662ae..d4cdef1 100644
--- a/utest/Makefile.am
-+++ b/utest/Makefile.am
-@@ -7,5 +7,4 @@ utest_SOURCES = \
-     testmain.cpp \
-     strutest.cpp
- 
-utest_LDFLAGS = -lcxxtools-unit
-utest_LDADD = $(top_builddir)/framework/common/libtntnet.la
-+utest_LDADD = $(top_builddir)/framework/common/libtntnet.la -lcxxtools-unit
-- 
-1.7.3.4
-
--- a/dev-libs/tntnet/files/tntnet-2.0-gnutls.patch
+++ b/dev-libs/tntnet/files/tntnet-2.0-gnutls.patch
@ -1,31 +0,0 @@
-Index: framework/common/gnutls.cpp
-===================================================================
--- framework/common/gnutls.cpp	(revision 1256)
-+++ framework/common/gnutls.cpp	(working copy)
-@@ -35,7 +35,7 @@
- #include "tnt/gcryptinit.h"
- #include <sys/poll.h>
- #include <errno.h>
-#include <cxxtools/net/net.h>
-+#include <cxxtools/ioerror.h>
- 
- log_define("tntnet.ssl")
- 
-@@ -364,7 +364,7 @@
-           break;
- 
-         if (ret == GNUTLS_E_AGAIN)
-          throw cxxtools::net::Timeout();
-+          throw cxxtools::IOTimeout();
- 
-         if (ret < 0 && ret != GNUTLS_E_INTERRUPTED)
-           throw GnuTlsException("gnutls_record_recv", ret);
-@@ -403,7 +403,7 @@
-           break;
- 
-         if (ret == GNUTLS_E_AGAIN)
-          throw cxxtools::net::Timeout();
-+          throw cxxtools::IOTimeout();
- 
-         if (ret != GNUTLS_E_INTERRUPTED)
-           throw GnuTlsException("gnutls_record_send", ret);
--- a/dev-libs/tntnet/metadata.xml
+++ b/dev-libs/tntnet/metadata.xml
@ -12,6 +12,5 @@
 	<herd>media-tv</herd>
 	<use>
 		<flag name="server">Enable tntnet server daemon</flag>
-		<flag name="sdk">Enable tntnet SDK</flag>
 	</use>
 </pkgmetadata>
--- a/dev-libs/tntnet/tntnet-2.2.1.ebuild
+++ b/dev-libs/tntnet/tntnet-2.2.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tntnet/tntnet-2.2.1.ebuild,v 1.3 2014/03/01 22:14:27 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tntnet/tntnet-2.2.1.ebuild,v 1.4 2014/06/11 18:55:12 hd_brummy Exp $

 EAPI=5

@ -12,7 +12,7 @@ SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="amd64 ~sparc x86"
 IUSE="doc gnutls server ssl examples"

 RDEPEND=">=dev-libs/cxxtools-2.2.1
@ -33,6 +33,9 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.0-zlib-minizip.patch
 	rm framework/common/{ioapi,unzip}.[ch] || die

+	# bug 423697
+	sed -e "s:unzip.h:minizip/unzip.h:" -i framework/defcomp/unzipcomp.cpp
+
 	eautoreconf

 	sed -i -e 's:@localstatedir@:/var:' etc/tntnet/tntnet.xml.in || die
--- a/dev-libs/tntnet/tntnet-2.2.ebuild
+++ b/dev-libs/tntnet/tntnet-2.2.ebuild
@ -1,90 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tntnet/tntnet-2.2.ebuild,v 1.3 2014/03/01 22:14:27 mgorny Exp $
-
-EAPI="5"
-
-inherit autotools eutils
-
-DESCRIPTION="Modular, multithreaded webapplicationserver extensible with C++"
-HOMEPAGE="http://www.tntnet.org/"
-SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="cgi doc examples gnutls server sdk ssl"
-
-RDEPEND="=dev-libs/cxxtools-2.2*
-	sys-libs/zlib[minizip]
-	ssl? (
-		gnutls? (
-			>=net-libs/gnutls-1.2.0
-			dev-libs/libgcrypt:0
-		)
-		!gnutls? ( dev-libs/openssl )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-arch/zip"
-
-src_prepare() {
-	# Both fixed in the next release
-	epatch "${FILESDIR}"/${PN}-2.0-zlib-minizip.patch
-	rm framework/common/{ioapi,unzip}.[ch] || die
-
-	eautoreconf
-
-	sed -i -e 's:@localstatedir@:/var:' etc/tntnet/tntnet.xml.in || die
-}
-
-src_configure() {
-	local myconf=""
-
-	# Prefer gnutls above SSL
-	if use gnutls; then
-		einfo "Using gnutls for ssl support."
-		myconf="${myconf} --with-ssl=gnutls"
-	elif use ssl; then
-		einfo "Using openssl for ssl support."
-		myconf="${myconf} --with-ssl=openssl"
-	else
-		myconf="${myconf} --with-ssl=no"
-	fi
-
-	# demos/examples depend upon sdk
-	if use examples && ! use sdk; then
-		myconf="${myconf} --with-sdk"
-	fi
-
-	econf \
-		$(use_with examples demos) \
-		$(use_with sdk) \
-		$(use_with cgi) \
-		$(use_with server) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog README TODO
-	if use doc; then
-		dodoc doc/*.pdf || die
-	fi
-
-	if use examples; then
-		cd "${S}/sdk/demos"
-		emake clean
-		rm -rf .deps */.deps .libs */.libs
-		cd "${S}"
-
-		insinto /usr/share/doc/${PF}/examples
-		doins -r sdk/demos/* || die
-	fi
-
-	if use server; then
-		rm -f "${D}/etc/init.d/tntnet"
-		newinitd "${FILESDIR}/tntnet.initd" tntnet
-	fi
-}
--- a/dev-perl/IP-Country/IP-Country-2.280.0.ebuild
+++ b/dev-perl/IP-Country/IP-Country-2.280.0.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/IP-Country/IP-Country-2.280.0.ebuild,v 1.1 2013/08/25 10:02:35 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/IP-Country/IP-Country-2.280.0.ebuild,v 1.2 2014/06/12 11:21:58 zlogene Exp $

-EAPI=4
+EAPI=5

 MODULE_AUTHOR=NWETTERS
 MODULE_VERSION=2.28
--- a/dev-perl/PortageXS/PortageXS-0.02.10-r3.ebuild
+++ b/dev-perl/PortageXS/PortageXS-0.02.10-r3.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/PortageXS/PortageXS-0.02.10-r3.ebuild,v 1.1 2013/01/03 08:46:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/PortageXS/PortageXS-0.02.10-r3.ebuild,v 1.2 2014/06/12 07:30:13 kumba Exp $

 inherit perl-module eutils prefix
 DESCRIPTION="Portage abstraction layer for perl"
@ -9,7 +9,7 @@ SRC_URI="http://download.mpsna.de/opensource/PortageXS/${P}.tar.gz"

 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="minimal"
 SRC_TEST="do"

--- a/dev-perl/Unicode-Map8/Unicode-Map8-0.130.0.ebuild
+++ b/dev-perl/Unicode-Map8/Unicode-Map8-0.130.0.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Unicode-Map8/Unicode-Map8-0.130.0.ebuild,v 1.1 2011/08/28 09:32:33 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Unicode-Map8/Unicode-Map8-0.130.0.ebuild,v 1.2 2014/06/12 11:46:38 zlogene Exp $

-EAPI=4
+EAPI=5

 MODULE_AUTHOR=GAAS
 MODULE_VERSION=0.13
--- a/dev-python/autopep8/Manifest
+++ b/dev-python/autopep8/Manifest
@ -2,3 +2,4 @@ DIST autopep8-0.5.2.tar.gz 10049 SHA256 a9a808bac49605036bdeaa4bf5b50a9bbf87088a
 DIST autopep8-0.9.5.tar.gz 71000 SHA256 d6610d683d02a1a487cc3f7d8ef6dd8e436c897f97b64ea2dcfc384767429670 SHA512 daef04cf3d2085fd59af3d8603e14e36e8d2673b783055971212438014b74e6732d8309a870285a2a8f8915cffdf27bd63631ddf6dfd1bb07c2e19b92ed32dae WHIRLPOOL 40d5d0b07c88a85075fed6742528f277d0592f88849bc9d1d1816bcc97c0744726570c8af44f0b1ed3b2840b73286496fe969dc7a0b9020a9f9f87d1f771d1e0
 DIST autopep8-1.0.1.tar.gz 121030 SHA256 50a30344ddbfeaa72577fd329e8b6411d41e34dba98724147d5240e1c62a4fc2 SHA512 def474a45f067d440ca769e033ac839818e55a2799ebcdef1aff27c441ca7d81b7d634400313b0f08afa06253bcabbdc35360afd641ffe3ebf98eac000972b4e WHIRLPOOL 92f39791680e55af2797cab5089997f5ecf73c66d955e0dff844c930de6154394aa0f81b3091895e4b5f29131d8346d4e2c670013147c41dc52812c4028bdf4c
 DIST autopep8-1.0.2.tar.gz 121131 SHA256 e018fcea66a5dbc0eadcad8a6931fe335328f08c4082399d1227635f2bb70fab SHA512 2eb5dd54a03a8b19e9b8c5ae51d06952831e07fbfdedb1b7466178275edf1496f70c4ae13b23fb9daa2fee9ba6305639f66e65af45e61ac24cb55335973a5e80 WHIRLPOOL 329bd2a1a86bfc1d19b96eb9c82f599440b577ce085d03905f161d232326aa9777b4500a59ae361a78e545e1e2a907e26541e4a6fbffdae8ed52408ce41fe3e0
+DIST autopep8-1.0.3.tar.gz 121225 SHA256 af2fb332383493982d00db52d03b52f6ae1edca637e59f498fc2a9e889dddf52 SHA512 550cb259c33a11c71ac3edea66df9d6f44fd5adc23f7f3e58ec6abb33f3eb6dbc248aa5a65078ad0f22f8c8b0d57c2338ca7a189d7b2078aa609c90d7bdf42e3 WHIRLPOOL 599e22ae66eec4eea25ae2f806129a442c7ba8822c247262f25402cfc60a0c76d7df29bf7d3cead784bb785cd2d19895ee97ba4b2c3afcb1a7e08efba9e87b5b
--- a/dev-python/autopep8/autopep8-1.0.3.ebuild
+++ b/dev-python/autopep8/autopep8-1.0.3.ebuild
@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/autopep8/autopep8-1.0.3.ebuild,v 1.1 2014/06/12 04:57:30 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1 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=""
+
+DEPEND=">=dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+	# Prevent UnicodeDecodeError with LANG=C
+	sed -e "/é/d" -i MANIFEST.in || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
+
+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/fabric/Manifest
+++ b/dev-python/fabric/Manifest
@ -14,4 +14,5 @@ DIST Fabric-1.8.0.tar.gz 219420 SHA256 0076c76abeef3ffe9172e1290e6e487e23a7229b6
 DIST Fabric-1.8.1.tar.gz 220137 SHA256 bf2b4a857e14ab5e555a4c287d2a26dc30e2f3d19a0e545df058e5c139019880 SHA512 5898b5aa9833a060957251b0fed15c9815074d4878775d54cba97906220029d36a8a7a0c5bc57278837a48674885373fb235b361ec2b1ebcdccfbfecb5f63e06 WHIRLPOOL 0286bbfc32f2805e5c1c8569c804ceddd6169d46e42798a3b5ad287adb2a921b8b860499e0291225351759651b49c089694775c822ba26806bb8201fcafcb064
 DIST Fabric-1.8.2.tar.gz 251398 SHA256 ae810aee9114c5e7ef3ce7a0f6fb6293d1dfcfcfa846aa4e007f3ae42beaf62b SHA512 299b4d9d7579aac24d955ef8b392e85682057e4f19ea18e5fec764ca6c8a5f181b924e6293990591765cda3b2590c791ae3ea273376d36614c7dd57ccf62a3ea WHIRLPOOL 8c0db105a285113b44b0012e458a0343ecc64503ad004929470232f89c7aed2a38b19c5a13cf2482e0e77b7dda2d41a496f5162acdb681b95a9c7d916c6732f5
 DIST Fabric-1.8.3.tar.gz 251306 SHA256 651a07959bdabfb15fda2a6e6adebf473e57ff5b6f3f5d2894fa787c2b6fd202 SHA512 6ad2180b99beab6d99474ac5297fb588938e748e52c14e34352101597a6023fd42c9656419467f6b42a06d0e6f0b5529ad8740212edf46f79d11790b4c6ef454 WHIRLPOOL 337694561f504f663f91d96e8c7d4af762c3796efcb15eeb792880d7f6806d5b59a9f4be9d1f833d3d033340b0404003d6e09672baa23a3c2704a81fb4de84ae
+DIST Fabric-1.9.0.tar.gz 205487 SHA256 a30385226b7186d3094503a890a40a1c023b2fd84ecf0ff1e5d4d583c28bf719 SHA512 b2a3478cbe6ecb760411184d56462003b2375a2aeb6cf9598c4ecd24a84502f5eb97610e7def37583ef8691b93a188b0296ed87905f6577949f6d452985d98ae WHIRLPOOL 3adf2d65ed4e3fc9c69578832b6b220c5884e7709da625ff8594238b9e89a3a8e1b0c337c42cc0af34f19ae8a6a3883d7dbb5bdfa25e2486a53bf3afcb589477
 DIST fabric-1.4.2.tar.gz 194062 SHA256 a2052fefd10b7f433b9598a409b19eb6581656807a7a02fbaf94b6b61e7173a2 SHA512 de448ea3029998d1040bf02f07a36e9183b5c87fbe2dd9f217e19034f762b7b6d821d95c4f1fd3b2f5e1955adcaced880c3eaba5d85f91ff3e5ef4a7aeee4d4a WHIRLPOOL 9af535af3ad227ad3cfacd35ba6b4ff82efc879f4a8fe327f62d2c9f99b4911db95c026c06e1ac1b4c54730ca4dbaa274a459a3ed9ab2f7ca0f63297f3a07ad2
--- a/dev-python/fabric/fabric-1.9.0.ebuild
+++ b/dev-python/fabric/fabric-1.9.0.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fabric/fabric-1.9.0.ebuild,v 1.1 2014/06/12 09:13:50 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="Fabric"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A simple pythonic tool for remote execution and deployment."
+HOMEPAGE="http://fabfile.org http://pypi.python.org/pypi/Fabric"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="<dev-python/paramiko-1.13[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( <dev-python/fudge-1.0[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+src_test() {
+	local DISTUTILS_NO_PARALLEL_BUILD=1
+	distutils-r1_src_test
+}
+
+python_test() {
+	nosetests tests || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
--- a/dev-python/fixtures/fixtures-0.3.14-r1.ebuild
+++ b/dev-python/fixtures/fixtures-0.3.14-r1.ebuild
@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/fixtures/fixtures-0.3.14-r1.ebuild,v 1.6 2014/06/08 09:32:13 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fixtures/fixtures-0.3.14-r1.ebuild,v 1.8 2014/06/12 08:11:53 patrick Exp $

 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
+PYTHON_COMPAT=( python{2_7,3_2,3_3} pypy pypy2_0 )

 inherit distutils-r1

--- a/dev-python/fixtures/fixtures-0.3.14-r2.ebuild
+++ b/dev-python/fixtures/fixtures-0.3.14-r2.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fixtures/fixtures-0.3.14-r2.ebuild,v 1.1 2014/06/12 08:11:53 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy2_0 )
+
+inherit distutils-r1
+
+DESCRIPTION="Fixtures, reusable state for writing clean tests and more."
+HOMEPAGE="https://launchpad.net/python-fixtures https://pypi.python.org/pypi/fixtures"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# nose not listed but provides coverage output of tests
+# run of test files by python lacks any output except on fail
+DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}]
+				>=dev-python/testtools-0.9.22[${PYTHON_USEDEP}]
+				dev-python/extras[${PYTHON_USEDEP}] )"
+RDEPEND=">=dev-python/testtools-0.9.22"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	pushd "${BUILD_DIR}"/ > /dev/null
+	ln -sf ../README .
+	nosetests lib/${PN}/tests/test_*.py || die "Tests failed under ${EPYTHON}"
+}
--- a/dev-python/hgtools/Manifest
+++ b/dev-python/hgtools/Manifest
@ -1,3 +1,4 @@
 DIST hgtools-2.0.2.zip 30635 SHA256 bfa82ccfea56b178c9f28cb719cb97853710880b207e0a32801ba1077757da07 SHA512 5173ff7e0e42657058731cdb3cf9c2fe7cbd378d026321be62e937c57da637fb79bbdc6b2c91df06f1c93854c253f77621c0a5b91a7df451d68ea72da6f25266 WHIRLPOOL 5f33ab464b72165948e8e568f3b3e2f5b364b14bc65ff9311906d0aafced74505d974f28af1241b963b6772cf770f544c77df2e6665376da86a41f83db9b349b
 DIST hgtools-3.0.2.zip 39191 SHA256 c07d775c12653767a6677cb81eea40952f1795b1da9dba4d3e42ffe7f6df8657 SHA512 0160c6ac2361371359d96012dbdd191d99f9f9b3161ac97308c0479a810847c2c233f6598ee50f94538e34ddeb418f70830f58280a1a3526b59e6a36dc163587 WHIRLPOOL 127efcd18069932dcc4e5a0676adf5c1e0ffb60aaca41be31190ec1a031075cd4abf3a35e52b9e22abd34b7625a89651ec810249e222334d8a7d34ca18c4dab7
 DIST hgtools-4.0.zip 39223 SHA256 159390941e10e2fad56c47460ed9e58abf7ec01f1f072ce9c5743352279ed8c5 SHA512 a8e328d3ca77421a24b4e9596d25b449263cb251943953ee5e05ef5abbff67c58dfe6213ca94f027eef8ed6cd57e78a076320d74aa767e8a98e2344b7a9cb271 WHIRLPOOL 88aa310e71d728fcdcfec391ea84c92babab2d320e33e96a8551d2c5aa5af5b466b4aeea176a4785d390ae76a727df53bebebcbc3d4b7b9cd9b4ea62027642b7
+DIST hgtools-6.0.zip 37542 SHA256 14f3f4d94827c2d45e5a05ffd6efbe2484f662354a3dce2d8d1a29df1b05dd5a SHA512 86443caa03ff5c8fe3b2f5d503c8d28ddc8e29f4818fb7d3b51233b79eb4977c98bd83ccdba0612c3c17ecddacd6d7c7b283dc6ffc935eeb7a5b1a099324e9af WHIRLPOOL d8517f2b6a769201246a5072c971880b4ae52cdfc8aec2f619cd642337eb3cfdf5abee06aa91792a8380c0d81f9a68949a9efa3f44a29a3218b8d9bea8601802
--- a/dev-python/hgtools/hgtools-6.0.ebuild
+++ b/dev-python/hgtools/hgtools-6.0.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hgtools/hgtools-6.0.ebuild,v 1.1 2014/06/12 06:44:54 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Classes and setuptools plugin for Mercurial repositories"
+HOMEPAGE="https://bitbucket.org/jaraco/hgtools/"
+SRC_URI="mirror://pypi/h/${PN}/${P}.zip"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+
+DEPEND="app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+RDEPEND="dev-vcs/mercurial"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	pushd "${BUILD_DIR}"/../ > /dev/null
+	py.test "${PN}"/tests || die
+}
--- a/dev-python/irc/Manifest
+++ b/dev-python/irc/Manifest
@ -1,4 +1,5 @@
 DIST irc-8.5.1.zip 112916 SHA256 ff29edb5c51bbf6583f60f677e846b3eb651374c2f6b39800e4b4947c989b8db SHA512 02f09b4c7dc4036ececc2aff97f761ddbc950dfebae298e95381d706f3b8be65704ad0a64ea9b581b5ce48f2a060beeb8b6ac5179a29844fe8e821502fc0d4a9 WHIRLPOOL e24d1a8155dd79e840aceb085f0a6d6fd0c0cafb356c64604c01555d4a6189e8e8dbc4824f74d58c45731615d24fe1606987b70dacf40375354134d200373d13
 DIST irc-8.5.3.zip 113424 SHA256 80454990b8b6ce2c8747cc92be817e1fe3eb2963b4659a70850d765b3a42773e SHA512 33f75d1784a267afd250d1164e43556bf1af37eb3846fdcb9e536ce008687487d2d46228219da3e9cd1e817f37c1d93e1aebf9a8627f798af04134161999c71f WHIRLPOOL cf6c23d7e458ec47ea95f18c1af6a756dfb26c3844cbb8d2d507bf4b98f7572da50a729d27ff21d9377ad3bfbea84438e641de9abeb65d17db8de92eecbf7059
 DIST irc-8.5.4.zip 113715 SHA256 92eaa2287240e770ba5fd34327aa69612cf27caba9f51e3116d5951b438f470e SHA512 2b5905e9d20025a11f665810da2cfea9d73b7d2274e7593b523871760727a8021cb9d041594ed16df2eb7e8c094d284f36056ffce9ae64e01b5d0f2dde0b1e7a WHIRLPOOL 16b31ca81398c18e4d3ae6aef2bc83994a06b30b1c55531a551664160969e419900feae1c3de10e541fec34ac5cade8b0c4a0fece32f6ed76df95b19e6b709f1
+DIST irc-8.9.1.zip 119769 SHA256 86f788293b2d924e1b71564a528f8e850135a271dcc45827577920188d4e5afc SHA512 0eae42a45b3b2e35b5a4da0d15f1e142ad28a0dadbfcb8d44efbc93648aaeda91019e084e8dba6d660c834e9bdcf0724a86a49194360ba5ab825573ea8ebc9cb WHIRLPOOL 05bf070a4103d6b33ae179d9be20733a633bf3f5caec363fd7cac05faee18465fd9adaeb6f1106747520c38bc2b31ca9c91b5b548878a4262a91d5765f9ff5e3
 DIST irc-8.9.zip 119554 SHA256 61b3fad6495a6689419e1bc620c58978214d4636a30bedc532b7941e50764ab5 SHA512 515bdc7bf8c7496f367e9d8ba4f1225de6033d8f2ce97626e97065cf7f7be39cecf909bea93d2cbb35c89811d84cf62bfd6c510d0ee621903f77e2e9fcf5d593 WHIRLPOOL 701bd7d11ebc02028b10f281f88c29df84ce2f8e88e3359a5b3d7b76f81fbd10657d3c8e10f129bb1ce2edc19990ecb0cdbf27ae3e09897c4d9e16903287e547
--- a/dev-python/irc/irc-8.9.1.ebuild
+++ b/dev-python/irc/irc-8.9.1.ebuild
@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/irc/irc-8.9.1.ebuild,v 1.2 2014/06/12 06:51:12 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+
+inherit distutils-r1
+
+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 test"
+
+DEPEND="app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/jaraco-utils[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}] )"
+
+RDEPEND="!>=dev-python/python-irclib-3.2.2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}/irc-8.5.1-setup_requires.patch"
+)
+
+python_prepare_all() {
+	# 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-r1_python_prepare_all
+}
+
+python_test() {
+	py.test irc/tests || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( scripts/. )
+	distutils-r1_python_install_all
+}
--- a/dev-python/jaraco-utils/Manifest
+++ b/dev-python/jaraco-utils/Manifest
@ -0,0 +1 @@
+DIST jaraco.util-10.0.2.zip 83375 SHA256 da136010c98f1ceaaa02ab1a201da45d3b2d59348fac8e3c7b1ddb61825ca872 SHA512 9522d0923db0637b605a11014104fbf6d86fc014fa1d065610df0cf8fe18dc5f962c8f4e4a3822c9223b434fbd252a99ac1949e52f7c9774642244f7a25e12e1 WHIRLPOOL 5dc4bdcf744e0fda210a3f1b5de6f5c8ff73c179586873b28cab309f320c662591442c63ae3cbdd2b3187ab56bb9d541839e40525baf1b15d79719015ebf20bc
--- a/dev-python/jaraco-utils/jaraco-utils-10.0.2.ebuild
+++ b/dev-python/jaraco-utils/jaraco-utils-10.0.2.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jaraco-utils/jaraco-utils-10.0.2.ebuild,v 1.3 2014/06/12 06:48:11 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+
+inherit distutils-r1
+
+MY_PN="jaraco.util"
+DESCRIPTION="General utility modules that supply commonly-used functionality"
+HOMEPAGE="http://pypi.python.org/pypi/jaraco.util"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/hgtools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}] )
+	"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_test() {
+	py.test tests || die "Tests failed under ${EPYTHON}"
+}
--- a/dev-python/jaraco-utils/metadata.xml
+++ b/dev-python/jaraco-utils/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+	<upstream>
+		<remote-id type="pypi">jaraco.utils</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@ -0,0 +1 @@
+DIST more-itertools-2.2.tar.gz 19807 SHA256 93e62e05c7ad3da1a233def6731e8285156701e3419a5fe279017c429ec67ce0 SHA512 579a778b91607800c4000a30c7509e9fc44ad1d35598ab9041b547aca9d94b811d3fc0abf5c84413fb70be87eb20177685a8a30dc7146a005fa1eb82986294f8 WHIRLPOOL 75ad77394757b30709700957f20136029100eb0e6a42ca7a031a54f0bc71fc926eb552c1b29b0b92af175a618ae826c6380c2919ae3e74d60fa3423e352a9c37
--- a/dev-python/more-itertools/metadata.xml
+++ b/dev-python/more-itertools/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+	<upstream>
+		<remote-id type="pypi">more-itertools</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-python/more-itertools/more-itertools-2.2.ebuild
+++ b/dev-python/more-itertools/more-itertools-2.2.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/more-itertools/more-itertools-2.2.ebuild,v 1.2 2014/06/12 06:47:01 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="More routines for operating on iterables, beyond itertools"
+HOMEPAGE="http://pypi.python.org/pypi/${PN}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND=""
+RDEPEND=""
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@ -1,3 +1,4 @@
 DIST pbr-0.5.23.tar.gz 128773 SHA256 032903366eabe6a388dfd6fdc1f4ef72558d7b9be6313bc24619c2a8d71b6087 SHA512 91889672e8c7cc6949c6e1180728f04242d546d112ac5dbe1d3b63e3a6c293072d68a1c95fdfd4d68404261d459270768e5d77b1a5596f3f0547e246c52a585d WHIRLPOOL 744b12fae6292f90330b81459b046ca91031918ad2ea0d56baebe40671f5bde85ab13d83263899d3a36b424788f9e15f5bc427a00dd0eb899def0c8a46cc2d7f
 DIST pbr-0.7.0.tar.gz 78021 SHA256 1680e9add47561abf6aed6c18d5d9bf3c8b8f22bd9931373f28348e10c5b9fce SHA512 14ff8996aa3ea20c65c8a9121efc8b7ef0c75b352994ac6aeba11b4bac4a4dc07015b31dbcb0f27097b02a3725f4b999d7967908db25ff6f93b9fa684e3c1095 WHIRLPOOL 77dd7840924edcc5c93294e495f6b5ccd6d9ae7024324f20ca2a124b19ef07d15d491aabede7daf51e830512e31918d403509e6804d5518e95b32285c781949f
 DIST pbr-0.8.0.tar.gz 75217 SHA256 799cbdd896806ffa736bca0021aa61619fee5813148f8418366c690af80ee94a SHA512 feae0eab60a5f64ac8dda519af6b9e671014d42a3ae77cd15080b034872d1d69e87f754caf082479943def7ff5bfb11a3b1524de236e189bc496e3688791aff4 WHIRLPOOL 9dc0b71af8a358e3924cf171d21d0150b4866fcde5352ba65259890f5fcce048c2c974b6f956114be31374893c9fdc56268fc156014db3a3e1dcbbbb67128bd9
+DIST pbr-0.8.2.tar.gz 77790 SHA256 eef2ace8d65d5902582cbc9ad3b2ecff0e86a6f90ad4837d8b17d568dd9dd20e SHA512 76d7d4c97660d5a6bbe9a33498a93b32528073024520e570739c511c0138ba1af7e35139bf77ca2a94063e5979baccd6252619449d6aed546fd1331be81ab52a WHIRLPOOL d6331fcd6e7d4eb750e3285e92fd21dfdfbb054b880f954156d1e781025a0c0e1c464e0c23cad587799ceba787928af092d34071eb0a5c4595b0e8aa6db52ff0
--- a/dev-python/pbr/pbr-0.8.2.ebuild
+++ b/dev-python/pbr/pbr-0.8.2.ebuild
@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pbr/pbr-0.8.2.ebuild,v 1.1 2014/06/12 08:32:26 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="PBR is a library that injects some useful and sensible default
+behaviors into your setuptools run."
+HOMEPAGE="https://github.com/openstack-dev/pbr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+		>=dev-python/flake8-2.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}] )"
+RDEPEND=">dev-python/pip-1.4[${PYTHON_USEDEP}]"
+
+# Requ'd for testsuite
+DISTUTILS_IN_SOURCE_BUILD=1
+# You can do this in about 3 different ways; throw it in a src_test() and prepend it to a
+# distutils-r1_src_test or os it a distutils-r1_python_test, but really it makes for a HUGE 'meh'
+
+# This normally actually belongs here.
+python_prepare_all() {
+	# This test passes when run within the source and doesn't represent a failure, but rather
+	# a gentoo sandbox constraint
+	sed -e s':test_console_script_develop:_&:' -i pbr/tests/test_core.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	testr init
+	testr run || die "Testsuite failed under ${EPYTHON}"
+	flake8 "${PN}"/tests || die "Run over tests folder by flake8 drew error"
+}
--- a/dev-python/pyoembed/Manifest
+++ b/dev-python/pyoembed/Manifest
@ -0,0 +1 @@
+DIST pyoembed-0.1.tar.gz 12764 SHA256 6e9fd950a12f34ec2f94a40bd4b6aca5c09a64bc7df82f27689ebdecb7b7c487 SHA512 539aa9c45c4a65a9605e1a13b59e914bb3bccf8b873b03212f5c90cdb3e4eea8290cfd274a33e6c8cac08210890b69bb52714eae781b79fe9eae5fa3d71e5be7 WHIRLPOOL 68260b017ace054c2011d9ced26b246a1cd7af0d722ee74aa5ce50257aeb53c38aaf8bb91f928249ef05409b632ae15dbdda004a8070fc788894c98377c11089
--- a/dev-python/pyoembed/metadata.xml
+++ b/dev-python/pyoembed/metadata.xml
@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>rafaelmartins@gentoo.org</email>
+		<name>Rafael G. Martins</name>
+	</maintainer>
+	<longdescription lang="en">
+		A Python library for oEmbed that supports auto-discovered and manually included providers.
+	</longdescription>
+	<upstream>
+		<maintainer status="active">
+			<email>rafaelmartins@gentoo.org</email>
+			<name>Rafael G. Martins</name>
+		</maintainer>
+		<remote-id type="pypi">pyoembed</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-python/pyoembed/pyoembed-0.1.ebuild
+++ b/dev-python/pyoembed/pyoembed-0.1.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyoembed/pyoembed-0.1.ebuild,v 1.1 2014/06/12 03:06:08 rafaelmartins Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for oEmbed with auto-discovered and manually added providers."
+HOMEPAGE="https://github.com/rafaelmartins/pyoembed"
+
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI=
+	KEYWORDS=
+	EGIT_REPO_URI="git://github.com/rafaelmartins/pyoembed.git
+		https://github.com/rafaelmartins/pyoembed.git"
+	inherit git-r3
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+python_test() {
+	esetup.py test
+}
--- a/dev-python/pyoembed/pyoembed-9999.ebuild
+++ b/dev-python/pyoembed/pyoembed-9999.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyoembed/pyoembed-9999.ebuild,v 1.1 2014/06/12 03:06:08 rafaelmartins Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for oEmbed with auto-discovered and manually added providers."
+HOMEPAGE="https://github.com/rafaelmartins/pyoembed"
+
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI=
+	KEYWORDS=
+	EGIT_REPO_URI="git://github.com/rafaelmartins/pyoembed.git
+		https://github.com/rafaelmartins/pyoembed.git"
+	inherit git-r3
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+python_test() {
+	esetup.py test
+}
--- a/dev-python/stevedore/stevedore-0.15-r1.ebuild
+++ b/dev-python/stevedore/stevedore-0.15-r1.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/stevedore/stevedore-0.15-r1.ebuild,v 1.1 2014/06/12 08:35:58 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Manage dynamic plugins for Python applications"
+HOMEPAGE="https://github.com/dreamhost/stevedore"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		virtual/python-argparse[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+		test? ( dev-python/nose[${PYTHON_USEDEP}]
+				dev-python/mock[${PYTHON_USEDEP}]
+				dev-python/coverage[${PYTHON_USEDEP}]
+				dev-python/flake8[${PYTHON_USEDEP}] )
+		doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+				dev-python/pillow[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	if use doc; then
+		mkdir docs/source/_build || die
+		sphinx-build -b html -c docs/source docs/source/ docs/source/_build
+	fi
+}
+
+python_test() {
+	nosetests -d --with-coverage --cover-inclusive --cover-package stevedore \
+		|| die "Tests failed under ${EPYTHON}"
+	flake8 stevedore setup.py || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/source/_build/. )
+	distutils-r1_python_install_all
+}
--- a/dev-python/subunit/subunit-0.0.18-r1.ebuild
+++ b/dev-python/subunit/subunit-0.0.18-r1.ebuild
@ -0,0 +1,61 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/subunit/subunit-0.0.18-r1.ebuild,v 1.1 2014/06/12 07:57:39 patrick Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy2_0 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A streaming protocol for test results"
+HOMEPAGE="https://launchpad.net/subunit http://pypi.python.org/pypi/python-subunit"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+#need to keyword the following in =dev-python/extras-0.0.3 then readd the keywords here
+#ia64 s390 sh sparc amd64-fbsd
+IUSE="static-libs"
+
+RDEPEND=">=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
+	dev-python/extras[${PYTHON_USEDEP}]"
+#	test? ( dev-python/testscenarios[${PYTHON_USEDEP}] )
+#requires keywording first; Bug #506510
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-lang/perl
+	dev-libs/check
+	dev-util/cppunit
+	virtual/pkgconfig"
+#requires keywording first; Bug #506510
+RESTRICT="test"
+
+src_configure() {
+	econf --enable-shared $(use_enable static-libs static)
+	distutils-r1_src_configure
+}
+
+src_compile() {
+	emake
+	distutils-r1_src_compile
+}
+
+python_test() {
+	local -x PATH="${PWD}/shell/share:${PATH}"
+	local -x PYTHONPATH=python
+	"${PYTHON}" -m testtools.run all_tests.test_suite || die "Testing failed with ${EPYTHON}"
+}
+
+src_install() {
+	local targets=(
+		install-include_subunitHEADERS
+		install-pcdataDATA
+		install-exec-local
+		install-libLTLIBRARIES
+	)
+	emake DESTDIR="${D}" "${targets[@]}"
+	prune_libtool_files
+	distutils-r1_src_install
+}
--- a/dev-python/sympy/Manifest
+++ b/dev-python/sympy/Manifest
@ -1,4 +1,2 @@
-DIST sympy-0.7.3-py3.2.tar.gz 6378901 SHA256 93f9062033e4ab2a701cb6653564297ddbba846f7cb2dc1a53598293a7f29fcc SHA512 d79f3873fd23a3c43ed0d36a90d3436a0fa24dbd9eb42248a9242438d749dad19780c8ccea445e35ce124837088e37359eea5f673c27c2c36ae521bc708c28fe WHIRLPOOL b119eba2a36af02cb02632202e9481b8368bc76c7ba8085e1ccae4048cc69eebb41db345f3de30fcf89ca91b5c868e03c014c1de0890df0caa053f735b615ccc
-DIST sympy-0.7.3.tar.gz 6379972 SHA256 bdc4c8eee7397eee2a86b1ea4fd8eed932941a19207f646f0ca48526f44b2f20 SHA512 2992baa3edfb4e1842fb642abf0bf0fc0bf56fc183aab8fed6b3c42fbea928fa110ede7fdddea2d63fc5953e8d304b04da433dc811134fadefb1eecc326121b8 WHIRLPOOL e2e482e54bfca2f1a3db657831d27fa03c12173c13c50430b06a28ab40a9666efa70a2c2e60bf53e8b23fd57bbbe91a82e29e6a4eb4b9a97d07216eea33c3d3e
 DIST sympy-0.7.4.1-system-mpmath.patch.gz 7350 SHA256 d7f2acd0ccfb06eb8c102dd7fae2325b35a5105a5853e01dcb863c0841dedc75 SHA512 761cdc6259101d6023d83cfea311a5547762c192b3c661ab3bc0ded20911ce464d0326a9b16d899ad35280a65046e621670e7de64ec40df740bfeb8bf667fb3d WHIRLPOOL 24693863da03dab6ed67131f46c4e18dfdc8110d0a23f49825dcb835909fa157781791680cfe46092c41c526fe281370aa7ce341f7fbccae02351d34c29bffd3
 DIST sympy-0.7.4.1.tar.gz 6824862 SHA256 51a8c2377c240a2cdb418bc59dac9ab106258196d04ce131d06806dbea2af456 SHA512 8d4d87428c202407ff364ef503634529500c1656cf5ddbb4de19b838499593c58d227f0b619541ce86cdc15157e3a5b48a95c906a5d05d4606ef95f1aa8fa2dc WHIRLPOOL 620d255e0cf289ac392328ad64e93d93489d8664df13498bac8933221c8edb80a45a8ea26da6cb8e1139ec2ca159c8f83ad196d96ee6afceb4fc8bb2a0eccfd7
--- a/dev-python/sympy/sympy-0.7.3.ebuild
+++ b/dev-python/sympy/sympy-0.7.3.ebuild
@ -1,239 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sympy/sympy-0.7.3.ebuild,v 1.3 2013/12/28 20:31:19 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Computer algebra system (CAS) in Python"
-HOMEPAGE="http://sympy.org/ https://github.com/sympy/sympy"
-SRC_URI="
-	python_targets_python2_6? ( https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz )
-	python_targets_python2_7? ( https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz )
-	python_targets_python3_2? ( https://github.com/${PN}/${PN}/releases/download/${P}/${P}-py3.2.tar.gz )
-	python_targets_python3_3? ( https://github.com/${PN}/${PN}/releases/download/${P}/${P}-py3.2.tar.gz )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos"
-IUSE="doc examples gtk imaging ipython latex mathml opengl pdf png pyglet system-mpmath test texmacs"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	mathml? (
-		dev-libs/libxml2:2[${PYTHON_USEDEP}]
-		dev-libs/libxslt[python_targets_python2_6?,python_targets_python2_7?]
-		gtk? ( x11-libs/gtkmathview[gtk] ) )
-	latex? (
-		virtual/latex-base
-		dev-texlive/texlive-fontsextra
-		png? ( app-text/dvipng )
-		pdf? ( app-text/ghostscript-gpl ) )
-	texmacs? ( app-office/texmacs )
-	ipython? ( dev-python/ipython[${PYTHON_USEDEP}] )
-	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
-	imaging? ( virtual/python-imaging[${PYTHON_USEDEP}] )
-	pyglet? ( dev-python/pyglet[python_targets_python2_6?,python_targets_python2_7?] )
-	>=dev-python/pexpect-2.0[python_targets_python2_6?,python_targets_python2_7?]
-	system-mpmath? ( ~dev-python/mpmath-0.17[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}"
-
-system_mpmath() {
-	local MPMATH_FILES
-	MPMATH_FILES="
-		sympy/combinatorics/permutations.py \
-		sympy/core/containers.py \
-		sympy/core/evalf.py \
-		sympy/core/expr.py \
-		sympy/core/function.py \
-		sympy/core/numbers.py \
-		sympy/core/power.py \
-		sympy/core/sets.py \
-		sympy/core/tests/test_evalf.py \
-		sympy/core/tests/test_numbers.py \
-		sympy/core/tests/test_sets.py \
-		sympy/core/tests/test_sympify.py \
-		sympy/external/tests/test_numpy.py \
-		sympy/functions/combinatorial/numbers.py \
-		sympy/functions/combinatorial/tests/test_comb_numbers.py \
-		sympy/functions/special/bessel.py \
-		sympy/functions/special/gamma_functions.py \
-		sympy/functions/special/hyper.py \
-		sympy/functions/special/tests/test_hyper.py \
-		sympy/matrices/matrices.py \
-		sympy/ntheory/partitions_.py \
-		sympy/physics/quantum/constants.py \
-		sympy/physics/quantum/qubit.py \
-		sympy/plotting/experimental_lambdify.py \
-		sympy/plotting/intervalmath/interval_arithmetic.py \
-		sympy/polys/numberfields.py \
-		sympy/polys/polytools.py \
-		sympy/polys/rootoftools.py \
-		sympy/polys/domains/__init__.py \
-		sympy/polys/domains/algebraicfield.py \
-		sympy/polys/domains/domain.py \
-		sympy/polys/domains/expressiondomain.py \
-		sympy/polys/domains/finitefield.py \
-		sympy/polys/domains/fractionfield.py \
-		sympy/polys/domains/gmpyintegerring.py \
-		sympy/polys/domains/gmpyrationalfield.py \
-		sympy/polys/domains/groundtypes.py \
-		sympy/polys/domains/mpmathcomplexdomain.py \
-		sympy/polys/domains/mpmathrealdomain.py \
-		sympy/polys/domains/polynomialring.py \
-		sympy/polys/domains/pythoncomplexdomain.py \
-		sympy/polys/domains/pythonintegerring.py \
-		sympy/polys/domains/pythonrationalfield.py \
-		sympy/polys/domains/pythonrealdomain.py \
-		sympy/polys/domains/quotientring.py \
-		sympy/polys/domains/sympyintegerring.py \
-		sympy/polys/domains/sympyrationalfield.py \
-		sympy/polys/domains/sympyrealdomain.py \
-		sympy/polys/tests/test_domains.py \
-		sympy/printing/latex.py \
-		sympy/printing/repr.py \
-		sympy/printing/str.py \
-		sympy/simplify/simplify.py \
-		sympy/simplify/tests/test_hyperexpand.py \
-		sympy/solvers/solvers.py \
-		sympy/solvers/tests/test_numeric.py \
-		sympy/statistics/distributions.py \
-		sympy/statistics/tests/test_statistics.py \
-		sympy/utilities/decorator.py \
-		sympy/utilities/lambdify.py \
-		sympy/utilities/runtests.py \
-		sympy/utilities/tests/test_code_quality.py \
-		sympy/utilities/tests/test_lambdify.py \
-		examples/advanced/pidigits.py \
-		examples/advanced/autowrap_ufuncify.py"
-		rm -rf sympy/mpmath/* || die
-		sed \
-			-e "s:sympy\.mpmath:mpmath:g" \
-			-e "s:from sympy import mpmath:import mpmath:g" \
-			-i ${MPMATH_FILES} || die "failed to patch mpmath imports"
-		epatch "${FILESDIR}"/${P}-mpmath.patch
-}
-
-python_unpack() {
-	if ! python_is_python3; then
-		mkdir "${WORKDIR}"/python2
-		cd "${WORKDIR}"/python2 || die
-		unpack ${P}.tar.gz
-	fi
-	if python_is_python3; then
-		mkdir "${WORKDIR}"/python3
-		cd "${WORKDIR}"/python3 || die
-		unpack ${P}-py3.2.tar.gz
-	fi
-}
-
-src_unpack() {
-	python_foreach_impl python_unpack
-}
-
-python_prepare() {
-	if use system-mpmath; then
-		if ! python_is_python3; then
-			cd "${WORKDIR}"/python2/${P} || die
-			system_mpmath
-		fi
-		if python_is_python3; then
-			cd "${WORKDIR}"/python3/${P} || die
-			system_mpmath
-		fi
-	fi
-}
-
-src_prepare() {
-	python_foreach_impl python_prepare
-}
-
-python_compile() {
-	local _py
-	if python_is_python3; then
-		_py=3
-	else
-		_py=2
-	fi
-
-	cd "${WORKDIR}"/python${_py}/${P} || die
-	export S="${WORKDIR}"/python${_py}/${P}
-
-	PYTHONPATH="." distutils-r1_python_compile
-}
-
-python_compile_all() {
-	local _py
-	if use doc; then
-		export XDG_CONFIG_HOME="${T}/config-dir"
-		mkdir "${XDG_CONFIG_HOME}" || die
-		chmod 0700 "${XDG_CONFIG_HOME}" || die
-		if python_is_python3; then
-			_py=3
-		else
-			_py=2
-		fi
-
-		cd "${WORKDIR}"/python${_py}/${P}/doc || die
-		emake html
-
-	fi
-}
-
-python_test() {
-	local _py
-	if python_is_python3; then
-		_py=3
-	else
-		_py=2
-	fi
-
-	cd "${WORKDIR}"/python${_py}/${P} || die
-	PYTHONPATH="." py.test || ewarn "tests with ${EPYTHON} failed"
-}
-
-python_install() {
-	local _py
-	if python_is_python3; then
-		_py=3
-	else
-		_py=2
-	fi
-
-	cd "${WORKDIR}"/python${_py}/${P} || die
-	export S="${WORKDIR}"/python${_py}/${P}
-
-	PYTHONPATH="." distutils-r1_python_install
-}
-
-python_install_all() {
-	local _py
-	distutils-r1_python_install_all
-	if python_is_python3; then
-		_py=3
-	else
-		_py=2
-	fi
-
-	cd "${WORKDIR}"/python${_py}/${P} || die
-	use doc && dohtml -r doc/_build/html/*
-
-	if use examples; then
-		insinto /usr/share/doc/${P}
-		doins -r examples
-	fi
-	if use texmacs; then
-		exeinto /usr/libexec/TeXmacs/bin/
-		doexe data/TeXmacs/bin/tm_sympy
-		insinto /usr/share/TeXmacs/plugins/sympy/
-		doins -r data/TeXmacs/progs
-	fi
-}
--- a/dev-python/testrepository/testrepository-0.0.18-r1.ebuild
+++ b/dev-python/testrepository/testrepository-0.0.18-r1.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testrepository/testrepository-0.0.18-r1.ebuild,v 1.1 2014/06/12 08:14:26 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A repository of test results."
+HOMEPAGE="https://launchpad.net/testscenarios"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		test? ( ${RDEPEND}
+			dev-python/testresources[${PYTHON_USEDEP}]
+			dev-python/testscenarios[${PYTHON_USEDEP}]
+			dev-python/pytz[${PYTHON_USEDEP}]
+		)"
+#bzr is listed but presumably req'd for a live repo test run
+RDEPEND=">=dev-python/subunit-0.0.10[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.30[${PYTHON_USEDEP}]
+		dev-python/fixtures[${PYTHON_USEDEP}]"
+
+# Required for test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	"${PYTHON}" ./testr init || die
+	"${PYTHON}" setup.py testr --coverage || die "tests failed under ${EPYTHON}"
+}
--- a/dev-python/testresources/testresources-0.2.7-r2.ebuild
+++ b/dev-python/testresources/testresources-0.2.7-r2.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testresources/testresources-0.2.7-r2.ebuild,v 1.1 2014/06/12 08:13:42 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Testresources, a pyunit extension for managing expensive test resources."
+HOMEPAGE="https://launchpad.net/testresources"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		test? ( dev-python/nose[${PYTHON_USEDEP}]
+				dev-python/testtools[${PYTHON_USEDEP}]
+				dev-python/fixtures[${PYTHON_USEDEP}]
+				virtual/python-unittest2[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+python_test() {
+	nosetests || die "Tests failed under ${EPYTHON}"
+}
--- a/dev-python/testscenarios/testscenarios-0.4-r5.ebuild
+++ b/dev-python/testscenarios/testscenarios-0.4-r5.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testscenarios/testscenarios-0.4-r5.ebuild,v 1.1 2014/06/12 08:13:26 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy2_0 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Testscenarios, a pyunit extension for dependency injection"
+HOMEPAGE="https://launchpad.net/testscenarios"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/testtools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+		dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	PYTHONPATH=./lib ${EPYTHON} -m testtools.run testscenarios.test_suite
+}
--- a/dev-python/testtools/testtools-0.9.35-r1.ebuild
+++ b/dev-python/testtools/testtools-0.9.35-r1.ebuild
@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/testtools-0.9.35-r1.ebuild,v 1.1 2014/06/12 08:10:28 patrick Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1 versionator
+
+#SERIES="$(get_version_component_range 1-2)"
+SERIES="trunk"
+
+DESCRIPTION="Extensions to the Python unittest library"
+HOMEPAGE="https://launchpad.net/testtools http://pypi.python.org/pypi/testtools"
+SRC_URI="http://launchpad.net/${PN}/${SERIES}/${PV}/+download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="test"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+RDEPEND="dev-python/mimeparse[${PYTHON_USEDEP}]
+		dev-python/extras[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7) )"
+
+python_test() {
+	# https://bugs.launchpad.net/testtools/+bug/1191725
+	# https://bugs.launchpad.net/testtools/+bug/1191725
+	# These tests pass run from the source, a gentooism
+	if ! python_is_python3; then
+		sed -e s':test_deferredruntest:#&:g' \
+		-e s':test_spinner:#&:g' \
+		-i ${PN}/tests/__init__.py || die
+	fi
+	# Bug 509510 re python-2.7.6
+	esetup.py test
+}
--- a/dev-python/testtools/testtools-0.9.35.ebuild
+++ b/dev-python/testtools/testtools-0.9.35.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/testtools-0.9.35.ebuild,v 1.1 2014/05/04 05:33:06 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/testtools-0.9.35.ebuild,v 1.3 2014/06/12 08:10:28 patrick Exp $

 EAPI=5

-PYTHON_COMPAT=( python{2_7,3_3} pypy )
+PYTHON_COMPAT=( python{2_7,3_2,3_3} pypy )

 inherit distutils-r1 versionator

--- a/dev-python/virtualenv-clone/virtualenv-clone-0.2.4-r2.ebuild
+++ b/dev-python/virtualenv-clone/virtualenv-clone-0.2.4-r2.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/virtualenv-clone/virtualenv-clone-0.2.4-r2.ebuild,v 1.1 2014/06/12 08:43:23 patrick Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A script for cloning a non-relocatable virtualenv."
+HOMEPAGE="http://github.com/edwardgeorge/virtualenv-clone"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
--- a/dev-python/virtualenvwrapper/Manifest
+++ b/dev-python/virtualenvwrapper/Manifest
@ -2,3 +2,4 @@ DIST virtualenvwrapper-3.7.1.tar.gz 185612 SHA256 d0ed67857b1eec1c923bdbeef41b6d
 DIST virtualenvwrapper-4.0.tar.gz 182642 SHA256 fe62ea3b8a4e177789092c9412fe2ea1a2c8efd0281216f16887e475bde44210 SHA512 c3705b9f76064b0b8f81a3a77eba54c376571d46291bf2bc85cb238bc6e2c0ea8a3a8d3b3266dcd4fa310e0406fe486371cfccc1e1bdcbf17e12a3dd1581c97e WHIRLPOOL d376213fd4dbdbacb51ce9a56a509226b3d1aedd54a5c120917006eb18312e99657692dc623f3ca92ce697ceb0a002c453ae7f927bcf37e7274efe53334e7394
 DIST virtualenvwrapper-4.1.1.tar.gz 81070 SHA256 47ab05af0bc7f146bdd4a77a978e02a1f4e1db6a0546e836e2442fa0990d7d77 SHA512 9b9e7d70d66feecd3962d6f8d365aabbcf4fced1fa5ddc5ac2737db7567cab6caad56db79a4f13ced98efdf2deb740a42e03c13eafcadc0259ffbead9c1fd452 WHIRLPOOL bd9e55cc2a6e0a3c89ee1f5671ca0a2f486df90bcf28868cfd756eac2b5a3926f3bd3cb595520eaccadfc56ec7fc5a3468d2991137ec7877448254528c50d4bb
 DIST virtualenvwrapper-4.2.tar.gz 125144 SHA256 cbc7f3587d5c3f23ef4e75fba166c7d4b278dff044d915cb9070845d2a89033e SHA512 3ba9b54140444e87f9309e5982b93bd4c5b265e70e39c1350949bbb3b05c1339461faf2264d493ba8ca3365854286d1016e5e36dcce62dff43288b64b62f5ce4 WHIRLPOOL da273124cd8d388842bf94516377b9214e63b3bb37e76e25a53dfa5c7bac60d39bfb6c34555756637f8d0f493041590222f152dfea5272c1e5b3a311149fc8af
+DIST virtualenvwrapper-4.3.tar.gz 92567 SHA256 514cbc22218347bf7b54bdbe49e1a5f550d2d53b1ad2491c10e91ddf48fb528f SHA512 48e2f41d5695641ad236901250a9cd51638f138d44d03f2d84042dd5ef7ff6e7410c28b10f129266b548a8a570672918d6365b81c074d03c847861746ace7984 WHIRLPOOL b814544f5226ad501ecd20353c84a4f668e078ba0b24a37095ca9c55c29892e2731866ba6141e8890d70928f640778cc63a3bbd09d90744c7c1c3a71a27b5ab6
--- a/dev-python/virtualenvwrapper/virtualenvwrapper-4.3.ebuild
+++ b/dev-python/virtualenvwrapper/virtualenvwrapper-4.3.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/virtualenvwrapper/virtualenvwrapper-4.3.ebuild,v 1.1 2014/06/12 08:43:54 patrick Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="virtualenvwrapper is a set of extensions to Ian Bicking's virtualenv tool"
+HOMEPAGE="http://www.doughellmann.com/projects/virtualenvwrapper http://pypi.python.org/pypi/virtualenvwrapper"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT=test
+
+RDEPEND="dev-python/virtualenv[${PYTHON_USEDEP}]
+	dev-python/stevedore[${PYTHON_USEDEP}]
+	dev-python/virtualenv-clone[${PYTHON_USEDEP}]"
+DEPEND="${DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/tox[${PYTHON_USEDEP}] )"
+
+src_prepare() {
+	sed -e 's:-o shwordsplit::' -i tests/run_tests || die
+}
+
+python_test() {
+	tox tests/test_cp.sh || die "Tests failed under ${EPYTHON}"
+}
--- a/dev-ruby/delayer/delayer-0.0.2.ebuild
+++ b/dev-ruby/delayer/delayer-0.0.2.ebuild
@ -1,10 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/delayer/delayer-0.0.2.ebuild,v 1.1 2014/06/11 07:39:01 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/delayer/delayer-0.0.2.ebuild,v 1.2 2014/06/12 06:02:21 graaff Exp $

 EAPI=5

 USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"

 inherit ruby-fakegem
@ -17,5 +19,5 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""

 all_ruby_prepare() {
-	sed -i -e '/bundler/d' Rakefile ${PN}.gemspec || die "sed failed"
+	sed -i -e '/bundler/d' Rakefile ${PN}.gemspec test/test_*.rb || die "sed failed"
 }
--- a/dev-ruby/docile/Manifest
+++ b/dev-ruby/docile/Manifest
@ -1 +1,2 @@
 DIST docile-1.1.3.gem 14336 SHA256 f7a439a6a117da82141541dbd9e6a5582baa23a5ae9a84b8ff434330c38acd1f SHA512 2a0091ae2a7fd8cea278984c769740c8ee7664de100822751588c01f2b2c1c1aa66647791e152a039097a3e0c3a6da938325a3d064965b5b1f6b23a8b2d29db0 WHIRLPOOL 4d6f6d76374fe3e50238703e82357076ddd24de7d2ccc50cde11e56bd891b9eedd745291d0370c4ab7fcfb5aa4097e4d53ce852fb57915790289a0ac33aa1597
+DIST docile-1.1.4.gem 14336 SHA256 76b1f9a24e08cf989418b20e5de02e2156182b30329f5514c89df27ac124ce0e SHA512 d879a6180756b365e7e2b33922179af71abf1fe0bbbeb04dbbc0ab1e549e5f04534b0dd323866a295090897ade5fbec99dae714b05d73645213e51c2c18f766f WHIRLPOOL 7e8144b5c812b550fed4b95d1a5cbc6372036a247c6fd4337e528b4afd38cd38a5d9c8d4f09c8bb14408bd7e2fe794721a106d8a0aefc99e1366f4352b3c9085
--- a/dev-ruby/docile/docile-1.1.4.ebuild
+++ b/dev-ruby/docile/docile-1.1.4.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/docile/docile-1.1.4.ebuild,v 1.1 2014/06/12 05:55:50 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21 jruby"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md HISTORY.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Turns any Ruby object into a DSL"
+HOMEPAGE="http://ms-ati.github.io/docile/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/require \"github\/markup\"/d' Rakefile || die
+}
--- a/dev-util/cmocka/cmocka-0.3.1-r1.ebuild
+++ b/dev-util/cmocka/cmocka-0.3.1-r1.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmocka/cmocka-0.3.1-r1.ebuild,v 1.1 2014/06/11 19:54:27 mgorny Exp $
+
+EAPI=5
+
+inherit cmake-multilib
+
+DESCRIPTION="A unit testing framework for C"
+HOMEPAGE="http://cmocka.org/"
+SRC_URI="https://open.cryptomilk.org/attachments/download/19/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc static-libs test"
+
+DEPEND="
+	doc? ( app-doc/doxygen[latex] )
+"
+RDEPEND=""
+
+PATCHES=( "${FILESDIR}/${PN}-automagicness.patch" )
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with static-libs STATIC_LIB)
+		$(cmake-utils_use test UNIT_TESTING)
+		$(multilib_is_native_abi && cmake-utils_use_with doc APIDOC \
+			|| echo -DWITH_APIDOC=OFF)
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use doc; then
+		pushd doc || die
+		doxygen doxy.config || die
+		rm -f html/*.md5 latex/*.md5 latex/Manifest man/man3/_* || die
+		dohtml html/*
+		dodoc latex/*
+		doman man/man3/*.3
+		popd || die
+	fi
+	cmake-utils_src_install
+}
--- a/eclass/ELT-patches/aix-noundef/1.4d
+++ b/eclass/ELT-patches/aix-noundef/1.4d
@ -1,12 +0,0 @@
--- ltmain.sh.orig	2009-12-06 22:35:17 +0100
-+++ ltmain.sh	2009-12-06 22:35:44 +0100
-@@ -1111,6 +1111,9 @@
-       # that all symbols are satisfied, otherwise we get a static library.
-       allow_undefined=yes
-       ;;
-+    *-aix*)
-+      allow_undefined=no
-+      ;;
-     *)
-       allow_undefined=yes
-       ;;
--- a/eclass/libtool.eclass
+++ b/eclass/libtool.eclass
@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.110 2014/01/13 19:49:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.111 2014/06/12 07:14:25 haubi Exp $

 # @ECLASS: libtool.eclass
 # @MAINTAINER:
@ -191,7 +191,7 @@ elibtoolize() {
 	[[ ${do_uclibc} == "yes" ]] && elt_patches+=" uclibc-conf uclibc-ltconf"

 	case ${CHOST} in
-		*-aix*)     elt_patches+=" hardcode aixrtl aix-noundef" ;; #213277
+		*-aix*)     elt_patches+=" hardcode aixrtl" ;; #213277
 		*-darwin*)  elt_patches+=" darwin-ltconf darwin-ltmain darwin-conf" ;;
 		*-solaris*) elt_patches+=" sol2-conf sol2-ltmain" ;;
 		*-freebsd*) elt_patches+=" fbsd-conf fbsd-ltconf" ;;
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r2.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r2.ebuild,v 1.1 2014/06/11 16:31:59 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r2.ebuild,v 1.2 2014/06/11 21:24:58 mgorny Exp $

 EAPI=5
 GCONF_DEBUG="no"
@ -152,5 +152,3 @@ multilib_src_install_all() {
 	DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
 	einstalldocs
 }
-
-
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@ -102,58 +102,6 @@ DIST thunderbird-17.0.9esr-uk.xpi 471142 SHA256 31b391426fbf0685f858e41d20cc4188
 DIST thunderbird-17.0.9esr-vi.xpi 478454 SHA256 02952f9e9797bbeafecfe760664222fb58dd64f21be0cd89b0eedc6068c49aec SHA512 79b93eece8c1f4514368f38e38aa3e4d0188f1550cf207d2cbff83f10ef29b13f886ac1995809618b61f280fb66af12ff4f6a93d7986f4c1ce091927284adff7 WHIRLPOOL b35d7a7ea02024131010ac934a77def68cab2535cc6a496be320fb2e655a3eb1d00799238b2613a3079d7df0fc7c7f15cd61be6a8b0714bfb2716b7b294b9525
 DIST thunderbird-17.0.9esr-zh-CN.xpi 436082 SHA256 0e7b80289addfd1cb030dd8d16a7fcb749ecb410504e4c50489e62cc5f0ccbeb SHA512 0f9db08d5973b38b49e056b42c3487219da7921a641c1a16daade5dcf064429b090c0d40b2c719a83932349b58bd137f0ca7fa313f6abf288f2e2be6c5178622 WHIRLPOOL 7e12310b57b9632652da0ddc259e349262c5512495c3bcbc4552c8d4819c59e39de9be1ff6971122caac4f04e8781fe2d5e867c467ef191c55d80131bcadc226
 DIST thunderbird-17.0.9esr-zh-TW.xpi 437591 SHA256 f44b738f76292ad20b87b1afa148e7cd13e60c4f4ddc456ac2cfb7dfcf9d836d SHA512 05ddc92a6df7c7f2ad1e5b55cfffe716ed54ae0ed64df72e3813823477d57e91bdfe3c3ae08bc544461e70e90cfdec997384031e04193a9761b122d315fc9e05 WHIRLPOOL dead2063e57d174daf6e9923ce21b6627642aca3579692f7c72c2e9dde14b62073b62fac6101d62063430349eb97f52044eb9db4f34e02f381944e6970354b1a
-DIST thunderbird-24.4.0-ar.xpi 457862 SHA256 ea847b5e42930343d2ec2e2f9182d59ff84d23b6a864e2c93eb0455cf452f296 SHA512 d751c3c155bd31d592e8fc8ba02dc4edeaaa235bec8b0899fb29cf0d813de617ed9e1a40c54209a4bb5ff10d43c78e96df44c2ef5dbfa0437ca2eedce4abffd3 WHIRLPOOL 7f2e9ee1cafaf4c63ffaf6ec3b92f4b1907860d5ac262fb4de557b709e2288bba730b9486d12fb67bd99bfcd90eae7558dc421046676e957c900220a7925c36e
-DIST thunderbird-24.4.0-ast.xpi 373831 SHA256 0ec76e7938dafb72e7fe94941dd9514223d8c5c3880cb4bfd92c2075c7a1528b SHA512 5dcf1118a7c8ee2effadda900f56b2cc575a0610d1dfe10b4fa7a25a9a380c0c9b996083fcfca63a227af5da0d5d5eedeec282e28ad9e0af8990af4606936f2d WHIRLPOOL ba272fccdb6c261c0206f29e1c7782e305ecc9154bc8a230a2729abf24b1e2574379aea85245cffe8c8a6e4843ada6ab729ea89a469111ae5a68e0411b37823f
-DIST thunderbird-24.4.0-be.xpi 416882 SHA256 f16da428ed0246b0f08e00bc0f23eddba4e524dd856b30e93628f7fe0a636fce SHA512 8e01f55f62d96c9e9826d6b58dcff0d6344cd96dac28e30359fb9ce8f825b92faeb33f986bceb75ccf83e13020a28cf8524f3b64213994ece330148693f1addb WHIRLPOOL 6856c45a5c98b0ae59b946d72bd62b1e34695cc26b796d291db2f88a29f1aac090a2054d0a6b5c8748a1798102fcf27f86128caad7c71e11df8063d03871f43e
-DIST thunderbird-24.4.0-bg.xpi 485023 SHA256 7d2e98470e62bb63c7acfd5f350cfb909598755b33ad2ff77d9792d3de341b7f SHA512 bb35c40f805cb7716f503f997e4034825a9e67d8118ca57f4bbb74f33e2faef33f07593fdae9ae9dc8c8d897266304cdc3fe9ad8ee9b1d4b6f389af9be322fb5 WHIRLPOOL 93913b6cdde59b5c29160a0d931e443b5a86891d6d9880a7c01dbd2f0e3d4f1f722b6aab71c9299be211cd7384a0204c44abab6d711a5373f9cf44f6015775f8
-DIST thunderbird-24.4.0-bn-BD.xpi 537257 SHA256 72afde682492061234e3887253fd10fccfc738677b952a5b2932d1963f181ed7 SHA512 785be7f62dcd1f662743bcf60b8a95192884e0f642827fe8d6be75d7abc22adf1c9135497114b572067c788ad27cce3a701db34a22c6814218778abe6fc30f49 WHIRLPOOL 41d590fe772ef11ec7e429f06460364a27ed0ff3b15e0953f6e3bc8eec5555ee2c4cb121ab4d4335a5c65a50558ec59610f86a699c2b3d0159ee22e24f4a6796
-DIST thunderbird-24.4.0-br.xpi 427679 SHA256 bf218d7f6d2eaf2f6444944de439cefe8f33e4e56a36eef83ee3e8986a98b944 SHA512 21a5584a13ab2dffc32477bb6e0c09d98e037b0632b5c8a8d5f0816fe0a0356c127c377bdfb77d2a68475bd0cabcffdd562d8186f2ecaea38d1566b191d92683 WHIRLPOOL 5a7ee546beb40b6dd8ff899277698801afc4445f02fbc92512c33891c7e0494a632b83e159cd2ffad570fe7e4481468c05fcba1f2ccac3f77d12061f1b19f89c
-DIST thunderbird-24.4.0-ca.xpi 429746 SHA256 7f22bd3ec7b29c272dd3c35062c2fb6d92cfbe248365d1e8ea9c86a1af83fdfd SHA512 27e7a69869753da0a72ff8cd0d27fb32e9d27d5681d83bbbdb7413ec1510d8d350798c1a108191aef3b58d7b4d58f13b682e55885323b1ad6af517fe7559e14b WHIRLPOOL 52669c05a34f80f61251e62121845ab160dae2b6ec27b36ce9b380b252e054853a6f64037cbf60edbdae59f078459c2cc6a88618707982d5062b8a421fd1ebca
-DIST thunderbird-24.4.0-cs.xpi 431476 SHA256 f139479d6984a6bf62b2a9ac398f16fd2ad057aa47115fae7072b50446877ede SHA512 3b5fa5940853fddc4b7428f4c10b81db15079c2c9ed881e801145c3c0f171fe3c01262907162361fec3bf9dc4a22b9259fbd575f6ad66c38a0b0c077ea03f4d0 WHIRLPOOL bfb8b34f78d13569ea386af8f6a627f2f5d1978de4a314580d819129efc9d84097d0a401d611e50f5b0eb66a6e625c7c53890d1d1cebce2309a6358948af30d5
-DIST thunderbird-24.4.0-da.xpi 409626 SHA256 0c59bf84b45dc399fa3090d3d34a5f27772630300115b10546fb7172823d0a4f SHA512 f74ce6c36341832ff4afccb2b64052f6400f424936a043b8203f71d21cba013d78b6a72783099ec08134e12bb12b005d4b0df07ee0a55000485225fb23867872 WHIRLPOOL f619c7768cc2f25ad6863de579bb5a9235e2bfde0618e4b7f9b790d060d67b617aacbd7740f55f37d2537de71a282e462080a0649dac3c5fe5dc6ed84c397bec
-DIST thunderbird-24.4.0-de.xpi 408674 SHA256 7bf488e61a07ab600b057921b117376eadf919a874e59f3350c16a171bcc5a5b SHA512 8a07d004664f97b5844eb7d43a239c6b04022c1d64046d8e1cfd50d5727e303e1639326576d3dbd41e1bda1241d8c8292461d707f9455f0dc336b0f8f2bb42ca WHIRLPOOL 3491abe38661c547dfaa77261b47af3586d7e70b75a9ec027e2063980d8d7d60e4a94bccc9fd4eed46b830f5064cef7fad2edf272a020477dfa058c675fdcf14
-DIST thunderbird-24.4.0-el.xpi 464552 SHA256 ba85515ab06c4255f2b0953c8a9f6e0d4ccf26f4a240e8972b29fbde708d08ce SHA512 33d7b01fb39abfa71d1352836f6b5565b4c02aef84bf8b9de1bf00d8928ee93849698b1bfb79b6e61a0c832afebc2d21ee0c0257a134afd059168957f3f75fb5 WHIRLPOOL e897e89364b0fdbec7812033433c7e5cc6d28245f027be3144ab6d82b5b289d6c762c2d300284a98850c4a547b584cfe8e3b71af07b449838932962a8a1ec3e1
-DIST thunderbird-24.4.0-en-GB.xpi 400962 SHA256 3ceb78e9d95e104113121d4667c25b48bdc2faedcab168884453765dd4994a8f SHA512 633a77c53b98f27f16f5b894ebc8b7bf304d534422618b7d23076d3e6a25481d12f6315843d3f918d1772897f82d0131e63aa4f6e2889fd7b5dc239a5d2b3d04 WHIRLPOOL 9acbaccbf15352116e7026f18dfaac97a97e5ebe07db0ea6314aed401ab92f71d9c0877d59779e7ff2db44e69487f2057a18c187ca81161b5c6e28a88f116276
-DIST thunderbird-24.4.0-es-AR.xpi 425657 SHA256 6ff2ec8f30aba2261dfa59b7fc3cf664502966e1d9247f2a0f6b0290b4752c0d SHA512 e5f953119ac1c99c8f967c13287571621eb46597ea9da1ab142d0597c6b264bf3c514b9fc70e8382a4cfa4f725daf9a908e9118a50d7d2ff9d8f6d5259280ae4 WHIRLPOOL 8d6a7f45116360cbe0f91279aabe38b8b778bc3bee752920fa7faa5f81e48d5f280c5fa2c7efa15d1db85e2d65bbaa2875dd9fd10acdb63eb042b28d18536534
-DIST thunderbird-24.4.0-es-ES.xpi 366308 SHA256 52721d25f1c81d8562dd830d0b946e3b3573e88e07370f53d4bfc181bd87ed5b SHA512 8cafd02a3d1acb95e8e5a7e5f81d97a12b946d4d9621777d3fcc13baef5bab44620c03acc7a9a199ef82ba778decd11589e4dede9f30a3c9c44b90da5824642e WHIRLPOOL a5ef30c14dfbe385de651d04145a6c4cc22d61e871207d56db439652be95957174aeb08b0b56649420702b8728e6a1ff0c8b58d0e34e52ffd83a8d8076a81842
-DIST thunderbird-24.4.0-et.xpi 422894 SHA256 b4ceaedc90bc8bd6efa8a77de2f58ea239b24dd3df3cc88db65857eb51b5f98b SHA512 46577f1dd4a771b7c0589a749d25684e408b6d6516f200f695b775c7cbec0cdab169765c5e88f83b2a5c6f161c6d1b4c7526ba8abe18b419b33373c203a73521 WHIRLPOOL d888a6425c07b04a72b4f18ccc452dc6c4c843c3350731908701f3d84416cdcf4dadf3cc779b49f53ac9d0a45728641c5ee82a3d2263e89bc4d0b128fb1d4826
-DIST thunderbird-24.4.0-eu.xpi 418497 SHA256 1369771f945eca750e85fa17ee02fccd57c58ca07e57ebe7ac8e4cc93a26a400 SHA512 5961e0e7c0de8aa9d13e2afd23c7ce9a22b640aa48fdf99c63ce80bf16c761aeb1fd7dca37b20056f9c9771e148319aef7ed65270805a03b685c7998841b7bd1 WHIRLPOOL f12c8f76a37913558ec2faaea8f06b36bd357f901eee8569f3ce3e6062c7155b15644fa35736896bd8f709d98b4a0d35b9b4cbf34bffcf340e4e4cfec1640aa8
-DIST thunderbird-24.4.0-fi.xpi 424264 SHA256 96dab3bfecee70e22015ae1f6c207e396c29d8670f270ed3f972f81fa7c383db SHA512 b26f732bb64c95bbdd8174046ccbf5a60898fb058e4a77b9591e9de0b77b2f9fbca8be7fd250e7db4933c47aec3f727c065172be1857db90a1a70dc3072b2062 WHIRLPOOL 95073756e4dcd95f14304047126db91e7738c339a3a70304b9796c01ea00ea5aaf41daac134a0805880f08cfe5e44a82b5dc6ccec9503ba79133abaab63d7140
-DIST thunderbird-24.4.0-fr.xpi 431288 SHA256 3848ae6f610b8862ff96ec7a0b54e6485f76831283ac12a619f0ce8107a59655 SHA512 8621ef1dffc5edc06a342c82e3d757b4eeade6f08cfe6da6a46cec4fb404c33dcae385a811d4eadb1181b0adce4707280e5b49a42d8810bfbb4a8d5f09d5e528 WHIRLPOOL 42052cc256bb242d60fbe7823e9bfb0d799295e6919c723f04be87e01d91677c4d2b36932aa2ed9f3d018554fdf872ad59324652d6179c7440698de5b9d128d0
-DIST thunderbird-24.4.0-fy-NL.xpi 426098 SHA256 2506c3ad7483c1c7d1ba23970a22fe069833a12bd63e2963f07d97176b476c85 SHA512 1e7bb53d877cfe8e608ad2334c24f77b21bc3e06e88e4b04f6bb94332285f8e3c881116dd02e1d48792008a1b7ee9847c34d8c39cf322abec7962138a5a58362 WHIRLPOOL 53420f63e0379cb11b1539ee53788b18101c2a437337cde6b68aacd63a8127a01da358deffb30423b9583ba96900dcb1d785c2be7b4865aea6e6c851afa76273
-DIST thunderbird-24.4.0-ga-IE.xpi 437114 SHA256 313765ea94fd9b05738a8322f84bdf3368827695342ae09fe3ab1da8b9f99277 SHA512 7539dd26fd5d60f973892b90b257a7362369f720c35a89d1a03ca64f695b2df86c59c16717988e31b179933461ef6fb27fe775998213f31a7424e31ae6dc1aa4 WHIRLPOOL 759b5682690cbfa4a44bb4571cd7d42698e0b122db87ebcbdead9327d6205a2e5fa06cdd41a716b5f70fa75069e4e978e68f7de5cddd98a30100e82d512da224
-DIST thunderbird-24.4.0-gd.xpi 440091 SHA256 63a4b1fb749551596b5f94130e63645585d384bcf57ead9256008241e8bbefd7 SHA512 9455a6282c03a0e77a933d6c384654db9d1ee0b5939b69650cb46b3c96273171d04bd355ee018370a1b966ba11c0ce1c133da5b5bb2d0e9a6a3278934e629b55 WHIRLPOOL 5e0211ee3366d9b8754a42f13f17af73755637600517c57ea55b5cd516694b1d029427577ec8a652883eaa2feb7cce852ecb60b199c9b20263ea72bd77c18ba6
-DIST thunderbird-24.4.0-gl.xpi 427543 SHA256 ac58f14a44b67bb6fd6c20efe79e81ad05c5a10b174595f5cf077d676a76d0bd SHA512 83a2e25e34b4b4d40a2a849cc07e8de7d4b9c493769453b9e5615ed024f8662385a6ddd90d1125195b96f5824004f32098ad0efd99f45e16a1df3115b762e11c WHIRLPOOL 60c27667852cbb075e41b3301195d75f859868ed8fc66dbfd295b8f5055c0b5045d088f07bb67f2c058ec6cf153a6d1a8889b7f835175874d9a9e3ef43e23a34
-DIST thunderbird-24.4.0-he.xpi 457065 SHA256 b563c9372a99c6e5aff15ba73e70424828acf2083402b22de1d033380432cd81 SHA512 20aedfe3e37b22372f6c9f968d5a90a0a16772d42ebe94c379aca6a9982e55ae49bcb351747dafc2cddd375867a78b92fc76fb863953fa302567a63f00ba8515 WHIRLPOOL b9bec453e77facb734effc99b996b23e961357b943074154690ab920127e2db7f32ea8852dd4f1fd6fe4e0b6325d5c0f3253e829a7ff5a754de07cb5ee228994
-DIST thunderbird-24.4.0-hu.xpi 441512 SHA256 4b516919dd26a7d6294e57ca6b45f07ca1f65e887ad49c3ded5458d7f895b066 SHA512 61232d09fa755530c3ddf66f6534909bb235dd1882d04f8518453f2eaff08d8a110ab1b2930f52fd5f4e0d6a9c6e8456726578c5f9efe4472b2f3be26cd7fd50 WHIRLPOOL ce1c3cff72eb83a3a62f6cda2ad7ce467d94e35d5774467815f580515ade250014584133827fae73bb8a4a76d65ee77cf5815a7bb1ccf027d86036abfe081607
-DIST thunderbird-24.4.0-id.xpi 457498 SHA256 5a4d8b2e0e96972d91fe60c1799c66f6387ea0858392dd545a2dcef02c753a8e SHA512 abd8afdf9f7690fbfff5f60bddc519a581d30a16a75932e541fb23a4a1faa19e5358a95dc23bbb9e6f9d5c8a7c7a9e758365bf2abff7a823b820ff60e9d54b46 WHIRLPOOL 331e89346c8189a9c8659a4e853e639600c2a94daed1ed45ab9a20cf00db40708de1a39f532f5050724d81c7e09bcbe2a2513ef5b8183e731b66ed3f6da32e0e
-DIST thunderbird-24.4.0-is.xpi 425710 SHA256 e85519acd2619815c350f49c9406c4f36585cc61c6555448bc2a323cf0bbf2ca SHA512 552ca6cf2fe1ef516422f2f89fde4a8d64c989f738e6cb69704908ce718c8fc52e06bfa0c99e90d340c1172a37900041548138aede6679ed0db93bea4a636543 WHIRLPOOL c0a2f6d6232352c93b5ff79814ff5b9fe80643d75ca042b6e0db0412f0002436d1375208f96f2b97c0bd24d95fd4d55762e25f3490cf00fdc1d714dd7e443b0a
-DIST thunderbird-24.4.0-it.xpi 357933 SHA256 d32a5e3ed927502c7163243b59686e977a42c85822eeae964c0635ded3071002 SHA512 10af0d137ebf6e22aee32637eae85c2ddbfb05ac9bac1276e92a09ba7d6d3eb7652f22b13b8ef2e9ef2e4e91fec4cf59ccd7417e20e61a5de549a2010aaba1e7 WHIRLPOOL 85f0c59fa7a9df8dccc8191d66ccc20c5611409d035f1026e3e3a9323bfecad534308a6d54d0370a70953483375eb6717b4783e2d789bfef4148170dbe757a5a
-DIST thunderbird-24.4.0-ja.xpi 475559 SHA256 425c787bc6f432b246f165c4e6bdbd814f6d058bb662a873c61f72ace8816515 SHA512 35617388296dee38c504e4861760c34a602ec078687647f3709f930e35aa9bbb1cbb91d30f5c13c2d27e4b4ca64820c8497125d0d68c2742ad7913f414cc2c4e WHIRLPOOL 9a2d8ffdb9b9d2905c008fa7f1967b9473a42913e903a89809a2250d04fc7c5d96dd8ce5596b80f4dfa4933216801124b0767ed8a0aa4c25619cb7a3c40e4970
-DIST thunderbird-24.4.0-ko.xpi 428070 SHA256 23750b422f4395630555b4dd60ed86a6f8d70a328d0334d1a04431c85a537562 SHA512 f4aa97d2c036803e1b54e799478d3117b8838a3c9e744150b2472df636138ddb1eb1daf7df633b33b149f8f9511efb2b73670e5c8367ccbab0e6b022e2ec8d05 WHIRLPOOL 113d23a0a1464e2de534ece2b63d7599aaef2d357c56c083021545fae9d6c60f9604593bfcc610b459e33888aaf09c0602d81fae847476e20b1ae84f763f46e9
-DIST thunderbird-24.4.0-lt.xpi 443260 SHA256 93873a2aad2433626675f23be74781d74472971edb0c891d1bfcfc29d10e920d SHA512 3467e55e75d8958f733989915e53e34df36ab6d4758e62323ab53c7fc11e370d5b15e96dd78752962c4befa3063862631fcab823ec2c2da4353ea4b97a892200 WHIRLPOOL 45bf7d95f79425fbb7e631ec302c5fb81b5196ec72543900062551e0f992ab5d5d93a2928769d9d58d1d1e2288600d2d6b3a4c13bb34a9bb47e93fede5bd2370
-DIST thunderbird-24.4.0-nb-NO.xpi 418922 SHA256 fbfd546b9617631c4df0cb85cf2e939d75b56c3c6ff7601f4556f840df7fb3e3 SHA512 e5d9b9743c7efab504983226471e84f8fb348d5dcc58010f09da740e8668cb72b30df3a2ea067ab7f6b2490861dcfbc868a2a73c1302466372ac680f351ab4a1 WHIRLPOOL 99fa9d8ffde5fbce16e9505134225e4c908b5113ac5df7915e120e1128a0798db33011d1a2059c62fa440378a524ccea25e45e762e618a7fc148d8a91093aa68
-DIST thunderbird-24.4.0-nl.xpi 418763 SHA256 7fd2b9560a00e3172a573796899fba26d1d1cae69e2b17c81213a223da8c2712 SHA512 4098b74265488d24de360e624f72da9dbc0e6315b139d020c076b0c20db880e61af7f6ebd9689315dbbabaeb6c27f0b7e6e5036990338fd5d63bd8b5c581b081 WHIRLPOOL a7f6c25cebce85e821394638cabe1e3ee93ecc6ddec825c02db8e459f2c4fa0a2f452fd6506686754fd6ca5d654eaeffd4b51c4c70f325ef6c26901c0d1e0d5d
-DIST thunderbird-24.4.0-nn-NO.xpi 421134 SHA256 d0fc15725d6a8f120040ba4051740a10d47fcdfce3345619a4cd7598370dafac SHA512 48fc6a3d49ddb931846f47519cd6adc25cc608d63e2fa90e3d0d1126c820314b5d1f22af763f6ead3cc0aff366d9366b5913b6d8bb3e5cc4873975de533cf6fe WHIRLPOOL fa8543adbe27a2f8105e85fe6a969f2a13ac98f4c256c80651100704e1fd5ede094079c37948b433b292ba3e8e07a14ef118cbbe1484de485c1c4b94316c4b1c
-DIST thunderbird-24.4.0-pa-IN.xpi 508273 SHA256 c0c55f8c1b8009795e30318297b527f9ece985db4439b2ad0dbe7af937da62c4 SHA512 24f507b0b0eb76b2e0a8701a9a2a58f68ccc6014bacfc68c00f04ffe786b59835aadc452f08fdf24697671778404806b566bfb9607bf2b2c0ea1ced623684420 WHIRLPOOL a0397d980b9b4ccec3ad9a0b005516fef92d2c205b87be8644937e683f934bd7a4b23f77752d3466edeb4c0d3d0849afe0ca4aa69252bb0de9763a7cca648b65
-DIST thunderbird-24.4.0-pl.xpi 401752 SHA256 ce486fffc5366b91d8d57b43ffcf5af93c7119960136344892cad5b32fcbb877 SHA512 57aa66f751773bd59e9475f262f60f38d4f03c38dbdb4ae628b869aae4eb61c3ef5bb0fef7ca0c5a0b1daeb666a994b8f301eced138eab2b2515c621f272674b WHIRLPOOL 5b5338d5f99551d6d7facca3c8b54972465f2f5bec094b5a25e071f0058435796311e7fd73f886b39a9a90722e3d0732a05ff102fd58c7a2f186a47555e07927
-DIST thunderbird-24.4.0-pt-BR.xpi 430909 SHA256 2b9ecf69dc46a62fb613eddcdd7d2c417046eff3ca20c400e7ec8389f1ae9436 SHA512 d1d726ed5281ed7288f266478386ac3722347f2179a3f6611c1771a7052393d82203bb4e0d6bd98e868ff0f1457776c3abfec60b847d1841bafae1f2e1e31380 WHIRLPOOL 2ce1e4264c3ec0d81403688faba94f148d381dd9e6dd89ed82c9171d17c2883159b2969b913f76da4d199783ce01fe27dfa808de2e4fce79a114a8d8173de48f
-DIST thunderbird-24.4.0-pt-PT.xpi 425025 SHA256 3f3b6695433f8a23d1fc1c90426165168a31e6ee505a9e0dc30773fb87d1ef0a SHA512 f6761eb17d56abf1623033e3fa688824c3f2c157a3b1129dcf9a313d986b394a98f9d09f6bdebd565c0f61177c0ac04fe09f83bbe06379193908dd212e3a5433 WHIRLPOOL 846d0a53748fbcd4c72a722432d122170fa759367c97cc0231ffad705c2562e76b44706b06af8407f236aa28e299f7bd18bf2f871d997a83d7f36e91f9b72bb1
-DIST thunderbird-24.4.0-rm.xpi 432384 SHA256 d4281b792ad6c2662b9dda2e4d087a11b50978901d508e7855cd945d9578ab06 SHA512 de96b2f83bc4837e512d1d62984d1918ef94fa08a2be68b7221f696c9d6aaa4746885049738a2177f5a23bb5f3c8b555ac99ed67dc13658d8784e2a6aa7483ec WHIRLPOOL 28793de07af26ffa3c3feaba562353b119c801d449e93b6f9c3ef6eb0ff0c404c79f42827f2f187e15b57418a1a7569024ab6f3d95f1410ddde7fcc7ee22bcd1
-DIST thunderbird-24.4.0-ro.xpi 497491 SHA256 efd0d40b632d181aa289dcf9a21d8ba213f90ca6f43a886e7cc67a4b1d3e88d0 SHA512 483aa78b7909f8b2d02790328e174da93174c0c65404fb645b83e8090a25c494cf94ef8b70caa48c49a311511c097f9f1e8c0f9073960edcba8540dee9c1a742 WHIRLPOOL c043d424037d5e50e78c918b0016e866c0ea1cb3c990c3679d62d58e48dd13d5a62070395c6a5a265e8b29d9c708463a646d8b61ecf4e4ff4948b066332acd55
-DIST thunderbird-24.4.0-ru.xpi 425097 SHA256 284e9c3fcaee7caa55f442d3fe6127d68bbd1a0e294015a3d97bcbac9a477a13 SHA512 aa8503bef9881cb7efcccfd44290a4672a5bbdd8e09777dca503b246104e1313964b69721e2fe175402ce044117cbb99b5e89b83aa5b0eb3e3156a1d3e4641b2 WHIRLPOOL 8fd953ab2165353113cdf72a81353d6343cef51e7bbcee2de9852c601bcea28f1f799521282f966cfcfd5c3fe47af9fa51fba23bbbb01ff77b93edcd5c54adbf
-DIST thunderbird-24.4.0-si.xpi 511167 SHA256 9f97455e774e74b4a3d5effe631d7b4eaeebdee3f0f0fdcc3b3ec90c17a7de67 SHA512 6e872439c340652ef91ef2db4b165e02285abae6e0530aeed4dfbfca5b4df249a7fe57d8daed705c934eb81daad3b5bf2ae2c17a3d2290a049cd8846f26f9489 WHIRLPOOL 2db377b92adc2fb3b0cd603b6ceb5da5e971fddbf067118af9a4ab7325fa16a88135d1d5a8855a958ba855b4cd8ca788831c4c9436ab06cf72e147d80cc85645
-DIST thunderbird-24.4.0-sk.xpi 440106 SHA256 8154cdc41071c4e4d06dd8bf37b5166e6078a90c00753e13d01d20c5a4b5ba4e SHA512 9197ebb29d04d5f616013208ea93e8f8d33cb61370f248e5b39a85b19d3626b4b6e5e58f881d18f8aa46d098ddb846e2877a42477752bc8c934f9a0d7f8db292 WHIRLPOOL 69093faa7aea69bd315cd81190f331442c8956bf571f721d583180036181d8eb659b91e79a31d9519a0683b7c4e3b06df6897450ab54279ff9c31b42de655d71
-DIST thunderbird-24.4.0-sl.xpi 421706 SHA256 4fbd8dce101e088cec044113cf298464b56f729d7de9c48c3e295aa8763a8b20 SHA512 b931f6c869c22c510ba55ba25c45bf3e109d1faaec4c8ee7707e196c4a8112fa4ce62877ebc7dd3c36385686e9b23f13f8abc92115ca04d96ec1af144c6946e9 WHIRLPOOL afd41b78d842a3ba0eb2f62a4978d2ac78a67859ef89adc09c20589bd56983f1fe10f0211fbc96048fa0346297d2ae0e5700dc771df354d894d637bcb5090186
-DIST thunderbird-24.4.0-sq.xpi 435215 SHA256 3d6ce7ca0a312345d7c8b7006fd05961e7f23c67bbbe73da971448de916ea511 SHA512 fc12450584224617d06568a78827cfdba97e25bbf2801dcbd0e34c7eec07f81d48f5a8b923e8799e750dbc6d478ef9b6e8a5136a706e13f7091977bbf1098445 WHIRLPOOL 9e43b5a649caf97c3eb69a65d2e85dfc3217f9e517a073c46775a037b2742e80a1dc99ffa94e91f12eb201177a6a644fb30d050ad5195d83dabb1a1ebcaa33d4
-DIST thunderbird-24.4.0-sr.xpi 518889 SHA256 95fc6006ce2b05f66945710e56304d2abda2295272b4fe6c976a7885cdc63b85 SHA512 fd17917f8ab81cf852716f890f69010a71db40c6e0d6dec3668408f0cbcee05918e59269c38e6921c41f29847184dcdb1d19049ef4b690563a539a9ad36aa189 WHIRLPOOL 8c54c6e80bd0415db39aa07dbd60eda6edd99fccb2a37ccd806c715161bea822b75079367ee712de9312e6e9c99edcfbf83bd3a53741f8899518faa5f1e11512
-DIST thunderbird-24.4.0-sv-SE.xpi 423815 SHA256 c509fa6766b0bad5e0fea3bb66e8faf56a4c3ed6a955d64ef2dd3aaf354c5dbe SHA512 924ef898cb4074ecb7f03b38352cbafab43a5cf658d597ac30edfcd2f0c5152a23305683884939a051c361abcef5a7fe6f704976df2467195c1fb6996c7bb28f WHIRLPOOL a00d3e34791764ca91e233e3829bb1d643873e157740467f7184379072dfb7a5033735589a523b48196b1471f1447483e284abac897227bee132d625dc0d1f5d
-DIST thunderbird-24.4.0-ta-LK.xpi 534923 SHA256 ca2a242106b6b8cfd4123961704aaa0ea50ef08a59413ab5782971460d47a371 SHA512 2eb64a1203e49635e2b97723f274014a4259cc6c9604cd79d1a78df2a8503cc2e345ac2eba3e3e882f222d0b3674f51e412297048d2df2c6e2636599a062ea5c WHIRLPOOL a57e0dec99c8d36dac92f403ef25976c56ee965fe6f8a30d868bd30bff87c4ed29e2459e1c6baaa636a90eefe1a07d6834083ce69553cf8138a238d3a4bc5342
-DIST thunderbird-24.4.0-tr.xpi 438067 SHA256 6e49a73b80664b92d590888d34f19aa2f77490459c2a9d89cdf6d65ca5f4a569 SHA512 2ba328717b9b05b631e4058aa63e338bda64a741e4e30af23fa07e463808912df3780585a7eabc6f2a10a32da28733bb56e2e6823387d735cc26f2e39d74e929 WHIRLPOOL d22f613b210fd843d0335afd034f92fe102fd960b7c6e7339072fe39566f349fd06f86e1d9a9f9e446a80c1fd80af2aff4a62abb8f5c30bd2549d6701a31a24f
-DIST thunderbird-24.4.0-uk.xpi 480949 SHA256 8846c8bf8f30206afb21663fc0b37ca05f382cd2704beb5dbbf2fac94276e500 SHA512 8de1a6c7796cb31697dc6d1e940f2b50707bf3b368f752ed98f126272de444c8409371c43e61cfb54d1c229fc33c60d02f2a59f12f89d19c0079c889473229b2 WHIRLPOOL 0a741331c33f90897f211605b5db60498f4cdac98dbd83e0ee374d7f82f51b42a9f91a4381c64d9cd2fa1ae34bea7a83b65dce25dc77c86da0dfbf6d3e32f787
-DIST thunderbird-24.4.0-vi.xpi 495558 SHA256 9986e317e7c830111e9e018fd37f9e39c99a5b841115c7b661c5b296532c8548 SHA512 bb0d78ae31e37c6e77fc5c27d40cc58398045eb76c6a188e3b570aebb88674cf7e97fedf9495e1c26ab414cdfbfae5cb2c1662dba563cdd81ef6797b3fde1314 WHIRLPOOL eab72ad334906956c13b5edea79b7dcfb4875c8c94870fc57d9e08e114d814eb13d259e3f21509c1c8d7e3480524318473b684c38b16fdfe6b96ad386dc33e2f
-DIST thunderbird-24.4.0-zh-CN.xpi 449181 SHA256 230d8f16b03d1b2f1b3a6a502f78027d0e9d7fe8d62751ddf85935d4247fa696 SHA512 7587bc245b02aebc398ea30192a3b94f0d8eaf2bebf0f0331c5212cc559b76fa718774fa9c4f9a1c1fd2c9d21c959df79eeb55be6e246d3ac64a43d8c4db14dd WHIRLPOOL 2d1eab914eb4f359d3429b240ad20b1a8356dc429d5c38ce0bfdbc949e1dcc22d15326fbeb139d1f1127436b2398bca328f6c97d9d1ecfbb8092acd624489291
-DIST thunderbird-24.4.0-zh-TW.xpi 450001 SHA256 4041db9d40a5c2d6256f8d3cf3e307d1708fa7db8645291383f6d09241225bdd SHA512 54102e819389e24fc766dfb2c89f79577b1776d4f71fafb7033f37cb6ac3110ec82fa7e8f891364dc83f7e20682395d3353985a2ed2473d06866477feec1755e WHIRLPOOL 301756f6ecf0f47ce023e3abe2464117fef1b533df89f6dd28a0c90a1d218a619f0117d6a16f98dc73d3be683b6a199f4f4656152266bc1a5176cc7611518f51
 DIST thunderbird-24.5.0-ar.xpi 457862 SHA256 61c387758c281431653c0d2a40f9779dea513358129fca8838b7568bfcb2f046 SHA512 54b43014866ac468bfd40acffd784c062c5e58966917274d3584ed468721a7e3141dce199b05e3886c1b34128be09f12990a037058ceb7812f6df52307996cfe WHIRLPOOL 90675521df9ff1f4a6f5f0b258bae8ebc1adf7250878941af6b810040b0009a1f5bc4bfb5f93a08953c1983577abc9f6304f602e36d0b8d0983a15cbf5e47be9
 DIST thunderbird-24.5.0-ast.xpi 373831 SHA256 a24e106915b718563a6b59e43d0152c027ac8f851192ca9c26135eaf2d0bf5f4 SHA512 7a90fd373834b36c5b7ed9e062146eb972fcc50925168fbad24913bfd737e5d29503c467bbe25550da9384f5c489d83798740613c29db433770dfae8eabbe01b WHIRLPOOL c94711344604b23c14522e38f00580c384cde27a4d26069f8079139dc5d348d2a1f342051e1d023ce9d1b03fa384b1e097f535452c2593d75ca60429eb3d2a89
 DIST thunderbird-24.5.0-be.xpi 416882 SHA256 46f2f6a22fc8eaa40793be47e7f3351297182cc7ddfb8116b00da965d6ef4a20 SHA512 bfd0a334c1107a00575d8acff11e022837b4e0c1b6e786ab7f6402590a175edad03b7f22a419640a63dc90925af7b5b6537f06e82ae8c920856332651fabb36f WHIRLPOOL 41635dc1ef11efa5c82b267990450743491e4dc27f75cf3b1765528b138d91c812af53403c1cf19a499595a7b832a1e66dae5a72e6ff6838240bea25bd9ea60c
@ -206,11 +154,63 @@ DIST thunderbird-24.5.0-uk.xpi 480949 SHA256 331ed11d6d4b873db63e33db707a205d98e
 DIST thunderbird-24.5.0-vi.xpi 495558 SHA256 993eb8b5869166b51dab725fea1126445cc132cafadab1b5096f6850f2aaadd3 SHA512 f98f8f53c95aa9cb2ea6133af0cc6e3a588558c693296e861c1397b95dd918ca5bcc73b00f6c7c48950dcd5fa6d4f8bf5c9d741ab37a33dab0936a6f78b03307 WHIRLPOOL 0d375ebc10f86396225e191d4c84f56f14a147244f0ea6d6e95b4158d2ab29ff4ccb3350f5c7aab3850f7de4db8b675e7e40357b3a58fd46c6819bc3b15b7774
 DIST thunderbird-24.5.0-zh-CN.xpi 449181 SHA256 e587849f5bae5bbb65bc68087fb9bbe672162e5bca69a7e99f0ca7e4559d5354 SHA512 bb199b1b19c8277c48db71c528ac5c2185f8cdaac9d70698adca465940c785b65839c8658b30456272d04a560a4cbc8036ccbb3a5c44a3c8e39de8a2613b9dea WHIRLPOOL d71c1613f1260c37c1ba7920455b44288102f5ac4c844ffa51f3a049bf838f8f33d6142dc02620d6c907927a4a9ed0dc75c39b19943430327364982096971ac4
 DIST thunderbird-24.5.0-zh-TW.xpi 450000 SHA256 ace0e695c8112ba1754f16603ee14418303ae053b97f8af0b23272a308c4f066 SHA512 bc6ff87b1b2030f0d8c62e224c5c5cd9415cc75ee0e1de39f9b68c77dd9d7bc8d7a8bb3b7ea47197e791ebee16a117bda07970157faf5bac6ffe18f39437ac36 WHIRLPOOL 38f9fbdcadd1b806d7cc114ec3a31875bf824cdf29ccfa90b0e869ab1da2259c5c8f6d2cdccc606e1e98882097617ae8eef617c67dfee4f4d7c5bf728b481555
+DIST thunderbird-24.6.0-ar.xpi 457862 SHA256 6aa3c326c9757751fe655242e446ae4d906a91ee86cc061a3dca1024fc57e88a SHA512 ad94a05d94331ab4049dd66e4dbcce2c735ab9022a2b46deaf4bb1905c82c3a9652bd494a7484d41f94e64abfd82cc3e5389fbbcc6c0e6b04a92fee13f911404 WHIRLPOOL 5b04322b3fff6863f0834f38fbed5a3c66f16846e4abc2362c97f3f506faf2fcdbb101c4e88ff4e35c7c6f715b8d9212c12c315d9b9c52b11c3160ab1c6ee72c
+DIST thunderbird-24.6.0-ast.xpi 373831 SHA256 e583f909925f6ecb4f72949bd99340f5a8524c21f2628594dee474c9307e1617 SHA512 5e5cc9e4815709b54c1fada0178d2585a402eaccbe9f60a5c6a5f4ad15eea96c6c13cf9eda10f58005323f4fb9dccfb644d8dae39c98dbd0bccc376eceb11652 WHIRLPOOL 7558eb52c6b832b74fed502394489db19cce817dde79b0078cb4f0a84953ab8fcf3046b698f5b85ba0606588db2b89b5c2b0861d4b0de52dc93f3cac0491a5c6
+DIST thunderbird-24.6.0-be.xpi 416882 SHA256 1fb28fd586a69e277ed01b6d6d636e95c7157bb5327e50662f1faadf524d18d3 SHA512 9faf2b88a5fcb00aac340cb53fa4153eeff35393cdae41a6bc62517a34c9d5107c05e17f7a13f1d424fa13f1a5d8ff22c294811e5c29ef17f8fed4c6244db11e WHIRLPOOL 6e280fa218f520ec88415c0faa2feca2f2fdab7be8a2d9992c48ddd119b6d3ece5eb99f7e7ecbf6d3a3551b5bdaeb4a75e03a1c15f7285c7609300f5690b700c
+DIST thunderbird-24.6.0-bg.xpi 485024 SHA256 9b3839d5d0b700d1b5258b47dd2cae555845e34c4dd3bc0a2c602dc0a4ff3503 SHA512 1e46eb0dc1b60a77317ec593495345b4bd493ba4fbcbf6b27aa422cf59c4ec6249bb0c4447d61dd4b491eb41a6289482dd7a59f6d637ee941cb37a975d922b19 WHIRLPOOL 75bc5d5bc0d243d0f7aa20c0908fece44acb899c60dba968efd1258ef33560de7dc53dbb755933310ddee08079c3c989c9a065e6d5e6f3c30005c476aeac7692
+DIST thunderbird-24.6.0-bn-BD.xpi 537258 SHA256 4fa1d881044ebc9b129e7f54b65278e5faa730ed5efc2f354f2ceaa6975398c1 SHA512 ddd46fcf3d15f3cbe2c20f5077a4f3f5573409d40436dec02719cfec6f70228a6bc5f5e99edb01e9a98bef24b97b099ba916fe2a8efcbe623af8ac3ca660234f WHIRLPOOL 45ad4239f959f57e8a8c6c5d6f08bf0049acffe68fcb64b5799f9aa09fbba270707b206a8b0c6dc7f1c9dd086a577880c1c0993771a189e800197d7549ef045b
+DIST thunderbird-24.6.0-br.xpi 427680 SHA256 31723061e78c394a75f2977a80378c6ceec8fbec7d980becd50dfc93c14e573a SHA512 7057c939f75a14c37a0e2b5b5d76753bd67bf51af82add62161ab863654fd178d1b9ef4fc1d16b265ea831df46c5dbc0cfdb895b25b583d5b5d764869f5a6fb6 WHIRLPOOL bbfb78a982e8cd1a1b9ca08e225c7408baed7e61aae5b6c8eebfdfebb625d448171623541eece7c850a897d75dc3465920c3591409960e3c3213a2ed34075279
+DIST thunderbird-24.6.0-ca.xpi 429746 SHA256 e7fa72f56d0a3ab90dd3df581aab4154552be12f71408e04701e4d3aec2b9e94 SHA512 91b018c157e3859694a5d6eeffa901e399d58bf48e0611ef90c5c08742dda1c7ec9174366f120d577872314af566b0e69d299ca10b48328e52875cfafaeffe3d WHIRLPOOL 1e045238aa875eaeef7e1973a7aac2f86eba74a7ad141e2e6fb1630ad857b166466c84c38c981705f593cae6d5f4407fbabdb1ce2d53c9372ce3ad42b27568ed
+DIST thunderbird-24.6.0-cs.xpi 431476 SHA256 360e5cb9097c16ac9fd626917777b491c7c00a95b2e1879ae0fad1b7bed2d870 SHA512 6202788e509ad47b256b02b482b703c187c55e968b5a456d1c63f68c927e3e47e50d7949e991aa01ef0c5dbb2d2e1d6baad99e44ba0fd04bb07f462110848c2c WHIRLPOOL 266208a62c9f1349f6f171cfbf87f0445d62ac545e85c774237eaa68f193cbfd0c3082c172554b21b93b45f7ac0311ff56b443f088e4e447ebb3ca922b495c17
+DIST thunderbird-24.6.0-da.xpi 409627 SHA256 ded61b233f3598f69352d92dc05a7ee9d0bd8852073e2835e0c3b05001f920a8 SHA512 e062cb15b56421aae3c725105ae91d5435e99c8f3b768b7ef1f43c64d4662987445c960aed5118d6e79fc1b90384a4349f4eb567edcb1322938f68bed5e186eb WHIRLPOOL db7331ffed205cc899773b76ef6b91459ba88d054d953ae90972abedb7aa6cba3d344a538132e009cf6710f7d8370e93bd0709df4d3dd06e0e3a00d0ca1b425a
+DIST thunderbird-24.6.0-de.xpi 408674 SHA256 aca6d21ea4176af021b27c67fd21707b0280cf0f1bf6ac34b03b6abf40d50e7e SHA512 a12854c94798da68e484456ec279f5000a72267c1b387c0943fe8466984bf77bc55000b3fb898cc38f69968b15583f3bd4a3300d795d4d074da29d213422bf9e WHIRLPOOL 142d5c4d8852a8337042a319956dd7e21309a5ebfbef2894c8c642aa5d706c136757313158819e2473034b6574c34db6bcff3b00e820c2f95fcffa1f49e7b71d
+DIST thunderbird-24.6.0-el.xpi 464553 SHA256 63080f452b54b7275bfc09b8aa73fd202739c0afd00a1413729b384e86649525 SHA512 b1cce6d3c2e9f48cb646ef3b000c924de1d023118e48e0cb7b7770ce09bca0ae6afc3363687f5686b46a3b06eb7bde702066c819729df0a2910131edbc1a5ccc WHIRLPOOL 7cff573c35846f8c437008209c9d4d36a07924f16fa1b74649e6524d66b9b93b815ea02757c4568e19d6385ee6b20716e5f06853377a8d5f031b622e1731d344
+DIST thunderbird-24.6.0-en-GB.xpi 400962 SHA256 dfdb57b440d21ea9e140fc528f25e6ab2a1966b3865fc87390362995d7c48067 SHA512 47410e1242ffc785e24616ca5c5d5ebc19ede088e0fcae925e9539568769a18a016ca04d5223d947f594e4fc1f8e86341cbbada0c8038f8138da09a3afed4bf1 WHIRLPOOL 61c5447bf0d73ceba9836c098eabe8f069d4d89dcaa6ed4d850c82f39001c8408b2b98cd9677d23903e607787c96e9140e5bed663cb8811ffa23545530138741
+DIST thunderbird-24.6.0-es-AR.xpi 425657 SHA256 3ec3c00f39e98f81c045f6cd41c68bc50ea908c91d295ebd9fa9b18722b83080 SHA512 94c43e10275290b2f6b02e9df2a9d8d878a2119676758db47d29c6cd1d22cbaacfd1efc1039dd744d875bd3a52079b103e63cb1d8002d48411f61ee31a8a60dc WHIRLPOOL 1b157cdf3ecabe5a9e832e343c1896a3fddcf2b3489da3bbb2eb581db7a0cea229af75c60b39a9aa9059edcae16d1b5a33e1659ca906100a2e231a97ceb365c5
+DIST thunderbird-24.6.0-es-ES.xpi 366308 SHA256 14086fa0e85857aa6430bdbfdd5f1f333a14b846126fba2ebfa65d954b68b609 SHA512 eb775acd395532969476566723a2b4d7bba84080719f72ad000e565e95780e33f743338e43519e9775504ee1742569aa9342e551c9bf45db893c7d1f8d07c5bf WHIRLPOOL c142de28aac41372c0caf80a30aee101732eb7021b2c2c662e41bb4e17526d07f0f8749f33522a6959d936e7dd4ec6d0de6966aa45d3d638eb094861eb413255
+DIST thunderbird-24.6.0-et.xpi 422893 SHA256 01505e5154f27bea956f17bf1f8ae3ecac21857b9cc631750aaccb2ae3ed3438 SHA512 4d6abf346ee412041648cef77847c40b9de8d0a71c6032231b4a77d95b0c5fa0b843cdbc5220284a4bcd1719b1e807a971d29d85ae3215a38097c0185f30aff7 WHIRLPOOL 03a76fd256ad8b5b4275936d1e57b34d5acee7580c9bda1101577e47898fd46497930e4a904203945815530fd8b60606a407183ddddb5f76d08b4dd13b1a14b1
+DIST thunderbird-24.6.0-eu.xpi 418497 SHA256 0277449af802ad6fac63b28e7b0383baf2c978ef15bc15a1dd373200762c3d8a SHA512 5aaafd917b8923943e2d99c0f704fbba97fcb2779bfeec34a955e508f02015e1dd34730236f8036090c5130f4f984ad285c4379061f686ec016f038b5e8a6fec WHIRLPOOL 5d96351e536ac74c714c77a838d5dafd4ddf9f6bd2db74c6d55b1df4615807798a145d2aacd6b835d563d80001757b6265acb1976db19725f5fb441334242b10
+DIST thunderbird-24.6.0-fi.xpi 424265 SHA256 9999cf22d0baa8c5c35f560560e1a6ee86fdc37147c433c662f53ed062b251ea SHA512 8ae3ecfb33641d6bb50b8a073ced6b0c85f0f84e86a125a58f0370e1b0e452aeb129bf8922af2c544ad53efd76b54aef72bd20ae208197f7ce8f9a8016934b44 WHIRLPOOL 441f1715c0e13b4585effbd1cbee2ced7703e4b170d356800a6d890865fecb03c66670ec9ed58969f4c61875e13e433e5338f678b1480655e32d4220e9052652
+DIST thunderbird-24.6.0-fr.xpi 431289 SHA256 d053f8f6da0b1d5417342e160824fc0472fd15556b29b2d4a01f043efebbfcac SHA512 2f31444b1d9795b600f77280187d10652dbd53e2102f4d493a4b291b06230738769238f0706a1b336abd3148f38081959f1c58c5d76df0eeecc8f2c61336bf59 WHIRLPOOL d5db61104aa6f060d6bbcc490a3af5cef19c4e967a267b8dca916e40a82129077a094a0ecd917f9086e30044195664aac614e79489d5f9d635db816dd167c8c7
+DIST thunderbird-24.6.0-fy-NL.xpi 426098 SHA256 39492e2d8c4d0783b0d3cbc4bdc2067805850041a3e159e7d2f87842e932c155 SHA512 dcb2e953c633e193fba20cdcbacc51569ce436ccf990ceaf3e71ad381ede6928ca63ca46542c8f671909e5789545dbbde142a9130fbdbcceed03b38e8ce39044 WHIRLPOOL c7195f5ca75dc16b1327f4e01df214d1e561e5c0b6c80257d1d223eb04bd0115e393d1f4afe0da7ba8ab72c889f834221eb48bb16965dc544615af43c34b9717
+DIST thunderbird-24.6.0-ga-IE.xpi 437114 SHA256 78223fedce58b23f0974b0795d90527778bda0ac07cc523345c471d724cc9d1e SHA512 9fa422c8d20a5fc0ef4030f691f51732374994df9b9dce542a35722d0bde3bea44b4886bce49ceb3dec02e4e1a57fc5c31e7438154996fe331219eaabb3061ae WHIRLPOOL 3108186661681445215e8de054e750575c7c6eecd9f124fa9f7aa18972035240e8287522672dd81a5b312fd76beb3eb0f0c2086d66afb85f686f1fc53a279eee
+DIST thunderbird-24.6.0-gd.xpi 440092 SHA256 cfb9655e0423bea9a7b9afe67fc0f38824f859b0bafeb6cacfa346a9e1f9f7db SHA512 1414678575d1944c4e053be8cbc61011139a50abf4b4faa2efb33d64b2e9facb88930d451998131b50591f4b7b6afb694f66888d94c1fd683f088f149878b066 WHIRLPOOL c9b68c63680a640ea37481fa8114399ce0b3eade8a21edfdcb90eceef3f1b561213dfa4182096c7d0c2a9f4f274451a94fb1a822708e7baf7c7f385ac65096f0
+DIST thunderbird-24.6.0-gl.xpi 427543 SHA256 41a888063bf5fc08f46280bb1d4e926b0162357bc2f76903d95272bf4d385683 SHA512 b84f8e44e5f910e7c9b20acbab1c6ec2475aea63247c9d09eee6cf7f9ebfbe7915fdb648d41b1668ce1485d900ce94db2080dfd59acc6ec1563cdf495871e0e3 WHIRLPOOL 8f82f1ec81344f77a2b1cc501c903798c3e1ce21c906c88645268db266972eb48b7a0dc88a07fca57abdc8f30c8f904b9dac14de901bdfb383bb00e6ac72412a
+DIST thunderbird-24.6.0-he.xpi 457066 SHA256 bdc5f8002eeb770daac280431dcfd837e7e2d6e4b250b37b70dba658dba72437 SHA512 c718721838ab1d6d229dd866cea0e0672de6b47cd0b95de6d393cd933bcabae61722d4baf43cbd456dc214b28c42eb8dbd4092cbffc842966840f2a31e3ebd69 WHIRLPOOL b532cac8ca62407f06fbf0eb2c954a07e802ed744619fb9c7c90c473b55330b18f2e8c22f0dd125fed24e3fa6b6fd11e3af05d2f78c45b83de0338c120363273
+DIST thunderbird-24.6.0-hu.xpi 441512 SHA256 f374db7d1f05bf2bedb8da02ae4ba37b2cdacffbcbced929be2113525d16a971 SHA512 312ab78ddec16d1b972086d99f4d1e67b80fa49a4b87fd69c1e8d36d95c35105ce3e04e74a4d9f5ff47c3e46138d0f6bcab2a4d42432f691e608c388d92da36e WHIRLPOOL 4ce53fbc7479194e9325431f348ca907f5f0ae2bd6c03e4abd39fd9391e8df3e00482c17c23b6c28cb23d3d43558394387c508b86b225b3dcc32967e066bf013
+DIST thunderbird-24.6.0-id.xpi 457499 SHA256 d25be8b5e37035220e02b07f774d821290ec21d1802973a637abb5af878af690 SHA512 699aed73aaf93668897fc2e25aa0e910d29e19ddc9a54b8ac5c93f700f3d92b6ed5f10cb950f9aaff163def934dcd2a33dd11061313f462c85663d74837a0db0 WHIRLPOOL c9e6509430c15e5d95911b378706a7ed86952b7c4eddd37e9a0ef51f5db69c1a4ca233d62ee80a024652c302bce72fdee5beb1f9e759cc7133e3f34478e8265b
+DIST thunderbird-24.6.0-is.xpi 425710 SHA256 b87e04aa6d35bbb41692c72f9f9cb19246e49a54d4edc3e29fddca5db651a3c0 SHA512 c75aa17e09ee4c119775ebf0be77c052e7aaadd47680289f362734c3ee75d44eef8ff9953728950f42dea707e9c433c140cfee71ddb0b75910bd3424d3a2b658 WHIRLPOOL 3770d15930394e785cd37e4dce8de4ce919076a73e249f899c722632a02ed38b77fa99da274711d50843369594524d90a0c6128997964bd082a0adfce0041e0c
+DIST thunderbird-24.6.0-it.xpi 357933 SHA256 fea724ca6ec33c7462fd4781390a0b310fb3a023aaa99771db83399b65f581fe SHA512 e9035129378b27136cca76c128da514275943fae46127bf75b8ef5e74b2af8c81bc33ce657c6b3f71622ed78976abf8528b0e17e9611b65ca1145998e5aa9339 WHIRLPOOL 5d11e4063e8212d0502e8ba7e55b087efdc568a57906e8c2f4d8da21601466dee1a66c42127a871f0f1e158e94b515130c62a35086403d17595ee74e079f77e9
+DIST thunderbird-24.6.0-ja.xpi 475559 SHA256 0c2113e085d920d748a0424f89641f92901d9e97ae9c06cfdb561e980a276c99 SHA512 5b6b1d408246f224a042e1c721f374e45ec59147de006cbf4032d1f7a2ea5dbc532eb4960c3c44862682a366e710e1e7b33ac4c66503b57f140322e50ebe583a WHIRLPOOL 0fe32b89ae299c18932ecfb4a651388ffb3d2dd68861dcdee22b62ccd8c0fdc978c5d24bd58163753727302ce72f3745cecbdfe2e59c3104ecc8f2bc257fa709
+DIST thunderbird-24.6.0-ko.xpi 428071 SHA256 cbaa57d1df226fb6f921d90c3b7d93ee47d73b2bb4f7bf3c748171a1c7af2aac SHA512 6c9ded188c44caf2c9cce221a05566ecd900eb5c9642ca84944a7a1921b36e09eee125a36b38cf347001f7c84fa0bc539a30c51904b2af40535aa56074108947 WHIRLPOOL 0fdc3226384688a05f23d83e3e95758e5536809db2a679869e4307d1f6055207f59213af980e88072e8c5792bd524c164c10cb877ddab9c273adeeb98f685f12
+DIST thunderbird-24.6.0-lt.xpi 443260 SHA256 6db3fa6fe593292d717b7077142381a038039365e8f14de74f74edbef64950e7 SHA512 ce0225f40b501071996ae91978bb0624ca005fafe21b41d2bd18516898b08f37b27822955b0eb53937c1d52b60dc97c2cf2c8ed94f37bc5d614de7220af03bff WHIRLPOOL 27e695d50daf168efbe10b7f4e3d5ea68b0f50d1c4d74d0a6c196e645cc9a08bb76eda6b9bb63d1f670b4a3ba5f4d7bafffbdf49a4c2fb350fac7328d3c27243
+DIST thunderbird-24.6.0-nb-NO.xpi 418922 SHA256 1a773698c405c78a947d5bc2a276f770aa885fad724c9f2b8c04025215c0e994 SHA512 e1f778b41ba1961e3901309069e7e028fd5c524e42347e35f604a2390a27c4a0af82360f620b51bebea05e26674d56ac36c86ab3cc0a4a98cf750e2f8469c5e3 WHIRLPOOL 804914ec21dd6e29cd0d939f0f4ae431926b7557524c7b8e185291fe007e9e0254a60cc9d0b95693481ee57786c764ce8b0c6c6e39f2fbb4b9276e67fd752010
+DIST thunderbird-24.6.0-nl.xpi 418764 SHA256 0761a699166bdcead5330af9691bb8437545dd24d3ce2cd1e642f1a48ecc7180 SHA512 5d4ec403f80b765a73e234ca3b343d34a3edaf2d64bcb87961aca4c98a39f9a5a4046fab0a06314c2612b0f90aea2b702499b1a1ec78fcbfb7c68050d7e19170 WHIRLPOOL 775d48fbc874221e9bddb9b4afc7320b73a88957af090129a522e31d851c7db1cc88c707803d15d3293e7c4ad18ac95ae319dbf07a69438d28d2130d36d3bbaf
+DIST thunderbird-24.6.0-nn-NO.xpi 421134 SHA256 4e1951dbdfdcf06dee95a6884d1e9e7b4cf141d95e078fa1fc5fb79feefe873e SHA512 e3fdee8be6e2b3b98a0d589581baacca55451036f15a5903a1ac6ca1c6d6bd54a5880599a46c6e570257773a4c01bc4417252e81c1aad1bff2c42316dbb64328 WHIRLPOOL 18a6522a3252e1d600479cee2237bf39fc846541323d0cf8d430b80bb923ffec5e0c20137ce47726b2f5a20133130b70804054d008c9adc9511b9965e6eb628e
+DIST thunderbird-24.6.0-pa-IN.xpi 508272 SHA256 8bfa8109aac418ac6650c8419f946250e569d8101f587f9d6f001a6a59b30385 SHA512 9c7a4017628e9aa17ecb33089cb8e9b98f6b36371273fc005d343bfbcb78fd830a98ab7d8877defe816a3225382aef81829ed407ca0baf5654907b2078d483fb WHIRLPOOL b2e0fd2f91e0b665ec59899910633a15bce5c4ae018612b5a5bed2c8e70389df7c65bf51958c2c4b71a3093f4fb4393db85d18b02c92aefc5bbabd172084e3bc
+DIST thunderbird-24.6.0-pl.xpi 401753 SHA256 e3514ebf5207fd6ae6caeb01c624ad015ffdb6e06aae3ffe39feade0bdbcdcce SHA512 2721310aa494c52f007fa30350b45281a3ce4a9af4e45f99b7f34a8b1071117401d0ac3259f1cc1303147e6e879e979fb30b8a583baa81b73ce57cfac22d6a29 WHIRLPOOL 1a2b89d0ebed6113e98642cb230a1f15c6d441df975d031e2d1cc7b02cf7138f25c9b630e684f38277b67d844001ebb7b6eb8278d6b94317638629da2b817cc6
+DIST thunderbird-24.6.0-pt-BR.xpi 430909 SHA256 2bc7c139195fa661fbe0721df4cbb80e56cd193cd7807e8b16a7855d453b66e1 SHA512 5ae49cdcc3009988758499fd6db0ed44b551f641aac06151d5f18e15d71d2badb956c57459c11bb25d95d89e88847c11ae1b093c7348c69c5a009faa944d9b03 WHIRLPOOL 3970595e01fc30d6ff1d5a4afc0c4d63460ee05aee9dfc00c01cbad044a0650ed5a139d329c2dd44463c7d34ca1901fbbf756c4e5f2b4cc32f8a2ed0f6c91b51
+DIST thunderbird-24.6.0-pt-PT.xpi 425026 SHA256 19c86db424f83dda485d655d80830d242850da1008cf2644e0e214d4bf56c745 SHA512 03ef2519b50fa98a744ef55840c7bd5fb937d52bffbc8651582c63aec614d010cf6dd957b379f945cb3fa6ff93ce9dd9db908c4b6cd7a9f2b9c9254d24bd0e4c WHIRLPOOL 7b90e4b3409c0efef5072cc7300ed326dc9013352b49fb405bec2cfef03263db79f2a13414c6a55377a28e69d1002772dfe344e1b7126eceda80d3c0e19b75f1
+DIST thunderbird-24.6.0-rm.xpi 432384 SHA256 779d52491bfbc449ba87fc4ea11f5190021cb72a45d7167cdbcb8fc10cdbbdeb SHA512 2498008c53768c8ad583ec0b2d03aed34f9dcb151990931f10c9a257aa3a55fe85b65a2dd6485a4c3a18fd0d1585cbd7825ece198a1d2e2c9c67ba604e4d6304 WHIRLPOOL 5ce01fdf7fb9fde8faace1cb471542575ed79fae830d878cf365c4fdba61c430ebf13a10143ce314ead1574c1617fbb066ef7333abd39fb93422ccb8eebbc9e7
+DIST thunderbird-24.6.0-ro.xpi 497491 SHA256 6b1e81e6df2f2ee752aab0fe1b9290e6c287da4ca498df330601de2bc9f8086e SHA512 144a188c85b59d50e37f7f8ebe17b1a0fdd91a785faf850e8c89fccc5c59d88c8f7febe73041dc311ee538a2b1475302e63375e672a2504dc70a227a7d348536 WHIRLPOOL 8dcdba4947abaa0910145e361915cefc68ec0669992cb4c8a44617da58926c6f31c042b69419dca1704e1a35022b1e7c7e7bcdd6320ce4123fecd16571c4fbd4
+DIST thunderbird-24.6.0-ru.xpi 425098 SHA256 2c4b38d8d1581614ae481efbe1fb1d74e75e374c4360df2dcc5eef335627cab2 SHA512 ef470ecfb69c960a881d997b4b879d22d67cfc43bb1bcf140b6c0645425a87fb285d3fae009829a1b8f16240df7b3a0ec0fc00fe6765f21b5261b08526c876f4 WHIRLPOOL f0f0f6f50eb11aa07d8dbdc14a4cc0d62b796654a6b1555a59f21031b7aefde134e38ddbd1d5f8a3ea3b2c74d4c3803a2bb6eec6d94e807c5e6aef719baa2231
+DIST thunderbird-24.6.0-si.xpi 511167 SHA256 7a5bac3f61891229cb933f82b8b5a196313951db10d157ea70688c69c0a4cf06 SHA512 01889672c400bc71bd3efbd0a9f32fa44dda5e640b33fb12715456fcb203e734efd70a244c53498b9ec2ec0896bbb0d11d95f5e47f43b295ae27bbb7dc6bc2c0 WHIRLPOOL 12ea5f7d78f4466068e37ab3b632b2c6d1cfa462d615723d2ec6ec36740536a6d42e099be6ce49c48f970279eabe1d2b5783c0ef6cacf2a5ed9fb591d973587e
+DIST thunderbird-24.6.0-sk.xpi 440106 SHA256 3899a09c9b4f6269830217e5d8ebd26a78619cc95c0a81898ab84a246def5cd8 SHA512 8f13c83a8f5c60ff58141083ac5abc33091ee46220495f32e4910619f9026a4a0307e8f087d27ffe98f6967afeb875352c827555f59edeb1764e9d441741af27 WHIRLPOOL 66cdbb8bd088d634b80cf481e47f51f3b85519738eee42252e3592cb21100d3b121dd0a2ef72e2560f635a466b1572696ac89f69a1db4af255285f7fd59a75f6
+DIST thunderbird-24.6.0-sl.xpi 421706 SHA256 22d81c886d7a775e9b1464550c326c6d2adc32ed87c47fbc47e953ac5d4a388e SHA512 a6c5cf395f9027327114f5c822cd195b1712a7497a13bb1ec390c0b86fb4594cd354b398b932fcdfa29daf3bd244081587337c643c44974c5b31eb4705f39d1e WHIRLPOOL 5b6a4e301a80e8c43657c1587148e6aed4ef22338dba9cde2ad67aa51acc23f3b1a3fd2b29331dc07cc7691ae473deab9086d4c720d4f5a9377a16f6a571733c
+DIST thunderbird-24.6.0-sq.xpi 435215 SHA256 08a4bf603c50b67e28841e76d1cdb23ec250e52c9afbc04b35059c8ced37120a SHA512 7390879139ddb0c87774365273a20be8d751a34da2e0acab50b79acdb7ce8757cda5d2ad7e960285b0bb1d7606affe0c84f5c780a327157cf8974911b957a1dc WHIRLPOOL a073e9f1dbd4a5b9c57b132ec6c277446738e18b60c65af66efc3adc6c30cf5eba19d642646c1f036fd7f5646de2945141ab277756f03c0c360526ef09034a48
+DIST thunderbird-24.6.0-sr.xpi 518890 SHA256 7e8eb7dd6dd9846bbb704d80dd757086f6da1b38070716cad12e2d6e87a99311 SHA512 3c050e5a9aeadd78a58ff2d8cf64686e03bfb1a403b0c7145a9c3c97e7f9fe908e8d872ea77d87e7e246c672fa0301814e51e4171f969dea249ac930c69a4157 WHIRLPOOL 076d2c2b09567077c960a250702d5ca2784b1c50bb2f594b917d7773611bca698577da72c439820c57a95820da0bd7a7591d0e2fa7b340b815e9896166f509af
+DIST thunderbird-24.6.0-sv-SE.xpi 423816 SHA256 4b920e494be9abf2784dc8b8b282b0c022601458e1bdac5ca21b92157f1a0fa6 SHA512 41062aba3a2605767acacb9f769e3a89a005326be17f497b9021b99ab9a2fc1c9ef56fba6c90866b6d6095e33411c3de320472244af697826c6312dc1dedc49b WHIRLPOOL 94ceaec4e5ff719ffb66b5e827a45b3d55ad504ba9517f701dba244e265c4096c37581dafdf54f4a2ebe517f5c82ee76a740deb30b30c3a6b365a0666ff68ee5
+DIST thunderbird-24.6.0-ta-LK.xpi 534923 SHA256 23ca919444d43bc104e282fb3dbaf5c71ebbbfacd80a5c8a1c72ece41971394c SHA512 1cb39799b333418a6344df19ead4626969a097f7e2e8ecb9f50a9af06bc870f25400ea92278e33b36fa7a89c102a3d1a9549333acc29a72b3a880f5bc4a512e5 WHIRLPOOL 898a02254e1aa01396447fe4dc8f3d0c9996cce63cccfaf34b4fc47a636ecf7ddcf9eb51847907dd5d5602ae3701d216cd41054c2ce4b8d68180504c6218dd2f
+DIST thunderbird-24.6.0-tr.xpi 438067 SHA256 e6d8de6e52b3bc0bd706d46a25f25e1fe8c5d37608d7d5c251b43008c5397fa6 SHA512 75f6bfdeda5f82ac0bcde110bded33b86b21f065490eed051d762ad7f5e1e40f89fb512bb18cbc90472b12af1eb44e56c09c2972088ff6ea5ea3e1b676d27a40 WHIRLPOOL 99b0aece156fec3796a2e54c6767363602e27271156eac904979c54b6d99d2469f026a6d6095344cb4acc3542c3f208746971caa05bb5a2a7497bc2fade9b38b
+DIST thunderbird-24.6.0-uk.xpi 480949 SHA256 650bbcb5e1879d756953cbe990e78730afbf6b93b4b4fceef6119d3618c00522 SHA512 9e07af6e8860c259b6bfbad6a3f384b4223d06d155da544e79d1b2d6034ae7178f2b927211fd0285f234cbaf117ef4fafbff16ec5edf4a56278df05d97c0925b WHIRLPOOL 8bf6d625a8900e6ba627f920d65ae933f1a6671ef02aebfe88e656235c0144a8541c3c996288fc3bd8e457b0aa8cfbbb0d72b3617665932457eb74fb68a74f7d
+DIST thunderbird-24.6.0-vi.xpi 495559 SHA256 7c927599de8066f45e07ff338167b9dba1c9b7f179bb8f6c93cdc9b0fa6b4624 SHA512 9e9068087c88acce29745fe475a2d1bd6f8e42b898c4f249b2ec4e933b0e6d908252964e1aa54720510c2ac0d6ce92010b7b673069db613dc4bf93c57442a79b WHIRLPOOL e7d2eb4ebe9821b3b939f03516031817f52e87fe165636746f0c1d85f09794141cfbc01c4bd362e761a0d6fcbcd7563c49dd403952004e5bca8497f7af883a67
+DIST thunderbird-24.6.0-zh-CN.xpi 449182 SHA256 63b2f4bfb24ad36d32529a79151a8b73195d4beb35eba9ef4a3e4cf8a2020139 SHA512 44969119a95cedc5b036e7b0cd82cc4eb9a18c70ae592e5ce6f54a698f0d687e5cad9052152c511ef946ae25e1d850ba32769843d918cf478465a49e82e7fa96 WHIRLPOOL 17a6fa7ccd6e241a522d0fd0c20052089c39f4fe955d899faed4d905e7a6a3319d0ed02a975c2279317e54aa6b97fc962de9284dd40a1463e19cb5503766c43a
+DIST thunderbird-24.6.0-zh-TW.xpi 450001 SHA256 0f99b8c4680ab081629535e79898081c568d3f57c01d7149c69118d4be125e55 SHA512 19ebcc974dafcb492b76566d650abdffa650efd41faf50d28eece34694698eb76e9c7f79cdeff34afb593254816c40e2efe3a102edd3b8c923021280c17a287e WHIRLPOOL 895d673811da95cb1f7098a0f3260739292249e0700c4d958719d668c569bfe45b609737aeeaee173fd6713552932bd949790ed18252f56846c25d554c878006
 DIST thunderbird-bin_i686-17.0.10.tar.bz2 21462541 SHA256 3efc91b30e1ba62fc1962b7ff751dc3b35f2110671d43e8b3f0343729761a357 SHA512 71136fe9e5cfd55e49b5568b8b5d9e17b36ebca58d695ddd9d73d483d926410262b4a8c18473dfaefbe33cca434bf44fbd1bdbf02e3ae27f2b7579a46f17c97b WHIRLPOOL 7d9085cf489b12c78633b0f74a0ec2fb4c7de3136810940610ccb843a779a1413e83527d1c4f65e7feea8918d648efc46c2bdba8f6e8f67207eea9fd561e0b56
 DIST thunderbird-bin_i686-17.0.9.tar.bz2 21483685 SHA256 9d356f6f4fe2aebd35cc002c8a8df3c4497743b982dad5f148b3f5ea2f659126 SHA512 052703a5c36943a4157a7c0b9472a00daa8ad42575ea54327443f91f7dc797aee78a36eb47baffc6229babaeffbff941dfb5e69f9e43ada436e79cb239cae88a WHIRLPOOL 0e4761bcd8301afca1473c9952e7af7e0699d52ae3fcc54394402a3247276efa19e2bc7b576d8a3164e40e8cdad89bf7531595a72fcacf7bcfd0fcaed5e1dda5
-DIST thunderbird-bin_i686-24.4.0.tar.bz2 28923795 SHA256 376ab51e3c424db7e235b2e94494d48ce2fa9a8f1fbf5ef5cf9e367bbaf7422d SHA512 45c348e57f122f9642b96498912caf29c50b97e2803e48f6d1226c313b0eef6a8a99e332808caeda3a4805d2a4db5dd66e2358e323427a7dde514972de768e55 WHIRLPOOL 98f9684e2fbbd6f8c58c0f01ee15c4e7205e11b39ec2e256ffc3f8cf7e60efb777601ff7d16ed4cea190b5d608a55e5b576d578ab317d39ab6b02bf759d74f89
 DIST thunderbird-bin_i686-24.5.0.tar.bz2 28958353 SHA256 6441f90eda22808c37bca023748efee7735cf9b18b1d21ce75878c10da8baad7 SHA512 aca3b0daef8c69c42fa5330ebe9e5e1d798774f082f70af345c9957f1b30e33040bc2d195f66221a7c0b31e86c3ff0d0c715b9b3bd234be7e89028ee7d8df111 WHIRLPOOL e7a95c5d5c387e2e23c79f9951dd37e3c5ce6d61e57ac408ceeade72da44c679647d752c2168bdd1be758c7181a69b2936c194efcadcd566d2b2a01f74dfc776
+DIST thunderbird-bin_i686-24.6.0.tar.bz2 28991898 SHA256 ba35f578095f79582341e988ce7c5e07f489833f7a309756c80caf4f56367987 SHA512 aeae561270f32f27fa5ac7f10d2cc04b2a705eee3e295794310aa046ae7b750303dd78a6f771c21dff2f318333b5f2d67267befab635da40a3f9ed3fc87562e2 WHIRLPOOL b6e25ea4453969aa774a9cd1bbc9dc3b090a0bd5f98faf54b4ce3adc042a6bc4a16f9f24dfb5f67afab2f4afeb62197edc3f099935ba7630d9294f744432d165
 DIST thunderbird-bin_x86_64-17.0.10.tar.bz2 25955127 SHA256 66a0d616c3ae1e423991c281e22e17a3a2c23afb626d1b8779ecda57ed98f9bb SHA512 264841e539dcbb42fe0d07a9ead026b6af6e07ed6d5d0b155e304c34bf9ae97ff49407c2317d1a0c607f73f3f3685f3d14f63b2e0d385a6e70c7b48e146f6e63 WHIRLPOOL 83dc1306bc61c168638958563cb2f7b247d6814c46f0307c53ff8b85af2d64979a243afaa2f8ad6e21f7e4213d9b9bdac30857e34c329d7358ba53c872f29e63
 DIST thunderbird-bin_x86_64-17.0.9.tar.bz2 25951910 SHA256 0e7d90e18507420ccbf74cc8ee8de17a2da983c7031cfbd08c490f49de1476f9 SHA512 8b77306cc41133ca4ff04f49220f36f6d8c73117e1742cad5b6172a2151cc293459282d6202cea1c5871bfa2f780f025974b989f7016cce2c06cf5eb914a2b38 WHIRLPOOL 7f0e0c8c1c96c93cc6ebae90046ce4b8c9d27385ace6a00d5dd0ebfd4a0c152e5cb2465b908136d850569a89516d133db8fd4ea668026e3c954c4a6735615a9e
-DIST thunderbird-bin_x86_64-24.4.0.tar.bz2 28164736 SHA256 57917aa608131da4d569e791fc8167f4df54975b74c64d6df641858400dd4c1b SHA512 2555dbf0ffe8690198bcdb876cc779114225c9e765e58e2514e14f3c9b13eabd93d61dbdfae1d7b987f7b694dfe50c75113f63d7c072251d7a6121a4f22209a2 WHIRLPOOL 67a2c88ffb796909ae85350ed09dcaf7f03fee8b95ca4c46881d67d3009bc5541ce2c0aaae1e23fff657a04a97dfe7ca22d78f39caa7633ad6e8d8a9d0084cf6
 DIST thunderbird-bin_x86_64-24.5.0.tar.bz2 28189715 SHA256 a54afdf7dcadb94bfe2bc6ea3d6232d311568a74ed3fd93becff9cd57063ff0c SHA512 ca1086770d95cd4860b43403e20d4ac4d55a31dc205e447eec52866c6af3606ed124b36f8e701582ec49243ad04e0560754fd615e1407a401f08842687fd9983 WHIRLPOOL a7f247ec3f9252322033269eb177bba82cc32ae7fd4e8cbc087f64888882af25d7dd408d6fa86ffa158127c2d7f08f62b67f313d53b808a79719c3674aec7cb3
+DIST thunderbird-bin_x86_64-24.6.0.tar.bz2 28193852 SHA256 09c193e865e90b6d2c547c17d10add7d43e8b89b630a8a490323d4ed391c924d SHA512 de6891043b1d53a3851d416b8024035dfb40a54239eaf3e73d11be3bbe6c10b0b156610c5fe9fc9e4b54a07942562ef3da688be4ec164bb44c8a53571763c5f7 WHIRLPOOL c5785fab9d367bc5d913b2723b32c532d5d2b04ca296d60cd7db2dbd7fcf3e1a5e14a054324b6d35ba765435d4d50abd7581e093b8442f1939bf2a8338b77192
--- a/mail-client/thunderbird-bin/thunderbird-bin-24.6.0.ebuild
+++ b/mail-client/thunderbird-bin/thunderbird-bin-24.6.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-24.4.0.ebuild,v 1.3 2014/03/22 20:17:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-24.6.0.ebuild,v 1.1 2014/06/11 19:27:19 axs Exp $

 EAPI="5"
 MOZ_ESR="0"
@ -35,7 +35,7 @@ SRC_URI="${SRC_URI}
 HOMEPAGE="http://www.mozilla.com/thunderbird"
 RESTRICT="strip mirror"

-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 IUSE="+crashreporter"
@ -50,8 +50,6 @@ RDEPEND="virtual/freedesktop-icon-theme
 	>=x11-libs/gtk+-2.2:2
 	>=media-libs/alsa-lib-1.0.16
 	crashreporter? ( net-misc/curl )
-
-	!net-libs/libproxy[spidermonkey]
 "

 QA_PREBUILT="
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@ -3,7 +3,9 @@ DIST enigmail-1.6.tar.gz 1231111 SHA256 10d5eb7ba364b9b6e6275aae8bba1d0e4321ed7d
 DIST firefox-17.0-patches-0.6.tar.xz 52684 SHA256 780d7aa5990e39ad105b21fa2584379357749e0eb16e0eaf9be66464a02f3de1 SHA512 56fc3970233e144bea5f6d6be6fdc7c17b1095172dc600c02be4a0cd3764958480e934a0b2ce1ab2a3edc237ece9cf1b7a2f7914828e6c5a3f519860ea2a5b5d WHIRLPOOL 4e2bdb64dfb23f66bec5bf41e34d61aff22e4f7bc14c7c981077575364c8a5aae889d941b99fbf21d248854648b70f6e4c2e6a2e06ab70b1d4495d539e2962a4
 DIST firefox-24.0-patches-0.9.tar.xz 6576 SHA256 615b47ed076ead8f6fe8a9cc8b51ae7615bb8fb404a3e7254190e73c6669479f SHA512 caf76c23e3ad4ae0fd9d240d4ee61c289bfc727ae8117a17c27396d32ab9e06512cfa53da86c99e6c2d941eca96e18c41775473f3c4a16cf8c91a2e8dbe144ad WHIRLPOOL c0104c84c20a28b945ce2fe5a22e00ccd412d00bc38e4d51583fb47765bd639808db1a1bb52be9b7515423437ae131e12dd5f837b35d8e2e50dfb86341446396
 DIST gdata-provider-2.6.2.xpi 115020 SHA256 008a302410b152e956cf56fc0abe4f6cc191ae51ab367abb7e0467ee65d44093 SHA512 38d2a581842de0937a96b7498db06aca120b8cd6b9de96a0285e90f57c28118193a24f32c9fdbee72233db0675a35c7bc51fd3ba6ec41bcf4521adf48107624e WHIRLPOOL 70d87e73d355559879daf4a00c9ff45c24a455af5fb2f93e8034811b0c444799bd754cb00ef63c321c3f7d85e98a62148fd0e9524fcc07edccb5c02772d7b515
+DIST gdata-provider-2.6.3.xpi 115020 SHA256 008a302410b152e956cf56fc0abe4f6cc191ae51ab367abb7e0467ee65d44093 SHA512 38d2a581842de0937a96b7498db06aca120b8cd6b9de96a0285e90f57c28118193a24f32c9fdbee72233db0675a35c7bc51fd3ba6ec41bcf4521adf48107624e WHIRLPOOL 70d87e73d355559879daf4a00c9ff45c24a455af5fb2f93e8034811b0c444799bd754cb00ef63c321c3f7d85e98a62148fd0e9524fcc07edccb5c02772d7b515
 DIST lightning-2.6.2.xpi 3644848 SHA256 5d130a10d8ba29ea52b22f4c0de5b92b05cbae0e7681fb7009c9e24d9c2823bc SHA512 71918d4797faa08f908593d77563a87ae6e65938a92f3bbc896622ba020461cd9ef982aa7f10bd477fa3d1b5f7959ada041e714283def30a26d6e448e523c452 WHIRLPOOL 617543cbee7fa53ac3f75fce8a813c35ff10b64706bccd968e72eb155339494f76fa69927b4024e34431a1d65324c630793bd4932f3dd2ba2d9ab5b098405ab7
+DIST lightning-2.6.5.xpi 3645840 SHA256 c4bc84f7e21148d6d06f4f61de70c7b4e331b53dce12979309e91294d4289b31 SHA512 880002e1c01a06b22ca20a120a5e4d893c364b058d7d52d12dddcdd3f4215652ae2c20332c3ca29fa6c5012df71330abda05bf3b862485043ddd481628ef801b WHIRLPOOL 5003a341a174cbe7da8b069d9f5d6ade0a7c0e8d842a0c25f74702e997942b3ea43be1e0eb6913d75bc78ef23fb2ee57551860d02b331db039cd6adbfcfa1f5c
 DIST thunderbird-17.0-patches-01.tar.xz 820 SHA256 79bf322258e0efc7682ce71ea84398e4dbec55b912acb264e16ddae72917bd8e SHA512 94ad743f86d95cb437bbe3be52beb8ab7c97acd9f703841f9445f94672d764cf6b9a3dfc065a6c54f24eeb16113a62708290512a3f54389c538a52fa93be7e06 WHIRLPOOL eb234826caf0f648d3ea8043b49fc2650f3a011eb28db661122e50abab0a6098b467e580d3c120b97a29919934c072e931f956bfa6676a2759cf46a2db88f282
 DIST thunderbird-17.0.9esr-ar.xpi 445976 SHA256 c28b2a296a252a221701524cd778d88b6a35389cf969822ecbc3174e9397ceca SHA512 2a559f7fad5eaf18727e9f594e282a498de1d63d54c11ed8720da165bfb722f0783747fe2acdd0a81315b041793dd5d4821dc9f6196d085fc104671b38e14d18 WHIRLPOOL 8ac2f5a41d355b8ca82199a60116fc83ed443d586ce3889a1ce8e3399b4b6442b2c2bec32761eacbdb9c1153651a6b7dfd5de9eb3fd8439edfd11e5012ca4cfe
 DIST thunderbird-17.0.9esr-ast.xpi 388038 SHA256 dcf4f2a49752dc992deee1e9c9d0899604470c546561b6b50976bfab0963bc0a SHA512 7e2595fbad33433634f7b2b2f3b43fd68272abc0d95afc899cc701524eae485e9c1ae83e7f0b3d0c1bbcc62981982ffd111b808b41effcd0985ac63371469d35 WHIRLPOOL 19e4de77b769e1615978949a87e7c48785a848cfa09b488554c5cf926fad9c6afe3acea9ea083d77c78145a4e2cd5a765258f838d82bbcf86cb1e8ea3e0cd383
@ -171,3 +173,58 @@ DIST thunderbird-24.5.0-vi.xpi 495558 SHA256 993eb8b5869166b51dab725fea1126445cc
 DIST thunderbird-24.5.0-zh-CN.xpi 449181 SHA256 e587849f5bae5bbb65bc68087fb9bbe672162e5bca69a7e99f0ca7e4559d5354 SHA512 bb199b1b19c8277c48db71c528ac5c2185f8cdaac9d70698adca465940c785b65839c8658b30456272d04a560a4cbc8036ccbb3a5c44a3c8e39de8a2613b9dea WHIRLPOOL d71c1613f1260c37c1ba7920455b44288102f5ac4c844ffa51f3a049bf838f8f33d6142dc02620d6c907927a4a9ed0dc75c39b19943430327364982096971ac4
 DIST thunderbird-24.5.0-zh-TW.xpi 450000 SHA256 ace0e695c8112ba1754f16603ee14418303ae053b97f8af0b23272a308c4f066 SHA512 bc6ff87b1b2030f0d8c62e224c5c5cd9415cc75ee0e1de39f9b68c77dd9d7bc8d7a8bb3b7ea47197e791ebee16a117bda07970157faf5bac6ffe18f39437ac36 WHIRLPOOL 38f9fbdcadd1b806d7cc114ec3a31875bf824cdf29ccfa90b0e869ab1da2259c5c8f6d2cdccc606e1e98882097617ae8eef617c67dfee4f4d7c5bf728b481555
 DIST thunderbird-24.5.0.source.tar.bz2 140048545 SHA256 971c48db11328613340ed97a92018403647b8cca6a692b3d6b4145aed124382a SHA512 f818ed8095b61f27b8df62e18fab59ffae7637b59efb5da66f9aa31a5e833d49f60ae302c0ca75ebcb1d6b1b0bea93b422ef4b9e775bed7738efb24b8888e381 WHIRLPOOL c1768f6098a25c12e1d2c4a249eefab59a8771a7a870480e757eb787ee439c6e3ff39e429c460fa210fe4a4a78e27fdf18491242421c91a1a53d8a022b68ee92
+DIST thunderbird-24.6.0-ar.xpi 457862 SHA256 6aa3c326c9757751fe655242e446ae4d906a91ee86cc061a3dca1024fc57e88a SHA512 ad94a05d94331ab4049dd66e4dbcce2c735ab9022a2b46deaf4bb1905c82c3a9652bd494a7484d41f94e64abfd82cc3e5389fbbcc6c0e6b04a92fee13f911404 WHIRLPOOL 5b04322b3fff6863f0834f38fbed5a3c66f16846e4abc2362c97f3f506faf2fcdbb101c4e88ff4e35c7c6f715b8d9212c12c315d9b9c52b11c3160ab1c6ee72c
+DIST thunderbird-24.6.0-ast.xpi 373831 SHA256 e583f909925f6ecb4f72949bd99340f5a8524c21f2628594dee474c9307e1617 SHA512 5e5cc9e4815709b54c1fada0178d2585a402eaccbe9f60a5c6a5f4ad15eea96c6c13cf9eda10f58005323f4fb9dccfb644d8dae39c98dbd0bccc376eceb11652 WHIRLPOOL 7558eb52c6b832b74fed502394489db19cce817dde79b0078cb4f0a84953ab8fcf3046b698f5b85ba0606588db2b89b5c2b0861d4b0de52dc93f3cac0491a5c6
+DIST thunderbird-24.6.0-be.xpi 416882 SHA256 1fb28fd586a69e277ed01b6d6d636e95c7157bb5327e50662f1faadf524d18d3 SHA512 9faf2b88a5fcb00aac340cb53fa4153eeff35393cdae41a6bc62517a34c9d5107c05e17f7a13f1d424fa13f1a5d8ff22c294811e5c29ef17f8fed4c6244db11e WHIRLPOOL 6e280fa218f520ec88415c0faa2feca2f2fdab7be8a2d9992c48ddd119b6d3ece5eb99f7e7ecbf6d3a3551b5bdaeb4a75e03a1c15f7285c7609300f5690b700c
+DIST thunderbird-24.6.0-bg.xpi 485024 SHA256 9b3839d5d0b700d1b5258b47dd2cae555845e34c4dd3bc0a2c602dc0a4ff3503 SHA512 1e46eb0dc1b60a77317ec593495345b4bd493ba4fbcbf6b27aa422cf59c4ec6249bb0c4447d61dd4b491eb41a6289482dd7a59f6d637ee941cb37a975d922b19 WHIRLPOOL 75bc5d5bc0d243d0f7aa20c0908fece44acb899c60dba968efd1258ef33560de7dc53dbb755933310ddee08079c3c989c9a065e6d5e6f3c30005c476aeac7692
+DIST thunderbird-24.6.0-bn-BD.xpi 537258 SHA256 4fa1d881044ebc9b129e7f54b65278e5faa730ed5efc2f354f2ceaa6975398c1 SHA512 ddd46fcf3d15f3cbe2c20f5077a4f3f5573409d40436dec02719cfec6f70228a6bc5f5e99edb01e9a98bef24b97b099ba916fe2a8efcbe623af8ac3ca660234f WHIRLPOOL 45ad4239f959f57e8a8c6c5d6f08bf0049acffe68fcb64b5799f9aa09fbba270707b206a8b0c6dc7f1c9dd086a577880c1c0993771a189e800197d7549ef045b
+DIST thunderbird-24.6.0-br.xpi 427680 SHA256 31723061e78c394a75f2977a80378c6ceec8fbec7d980becd50dfc93c14e573a SHA512 7057c939f75a14c37a0e2b5b5d76753bd67bf51af82add62161ab863654fd178d1b9ef4fc1d16b265ea831df46c5dbc0cfdb895b25b583d5b5d764869f5a6fb6 WHIRLPOOL bbfb78a982e8cd1a1b9ca08e225c7408baed7e61aae5b6c8eebfdfebb625d448171623541eece7c850a897d75dc3465920c3591409960e3c3213a2ed34075279
+DIST thunderbird-24.6.0-ca.xpi 429746 SHA256 e7fa72f56d0a3ab90dd3df581aab4154552be12f71408e04701e4d3aec2b9e94 SHA512 91b018c157e3859694a5d6eeffa901e399d58bf48e0611ef90c5c08742dda1c7ec9174366f120d577872314af566b0e69d299ca10b48328e52875cfafaeffe3d WHIRLPOOL 1e045238aa875eaeef7e1973a7aac2f86eba74a7ad141e2e6fb1630ad857b166466c84c38c981705f593cae6d5f4407fbabdb1ce2d53c9372ce3ad42b27568ed
+DIST thunderbird-24.6.0-cs.xpi 431476 SHA256 360e5cb9097c16ac9fd626917777b491c7c00a95b2e1879ae0fad1b7bed2d870 SHA512 6202788e509ad47b256b02b482b703c187c55e968b5a456d1c63f68c927e3e47e50d7949e991aa01ef0c5dbb2d2e1d6baad99e44ba0fd04bb07f462110848c2c WHIRLPOOL 266208a62c9f1349f6f171cfbf87f0445d62ac545e85c774237eaa68f193cbfd0c3082c172554b21b93b45f7ac0311ff56b443f088e4e447ebb3ca922b495c17
+DIST thunderbird-24.6.0-da.xpi 409627 SHA256 ded61b233f3598f69352d92dc05a7ee9d0bd8852073e2835e0c3b05001f920a8 SHA512 e062cb15b56421aae3c725105ae91d5435e99c8f3b768b7ef1f43c64d4662987445c960aed5118d6e79fc1b90384a4349f4eb567edcb1322938f68bed5e186eb WHIRLPOOL db7331ffed205cc899773b76ef6b91459ba88d054d953ae90972abedb7aa6cba3d344a538132e009cf6710f7d8370e93bd0709df4d3dd06e0e3a00d0ca1b425a
+DIST thunderbird-24.6.0-de.xpi 408674 SHA256 aca6d21ea4176af021b27c67fd21707b0280cf0f1bf6ac34b03b6abf40d50e7e SHA512 a12854c94798da68e484456ec279f5000a72267c1b387c0943fe8466984bf77bc55000b3fb898cc38f69968b15583f3bd4a3300d795d4d074da29d213422bf9e WHIRLPOOL 142d5c4d8852a8337042a319956dd7e21309a5ebfbef2894c8c642aa5d706c136757313158819e2473034b6574c34db6bcff3b00e820c2f95fcffa1f49e7b71d
+DIST thunderbird-24.6.0-el.xpi 464553 SHA256 63080f452b54b7275bfc09b8aa73fd202739c0afd00a1413729b384e86649525 SHA512 b1cce6d3c2e9f48cb646ef3b000c924de1d023118e48e0cb7b7770ce09bca0ae6afc3363687f5686b46a3b06eb7bde702066c819729df0a2910131edbc1a5ccc WHIRLPOOL 7cff573c35846f8c437008209c9d4d36a07924f16fa1b74649e6524d66b9b93b815ea02757c4568e19d6385ee6b20716e5f06853377a8d5f031b622e1731d344
+DIST thunderbird-24.6.0-en-GB.xpi 400962 SHA256 dfdb57b440d21ea9e140fc528f25e6ab2a1966b3865fc87390362995d7c48067 SHA512 47410e1242ffc785e24616ca5c5d5ebc19ede088e0fcae925e9539568769a18a016ca04d5223d947f594e4fc1f8e86341cbbada0c8038f8138da09a3afed4bf1 WHIRLPOOL 61c5447bf0d73ceba9836c098eabe8f069d4d89dcaa6ed4d850c82f39001c8408b2b98cd9677d23903e607787c96e9140e5bed663cb8811ffa23545530138741
+DIST thunderbird-24.6.0-es-AR.xpi 425657 SHA256 3ec3c00f39e98f81c045f6cd41c68bc50ea908c91d295ebd9fa9b18722b83080 SHA512 94c43e10275290b2f6b02e9df2a9d8d878a2119676758db47d29c6cd1d22cbaacfd1efc1039dd744d875bd3a52079b103e63cb1d8002d48411f61ee31a8a60dc WHIRLPOOL 1b157cdf3ecabe5a9e832e343c1896a3fddcf2b3489da3bbb2eb581db7a0cea229af75c60b39a9aa9059edcae16d1b5a33e1659ca906100a2e231a97ceb365c5
+DIST thunderbird-24.6.0-es-ES.xpi 366308 SHA256 14086fa0e85857aa6430bdbfdd5f1f333a14b846126fba2ebfa65d954b68b609 SHA512 eb775acd395532969476566723a2b4d7bba84080719f72ad000e565e95780e33f743338e43519e9775504ee1742569aa9342e551c9bf45db893c7d1f8d07c5bf WHIRLPOOL c142de28aac41372c0caf80a30aee101732eb7021b2c2c662e41bb4e17526d07f0f8749f33522a6959d936e7dd4ec6d0de6966aa45d3d638eb094861eb413255
+DIST thunderbird-24.6.0-et.xpi 422893 SHA256 01505e5154f27bea956f17bf1f8ae3ecac21857b9cc631750aaccb2ae3ed3438 SHA512 4d6abf346ee412041648cef77847c40b9de8d0a71c6032231b4a77d95b0c5fa0b843cdbc5220284a4bcd1719b1e807a971d29d85ae3215a38097c0185f30aff7 WHIRLPOOL 03a76fd256ad8b5b4275936d1e57b34d5acee7580c9bda1101577e47898fd46497930e4a904203945815530fd8b60606a407183ddddb5f76d08b4dd13b1a14b1
+DIST thunderbird-24.6.0-eu.xpi 418497 SHA256 0277449af802ad6fac63b28e7b0383baf2c978ef15bc15a1dd373200762c3d8a SHA512 5aaafd917b8923943e2d99c0f704fbba97fcb2779bfeec34a955e508f02015e1dd34730236f8036090c5130f4f984ad285c4379061f686ec016f038b5e8a6fec WHIRLPOOL 5d96351e536ac74c714c77a838d5dafd4ddf9f6bd2db74c6d55b1df4615807798a145d2aacd6b835d563d80001757b6265acb1976db19725f5fb441334242b10
+DIST thunderbird-24.6.0-fi.xpi 424265 SHA256 9999cf22d0baa8c5c35f560560e1a6ee86fdc37147c433c662f53ed062b251ea SHA512 8ae3ecfb33641d6bb50b8a073ced6b0c85f0f84e86a125a58f0370e1b0e452aeb129bf8922af2c544ad53efd76b54aef72bd20ae208197f7ce8f9a8016934b44 WHIRLPOOL 441f1715c0e13b4585effbd1cbee2ced7703e4b170d356800a6d890865fecb03c66670ec9ed58969f4c61875e13e433e5338f678b1480655e32d4220e9052652
+DIST thunderbird-24.6.0-fr.xpi 431289 SHA256 d053f8f6da0b1d5417342e160824fc0472fd15556b29b2d4a01f043efebbfcac SHA512 2f31444b1d9795b600f77280187d10652dbd53e2102f4d493a4b291b06230738769238f0706a1b336abd3148f38081959f1c58c5d76df0eeecc8f2c61336bf59 WHIRLPOOL d5db61104aa6f060d6bbcc490a3af5cef19c4e967a267b8dca916e40a82129077a094a0ecd917f9086e30044195664aac614e79489d5f9d635db816dd167c8c7
+DIST thunderbird-24.6.0-fy-NL.xpi 426098 SHA256 39492e2d8c4d0783b0d3cbc4bdc2067805850041a3e159e7d2f87842e932c155 SHA512 dcb2e953c633e193fba20cdcbacc51569ce436ccf990ceaf3e71ad381ede6928ca63ca46542c8f671909e5789545dbbde142a9130fbdbcceed03b38e8ce39044 WHIRLPOOL c7195f5ca75dc16b1327f4e01df214d1e561e5c0b6c80257d1d223eb04bd0115e393d1f4afe0da7ba8ab72c889f834221eb48bb16965dc544615af43c34b9717
+DIST thunderbird-24.6.0-ga-IE.xpi 437114 SHA256 78223fedce58b23f0974b0795d90527778bda0ac07cc523345c471d724cc9d1e SHA512 9fa422c8d20a5fc0ef4030f691f51732374994df9b9dce542a35722d0bde3bea44b4886bce49ceb3dec02e4e1a57fc5c31e7438154996fe331219eaabb3061ae WHIRLPOOL 3108186661681445215e8de054e750575c7c6eecd9f124fa9f7aa18972035240e8287522672dd81a5b312fd76beb3eb0f0c2086d66afb85f686f1fc53a279eee
+DIST thunderbird-24.6.0-gd.xpi 440092 SHA256 cfb9655e0423bea9a7b9afe67fc0f38824f859b0bafeb6cacfa346a9e1f9f7db SHA512 1414678575d1944c4e053be8cbc61011139a50abf4b4faa2efb33d64b2e9facb88930d451998131b50591f4b7b6afb694f66888d94c1fd683f088f149878b066 WHIRLPOOL c9b68c63680a640ea37481fa8114399ce0b3eade8a21edfdcb90eceef3f1b561213dfa4182096c7d0c2a9f4f274451a94fb1a822708e7baf7c7f385ac65096f0
+DIST thunderbird-24.6.0-gl.xpi 427543 SHA256 41a888063bf5fc08f46280bb1d4e926b0162357bc2f76903d95272bf4d385683 SHA512 b84f8e44e5f910e7c9b20acbab1c6ec2475aea63247c9d09eee6cf7f9ebfbe7915fdb648d41b1668ce1485d900ce94db2080dfd59acc6ec1563cdf495871e0e3 WHIRLPOOL 8f82f1ec81344f77a2b1cc501c903798c3e1ce21c906c88645268db266972eb48b7a0dc88a07fca57abdc8f30c8f904b9dac14de901bdfb383bb00e6ac72412a
+DIST thunderbird-24.6.0-he.xpi 457066 SHA256 bdc5f8002eeb770daac280431dcfd837e7e2d6e4b250b37b70dba658dba72437 SHA512 c718721838ab1d6d229dd866cea0e0672de6b47cd0b95de6d393cd933bcabae61722d4baf43cbd456dc214b28c42eb8dbd4092cbffc842966840f2a31e3ebd69 WHIRLPOOL b532cac8ca62407f06fbf0eb2c954a07e802ed744619fb9c7c90c473b55330b18f2e8c22f0dd125fed24e3fa6b6fd11e3af05d2f78c45b83de0338c120363273
+DIST thunderbird-24.6.0-hr.xpi 422387 SHA256 1e4cfebe1f3cb0e219e24e9ce2cfdf799a7df046dd4dec81b14f4b1c77104a85 SHA512 926ab4d5cdd52b424e1bca77b20d49f735fcd0cd17be6cc6d5c7b97d20d7d28a5165f251293b16199e28fefc6cf6443eb0ca3aa08b6f6eec8d88d67173b962aa WHIRLPOOL b5f36174bed9ffb4c271097a6c41a4bbdc2f05744c8f7d4f273019eb1846a96bb183128828fa3acd9558842a26ebc74a8876df6cb89b8f248834b7d2b4e76d45
+DIST thunderbird-24.6.0-hu.xpi 441512 SHA256 f374db7d1f05bf2bedb8da02ae4ba37b2cdacffbcbced929be2113525d16a971 SHA512 312ab78ddec16d1b972086d99f4d1e67b80fa49a4b87fd69c1e8d36d95c35105ce3e04e74a4d9f5ff47c3e46138d0f6bcab2a4d42432f691e608c388d92da36e WHIRLPOOL 4ce53fbc7479194e9325431f348ca907f5f0ae2bd6c03e4abd39fd9391e8df3e00482c17c23b6c28cb23d3d43558394387c508b86b225b3dcc32967e066bf013
+DIST thunderbird-24.6.0-hy-AM.xpi 477923 SHA256 c2c76a69dc3cb32a2009024d70ba25300bca706c72883f44e4894a679ecb5823 SHA512 b8be542d1a22ef7c8ac3c974162d65400ca81c8297a226fb8de1b2c510ac3d05282501fc814b9334c6b82d2cbce80e03de906a30b03c85d2cb6998e5d0349ccb WHIRLPOOL 4e7f8545486cb85968ccd8f7fe80d8066fc1107a528bfcca27ed652d910571d91479162619adf3d5afb4121215d5b4747e8323d96bbdbd29c4283c9307d5476d
+DIST thunderbird-24.6.0-id.xpi 457499 SHA256 d25be8b5e37035220e02b07f774d821290ec21d1802973a637abb5af878af690 SHA512 699aed73aaf93668897fc2e25aa0e910d29e19ddc9a54b8ac5c93f700f3d92b6ed5f10cb950f9aaff163def934dcd2a33dd11061313f462c85663d74837a0db0 WHIRLPOOL c9e6509430c15e5d95911b378706a7ed86952b7c4eddd37e9a0ef51f5db69c1a4ca233d62ee80a024652c302bce72fdee5beb1f9e759cc7133e3f34478e8265b
+DIST thunderbird-24.6.0-is.xpi 425710 SHA256 b87e04aa6d35bbb41692c72f9f9cb19246e49a54d4edc3e29fddca5db651a3c0 SHA512 c75aa17e09ee4c119775ebf0be77c052e7aaadd47680289f362734c3ee75d44eef8ff9953728950f42dea707e9c433c140cfee71ddb0b75910bd3424d3a2b658 WHIRLPOOL 3770d15930394e785cd37e4dce8de4ce919076a73e249f899c722632a02ed38b77fa99da274711d50843369594524d90a0c6128997964bd082a0adfce0041e0c
+DIST thunderbird-24.6.0-it.xpi 357933 SHA256 fea724ca6ec33c7462fd4781390a0b310fb3a023aaa99771db83399b65f581fe SHA512 e9035129378b27136cca76c128da514275943fae46127bf75b8ef5e74b2af8c81bc33ce657c6b3f71622ed78976abf8528b0e17e9611b65ca1145998e5aa9339 WHIRLPOOL 5d11e4063e8212d0502e8ba7e55b087efdc568a57906e8c2f4d8da21601466dee1a66c42127a871f0f1e158e94b515130c62a35086403d17595ee74e079f77e9
+DIST thunderbird-24.6.0-ja.xpi 475559 SHA256 0c2113e085d920d748a0424f89641f92901d9e97ae9c06cfdb561e980a276c99 SHA512 5b6b1d408246f224a042e1c721f374e45ec59147de006cbf4032d1f7a2ea5dbc532eb4960c3c44862682a366e710e1e7b33ac4c66503b57f140322e50ebe583a WHIRLPOOL 0fe32b89ae299c18932ecfb4a651388ffb3d2dd68861dcdee22b62ccd8c0fdc978c5d24bd58163753727302ce72f3745cecbdfe2e59c3104ecc8f2bc257fa709
+DIST thunderbird-24.6.0-ko.xpi 428071 SHA256 cbaa57d1df226fb6f921d90c3b7d93ee47d73b2bb4f7bf3c748171a1c7af2aac SHA512 6c9ded188c44caf2c9cce221a05566ecd900eb5c9642ca84944a7a1921b36e09eee125a36b38cf347001f7c84fa0bc539a30c51904b2af40535aa56074108947 WHIRLPOOL 0fdc3226384688a05f23d83e3e95758e5536809db2a679869e4307d1f6055207f59213af980e88072e8c5792bd524c164c10cb877ddab9c273adeeb98f685f12
+DIST thunderbird-24.6.0-lt.xpi 443260 SHA256 6db3fa6fe593292d717b7077142381a038039365e8f14de74f74edbef64950e7 SHA512 ce0225f40b501071996ae91978bb0624ca005fafe21b41d2bd18516898b08f37b27822955b0eb53937c1d52b60dc97c2cf2c8ed94f37bc5d614de7220af03bff WHIRLPOOL 27e695d50daf168efbe10b7f4e3d5ea68b0f50d1c4d74d0a6c196e645cc9a08bb76eda6b9bb63d1f670b4a3ba5f4d7bafffbdf49a4c2fb350fac7328d3c27243
+DIST thunderbird-24.6.0-nb-NO.xpi 418922 SHA256 1a773698c405c78a947d5bc2a276f770aa885fad724c9f2b8c04025215c0e994 SHA512 e1f778b41ba1961e3901309069e7e028fd5c524e42347e35f604a2390a27c4a0af82360f620b51bebea05e26674d56ac36c86ab3cc0a4a98cf750e2f8469c5e3 WHIRLPOOL 804914ec21dd6e29cd0d939f0f4ae431926b7557524c7b8e185291fe007e9e0254a60cc9d0b95693481ee57786c764ce8b0c6c6e39f2fbb4b9276e67fd752010
+DIST thunderbird-24.6.0-nl.xpi 418764 SHA256 0761a699166bdcead5330af9691bb8437545dd24d3ce2cd1e642f1a48ecc7180 SHA512 5d4ec403f80b765a73e234ca3b343d34a3edaf2d64bcb87961aca4c98a39f9a5a4046fab0a06314c2612b0f90aea2b702499b1a1ec78fcbfb7c68050d7e19170 WHIRLPOOL 775d48fbc874221e9bddb9b4afc7320b73a88957af090129a522e31d851c7db1cc88c707803d15d3293e7c4ad18ac95ae319dbf07a69438d28d2130d36d3bbaf
+DIST thunderbird-24.6.0-nn-NO.xpi 421134 SHA256 4e1951dbdfdcf06dee95a6884d1e9e7b4cf141d95e078fa1fc5fb79feefe873e SHA512 e3fdee8be6e2b3b98a0d589581baacca55451036f15a5903a1ac6ca1c6d6bd54a5880599a46c6e570257773a4c01bc4417252e81c1aad1bff2c42316dbb64328 WHIRLPOOL 18a6522a3252e1d600479cee2237bf39fc846541323d0cf8d430b80bb923ffec5e0c20137ce47726b2f5a20133130b70804054d008c9adc9511b9965e6eb628e
+DIST thunderbird-24.6.0-pa-IN.xpi 508272 SHA256 8bfa8109aac418ac6650c8419f946250e569d8101f587f9d6f001a6a59b30385 SHA512 9c7a4017628e9aa17ecb33089cb8e9b98f6b36371273fc005d343bfbcb78fd830a98ab7d8877defe816a3225382aef81829ed407ca0baf5654907b2078d483fb WHIRLPOOL b2e0fd2f91e0b665ec59899910633a15bce5c4ae018612b5a5bed2c8e70389df7c65bf51958c2c4b71a3093f4fb4393db85d18b02c92aefc5bbabd172084e3bc
+DIST thunderbird-24.6.0-pl.xpi 401753 SHA256 e3514ebf5207fd6ae6caeb01c624ad015ffdb6e06aae3ffe39feade0bdbcdcce SHA512 2721310aa494c52f007fa30350b45281a3ce4a9af4e45f99b7f34a8b1071117401d0ac3259f1cc1303147e6e879e979fb30b8a583baa81b73ce57cfac22d6a29 WHIRLPOOL 1a2b89d0ebed6113e98642cb230a1f15c6d441df975d031e2d1cc7b02cf7138f25c9b630e684f38277b67d844001ebb7b6eb8278d6b94317638629da2b817cc6
+DIST thunderbird-24.6.0-pt-BR.xpi 430909 SHA256 2bc7c139195fa661fbe0721df4cbb80e56cd193cd7807e8b16a7855d453b66e1 SHA512 5ae49cdcc3009988758499fd6db0ed44b551f641aac06151d5f18e15d71d2badb956c57459c11bb25d95d89e88847c11ae1b093c7348c69c5a009faa944d9b03 WHIRLPOOL 3970595e01fc30d6ff1d5a4afc0c4d63460ee05aee9dfc00c01cbad044a0650ed5a139d329c2dd44463c7d34ca1901fbbf756c4e5f2b4cc32f8a2ed0f6c91b51
+DIST thunderbird-24.6.0-pt-PT.xpi 425026 SHA256 19c86db424f83dda485d655d80830d242850da1008cf2644e0e214d4bf56c745 SHA512 03ef2519b50fa98a744ef55840c7bd5fb937d52bffbc8651582c63aec614d010cf6dd957b379f945cb3fa6ff93ce9dd9db908c4b6cd7a9f2b9c9254d24bd0e4c WHIRLPOOL 7b90e4b3409c0efef5072cc7300ed326dc9013352b49fb405bec2cfef03263db79f2a13414c6a55377a28e69d1002772dfe344e1b7126eceda80d3c0e19b75f1
+DIST thunderbird-24.6.0-rm.xpi 432384 SHA256 779d52491bfbc449ba87fc4ea11f5190021cb72a45d7167cdbcb8fc10cdbbdeb SHA512 2498008c53768c8ad583ec0b2d03aed34f9dcb151990931f10c9a257aa3a55fe85b65a2dd6485a4c3a18fd0d1585cbd7825ece198a1d2e2c9c67ba604e4d6304 WHIRLPOOL 5ce01fdf7fb9fde8faace1cb471542575ed79fae830d878cf365c4fdba61c430ebf13a10143ce314ead1574c1617fbb066ef7333abd39fb93422ccb8eebbc9e7
+DIST thunderbird-24.6.0-ro.xpi 497491 SHA256 6b1e81e6df2f2ee752aab0fe1b9290e6c287da4ca498df330601de2bc9f8086e SHA512 144a188c85b59d50e37f7f8ebe17b1a0fdd91a785faf850e8c89fccc5c59d88c8f7febe73041dc311ee538a2b1475302e63375e672a2504dc70a227a7d348536 WHIRLPOOL 8dcdba4947abaa0910145e361915cefc68ec0669992cb4c8a44617da58926c6f31c042b69419dca1704e1a35022b1e7c7e7bcdd6320ce4123fecd16571c4fbd4
+DIST thunderbird-24.6.0-ru.xpi 425098 SHA256 2c4b38d8d1581614ae481efbe1fb1d74e75e374c4360df2dcc5eef335627cab2 SHA512 ef470ecfb69c960a881d997b4b879d22d67cfc43bb1bcf140b6c0645425a87fb285d3fae009829a1b8f16240df7b3a0ec0fc00fe6765f21b5261b08526c876f4 WHIRLPOOL f0f0f6f50eb11aa07d8dbdc14a4cc0d62b796654a6b1555a59f21031b7aefde134e38ddbd1d5f8a3ea3b2c74d4c3803a2bb6eec6d94e807c5e6aef719baa2231
+DIST thunderbird-24.6.0-si.xpi 511167 SHA256 7a5bac3f61891229cb933f82b8b5a196313951db10d157ea70688c69c0a4cf06 SHA512 01889672c400bc71bd3efbd0a9f32fa44dda5e640b33fb12715456fcb203e734efd70a244c53498b9ec2ec0896bbb0d11d95f5e47f43b295ae27bbb7dc6bc2c0 WHIRLPOOL 12ea5f7d78f4466068e37ab3b632b2c6d1cfa462d615723d2ec6ec36740536a6d42e099be6ce49c48f970279eabe1d2b5783c0ef6cacf2a5ed9fb591d973587e
+DIST thunderbird-24.6.0-sk.xpi 440106 SHA256 3899a09c9b4f6269830217e5d8ebd26a78619cc95c0a81898ab84a246def5cd8 SHA512 8f13c83a8f5c60ff58141083ac5abc33091ee46220495f32e4910619f9026a4a0307e8f087d27ffe98f6967afeb875352c827555f59edeb1764e9d441741af27 WHIRLPOOL 66cdbb8bd088d634b80cf481e47f51f3b85519738eee42252e3592cb21100d3b121dd0a2ef72e2560f635a466b1572696ac89f69a1db4af255285f7fd59a75f6
+DIST thunderbird-24.6.0-sl.xpi 421706 SHA256 22d81c886d7a775e9b1464550c326c6d2adc32ed87c47fbc47e953ac5d4a388e SHA512 a6c5cf395f9027327114f5c822cd195b1712a7497a13bb1ec390c0b86fb4594cd354b398b932fcdfa29daf3bd244081587337c643c44974c5b31eb4705f39d1e WHIRLPOOL 5b6a4e301a80e8c43657c1587148e6aed4ef22338dba9cde2ad67aa51acc23f3b1a3fd2b29331dc07cc7691ae473deab9086d4c720d4f5a9377a16f6a571733c
+DIST thunderbird-24.6.0-sq.xpi 435215 SHA256 08a4bf603c50b67e28841e76d1cdb23ec250e52c9afbc04b35059c8ced37120a SHA512 7390879139ddb0c87774365273a20be8d751a34da2e0acab50b79acdb7ce8757cda5d2ad7e960285b0bb1d7606affe0c84f5c780a327157cf8974911b957a1dc WHIRLPOOL a073e9f1dbd4a5b9c57b132ec6c277446738e18b60c65af66efc3adc6c30cf5eba19d642646c1f036fd7f5646de2945141ab277756f03c0c360526ef09034a48
+DIST thunderbird-24.6.0-sr.xpi 518890 SHA256 7e8eb7dd6dd9846bbb704d80dd757086f6da1b38070716cad12e2d6e87a99311 SHA512 3c050e5a9aeadd78a58ff2d8cf64686e03bfb1a403b0c7145a9c3c97e7f9fe908e8d872ea77d87e7e246c672fa0301814e51e4171f969dea249ac930c69a4157 WHIRLPOOL 076d2c2b09567077c960a250702d5ca2784b1c50bb2f594b917d7773611bca698577da72c439820c57a95820da0bd7a7591d0e2fa7b340b815e9896166f509af
+DIST thunderbird-24.6.0-sv-SE.xpi 423816 SHA256 4b920e494be9abf2784dc8b8b282b0c022601458e1bdac5ca21b92157f1a0fa6 SHA512 41062aba3a2605767acacb9f769e3a89a005326be17f497b9021b99ab9a2fc1c9ef56fba6c90866b6d6095e33411c3de320472244af697826c6312dc1dedc49b WHIRLPOOL 94ceaec4e5ff719ffb66b5e827a45b3d55ad504ba9517f701dba244e265c4096c37581dafdf54f4a2ebe517f5c82ee76a740deb30b30c3a6b365a0666ff68ee5
+DIST thunderbird-24.6.0-ta-LK.xpi 534923 SHA256 23ca919444d43bc104e282fb3dbaf5c71ebbbfacd80a5c8a1c72ece41971394c SHA512 1cb39799b333418a6344df19ead4626969a097f7e2e8ecb9f50a9af06bc870f25400ea92278e33b36fa7a89c102a3d1a9549333acc29a72b3a880f5bc4a512e5 WHIRLPOOL 898a02254e1aa01396447fe4dc8f3d0c9996cce63cccfaf34b4fc47a636ecf7ddcf9eb51847907dd5d5602ae3701d216cd41054c2ce4b8d68180504c6218dd2f
+DIST thunderbird-24.6.0-tr.xpi 438067 SHA256 e6d8de6e52b3bc0bd706d46a25f25e1fe8c5d37608d7d5c251b43008c5397fa6 SHA512 75f6bfdeda5f82ac0bcde110bded33b86b21f065490eed051d762ad7f5e1e40f89fb512bb18cbc90472b12af1eb44e56c09c2972088ff6ea5ea3e1b676d27a40 WHIRLPOOL 99b0aece156fec3796a2e54c6767363602e27271156eac904979c54b6d99d2469f026a6d6095344cb4acc3542c3f208746971caa05bb5a2a7497bc2fade9b38b
+DIST thunderbird-24.6.0-uk.xpi 480949 SHA256 650bbcb5e1879d756953cbe990e78730afbf6b93b4b4fceef6119d3618c00522 SHA512 9e07af6e8860c259b6bfbad6a3f384b4223d06d155da544e79d1b2d6034ae7178f2b927211fd0285f234cbaf117ef4fafbff16ec5edf4a56278df05d97c0925b WHIRLPOOL 8bf6d625a8900e6ba627f920d65ae933f1a6671ef02aebfe88e656235c0144a8541c3c996288fc3bd8e457b0aa8cfbbb0d72b3617665932457eb74fb68a74f7d
+DIST thunderbird-24.6.0-vi.xpi 495559 SHA256 7c927599de8066f45e07ff338167b9dba1c9b7f179bb8f6c93cdc9b0fa6b4624 SHA512 9e9068087c88acce29745fe475a2d1bd6f8e42b898c4f249b2ec4e933b0e6d908252964e1aa54720510c2ac0d6ce92010b7b673069db613dc4bf93c57442a79b WHIRLPOOL e7d2eb4ebe9821b3b939f03516031817f52e87fe165636746f0c1d85f09794141cfbc01c4bd362e761a0d6fcbcd7563c49dd403952004e5bca8497f7af883a67
+DIST thunderbird-24.6.0-zh-CN.xpi 449182 SHA256 63b2f4bfb24ad36d32529a79151a8b73195d4beb35eba9ef4a3e4cf8a2020139 SHA512 44969119a95cedc5b036e7b0cd82cc4eb9a18c70ae592e5ce6f54a698f0d687e5cad9052152c511ef946ae25e1d850ba32769843d918cf478465a49e82e7fa96 WHIRLPOOL 17a6fa7ccd6e241a522d0fd0c20052089c39f4fe955d899faed4d905e7a6a3319d0ed02a975c2279317e54aa6b97fc962de9284dd40a1463e19cb5503766c43a
+DIST thunderbird-24.6.0-zh-TW.xpi 450001 SHA256 0f99b8c4680ab081629535e79898081c568d3f57c01d7149c69118d4be125e55 SHA512 19ebcc974dafcb492b76566d650abdffa650efd41faf50d28eece34694698eb76e9c7f79cdeff34afb593254816c40e2efe3a102edd3b8c923021280c17a287e WHIRLPOOL 895d673811da95cb1f7098a0f3260739292249e0700c4d958719d668c569bfe45b609737aeeaee173fd6713552932bd949790ed18252f56846c25d554c878006
+DIST thunderbird-24.6.0.source.tar.bz2 140120461 SHA256 ae9a7cbc8dc195bd9f4b7b4edcd33599fa08c5388a0690f77221e6c5566629ea SHA512 a0f2fb586284f0afb22cd5cbac9d675ceea674cdcfbad1e61cd9d92eeb720574660e7eead9bac7e587bab999d724b3fcd008d8ef12b1db59f3f61a607d0e3111 WHIRLPOOL 06f39474b3ccacab472fe5ae7287900d45235e3ed99f323c6931ef14293387191a87efad0efbaf567575b0e21df038b93ba36dc2744d98c4b9fb37ff2e6c6a87
--- a/mail-client/thunderbird/thunderbird-24.6.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-24.6.0.ebuild
@ -0,0 +1,398 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-24.6.0.ebuild,v 1.2 2014/06/12 00:28:33 floppym Exp $
+
+EAPI=5
+WANT_AUTOCONF="2.1"
+MOZ_ESR=""
+MOZ_LIGHTNING_VER="2.6.5"
+MOZ_LIGHTNING_GDATA_VER="2.6.3"
+
+# This list can be updated using scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=(ar ast be bg bn-BD br ca cs da de el en en-GB en-US es-AR
+es-ES et eu fi fr fy-NL ga-IE gd gl he hr hu hy-AM id is it ja ko lt nb-NO
+nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi
+zh-CN zh-TW )
+
+# Convert the ebuild version to th firefox-24.0-patches-0.4.tar.xze upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_beta/b}"
+# ESR releases have slightly version numbers
+if [[ ${MOZ_ESR} == 1 ]]; then
+	MOZ_PV="${MOZ_PV}esr"
+fi
+MOZ_P="${PN}-${MOZ_PV}"
+
+# Enigmail version
+EMVER="1.6"
+# Upstream ftp release URI that's used by mozlinguas.eclass
+# We don't use the http mirror because it deletes old tarballs.
+MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"
+MOZ_HTTP_URI="http://ftp.mozilla.org/pub/${PN}/releases/"
+
+inherit flag-o-matic toolchain-funcs mozconfig-3 makeedit multilib autotools pax-utils check-reqs nsplugins mozlinguas
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist crypt gstreamer +jit ldap +lightning +minimal mozdom pulseaudio selinux system-cairo system-icu system-jpeg system-sqlite"
+
+PATCH="thunderbird-24.0-patches-0.1"
+PATCHFF="firefox-24.0-patches-0.9"
+
+SRC_URI="${SRC_URI}
+	${MOZ_FTP_URI}${MOZ_PV}/source/${MOZ_P}.source.tar.bz2
+	${MOZ_HTTP_URI}${MOZ_PV}/source/${MOZ_P}.source.tar.bz2
+	crypt? ( http://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )
+	lightning? (
+		${MOZ_HTTP_URI/${PN}/calendar/lightning}${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi
+		${MOZ_HTTP_URI/${PN}/calendar/lightning}${MOZ_LIGHTNING_GDATA_VER}/linux/gdata-provider.xpi -> gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.xpi
+	)
+	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
+	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz
+	http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+RDEPEND="
+	>=dev-libs/nss-3.16
+	>=dev-libs/nspr-4.10.4
+	>=dev-libs/glib-2.26:2
+	>=media-libs/mesa-7.10
+	>=media-libs/libpng-1.6.6[apng]
+	virtual/libffi
+	gstreamer? ( media-plugins/gst-plugins-meta:0.10[ffmpeg] )
+	pulseaudio? ( media-sound/pulseaudio )
+	system-cairo? ( >=x11-libs/cairo-1.12[X] )
+	system-icu? ( >=dev-libs/icu-51.1 )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-sqlite? ( >=dev-db/sqlite-3.8.0.2:3[secure-delete,debug=] )
+	>=media-libs/libvpx-1.0.0
+	kernel_linux? ( media-libs/alsa-lib )
+	selinux? ( sec-policy/selinux-thunderbird )
+	!x11-plugins/enigmail
+	crypt?  ( || (
+		( >=app-crypt/gnupg-2.0
+			|| (
+				app-crypt/pinentry[gtk]
+				app-crypt/pinentry[qt4]
+			)
+		)
+		=app-crypt/gnupg-1.4*
+	) )"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/binutils-2.16.1
+	virtual/pkgconfig
+	amd64? ( ${ASM_DEPEND}
+		virtual/opengl )
+	x86? ( ${ASM_DEPEND}
+		virtual/opengl )"
+
+if [[ ${PV} =~ beta ]]; then
+	S="${WORKDIR}/comm-beta"
+else
+	S="${WORKDIR}/comm-esr${PV%%.*}"
+fi
+
+pkg_setup() {
+	moz_pkgsetup
+
+	export MOZILLA_DIR="${S}/mozilla"
+
+	if ! use bindist ; then
+		elog "You are enabling official branding. You may not redistribute this build"
+		elog "to any users on your network or the internet. Doing so puts yourself into"
+		elog "a legal problem with Mozilla Foundation"
+		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
+		elog
+	fi
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	CHECKREQS_DISK_BUILD="4G"
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+
+	# Unpack lightning for calendar locales
+	if use lightning ; then
+		xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
+		xpi_unpack gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.xpi
+	fi
+}
+
+src_prepare() {
+	# Apply our Thunderbird patchset
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/thunderbird"
+
+	# Apply our patchset from firefox to thunderbird as well
+	pushd "${S}"/mozilla &>/dev/null || die
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/firefox"
+	popd &>/dev/null || die
+
+	if use crypt ; then
+		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
+		pushd "${S}"/mailnews/extensions/enigmail &>/dev/null || die
+		epatch "${FILESDIR}"/enigmail-1.6.0-parallel-fix.patch
+		popd &>/dev/null || die
+	fi
+
+	# Ensure that are plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+		"${S}"/mozilla/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+		"${S}"/mozilla/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/mail/installer/Makefile.in || die
+
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${S}"/mozilla/toolkit/mozapps/installer/packager.mk || die
+
+	# Shell scripts sometimes contain DOS line endings; bug 391889
+	grep -rlZ --include="*.sh" $'\r$' . |
+	while read -r -d $'\0' file ; do
+		einfo edos2unix "${file}"
+		edos2unix "${file}"
+	done
+
+	# Confirm the version of lightning being grabbed for langpacks is the same
+	# as that used in thunderbird
+	local THIS_MOZ_LIGHTNING_VER=$(cat "${S}"/calendar/sunbird/config/version.txt)
+	if [[ ${MOZ_LIGHTNING_VER} != ${THIS_MOZ_LIGHTNING_VER} ]]; then
+		eqawarn "The version of lightning used for localization differs from the version"
+		eqawarn "in thunderbird.  Please update MOZ_LIGHTNING_VER in the ebuild from ${MOZ_LIGHTNING_VER}"
+		eqawarn "to ${THIS_MOZ_LIGHTNING_VER}"
+	fi
+
+	# Allow user to apply any additional patches without modifing ebuild
+	epatch_user
+
+	eautoreconf
+	# Ensure we run eautoreconf in mozilla to regenerate configure
+	cd "${S}"/mozilla
+	eautoconf
+}
+
+src_configure() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	MEXTENSIONS="default"
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# We must force enable jemalloc 3 threw .mozconfig
+	echo "export MOZ_JEMALLOC=1" >> ${S}/.mozconfig
+
+	mozconfig_annotate '' --enable-jemalloc
+	mozconfig_annotate '' --enable-replace-malloc
+	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --disable-gconf
+	mozconfig_annotate '' --disable-mailnews
+	mozconfig_annotate '' --with-system-png
+	mozconfig_annotate '' --enable-system-ffi
+
+	# Other ff-specific settings
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+	mozconfig_annotate '' --with-user-appdir=.thunderbird
+	mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
+	mozconfig_annotate '' --build="${CTARGET:-${CHOST}}"
+
+	# Use enable features
+	mozconfig_use_enable gstreamer
+	mozconfig_use_enable pulseaudio
+	mozconfig_use_enable system-cairo
+	mozconfig_use_enable system-sqlite
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-icu
+	mozconfig_use_enable system-icu intl-api
+	mozconfig_use_enable lightning calendar
+	mozconfig_use_enable ldap
+	# Feature is know to cause problems on hardened
+	mozconfig_use_enable jit ion
+
+	# Bug #72667
+	if use mozdom; then
+		MEXTENSIONS="${MEXTENSIONS},inspector"
+	fi
+
+	# Use an objdir to keep things organized.
+	echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/tbird" >> "${S}"/.mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+
+	# Disable no-print-directory
+	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-cxxflags -fno-stack-protector
+	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]]; then
+		if use amd64 || use x86; then
+			append-flags -mno-avx
+		fi
+	fi
+}
+
+src_compile() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+	emake -f client.mk
+
+	# Only build enigmail extension if crypt enabled.
+	if use crypt ; then
+		cd "${S}"/mailnews/extensions/enigmail || die
+		./makemake -r 2&> /dev/null
+		cd "${S}"/tbird/mailnews/extensions/enigmail
+		emake
+		emake xpi
+	fi
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
+
+	declare emid
+	local obj_dir="tbird"
+	cd "${S}/${obj_dir}"
+
+	# Copy our preference before omnijar is created.
+	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \
+		"${S}/${obj_dir}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	# Set default path to search for dictionaries.
+	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
+		>> "${S}/${obj_dir}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${S}"/${obj_dir}/mozilla/dist/bin/xpcshell
+
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+	emake DESTDIR="${D}" install
+
+	# Install language packs
+	mozlinguas_src_install
+
+	if ! use bindist; then
+		newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png thunderbird-icon.png
+		domenu "${FILESDIR}"/icon/${PN}.desktop
+	else
+		newicon "${S}"/mail/branding/aurora/content/icon48.png thunderbird-icon-unbranded.png
+		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
+			${PN}.desktop
+
+		sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
+			"${ED}"/usr/share/applications/${PN}.desktop
+	fi
+
+	if use crypt ; then
+		cd "${T}" || die
+		unzip "${S}"/${obj_dir}/mozilla/dist/bin/enigmail*.xpi install.rdf \
+		|| die
+		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
+
+		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die
+		cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
+		unzip "${S}"/${obj_dir}/mozilla/dist/bin/enigmail*.xpi || die
+	fi
+
+	if use lightning ; then
+		local l c
+		mozlinguas_export
+
+		emid="{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}"
+		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
+		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
+		unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/gdata-provider-*.xpi
+		# Install locales for gdata-provider -- each locale is a directory tree
+		insinto ${MOZILLA_FIVE_HOME}/extensions/${emid}/chrome
+		cd "${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}/chrome
+		for l in "${mozlinguas[@]}"; do if [[ -d gdata-provider-${l} ]]; then
+			doins -r gdata-provider-${l}
+			echo "locale gdata-provider ${l} chrome/gdata-provider-${l}/locale/${l}/" \
+				>> "${ED}"/${MOZILLA_FIVE_HOME}/extensions/${emid}/chrome.manifest \
+				|| die "Error adding gdata-provider-${l} to chrome.manifest"
+		else
+			ewarn "Sorry, but lightning gdata-provider in ${P} does not support the ${l} locale"
+		fi; done
+
+		emid="{e2fda1a4-762b-4020-b5ad-a41df1933103}"
+		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
+		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
+		unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/lightning-*.xpi \
+			|| die
+		# Install locales for lightning - each locale is a jar file
+		insinto ${MOZILLA_FIVE_HOME}/extensions/${emid}/chrome
+		cd "${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER}/chrome || die
+		for l in "${mozlinguas[@]}"; do if [[ -e calendar-${l}.jar ]]; then
+			for c in calendar lightning; do
+				doins ${c}-${l}.jar
+				echo "locale ${c} $l jar:chrome/${c}-${l}.jar!/locale/${l}/${c}/" \
+					>> "${ED}"/${MOZILLA_FIVE_HOME}/extensions/${emid}/chrome.manifest \
+					|| die "Error adding ${c}-${l} to chrome.manifest"
+			done
+		else
+			ewarn "Sorry, but lightning calendar in ${P} does not support the ${l} locale"
+		fi; done
+
+		# Fix mimetype so it shows up as a calendar application in GNOME 3
+		# This requires that the .desktop file was already installed earlier
+		sed -e "s:^\(MimeType=\):\1text/calendar;:" \
+			-e "s:^\(Categories=\):\1Calendar;:" \
+			-i "${ED}"/usr/share/applications/${PN}.desktop || die
+	fi
+
+	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/{thunderbird-bin,thunderbird}
+
+	# Plugin-container needs to be pax-marked for hardened to ensure plugins such as flash
+	# continue to work as expected.
+	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
+
+	if use minimal; then
+		rm -r "${ED}"/usr/include "${ED}"${MOZILLA_FIVE_HOME}/{idl,include,lib,sdk} || \
+			die "Failed to remove sdk and headers"
+	fi
+}
+
+pkg_postinst() {
+	elog
+	elog "If you experience problems with plugins please issue the"
+	elog "following command : rm \${HOME}/.thunderbird/*/extensions.sqlite ,"
+	elog "then restart thunderbird"
+}
--- a/media-gfx/exiv2/exiv2-0.24.ebuild
+++ b/media-gfx/exiv2/exiv2-0.24.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/exiv2-0.24.ebuild,v 1.1 2014/06/04 21:22:13 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/exiv2-0.24.ebuild,v 1.2 2014/06/12 07:21:52 mgorny Exp $

 EAPI=5
 AUTOTOOLS_IN_SOURCE_BUILD=1
@ -57,8 +57,6 @@ src_prepare() {
 	fi

 	if use contrib; then
-		epatch "${FILESDIR}/${PN}-0.23-boost-fs-contrib.patch"
-
 		# create build environment for contrib
 		ln -snf ../../src contrib/organize/exiv2
 		sed -i -e 's:/usr/local/include/.*:/usr/include:g' \
--- a/media-sound/soundkonverter/Manifest
+++ b/media-sound/soundkonverter/Manifest
@ -1,3 +1,4 @@
 DIST 29024-soundkonverter-2.0.3.tar.gz 591340 SHA256 86e1a62a47433ab446c165c16b8950d3ed00cf73dfb3d411019717e8e5d73f0c SHA512 106620e82162280c96ee809145d7196bec049f2a69c6808dce2528ccda5be1976c5a6aad32e25fb6b5578417e535263f4425edc1ebe4b28f6a2f5fdcb9478c98 WHIRLPOOL 2df0edd1342e63cde2407d8a36484d323304e8bddff89ad9f112e218e5f23a0820c51fb7b03d3303623681348df76a9b5895e243f358c6e3af6115722c8c4139
 DIST 29024-soundkonverter-2.0.4.tar.gz 617552 SHA256 ce42af4f16eb45df7f8bacc3e16a8d0db4220ca0444772e426603116a982ac7a SHA512 0cea88c17b32fdb0038839bedb216f062b6d7643feef528787278f03ca3058df4fbe1562cce2c8d749d0baf05e1ba8f89ed544a4cee1353f54fd2de4ded8235a WHIRLPOOL 0dbbd2a331445db7413024b6bddd8e6c757d4ec320287f83dffb1c58be7447e00c01d2714d81e2dd924cf1cf10d49102cd488dccd4abe75b7866aa0263447bf9
 DIST 29024-soundkonverter-2.1.0.tar.gz 752619 SHA256 951603da42012ac2424293a29affe6fdf772ea53a69ca063b8eff9f122a93431 SHA512 d8e93ba794f44e102fa68baf423541c78e23be2db619eb940cb936b626218e0516b20a7cfec668e33034230edc14db4e3cfaaa4d5612c0c32cacfd45cf83bfd1 WHIRLPOOL 7d6f3eccf06e0f395a56fe813739ee6845f39a665cf0d677fae9e5d0ed386d6febe87dfff4a8d9ff9888d5f1b24599fb567c73d59885c84d46ee90e0b9b79d0a
+DIST 29024-soundkonverter-2.1.1.tar.gz 754788 SHA256 d97aeec4f1d338d07f6e0768e6ff9728ec050d4baab639fbe6b21c412747fcaa SHA512 d42e96710a9078d0dbcbe9c61ac5d6354f32e3ed44b730eaef476cba1df54d4351d874739ee4287651ee9acbf876c89d5e754dd61f3bf611de2bc3ea46f60a72 WHIRLPOOL 3c8e520194bfafcd6e9bff82c3cc20f66758995be78772cdc21e7aa5cc879b8cf8b47833688f4648afa3b6cec9cd26951b82547e5763cd223c58a592e64576cb
--- a/media-sound/soundkonverter/soundkonverter-2.1.1.ebuild
+++ b/media-sound/soundkonverter/soundkonverter-2.1.1.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/soundkonverter/soundkonverter-2.1.1.ebuild,v 1.1 2014/06/12 11:45:01 kensington Exp $
+
+EAPI=5
+
+KDE_LINGUAS="ca cs de es et fr hu it pt pt_BR ro ru sl sv zh_CN zh_TW"
+inherit kde4-base
+
+DESCRIPTION="Frontend to various audio converters"
+HOMEPAGE="http://www.kde-apps.org/content/show.php/soundKonverter?content=29024"
+SRC_URI="http://kde-apps.org/CONTENT/content-files/29024-${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdebase_dep libkcddb)
+	media-libs/phonon
+	media-libs/taglib
+	media-sound/cdparanoia
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+pkg_postinst() {
+	elog "soundKonverter optionally supports many different audio formats."
+	elog "You will need to install the appropriate encoding packages for the"
+	elog "formats you require. For a full listing, consult the README file"
+	elog "in /usr/share/doc/${PF}"
+}
--- a/media-sound/spotify/spotify-0.9.10.17-r1.ebuild
+++ b/media-sound/spotify/spotify-0.9.10.17-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/spotify/spotify-0.9.10.17.ebuild,v 1.1 2014/05/20 15:36:48 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/spotify/spotify-0.9.10.17-r1.ebuild,v 1.1 2014/06/12 01:21:48 floppym Exp $

 EAPI=5
 inherit eutils fdo-mime gnome2-utils pax-utils unpacker
@ -44,7 +44,7 @@ RDEPEND="${DEPEND}
 		media-libs/freetype
 		dev-libs/openssl:0
 		dev-libs/glib:2
-		dev-libs/libgcrypt:11/11
+		|| ( dev-libs/libgcrypt:11/11 dev-libs/libgcrypt:0/11 )
 		media-libs/libpng:1.2
 		dev-db/sqlite:3
 		sys-libs/zlib
--- a/media-sound/spotify/spotify-0.9.4.183-r4.ebuild
+++ b/media-sound/spotify/spotify-0.9.4.183-r4.ebuild
@ -1,183 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/spotify/spotify-0.9.4.183-r4.ebuild,v 1.1 2014/01/15 19:44:27 prometheanfire Exp $
-
-EAPI=5
-inherit eutils fdo-mime gnome2-utils pax-utils unpacker
-
-DESCRIPTION="Spotify is a social music platform"
-HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
-MY_PV="${PV}.g644e24e.428-1"
-MY_P="${PN}-client_${MY_PV}"
-SRC_BASE="http://repository.spotify.com/pool/non-free/${PN:0:1}/${PN}/"
-SRC_URI="
-	x86?   ( ${SRC_BASE}${MY_P}_i386.deb )
-	amd64? ( ${SRC_BASE}${MY_P}_amd64.deb )
-	"
-LICENSE="Spotify"
-SLOT="0"
-#amd64 and x86 keywords removed due to security concerns, see bug 474010
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome pax_kernel pulseaudio"
-RESTRICT="mirror strip"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-		x11-libs/libxcb
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXext
-		x11-libs/libXinerama
-		x11-libs/libXdmcp
-		x11-libs/libXScrnSaver
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		dev-qt/qtcore:4[qt3support]
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4[qt3support]
-		dev-qt/qtwebkit:4
-		x11-misc/xdg-utils
-		media-libs/alsa-lib
-		media-libs/fontconfig
-		media-libs/freetype
-		dev-libs/openssl:0
-		dev-libs/glib:2
-		dev-libs/libgcrypt:0/11
-		media-libs/libpng:1.2
-		dev-db/sqlite:3
-		sys-libs/zlib
-		app-arch/bzip2
-		sys-apps/dbus
-		sys-apps/util-linux
-		dev-libs/expat
-		>=dev-libs/nspr-4.9
-		gnome-base/gconf:2
-		x11-libs/gtk+:2
-		dev-libs/nss
-		dev-libs/glib:2
-		net-print/cups
-		virtual/udev
-		pulseaudio? ( >=media-sound/pulseaudio-0.9.21 )
-		gnome? ( gnome-extra/gnome-integration-spotify )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="/opt/spotify/spotify-client/spotify
-			/opt/spotify/spotify-client/Data/SpotifyHelper
-			/opt/spotify/spotify-client/libcef.so"
-
-src_prepare() {
-	# link against openssl-1.0.0 as it crashes with 0.9.8
-	sed -i \
-		-e 's/\(lib\(ssl\|crypto\).so\).0.9.8/\1.1.0.0/g' \
-		opt/spotify/spotify-client/spotify || die "sed failed"
-	sed -i \
-		-e 's/\(lib\(ssl\|crypto\).so\).0.9.8/\1.1.0.0/g' \
-		opt/spotify/spotify-client/Data/SpotifyHelper || die "sed failed"
-	# different NSPR / NSS library names for some reason
-	sed -i \
-		-e 's/\(lib\(plc4\|nspr4\).so\).9\(.\)/\1.0d\3\3/g' \
-		opt/spotify/spotify-client/Data/SpotifyHelper || die "sed failed"
-	sed -i \
-		-e 's/\(lib\(nss3\|nssutil3\|smime3\).so\).1d/\1\x00\x00\x00/g' \
-		-e 's/\(lib\(plc4\|nspr4\).so\).0d\(.\)/\1\x00\x00\3\3/g' \
-		opt/spotify/spotify-client/Data/libcef.so || die "sed failed"
-	# Fix desktop entry to launch spotify-dbus.py for GNOME integration
-	if use gnome ; then
-	sed -i \
-		-e 's/spotify \%U/spotify-dbus.py \%U/g' \
-		opt/spotify/spotify-client/spotify.desktop || die "sed failed"
-	fi
-	#and fix other stuff in the desktop file as well
-	sed -i \
-		-e 's/x-scheme-handler\/spotify$/x-scheme-handler\/spotify\;/g' \
-		-e 's/AudioVideo$/AudioVideo\;/g' \
-		opt/spotify/spotify-client/spotify.desktop || die "sed failed"
-}
-
-src_install() {
-	dodoc opt/spotify/spotify-client/changelog
-	dodoc usr/share/doc/spotify-client/changelog.Debian.gz
-	dodoc usr/share/doc/spotify-client/copyright
-
-	insinto /usr/share/pixmaps
-	doins opt/spotify/spotify-client/Icons/*.png
-
-	# install in /opt/spotify
-	SPOTIFY_HOME=/opt/spotify/spotify-client
-	insinto ${SPOTIFY_HOME}
-	doins -r opt/spotify/spotify-client/*
-	fperms +x ${SPOTIFY_HOME}/spotify
-	fperms +x ${SPOTIFY_HOME}/Data/SpotifyHelper
-
-	dodir /usr/bin
-	cat <<-EOF >"${D}"/usr/bin/spotify
-		#! /bin/sh
-		LD_PRELOAD="\${LD_PRELOAD} ${SPOTIFY_HOME}/libcef.so"
-		export LD_PRELOAD
-		exec ${SPOTIFY_HOME}/spotify "\$@"
-	EOF
-	fperms +x /usr/bin/spotify
-
-	# revdep-rebuild produces a false positive because of symbol versioning
-	dodir /etc/revdep-rebuild
-	cat <<-EOF >"${D}"/etc/revdep-rebuild/10${PN}
-		SEARCH_DIRS_MASK="${SPOTIFY_HOME}"
-	EOF
-
-	for size in 16 22 24 32 48 64 128 256; do
-		newicon -s ${size} "${S}${SPOTIFY_HOME}/Icons/spotify-linux-${size}.png" \
-			"spotify-client.png"
-	done
-	domenu "${S}${SPOTIFY_HOME}/spotify.desktop"
-
-	if use pax_kernel; then
-		#create the headers, reset them to default, then paxmark -m them
-		pax-mark C "${ED}"/opt/${PN}/spotify-client/${PN} || die
-		pax-mark C "${ED}"/opt/${PN}/spotify-client/Data/SpotifyHelper || die
-		pax-mark z "${ED}"/opt/${PN}/spotify-client/${PN} || die
-		pax-mark z "${ED}"/opt/${PN}/spotify-client/Data/SpotifyHelper || die
-		pax-mark m "${ED}"/opt/${PN}/spotify-client/${PN} || die
-		pax-mark m "${ED}"/opt/${PN}/spotify-client/Data/SpotifyHelper || die
-		eqawarn "You have set USE=pax_kernel meaning that you intendto run"
-		eqawarn "${PN} under a PaX enabled kernel.  To do so, we must modify"
-		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
-		eqawarn "you suspect that ${PN} is being broken by this modification,"
-		eqawarn "please open a bug."
-	fi
-
-	#hack to fix the nspr linking in spotify
-	dosym /usr/lib/libnspr4.so /opt/spotify/spotify-client/libnspr4.so.9
-	dosym /usr/lib/libplc4.so /opt/spotify/spotify-client/libplc4.so.9
-	sed -i 's/libcef\.so/libcef\.so\ \/opt\/spotify\/spotify\-client\/libnspr4\.so\.9\ \/opt\/spotify\/spotify\-client\/libplc4\.so\.9/g' "${ED}/usr/bin/spotify"
-
-	#TODO maybe this symlink is not needed and could be fixed with previous sed
-	dosym /opt/${PN}/spotify-client/Data/libcef.so /opt/${PN}/spotify-client/
-
-	#TODO fix for x86
-	dosym /usr/lib/libudev.so /opt/${PN}/spotify-client/Data/libudev.so.0
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-
-	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
-	ewarn "To remove the cache:"
-	ewarn "rm -rf ~/.cache/spotify"
-	ewarn
-	ewarn "you need to use the ld.bfd linker with openssl"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-}
--- a/media-sound/spotify/spotify-0.9.4.183-r6.ebuild
+++ b/media-sound/spotify/spotify-0.9.4.183-r6.ebuild
@ -1,180 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/spotify/spotify-0.9.4.183-r6.ebuild,v 1.1 2014/04/24 07:02:32 prometheanfire Exp $
-
-EAPI=5
-inherit eutils fdo-mime gnome2-utils pax-utils unpacker
-
-DESCRIPTION="Spotify is a social music platform"
-HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
-MY_PV="${PV}.g644e24e.428-1"
-MY_P="${PN}-client_${MY_PV}"
-SRC_BASE="http://repository.spotify.com/pool/non-free/${PN:0:1}/${PN}/"
-SRC_URI="
-	x86?   ( ${SRC_BASE}${MY_P}_i386.deb )
-	amd64? ( ${SRC_BASE}${MY_P}_amd64.deb )
-	"
-LICENSE="Spotify"
-SLOT="0"
-#amd64 and x86 keywords removed due to security concerns, see bug 474010
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome pax_kernel pulseaudio"
-RESTRICT="mirror strip"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-		x11-libs/libxcb
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXext
-		x11-libs/libXinerama
-		x11-libs/libXdmcp
-		x11-libs/libXScrnSaver
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		dev-qt/qtcore:4[qt3support]
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4[qt3support]
-		dev-qt/qtwebkit:4
-		x11-misc/xdg-utils
-		media-libs/alsa-lib
-		media-libs/fontconfig
-		media-libs/freetype
-		dev-libs/openssl:0
-		dev-libs/glib:2
-		dev-libs/libgcrypt:11/11
-		media-libs/libpng:1.2
-		dev-db/sqlite:3
-		sys-libs/zlib
-		app-arch/bzip2
-		sys-apps/dbus
-		sys-apps/util-linux
-		dev-libs/expat
-		>=dev-libs/nspr-4.9
-		gnome-base/gconf:2
-		x11-libs/gtk+:2
-		dev-libs/nss
-		dev-libs/glib:2
-		net-print/cups
-		virtual/udev
-		pulseaudio? ( >=media-sound/pulseaudio-0.9.21 )
-		gnome? ( gnome-extra/gnome-integration-spotify )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="/opt/spotify/spotify-client/spotify
-			/opt/spotify/spotify-client/Data/SpotifyHelper
-			/opt/spotify/spotify-client/Data/libcef.so"
-
-src_prepare() {
-	# link against openssl-1.0.0 as it crashes with 0.9.8
-	sed -i \
-		-e 's/\(lib\(ssl\|crypto\).so\).0.9.8/\1.1.0.0/g' \
-		opt/spotify/spotify-client/spotify || die "sed failed"
-	sed -i \
-		-e 's/\(lib\(ssl\|crypto\).so\).0.9.8/\1.1.0.0/g' \
-		opt/spotify/spotify-client/Data/SpotifyHelper || die "sed failed"
-	# different NSPR / NSS library names for some reason
-	sed -i \
-		-e 's/\(lib\(plc4\|nspr4\).so\).9\(.\)/\1.0d\3\3/g' \
-		opt/spotify/spotify-client/Data/SpotifyHelper || die "sed failed"
-	sed -i \
-		-e 's/\(lib\(nss3\|nssutil3\|smime3\).so\).1d/\1\x00\x00\x00/g' \
-		-e 's/\(lib\(plc4\|nspr4\).so\).0d\(.\)/\1\x00\x00\3\3/g' \
-		opt/spotify/spotify-client/Data/libcef.so || die "sed failed"
-	# Fix desktop entry to launch spotify-dbus.py for GNOME integration
-	if use gnome ; then
-	sed -i \
-		-e 's/spotify \%U/spotify-dbus.py \%U/g' \
-		opt/spotify/spotify-client/spotify.desktop || die "sed failed"
-	fi
-	#and fix other stuff in the desktop file as well
-	sed -i \
-		-e 's/x-scheme-handler\/spotify$/x-scheme-handler\/spotify\;/g' \
-		-e 's/AudioVideo$/AudioVideo\;/g' \
-		opt/spotify/spotify-client/spotify.desktop || die "sed failed"
-}
-
-src_install() {
-	dodoc opt/spotify/spotify-client/changelog
-	dodoc usr/share/doc/spotify-client/changelog.Debian.gz
-	dodoc usr/share/doc/spotify-client/copyright
-
-	insinto /usr/share/pixmaps
-	doins opt/spotify/spotify-client/Icons/*.png
-
-	# install in /opt/spotify
-	SPOTIFY_HOME=/opt/spotify/spotify-client
-	insinto ${SPOTIFY_HOME}
-	doins -r opt/spotify/spotify-client/*
-	fperms +x ${SPOTIFY_HOME}/spotify
-	fperms +x ${SPOTIFY_HOME}/Data/SpotifyHelper
-
-	dodir /usr/bin
-	cat <<-EOF >"${D}"/usr/bin/spotify
-		#! /bin/sh
-		LD_PRELOAD="\${LD_PRELOAD} ${SPOTIFY_HOME}/libnspr4.so.9 ${SPOTIFY_HOME}/libplc4.so.9"
-		LD_LIBRARY_PATH="${SPOTIFY_HOME}/Data/"
-		export LD_PRELOAD
-		export LD_LIBRARY_PATH
-		exec ${SPOTIFY_HOME}/spotify "\$@"
-	EOF
-	fperms +x /usr/bin/spotify
-
-	# revdep-rebuild produces a false positive because of symbol versioning
-	dodir /etc/revdep-rebuild
-	cat <<-EOF >"${D}"/etc/revdep-rebuild/10${PN}
-		SEARCH_DIRS_MASK="${SPOTIFY_HOME}"
-	EOF
-
-	for size in 16 22 24 32 48 64 128 256; do
-		newicon -s ${size} "${S}${SPOTIFY_HOME}/Icons/spotify-linux-${size}.png" \
-			"spotify-client.png"
-	done
-	domenu "${S}${SPOTIFY_HOME}/spotify.desktop"
-
-	if use pax_kernel; then
-		#create the headers, reset them to default, then paxmark -m them
-		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark C "${ED}${SPOTIFY_HOME}/Data/SpotifyHelper" || die
-		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark z "${ED}${SPOTIFY_HOME}/Data/SpotifyHelper" || die
-		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark m "${ED}${SPOTIFY_HOME}/Data/SpotifyHelper" || die
-		eqawarn "You have set USE=pax_kernel meaning that you intendto run"
-		eqawarn "${PN} under a PaX enabled kernel.  To do so, we must modify"
-		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
-		eqawarn "you suspect that ${PN} is being broken by this modification,"
-		eqawarn "please open a bug."
-	fi
-
-	#hack to fix the nspr linking in spotify
-	dosym /usr/lib/libnspr4.so "${SPOTIFY_HOME}/libnspr4.so.9"
-	dosym /usr/lib/libplc4.so "${SPOTIFY_HOME}/libplc4.so.9"
-	#TODO fix for x86
-	dosym /usr/lib/libudev.so "${SPOTIFY_HOME}/Data/libudev.so.0"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-
-	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
-	ewarn "To remove the cache:"
-	ewarn "rm -rf ~/.cache/spotify"
-	ewarn
-	ewarn "you need to use the ld.bfd linker with openssl"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-}
--- a/media-sound/spotify/spotify-0.9.4.183-r7.ebuild
+++ b/media-sound/spotify/spotify-0.9.4.183-r7.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/spotify/spotify-0.9.4.183-r5.ebuild,v 1.2 2014/01/28 04:24:21 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/spotify/spotify-0.9.4.183-r7.ebuild,v 1.1 2014/06/12 01:30:04 floppym Exp $

 EAPI=5
 inherit eutils fdo-mime gnome2-utils pax-utils unpacker
@ -17,7 +17,7 @@ SRC_URI="
 LICENSE="Spotify"
 SLOT="0"
 #amd64 and x86 keywords removed due to security concerns, see bug 474010
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~x86"
 IUSE="gnome pax_kernel pulseaudio"
 RESTRICT="mirror strip"

@ -44,7 +44,7 @@ RDEPEND="${DEPEND}
 		media-libs/freetype
 		dev-libs/openssl:0
 		dev-libs/glib:2
-		dev-libs/libgcrypt:0/11
+		|| ( dev-libs/libgcrypt:11/11 dev-libs/libgcrypt:0/11 )
 		media-libs/libpng:1.2
 		dev-db/sqlite:3
 		sys-libs/zlib
--- a/media-video/ffmpeg/ffmpeg-2.2.3-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.2.3-r1.ebuild
@ -0,0 +1,366 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.3-r1.ebuild,v 1.1 2014/06/11 20:54:53 mgorny Exp $
+
+EAPI="5"
+
+# Subslot: libavutil major.libavcodec major.libavformat major
+# Since FFmpeg ships several libraries, subslot is kind of limited here.
+# Most consumers will use those three libraries, if a "less used" library
+# changes its soname, consumers will have to be rebuilt the old way
+# (preserve-libs).
+# If, for example, a package does not link to libavformat and only libavformat
+# changes its ABI then this package will be rebuilt needlessly. Hence, such a
+# package is free _not_ to := depend on FFmpeg but I would strongly encourage
+# doing so since such a case is unlikely.
+FFMPEG_SUBSLOT=52.55.55
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-2"
+	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
+fi
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
+HOMEPAGE="http://ffmpeg.org/"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+else # Release
+	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
+fi
+FFMPEG_REVISION="${PV#*_p}"
+
+LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )"
+SLOT="0/${FFMPEG_SUBSLOT}"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~hppa ~mips ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+fi
+IUSE="
+	aac aacplus alsa amr amrenc bindist bluray +bzip2 cdio celt
+	cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
+	gme	gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack jpeg2k
+	ladspa libass libcaca libsoxr libv4l modplug mp3 +network openal opengl
+	openssl opus oss pic pulseaudio quvi rtmp schroedinger sdl speex ssh
+	static-libs test theora threads truetype twolame v4l vaapi vdpau vorbis vpx
+	wavpack webp X x264 x265 xvid +zlib zvbi
+	"
+
+ARM_CPU_FEATURES="armv5te armv6 armv6t2 neon armvfp:vfp"
+MIPS_CPU_FEATURES="mips32r2 mipsdspr1 mipsdspr2 mipsfpu"
+PPC_CPU_FEATURES="altivec"
+X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext avx avx2 fma3 fma4 mmx mmxext sse sse2 sse3 ssse3 sse4 sse4_2:sse42"
+
+# String for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+CPU_FEATURES="
+	${ARM_CPU_FEATURES}
+	${MIPS_CPU_FEATURES}
+	${PPC_CPU_FEATURES}
+	${X86_CPU_FEATURES}
+"
+
+for i in ${CPU_FEATURES}; do
+	IUSE="${IUSE} ${i%:*}"
+done
+
+FFTOOLS="aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart trasher"
+
+for i in ${FFTOOLS}; do
+	IUSE="${IUSE} +fftools_$i"
+done
+
+RDEPEND="
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	amr? ( media-libs/opencore-amr[${MULTILIB_USEDEP}] )
+	bluray? ( media-libs/libbluray[${MULTILIB_USEDEP}] )
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	cdio? (
+		|| (
+			dev-libs/libcdio-paranoia[${MULTILIB_USEDEP}]
+			<dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}]
+		)
+	)
+	celt? ( >=media-libs/celt-0.11.1[${MULTILIB_USEDEP}] )
+	encode? (
+		aac? ( media-libs/vo-aacenc[${MULTILIB_USEDEP}] )
+		aacplus? ( media-libs/libaacplus[${MULTILIB_USEDEP}] )
+		amrenc? ( media-libs/vo-amrwbenc[${MULTILIB_USEDEP}] )
+		faac? ( media-libs/faac[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.98.3[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			media-libs/libogg[${MULTILIB_USEDEP}]
+		)
+		twolame? ( media-sound/twolame[${MULTILIB_USEDEP}] )
+		wavpack? ( media-sound/wavpack[${MULTILIB_USEDEP}] )
+		webp? ( media-libs/libwebp[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20111017:=[${MULTILIB_USEDEP}] )
+		x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.1.0[${MULTILIB_USEDEP}] )
+	)
+	fdk? ( >=media-libs/fdk-aac-0.1.3[${MULTILIB_USEDEP}] )
+	flite? ( app-accessibility/flite[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	gme? ( media-libs/game-music-emu[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-2.12.16[${MULTILIB_USEDEP}] )
+	gsm? ( >=media-sound/gsm-1.0.12-r1[${MULTILIB_USEDEP}] )
+	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+	iec61883? (
+		media-libs/libiec61883[${MULTILIB_USEDEP}]
+		sys-libs/libraw1394[${MULTILIB_USEDEP}]
+		sys-libs/libavc1394[${MULTILIB_USEDEP}]
+	)
+	ieee1394? (
+		media-libs/libdc1394[${MULTILIB_USEDEP}]
+		sys-libs/libraw1394[${MULTILIB_USEDEP}]
+	)
+	jack? ( media-sound/jack-audio-connection-kit[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0[${MULTILIB_USEDEP}] )
+	libass? ( media-libs/libass[${MULTILIB_USEDEP}] )
+	libcaca? ( media-libs/libcaca[${MULTILIB_USEDEP}] )
+	libsoxr? ( media-libs/soxr[${MULTILIB_USEDEP}] )
+	libv4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	modplug? ( media-libs/libmodplug[${MULTILIB_USEDEP}] )
+	openal? ( >=media-libs/openal-1.1[${MULTILIB_USEDEP}] )
+	opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
+	openssl? ( dev-libs/openssl[${MULTILIB_USEDEP}] )
+	opus? ( media-libs/opus[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	quvi? ( media-libs/libquvi:0.4 )
+	rtmp? ( >=media-video/rtmpdump-2.2f[${MULTILIB_USEDEP}] )
+	sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,video,${MULTILIB_USEDEP}] )
+	schroedinger? ( media-libs/schroedinger[${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_beta3[${MULTILIB_USEDEP}] )
+	ssh? ( net-libs/libssh[${MULTILIB_USEDEP}] )
+	truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-0.32[${MULTILIB_USEDEP}] )
+	vdpau? ( x11-libs/libvdpau[${MULTILIB_USEDEP}] )
+	vorbis? (
+		media-libs/libvorbis[${MULTILIB_USEDEP}]
+		media-libs/libogg[${MULTILIB_USEDEP}]
+	)
+	vpx? ( >=media-libs/libvpx-0.9.6[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	)
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+	zvbi? ( media-libs/zvbi[${MULTILIB_USEDEP}] )
+	!media-video/qt-faststart
+	!media-libs/libpostproc
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	doc? ( app-text/texi2html )
+	fontconfig? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	gnutls? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	ieee1394? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	ladspa? ( media-libs/ladspa-sdk[${MULTILIB_USEDEP}] )
+	libv4l? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	mmx? ( >=dev-lang/yasm-1.2 )
+	rtmp? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	schroedinger? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	test? ( net-misc/wget )
+	truetype? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	v4l? ( sys-kernel/linux-headers )
+"
+# faac is license-incompatible with ffmpeg
+REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
+	libv4l? ( v4l )
+	fftools_cws2fws? ( zlib )
+	test? ( encode )"
+
+S=${WORKDIR}/${P/_/-}
+
+src_prepare() {
+	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
+		export revision=git-N-${FFMPEG_REVISION}
+	fi
+	epatch "${FILESDIR}/ladspadl.patch"
+	epatch_user
+}
+
+multilib_src_configure() {
+	local myconf=( ${EXTRA_FFMPEG_CONF} )
+
+	# options to use as use_enable in the foo[:bar] form.
+	# This will feed configure with $(use_enable foo bar)
+	# or $(use_enable foo foo) if no :bar is set.
+	local ffuse=(
+		bzip2:bzlib cpudetection:runtime-cpudetect debug doc
+		gnutls hardcoded-tables iconv network openssl sdl:ffplay vaapi
+		vdpau zlib
+	)
+	use openssl && myconf+=( --enable-nonfree )
+
+	# Encoders
+	if use encode
+	then
+		ffuse+=( aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame )
+		for i in aacplus faac theora twolame wavpack webp x264 x265 xvid; do
+			ffuse+=( ${i}:lib${i} )
+		done
+
+		# Licensing.
+		if use aac || use amrenc ; then
+			myconf+=( --enable-version3 )
+		fi
+		if use aacplus || use faac ; then
+			myconf+=( --enable-nonfree )
+		fi
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# libavdevice options
+	ffuse+=( cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal opengl )
+
+	# Indevs
+	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
+	for i in alsa oss jack ; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+	ffuse+=( libv4l:libv4l2 pulseaudio:libpulse X:x11grab )
+
+	# Outdevs
+	for i in alsa oss sdl ; do
+		use ${i} || myconf+=( --disable-outdev=${i} )
+	done
+
+	# libavfilter options
+	ffuse+=( flite:libflite frei0r fontconfig ladspa libass truetype:libfreetype )
+
+	# libswresample options
+	ffuse+=( libsoxr )
+
+	# Threads; we only support pthread for now but ffmpeg supports more
+	ffuse+=( threads:pthreads )
+
+	# Decoders
+	ffuse+=( amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac jpeg2k:libopenjpeg )
+	use amr && myconf+=( --enable-version3 )
+	for i in bluray celt gme gsm modplug opus quvi rtmp ssh schroedinger speex vorbis vpx zvbi; do
+		ffuse+=( ${i}:lib${i} )
+	done
+	use fdk && myconf+=( --enable-nonfree )
+
+	for i in "${ffuse[@]}" ; do
+		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
+	done
+
+	# (temporarily) disable non-multilib deps
+	if ! multilib_is_native_abi; then
+		for i in frei0r libquvi; do
+			myconf+=( --disable-${i} )
+		done
+	fi
+
+	# CPU features
+	for i in ${CPU_FEATURES}; do
+		use ${i%:*} || myconf+=( --disable-${i#*:} )
+	done
+	if use pic ; then
+		myconf+=( --enable-pic )
+		# disable asm code if PIC is required
+		# as the provided asm decidedly is not PIC for x86.
+		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
+	fi
+	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #172723
+	# We need to do this so that features of that CPU will be better used
+	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
+	# will just ignore it.
+	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
+		[[ ${i} = native ]] && i="host" # bug #273421
+		myconf+=( --cpu=${i} )
+		break
+	done
+
+	# Mandatory configuration
+	myconf=(
+		--enable-gpl
+		--enable-postproc
+		--enable-avfilter
+		--enable-avresample
+		--disable-stripping
+		"${myconf[@]}"
+	)
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	"${S}/configure" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		--extra-cflags="${CFLAGS}" \
+		--extra-cxxflags="${CXXFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}" || die
+}
+
+multilib_src_compile() {
+	emake V=1
+
+	if multilib_is_native_abi; then
+		for i in ${FFTOOLS} ; do
+			if use fftools_${i} ; then
+				emake V=1 tools/${i}
+			fi
+		done
+	fi
+}
+
+multilib_src_install() {
+	emake V=1 DESTDIR="${D}" install install-man
+
+	if multilib_is_native_abi; then
+		for i in ${FFTOOLS} ; do
+			if use fftools_${i} ; then
+				dobin tools/${i}
+			fi
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README CREDITS doc/*.txt doc/APIchanges doc/RELEASE_NOTES
+	use doc && dohtml -r doc/*
+	if use examples ; then
+		dodoc -r doc/examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
+		emake V=1 fate
+}
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.154 2014/06/03 06:20:53 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.155 2014/06/11 20:54:53 mgorny Exp $

 EAPI="5"

@ -21,7 +21,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
 fi

-inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}

 DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
 HOMEPAGE="http://ffmpeg.org/"
@ -74,62 +74,84 @@ for i in ${FFTOOLS}; do
 done

 RDEPEND="
-	alsa? ( media-libs/alsa-lib )
-	amr? ( media-libs/opencore-amr )
-	bluray? ( media-libs/libbluray )
-	bzip2? ( app-arch/bzip2 )
-	cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
-	celt? ( >=media-libs/celt-0.11.1 )
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	amr? ( media-libs/opencore-amr[${MULTILIB_USEDEP}] )
+	bluray? ( media-libs/libbluray[${MULTILIB_USEDEP}] )
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	cdio? (
+		|| (
+			dev-libs/libcdio-paranoia[${MULTILIB_USEDEP}]
+			<dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}]
+		)
+	)
+	celt? ( >=media-libs/celt-0.11.1[${MULTILIB_USEDEP}] )
 	encode? (
-		aac? ( media-libs/vo-aacenc )
-		aacplus? ( media-libs/libaacplus )
-		amrenc? ( media-libs/vo-amrwbenc )
-		faac? ( media-libs/faac )
-		mp3? ( >=media-sound/lame-3.98.3 )
-		theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
-		twolame? ( media-sound/twolame )
-		wavpack? ( media-sound/wavpack )
-		webp? ( media-libs/libwebp )
-		x264? ( >=media-libs/x264-0.0.20111017:= )
-		x265? ( >=media-libs/x265-0.9:= )
-		xvid? ( >=media-libs/xvid-1.1.0 )
+		aac? ( media-libs/vo-aacenc[${MULTILIB_USEDEP}] )
+		aacplus? ( media-libs/libaacplus[${MULTILIB_USEDEP}] )
+		amrenc? ( media-libs/vo-amrwbenc[${MULTILIB_USEDEP}] )
+		faac? ( media-libs/faac[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.98.3[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			media-libs/libogg[${MULTILIB_USEDEP}]
+		)
+		twolame? ( media-sound/twolame[${MULTILIB_USEDEP}] )
+		wavpack? ( media-sound/wavpack[${MULTILIB_USEDEP}] )
+		webp? ( media-libs/libwebp[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20111017:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-0.9:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.1.0[${MULTILIB_USEDEP}] )
 	)
-	fdk? ( >=media-libs/fdk-aac-0.1.3 )
-	flite? ( app-accessibility/flite )
-	fontconfig? ( media-libs/fontconfig )
+	fdk? ( >=media-libs/fdk-aac-0.1.3[${MULTILIB_USEDEP}] )
+	flite? ( app-accessibility/flite[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
 	frei0r? ( media-plugins/frei0r-plugins )
-	gme? ( media-libs/game-music-emu )
-	gnutls? ( >=net-libs/gnutls-2.12.16 )
-	gsm? ( >=media-sound/gsm-1.0.12-r1 )
-	iconv? ( virtual/libiconv )
-	iec61883? ( media-libs/libiec61883 sys-libs/libraw1394 sys-libs/libavc1394 )
-	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
-	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0 )
-	libass? ( media-libs/libass )
-	libcaca? ( media-libs/libcaca )
-	libsoxr? ( media-libs/soxr )
-	libv4l? ( media-libs/libv4l )
-	modplug? ( media-libs/libmodplug )
-	openal? ( >=media-libs/openal-1.1 )
-	opengl? ( virtual/opengl )
-	openssl? ( dev-libs/openssl )
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
+	gme? ( media-libs/game-music-emu[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-2.12.16[${MULTILIB_USEDEP}] )
+	gsm? ( >=media-sound/gsm-1.0.12-r1[${MULTILIB_USEDEP}] )
+	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+	iec61883? (
+		media-libs/libiec61883[${MULTILIB_USEDEP}]
+		sys-libs/libraw1394[${MULTILIB_USEDEP}]
+		sys-libs/libavc1394[${MULTILIB_USEDEP}]
+	)
+	ieee1394? (
+		media-libs/libdc1394[${MULTILIB_USEDEP}]
+		sys-libs/libraw1394[${MULTILIB_USEDEP}]
+	)
+	jack? ( media-sound/jack-audio-connection-kit[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0[${MULTILIB_USEDEP}] )
+	libass? ( media-libs/libass[${MULTILIB_USEDEP}] )
+	libcaca? ( media-libs/libcaca[${MULTILIB_USEDEP}] )
+	libsoxr? ( media-libs/soxr[${MULTILIB_USEDEP}] )
+	libv4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	modplug? ( media-libs/libmodplug[${MULTILIB_USEDEP}] )
+	openal? ( >=media-libs/openal-1.1[${MULTILIB_USEDEP}] )
+	opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
+	openssl? ( dev-libs/openssl[${MULTILIB_USEDEP}] )
+	opus? ( media-libs/opus[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
 	quvi? ( media-libs/libquvi:0.4 )
-	rtmp? ( >=media-video/rtmpdump-2.2f )
-	sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,video] )
-	schroedinger? ( media-libs/schroedinger )
-	speex? ( >=media-libs/speex-1.2_beta3 )
-	ssh? ( net-libs/libssh )
-	truetype? ( media-libs/freetype:2 )
-	vaapi? ( >=x11-libs/libva-0.32 )
-	vdpau? ( x11-libs/libvdpau )
-	vorbis? ( media-libs/libvorbis media-libs/libogg )
-	vpx? ( >=media-libs/libvpx-0.9.6 )
-	X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes )
-	zlib? ( sys-libs/zlib )
-	zvbi? ( media-libs/zvbi )
+	rtmp? ( >=media-video/rtmpdump-2.2f[${MULTILIB_USEDEP}] )
+	sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,video,${MULTILIB_USEDEP}] )
+	schroedinger? ( media-libs/schroedinger[${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_beta3[${MULTILIB_USEDEP}] )
+	ssh? ( net-libs/libssh[${MULTILIB_USEDEP}] )
+	truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-0.32[${MULTILIB_USEDEP}] )
+	vdpau? ( x11-libs/libvdpau[${MULTILIB_USEDEP}] )
+	vorbis? (
+		media-libs/libvorbis[${MULTILIB_USEDEP}]
+		media-libs/libogg[${MULTILIB_USEDEP}]
+	)
+	vpx? ( >=media-libs/libvpx-0.9.6[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	)
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+	zvbi? ( media-libs/zvbi[${MULTILIB_USEDEP}] )
 	!media-video/qt-faststart
 	!media-libs/libpostproc
 "
@ -137,16 +159,16 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=sys-devel/make-3.81
 	doc? ( app-text/texi2html )
-	fontconfig? ( virtual/pkgconfig )
-	gnutls? ( virtual/pkgconfig )
-	ieee1394? ( virtual/pkgconfig )
-	ladspa? ( media-libs/ladspa-sdk )
-	libv4l? ( virtual/pkgconfig )
+	fontconfig? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	gnutls? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	ieee1394? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	ladspa? ( media-libs/ladspa-sdk[${MULTILIB_USEDEP}] )
+	libv4l? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
 	mmx? ( >=dev-lang/yasm-1.2 )
-	rtmp? ( virtual/pkgconfig )
-	schroedinger? ( virtual/pkgconfig )
+	rtmp? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	schroedinger? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
 	test? ( net-misc/wget )
-	truetype? ( virtual/pkgconfig )
+	truetype? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
 	v4l? ( sys-kernel/linux-headers )
 "
 # faac is license-incompatible with ffmpeg
@ -156,95 +178,100 @@ REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
 	test? ( encode )"

 S=${WORKDIR}/${P/_/-}
-BUILD_DIR=${S}_build

 src_prepare() {
-	if [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
 		export revision=git-N-${FFMPEG_REVISION}
 	fi
 	epatch_user
 }

-src_configure() {
-	mkdir -p "${BUILD_DIR}"
-	cd "${BUILD_DIR}"
-
-	local myconf="${EXTRA_FFMPEG_CONF}"
+multilib_src_configure() {
+	local myconf=( ${EXTRA_FFMPEG_CONF} )

 	# options to use as use_enable in the foo[:bar] form.
 	# This will feed configure with $(use_enable foo bar)
 	# or $(use_enable foo foo) if no :bar is set.
-	local ffuse="bzip2:bzlib cpudetection:runtime-cpudetect debug doc
-			     gnutls hardcoded-tables iconv network openssl sdl:ffplay vaapi
-				 vdpau X:xlib zlib"
-	use openssl && myconf="${myconf} --enable-nonfree"
+	local ffuse=(
+		bzip2:bzlib cpudetection:runtime-cpudetect debug doc
+		gnutls hardcoded-tables iconv network openssl sdl:ffplay vaapi
+		vdpau X:xlib zlib
+	)
+	use openssl && myconf+=( --enable-nonfree )

 	# Encoders
 	if use encode
 	then
-		ffuse="${ffuse} aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame"
+		ffuse+=( aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame )
 		for i in aacplus faac theora twolame wavpack webp x264 x265 xvid; do
-			ffuse="${ffuse} ${i}:lib${i}"
+			ffuse+=( ${i}:lib${i} )
 		done

 		# Licensing.
 		if use aac || use amrenc ; then
-			myconf="${myconf} --enable-version3"
+			myconf+=( --enable-version3 )
 		fi
 		if use aacplus || use faac ; then
-			myconf="${myconf} --enable-nonfree"
+			myconf+=( --enable-nonfree )
 		fi
 	else
-		myconf="${myconf} --disable-encoders"
+		myconf+=( --disable-encoders )
 	fi

 	# libavdevice options
-	ffuse="${ffuse}	cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal opengl"
+	ffuse+=( cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal opengl )

 	# Indevs
-	use v4l || myconf="${myconf} --disable-indev=v4l2 --disable-outdev=v4l2"
+	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
 	for i in alsa oss jack ; do
-		use ${i} || myconf="${myconf} --disable-indev=${i}"
+		use ${i} || myconf+=( --disable-indev=${i} )
 	done
-	ffuse="${ffuse}	libv4l:libv4l2 pulseaudio:libpulse X:x11grab"
+	ffuse+=( libv4l:libv4l2 pulseaudio:libpulse X:x11grab )

 	# Outdevs
 	for i in alsa oss sdl ; do
-		use ${i} || myconf="${myconf} --disable-outdev=${i}"
+		use ${i} || myconf+=( --disable-outdev=${i} )
 	done

 	# libavfilter options
-	ffuse="${ffuse} flite:libflite frei0r fontconfig ladspa libass truetype:libfreetype"
+	ffuse+=( flite:libflite frei0r fontconfig ladspa libass truetype:libfreetype )

 	# libswresample options
-	ffuse="${ffuse} libsoxr"
+	ffuse+=( libsoxr )

 	# Threads; we only support pthread for now but ffmpeg supports more
-	ffuse="${ffuse} threads:pthreads"
+	ffuse+=( threads:pthreads )

 	# Decoders
-	ffuse="${ffuse} amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac jpeg2k:libopenjpeg"
-	use amr && myconf="${myconf} --enable-version3"
+	ffuse+=( amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac jpeg2k:libopenjpeg )
+	use amr && myconf+=( --enable-version3 )
 	for i in bluray celt gme gsm modplug opus quvi rtmp ssh schroedinger speex vorbis vpx zvbi; do
-		ffuse="${ffuse} ${i}:lib${i}"
+		ffuse+=( ${i}:lib${i} )
 	done
-	use fdk && myconf="${myconf} --enable-nonfree"
+	use fdk && myconf+=( --enable-nonfree )

-	for i in ${ffuse} ; do
-		myconf="${myconf} $(use_enable ${i%:*} ${i#*:})"
+	for i in "${ffuse[@]}" ; do
+		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
 	done

+	# (temporarily) disable non-multilib deps
+	if ! multilib_is_native_abi; then
+		for i in frei0r libquvi; do
+			myconf+=( --disable-${i} )
+		done
+	fi
+
 	# CPU features
 	for i in ${CPU_FEATURES}; do
-		use ${i%:*} || myconf="${myconf} --disable-${i#*:}"
+		use ${i%:*} || myconf+=( --disable-${i#*:} )
 	done
 	if use pic ; then
-		myconf="${myconf} --enable-pic"
+		myconf+=( --enable-pic )
 		# disable asm code if PIC is required
 		# as the provided asm decidedly is not PIC for x86.
-		use x86 && myconf="${myconf} --disable-asm"
+		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
 	fi
-	[[ ${ABI} == "x32" ]] && myconf+=" --disable-asm" #427004
+	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004

 	# Try to get cpu type based on CFLAGS.
 	# Bug #172723
@ -252,32 +279,33 @@ src_configure() {
 	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
 	# will just ignore it.
 	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
-		[ "${i}" = "native" ] && i="host" # bug #273421
-		myconf="${myconf} --cpu=${i}"
+		[[ ${i} = native ]] && i="host" # bug #273421
+		myconf+=( --cpu=${i} )
 		break
 	done

 	# Mandatory configuration
-	myconf="
+	myconf=(
 		--enable-gpl
 		--enable-postproc
 		--enable-avfilter
 		--enable-avresample
 		--disable-stripping
-		${myconf}"
+		"${myconf[@]}"
+	)

 	# cross compile support
 	if tc-is-cross-compiler ; then
-		myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-"
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
 		case ${CHOST} in
 			*freebsd*)
-				myconf="${myconf} --target-os=freebsd"
+				myconf+=( --target-os=freebsd )
 				;;
 			mingw32*)
-				myconf="${myconf} --target-os=mingw32"
+				myconf+=( --target-os=mingw32 )
 				;;
 			*linux*)
-				myconf="${myconf} --target-os=linux"
+				myconf+=( --target-os=linux )
 				;;
 		esac
 	fi
@ -295,31 +323,34 @@ src_configure() {
 		--extra-cflags="${CFLAGS}" \
 		--extra-cxxflags="${CXXFLAGS}" \
 		$(use_enable static-libs static) \
-		${myconf} || die
+		"${myconf[@]}" || die
 }

-src_compile() {
-	cd "${BUILD_DIR}"
+multilib_src_compile() {
 	emake V=1

-	for i in ${FFTOOLS} ; do
-		if use fftools_$i ; then
-			emake V=1 tools/$i
-		fi
-	done
+	if multilib_is_native_abi; then
+		for i in ${FFTOOLS} ; do
+			if use fftools_${i} ; then
+				emake V=1 tools/${i}
+			fi
+		done
+	fi
 }

-src_install() {
-	cd "${BUILD_DIR}"
+multilib_src_install() {
 	emake V=1 DESTDIR="${D}" install install-man

-	for i in ${FFTOOLS} ; do
-		if use fftools_$i ; then
-			dobin tools/$i
-		fi
-	done
+	if multilib_is_native_abi; then
+		for i in ${FFTOOLS} ; do
+			if use fftools_${i} ; then
+				dobin tools/${i}
+			fi
+		done
+	fi
+}

-	cd "${S}"
+multilib_src_install_all() {
 	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges doc/RELEASE_NOTES
 	use doc && dohtml -r doc/*
 	if use examples ; then
@ -328,8 +359,7 @@ src_install() {
 	fi
 }

-src_test() {
-	cd "${BUILD_DIR}"
+multilib_src_test() {
 	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
 		emake V=1 fate
 }
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Wed, 11 Jun 2014 18:07:01 +0000
+Thu, 12 Jun 2014 13:07:01 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Wed, 11 Jun 2014 18:07:01 +0000
+Thu, 12 Jun 2014 13:07:02 +0000
--- a/metadata/md5-cache/app-accessibility/accerciser-1.12.1
+++ b/metadata/md5-cache/app-accessibility/accerciser-1.12.1
@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/ipython dev-python/pygtk:2 dev-python/pygobject:2 dev-python/pycairo dev-python/libgnome-python dev-python/libwnck-python dev-python/pygtksourceview dev-python/gconf-python dev-python/librsvg-python >=gnome-extra/at-spi-1.7:1 dev-libs/glib:2 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 SRC_URI=mirror://gnome/sources/accerciser/1.12/accerciser-1.12.1.tar.bz2
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multilib	fac675dcccf94392371a6abee62d909f	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=36c93239d4eb41f254c1a693d716a87b
--- a/metadata/md5-cache/app-accessibility/accerciser-3.12.0
+++ b/metadata/md5-cache/app-accessibility/accerciser-3.12.0
@ -9,5 +9,5 @@ LICENSE=BSD CC-BY-SA-3.0
 RDEPEND=>=app-accessibility/at-spi2-core-2.5.2:2 >=dev-python/pygobject-2.90.3:3[python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=x11-libs/gtk+-3.1.13:3[introspection] dev-libs/atk[introspection] >=dev-libs/glib-2.28:2 dev-libs/gobject-introspection >=dev-python/ipython-0.11[python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=dev-python/pyatspi-2.1.5[python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/pycairo[python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-)] x11-libs/gdk-pixbuf[introspection] x11-libs/libwnck:3[introspection] x11-libs/pango[introspection] python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) dev-lang/python-exec:=[python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 SLOT=0
 SRC_URI=mirror://gnome/sources/accerciser/3.12/accerciser-3.12.0.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	6f0183db47dc66fccb7a6899f7209b48	python-utils-r1	8ba35e0dacf49c6cae65901d183c971f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	6f0183db47dc66fccb7a6899f7209b48	python-utils-r1	8ba35e0dacf49c6cae65901d183c971f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=bc7ec18676acf56f5bedb09655c60e2e
--- a/metadata/md5-cache/app-accessibility/accerciser-3.8.2
+++ b/metadata/md5-cache/app-accessibility/accerciser-3.8.2
@ -9,5 +9,5 @@ LICENSE=BSD CC-BY-SA-3.0
 RDEPEND=>=app-accessibility/at-spi2-core-2.5.2:2 >=dev-python/pygobject-2.90.3:3[python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=x11-libs/gtk+-3.1.13:3[introspection] dev-libs/atk[introspection] >=dev-libs/glib-2.28:2 dev-libs/gobject-introspection >=dev-python/ipython-0.11[python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=dev-python/pyatspi-2.1.5[python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/pycairo[python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-)] x11-libs/gdk-pixbuf[introspection] x11-libs/libwnck:3[introspection] x11-libs/pango[introspection] python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) dev-lang/python-exec:=[python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 SLOT=0
 SRC_URI=mirror://gnome/sources/accerciser/3.8/accerciser-3.8.2.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	6f0183db47dc66fccb7a6899f7209b48	python-utils-r1	8ba35e0dacf49c6cae65901d183c971f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	6f0183db47dc66fccb7a6899f7209b48	python-utils-r1	8ba35e0dacf49c6cae65901d183c971f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=083ae1bb79092d9da4bdd2155c7eec1a
--- a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.10.2
+++ b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.10.2
@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=app-accessibility/at-spi2-core-2.9.4 >=dev-libs/atk-2.9.4 >=dev-libs/glib-2.32:2 >=sys-apps/dbus-1 !<gnome-extra/at-spi-1.32.0-r1
 SLOT=2
 SRC_URI=mirror://gnome/sources/at-spi2-atk/2.10/at-spi2-atk-2.10.2.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=0210d30262e2934ada35c89be073eb6b
--- a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.12.1
+++ b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.12.1
@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=app-accessibility/at-spi2-core-2.11.2 >=dev-libs/atk-2.11.90 >=dev-libs/glib-2.32:2 >=sys-apps/dbus-1.5 !<gnome-extra/at-spi-1.32.0-r1
 SLOT=2
 SRC_URI=mirror://gnome/sources/at-spi2-atk/2.12/at-spi2-atk-2.12.1.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=f1c9b26afc5c39e30314a8dd1019d9ac
--- a/metadata/md5-cache/app-accessibility/at-spi2-core-2.10.2
+++ b/metadata/md5-cache/app-accessibility/at-spi2-core-2.10.2
@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.28:2 >=sys-apps/dbus-1 x11-libs/libSM x11-libs/libXi x11-libs/libXtst introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) X? ( x11-libs/libX11 )
 SLOT=2
 SRC_URI=mirror://gnome/sources/at-spi2-core/2.10/at-spi2-core-2.10.2.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=c5c7c26bf4a30bb934933a00751c76d6
--- a/metadata/md5-cache/app-accessibility/at-spi2-core-2.12.0
+++ b/metadata/md5-cache/app-accessibility/at-spi2-core-2.12.0
@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.36:2 >=sys-apps/dbus-1 x11-libs/libSM x11-libs/libXi x11-libs/libXtst introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) X? ( x11-libs/libX11 )
 SLOT=2
 SRC_URI=mirror://gnome/sources/at-spi2-core/2.12/at-spi2-core-2.12.0.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=f64a5e1b7cb9949482db345f013c389e
--- a/metadata/md5-cache/app-accessibility/brltty-4.5-r3
+++ b/metadata/md5-cache/app-accessibility/brltty-4.5-r3
@ -10,5 +10,5 @@ RDEPEND=java? ( >=virtual/jre-1.4 ) bluetooth? ( net-wireless/bluez ) gpm? ( >=s
 REQUIRED_USE=doc? ( api ) java? ( api ) ocaml? ( api ) python? ( api ) tcl? ( api )
 SLOT=0
 SRC_URI=http://mielke.cc/brltty/releases/brltty-4.5.tar.gz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	findlib	9cf6020ee5481f39f1aa566a323f9868	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	findlib	9cf6020ee5481f39f1aa566a323f9868	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=7ffc06a5e5b56f563aa6e679a2c13570
--- a/metadata/md5-cache/app-accessibility/brltty-5.0-r2
+++ b/metadata/md5-cache/app-accessibility/brltty-5.0-r2
@ -10,5 +10,5 @@ RDEPEND=java? ( >=virtual/jre-1.4 ) bluetooth? ( net-wireless/bluez ) gpm? ( >=s
 REQUIRED_USE=doc? ( api ) java? ( api ) ocaml? ( api ) python? ( api ) tcl? ( api )
 SLOT=0
 SRC_URI=http://mielke.cc/brltty/archive/brltty-5.0.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	findlib	9cf6020ee5481f39f1aa566a323f9868	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	findlib	9cf6020ee5481f39f1aa566a323f9868	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=4fa0919b2f88450b320b073dc9a8d738
--- a/metadata/md5-cache/app-accessibility/brltty-5.0-r3
+++ b/metadata/md5-cache/app-accessibility/brltty-5.0-r3
@ -10,5 +10,5 @@ RDEPEND=java? ( >=virtual/jre-1.4 ) bluetooth? ( net-wireless/bluez ) gpm? ( >=s
 REQUIRED_USE=doc? ( api ) java? ( api ) ocaml? ( api ) python? ( api ) tcl? ( api )
 SLOT=0
 SRC_URI=http://mielke.cc/brltty/archive/brltty-5.0.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	findlib	9cf6020ee5481f39f1aa566a323f9868	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	6f0183db47dc66fccb7a6899f7209b48	python-utils-r1	8ba35e0dacf49c6cae65901d183c971f	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	findlib	9cf6020ee5481f39f1aa566a323f9868	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	6f0183db47dc66fccb7a6899f7209b48	python-utils-r1	8ba35e0dacf49c6cae65901d183c971f	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d4c5babbe903c7b0bb55000375e70de2
--- a/metadata/md5-cache/app-accessibility/caribou-0.4.13
+++ b/metadata/md5-cache/app-accessibility/caribou-0.4.13
@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-core >=dev-python/pygobject-2.90.3:3[python_ta
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/caribou/0.4/caribou-0.4.13.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	6f0183db47dc66fccb7a6899f7209b48	python-utils-r1	8ba35e0dacf49c6cae65901d183c971f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	6f0183db47dc66fccb7a6899f7209b48	python-utils-r1	8ba35e0dacf49c6cae65901d183c971f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ed5527d08aaaf01934ccbb08a49fb2ef
--- a/metadata/md5-cache/app-accessibility/dasher-4.11
+++ b/metadata/md5-cache/app-accessibility/dasher-4.11
@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.16:2 dev-libs/expat >=x11-libs/gtk+-2.6:2 >=gnome-base/gconf-2:2 x11-libs/libX11 x11-libs/libXtst accessibility? ( app-accessibility/gnome-speech >=gnome-base/libbonobo-2 >=gnome-base/orbit-2 >=gnome-base/libgnomeui-2 gnome-extra/at-spi:1 dev-libs/atk ) cairo? ( >=x11-libs/gtk+-2.8:2 ) gnome? ( >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/dasher/4.11/dasher-4.11.tar.bz2
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=d9fd4294ac978ea8593b48ed2b7fde30
--- a/metadata/md5-cache/app-accessibility/epos-2.5.37-r1
+++ b/metadata/md5-cache/app-accessibility/epos-2.5.37-r1
@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/epos/epos-2.5.37.tar.gz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
 _md5_=7e217930bf9e6c20f060233e4e825a21
--- a/metadata/md5-cache/app-accessibility/espeak-1.48.04
+++ b/metadata/md5-cache/app-accessibility/espeak-1.48.04
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst preinst prepare
+DEPEND=portaudio? ( >=media-libs/portaudio-19_pre20071207 ) pulseaudio? ( media-sound/pulseaudio ) app-arch/unzip
+DESCRIPTION=Speech synthesizer for English and other languages
+EAPI=5
+HOMEPAGE=http://espeak.sourceforge.net/
+IUSE=portaudio pulseaudio
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=portaudio? ( >=media-libs/portaudio-19_pre20071207 ) pulseaudio? ( media-sound/pulseaudio ) media-sound/sox
+SLOT=0
+SRC_URI=mirror://sourceforge/espeak/espeak-1.48.04-source.zip
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=250129c4d52630534744d9082228a741
--- a/metadata/md5-cache/app-accessibility/flite-1.4-r3
+++ b/metadata/md5-cache/app-accessibility/flite-1.4-r3
@ -9,5 +9,5 @@ LICENSE=BSD freetts public-domain regexp-UofT BSD-2
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.24.1 )
 SLOT=0
 SRC_URI=http://www.speech.cs.cmu.edu/flite/packed/flite-1.4/flite-1.4-release.tar.bz2
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
 _md5_=ef25e8f924d069e325e4c7162e71aabd
--- a/metadata/md5-cache/app-accessibility/flite-1.4-r4
+++ b/metadata/md5-cache/app-accessibility/flite-1.4-r4
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.24.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Flite text to speech engine
+EAPI=5
+HOMEPAGE=http://www.speech.cs.cmu.edu/flite/index.html
+IUSE=alsa oss static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD freetts public-domain regexp-UofT BSD-2
+RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.24.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] )
+SLOT=0
+SRC_URI=http://www.speech.cs.cmu.edu/flite/packed/flite-1.4/flite-1.4-release.tar.bz2
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	02e68fc95064bb486c12ad2de16b8c82	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=645aef550364727a52862a5b3e3d60a7
--- a/metadata/md5-cache/app-accessibility/gnome-mag-0.16.3
+++ b/metadata/md5-cache/app-accessibility/gnome-mag-0.16.3
@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.11.1:2 >=x11-libs/gtk+-2.14:2 >=gnome-base/libbonobo-1.107 >=gnome-extra/at-spi-1.5.2:1 >=gnome-base/orbit-2.3.100 dev-libs/dbus-glib x11-libs/libX11 x11-libs/libXtst x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrender x11-libs/libXcomposite
 SLOT=1
 SRC_URI=mirror://gnome/sources/gnome-mag/0.16/gnome-mag-0.16.3.tar.bz2
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=af6aca8a156c190be864e892a3755cd9
--- a/metadata/md5-cache/app-accessibility/gnome-speech-0.4.25-r1
+++ b/metadata/md5-cache/app-accessibility/gnome-speech-0.4.25-r1
@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=gnome-base/orbit-2.3.94 >=gnome-base/libbonobo-1.97 >=dev-libs/glib-2:2 espeak? ( app-accessibility/espeak ) festival? ( app-accessibility/festival )
 SLOT=1
 SRC_URI=mirror://gnome/sources/gnome-speech/0.4/gnome-speech-0.4.25.tar.bz2
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
 _md5_=ae0ae379da7b43227e4e0ded6611f44c
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST jaraco.util-10.0.2.zip 83375 SHA256 da136010c98f1ceaaa02ab1a201da45d3b2d59348fac8e3c7b1ddb61825ca872 SHA512 9522d0923db0637b605a11014104fbf6d86fc014fa1d065610df0cf8fe18dc5f962c8f4e4a3822c9223b434fbd252a99ac1949e52f7c9774642244f7a25e12e1 WHIRLPOOL 5dc4bdcf744e0fda210a3f1b5de6f5c8ff73c179586873b28cab309f320c662591442c63ae3cbdd2b3187ab56bb9d541839e40525baf1b15d79719015ebf20bc`
				`@ -0,0 +1 @@`
				`DIST more-itertools-2.2.tar.gz 19807 SHA256 93e62e05c7ad3da1a233def6731e8285156701e3419a5fe279017c429ec67ce0 SHA512 579a778b91607800c4000a30c7509e9fc44ad1d35598ab9041b547aca9d94b811d3fc0abf5c84413fb70be87eb20177685a8a30dc7146a005fa1eb82986294f8 WHIRLPOOL 75ad77394757b30709700957f20136029100eb0e6a42ca7a031a54f0bc71fc926eb552c1b29b0b92af175a618ae826c6380c2919ae3e74d60fa3423e352a9c37`
				`@ -0,0 +1 @@`
				`DIST pyoembed-0.1.tar.gz 12764 SHA256 6e9fd950a12f34ec2f94a40bd4b6aca5c09a64bc7df82f27689ebdecb7b7c487 SHA512 539aa9c45c4a65a9605e1a13b59e914bb3bccf8b873b03212f5c90cdb3e4eea8290cfd274a33e6c8cac08210890b69bb52714eae781b79fe9eae5fa3d71e5be7 WHIRLPOOL 68260b017ace054c2011d9ced26b246a1cd7af0d722ee74aa5ce50257aeb53c38aaf8bb91f928249ef05409b632ae15dbdda004a8070fc788894c98377c11089`