Sync with portage [Fri Sep 14 10:30:51 MSK 2012].

12 years ago · 3aa200e292
parent 5da345cd59
commit 3aa200e292
27189 changed files with 31723 additions and 34363 deletions
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@ -1,3 +1,4 @@
 DIST eselect-1.2.15.tar.bz2 169358 SHA256 fa8e3b2af2bc4a951ddb6067ba1e786a04681555ab7e83d50d4eb85047f2e7d7 SHA512 228b1a3a8e8fee6ede929c8d36532ca58537ea59f1e9d055c9ca49049949ffc76dde2c04d684c63ec2df451bda5f0ee3d38e3a1c56d13f671be88f0f9fbb3dee WHIRLPOOL b4972c570038c2e27e61002ba008d17eeab102316cb49e1118b02387b14b9f4cc1b6032ed0654c6ba4f8f60eb15dea0677e147cd47137b93c9f66832339649af
 DIST eselect-1.2.18.tar.bz2 170120 SHA256 68581af8f7ca427dbd726b766071c833918fb5ae25ad03224def7e1599297b3c SHA512 e73c2503163e4c3400885ada32d4c7a4a2a511d7747c9add92522a9f3117eff6174092310ee0b5d56fb25546d11a881c643e00ef653d00d58e07a7742a1b5004 WHIRLPOOL 37b1bf6917b8e3dff48153a0c7af72d0b991392de79c95e3dcf484ed98077e20626ff967d6a0887167ec77536e12ac3fc4699e2d1b9f1d2c6fdce81f3218ef4d
 DIST eselect-1.3.1.tar.xz 163908 SHA256 4fc1c3f1b021dd8d28475ab2115f6a2de843bbbb941a0f70999389d1e0d56444 SHA512 b62e3e9f9c145a92625d136ea14ffa9705fa312971160ee3bb33f285dd67f6e6f415c7b9909b902b872500663a7a79c6fe53f52d179de7b7e120c5de994effd3 WHIRLPOOL a04a20c25617c3a53b0937c7f01f6dc89677beb5e1917a8d078a7f4403d4d77b7342da47766a061bc9158962ada190901db5b99d4b9603c49d9b90d3ad57feb5
+DIST eselect-1.3.2.tar.xz 164168 SHA256 8b3906133090229defd6c5017fac0049e14cc0a5185c479cb3e6155a71827a78 SHA512 3225ce8b4313ae15bc7be8f047b29a202976c4a8766005487b78031a0e11e6395da55d74a961b022685126b397f8811babd3ee6580e8ba94e1ddd117964207e5 WHIRLPOOL 94917cad340ab697a35d0b3d4e80e95a6d764829692d54e0ee17fdef84c847aa35da10174352b0d4ffd8f541bbf0280e4b63790a276789a66463d2c8a1a245b0
--- a/app-admin/eselect/eselect-1.3.2.ebuild
+++ b/app-admin/eselect/eselect-1.3.2.ebuild
@ -0,0 +1,68 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.3.2.ebuild,v 1.1 2012/09/13 17:11:50 ulm Exp $
+
+EAPI=3
+
+inherit bash-completion-r1
+
+DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
+HOMEPAGE="http://www.gentoo.org/proj/en/eselect/"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+RDEPEND="sys-apps/sed
+	|| (
+		sys-apps/coreutils
+		sys-freebsd/freebsd-bin
+		app-misc/realpath
+	)"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	doc? ( dev-python/docutils )"
+RDEPEND="!app-admin/eselect-news
+	${RDEPEND}
+	sys-apps/file
+	sys-libs/ncurses"
+
+# Commented out: only few users of eselect will edit its source
+#PDEPEND="emacs? ( app-emacs/gentoo-syntax )
+#	vim-syntax? ( app-vim/eselect-syntax )"
+
+src_compile() {
+	emake || die
+
+	if use doc; then
+		emake html || die
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	newbashcomp misc/${PN}.bashcomp ${PN} || die
+	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt || die
+
+	if use doc; then
+		dohtml *.html doc/* || die
+	fi
+
+	# needed by news module
+	keepdir /var/lib/gentoo/news
+	if ! use prefix; then
+		fowners root:portage /var/lib/gentoo/news || die
+		fperms g+w /var/lib/gentoo/news || die
+	fi
+}
+
+pkg_postinst() {
+	# fowners in src_install doesn't work for the portage group:
+	# merging changes the group back to root
+	if ! use prefix; then
+		chgrp portage "${EROOT}/var/lib/gentoo/news" \
+			&& chmod g+w "${EROOT}/var/lib/gentoo/news"
+	fi
+}
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@ -1,2 +1,3 @@
 DIST sudo-1.8.5p2.tar.gz 1746344 SHA256 c32ae2bc3faf83444c82ca75ccb10ad3684d8222e3535f164c4a4db7cdddf8cf SHA512 616967eea79f91cda2b0cd1d13ed453d20142521ecfca289432bdf5708ac0549c7873fd80170cc0481390e82f1e60fb0bffcfc7c6b70d5d721aa98d23361c5cb WHIRLPOOL ac0d2c040935c54947571a0d4671be70aaaf7a6f69cb097acd321718656d4c569b0db4191eaf943c6b642a1d641263429287241a236a0f2a0c9edf973710bf8b
 DIST sudo-1.8.5p3.tar.gz 1746553 SHA256 00bbf27d53e8a74ef3e76b531c2b8a8d6dccab58e0d040c2a3a08171543bb1a7 SHA512 d326be88f5631872039b0a8377753b3eea12cca63b3ab57aecbb35f9abbcebca8b7d73bb31da4a5b4a03bfef15c51f4f9212a349b3551202fdf0d26993e2bd46 WHIRLPOOL 0ac3f034785d1edddbbda34d8d51dc2cd967c0d4e94fbb44c88b69eecbbcb654d417e89f9f21850ba566feee333d2fad8218673983153b19b432885faaf33e87
+DIST sudo-1.8.6p1.tar.gz 1855230 SHA256 70d6a3ceb6168c879a80a5fa03cdd06178b95d0ecb6bf87aa0bc7c159da944cc SHA512 9a0c530af240f07417a6fc745248c08942826c2efb0ac271ec38535d5c741a01459ed514256d781912a599f507deb63561222bf3079f7d7f743248cb878e69ee WHIRLPOOL c39025f1813293b17cabaef934b6399ab5f9bc19917f0c37654346b300efc9022ed21683f07a115cc0ddc12d0006e28101268e3aec81413625831c6b91c385d5
--- a/app-admin/sudo/sudo-1.8.6_p1.ebuild
+++ b/app-admin/sudo/sudo-1.8.6_p1.ebuild
@ -0,0 +1,190 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.6_p1.ebuild,v 1.1 2012/09/13 13:50:38 flameeyes Exp $
+
+EAPI=4
+
+inherit eutils pam multilib libtool
+
+MY_P=${P/_/}
+MY_P=${MY_P/beta/b}
+
+uri_prefix=
+case ${P} in
+*_beta*|*_rc*) uri_prefix=beta/ ;;
+esac
+
+DESCRIPTION="Allows users or groups to run commands as other users"
+HOMEPAGE="http://www.sudo.ws/"
+SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+	ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
+
+# Basic license is ISC-style as-is, some files are released under
+# 3-clause BSD license
+LICENSE="as-is BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris"
+IUSE="ldap nls pam offensive selinux skey"
+
+DEPEND="pam? ( virtual/pam )
+	skey? ( >=sys-auth/skey-1.1.5-r1 )
+	ldap? (
+		>=net-nds/openldap-2.1.30-r1
+		dev-libs/cyrus-sasl
+	)
+	sys-libs/zlib"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-sudo )
+	ldap? ( dev-lang/perl )
+	pam? ( sys-auth/pambase )
+	>=app-misc/editor-wrapper-3
+	virtual/editor
+	virtual/mta"
+DEPEND="${DEPEND}
+	sys-devel/bison"
+
+S=${WORKDIR}/${MY_P}
+
+REQUIRED_USE="pam? ( !skey ) skey? ( !pam )"
+
+MAKEOPTS+=" SAMPLES="
+
+src_prepare() {
+	elibtoolize
+}
+
+set_rootpath() {
+	# FIXME: secure_path is a compile time setting. using ROOTPATH
+	# is not perfect, env-update may invalidate this, but until it
+	# is available as a sudoers setting this will have to do.
+	einfo "Setting secure_path ..."
+
+	# first extract the default ROOTPATH from build env
+	ROOTPATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}")
+	if [[ -z ${ROOTPATH} ]] ; then
+		ewarn "	Failed to find ROOTPATH, please report this"
+	fi
+
+	# then remove duplicate path entries
+	cleanpath() {
+		local newpath thisp IFS=:
+		for thisp in $1 ; do
+			if [[ :${newpath}: != *:${thisp}:* ]] ; then
+				newpath+=:$thisp
+			else
+				einfo "   Duplicate entry ${thisp} removed..."
+			fi
+		done
+		ROOTPATH=${newpath#:}
+	}
+	cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${ROOTPATH:+:${ROOTPATH}}
+
+	# finally, strip gcc paths #136027
+	rmpath() {
+		local e newpath thisp IFS=:
+		for thisp in ${ROOTPATH} ; do
+			for e ; do [[ $thisp == $e ]] && continue 2 ; done
+			newpath+=:$thisp
+		done
+		ROOTPATH=${newpath#:}
+	}
+	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
+
+	einfo "... done"
+}
+
+src_configure() {
+	local ROOTPATH
+	set_rootpath
+
+	# audit: somebody got to explain me how I can test this before I
+	# enable it.. - Diego
+	# plugindir: autoconf code is crappy and does not delay evaluation
+	# until `make` time, so we have to use a full path here rather than
+	# basing off other values.
+	econf \
+		--enable-zlib=system \
+		--with-secure-path="${ROOTPATH}" \
+		--with-editor="${EPREFIX}"/usr/libexec/editor \
+		--with-env-editor \
+		$(use_with offensive insults) \
+		$(use_with offensive all-insults) \
+		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo) \
+		$(use_with ldap) \
+		$(use_enable nls) \
+		$(use_with pam) \
+		$(use_with skey) \
+		$(use_with selinux) \
+		--without-opie \
+		--without-linux-audit \
+		--with-timedir="${EPREFIX}"/var/db/sudo \
+		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	if use ldap ; then
+		dodoc README.LDAP doc/schema.OpenLDAP
+		dosbin plugins/sudoers/sudoers2ldif
+
+		cat <<-EOF > "${T}"/ldap.conf.sudo
+		# See ldap.conf(5) and README.LDAP for details
+		# This file should only be readable by root
+
+		# supported directives: host, port, ssl, ldap_version
+		# uri, binddn, bindpw, sudoers_base, sudoers_debug
+		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key
+		EOF
+
+		insinto /etc
+		doins "${T}"/ldap.conf.sudo
+		fperms 0440 /etc/ldap.conf.sudo
+	fi
+
+	pamd_mimic system-auth sudo auth account session
+
+	keepdir /var/db/sudo
+	fperms 0700 /var/db/sudo
+}
+
+pkg_postinst() {
+	if use ldap ; then
+		ewarn
+		ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
+		ewarn
+		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
+			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
+			ewarn "configured in /etc/nsswitch.conf."
+			ewarn
+			ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
+			ewarn "  sudoers: ldap files"
+			ewarn
+		fi
+	fi
+	if use prefix ; then
+		ewarn
+		ewarn "To use sudo, you need to change file ownership and permissions"
+		ewarn "with root privileges, as follows:"
+		ewarn
+		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
+		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
+		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
+		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
+		ewarn
+	fi
+
+	elog "To use the -A (askpass) option, you need to install a compatible"
+	elog "password program from the following list. Starred packages will"
+	elog "automatically register for the use with sudo (but will not force"
+	elog "the -A option):"
+	elog ""
+	elog " [*] net-misc/ssh-askpass-fullscreen"
+	elog "     net-misc/x11-ssh-askpass"
+	elog ""
+	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
+	elog "variable to the program you want to use."
+}
--- a/app-arch/alien/alien-8.87.ebuild
+++ b/app-arch/alien/alien-8.87.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/alien/alien-8.87.ebuild,v 1.1 2012/06/10 15:12:19 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/alien/alien-8.87.ebuild,v 1.2 2012/09/13 10:09:50 ago Exp $

 EAPI=1

@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.tar.gz"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~x86"
 IUSE="+bzip2"

 RDEPEND="app-arch/rpm
--- a/app-arch/xz-utils/xz-utils-5.0.4.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.0.4.ebuild
@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-5.0.4.ebuild,v 1.7 2012/09/09 15:59:15 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-5.0.4.ebuild,v 1.8 2012/09/14 02:24:09 ottxor Exp $

 # Remember: we cannot leverage autotools in this ebuild in order
 #           to avoid circular deps with autotools

-EAPI="2"
+EAPI="4"

 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="http://git.tukaani.org/xz.git"
@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN/-utils}-${PV/_}"
 	SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S=${WORKDIR}/${MY_P}
 	EXTRA_DEPEND=
 fi
@ -50,18 +50,16 @@ src_configure() {
 }

 src_install() {
-	emake install DESTDIR="${D}" || die
-	find "${D}"/usr/ -name liblzma.la -delete || die # dependency_libs=''
-	rm "${D}"/usr/share/doc/xz/COPYING* || die
-	mv "${D}"/usr/share/doc/{xz,${PF}} || die
-	prepalldocs
-	dodoc AUTHORS ChangeLog NEWS README THANKS
+	default
+	find "${ED}"/usr/ -name liblzma.la -delete || die # dependency_libs=''
+	rm "${ED}"/usr/share/doc/xz/COPYING* || die
+	mv "${ED}"/usr/share/doc/{xz,${PF}} || die
 }

 pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/liblzma.so.0
+	preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0)
 }

 pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/liblzma.so.0
+	preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0)
 }
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-9999.ebuild,v 1.11 2012/05/17 04:05:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-9999.ebuild,v 1.12 2012/09/14 02:24:09 ottxor Exp $

 # Remember: we cannot leverage autotools in this ebuild in order
 #           to avoid circular deps with autotools

-EAPI="2"
+EAPI="4"

 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="http://git.tukaani.org/xz.git"
@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN/-utils}-${PV/_}"
 	SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S=${WORKDIR}/${MY_P}
 	EXTRA_DEPEND=
 fi
@ -50,10 +50,8 @@ src_configure() {
 }

 src_install() {
-	emake install DESTDIR="${D}" || die
-	find "${D}"/usr/ -name liblzma.la -delete || die # dependency_libs=''
-	rm "${D}"/usr/share/doc/xz/COPYING* || die
-	mv "${D}"/usr/share/doc/{xz,${PF}} || die
-	prepalldocs
-	dodoc AUTHORS ChangeLog NEWS README THANKS
+	default
+	find "${ED}"/usr/ -name liblzma.la -delete || die # dependency_libs=''
+	rm "${ED}"/usr/share/doc/xz/COPYING* || die
+	mv "${ED}"/usr/share/doc/{xz,${PF}} || die
 }
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@ -1,3 +1,2 @@
 DIST cdrtools-3.00.tar.bz2 1978563 SHA256 7f9cb64820055573b880f77b2f16662a512518336ba95ab49228a1617973423d SHA512 93887afd6c244814b7f6a623f0ac5b551934626163065a6f32aefe82aa7438450fd7a42737ef3cdaad3f18841c066d25e72e37891531dd0be5be328692712cec WHIRLPOOL a02750131e4ec55df10387a01dab3881afee669cd8b8ea65eaed4fdd82e6bd11040c6d79fc64ccc9377e787f5903ec92ea3ae81db1945554b65a8636737cc931
-DIST cdrtools-3.01a07.tar.bz2 2043525 SHA256 cc54fefaf4ed5b6b49b996da1d1ebb1c44e88bbfada5c60e8f76c3a082591428 SHA512 670c5b191f35565a86ec4b55c78c3884f2157afd92a7d6f029371cbb252b1a7066ea3186de2586604cb96f4e618fadae6efb9bb1ac5819958cce543d4b9442db WHIRLPOOL d6f37ce8c448c1204491f24a6c5d7088cb5329eb0dbbc9de7aca1349994afb43762c543e6104f75ac0d64d18497c4c27de065871425fec042a1864f36161452a
 DIST cdrtools-3.01a08.tar.bz2 2042834 SHA256 e503b0531c99644788cf11be694f311043fc9adb17612e3dccd2eefc23a16f41 SHA512 cf591d571c4f17d15927eece49780f875ef797a4d3c4df130340257ff2ce8df40377f88f8f3bc4301cb1b0b8927ee2a7f580e0a0f7f0652b5c88f0a10af214e8 WHIRLPOOL cbe680ebeec52716980c07b86a1d005197542e611dfcff770c2e9717005de3225980166f47e369cf46fadd91db5dac3e42b9a45f9567db91239641f2784f60d9
--- a/app-cdr/cdrtools/cdrtools-3.01_alpha07.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.01_alpha07.ebuild
@ -1,131 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.01_alpha07.ebuild,v 1.3 2012/04/28 17:12:59 billie Exp $
-
-EAPI=4
-
-inherit multilib eutils toolchain-funcs flag-o-matic
-
-MY_P="${P/_alpha/a}"
-
-DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
-HOMEPAGE="http://cdrecord.berlios.de/private/cdrecord.html"
-SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha/')/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="acl unicode"
-
-DEPEND="acl? ( virtual/acl )
-	>=sys-devel/gettext-0.18.1.1
-	!app-cdr/cdrkit"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P/_alpha[0-9][0-9]}
-
-src_prepare() {
-	# Remove profiled make files.
-	rm -f $(find . -name '*_p.mk') || die "rm profiled"
-
-	# Adjusting hardcoded paths.
-	sed -i -e 's:opt/schily:usr:' \
-		$(find ./ -type f -name \*.[0-9ch] -exec grep -l 'opt/schily' '{}' '+') \
-		|| die "sed opt/schily"
-
-	sed -i -e "s:\(^INSDIR=\t\tshare/doc/\):\1${PF}/:" \
-		$(find ./ -type f -exec grep -l 'INSDIR.\+doc' '{}' '+') \
-		|| die "sed doc"
-
-	# Respect libdir.
-	sed -i -e "s:\(^INSDIR=\t\t\)lib:\1$(get_libdir):" \
-		$(find ./ -type f -exec grep -l '^INSDIR.\+lib\(/siconv\)\?$' '{}' '+') \
-		|| die "sed multilib"
-
-	# Do not install static libraries.
-	sed -i -e 's:include\t\t.*rules.lib::' \
-		$(find ./ -type f -exec grep -l '^include.\+rules\.lib' '{}' '+') \
-		|| die "sed rules"
-
-	# Respect CC/CXX variables.
-	cd "${S}"/RULES
-	local tcCC=$(tc-getCC)
-	local tcCXX=$(tc-getCXX)
-	sed -i -e "/cc-config.sh/s|\$(C_ARCH:%64=%) \$(CCOM_DEF)|${tcCC} ${tcCC}|" \
-		rules1.top || die "sed rules1.top"
-	sed -i -e "/^\(CC\|DYNLD\|LDCC\|MKDEP\)/s|gcc|${tcCC}|" \
-		-e "/^\(CC++\|DYNLDC++\|LDCC++\|MKC++DEP\)/s|g++|${tcCXX}|" \
-		-e "/COPTOPT=/s/-O//" \
-		-e 's/$(GCCOPTOPT)//' \
-		cc-gcc.rul || die "sed cc-gcc.rul"
-	sed -i -e "s|^#CONFFLAGS +=\t-cc=\$(XCC_COM)$|CONFFLAGS +=\t-cc=${tcCC}|g" \
-		rules.cnf || die "sed rules.cnf"
-
-	# Create additional symlinks needed for some archs (armv4l already created)
-	local t
-	for t in armv4tl armv5l armv5tel armv6l armv7l ppc64 s390x; do
-		ln -s i586-linux-cc.rul ${t}-linux-cc.rul || die
-		ln -s i586-linux-gcc.rul ${t}-linux-gcc.rul || die
-	done
-
-	# Schily make setup.
-	cd "${S}"/DEFAULTS
-	local os="linux"
-
-	sed -i \
-		-e "s:/opt/schily:/usr:g" \
-		-e "s:/usr/src/linux/include::g" \
-		-e "s:bin:root:g" \
-		Defaults.${os} || die "sed Schily make setup"
-}
-
-# skip obsolete configure script
-src_configure() { : ; }
-
-src_compile() {
-	if use unicode; then
-		local flags="$(test-flags -finput-charset=ISO-8859-1 -fexec-charset=UTF-8)"
-		if [[ -n ${flags} ]]; then
-			append-flags ${flags}
-		else
-			ewarn "Your compiler does not support the options required to build"
-			ewarn "cdrtools with unicode in USE. unicode flag will be ignored."
-		fi
-	fi
-
-	if ! use acl; then
-		CFLAGS="${CFLAGS} -DNO_ACL"
-	fi
-
-	# LIB_ACL_TEST removed to support x86-fbsd
-	# If not built with -j1, "sometimes" cdda2wav will not be built.
-	emake -j1 CC="$(tc-getCC)" CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" \
-		LDOPTX="${LDFLAGS}" \
-		INS_BASE="${D}/usr" INS_RBASE="${D}" LINKMODE="dynamic" \
-		RUNPATH="" GMAKE_NOWARN="true"
-}
-
-src_install() {
-	# If not built with -j1, "sometimes" manpages are not installed.
-	emake -j1 CC="$(tc-getCC)" CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" \
-		LDOPTX="${LDFLAGS}" \
-		INS_BASE="${D}/usr" INS_RBASE="${D}" LINKMODE="dynamic" \
-		RUNPATH="" GMAKE_NOWARN="true" install
-
-	# These symlinks are for compat with cdrkit.
-	dosym schily /usr/include/scsilib
-	dosym ../scg /usr/include/schily/scg
-
-	dodoc ABOUT Changelog* CONTRIBUTING PORTING README.linux-shm READMEs/README.linux
-
-	cd "${S}"/cdda2wav
-	docinto cdda2wav
-	dodoc Changelog FAQ Frontends HOWTOUSE NEEDED README THANKS TODO
-
-	cd "${S}"/mkisofs
-	docinto mkisofs
-	dodoc ChangeLog* TODO
-
-	# Remove man pages related to the build system
-	rm -rvf "${D}"/usr/share/man/man5
-}
--- a/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild,v 1.4 2012/09/09 12:38:35 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild,v 1.5 2012/09/13 08:41:29 ulm Exp $

 EAPI=4

@ -30,7 +30,7 @@ HOMEPAGE="http://www.gnu.org/software/emacs/"
 LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
 SLOT="24"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="alsa athena dbus games gconf gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"
+IUSE="alsa athena dbus games gconf gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"

 RDEPEND="sys-libs/ncurses
 	>=app-admin/eselect-emacs-1.2
@ -166,7 +166,7 @@ src_configure() {

 		if use gtk; then
 			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			myconf="${myconf} --with-x-toolkit=$(usev gtk3 || echo gtk)"
+			myconf="${myconf} --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
 			local f
 			for f in athena Xaw3d motif; do
 				use ${f} && ewarn "USE flag \"${f}\" ignored" \
@ -184,9 +184,6 @@ src_configure() {
 			einfo "Configuring to build with no toolkit"
 			myconf="${myconf} --with-x-toolkit=no"
 		fi
-
-		! use gtk && use gtk3 \
-			&& ewarn "USE flag \"gtk3\" has no effect if \"gtk\" is not set."
 	else
 		myconf="${myconf} --without-x --without-ns"
 	fi
--- a/app-editors/leafpad/files/leafpad-0.8.18.1-fdo.patch
+++ b/app-editors/leafpad/files/leafpad-0.8.18.1-fdo.patch
@ -0,0 +1,21 @@
+desktop-file-validate:
+
+leafpad.desktop: error: value "text/plain" for string list key "MimeType" in group "Desktop Entry"
+does not have a semicolon (';') as trailing character
+
+leafpad.desktop: warning: key "Encoding" in group "Desktop Entry" is deprecated
+
+--- data/leafpad.desktop.in
+++ data/leafpad.desktop.in
+@@ -1,10 +1,9 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ _Name=Leafpad
+ _Comment=Simple text editor
+ Exec=leafpad %f
+ Icon=leafpad
+ Terminal=false
+ Type=Application
+-MimeType=text/plain
+MimeType=text/plain;
+ Categories=GTK;Utility;TextEditor;
--- a/app-editors/leafpad/leafpad-0.8.18.1.ebuild
+++ b/app-editors/leafpad/leafpad-0.8.18.1.ebuild
@ -1,49 +1,36 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/leafpad/leafpad-0.8.18.1.ebuild,v 1.4 2012/05/03 18:33:02 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/leafpad/leafpad-0.8.18.1.ebuild,v 1.5 2012/09/13 21:14:54 ssuominen Exp $

-EAPI=3
-inherit fdo-mime gnome2-utils
+EAPI=4
+inherit eutils fdo-mime gnome2-utils

-DESCRIPTION="Simple GTK+ Text Editor"
+DESCRIPTION="Legacy (stable) release of the GTK+ 2.x based codebase"
 HOMEPAGE="http://tarot.freeshell.org/leafpad/"
-SRC_URI="http://savannah.nongnu.org/download/leafpad/${P}.tar.gz"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"

-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86 ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="emacs"
+LICENSE=GPL-2
+SLOT=0
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-interix ~amd64-linux ~x86-linux"
+IUSE=emacs

-RDEPEND=">=x11-libs/gtk+-2.10:2
-	virtual/libintl"
+RDEPEND="virtual/libintl
+	x11-libs/gtk+:2"
 DEPEND="${RDEPEND}
-	sys-devel/gettext
 	dev-util/intltool
+	sys-devel/gettext
 	virtual/pkgconfig"

-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--enable-chooser \
-		--enable-print \
-		$(use_enable emacs)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-}
+DOCS="AUTHORS ChangeLog NEWS README"

-pkg_preinst() {
-	gnome2_icon_savelist
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fdo.patch
 }

-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
+src_configure() {
+	econf --enable-chooser --enable-print $(use_enable emacs)
 }

-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { fdo-mime_desktop_database_update; gnome2_icon_cache_update; }
+pkg_postrm() { fdo-mime_desktop_database_update; gnome2_icon_cache_update; }
--- a/app-emacs/ecb/ecb-2.40-r2.ebuild
+++ b/app-emacs/ecb/ecb-2.40-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ecb/ecb-2.40-r2.ebuild,v 1.1 2012/06/13 19:48:14 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ecb/ecb-2.40-r2.ebuild,v 1.2 2012/09/13 11:27:49 ago Exp $

 EAPI=4

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

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="java"

 DEPEND=">=app-emacs/cedet-1.0_pre6
--- a/app-emacs/ess/ess-12.04.4.ebuild
+++ b/app-emacs/ess/ess-12.04.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ess/ess-12.04.4.ebuild,v 1.2 2012/07/29 18:07:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ess/ess-12.04.4.ebuild,v 1.3 2012/09/13 10:13:44 ago Exp $

 EAPI=4

@ -13,7 +13,7 @@ SRC_URI="http://ess.r-project.org/downloads/ess/${MY_P}.tgz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""

 DEPEND="app-text/texi2html
--- a/app-emacs/org-mode/org-mode-7.8.11.ebuild
+++ b/app-emacs/org-mode/org-mode-7.8.11.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-7.8.11.ebuild,v 1.1 2012/06/05 22:00:37 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-7.8.11.ebuild,v 1.2 2012/09/13 10:14:42 ago Exp $

 EAPI=4
 NEED_EMACS=22
@ -13,7 +13,7 @@ SRC_URI="http://orgmode.org/org-${PV}.tar.gz"

 LICENSE="GPL-3 FDL-1.3 contrib? ( GPL-2 MIT as-is )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos"
+KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos"
 IUSE="contrib"

 S="${WORKDIR}/org-${PV}"
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@ -1,4 +1,4 @@
 DIST VBoxGuestAdditions_4.1.12.iso 50776064 SHA256 7dce13dd99c8b4757d56f5bada19a61a3ad50c69d7e0d9c245c0b88f50c0c245 SHA512 04f76ae6707b76662d12cf98dda2270470ef9281c750f0f7cd47e7648c2abe9c2808baf6ae80b1566a039201bf9485b7a539c03093f36629afa6cc80f6812d93 WHIRLPOOL e254b5f11b5dc03b845c131be4691550d82e880e8376f2400dc7ad1596c159aff5d42dcf540ecee85df736d25800b391b47fdec31c718d845e754847a9fa8a72
 DIST VBoxGuestAdditions_4.1.18.iso 52164608 SHA256 0b670a698dcb427ebf69cdec1e040b26e93538e1ca76f58506c1db70308152ff SHA512 079840900997ad27079dbdfec0e5cc142befc96df9a587b7795f3a224549f0671f62908ae2862f00ca31ae7cd18fdb2a13b19c3aec23ca5cd0d5dc3059481878 WHIRLPOOL b8d3b23b8f4e568950c83d7c5c75048fd944e7bb222d4a9dd7c1bb071bc42e42fe2f6ce136b2e80c62aeb4063d6ab6480927ae44a181c99195e723e7f4d8672a
-DIST VBoxGuestAdditions_4.1.20.iso 52207616 SHA256 04ab744725c17db441077ef471eeb41db5fc6e4569ac54e6c4f52923737b0494 SHA512 977410c193ab010af3d097495b0288effd0181552259f990c4c4588fb28de90e5d700cd0f76f151b898a353f86ec878ba091b401c6ed48220572b19a31cd8642 WHIRLPOOL aed5b12b788aed589df2811d0d270a36178cf5a369630e168d67b621f6f3e23f735b1eb33bf0c0c2e7b2c2b4c9b7d697b8c5874088b59272459d5b786e232c58
 DIST VBoxGuestAdditions_4.1.22.iso 52207616 SHA256 5c7d9a4a31c8a926ba6dbae2b9704a561638e94ea0fc4f805a9231dd4f932d46 SHA512 529e5f236a1c4bad9123941d8fc3b0d73f93309d42656bf72090282bd970843457af548323079e36ea95d14b8320b3aaafb3ae790da5694d22f538ff8aa1fcf3 WHIRLPOOL f826dd334cfcc25b64b0ecdfb6a5e15bed60d3ceb398710a1787ea43f154b72e1117840f448ba398dcfe149ce0897799b57f0cf1e1e8b070cc055bc9e98896f9
+DIST VBoxGuestAdditions_4.2.0.iso 55207936 SHA256 ef274ecdcb48adec469656959e51c8468b6d3a7733ddf93f9a3713f77f1604f3 SHA512 e6d9241298297bac9fdcc0cbd8afba8d5075b531d966059ae7cf216cf4b1536e9320e773c0bbe3b376effa8b49bc189189607e85735149f73a7cacff5ad2d798 WHIRLPOOL 1fb8418151bc9ed323044834d65b042792a434d0e91cb873c07be03d85789b316979dd73b75d34967ccfce442717cddb54976467d1f7111e9a6662c4c2c7ce91
--- a/app-emulation/virtualbox-additions/virtualbox-additions-4.1.20.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-4.1.20.ebuild
@ -1,17 +1,19 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.1.20.ebuild,v 1.1 2012/08/21 09:18:04 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.2.0.ebuild,v 1.1 2012/09/13 19:41:15 polynomial-c Exp $

 EAPI=2

 inherit eutils

 MY_PN=VBoxGuestAdditions
-MY_P=${MY_PN}_${PV}
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=${MY_PN}_${MY_PV}

 DESCRIPTION="CD image containing guest additions for VirtualBox"
 HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.iso"
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"

 LICENSE="PUEL"
 SLOT="0"
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@ -1,16 +1,16 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.12-77245.tar.gz 10062236 SHA256 57a98286a9393e49c36ab8873878a89d0ac6b1179bf9a5c0d5fd517e272a8881 SHA512 8156fb23fcb5aead17da3f68d1303339e80981466c92531a1255b0f97aaa3c09243c6f6802220cac9abb1ab70255a51b8d3bed479d1724f4350d043cbec27fd7 WHIRLPOOL 3607b3dc4d3dd1947b41fd5859b796873441bdde228d138d31b11865e21c750cdf7a329f0b13778ecf63d4b0b176b38f0d72fe0057ce217e8299c7737af62983
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.18-78361.tar.gz 10572216 SHA256 1c8cf8d67d9adf75fd02d529c03ee2f960ec4be08970fd8030ba7912ef1e3198 SHA512 aeb7d04fd485fe55390e43e4b20cb87d64640c96beefc3f3bfdc755a2c3622dbbd006a9186731898f36b30ceed7ea887729d48c55874f28c0b6cd96c1cc2dbc0 WHIRLPOOL 513a78b062d75d4cd3a36ed4835a7878f9bf7b0b13d8981dd6664f71cef8f6503457e4dd909203c549a4068fa1608c4ab402944d4de1674a278da13a84da0859
-DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.20-80170.tar.gz 10749918 SHA256 3aa9a2d65e63b8fcf3fc02070bde23d27f4e061953c8c8f1a1e1d492244bfa2a SHA512 828e3142e20c727ee058c0e56cabe53458437f6addf7de4586e0e513d8423e3fdbd479bd90aaa8498e4cf973506c637095506cc77c37bad11c7360ec3565638b WHIRLPOOL 8b2dfa67d2caff8ce5a057cb762b78d1b2c5bd1abb15f05f82ee323a92f7932ad53d09a162da2f2163c503e2a6b65ff4c6796501c10fc9f359aea185afe1a544
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.22-80657.tar.gz 10778079 SHA256 837ea30834b7c80e2ae114bb62becac4745ad2878658239cc8eb13ff54cea75f SHA512 1dc1aa1d57a51b05e01004cabbdd40b2b5ff410d3f514cb499c50d847f8830610108bde225a6156a0d9c0c03a7ab96c4d767a7c7a6a5616191cbc1fb46486cca WHIRLPOOL 6758b41ac4d2169b618fbaff6f759ba0b5a3595c77025f61c74ef57ee180ba49c31a9d7ce2b65d37de3e921c2d734878a6deaa00741603e3d5717d203510838d
+DIST Oracle_VM_VirtualBox_Extension_Pack-4.2.0-80737.tar.gz 10828566 SHA256 18055795fa95d3a49ac00fd7e5009113d871a0c87a5e0f864f88c4eeb3222218 SHA512 ef637feea9041bcd68e5937a5bcc092b99862e2b9baa95263630f5ae2c1999c0cd2522b83707fb462d7a32af6ab1dcc2bf9275fd15ac94947cc5189b92c3b64e WHIRLPOOL b0696b319dff29a050ca5520e39625fb0d956e45309a2c773f1b77ad2fab83f9d7fbef4adb3a27be9ddd50068a45e4df155013cf7b6c879a9caa9e34ecf8a7aa
 DIST VirtualBox-4.1.12-77245-Linux_amd64.run 77250001 SHA256 006eabe522116abcce7af4b5ea6f32f862d3d95ab565e44e5077ab5ced62ba24 SHA512 42f74c47a405108b2a8360601a3a13bacc6cb3f223bbf12ba781f1f8f6e31160aab3c6c3cb4088bfe09d52c5287510285b2276746eb26df3408dc8787748305b WHIRLPOOL 121657f81057813168e182e6ad915a155b54948442f3302130b780e2a239800323e866a2a9d0f29d6c6a88e6c80fd16b9db1d049c09c9a232dbde697281ea4cf
 DIST VirtualBox-4.1.12-77245-Linux_x86.run 77137358 SHA256 49890bf1077b3649181d1607372d5b92bcf347371e0631a4af6a43193492f047 SHA512 4c0938b947512f9563e4afdf4bf9e9d9a478d4bc4062a12aa082c4e1605755fd9804aa2a4c2ff8c16aee21e700825f0128b193d84f33d8eaf1084f52654d2f7e WHIRLPOOL 6e93dd0157ec92c8811367f8e73977a0b85f2dc50e1334c9f8e820a34f53c3a99a775cdf8777f23cb5cbc669e4429c5f255ceb4c02eb23b121d3ae6853d5eead
 DIST VirtualBox-4.1.18-78361-Linux_amd64.run 78734802 SHA256 f45015f3b427a24195e8cbabb2158d26daecd6c03cd7437aacb5249500a2b425 SHA512 f584d7e00c115b4d45509895a6906154f0ce1b6e90366a6f04feeee8f7c1a11ccbbd9cd1d03bb749b39a3a278adff3ac2dd6301ff8d854c76591fc8b8a6f477d WHIRLPOOL 4557979bdf6131dc22fcc8c9617071d9c10d837da973903c8bb3eca27a9b7e3d2ec3e190df5607060508aa81721535f137e2fa65ba5550d04a12ed7d060aee13
 DIST VirtualBox-4.1.18-78361-Linux_x86.run 78611917 SHA256 112d5eefb15fc96f9e2c3a85928a1984c022ef32bb8781536a7a06e33a80865a SHA512 9a5f688cc64fd409c32707a6c04cd859dfa2363240110481b7290ef74fd4ebdb4ddd2db47eb3bed0ef10315bcb5e0f275647e4ae777758726987b94387a0aca1 WHIRLPOOL 34c423a8849ddb14e4dbd8f734081ba407bf7b5a731fd970e79b74582d2e8756785bd6ec474b2a822ff8fdd30538f89e1c2465387bf8431d6d7dd18fa92e0434
-DIST VirtualBox-4.1.20-80170-Linux_amd64.run 78632402 SHA256 0c282c58d35aad41ac43b9fd0b33689a384d5ea21018d2824da63df9b3cf9241 SHA512 fcbc5a07dc2ef82de02c0b5f5fae33b6e5fa994912b6dc4121ab6dfc43a7d57179643d227b6d7c834e1e0f000ac02f2595b0a0323a4d1a7bb3b1eba086c0b154 WHIRLPOOL fb96eb5cc405002b2498175d5087e0002eccc00d7337efdf79d95310e2fe9947abee2be45ec58fa5d5029e68690826111858d4e917de29010d0737af7e7ba6ea
-DIST VirtualBox-4.1.20-80170-Linux_x86.run 78704078 SHA256 e084db553064fb85136df22d13f262fef602daca56b95799cef7df761310a8d5 SHA512 4d93bf250fec5d0be9e84795a22ceb592433223fa67520e67e1e797523149d251977a51c1589b71527d079d698cf045c12e0567b3662152ccb7ae266901af1b7 WHIRLPOOL 0f4c8726566015ba1a0eaf041b002dd5be9dba9dbbb43b88b6bc318ab150b03c444a2c3f73575d5d8328ead1116352bb05b1cad1148d90b9e1de46c2ced07f3b
 DIST VirtualBox-4.1.22-80657-Linux_amd64.run 78693841 SHA256 d53a5cc2d1b9431d4f9443462b84549678e943be1d8b4a714d7844c741507c76 SHA512 cdd2920099c0c0349bc6750ab7cad67f23cfba109db62297ad8bede1e7a5658781a29ea1111c8ae1b07cf1eeaf2394baf419be1b9b174575f3c10c13aa9d9b68 WHIRLPOOL c532b3b48c9a0b8057c65db4cbd6e31f17e93a88a4bb5842f9b8c821e8f102d4e2b1bcbfd081ec6a1ecc95b697d8f7914542e8aefcebeb9b2137ad8edf267696
 DIST VirtualBox-4.1.22-80657-Linux_x86.run 78632398 SHA256 a18a2b7723bc8c325149b5581ae36208211c7d8651269516d366db9cdafcd0ae SHA512 0f9dd4fc25828cec3ac3d2961b925a57dd88e0af1c3cf75c9199428b4090790ebd439015700b63def6c53b5acc94135e7766f36f29d6befcb03339d563fac054 WHIRLPOOL 76d06e577f2ee3d9ec0eea0b9800b618af97205ac9b036fe3f1c73b7ecccfbf6f57e49ddc224e9963eb048c5fe6e88cfedf9743b8af2df97137feb03e89fac36
+DIST VirtualBox-4.2.0-80737-Linux_amd64.run 80342468 SHA256 04030998f15b656e9b76064cde3e6cb43c5a41b1e25e700f123f5a629578fe5e SHA512 12230b1910cbf7d3ef7942fa262d96caeb0a5d97cc21b344933c2b21feb0883785d51134c2d14f904972595ca4655034408d57f2327024ba7c95abbc7e2c4152 WHIRLPOOL 2a92948b86514b684cf7116d9cf4ae880cb9b559ea5379ae7c7c1dbd652549a431ace9c77704fd7a916cafab18f5f3fec88383cea7164dfc18788e1802eb8585
+DIST VirtualBox-4.2.0-80737-Linux_x86.run 80158144 SHA256 d859981312c2b6ed9e596375fc180378763b09e5a3cf0d6dd61bc252789006c4 SHA512 755aa7efbe75e4bd83b04bd950955516d2a5462fd8b398092dbb8854cbba54ce22d8072b885abba883fc8c751a41ee7670c021ef72f530b726466fa3bddbbf0d WHIRLPOOL 101492d5e9b85ee7634d2b3b5cbd9f1aff258b12c951455ee969b2fe48768f48e90956a5dbcfaf8c83be6cf10f601fad6633c56a471a34762f8079f52db8a72d
 DIST VirtualBoxSDK-4.1.12-77245.zip 8896345 SHA256 a490878e7bc2443c7e4b51115382a6c5b65cda44cfc449af1676778093b307fa SHA512 2409b0c0c090287e5251cb2cc54e3ad02ab53005b8e5340ebcda585b557c888122e73a485b90a79e7d72996c910d08c817e55f8dc852326ca3134f8b33630ea3 WHIRLPOOL 166501729284022798af4253c3568d6baf63f553bfce4878a7140141bbe17dadaff044dd69fe35a757add7ca166125e20ae0ab702dc237130d19ff4aa93fd5e9
 DIST VirtualBoxSDK-4.1.18-78361.zip 8805499 SHA256 9c8a7461529d11252443305749a086584090fbd8ff106d6e62b6a76d0fe0443e SHA512 bc17d278de6d9b372874212ce89e3440f11b04e7892a807a0c6b909f24823ae292ce2c7c888924afa5e001d746d604722e4f5d16716a60328e24c76f6d81f794 WHIRLPOOL 8ace578dd0b97e8516f0786e93f4dc2f5fa5d86c404b38289e18351276f6727be326126275c1ea8e26874ebe4d4e847c9defdaa3658dd387e83960a768f2ff5f
-DIST VirtualBoxSDK-4.1.20-80170.zip 8806206 SHA256 83ff7449c91d3457fe3e877579b292705b592000e32e15bf828232c87edd0874 SHA512 e38f6d6ee7ff568ece13e08e9e1a7677dcea554512ab6f55cb985fb9e3e62238e9881f60bbd586a96833845daad934edb9c7d8d738df6f4d5c10598434367bbf WHIRLPOOL 281426569e97aed3b1eb7308253e80e34e50f7e9626783f956b31d3eed3e145c7024a7f90436efd5b62a269d69658fe6e69f2d77224f0472d231a15bb61d5f03
 DIST VirtualBoxSDK-4.1.22-80657.zip 8805310 SHA256 89f221ae08863342e7a8da3186135796430614e5792d7f8eae284b1360f669d2 SHA512 e488f6099f814174555112bccb06710d1dd782943c01ae4afb6f907328f28b198caf992f6c142751223b71cff02cdaca206fddd5f61b00c4c010ed84f922f94d WHIRLPOOL 69d9c3c1e44e5657d88b1d6b6da0deb8b65d0f88656eea895249fb610bdc0c0539b0c6daadaf04185296fbc2553873acf86308d26725d3292760ff395bf3390d
+DIST VirtualBoxSDK-4.2.0-80737.zip 9718188 SHA256 cf1bca71340d78b474c5c74eadf97d66121b39a6fa575b156f2f1e1f8a8db24d SHA512 699d01933d65fde33ebd60f7b4928801641c5ae2432fee0693da84cffe3271012a09ed7021d71381bd6894d4457e90ed02fac14dcb8b58dea396dbf990344db5 WHIRLPOOL c407867a4b4d68844553c33d012b79bbd80f2cad59e94435c451486518aca1022480fa4d13b2fddc6e93231fe5d7b9cbe6d60be3d30166e5c33a856230b43206
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.20.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.1.20.ebuild
@ -1,23 +1,25 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.1.20.ebuild,v 1.1 2012/08/21 08:58:35 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.0.ebuild,v 1.1 2012/09/13 19:39:53 polynomial-c Exp $

 EAPI=2

 inherit eutils unpacker fdo-mime gnome2 pax-utils

-MY_PV=${PV}-80170
-SDK_PV=${MY_PV}
+MY_PV=${PV/beta/BETA}
+MY_PV=${MY_PV/rc/RC}
+VBOX_PV=${MY_PV}-80737
+SDK_PV=${VBOX_PV}
 EXTP_PV=${SDK_PV}
-MY_P=VirtualBox-${MY_PV}-Linux
+MY_P=VirtualBox-${VBOX_PV}-Linux
 EXTP_PN=Oracle_VM_VirtualBox_Extension_Pack

 DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
 HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_amd64.run )
-	x86? ( http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_x86.run )
-	sdk? ( http://download.virtualbox.org/virtualbox/${PV}/VirtualBoxSDK-${SDK_PV}.zip )
-	http://download.virtualbox.org/virtualbox/${PV}/${EXTP_PN}-${EXTP_PV}.vbox-extpack -> ${EXTP_PN}-${EXTP_PV}.tar.gz"
+SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run )
+	x86? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )
+	sdk? ( http://download.virtualbox.org/virtualbox/${MY_PV}/VirtualBoxSDK-${SDK_PV}.zip )
+	http://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_PN}-${EXTP_PV}.vbox-extpack -> ${EXTP_PN}-${EXTP_PV}.tar.gz"

 LICENSE="GPL-2 PUEL"
 SLOT="0"
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@ -1,4 +1,4 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.12-77245.tar.gz 10062236 SHA256 57a98286a9393e49c36ab8873878a89d0ac6b1179bf9a5c0d5fd517e272a8881 SHA512 8156fb23fcb5aead17da3f68d1303339e80981466c92531a1255b0f97aaa3c09243c6f6802220cac9abb1ab70255a51b8d3bed479d1724f4350d043cbec27fd7 WHIRLPOOL 3607b3dc4d3dd1947b41fd5859b796873441bdde228d138d31b11865e21c750cdf7a329f0b13778ecf63d4b0b176b38f0d72fe0057ce217e8299c7737af62983
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.18-78361.tar.gz 10572216 SHA256 1c8cf8d67d9adf75fd02d529c03ee2f960ec4be08970fd8030ba7912ef1e3198 SHA512 aeb7d04fd485fe55390e43e4b20cb87d64640c96beefc3f3bfdc755a2c3622dbbd006a9186731898f36b30ceed7ea887729d48c55874f28c0b6cd96c1cc2dbc0 WHIRLPOOL 513a78b062d75d4cd3a36ed4835a7878f9bf7b0b13d8981dd6664f71cef8f6503457e4dd909203c549a4068fa1608c4ab402944d4de1674a278da13a84da0859
-DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.20-80170.tar.gz 10749918 SHA256 3aa9a2d65e63b8fcf3fc02070bde23d27f4e061953c8c8f1a1e1d492244bfa2a SHA512 828e3142e20c727ee058c0e56cabe53458437f6addf7de4586e0e513d8423e3fdbd479bd90aaa8498e4cf973506c637095506cc77c37bad11c7360ec3565638b WHIRLPOOL 8b2dfa67d2caff8ce5a057cb762b78d1b2c5bd1abb15f05f82ee323a92f7932ad53d09a162da2f2163c503e2a6b65ff4c6796501c10fc9f359aea185afe1a544
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.22-80657.tar.gz 10778079 SHA256 837ea30834b7c80e2ae114bb62becac4745ad2878658239cc8eb13ff54cea75f SHA512 1dc1aa1d57a51b05e01004cabbdd40b2b5ff410d3f514cb499c50d847f8830610108bde225a6156a0d9c0c03a7ab96c4d767a7c7a6a5616191cbc1fb46486cca WHIRLPOOL 6758b41ac4d2169b618fbaff6f759ba0b5a3595c77025f61c74ef57ee180ba49c31a9d7ce2b65d37de3e921c2d734878a6deaa00741603e3d5717d203510838d
+DIST Oracle_VM_VirtualBox_Extension_Pack-4.2.0-80737.tar.gz 10828566 SHA256 18055795fa95d3a49ac00fd7e5009113d871a0c87a5e0f864f88c4eeb3222218 SHA512 ef637feea9041bcd68e5937a5bcc092b99862e2b9baa95263630f5ae2c1999c0cd2522b83707fb462d7a32af6ab1dcc2bf9275fd15ac94947cc5189b92c3b64e WHIRLPOOL b0696b319dff29a050ca5520e39625fb0d956e45309a2c773f1b77ad2fab83f9d7fbef4adb3a27be9ddd50068a45e4df155013cf7b6c879a9caa9e34ecf8a7aa
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.20.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.20.ebuild
@ -1,18 +1,20 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.1.20.ebuild,v 1.1 2012/08/21 09:18:35 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.2.0.ebuild,v 1.1 2012/09/13 19:42:35 polynomial-c Exp $

 EAPI=2

 inherit eutils multilib

-MY_BUILD="80170"
+MY_BUILD="80737"
 MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
-MY_P="${MY_PN}-${PV}-${MY_BUILD}"
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P="${MY_PN}-${MY_PV}-${MY_BUILD}"

 DESCRIPTION="PUEL extensions for VirtualBox"
 HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"

 LICENSE="PUEL"
 SLOT="0"
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@ -1,3 +1,4 @@
 DIST VirtualBox-4.1.12.tar.bz2 73250628 SHA256 4e4b9181a61ee9ccbe5fd28dbf528dde708fba490af5de6fac0d138b283b1d02 SHA512 93122eb428c114b73c76775d1643ea297dff3800b9c1950ad0e5ad2dbb3b308a119dd065364d2578035746f5844f813c881227b188c3965752ff31dad5017c5d WHIRLPOOL d8f4446a069b9a73ebc20bcf23d464e16adba40bd356adbba4f1fc1e1a0dca089b101bc7b4483e0c28b0c2b1bd88c0cd28dffa045f4f95303ca926825ce9a2e9
 DIST VirtualBox-4.1.18.tar.bz2 73688436 SHA256 e650e4fdc23581b9edc0e5d5705cc596c76796851ebf65ccda0edb8e413fa3b7 SHA512 8053daaf45aa8ea4e56f7fc3b53b280ecbf184cb943ef574c7c1005557e762bcd626fe8b28693706c1c5385f497ea1baf39927b2cf83a09dc055076ec7bc8a3e WHIRLPOOL 0e232225431b230fd73e8d23bcdb23e413aa85fc336aa8af179f190c2b855b77057daa324ef1fcc5da08a75c51daa87f04beb97f03bdbd9ce2a270064debca78
-DIST VirtualBox-4.1.20.tar.bz2 73391720 SHA256 b132dbc5c6e9ed77aba737ec35b488ac152aa362c3ad49d466897bc410324aeb SHA512 ee14844b00e202fb23168d5c583d7dacca2de0506028ede7dd51fe33a2a1b5b7154e706445c85d930e0d7365ee32878d08644d6830d1b591ad5334fef5453c6e WHIRLPOOL 8a33f3553554eae6a4cbb5e80b376e507d9da97cf10e49363a2888fa849d238bf84492aa4941e7c930ec17c9b1c5dc5f1ad4643ef9258d74a44f8b81f84a00c2
+DIST VirtualBox-4.1.22.tar.bz2 73385514 SHA256 7abb506203dd0d69b4b408fd999b5b9a479a9adce5f80e9b5569641c053dd153 SHA512 1bc2e33f6ce1ab417887241ee95bc3042b5c6072b3babc221c349b36b923f0655e776e98468cc63f65662e5ae3819c974bc8b5c97bae531a2c4a0ebb1c1ebba6 WHIRLPOOL e52ee58fdf1b3d1e1323cb26df1791dbc4c9375061467191a73f12071ac99a5c2791ddb65eeff9af5a645ba39fe88d4f7bc4362c919c9c14ba10a99d1b6c3776
+DIST VirtualBox-4.2.0.tar.bz2 76590194 SHA256 895426ecac371bef4c070e8bcc9306f0c57dcbd6be25188d915b63ddde6f49e6 SHA512 76cddb682a2f5615e8ab465e8766d0ba19e1482b595a185cb401fdb962fb6f161945986ea5514934652305fa3d25f66a88767572fa4e0c5d3b5d5ffeb15c8005 WHIRLPOOL 5c4521a1dfc5b249c6c9692741a83014dc98496086e31186883e8b3f43c18af700f8002c3586b1475fd2c8bac2cbcaadc90aafb259ec50ebbeb3703440ddb822
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.22.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.22.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.20.ebuild,v 1.1 2012/08/21 09:20:50 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.22.ebuild,v 1.1 2012/09/13 19:46:22 polynomial-c Exp $

 EAPI=2

--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.0.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.0.ebuild
@ -0,0 +1,201 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.0.ebuild,v 1.1 2012/09/13 19:46:22 polynomial-c Exp $
+
+EAPI=2
+
+inherit eutils linux-mod user
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+DESCRIPTION="VirtualBox kernel modules and user-space tools for Linux guests"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
+			 x11-apps/xrandr
+			 x11-apps/xrefresh
+			 x11-libs/libXmu
+			 x11-libs/libX11
+			 x11-libs/libXt
+			 x11-libs/libXext
+			 x11-libs/libXau
+			 x11-libs/libXdmcp
+			 x11-libs/libSM
+			 x11-libs/libICE )
+	!!x11-drivers/xf86-input-virtualbox"
+DEPEND="${RDEPEND}
+		>=dev-util/kbuild-0.1.9998_pre20120806
+		>=dev-lang/yasm-0.6.2
+		sys-devel/bin86
+		sys-devel/dev86
+		sys-libs/pam
+		sys-power/iasl
+		X? ( x11-proto/renderproto )
+		!X? ( x11-proto/xproto )"
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
+			vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+		linux-mod_pkg_setup
+		BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+		enewgroup vboxguest
+		enewuser vboxguest -1 /bin/sh /var/run/vboxguest vboxguest
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Create and unpack a tarball with the sources of the Linux guest
+	# kernel modules, to include all the needed files
+	"${S}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
+	unpack ./vbox-kmod.tar.gz
+
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	cd "${S}"
+	rm -rf kBuild/bin tools
+}
+
+src_prepare() {
+	# PaX fixes (see bug #298988)
+	pushd "${WORKDIR}" &>/dev/null || die
+	epatch "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
+	popd &>/dev/null || die
+
+	# Disable things unused or splitted into separate ebuilds
+	cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk
+
+	# stupid new header references...
+	for vboxheader in {product,revision}-generated.h ; do
+		for mdir in vbox{guest,sf} ; do
+			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
+				"${WORKDIR}/${mdir}/${vboxheader}"
+		done
+	done
+}
+
+src_configure() {
+		# build the user-space tools, warnings are harmless
+		./configure --nofatal \
+		--disable-xpcom \
+		--disable-sdl-ttf \
+		--disable-pulse \
+		--disable-alsa \
+		--build-headless || die "configure failed"
+}
+
+src_compile() {
+		source ./env.sh
+
+		for each in /src/VBox/{Runtime,Additions/common} \
+		/src/VBox/Additions/linux/{sharedfolders,daemon} ; do
+				cd "${S}"${each}
+				MAKE="kmk" emake TOOL_YASM_AS=yasm \
+				KBUILD_PATH="${S}/kBuild" \
+				|| die "kmk VBoxControl failed"
+		done
+
+		if use X; then
+				cd "${S}"/src/VBox/Additions/x11/VBoxClient
+				MAKE="kmk" emake TOOL_YASM_AS=yasm \
+				KBUILD_PATH="${S}/kBuild" \
+				|| die "kmk VBoxClient failed"
+		fi
+
+		# Now creating the kernel modules. We must do this _after_
+		# we compiled the user-space tools as we need two of the
+		# automatically generated header files. (>=3.2.0)
+		linux-mod_src_compile
+}
+
+src_install() {
+		linux-mod_src_install
+
+		cd "${S}"/out/linux.${ARCH}/release/bin/additions
+
+		insinto /sbin
+		newins mount.vboxsf mount.vboxsf
+		fperms 4755 /sbin/mount.vboxsf
+
+		newinitd "${FILESDIR}"/${PN}-7.initd ${PN}
+
+		insinto /usr/sbin/
+		newins VBoxService vboxguest-service
+		fperms 0755 /usr/sbin/vboxguest-service
+
+		insinto /usr/bin
+		doins VBoxControl
+		fperms 0755 /usr/bin/VBoxControl
+
+		# VBoxClient user service and xrandr wrapper
+		if use X; then
+			doins VBoxClient
+			fperms 0755 /usr/bin/VBoxClient
+
+			cd "${S}"/src/VBox/Additions/x11/Installer
+			newins 98vboxadd-xclient VBoxClient-all
+			fperms 0755 /usr/bin/VBoxClient-all
+		fi
+
+		# udev rule for vboxdrv
+		dodir /lib/udev/rules.d
+		echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${D}/lib/udev/rules.d/60-virtualbox-guest-additions.rules" \
+			|| die
+		echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${D}/lib/udev/rules.d/60-virtualbox-guest-additions.rules" \
+			|| die
+
+		# VBoxClient autostart file
+		insinto /etc/xdg/autostart
+		doins "${FILESDIR}"/vboxclient.desktop
+
+		# sample xorg.conf
+		insinto /usr/share/doc/${PF}
+		doins "${FILESDIR}"/xorg.conf.vbox
+}
+
+pkg_postinst() {
+		linux-mod_pkg_postinst
+		if ! use X ; then
+			elog "use flag X is off, enable it to install the"
+			elog "X Window System input and video drivers"
+		fi
+		elog ""
+		elog "Please add users to the \"vboxguest\" group so they can"
+		elog "benefit from seamless mode, auto-resize and clipboard."
+		elog ""
+		elog "Please add:"
+		elog "/etc/init.d/${PN}"
+		elog "to the default runlevel in order to start"
+		elog "needed services."
+		elog "To use the VirtualBox X drivers, use the following"
+		elog "file as your /etc/X11/xorg.conf:"
+		elog "    /usr/share/doc/${PF}/xorg.conf.xorg"
+		elog ""
+		elog "Also make sure you use the Mesa library for OpenGL:"
+		elog "    eselect opengl set xorg-x11"
+		elog ""
+		elog "An autostart .desktop file has been installed to start"
+		elog "VBoxClient in desktop sessions."
+		elog ""
+		elog "You can mount shared folders with:"
+		elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
+		elog ""
+		elog "Warning:"
+		elog "this ebuild is only needed if you are running gentoo"
+		elog "inside a VirtualBox Virtual Machine, you don't need"
+		elog "it to run VirtualBox itself."
+		elog ""
+}
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@ -1,4 +1,4 @@
 DIST vbox-kernel-module-src-4.1.12.tar.xz 459148 SHA256 70707451b9dab6128005410f515f0c2c5d8c295b319243d9e623ae68c5acff1f SHA512 a90a74ced4893b7e017a96c0bbd1c4023a5b7aef263baaca38006753c559359a473f291c947f738ea68357c4a83ec0cef2282900ca0c886b291a94376089bc7b WHIRLPOOL 0c42dbca42b86b604a59273dd1eeeb401942db1a5e2c990d9b2f5920fc7b353f53a997787ed08eae41d9a5e513e70d5c526a5ea4c11ecb65f25fb36500fe92bb
 DIST vbox-kernel-module-src-4.1.18.tar.xz 459308 SHA256 e5fe22add223af149dba2061343573326f0aaf37d1b2959c24097005ff4037ef SHA512 f7676013a2a77d03d6c9b29e4444655f76c148819d204e792a29e14458a32d3c9b4474160502f830d7704b4733e44e46051adf279e8e8f04e863c3ff4bc24247 WHIRLPOOL 3751a03d8d556622dddf8bddef7e9f2ff12b9a518c93bfbd8493455c7de20447771e5559e51aae3af113c41fcc46cdf8c4555ff941484424fea5884c690eaad5
-DIST vbox-kernel-module-src-4.1.20.tar.xz 459736 SHA256 d7ab3c31c08b277bf223ae16338b0b0e7ad03208138193b622e9f9e37e35a7d2 SHA512 c0846f8016c7733f58fbd080695a9cc16260332c6c2943c067cf8870265cfdd17ebdc8270ed1928f9942672c8c84acd23c006a01ca3d8eb6d9ccba2967b27930 WHIRLPOOL faa1d8fd836e0f3abc94d7d5aa94b31c61cb16fb4ee747bffa10e444fe21904a11177e7215206df8820375a29e66e1ba3a5ddd4f721571606df0e65c04da49ec
 DIST vbox-kernel-module-src-4.1.22.tar.xz 459980 SHA256 8d37d4c4497fd1de9511af2eb1aea4959045b47ad623f04e76958dfabd0848e3 SHA512 3ac0e55b794468b7b4b204500334d86763c523a2dfac84d830153b3ca324883fdce996eeaa35fa0e36606b46c126c0ab77374d1d3d7df8b65cf1058335ece214 WHIRLPOOL 19b2bfa3be78a845af962c80a5dd1defc7bbba2d30f0641ff02d069d5d2e3fab53eb4ce42a450ff16d5ea40f2ec3b5b88af8f341a481a93c6fe2aad03eca09ce
+DIST vbox-kernel-module-src-4.2.0.tar.xz 459752 SHA256 d259fd8023f1418c7e025d3bc795b4edacddb913135ef02c36249d498788b241 SHA512 a784d76756abea86c35ac1146c290926ccc93434b1b6850efa1338bc95dade291521a080e0c43f7858ff589da62559ed60a882015ed8140941d5eb0c9b54416c WHIRLPOOL 60e5b83cf57d80472af91a07e8608ea36b18ffccccfdcffe8bcc4750932b8117f33a3d40fd2a8dbc2bade22f2fcfdbb9a896bce017dbd919cfa951b57e485fb8
--- a/app-emulation/virtualbox-modules/virtualbox-modules-4.1.20.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.1.20.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.1.20.ebuild,v 1.1 2012/08/21 08:58:05 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.2.0.ebuild,v 1.1 2012/09/13 19:37:11 polynomial-c Exp $

 # XXX: the tarball here is just the kernel modules split out of the binary
 #      package that comes from virtualbox-bin
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@ -1,4 +1,4 @@
 DIST VirtualBox-4.1.12.tar.bz2 73250628 SHA256 4e4b9181a61ee9ccbe5fd28dbf528dde708fba490af5de6fac0d138b283b1d02 SHA512 93122eb428c114b73c76775d1643ea297dff3800b9c1950ad0e5ad2dbb3b308a119dd065364d2578035746f5844f813c881227b188c3965752ff31dad5017c5d WHIRLPOOL d8f4446a069b9a73ebc20bcf23d464e16adba40bd356adbba4f1fc1e1a0dca089b101bc7b4483e0c28b0c2b1bd88c0cd28dffa045f4f95303ca926825ce9a2e9
 DIST VirtualBox-4.1.18.tar.bz2 73688436 SHA256 e650e4fdc23581b9edc0e5d5705cc596c76796851ebf65ccda0edb8e413fa3b7 SHA512 8053daaf45aa8ea4e56f7fc3b53b280ecbf184cb943ef574c7c1005557e762bcd626fe8b28693706c1c5385f497ea1baf39927b2cf83a09dc055076ec7bc8a3e WHIRLPOOL 0e232225431b230fd73e8d23bcdb23e413aa85fc336aa8af179f190c2b855b77057daa324ef1fcc5da08a75c51daa87f04beb97f03bdbd9ce2a270064debca78
-DIST VirtualBox-4.1.20.tar.bz2 73391720 SHA256 b132dbc5c6e9ed77aba737ec35b488ac152aa362c3ad49d466897bc410324aeb SHA512 ee14844b00e202fb23168d5c583d7dacca2de0506028ede7dd51fe33a2a1b5b7154e706445c85d930e0d7365ee32878d08644d6830d1b591ad5334fef5453c6e WHIRLPOOL 8a33f3553554eae6a4cbb5e80b376e507d9da97cf10e49363a2888fa849d238bf84492aa4941e7c930ec17c9b1c5dc5f1ad4643ef9258d74a44f8b81f84a00c2
 DIST VirtualBox-4.1.22.tar.bz2 73385514 SHA256 7abb506203dd0d69b4b408fd999b5b9a479a9adce5f80e9b5569641c053dd153 SHA512 1bc2e33f6ce1ab417887241ee95bc3042b5c6072b3babc221c349b36b923f0655e776e98468cc63f65662e5ae3819c974bc8b5c97bae531a2c4a0ebb1c1ebba6 WHIRLPOOL e52ee58fdf1b3d1e1323cb26df1791dbc4c9375061467191a73f12071ac99a5c2791ddb65eeff9af5a645ba39fe88d4f7bc4362c919c9c14ba10a99d1b6c3776
+DIST VirtualBox-4.2.0.tar.bz2 76590194 SHA256 895426ecac371bef4c070e8bcc9306f0c57dcbd6be25188d915b63ddde6f49e6 SHA512 76cddb682a2f5615e8ab465e8766d0ba19e1482b595a185cb401fdb962fb6f161945986ea5514934652305fa3d25f66a88767572fa4e0c5d3b5d5ffeb15c8005 WHIRLPOOL 5c4521a1dfc5b249c6c9692741a83014dc98496086e31186883e8b3f43c18af700f8002c3586b1475fd2c8bac2cbcaadc90aafb259ec50ebbeb3703440ddb822
--- a/app-emulation/virtualbox/files/virtualbox-4.2.0-nopie.patch
+++ b/app-emulation/virtualbox/files/virtualbox-4.2.0-nopie.patch
@ -0,0 +1,130 @@
+Index: Config.kmk
+===================================================================
+diff --git a/trunk/Config.kmk b/trunk/Config.kmk
+--- a/trunk/Config.kmk	(revision 43316)
+++ b/trunk/Config.kmk	(working copy)
+@@ -2230,6 +2230,7 @@ $(PATH_OUT)/GCCConfig.kmk: \
+ 	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-pointer-to-int-cast        ?= $(call VBOX_GCC_CHECK_CC,-Wno-pointer-to-int-cast,)'
+ 	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-variadic-macros   ?= $(call VBOX_GCC_CHECK_CXX,-Wno-variadic-macros,)'
+ 	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_fno-stack-protector   ?= $(call VBOX_GCC_CHECK_CC,-fno-stack-protector,)'
+	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_nopie                 ?= $(call VBOX_GCC_CHECK_CC,-nopie,)'
+ 	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_fno-dwarf2-cfi-asm    ?= $(call VBOX_GCC_CHECK_CC,-fno-dwarf2-cfi-asm,)'
+ 	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_fdiagnostics-show-option ?= $(call VBOX_GCC_CHECK_CC,-fdiagnostics-show-option,)'
+ # Produce code optimized for the most common IA32/AMD64/EM64T processors. Introduced with gcc version 4.2.
+@@ -2881,8 +2882,8 @@ ifdef VBOX_WITH_RAW_MODE
+ 
+  ifeq ($(VBOX_LDR_FMT32),elf)
+  TEMPLATE_VBoxRc_TOOL                = $(VBOX_GCC32_TOOL)
+- TEMPLATE_VBoxRc_CXXFLAGS            = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) -fno-rtti
+- TEMPLATE_VBoxRc_CFLAGS              = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden)
+ TEMPLATE_VBoxRc_CXXFLAGS            = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) -fno-rtti
+ TEMPLATE_VBoxRc_CFLAGS              = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) $(VBOX_GCC_fvisibility-hidden)
+   ifeq ($(KBUILD_TARGET),solaris)
+    TEMPLATE_VBoxRc_LDFLAGS           = -r
+   else
+@@ -2936,9 +2937,9 @@ ifdef VBOX_WITH_RAW_MODE
+  endif
+ 
+  ifeq ($(VBOX_LDR_FMT32),elf)
+-  TEMPLATE_VBoxRcExe_CFLAGS   = $(filter-out -nostdinc,$(TEMPLATE_VBoxRc_CFLAGS)) -O0
+-  TEMPLATE_VBoxRcExe_CXXFLAGS = $(filter-out -nostdinc,$(TEMPLATE_VBoxRc_CXXFLAGS)) -O0
+-  TEMPLATE_VBoxRcExe_LDFLAGS  = -g
+  TEMPLATE_VBoxRcExe_CFLAGS   = $(filter-out -nostdinc,$(TEMPLATE_VBoxRc_CFLAGS)) -O0 $(VBOX_GCC_nopie)
+  TEMPLATE_VBoxRcExe_CXXFLAGS = $(filter-out -nostdinc,$(TEMPLATE_VBoxRc_CXXFLAGS)) -O0 $(VBOX_GCC_nopie)
+  TEMPLATE_VBoxRcExe_LDFLAGS  = -g $(VBOX_GCC_nopie)
+   TEMPLATE_VBoxRcExe_LDFLAGS.dbgopt = -g
+   TEMPLATE_VBoxRcExe_LDFLAGS.strict = -g
+   TEMPLATE_VBoxRcExe_LDFLAGS.release = -g
+@@ -3009,8 +3010,8 @@ endif # pe
+ 
+ ifeq ($(VBOX_LDR_FMT),elf)
+ TEMPLATE_VBoxR0_TOOL                = $(VBOX_GCC_TOOL)
+-TEMPLATE_VBoxR0_CFLAGS              = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99
+-TEMPLATE_VBoxR0_CXXFLAGS            = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) -fno-rtti
+TEMPLATE_VBoxR0_CFLAGS              = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99
+TEMPLATE_VBoxR0_CXXFLAGS            = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) -fno-rtti
+ TEMPLATE_VBoxR0_CFLAGS.amd64        = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables -ffreestanding
+ TEMPLATE_VBoxR0_CXXFLAGS.amd64      = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables
+ ifeq ($(KBUILD_TARGET),solaris)
+@@ -3039,12 +3040,12 @@ TEMPLATE_VBoxR0_TOOL                = GXX4MACHO
+ TEMPLATE_VBoxR0_DEFS               += $(VBOX_DARWIN_DEF_SDK_DEFS)
+ TEMPLATE_VBoxR0_CXXFLAGS            = $(VBOX_DARWIN_DEF_SDK_CXXFLAGS) -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) \
+ 	-fno-common -msoft-float -static -fno-rtti -fno-exceptions $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing \
+-	-mno-sse -mno-mmx -mno-sse2 -mno-3dnow $(VBOX_GCC_fno-stack-protector)
+	-mno-sse -mno-mmx -mno-sse2 -mno-3dnow $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie)
+ TEMPLATE_VBoxR0_CXXFLAGS.amd64      = -m64 -mno-red-zone -mno-sse3 -mno-sse4 -mno-sse4.1 -mno-sse4.2  -mno-sse4a -fno-unwind-tables
+ TEMPLATE_VBoxR0_CXXFLAGS.x86        = -m32
+ TEMPLATE_VBoxR0_CFLAGS              = $(VBOX_DARWIN_DEF_SDK_CFLAGS)   -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC_Wno-variadic-macros) \
+ 	-fno-common -msoft-float -static -fno-exceptions $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing \
+-	-mno-sse -mno-mmx -mno-sse2 -mno-3dnow $(VBOX_GCC_fno-stack-protector)
+	-mno-sse -mno-mmx -mno-sse2 -mno-3dnow $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie)
+ TEMPLATE_VBoxR0_CFLAGS.amd64        = -m64 -mno-red-zone -mno-sse3 -mno-sse4 -mno-sse4.1 -mno-sse4.2  -mno-sse4a -fno-unwind-tables
+ TEMPLATE_VBoxR0_CFLAGS.x86          = -m32
+ TEMPLATE_VBoxR0_LDFLAGS             = $(VBOX_DARWIN_DEF_SDK_LDFLAGS) -nostdlib
+@@ -3114,7 +3115,7 @@ TEMPLATE_VBOXR0DRV_DEFS               += __KERNEL_
+ TEMPLATE_VBOXR0DRV_INCS                = $(VBOX_LINUX_INCS)
+ TEMPLATE_VBOXR0DRV_CFLAGS              = -nostdinc -iwithprefix include $(VBOX_LINUX_INCLUDE) \
+ 	$(VBOX_GCC_WARN) -Wstrict-prototypes $(VBOX_GCC_Wno-pointer-sign) -Wno-sign-compare $(VBOX_GCC_fdiagnostics-show-option) \
+-	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
+	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
+ 	-fno-strict-aliasing -fno-common -Werror-implicit-function-declaration
+ TEMPLATE_VBOXR0DRV_CFLAGS.x86          = -mpreferred-stack-boundary=2 -msoft-float
+ TEMPLATE_VBOXR0DRV_CFLAGS.amd64        = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow \
+@@ -3242,7 +3243,7 @@ TEMPLATE_VBOXR0DRV_CFLAGS              =  \
+ 	-Wstrict-prototypes -Wmissing-prototypes -Wstrict-prototypes \
+ 	-Wimplicit-function-declaration -Werror-implicit-function-declaration \
+ 	-O2 -fformat-extensions -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \
+-	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
+	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
+ 	-nostdinc -std=c99
+ TEMPLATE_VBOXR0DRV_CFLAGS.x86          = -m32 -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2
+ TEMPLATE_VBOXR0DRV_CFLAGS.amd64        = -m64 --param inline-unit-growth=100 --param large-function-growth=1000 \
+@@ -3251,7 +3252,7 @@ TEMPLATE_VBOXR0DRV_CFLAGS.amd64        = -m64 --pa
+ TEMPLATE_VBOXR0DRV_CXXFLAGS            = -fno-exceptions -fno-rtti \
+ 	$(VBOX_GCC_WARN) -Wpointer-arith -Winline \
+ 	-O2 -fno-format-extensions -fno-strict-aliasing -fno-common -finline-limit=8000 \
+-	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
+	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
+ 	-nostdinc
+ TEMPLATE_VBOXR0DRV_CXXFLAGS.x86        = $(TEMPLATE_VBOXR0DRV_CFLAGS.x86)
+ TEMPLATE_VBOXR0DRV_CXXFLAGS.amd64      = $(TEMPLATE_VBOXR0DRV_CFLAGS.amd64)
+@@ -3827,8 +3828,8 @@ else
+  TEMPLATE_VBOXNOCRTGCC_TOOL             = $(VBOX_GCC_TOOL)
+  TEMPLATE_VBOXNOCRTGCC_ASTOOL           = $(VBOX_ASTOOL)
+  TEMPLATE_VBOXNOCRTGCC_ASFLAGS          = $(VBOX_ASFLAGS)
+- TEMPLATE_VBOXNOCRTGCC_CFLAGS          += $(VBOX_GCC_fno-stack-protector)
+- TEMPLATE_VBOXNOCRTGCC_CXXFLAGS        += $(VBOX_GCC_fno-stack-protector)
+ TEMPLATE_VBOXNOCRTGCC_CFLAGS          += $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie)
+ TEMPLATE_VBOXNOCRTGCC_CXXFLAGS        += $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie)
+  ifeq ($(KBUILD_TARGET_ARCH),amd64)
+   # in 64-bit mode we'll build a sys-module (VBoxREM2).
+   if1of ($(KBUILD_TARGET), darwin solaris)
+@@ -4643,7 +4644,7 @@ TEMPLATE_VBOXLNXHOSTR3EXE_ASTOOL            = YASM
+ TEMPLATE_VBOXLNXHOSTR3EXE_ASFLAGS           = $(VBOX_ASFLAGS)
+ TEMPLATE_VBOXLNXHOSTR3EXE_DLLSUFF           = .so
+ TEMPLATE_VBOXLNXHOSTR3EXE_DEFS              = IN_RING3 $(ARCH_BITS_DEFS)
+-TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS          = -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_fno-stack-protector)
+TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS          = -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie)
+ TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.debug    = -fno-inline
+ TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.release  = -O2 -fno-omit-frame-pointer -fno-strict-aliasing
+ TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.profile  = $(TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.release)
+@@ -4652,7 +4653,7 @@ TEMPLATE_VBOXLNXHOSTR3EXE_CFLAGS.release    = $(TE
+ TEMPLATE_VBOXLNXHOSTR3EXE_CFLAGS.debug      = $(TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.debug)
+ TEMPLATE_VBOXLNXHOSTR3EXE_CFLAGS.profile    = $(TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.profile)
+ TEMPLATE_VBOXLNXHOSTR3EXE_CFLAGS.kprofile   = $(TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.kprofile)
+-TEMPLATE_VBOXLNXHOSTR3EXE_CFLAGS            = -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC_fno-stack-protector)
+TEMPLATE_VBOXLNXHOSTR3EXE_CFLAGS            = -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie)
+ TEMPLATE_VBOXLNXHOSTR3EXE_LIBS              = pthread m rt dl
+ 
+ TEMPLATE_VBOXLNXHOSTR3LIB                   = Template for linux host libraries.
+@@ -4836,8 +4837,8 @@ if1of ($(KBUILD_TARGET), dragonfly freebsd linux n
+  TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.x86     = -m elf_i386
+  TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.amd64   = -m elf_x86_64
+ endif
+-TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS  = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS)   -fno-merge-constants -std=c99 $(VBOX_GCC_fno-stack-protector) -ffreestanding
+-TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS= $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS) -fno-merge-constants $(VBOX_GCC_fno-stack-protector) -ffreestanding
+TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS  = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS)   -fno-merge-constants -std=c99 $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) -ffreestanding
+TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS= $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS) -fno-merge-constants $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) -ffreestanding
+ TEMPLATE_VBOXGUESTR3XF86MOD_SYSSUFF = .o
+ TEMPLATE_VBOXGUESTR3XF86MOD_LIBS  = \
+ 	$(VBOX_LIB_VBGL_R3_XFREE86)
--- a/app-emulation/virtualbox/virtualbox-4.1.20-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.1.20-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.20-r1.ebuild,v 1.3 2012/09/05 09:16:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.0.ebuild,v 1.2 2012/09/14 04:16:41 polynomial-c Exp $

 EAPI=4

@ -11,8 +11,10 @@ if [[ ${PV} == "9999" ]] ; then
 	ESVN_REPO_URI="http://www.virtualbox.org/svn/vbox/trunk"
 	inherit linux-mod subversion
 else
-	MY_P=VirtualBox-${PV}
-	SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
+	MY_PV="${PV/beta/BETA}"
+	MY_PV="${MY_PV/rc/RC}"
+	MY_P=VirtualBox-${MY_PV}
+	SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
 	S="${WORKDIR}/${MY_P}"
 fi

@ -50,7 +52,7 @@ RDEPEND="!app-emulation/virtualbox-bin
 	vnc? ( >=net-libs/libvncserver-0.9.9 )
 	java? ( || ( virtual/jre:1.7 virtual/jre:1.6 ) )"
 DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.999
+	>=dev-util/kbuild-0.1.9998_pre20120806
 	>=dev-lang/yasm-0.6.2
 	sys-devel/bin86
 	sys-devel/dev86
@ -176,7 +178,7 @@ src_prepare() {

 	# Fix compile error on hardened bug 339914 (disable PIE)
 	if gcc-specs-pie ; then
-		epatch "${FILESDIR}"/${PN}-4.1.20-nopie.patch
+		epatch "${FILESDIR}"/virtualbox-4.2.0-nopie.patch
 	fi
 }

@ -272,9 +274,6 @@ src_install() {
 	fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetAdpCtl
 	fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetDHCP

-	# VBoxSVC needs to be pax-marked (bug #403453)
-	pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxSVC || die
-
 	if ! use headless ; then
 		for each in VBox{SDL,Headless} ; do
 			doins $each || die
--- a/app-misc/mc/files/mc-4.8.5-Ticket-2881-fix-tabs.patch
+++ b/app-misc/mc/files/mc-4.8.5-Ticket-2881-fix-tabs.patch
@ -0,0 +1,39 @@
+https://www.midnight-commander.org/ticket/2881
+https://bugs.gentoo.org/show_bug.cgi?id=434688
+
+commit 28cd54da5a73e6d722bd0534e3f43baedb398cea
+Author: Andrew Borodin <aborodin@vmail.ru>
+Date:   Tue Sep 11 10:14:48 2012 +0400
+
+    Ticket #2881: (edit_move_forward3): fix two-columns extra offset of cursor
+    
+    ...after tab character.
+    
+    Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
+
+diff --git a/src/editor/edit.c b/src/editor/edit.c
+index bfda1b9..3dfd22e 100644
+--- a/src/editor/edit.c
+++ b/src/editor/edit.c
+@@ -3073,16 +3073,15 @@ edit_move_forward3 (WEdit * edit, off_t current, long cols, off_t upto)
+         c = convert_to_display_c (c);
+ #endif
+ 
+        if (c == '\n')
+            return (upto != 0 ? (off_t) col : p);
+         if (c == '\t')
+             col += TAB_SIZE - col % TAB_SIZE;
+-        else if (c == '\n')
+-            return (upto != 0 ? (off_t) col : p);
+-
+-        if ((c < 32 || c == 127) && (orig_c == c
+        else if ((c < 32 || c == 127) && (orig_c == c
+ #ifdef HAVE_CHARSET
+-                                     || (!mc_global.utf8_display && !edit->utf8)
+                                          || (!mc_global.utf8_display && !edit->utf8)
+ #endif
+-            ))
+                 ))
+             /* '\r' is shown as ^M, so we must advance 2 characters */
+             /* Caret notation for control characters */
+             col += 2;
--- a/app-misc/mc/mc-4.8.5-r1.ebuild
+++ b/app-misc/mc/mc-4.8.5-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.5.ebuild,v 1.1 2012/09/10 21:02:57 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.5-r1.ebuild,v 1.1 2012/09/14 05:12:42 slyfox Exp $

 EAPI=4

@ -43,6 +43,8 @@ DEPEND="${RDEPEND}

 src_prepare() {
 	[[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
+
+	epatch "${FILESDIR}"/${P}-Ticket-2881-fix-tabs.patch
 }

 S=${WORKDIR}/${MY_P}
--- a/app-misc/scrub/scrub-2.5.1.ebuild
+++ b/app-misc/scrub/scrub-2.5.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/scrub/scrub-2.5.1.ebuild,v 1.1 2012/06/12 15:22:23 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/scrub/scrub-2.5.1.ebuild,v 1.2 2012/09/13 11:28:09 ago Exp $

 EAPI="4"

@ -10,7 +10,7 @@ SRC_URI="http://diskscrub.googlecode.com/files/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="amd64 ~sparc ~x86"
 IUSE=""

 DEPEND=""
--- a/app-mobilephone/gnokii/files/gnokii-0.6.31-fix_xgnokii_inclusion.patch
+++ b/app-mobilephone/gnokii/files/gnokii-0.6.31-fix_xgnokii_inclusion.patch
@ -0,0 +1,11 @@
+--- configure.in.ori	2012-04-03 13:06:36.452630827 +0200
+++ configure.in	2012-04-03 13:07:19.139299726 +0200
+@@ -689,7 +689,7 @@
+    fi
+ fi
+ 
+-AM_CONDITIONAL(XGNOKII, test "x$_support" = "xyes")
+AM_CONDITIONAL(XGNOKII, test "x$x_support" = "xyes")
+ 
+ dnl ======================== Check for libsocket
+ AC_CHECK_LIB(socket, socket)
--- a/app-office/calligra-l10n/Manifest
+++ b/app-office/calligra-l10n/Manifest
@ -1,80 +1,53 @@
 DIST calligra-l10n-ca-2.4.3.tar.bz2 439602 SHA256 f3c7a9c1ff4f30bd811131a36b67eff58ccd5dedad5a5541eb2b4905570ecc47 SHA512 1072d69b11cc5d61bade0b8960f5c9a22bae925a3cbd211f8d1408e1738a6f5f949b37666e7cf2e3eac1fb7bdbd8415a3f03e276e8fe7f139491a3da849325ab WHIRLPOOL 451f3a7090dcc87dd538b01224bed6b67e8d63d6b27216ddcb1d4b0561e3beeef251e79fff15879f0c356b1d4ea9445e71934f7a27251effea8cc5ba8f6ad40d
-DIST calligra-l10n-ca-2.5.0.tar.bz2 437116 SHA256 22a9d20b5207e92d78c8f16b5b3506f3e62a42485a390908176335faf9c6ff7b SHA512 799147b00818122d3fc62057da9921c9e0981583d6589b7b7c6408b1b4204c9ae86f70c804967bfe076eaba005b21d2085f7581538b999f095a28291e3d226c9 WHIRLPOOL 3ed710b87588631ecfaef2e036484822dad2a2544aaa5a6b59f17ae2c549163c22d59b8a988467cfe93cf119a3b3365e32cd377b54a12c51aceda012ce5f3955
-DIST calligra-l10n-ca-2.5.1.tar.bz2 414291 SHA256 acf9d74f38c9048252039d5278021b49b8355b1471875e5de22106fe0719a7d4 SHA512 bf71bb8212e67cc26b09d908c49d3f8dc455b0704659b2e856004b19d560af1b1eeca5079fbebe2e8182ff1b91c43e7d29bf617eb02576f829acc5bdddd21f21 WHIRLPOOL 4fb4e67c0c2ae7d40d90316dc2a04f99c5cf44f77f9bf31cf154aaddfedd904e3e21664f04ac4a3036e2549365eba0e14cd1aaf676cff0b6ba196636958fe365
+DIST calligra-l10n-ca-2.5.2.tar.bz2 414124 SHA256 604b2954d739036b9c8bc851dbe465ae549939eae2edd4bee0e675a013c38172 SHA512 9b999bdaebeff84128539b3c499b12628d9eee9cffbca0280547d367d6e833912ff4bee115b368436d99a91e630e1c3b06d2341e0429a10099d8cd9bac417a76 WHIRLPOOL fe160c1c8b68dc387d696569b4c7d8affb5d28f66af70a43d5cf302f9f08ca4258b4af9f79fef92888b7b594b1db100dcaeed02d66acd5982f778e1ca7b777a2
 DIST calligra-l10n-ca@valencia-2.4.3.tar.bz2 271847 SHA256 0b6dc7b2596601bf902b20fac285e0c31f13ad2f5b8dd2e591d14ddde706f42b SHA512 edb3e087c00fc40e037a45c4d6e8c1f93ba4e3b1389af05595b794ba1e5b60d117ee1a2dab2f09a7d798fccd744f10e914d486936eeb485f60cf888f909140e7 WHIRLPOOL 35b2cc996719de65416e6e5f67a961bd6374178d5a427a9b6ed5872d7f6d5b241126522d69e3065d6ae23c54779031df7359ffe1983a5044641a73c728bdac1c
-DIST calligra-l10n-ca@valencia-2.5.0.tar.bz2 375407 SHA256 94e50336b99f86572cb006c59d113eabbb183a4a3e9012cf7bf0d9bd41269996 SHA512 2110ca41654527bf32d0ce8986b2e3a782903ae08c86b82401c806351525000f1ab4dc7ec79c538e6474584df4691666b215573c6a0f575adfa487919caa2ed8 WHIRLPOOL ea4346482a53964e9d8ea7643fe852bc2eab53a3cfb754248214c842462d66b02591073c9a8c5b51cef0859a3bf7475eb0291eec82ea6cedf88bb6748d635ddc
-DIST calligra-l10n-ca@valencia-2.5.1.tar.bz2 256443 SHA256 86538a621b4f2646771e926d1350662cb28a57e15a3aae61740e805e2f87b65d SHA512 9ae315e84e35a691a06e6ea555db7c3bdc71c1cccc846fc3d85e3c880a1cb128666888eaeae2c5e453d8adcd37683fb638697a77e55285b86c47e637a60bc29e WHIRLPOOL 8ad9381795d515bdbc9dc295cccea286448b33b172c1297b8281a1f6a53ca37a077bb95ed9c948a2dedae5397903afae63b62872962fff1aa31c851a439bcbbe
+DIST calligra-l10n-ca@valencia-2.5.2.tar.bz2 256139 SHA256 f803cc96ec0ec9ef7ebfb79fe1c4bdd5106ade7a6824540e370942a37064eb05 SHA512 23a3e55872a0cb0a074b76dd10c60d38f41dd72abe41d38ca80b85a411f5e92b96937eeb5a9604617b68005c59158778687d273e4d3291e5a9cca37a24ba6cc1 WHIRLPOOL e3a361d52de760dcdb0e3b86be6e2a737d1df484ab0c8e901bdb19eaf686d057f5a240a84b23d50cafb0329c5f648b31a38dae114752f90e66d0adcaba8e96b8
 DIST calligra-l10n-cs-2.4.3.tar.bz2 348554 SHA256 72f20e8e00bdeb8bea77cc521bb6145213c9ef836bb5cea31c5677bb6d8d30bc SHA512 caeb211b7b3fefafc3346fc6703db640f6955359d9fac3f150d8fdb9307fb3568e278efb2ca387cdff5c4f3e52bafb043ba7c96af12c9ee18893d59ea7ab5fc5 WHIRLPOOL 942872d561d855fb581680a37abb7c7d1118b3e8df440e77b2cc0cf7243bb6528ef8b47d0d2fb1429bc5e0d6e358e2c323fb9850d881c29685131fd36ba58f52
 DIST calligra-l10n-da-2.4.3.tar.bz2 547805 SHA256 188298db0e25636c9048b0bdc0715f018249bdb854f3e8a55efb0bb8d52bdfe1 SHA512 96df3d8127e50f8fd3e0c7a80934029a816a4cf6ded739399fe02a53cd85539deec187324eb01943c4a5f36669fe60044c351aef3e3dae8959fad4f7f00a2f06 WHIRLPOOL 1ab4ae90afa1a611bb4d886998fe91ccd57d49117115aa104b0d747b37a5fb6165ee5fb8425d3786a5a3baeb1ba0682c120ac1474cd1376e7cb89aa58541f2f0
-DIST calligra-l10n-da-2.5.0.tar.bz2 425111 SHA256 380b9cda832727648cd3b6f92958018854aca2b3ac16af24fd3bd48fd37f9b03 SHA512 b47a7fe424d0a049a139851fcb19f639066c7767905f299da19bf2a11cf062eb0b2b3a0af638eadd8b07da9c30f287e46c0aa6b5dcedc999942674df42e21085 WHIRLPOOL b59fb40c9d82d1c63d5c485d95aa708a2b7468e51b0f82a3a39dd350b75883a18aab29ae7114a0b4e925923fda5c02fa19ecf6955145d06c250b4d57dd93e63f
-DIST calligra-l10n-da-2.5.1.tar.bz2 402194 SHA256 9ed722d721a0fbcf66ccb92d36af907a6400398be52513660cb43a9ecc784238 SHA512 eb1f42e50b3ded771471d49934bb150edbfd1385b384babe43a7e81f020fae58d095da60dd6534d4834f44a52aee7f87c31b68002afbbae08d0294a30e9b084f WHIRLPOOL 5fdcee0b7255244ea5fbbd6bee4e1de5d24d6d9c8ab3195d70e244cbdd4588146f19e4347b66a043ae77300ba73a07b01ca48e6fbff40f34da80285ab850646e
+DIST calligra-l10n-da-2.5.2.tar.bz2 402118 SHA256 4f28a3b579964724958d274cc4bcdda630d5ab7a9d815e8f12aebf4e8f49de21 SHA512 1a130644095c49ce7f548b72af55a3b94886ce124ae651deeae382b861199adc565a30b395b9382e59b953614b88f113751257971c15224b0926fa3a5b00b6c1 WHIRLPOOL 8543436cec7f40fab17a8c01fa9d8cf3735661cd8806f4173a2d782068dfbb4ff39cc25a3f375163a7c7aa534be1a375f2dcc2e241df635110ed9113da5d3e84
 DIST calligra-l10n-de-2.4.3.tar.bz2 716257 SHA256 87b449b0f915708c7bba29f5a11ac27fac96d17f3ef9b7f5275867ade3c4d610 SHA512 6dd99fa3b90d080145d7ca6a21c6f7a013c745c74df3c679200fcf12aabd277ceeaf70957e9741a0c51d2f75e4a470ab8da203b01009af82e9d6387259020ee6 WHIRLPOOL 2ceb2b61e793b21e8d3f0eb49269d2281a25efb0a8e94dfec4e3db088cc50b0156ad96d97326c10963066b9a105bf30c9b0008cbd1640f503818327f68c0f34c
-DIST calligra-l10n-de-2.5.0.tar.bz2 706557 SHA256 e4b02140f78dd444aa3fd233a59c302f13140edd6b0a28be9efe913a8f74cb1b SHA512 0fec55b533e298db1a70bf12d36975e61eb067b3b2a4bf698314f956d30bdce9eb9e2a97982ae3e12242ae77920f0e52734c5bd1084cdd4489fb9c13531b284d WHIRLPOOL 09a22e2ebdc3568b324f47fd247d67089ee1293189bcf805ba5ef7bf7e8eb46de22d940f770deae140c825e3cdc7024f7f01388a195b71083b9648b7866ccff2
-DIST calligra-l10n-de-2.5.1.tar.bz2 684889 SHA256 8788800bea0ec078cd2414ecdec0b968ec7bdc416c2ed4d5c43b1191b2d267da SHA512 8aaf8b8df8a4a0f5cd18bb5d6a83d27fffdcb2b373909f3b311a53365f4a4103692dba59176230fa233e4b4b7f84dc3e2cadc17f163be8186013c3425bd9cacb WHIRLPOOL 12b8760ddec7b55533981855c6ec95a4ccb18b86c280a931bf5fe60f3bb18b191d9523b2010a1b6f04269f3ea1b4994b3129968daea2d6293d6228fca3f26833
+DIST calligra-l10n-de-2.5.2.tar.bz2 684546 SHA256 b449ee5c2f275f83c32901dcdc805979db467cda2ecc898e834e16f50f64b277 SHA512 d729bffe6dcb0974e388c169745ebf569ee8cbc584e98c0cfa85af4ecef88e5098096c700bec79f879c9b6f29bda2a87353f24afa92d6d7cd09787221c20fad0 WHIRLPOOL a2e8eb66efee93be045c6652fecd2f732d291add5426366e8503805d64357bba2b7ecc2689290300aa316f1a0144cb6036a32b6d322aee691b4d0090a9e2f721
 DIST calligra-l10n-el-2.4.3.tar.bz2 418000 SHA256 ca6499f079166536436031ac59bf9a448a519f479f63ada8ad4fc44de13fe506 SHA512 62228d59c07f59cd4fa6cf3bd239bb070f770981b6508f9562865d2216890791c1d63e360d337fddbaa7ca2d0b333cfe5a5cf6d91a0b8af8c1494427bb55200c WHIRLPOOL f72abe9660bdb2d523bd4c2b02bae0c132eddfadb53fe06990fbacdd13984f38f5087b87ed988a9519d04e765a60c7abfc50ae67c1f502841c01aa3262146928
-DIST calligra-l10n-el-2.5.0.tar.bz2 415848 SHA256 4917529774f64a6244840ead55272f98f0f01989e35de37d015cf6cee543bfe8 SHA512 393e2a4b389b2678b0acf7f01828954c3f824f6944963c5f1c2f69ec5d343387a583e96bab3ef247cfe7af52cb196369539f84e6171ad6fa674c66e3cb2a20af WHIRLPOOL bce408952d44054141a898126cc43f8dea884fb653293a7a6eaabfd7bf36550292bc47db309a3aef6cb1ebf57e185acee8cad735075871504ac85b0e75140877
-DIST calligra-l10n-el-2.5.1.tar.bz2 395253 SHA256 6148da9a95b31c73329e78b66f122e1741935884b788638dec55f548e931fb6a SHA512 b0a1d2372333565bb89255cfe54be5e9c03bd458ef99b1d5b149fc3cb663c25a9b9ecdc289467cefbbb4071a17f1a61517b5296ca06ad0883232b5eb81a00141 WHIRLPOOL 38bc763f839a899788aab2fb258787344e09e5b3e9d29cbc85ba88fbc5348e88dfc5807aa21440adf4f82530b52fb44be971f8de1503a22e377c5f19284219ee
+DIST calligra-l10n-el-2.5.2.tar.bz2 395021 SHA256 a40aa76d1e2b17a4caa5c7d915ffee30e0aa74d56c0b47f040daf5c134a3c057 SHA512 252c9b54ea89f087076c21c7f86dd4a39a27312cfbc1a4df6fc2e5fd210187517c1849a655527a6f93a5948e4aa0c35e0b86f7632a9f60ee89dda97491e434e7 WHIRLPOOL 5895c10a603954d14ffc4c11bafba6868465a1b6c22924fafb96a4a9f3751a9afb05b824fe76702f6b6d0fb60cce171a1a7a22d5e20577f5274a61d790eeb709
 DIST calligra-l10n-en_GB-2.4.3.tar.bz2 391605 SHA256 15d5fc33b8590ab07488c045ffd088f804e791e6fdab95bb9c0188175cfb152b SHA512 7011dc130508f150580eeb44a8da5e0cf6d70f1fdcee6fc99f4cc02922f69b124723c3a0559d4c7e14e1b42da3c34a32d325fa82464de1671addb82da85cbb0b WHIRLPOOL 2973fc96aaea8b575dba2f8acb0008e2d6e10d7e6a732a4de33e85b53ac03a5ec04d30f05e14e7b12ad87d6ddb8fb4337703ebde4d5728f03915469e0222ce05
-DIST calligra-l10n-en_GB-2.5.0.tar.bz2 389520 SHA256 f678832b936d37f3e39fc534c9566907cab128994ae027e6d426e7ae72f8490c SHA512 17cca879ccb8571693cd0e0f695fc1429de6d1d4689f41c7b454baf1b7de4119edad3cf87ed7e8d53ff1bbddc12707a10ac5553894f9fae81feaaf6d2908288c WHIRLPOOL 43de9ca40a46cf7340902eedd6b9bcf28240c127499d57e442e563ef52baacf18db3c62792d13d85c218a6e272cbe3c88f10d3e24ecc8297979613d1a0162888
-DIST calligra-l10n-en_GB-2.5.1.tar.bz2 368947 SHA256 90b4cbb03ee43b8eb9890c5123f5bf8a15f0d049d2ac2a6d74c6f92ac57f5ab3 SHA512 831da30e24ec663ac65d756b450d7426627da823f0ddd25f7759975acaa0e5d31653b101f6b46e8bca287b79cd3a39574dcc31b1dbf3b9aaf82440d25821dc24 WHIRLPOOL ac9545605203b72a3cad903dc0d0a51b17109c71178e688441f7513de85f38405fcdba865fd57b3247ee6ae8801961a7aaa4a9044403acab62d659497e2ab2f8
+DIST calligra-l10n-en_GB-2.5.2.tar.bz2 368868 SHA256 345191d943bdac242cbc3095a02649678a951c24924fe17037e065e3058c817a SHA512 8ba7c8dacc3853d89eb2261147f92a1d23f3ac27ef9c4e08e210faf2e9e2b97d9d01f5f3696e9dd603177dffe5a52292db0140ded49217abd0ed6e4f77d411dc WHIRLPOOL b97868cd828c7d34185a0ab5ed0900b0c19ff08a438d502850c6d5e1d1c35cf45f76690eeca102e0dda892707803b8dc04db84bef75827759f3c0bf44c4eaea0
 DIST calligra-l10n-es-2.4.3.tar.bz2 4378724 SHA256 6aba21eb1aa42781a1b511434f3c8e9d47d5e4d2f7f79a9a945b584986c3e647 SHA512 5431c06a3bfb85c6efb8eaaa1fadbcc4dd73b34eec1ed6e8382f413b2745ec7f5fe911d1e19dd68c78228efbbcf6395a5e3feb68f77dece9c975efd0331a1ff2 WHIRLPOOL 4f8ca937641274982010b47e4bb3c952acc2ffb6bea9d1056ab1b8371465a353ab21b3ecc0cf9bf9b5199556d61312531f73b62ef4a0e276334381657df0be48
-DIST calligra-l10n-es-2.5.0.tar.bz2 1051807 SHA256 101d8073fcb3d31bbf9839ffbac269d0c59af6f2867985c1945feb51e0aa14d0 SHA512 ab4328150fc132b0bfdd74b457984e15e56ade86c70976eb0ce3aa48e26143fe3ce5172ee4b970b306847948db6241b2e8415e25901beae5b069f0c4527536c0 WHIRLPOOL 10ae86abe576eb2c625b805d3d54e01cb064d35f18d53c05e2b38b9a6b865cedc9e5fab7c08fd6042ab901f5556e16815fadfc6c8c64b670f762eac22f9ba9a1
-DIST calligra-l10n-es-2.5.1.tar.bz2 1027627 SHA256 e22f29fe1649301fb64ba4ee3f99335b7ab0b3c42b938d36372decd6e31ec5ec SHA512 538a2d5825457b44eaf545c599bc3fe2d1267b281bc153c5f4df78abcaaac4aa98f600c5228bdd38837ef45d56a11c17e00ef0ee3ffaf11beaf0905f7d130001 WHIRLPOOL 7ca070be4c4bdfd0c145a0289b68af5249748751b45836eed60b8242082956ff8bf30a14d3c9b1e98906596cae34ace9d82cce7dbe16a29f680c34c754985e25
+DIST calligra-l10n-es-2.5.2.tar.bz2 1027738 SHA256 d31dc53fbe9abe5a42d9116b7b88d4a64db752d832daab57b88b8a722eb11d49 SHA512 1a12d74991e0061798f75d83a9644274618c56df8fc35b557b5c4830239226c4c18e8087cc94f693ffc33719bf29586159af151e0c1276e2d67137b315f3bd15 WHIRLPOOL 59509573f5c0902ae41a5bd2c4ddbdaec798acc60a2d23e844f2a6ec095027af8e168f73480c69870fe804491e1e0ba06698340f0f88e2161d402fef72f0e107
 DIST calligra-l10n-et-2.4.3.tar.bz2 686649 SHA256 0726db86adbfa1ecc12c48af329a739343fdcc7a42e56c1337402880bd98ab38 SHA512 26c77e702d5bbda16fd5af57f9d5bf6902607ddad3f7bd831d040ae0cdd0336654e6286aefa4d1894871c275a9f75ab669558d145f370e3e6e62c541dafed6c6 WHIRLPOOL 6394b74679d1d9e72908a426b765bf17f361f018d52271426cf9bafa33ea5d4e1b1ea066263ef1f6afd531faa6719a1a73412ca30b510e2f3fcf8507b3ac7e04
-DIST calligra-l10n-et-2.5.0.tar.bz2 781342 SHA256 fe60177b50e8e3df924da8e2647a3d2ab29eb910ca5d848ad4a59c42293bc598 SHA512 d97f54f13297e2e9440d8b6f31cb8d794e8b6dc6a7711a2f5cb1399ba98f8d1508164877c59da8e1ef28667eb7aafab1775d0d184bcbc21d4e9aea624b77b30e WHIRLPOOL 140fb48183a0f2929f2df5f7f3775fd41d65d1bcbec7abe2cd09b1de9de292e6945603d9e6544df8854468db082c2ea10299d20bab4c7bfa38d0d54da4934898
-DIST calligra-l10n-et-2.5.1.tar.bz2 758830 SHA256 c1365706105679cf06762fa2886dfd5007606714d24ac1db01be81bd6d6d04f9 SHA512 f6ddbb5d10fa44eeb084efd7babb864fe7ad3f5afdae8bebc19a3bf25165d247ed9275898898e5ab93eeb8a1de37fbe09453d06141e68add6f276d76be68c73e WHIRLPOOL d820adffb094d03c2c65afb4b6adb3e755e127ba90dd539f0a562a2dc52a505ce5959255431efd7325babd5752eb3ec89bdf398554ca436084f04e70a54f3e74
+DIST calligra-l10n-et-2.5.2.tar.bz2 758903 SHA256 7a61ccf808de0720e404a6f38fbb11d26c3ea23156a43509e39a55480c4811e8 SHA512 81a7ee38379b8727dddd7c34db59a503bc045373cccc3610e2549932b434e5e96857076c794c3a92c4ad8e72ff9409795a83b7496a2547e128078ade0be209f8 WHIRLPOOL a3932c4183b263a738e8310ef2e18fc49d3b9a50a37dc1c9e5bb42dd2cd839928a15381df4600b0ce897d596406f50a2fc84e37c59f8e588eaa687a0aedeb61c
 DIST calligra-l10n-fi-2.4.3.tar.bz2 404201 SHA256 3559a25320abc875b6167ec1dc5a11238dcd80321895be4594cdcb8da2b8c31d SHA512 c2cc5b449f2f712600cfecea9d390d762d8fabe64410937cabcc80fe2bd260bf7b79fd28b204fc7ad4f3f08f870b148df851d203e52edee6735287385e580fb2 WHIRLPOOL 13144f291719bd2038ed4981f4bc6add0583390cea4ccba981a17d9a39f1d76102bb6826f2822023204fb95b2a0211e0b7b79d2a1dee21f084c4aab39dd11a4f
-DIST calligra-l10n-fi-2.5.0.tar.bz2 402903 SHA256 ec35a4960961437c76cea0a9e236517ee8eeee86b6c5996532c5b91444f6e163 SHA512 c4fc33262b2c2242c317fcb86da496190e25a52fb253eb52c9a6f9b75d245cd89ea57b36138270bfeac3d815070c2107946a284cb41a88386be32d9af0504f55 WHIRLPOOL 89cf6e6b73597b0ec35b1f3bab411d8e7d7923b5ca4828f24929a6a426c3aca32c17af0386f7c87be5d9ed9150be6231d44ae66842c7908f4c482135878cad29
-DIST calligra-l10n-fi-2.5.1.tar.bz2 383601 SHA256 fc4c633bc00a8fe0bc6317101b8557c561acd55ee2ae89a3f3c4b779d5157fbc SHA512 c8a1e35362135b42df5a08ffc98d7b98c3cb5cf0106b1cd5d003382ff08c15db0daad7e9adfb720791a6165626f935e1f7a27fe33605b5fbc476abf7fd33658d WHIRLPOOL 077a86de53e88f0882b0ec3f75304562462527b5b493d1b0063de1dc0036d8ac00fbdbd74e3f78dc245c2e113f0d83ab3a659ddcbfc8cafd44adb549ed219ff6
+DIST calligra-l10n-fi-2.5.2.tar.bz2 383058 SHA256 d877147ba3b99cc92baf8959b080f7a4d11015ffa325ceba3b11b73164238837 SHA512 9c5fd8375d7137aaba2e888bb4d28965524b592dbf7b85c113b6e700dd9d92cda6cb1ebc90ece2b0515d3bdc1a7baf0ef59ada96da485ca04aef8d3de63e6dce WHIRLPOOL 62734e9ed8ec193723e8151179651f6cd5fb171cee3407794564db33a3c626da0e74ef6945d4af3c47e052d80cbfc2837027c9e720903b0fbde44da4bdfc1380
 DIST calligra-l10n-fr-2.4.3.tar.bz2 5611729 SHA256 e4ccfd78d558669d1707d6e475653d243cf24d0c44fb54c944f8c34fdc297006 SHA512 e869769d6f0a7efb1428a2e967ee7a89b132976c1fb338690d4f8115999a9e9a9dc54664f8ac8933b80f60a057e707b2955c39a330537d1119a690609c42cf23 WHIRLPOOL 81e7bfd275371fd205dcc4d3deb9ced31adf4e0a367e234311c6a061364b372f671775dac4d47ec9c03f1b0ad0d89ada6b5f241bd1d287c1ff3a7a3213389942
-DIST calligra-l10n-fr-2.5.0.tar.bz2 3953906 SHA256 baf547ca95bd9f4677288c725dd2e9c1b98cefbcda038ccc42744170278ad3ef SHA512 174cc60dee9bbd1c6e29d4bf39354a702c3f15382291100f0da3cab1b2d3b56985d609a25e30394bd937647b15f55f28e95743f7b50733e13d4f46ef0475492c WHIRLPOOL a6d75ca972a7d16b9ca1a6a71872c5ff380e8a15ea4b0c7cff1f1b02c54e57392a429aede16ce59e3b66f15007c2171ec96241ec628477718020a2e2ed91d8e5
-DIST calligra-l10n-fr-2.5.1.tar.bz2 3930917 SHA256 06d30dd6659a9474a4a804374ec57e7ff17c59c3b43eab71f16893ccb3f25d48 SHA512 b4d491acdb30c86a9f39b1d3be1181368707af56133b5d388faecca2610b1a05cf2692636c7478ce9809d725e9f5b855eedb522a3933676685902f3a932ffc38 WHIRLPOOL 04ec00cf0acc65e5ca9b836c704733855ca99f1a1d1d7657b7c521c7ffaf910735f9d836a30885020f995739762c428f7ae3472911d07464f0874cbbc18f9b07
-DIST calligra-l10n-gl-2.5.0.tar.bz2 388832 SHA256 539a694bd8a1acf39ce4a80a17c4f07bffb14d1dfe25c9125039daff8d1d1960 SHA512 89322cdf0e00553b338cc9fa6532fee6194409ffe1fe7140a3aa470519ccbd3dc203cb80532db7cfa841c998286554506526d5dde08ca57060d1706028b60528 WHIRLPOOL f73c6720151f059e6c37949ef46319f76a7c3244eb8312ef4cc1895249a07d3278bbb77bd88c10f87f2fbe2c232ab260d613d7a501717c82ec4be75a2889d141
-DIST calligra-l10n-gl-2.5.1.tar.bz2 372369 SHA256 54ff01837b1013722117949325520c9ca2e08d9a99f311a9e1ee5f04927a8e8a SHA512 bcb05332e214267199029d750cc5d05f44821fd3ab49af0e82ddcd29a765bf2fc89394fe72fb78c3245dcd5e31900fd1111563912e34ac1b9ab1411ae0a5dd6e WHIRLPOOL 65e6281a3e11e267e9e686bcdce19be783d958f65db1da7430bb77d487fb72dc809168b3767e00b37e5ced97fb1560fc37eec4c949a55ec64f695b9aa928c963
+DIST calligra-l10n-fr-2.5.2.tar.bz2 3930088 SHA256 9aba2a8a9029233812c6faf5f342ee8b36f3a9a2bbd3f7a602ac81796c164022 SHA512 8753c5dcc7fe2697961bc47ad1e3249b153011e4aa29d3dcd54963454ab4d6d3d2ecba97e85519862ab476e04577cead25f28f0978461519704e7eabfa1a97b3 WHIRLPOOL 43dd3477035f15c51ae00251b730821421e7632eaf94b7942eedc3827bd650e41cb423be06470215970edacd44a22617fc493a55db89c168f3d616bdf8b978d3
+DIST calligra-l10n-gl-2.5.2.tar.bz2 372347 SHA256 a035e6beaaa4e551dd2909cfc6fb506c120cee3684c7a683219c45f2a397bcfc SHA512 23ae25fc3e678cd1fe16d3adcc19ffd2041438579084c6c8eafd043e25821b5edf774e9d717c55683ae30ffac8f8d83ec67d260f23628898ebe709cf2628a412 WHIRLPOOL 2ae6e0a48aaba1423db5302467bc61f645fc9f652a6e08ba020c5e4bd88b9b6fec706d627ce00f9cbd57e9a2b02220f5d0026badad6528a5c12cf16a61c4a254
 DIST calligra-l10n-hu-2.4.3.tar.bz2 449165 SHA256 420a79e03151572153d091a1b8e24c8296dcd0bfb93cf40bdd76a966c054e3f7 SHA512 192b98b8f4a0ee92bd8551000d446d8a60230767a128ea16f971702d376e5c4a78b6cfb139aecc806445236dd52c4296aa7524a47ef327b0eb2060521e040184 WHIRLPOOL b844d6e60550939011ae17db1859d6cd6faf7d92a615166fa9c0b39e523e030550f2d6efbd0fba83ae6a2e95bfb61fbb2c589c10a6e7495a6c65d14d4de35c0a
-DIST calligra-l10n-hu-2.5.0.tar.bz2 440930 SHA256 e936fc991727b1a1b5163db4117a3fcf9f201f1f57be9d7fc35fd61c00b2ed2f SHA512 cc04b9c8c4ae7c1f4ef8895d3428ae1f36ddb083c71a8acc860bebb4208ac7b9f66d3b9754619295e4621c2024fcd3cad2dc3fa8c21e9d7f70668e5bf921cc61 WHIRLPOOL e248ca47d87dcc326b5b8af00ddd204d3d4d7f5e0b78a54f02201c52536d97e0ff0e4d3d7bf8f7ca63d96e53bae0690ad4a68af38e81a41fea61834fe31e818f
-DIST calligra-l10n-hu-2.5.1.tar.bz2 413770 SHA256 8fe50e77b6e08da58f2bf7155530bbfcc00c53066ed10fe2745f951a70a51abe SHA512 e6ec3cb74b2fd1432c6f85a3ff418594bd18adfabbe761f42c83f00b91a7669ae83e78d011bb4fb8ff2d5f171d5cee4fc516c144896d99b607b2a38a2a4cae2b WHIRLPOOL e4ffbca24ae7b1f0352b541c2c7efdc07486d14d2cd86fa22ebefdb3fa17407f418c2aba1ff26a742c3aa240d5a46474ab051ae4791b4b6f1c14b2adde3ea58d
+DIST calligra-l10n-hu-2.5.2.tar.bz2 413637 SHA256 5f0d1bb596ecec8e0774f25af5ea7e23d91de441105f348f428d18df3baea3cf SHA512 a179bcef68a60ca0646968396afe4ab1be4fbb86befb693c344e7a6c99de17fc6c40d0bde2e200bd81287b02449b29fc4bfca10c3bb07fb400698389c040d197 WHIRLPOOL f6e8de4ae344dbdbaafc45021059fd5267c797264ee64442dcece03e40b6eabd7b48ccf61730462b1ef67ae83deafb7bf6bf4ac490a487f7e6963532cc19d47a
 DIST calligra-l10n-it-2.4.3.tar.bz2 626627 SHA256 db96bd2aa09fab0533439bbabd7de8467237fb67f42d4d8a5bbb4b6e68dc383c SHA512 fe4fe1708ca7303763242e2ed2977e0f2b4d6ce75a0b6bda2837ff134c6fc47e6a1f91d40e5da6d0a716210cda238e4bee90db122a6c4931102bee4fff47aee1 WHIRLPOOL b795563027eb8f51b5917938a1bdeb7fe031f57f6cf4fe628f06374d2ef045a0a60c2857e37a6cd480872ab46a3bf1b2909a0deb529030e2ae333627d082a2e0
-DIST calligra-l10n-it-2.5.0.tar.bz2 623056 SHA256 342f93a92a9e56933c8d68f4aad75ec34f46fe42fbeea0149231af2bfd079059 SHA512 82e1d13c0d9de2e261afcb02d312e144fa3f0bb753289d4dc75ef936d030bc443c18a70bbab82e99c395519641c1bbd97b8284a5f378aba60e4a261433f3edaf WHIRLPOOL 3c74fe1141b560e2eec2a3ea02d4d39244ea0d3727fee5acb4a8b6b1722b30d4484acfc388cd9e08cf7da7756a67c693a8930f716fe1969b059fff68feaf3bfb
-DIST calligra-l10n-it-2.5.1.tar.bz2 602084 SHA256 c2fa62a0480a20733e6032f3225967261dd3ee0339c704dff2642361220041b1 SHA512 5c0c237cf8b99541bca032cc1508e140819e3ecd80a284fb98b104373b7b34c82734ecb8369da430d8e3764a6467b3946afaecb180d7d35a3ee5e98c826b0bfc WHIRLPOOL c88e479ee63db5c06700a8c73ded46ffdced251d947e2ce295274482bcffa2982c4e6b86992e7c2a3e8f3b3de81279d8bdf892bb6440b9b15530964980d07102
-DIST calligra-l10n-ja-2.5.0.tar.bz2 327098 SHA256 84b9aaca03feec36e7ff26422b947b706c6e4510706fc96c40b40746e5078891 SHA512 110507f73d97350be178d47407985289f5b6e2cd1b114aebf3e4c9e74c7ba83e7d6221e1e75599256c40857de170c761f9d0ac6d6c48437b3d0e47b1abdf7cca WHIRLPOOL c4e2d948fcb84da3ac6df8c8feae862ac930adfee94cf26e19ec94cf851a8cb67a0240aaa42889313db321e49f053bfe1a497dd11587bf2dbb9a5eaf16efc97e
-DIST calligra-l10n-ja-2.5.1.tar.bz2 309438 SHA256 611ab9c231921b0b5ca19b568ae1358d75a758915fe2f4ae23e10e77c3bb0852 SHA512 39a774f762b1344792e244ebc69a310a77bddeb031baa9ad0f9a884f3721cda72ae5efe4ee5c97d784430d430693497339b4399c5ca1c196cb281891192b94ac WHIRLPOOL 799faff6e1ce7a335e187cbe7fdd9d2685a0e0aeb7b243636c968a2ddc8c15c7ab910bf477002d9fe1adee401870d29947aede66976abbf8bf40e02c1c74987f
+DIST calligra-l10n-it-2.5.2.tar.bz2 602221 SHA256 c906326d8f2c9e006bd7974ea66b24c575ed5521c5ba6c3246c1f4a5f388be86 SHA512 d747d9dcbc2d9b8a0badbd0c7c2728d6300b07a037cf73d318a475decfba8265a66937bfee1e84e8afd3c093d9e8bee241c1ee17759614892e23d567a511b503 WHIRLPOOL 0a2f03f28e288a884ada3ade94366d86f05c445580def8ad633147a4ac419e3fb66ffd0561bd961837632930412b36ca8dd5ce06c73d9e15dcb862e61a256bdc
+DIST calligra-l10n-ja-2.5.2.tar.bz2 309399 SHA256 793b22b26a86f3931644bc0fe87b4c8089fb3b549af07c30a9df5ec70ddbb193 SHA512 df132643c1e0267de2fb27fd047c5ea7364a9f1a4bd6e37e24de874213522ac6c21e70ada9614ec9893df51e1d37a12b95648372a9ce5d15179efaaa55684ba9 WHIRLPOOL 9ea76ed99a63599d7b2884f45406e4f3c718eff94083cdc19daff73135d2932d3a753f867bb7ecf927c2b2a6bcaaaeec35683eebe68a051407d14a7f9e8f6036
 DIST calligra-l10n-kk-2.4.3.tar.bz2 405473 SHA256 5585788422ea823d8c1daa399bbf8ca9aa7a9b5c0e33b343cbfce6ef1c1170fa SHA512 e240d7c293ca710e218532d5f5ee4845a7f9e082c71b42d39b74b93f0b129ac6de3fadc4e1a2dc51b734d67aee864f33480dd1600a2c785a6ebc2ae11903d8dc WHIRLPOOL dc8da57ca4aca4b7f25af62700562758468ee4f0027eb3b2db5fa180cb8fb0f2f9be5ced45fb56ebcd33f0e884de870344c35eed95bdb8a933af3a486a33feed
-DIST calligra-l10n-kk-2.5.0.tar.bz2 403958 SHA256 a83c81979ed8c8bc998664ff6bdabf87bfe21ac6873debe58625cd300bd367c7 SHA512 19de9b399633566bbaedb268290fdf8fbcec49384a2f8cf422c315a8b474e3792f3a8f8d338afb839a3baaa9165b80ccf11bf3ce6d3e3da04a6b1babb5cbe999 WHIRLPOOL 33af36d2b3ccca199f708685f6d01062e30e6b524571412b4aa46d0684e417a4e5b9d287c458660fcb21b8f1d3be4dfecf043229e2300c55b321526625231df9
-DIST calligra-l10n-kk-2.5.1.tar.bz2 380766 SHA256 e57d0ea51d19bfbbe6339dc0652bfb2c6aef0c4256dfa4b3974ad2662029002c SHA512 bc0a960f91a55a82c52055b02cb35c1a46cd7b223540bdb64f31127f74772a787ce1e81a1708e86853878b7596c67cd77c1a4796cab3bc48de54956df4338344 WHIRLPOOL 2e8276101d5cba31e7fdb7e7c21e32db4d7e17bae264dd7732b73b4e900229c3d8770e658324dfbbc7c1f2f9945d8f7d8a3ab7b24693fa2009108b834e3ffe67
+DIST calligra-l10n-kk-2.5.2.tar.bz2 380608 SHA256 536a4c9ab9c77209662b80f9d62845b411af17a7c30e481a1e528f83e679e5fe SHA512 9334dacd3d8b31784d11909453b187f4c649c8792e8d6c777edef2b17f854fce4f7b08ab83978df818df40ab15698cf1b7507a9d7f84bc71df139313e5d0007b WHIRLPOOL e91511edff5cf20fadf688fa0b02f1ca04334fe09eb0119e533badc2b652753f3a578b4bd74727c7d175379931b72fb7757c0da372ceb9e56fa3654e866d88be
 DIST calligra-l10n-nb-2.4.3.tar.bz2 367058 SHA256 8923d881b68b955f881fbd39232a8f8c7c25387d35b6ec26eecb2f6790e50931 SHA512 acd63051ee76d8a0ffb26432010475c9aaa2d9bdaaa2df8a84cb6c00f286135fa7582b30e5ea0a3793a8575525e29f9d44d228030280c346977736eee23922e6 WHIRLPOOL 655930e9458e4a6f8c68839b45e93d0ab77e61efbe40f5997b085c84506590e7183fb95ac8dcfd0963c0a23dfa221bfa2dee7cef7aeaf16d67fd73bad2284497
-DIST calligra-l10n-nb-2.5.0.tar.bz2 357515 SHA256 83cb4d1c20a75c457b6ec0aaa453081dcb478adb71386d445d582dac66589a2c SHA512 10528446a5b2fffc1e1b9e1539945836a3feec2fa604646c29228aaccb05da41a5ecea0c3fcff2f820799fc2b098c0bc01741fce11a5a94a47a592d031f36010 WHIRLPOOL dd0948b11bf5e82f6fe3b55ae91354b7359f6d5a5da21b696be1359f447bf0d1447ec3067733ba603a0e90735d9f3671983f3330c04f13fa275b1bcdc156de5b
-DIST calligra-l10n-nb-2.5.1.tar.bz2 336564 SHA256 44e53b459d1f5f903a43fef27bb39a3ee73f431c87d9b1a76fe9865ca5cc38b5 SHA512 bef78a72a22f27a0672c1ad23db70ed76b87116d611fe3f82d7b94bc67a2d08237ba0c09c9e01cb73a9d9f6a0c21d8d61a38e66f1ba6825df5860a80f7ab596e WHIRLPOOL 64585548352825c8919bc35430e1bc73a9dbb3300dc417cc380bb3bd6e8ad12d7dea0e77dceabf5985007c30704b13b959c6e1672728fe47edc0742abbfc8f85
+DIST calligra-l10n-nb-2.5.2.tar.bz2 336667 SHA256 884adca9caed3ee29d5b0551b598ba80e5909bae82b1441834348eaf17b2415f SHA512 2d94579907470ccfbc031f60b5f50055a495244773394080b7f871fa56710ae8cc773fb0d766a89467aea49a95cbba23ad5461ecb57d51f32626a254924373b5 WHIRLPOOL f387e0f611000e9061d50d043e154494d0f5c7fb2a19a1d4ae417e7097ae80af2e7ae9573b9e6829cb81454e40f9a71975b40031c990719dd84724003bd9ffdd
 DIST calligra-l10n-nds-2.4.3.tar.bz2 413759 SHA256 c9dc91854284c8ba9246c737cc89269b4e1bb7d532e649ef1da05600b4858e7f SHA512 d8a70f7d16a08c3473fc0504af28d8dec9fa4f9ba603f8054199daddad54d2a2ef00182997c3c7b82ddb7093c48e6d825a0dff04058e3d7b77851b0b901e3bd3 WHIRLPOOL 7d6673b11ac7d88f6d18c1c79638d389da2f672249a52ba3e8d1df3831eed200b2543f7aede123783c2e3f5e3d76f3af7596819db524fafbf5ff9efa7c2f3f84
-DIST calligra-l10n-nds-2.5.0.tar.bz2 411242 SHA256 f670de8b62c9730cfffb8b57771ba8eeca6871bbc8620c9b759cb7c070fe653c SHA512 6d03fac5bee23a1537b491e548099b3bfad23239df42c6159ab05a7558c6b8606c1d7fe21f5728887a81e82728f4b0cfd0c66248745b28cebf14880dbc349c20 WHIRLPOOL 31d16d7c39a87cf5bd30bb3714a95e3e4e956efb18f8e9d214b4ee9689f0572290c05ad5d58ddb4dfb757acfc672cd178e1b7ce8fecde050e06db0b837da6cd0
-DIST calligra-l10n-nds-2.5.1.tar.bz2 389712 SHA256 2d3ae9b7e2c20aa98ee4fd78abf087ca057aa845ebcad232c299f357cd14a639 SHA512 fd95f106a3ee412880bddda5fc6ca20e17bbe9943a7f2dfdfe4b22a00bcc148627656a415033934ebd86731db7f5da34897ded2df8da98f1ac942f38f5ca5062 WHIRLPOOL a611927e87611dfabc977ec0e888dd234c946e49d70e97e75d550d5133186897ef572daeec0242b729ec9da6d6c25b147e7ee0298a27b3ed612988e68a7763ad
+DIST calligra-l10n-nds-2.5.2.tar.bz2 389820 SHA256 6d156f8289c5c40cc200a6724f02ff52595c763f5a52f6145779acdd9f32d658 SHA512 bf4168f0916ad2d105ac9db2ed605e8b40e7ee3de71d823bfb69e11f908a9003dd58fa3913bf108723888ee5e5380d0f3c36f4a6db2367258c7817c7d0c46240 WHIRLPOOL 66d195ae5599d815b9f6e94e52cc87171654abb392c610a6dfbc985008fe21efd9bf5ebe4165ebe88dc0ba67dbe951c8ac05c28fc5518cef2908be75d4133ba6
 DIST calligra-l10n-nl-2.4.3.tar.bz2 3101190 SHA256 b615b0313a1fdb60c3021ecb6d4cde2b9f7d8bf620c80d2b32bcb4e300de629d SHA512 ff623aa61642fea4757495769f0bed48657f65202e9fd47f0ce8a94abf45568a3ce91243267a34509441698a2392abe14551a67e3c5f3522d05bc0573faa4115 WHIRLPOOL e8be12f6974585da278055450f37794152166aa47a29ece0b81c39c96af2c0a3101ef48393649698720ce54fe2de34143f78c0763d79eec83247cce04ebf0713
-DIST calligra-l10n-nl-2.5.0.tar.bz2 2585535 SHA256 55aeb66e5156ef1dcdb508b4367d4d1cd7c87ba8a0a3bf87ad28b2363e074dcb SHA512 51b2d4ad9daf01623106a1d0d050b7b7cc4f0dfdfebf5cb614a60ec13b36861b846e86d83e2fa32d95ef27f2d1f849f1e94bcf629046e0be3f7dc6ba5708f890 WHIRLPOOL 965331f4b410db4c825663685590ac40cc13e96e2cf5a4f6b5529172bda3ec162cd399837dbdc9cfcf5a3ea92e69e790fe95522131c78087a94ca1eb909568f3
-DIST calligra-l10n-nl-2.5.1.tar.bz2 2547422 SHA256 198d697f2d90f726a4670245f46012d8daa2ea8af3f5221b5e197377d7d55f3d SHA512 53e0e51731746eced68347d098755affb8903b0ae5c807553ead86a1303f01e1785861e4533208ed1d4730f4c827fad057821acdcc5d543d59f7a4384a53efad WHIRLPOOL dd243289511471e406a4e788afab209222f36935517902d0005d189cca5e8c725245d37d82b303ec56067aef8cbf7b07487a3ba417127c3160da0a873cc8cd5e
+DIST calligra-l10n-nl-2.5.2.tar.bz2 2547955 SHA256 c1733c5468dec6a75403d60141704f9594656140ba2a0c7957a5f77f4a558a9e SHA512 216cf88700e2b66f343a1e47dfcab63929ae8c88ce2fce2d77984a0cdecf7fb71b06bbc48e253a4c051cd64cb8c6ebeede936d70e6118a954e87c6fe20a6629b WHIRLPOOL 59a8d96f82792ee98b7d646708f478a150d1733373ae1dcd43804af846f7872bfd7cb58446eb2a0cf0f6ac1ac8983f8fd02b5b7e4691b2a09a0d892f91ba209b
 DIST calligra-l10n-pl-2.4.3.tar.bz2 430261 SHA256 c5705e69778738b525d9a14d816f44c5f15fa24ded33f53b42dfdf5487ec50e5 SHA512 91b75a40c590a754921f849016f8ce2f69faaba4a401565b619514246881a1e95103370825a9e9c30eced65160b8a81d71e1e62704c826424932b9adb1844dff WHIRLPOOL 6317a296b3c40abfddff3ae0bd570ef4e59a0ff7a9668e9ae681c1aa4b8f1c2eb4ebca7daac47fc3b7b2fa6118e692b10f2248c722acbafb2643691cc3d4164a
-DIST calligra-l10n-pl-2.5.0.tar.bz2 429060 SHA256 63b604bf1d8f9931fd6b388ecc62512233e765b05eb05f927a710eead2d9724a SHA512 34e16da82995ba671001de8ed5303a35d0806545eef4a92995b2060b3881d56d1a7e6883423dc5f9bdfdd9b0044f989d40df959186b4c7c953a5ea6c08526eeb WHIRLPOOL f01012cbc82a9cb39895ee77b8aeefdcc35c5f094fb2299ad55d7d894278fc42399b9611ad8ef58457b1b87a683cb64cee2bc50122d737eb9fb72cf263827e7f
-DIST calligra-l10n-pl-2.5.1.tar.bz2 407459 SHA256 0731bf0e19543cd5506252a4d4cd993a688cda0f718253976577291d1899d274 SHA512 8fb8bb589c1c4fa989e56d5a9bb1910101cdf92edc6673ea8baf19507d9ec965d500a04a82328d970825f59749d3177617451c44850d7c4070b72fe84c3fb07d WHIRLPOOL 33f5ca60142722a2a26c1beaf29a0790c3f3f561c73ea30ec3f7af9a153d74bf809d968e90264cd1bac5add22ce3cfd9609f664587e813baf6df839ad5ea2e1f
+DIST calligra-l10n-pl-2.5.2.tar.bz2 407137 SHA256 3dc622fedb8017cd251c5ec975e1539dad3145888040e409dc6e43a95ba78216 SHA512 742c04167cfab1886ef177c7a44ba05e2363cb37d48651778d0628d1bf92d32940aacd74e7ec58c6b6b5c811fbbd4763edd6f2318f39c45f297b5fc558c90017 WHIRLPOOL 5d7d09abe46459ddafb9b4b37df55a44c2f86510a85773441e14267fe03c1c1307f60e90120ad391321c842421e60b2e5bb9f358982b4a3190e95711b41b40b1
 DIST calligra-l10n-pt-2.4.3.tar.bz2 661455 SHA256 135754edb457f99c288733616e8aac9c3275c3c151e6934f0df098e49e4744b6 SHA512 ccb8d2f7e13426f81abe8b53d3f1ff4f8c3820823ca21b39b44f8778ccabbeecb7ed7c14a1b95f7e56980ed1ce0f55df46ea89db7162ecfd5ef4c7f965dd3bba WHIRLPOOL 2add787cae8deaa0a7cd6f82e026c29bef82f82bcca9834d5d61b13397e79e1d05296cb0c5fba720192410a5b82046a85483afd4ecfa2e4496a2548d57066d04
-DIST calligra-l10n-pt-2.5.0.tar.bz2 645623 SHA256 a3d5e2f9f322b8c916149c6d536d460187b67450a16b272a6de908caa36392e1 SHA512 fbc4570d21610f859edd1a7e67ced3516dc9ede2b4bc70821bc78f82032f5f1386b8fc646e6009a6295a9b3f0256fcf806b758a6b97e149fb5de4e1d71db8165 WHIRLPOOL 630365a9c58a022f68e7358080a024530ea9fda4ba7937ca4f3fc3ffb55a8665b57637e99a174b93974b581433a5edd4e030d88c5aaa12c31b7fc3a24b2a3bee
-DIST calligra-l10n-pt-2.5.1.tar.bz2 624108 SHA256 de6811d95435a85531bd77c148a57865692625ac9c3714b52bce196cafe5f30b SHA512 8292715480b4b536744ae24aaecb738317984c87ee70fcce1c91e8ea4c200ded6b77139e436045a0041fe8849bc3a752a1c410339e11bb17029bc92e931a7292 WHIRLPOOL b12f319ec978e96cbaf477cc238c5cb8c1a33d7fc77dad083de23da9a4aeb92828488b834d665dde7f550a1dbdc3786c61b7cf153e97e025397fbd12a88e2c40
+DIST calligra-l10n-pt-2.5.2.tar.bz2 623931 SHA256 8f85259643f14efe7541eac9f0d6352ac9f1b8b1343439621e58516535feafcf SHA512 aadc6c000201d4671662110f267e89145a19603ff9251ddbf79305d24c9fc0d39e0befe4777c050adb30442acb3819ef1f0711a37f33f700075b7c0c4b8de50c WHIRLPOOL dafdaae641c5ad478788717b709539ac118eeb344570c5e9d2b58db4ee5b9cfb73153d244b3627a6c5259a4ed977bb1ed3cd0817ded3070ca10385acb9d68d50
 DIST calligra-l10n-pt_BR-2.4.3.tar.bz2 739611 SHA256 c94943a93024bcadb595ed4363516a091a399fe9a7368c3365c24c7e2811b6ee SHA512 caaa86d5bef8148b75236fff1e12904b8be74e85181b0ffbdf97d2ea692b27542f0e44a25586a537f0e38b906cc0f3cac4f394c67054fe3eb0cc2ae0ad57498b WHIRLPOOL 79e287bb79377d90c27e74091677e7a9f856242303386852c11fb3cd6c7a846679746e5c9e78aff231dafdf2c26419154cf4e57e4bf4b96aa1dd12f4c38849e9
-DIST calligra-l10n-pt_BR-2.5.0.tar.bz2 694386 SHA256 61743ace48a3657ff28d56c7b1fd89f30caf2ae8170fbb30fe86fd26b9cda959 SHA512 544f01f6883c995a4bd840004905f29c58fc7c2df5fd663b1bc5f9b6d337a1d3db6cb5c37c78f686b7b616207f3912b2a15ddf52cff5b5e17e120a55f3e21b0c WHIRLPOOL 6a164b89a3f6eef608f90098a19f856495c044761a441a2a0307c4707b74d9b1068ee02c2302fcc8569526bed7e595a26251c105c8494b53d64c5a1d431bd2dc
-DIST calligra-l10n-pt_BR-2.5.1.tar.bz2 671206 SHA256 fcc529b3c8f52f10890563729a2147c368dc40412f6d4d9644f3f781b1737b2d SHA512 dea1e64891c9688480333906a7e568dcc198c7e8f47ae7dc892fd1506c5f3b78a304e8c7b173802b87f7bf6f708b40727a1c4affea68e38fbc37f50a95d72aed WHIRLPOOL 415ffe552d1244622f4369078d08c7471290ad6f249c386b8724d3026e5cee6df1e0d3717dad23ca2717d83b91743e0fd072b4b83f7a0122fdda93bc7bfda580
+DIST calligra-l10n-pt_BR-2.5.2.tar.bz2 671309 SHA256 b7891800d4f39bc72c52bca437c6e2e386ee33fd2bd0e28330d8d019b7c6460f SHA512 d3d9d3bbd9d454145bbdd98189a561afab2b5c532c90c6be41a7c26a2891591065b07125d1fd496102705d265ac54cbaec085146f26479e66f69ff5646205250 WHIRLPOOL d414bb8d78bb5f2b5a3bd4f6ed057562791dff0522d5dd93222f0ae299cf65a4057d2abe3728f66d2b19e3a86f1008e76f79c17cb6445408516111d0b91844c8
 DIST calligra-l10n-ru-2.4.3.tar.bz2 582280 SHA256 d830e4f36a1bc2385395b7e13b96cea8e08911c6c2385057f241fe446bc1bd0a SHA512 febf426d8135599adbc5fcbe9872c86a72afbc212e965833a4b85b7a883e838db2e2273b376f49491875cb6470aa7de1bd59161ab4845aab590aab9fb85a6186 WHIRLPOOL 55fd3f3d7f5b40820528b4bd6c3136b1204bcc716b4d771ef04ad58ffef4dd8fe0092c2a9dfb8e87c9177dd543b385d9003ea3281522dfa72700ffde31b2b31c
-DIST calligra-l10n-ru-2.5.0.tar.bz2 579824 SHA256 9831be73a725e7aa6dd92be230ef6b6f1eac8a6a0bc4b925e584081ad11d8b78 SHA512 b68230a2dc84a2cd2fc77df88ffbbf43e88222e21a9647a92c83f93b4a664200fb7a3cf4c25a15361081b2699f1e0a99fc927ef6475de93de57c0b23813e4a8b WHIRLPOOL bff52e2f8eee7847d137aa4015850907651558927202e17856245352df3091afae8760517b7f2a51a8924232a5f6780730234ff83317caeeb63597fa91b09179
-DIST calligra-l10n-ru-2.5.1.tar.bz2 560951 SHA256 1efc4d0366f811436a2d3e46ea36c1f4517a3faaa24d5515f9b0de36bbaf0ea6 SHA512 e30dec74199c8f4d67bcdec5945754a1da3fcf6a6ad3e0c70e67f5c908b3c40375b278aba0418ae5575100c032a4c7b688c942b64a97245b0e1b698dd782ff1f WHIRLPOOL 26d31b0fe96646c6c63e1c1430cec0362d5a4b6b0485537ddd89b3c09c78df8563ba996133cbede7dd74b94249daf5f7f8aaf0f3c0e325a5d6fc0e0dd45adad9
+DIST calligra-l10n-ru-2.5.2.tar.bz2 561100 SHA256 ae0a9cc694f072bc24021b345531de3cfeb41bf6335ffd79111d9b30c7a51856 SHA512 a2d5c882a675635b28b907cf22bd7a8a4f771bc51ab77becaa44cf7a77857950e5f324afb1c6fb1d3138d6a047643c5750c3dcd623106e8d4a460130d1656662 WHIRLPOOL a294c77c32bbd1e4ff75e28898fa48087505cc15fdc5f5ef930690ade17c27ce2d99149831cae5fe27d4b54f045e3a61234e7dc67250459a41bdac3c5b8cfc9f
 DIST calligra-l10n-sk-2.4.3.tar.bz2 368411 SHA256 ef89e2154fa3e787b5c4abeeef268e587be517ea896753bed52e570cbb4195ab SHA512 08e2cb147e944882d9d217a52dde2552be4aa1204b66b21e1006beaceb60b0a164bf382522daff8a54bd3bbae7ac86f06297cb85ba802bdef4215f438b02ced5 WHIRLPOOL 87a6c9c7319b9fa61cd63f538533ce7d0d164cbcb7d93ed9efebd0b3eedf97f1e529b99c7b4319dfe86e248066da2ce86507335b429d441b870b4075b4f92b41
-DIST calligra-l10n-sk-2.5.0.tar.bz2 362236 SHA256 13ccb474033e5e45f32902ee79c8f2668b6ab91ba1081692f8f000bbf9bd45c3 SHA512 66cc17dba0dcccf7177475f4b5ef9d00dc1c9834144b18ad5bad6948987c21a261a1dc502a5f796bc2408a2f796e7de25008862ca6b817bc7da89465d0606745 WHIRLPOOL 72ca6035efa1104fb299e6050fe31384b591d2101c4426abf4dd2c540e3bbcc7f3aa5df24e7ccaba3983c661f1742913d13bc7dcc13cbee6e60ff39d34983050
-DIST calligra-l10n-sk-2.5.1.tar.bz2 342332 SHA256 297921cd9b2c164d4f213fad1d47313846a8a858a9552415486fb66380db98db SHA512 24a02bf634231f4da1cadf3528ec4095d72f3ed0abe3adb1a9812fd5f682927acb5d93ebd9f43ff5d1dd9d396ce75ba63ff9abd92792a806651d8241279e67ae WHIRLPOOL 18a551a22e1159e77fdee76de6e3bb3946d273a32364b517ab98c8e68440c18cebe7d7a7de5022065288edd411b02b999b7df59b8dc7a0ae7b0893c432f28706
+DIST calligra-l10n-sk-2.5.2.tar.bz2 342599 SHA256 b43c115c5117a26e19efc0149c80bd5e7c4234d33516e753a6d0f9aed7ee7927 SHA512 6dacd37f17bcfe1062a02ec8fcb1ebabff697426769aa097a4c0cfc34d32789928366889902236417cd4d963540cf24a12a0a13ca31bc79edbd1ae50a17d5dfc WHIRLPOOL caaf6814c3cff4af7ffedd460e4e0481c472b56368af9cc3ea02a5883dc66efde17d8a04498a39511c81efeb3dbf9dd4908b46ca21d4330fce4501b36ed99079
 DIST calligra-l10n-sv-2.4.3.tar.bz2 2047214 SHA256 4ddbfce98dd6f0329267e232da5c47cbf6cc212dd66bf5e5fba5691d25141db4 SHA512 4baa4658405b8645c7dc9423e2ffcd1b03ee0440790f6e81850feb287f557e1fa6402e2b99de16a7c473dc8d253d97d710078a2325fb15e0ca7fbc3210f575f2 WHIRLPOOL 2ddbc001422fe81ee453755cff66d858668a456af0179a415c10907860ebd66e5a886a242165c9438937b3433da0fe5a31b9af6b308f77a70322d590301a1b2b
-DIST calligra-l10n-sv-2.5.0.tar.bz2 2031991 SHA256 fd9183be4f695c98204befd42795d919212646ba4f44bd27a9765766061894c0 SHA512 1cfeb395a2be86838158ac44397819622134eac511cd7cbde0f68e5a01b8739c687608c99a56d59b8c5ad5dc43db4e3370c57996e54c5a5fbf4f7d480f8fb070 WHIRLPOOL 27fc8f5cd344fa0342f7aef68c9230302a1a71f4d0734ded68dab912c0cc1f932cebe6615d9d727a31967dba93617c6f1672ef51983e41f86868a48fbed4f9a5
-DIST calligra-l10n-sv-2.5.1.tar.bz2 2015444 SHA256 2602c7d4a7961464db8c1c20723ee1c494288e0e714ddf0bb114e952e9b29bb7 SHA512 c6a4bdd94955fc9910e147e9fcfa0e6e1897b4509fbffed042ffeed8a28885b88dae2cb591b65d5b21cd77206c7c828f1798f2754ca9f25e85910252ba070f68 WHIRLPOOL a79da3a91165fc767e300ef4c6f37c4cbad4526eb3a2719a62fd9bad30fbe08daca6c8e71ca462d9f2721fb2dd0d2fefdec4eda758f62141f262107887d9b6f8
+DIST calligra-l10n-sv-2.5.2.tar.bz2 2015940 SHA256 729dc8d7a6a1c5ceee009a19f3c40984739699cf00c1584dce1f6af4a150944d SHA512 a850ff79c6be1eae0fc20de4bcd01cae8e9efba025f81bc6eb050f41e0ac587af063530ecd36ecb884cf04b6e14566dbce0d98a55063f8ce7bee178cbb70b310 WHIRLPOOL deeb7121c6d8843a3ce91f74177647fa2fcd15a4c74a5d9cf48e773219e2ca506bf8a0e4d30809aa0843950ca44dd44e367a98dd6838092d6416dc6e11a127f9
 DIST calligra-l10n-uk-2.4.3.tar.bz2 2125959 SHA256 700e9f9fda44cbb2b2dadc55f9170c945d4c4b3f4219738ee133928f594eddbb SHA512 f2dbd834b31ebaf6c4d6190a684b74c3b998f6d135dc64ab340fd995d62ceac0f9bf17ee88dfa7258ca3ac5e670c783c6f0ccefea8d590d151ee14a68e7ed2e2 WHIRLPOOL 3f09910de1bb03dbdd0ba616aa0905a7b3c4704bec11a68b918309caef45ebb8626bbc23dec7c637cabaf1242311444f8dc69464f8853c767b05cb1899ed1955
-DIST calligra-l10n-uk-2.5.0.tar.bz2 2120032 SHA256 81f46ad5bb21551046e52eec9fb6c054bc1f41656271d8ceed4a5b814e09f9ce SHA512 18f5c4d9770b84804d3dc15f13cfc8d3ea6a20450ec38f19f590d7fe7f0f28b161af761718c795810fb913e31c44ad441890685d8281bfa71c83c27164026775 WHIRLPOOL cfd5835926a098e40f2366b2c0d22b69371873f0227090da8820d4fa13210270c559dfdabadb4129030335c6178bce23624fb9804d4bc63644ca6d89f3f99e78
-DIST calligra-l10n-uk-2.5.1.tar.bz2 2101875 SHA256 f4d1a49b9aff883c9b2bf0972bbf6bfc541da589508f15e6b72fdecb5ac6b88c SHA512 51d63ea3bf9e33d257570112f029b84a02d32a8fa3e52057a2d6ead5fccc5cedccc1464e0b8b8e9fbba19fd8f22333a8e314814a5a5dcb6f83acf0b56159f5cd WHIRLPOOL a8d35628d423fbad336353e9c6a9ca747b489fd82d4f80cc22df2b1664ab8cb60123e683a69cbc6de300ec4beed5a7bf21b5ece62c0adea72aad473054ade442
+DIST calligra-l10n-uk-2.5.2.tar.bz2 2101633 SHA256 993c5fbdc63521318e100e63ea5ac5e1d01b9612b1b4f11695796161a9b1b95b SHA512 aa47fe939095df01cdcfe52628f9d54a899bf1f3cf9be2d60f04c29bdb6c465bae4be652d70c6d3991f16c95dc0cee733893194e8ad6fec5c831229c1d7a2400 WHIRLPOOL 720a18b9243c3c23c38735f2c8c4e35d532bc5190ac6b1a142b2133475a0f478ac61a889ba1294e3a547e22a81c19c21627f578be7734e443833c30992afcdd4
 DIST calligra-l10n-zh_CN-2.4.3.tar.bz2 346269 SHA256 49cce084396baf0e619230f4990edb39d8e08c8ab6acd7a8e7e5a510eaa80cb7 SHA512 940086ac0dd548626d96e9fb3f9bd022cd107dbe3af88246eae099c803c66f621329f2e99388c7c1420a866363c94ea111ff7d61ad8eef4d5b3b6c9b5e7f5aff WHIRLPOOL e4900a5594eac24c18e10fc9f39ff66d210fca65424b2e4c66b675caddf005885c951cba7769e5337035397fac884f658fc56b6885a2ceb92afac87f5a1129a5
-DIST calligra-l10n-zh_CN-2.5.0.tar.bz2 345490 SHA256 7ae7239772650b5cfc3090eba6d9e638da70813c6dcd1d2074408bc2337c8a1f SHA512 a8402746ad568b30bab77d871e30b39afb1d26168b85ef6a56062562452a240e157daf7fcbf659b0a7936dbcaf62e65e711f5078f4bfe4225e7a3e3a9bf22e71 WHIRLPOOL b1294aa5f9ed74914fe059e7b2250e3938895ab2e5c18c50830ac62f1f4b64e48c267e4f7e102a8ae5c177a3cae4b9b96777142a6c9c91b337fde301c8b9ebca
-DIST calligra-l10n-zh_CN-2.5.1.tar.bz2 329409 SHA256 f493e5c559f74abbb04f1a079bf5e7bd9fa7789bc8a64746fd7d28ecf914a2de SHA512 8dba384e23ad80999ea0b2f0ae6276b8024831268989870d696afe2a830e8afaab08ebb507fc0b459065af40bf9e11a3f7161fb58b8c06ffd1999ee43f319318 WHIRLPOOL 3de22afb3309647f67ebd7add97f6e6dbe73f5d13a7779ac124f44827c1dc1d7ee00aae5660641344d26f8572e296edbcb5c5c3ad858611afe44e415822f049f
+DIST calligra-l10n-zh_CN-2.5.2.tar.bz2 329020 SHA256 9a991f714bac9b90ef6bbab5abb371c17e9710bcc14fa4dfb208482eb9e44537 SHA512 8ff824b046b761d9e6eb90cf94a8e2adde63191311562295f3f31f5cec2ceff753bb9dce4875baee23a71face2e8e15ddc8a2c26575cfb4e60c436e92163aec1 WHIRLPOOL 4543688b00efe2eeec50684041f8f52bc73ca72e73959c56a4ea844827405c0b33b506b94cc0a0508202172567c09b42bc205d27b8fdc73f33ca6179947a131f
 DIST calligra-l10n-zh_TW-2.4.3.tar.bz2 386371 SHA256 9bd8d7cfdf23d6b2b3b58a2d044a9a4c0d678286a1d47c631af2b067f06ddfc0 SHA512 d85f4c0256c0d1641448e30465d194604586413cd25e55034969ef9be11ae94f2b24f4fdcb03a94927fcee5916ef69f43364f42544cde372110add26ea3c3765 WHIRLPOOL ba86ef5f6260b3cf7ee190c6915eec6a214dc8494176842fd5746ffce66366bf3a5f65b4ad7b75d5c4bf52ef79192f1155a1904207b771f5c95a5833f892a3bb
-DIST calligra-l10n-zh_TW-2.5.0.tar.bz2 385061 SHA256 2fbc2eccc6d7ff25a6199772a2c9e63768b306c1e7ee5fef071179855d5e6a0a SHA512 683103e368dd3ad6fb09b7657e74cece5642f59561bf66597a2d43e294ab67e34127fa06ed8a0be9577c88f91c08c4f6aaf1be33a01adf65584ae58fce387153 WHIRLPOOL e76d369ac385e2ce02adec3174a828234500211dd7b7487d428d516fb962a3e5a5431a5ddde671703535d0385621e6daf26280d051e122bb9e6a2130c45c7038
-DIST calligra-l10n-zh_TW-2.5.1.tar.bz2 368394 SHA256 fb4db6c138b9bbdc83267e80772a1d9e6c062cefa4f873a27d8a507b8d080383 SHA512 f0c648eefde3d3f2fa0e27472aac3c5c3b11834cdece5276de1acb1123e5e6b3225693fe17962e2ae49a376e12740f356bc8bee2e312e6a41b96171592dcf496 WHIRLPOOL a592212ea32b90f70d66475d1fb0238f7bc552790b14cd5c513a8732075e00dcad650ab55a5691583f34e00ea9c73ea53f19f12f3c9e6940e7ab39e5165ab129
+DIST calligra-l10n-zh_TW-2.5.2.tar.bz2 368155 SHA256 3ce3120c857d156ba644af97f3effa0de13ae2973ee6e54fbe1ff6969421d286 SHA512 9774680516eff2ec86576b51bdfefd24b13f0d4b31b3d0b3b399e929e9a3f6577af787d04fb042168b8e83462b071fbb82f9335e76c9de403fb481914830b78b WHIRLPOOL 95b3605f1d5df98ba57c1219b635b321f6caddb569097cec800fc503112e6d227f3ec5e85c02864535798f2b877d6251aaf0b1e23f4a5a3aaa8a3c91ced01e73
--- a/app-office/calligra-l10n/calligra-l10n-2.5.0.ebuild
+++ b/app-office/calligra-l10n/calligra-l10n-2.5.0.ebuild
@ -1,77 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra-l10n/calligra-l10n-2.5.0.ebuild,v 1.1 2012/08/13 16:36:14 scarabeus Exp $
-
-EAPI=4
-
-inherit kde4-base
-
-DESCRIPTION="Calligra localization package"
-HOMEPAGE="http://www.kde.org/"
-LICENSE="GPL-2"
-
-DEPEND="sys-devel/gettext"
-RDEPEND="!app-office/koffice-l10n"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-MY_LANGS="ca ca@valencia da de el en_GB es et fi fr gl hu it ja kk nb nds nl pl pt pt_BR ru sk sv uk zh_CN zh_TW"
-URI_BASE="mirror://kde/stable/${PN/-l10n/}-${PV}/${PN}/"
-SRC_URI=""
-SLOT="4"
-
-for MY_LANG in ${MY_LANGS} ; do
-	IUSE="${IUSE} linguas_${MY_LANG}"
-	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE}/${PN}-${MY_LANG}-${PV}.tar.bz2 )"
-done
-unset MY_LANG
-
-S="${WORKDIR}"
-
-src_unpack() {
-	local lng dir
-	if [[ -z ${A} ]]; then
-		elog
-		elog "You either have the LINGUAS variable unset, or it only"
-		elog "contains languages not supported by ${P}."
-		elog "You won't have any additional language support."
-		elog
-		elog "${P} supports these language codes:"
-		elog "${MY_LANGS}"
-		elog
-	fi
-
-	[[ -n ${A} ]] && unpack ${A}
-	cd "${S}"
-
-	# add all linguas to cmake
-	if [[ -n ${A} ]]; then
-		for lng in ${MY_LANGS}; do
-			dir="${PN}-${lng}-${PV}"
-			if [[ -d "${dir}" ]] ; then
-				echo "add_subdirectory( ${dir} )" >> "${S}"/CMakeLists.txt
-			fi
-		done
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_MESSAGES=ON -DBUILD_DATA=ON
-		$(cmake-utils_use_build doc)
-	)
-	[[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_configure
-}
-
-src_compile() {
-	[[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_compile
-}
-
-src_test() {
-	[[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_test
-}
-
-src_install() {
-	[[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_install
-}
--- a/app-office/calligra-l10n/calligra-l10n-2.5.2.ebuild
+++ b/app-office/calligra-l10n/calligra-l10n-2.5.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra-l10n/calligra-l10n-2.5.1.ebuild,v 1.1 2012/08/30 11:35:37 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra-l10n/calligra-l10n-2.5.2.ebuild,v 1.1 2012/09/13 12:04:43 scarabeus Exp $

 EAPI=4

--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@ -1,3 +1,2 @@
 DIST calligra-2.4.3.tar.bz2 119351575 SHA256 8a7dbefdd957217ca4280c1865b319f4fa6c3b38ec8f302e6131a21be8c5946a SHA512 7c8ab608a43d2f386086d4966462521c22d648e5e6f5d11cc88093c8d40d21b3c81d77f0b01ec3781c849560138c7c3d026c017c3653400c92ad8314d1615827 WHIRLPOOL fe5259c0ff220a9020647f686de5afecb7a9c0a2929259435d7f9b7c461a0da3c338d39fbd5bb7dcd53a0f79bab6ac312d68d46c241adab7916a89d86e869974
-DIST calligra-2.5.0.tar.bz2 119191980 SHA256 41b80d33970b9110c0f26fda11c9c5c87d41036c333e34d6c7fce70f4f6cde60 SHA512 965852ed8230e6742d94e7170351bc658cae8f015c368bc329e4ca7f80ed27d5a9749daee438ec42ec9123865eb88596928b31eef8edf12fff9e5de25ab3d5c0 WHIRLPOOL 7cb7cba2544f2b4476946060e70c654420387a36675621a988c8398a278eedd6b1e9278897cf280203b92645cf544e3223d72cd2b528033c307ba867ac21d85c
-DIST calligra-2.5.1.tar.bz2 119275167 SHA256 325fd8b3540b1e07fbf04f32350f4535bcb101cf46a87879dff935cfcd87cd48 SHA512 e67b94aafe5c32461169729bb591c32495d3e1c8fec934044b19425d65f1a95398caf98588308074e2457ca6ee3608498ba14d3cc71c59bd371651af28bd8b38 WHIRLPOOL 26133ace859842e44282e5099eaca528ef5ed5cd162770fafe2f5e4118e6b44a558f9470d9617f1d39aed7172981483da20e1afeb76acc590268a2dfb673ac17
+DIST calligra-2.5.2.tar.bz2 119280741 SHA256 4ea50791891de621caba4ddf1484539ab50a6a770ad21cbb428c66fa685689ca SHA512 8bff1aa2cd6d785c575dfa38ef6d680026ea6634fb6d6a994fc133754412530048e70ab62ffeeadc417e37b644ff821ea75aeeaf31bcb99f11c0f706e79b792d WHIRLPOOL d51008c83ee2240a6b5827995f1564c0e0cc8740ae8c9756d044513160a2009b35e0f56bb97f8c27b384626f06de84f5f5db8fe8900337a9f489e4e884eb1961
--- a/app-office/calligra/calligra-2.5.0.ebuild
+++ b/app-office/calligra/calligra-2.5.0.ebuild
@ -1,222 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.5.0.ebuild,v 1.4 2012/08/21 19:06:56 dilfridge Exp $
-
-# note: files that need to be checked for dependencies etc:
-# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
-# krita/CMakeLists.txt
-
-EAPI=4
-
-KDE_SCM=git
-KDE_MINIMAL=4.6.4
-QT_MINIMAL=4.8.1
-OPENGL_REQUIRED=optional
-
-KDE_HANDBOOK=optional
-
-KDE_LINGUAS_LIVE_OVERRIDE=true
-inherit kde4-base versionator
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="http://www.calligra.org/"
-
-case ${PV} in
-	2.[456789].[789]?)
-		# beta or rc releases
-		SRC_URI="mirror://kde/unstable/${P}/${P}.tar.bz2" ;;
-	2.[456789].?)
-		# stable releases
-		SRC_URI="mirror://kde/stable/${P}/${P}.tar.bz2" ;;
-	2.[456789].9999)
-		# stable branch live ebuild
-		SRC_URI="" ;;
-	9999)
-		# master branch live ebuild
-		SRC_URI="" ;;
-esac
-
-LICENSE="GPL-2"
-SLOT="4"
-
-[[ ${PV} == *9999 ]] || KEYWORDS="~amd64 ~x86"
-
-IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
-gsl +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +okular opengtl openexr
-+pdf postgres +semantic-desktop spacenav +ssl sybase test tiff +threads +truetype
-word-perfect xbase +xml +xslt"
-
-# please do not sort here, order is same as in CMakeLists.txt
-CAL_FTS="kexi words flow plan stage sheets krita karbon braindump"
-for cal_ft in ${CAL_FTS}; do
-	IUSE+=" calligra_features_${cal_ft}"
-done
-unset cal_ft
-
-REQUIRED_USE="
-	calligra_features_kexi? ( calligra_features_sheets )
-	calligra_features_words? ( calligra_features_sheets )
-	calligra_features_krita? ( eigen exif lcms )
-	calligra_features_plan? ( kdepim semantic-desktop )
-	calligra_features_sheets? ( eigen )
-	test? ( calligra_features_karbon )
-"
-
-RDEPEND="
-	!app-office/karbon
-	!app-office/kexi
-	!app-office/koffice-data
-	!app-office/koffice-l10n
-	!app-office/koffice-libs
-	!app-office/koffice-meta
-	!app-office/kplato
-	!app-office/kpresenter
-	!app-office/krita
-	!app-office/kspread
-	!app-office/kword
-	dev-lang/perl
-	dev-libs/boost
-	dev-libs/libxml2
-	$(add_kdebase_dep knewstuff)
-	media-libs/libpng
-	sys-libs/zlib
-	>=x11-libs/qt-gui-4.8.1-r1:4
-	virtual/libiconv
-	attica? ( dev-libs/libattica )
-	crypt? ( app-crypt/qca:2 )
-	eigen? ( dev-cpp/eigen:2 )
-	exif? ( media-gfx/exiv2 )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	freetds? ( dev-db/freetds )
-	gif? ( media-libs/giflib )
-	glew? ( media-libs/glew )
-	glib? ( dev-libs/glib:2 )
-	gsf? ( gnome-extra/libgsf )
-	gsl? ( sci-libs/gsl )
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/openjpeg )
-	kdcraw? ( $(add_kdebase_dep libkdcraw) )
-	kdepim? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
-	lcms? ( media-libs/lcms:2 )
-	marble? ( $(add_kdebase_dep marble) )
-	mysql? ( virtual/mysql )
-	okular? ( $(add_kdebase_dep okular) )
-	opengtl? ( >=media-libs/opengtl-0.9.15 )
-	openexr? ( media-libs/openexr )
-	pdf? (
-		app-text/poppler
-		media-gfx/pstoedit
-	)
-	postgres? (
-		dev-db/postgresql-base
-		dev-libs/libpqxx
-	)
-	semantic-desktop? ( dev-libs/soprano $(add_kdebase_dep kdelibs semantic-desktop) )
-	spacenav? ( dev-libs/libspnav  )
-	ssl? ( dev-libs/openssl )
-	sybase? ( dev-db/freetds )
-	tiff? ( media-libs/tiff )
-	truetype? ( media-libs/freetype:2 )
-	word-perfect? (
-		app-text/libwpd
-		app-text/libwps
-		app-text/libwpg
-	)
-	xbase? ( dev-db/xbase )
-	xslt? ( dev-libs/libxslt )
-	calligra_features_kexi? (
-		>=dev-db/sqlite-3.7.9:3[extensions]
-		dev-libs/icu
-	)
-"
-DEPEND="${RDEPEND}"
-
-[[ ${PV} == 9999 ]] && LANGVERSION="2.4" || LANGVERSION="$(get_version_component_range 1-2)"
-PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
-
-RESTRICT=test
-# bug 394273
-
-src_configure() {
-	local cal_ft
-
-	# first write out things we want to hard-enable
-	local mycmakeargs=(
-		"-DIHAVEPATCHEDQT=ON"
-		"-DWITH_Boost=ON"
-		"-DWITH_LibXml2=ON"
-		"-DWITH_PNG=ON"
-		"-DWITH_ZLIB=ON"
-		"-DGHNS=ON"
-		"-DWITH_X11=ON"
-		"-DWITH_Qt4=ON"
-		"-DBUILD_libmsooxml=ON"      # only internal code, no deps
-		"-DWITH_Iconv=ON"            # available on all supported arches and many more
-		"-DQT3SUPPORT=ON"            # kde4-base.eclass pulls this in anyway
-	)
-
-	# default disablers
-	mycmakeargs+=(
-		"-DBUILD_mobile=OFF"         # we dont support mobile gui, maybe arm could
-		"-DBUILD_active=OFF"         # we dont support active gui, maybe arm could
-		"-DWITH_LCMS=OFF"            # we use lcms:2
-		"-DCREATIVEONLY=OFF"
-		"-DWITH_TINY=OFF"
-		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
-		"-DWITH_DCMTK=OFF"           # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
-	)
-
-	# regular options
-	mycmakeargs+=(
-		$(cmake-utils_use_with attica LibAttica)
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with eigen Eigen2)
-		$(cmake-utils_use_with exif Exiv2)
-		$(cmake-utils_use_with fftw FFTW3)
-		$(cmake-utils_use_with fontconfig Fontconfig)
-		$(cmake-utils_use_with freetds FreeTDS)
-		$(cmake-utils_use_with gif GIF2)
-		$(cmake-utils_use_with glew GLEW)
-		$(cmake-utils_use_with glib GLIB2)
-		$(cmake-utils_use_with glib GObject)
-		$(cmake-utils_use_with gsf LIBGSF)
-		$(cmake-utils_use_with gsl GSL)
-		$(cmake-utils_use_with jpeg JPEG)
-		$(cmake-utils_use_with jpeg2k OpenJPEG)
-		$(cmake-utils_use_with kdcraw Kdcraw)
-		$(cmake-utils_use_with kdepim KdepimLibs)
-		$(cmake-utils_use_with lcms LCMS2)
-		$(cmake-utils_use_with marble Marble)
-		$(cmake-utils_use_with mysql MySQL)
-		$(cmake-utils_use_with okular Okular)
-		$(cmake-utils_use_with opengtl OpenCTL)
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with pdf Poppler)
-		$(cmake-utils_use_with pdf Pstoedit)
-		$(cmake-utils_use_with postgres PostgreSQL)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use semantic-desktop NEPOMUK)
-		$(cmake-utils_use_with spacenav Spnav)
-		$(cmake-utils_use_with ssl OpenSSL)
-		$(cmake-utils_use_with sybase FreeTDS)
-		$(cmake-utils_use_with tiff TIFF)
-		$(cmake-utils_use_with threads Threads)
-		$(cmake-utils_use_with truetype Freetype)
-		$(cmake-utils_use_with word-perfect WPD)
-		$(cmake-utils_use_with word-perfect WPG)
-		$(cmake-utils_use_with xbase XBase)
-		$(cmake-utils_use_with xslt LibXslt)
-	)
-
-	# applications
-	for cal_ft in ${CAL_FTS}; do
-		mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
-	done
-	mycmakeargs+=( $(cmake-utils_use_build test cstester) )
-
-	# filters
-
-	kde4-base_src_configure
-}
--- a/app-office/calligra/calligra-2.5.2.ebuild
+++ b/app-office/calligra/calligra-2.5.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.5.1.ebuild,v 1.1 2012/08/30 11:20:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.5.2.ebuild,v 1.3 2012/09/13 19:36:29 scarabeus Exp $

 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@ -138,8 +138,6 @@ PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
 RESTRICT=test
 # bug 394273

-PATCHES=( "${FILESDIR}/${PN}-2.5.0-kexi-automagic.patch" )
-
 src_configure() {
 	local cal_ft

--- a/app-office/calligra/calligra-2.5.49.9999.ebuild
+++ b/app-office/calligra/calligra-2.5.49.9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.5.49.9999.ebuild,v 1.1 2012/08/30 11:30:45 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.5.49.9999.ebuild,v 1.2 2012/09/13 19:36:29 scarabeus Exp $

 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@ -191,7 +191,7 @@ src_configure() {
 		$(cmake-utils_use_with lcms LCMS2)
 		$(cmake-utils_use_with marble Marble)
 		$(cmake-utils_use_with mysql MySQL)
-		$(cmake-utils_use_build mysql)
+		$(cmake-utils_use_build mysql mySQL)
 		$(cmake-utils_use_with okular Okular)
 		$(cmake-utils_use_with opengtl OpenCTL)
 		$(cmake-utils_use_with openexr OpenEXR)
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.29 2012/08/30 11:30:45 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.30 2012/09/13 19:36:29 scarabeus Exp $

 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@ -189,7 +189,7 @@ src_configure() {
 		$(cmake-utils_use_with lcms LCMS2)
 		$(cmake-utils_use_with marble Marble)
 		$(cmake-utils_use_with mysql MySQL)
-		$(cmake-utils_use_build mysql)
+		$(cmake-utils_use_build mysql mySQL)
 		$(cmake-utils_use_with okular Okular)
 		$(cmake-utils_use_with opengtl OpenCTL)
 		$(cmake-utils_use_with openexr OpenEXR)
--- a/app-office/libreoffice/libreoffice-3.6.1.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.6.1.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.1.2.ebuild,v 1.1 2012/08/31 14:08:51 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.1.2.ebuild,v 1.2 2012/09/13 15:56:52 scarabeus Exp $

 EAPI=4

@ -102,7 +102,7 @@ COMMON_DEPEND="
 	app-text/libwpg:0.2
 	>=app-text/libwps-0.2.2
 	>=dev-cpp/clucene-2.3.3.4-r2
-	>=dev-cpp/libcmis-0.2
+	>=dev-cpp/libcmis-0.2:0.2
 	dev-db/unixODBC
 	dev-libs/expat
 	>=dev-libs/glib-2.28
--- a/app-office/libreoffice/libreoffice-3.6.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-3.6.9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.25 2012/08/25 08:43:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.26 2012/09/13 15:56:52 scarabeus Exp $

 EAPI=4

@ -102,7 +102,7 @@ COMMON_DEPEND="
 	app-text/libwpg:0.2
 	>=app-text/libwps-0.2.2
 	>=dev-cpp/clucene-2.3.3.4-r2
-	>=dev-cpp/libcmis-0.2
+	>=dev-cpp/libcmis-0.2:0.2
 	dev-db/unixODBC
 	dev-libs/expat
 	>=dev-libs/glib-2.28
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.107 2012/09/10 09:19:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.108 2012/09/13 15:56:52 scarabeus Exp $

 EAPI=4

@ -104,7 +104,7 @@ COMMON_DEPEND="
 	app-text/libwpg:0.2
 	>=app-text/libwps-0.2.2
 	>=dev-cpp/clucene-2.3.3.4-r2
-	>=dev-cpp/libcmis-0.2
+	dev-cpp/libcmis:0.3
 	dev-db/unixODBC
 	dev-libs/expat
 	>=dev-libs/glib-2.28
--- a/app-office/texmacs/Manifest
+++ b/app-office/texmacs/Manifest
@ -1,3 +1,4 @@
 DIST TeXmacs-1.0.7.15-src.tar.gz 15128281 SHA256 0a690de5e30a8fac6779767ebabe2f283f666e47b77e276e7dd2553578daabee SHA512 250a4df6d94663af22447bd5ba53df3c2df5e59e849f5fe8ee2ac656393f7e4cf66a7a56ffa7b6149457615ebae50ece23ec7d7a11c5ecaf674e5946cf5f012a WHIRLPOOL 079b66700d5e7e548f2ac25719913c49e1b2cc5a86a7e728d341e8388db840c2a3cba603ca0cec805c3baf08cca09777f33e35940731f5df5b9b2b8e8c275d0a
+DIST TeXmacs-1.0.7.16-src.tar.gz 15390090 SHA256 8bc402023f45a593578b83d2971f675eaa06463bd7f7b6b70fcf18415e585999 SHA512 bc0a3b86d5a1b6b2a6d1aec60630cac1056648ea0eda7ebd8f14adc867002065e078320093623f2cd1335f726370cc648c3349805624f4166bf47af4a386dbea WHIRLPOOL 462213c608fe8145fa662f654c47d262499c7900cc62de8d14802de9926656cc38a79d65631df19fb7a8457668bc6bc05b150bea510318a8c72107bb00e9f810
 DIST TeXmacs-1.0.7.2-src.tar.gz 4763348 SHA256 98ca44418f4d4644bdee03add2e2baf18f0839d4d8336189ff4a095329f7a2ba SHA512 e8ba14c8419de262c13e5eddc003ba0d341b4d570685526c73f0cf1bf437dcae86ac37952147b72b653eb66bcdd94f41eca9ff000f8f0fd80786ba13ee1b57fc WHIRLPOOL ca208be8c784e8a957421ce2b5db94958c38212c71ccb01d792ad9281bbabad3fd58a38e5ed48d8c2240a52e9c67b072080e277e631f210a1997ffd3f74bd8cc
 DIST TeXmacs-600dpi-fonts.tar.gz 2899193 SHA256 e8eeb3c97a1405fd037b0567f683a6d2225d47c7829893b9768bd6c1c707cc81 SHA512 b04a9661a9b59aec46279fd78121e56b24fc66df821f62baa09df179958d3260bde04fc17e9c1dbbe186dbc39f4580f34858c1ed2c7549c8249c42ac81b27d28 WHIRLPOOL 5a29ff42d89fd54150effe0ef0b395ee09d37c098725455e80608f60395fb736597c249e6b1b76e68d05e5cc2eec6b8d0567c6f54cbd37d76f1b419b0884323c
--- a/app-office/texmacs/files/texmacs-mime.patch
+++ b/app-office/texmacs/files/texmacs-mime.patch
@ -0,0 +1,11 @@
+diff -r -U1 TeXmacs-1.0.7.16-src.orig/Makefile.in TeXmacs-1.0.7.16-src/Makefile.in
+--- TeXmacs-1.0.7.16-src.orig/Makefile.in	2012-07-09 21:33:36.000000000 +0700
+++ TeXmacs-1.0.7.16-src/Makefile.in	2012-09-13 12:27:29.000000000 +0700
+@@ -181,3 +181,2 @@
+ 	$(CP) $(tmdir)/misc/mime/texmacs.xml $(DESTDIR)$(datadir)/mime/packages
+-	@update-mime-database $(DESTDIR)$(datadir)/mime/ 2>/dev/null || :
+ 	$(MKDIR) $(DESTDIR)$(datadir)/pixmaps
+@@ -228,3 +227,2 @@
+ 	$(RM) $(datadir)/mime/packages/texmacs.xml
+-	@update-mime-database $(DESTDIR)$(datadir)/mime/ 2>/dev/null || :
+ 	$(RM) $(datadir)/pixmaps/TeXmacs.xpm
--- a/app-office/texmacs/files/texmacs-plugins.patch
+++ b/app-office/texmacs/files/texmacs-plugins.patch
@ -0,0 +1,48 @@
+diff -r -U1 TeXmacs-1.0.7.16-src.orig/plugins/axiom/Makefile TeXmacs-1.0.7.16-src/plugins/axiom/Makefile
+--- TeXmacs-1.0.7.16-src.orig/plugins/axiom/Makefile	2010-12-18 01:02:16.000000000 +0600
+++ TeXmacs-1.0.7.16-src/plugins/axiom/Makefile	2012-09-13 00:38:53.000000000 +0700
+@@ -16,3 +16,3 @@
+ bin/tm_axiom: src/tm_axiom.c
+-	$(CC) $(CPPFLAGS) $(CFLAGS) src/tm_axiom.c -o bin/tm_axiom
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) src/tm_axiom.c -o bin/tm_axiom
+ 
+diff -r -U1 TeXmacs-1.0.7.16-src.orig/plugins/graphviz/Makefile TeXmacs-1.0.7.16-src/plugins/graphviz/Makefile
+--- TeXmacs-1.0.7.16-src.orig/plugins/graphviz/Makefile	2010-12-18 01:02:15.000000000 +0600
+++ TeXmacs-1.0.7.16-src/plugins/graphviz/Makefile	2012-09-13 00:38:58.000000000 +0700
+@@ -16,3 +16,3 @@
+ bin/tm_graphviz: src/tm_graphviz.c
+-	$(CC) $(CPPFLAGS) $(CFLAGS) src/tm_graphviz.c -o bin/tm_graphviz
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) src/tm_graphviz.c -o bin/tm_graphviz
+ 
+diff -r -U1 TeXmacs-1.0.7.16-src.orig/plugins/maple/Makefile TeXmacs-1.0.7.16-src/plugins/maple/Makefile
+--- TeXmacs-1.0.7.16-src.orig/plugins/maple/Makefile	2010-12-18 01:02:16.000000000 +0600
+++ TeXmacs-1.0.7.16-src/plugins/maple/Makefile	2012-09-13 00:39:59.000000000 +0700
+@@ -17,3 +17,3 @@
+ bin/tm_maple_5: src/tm_maple_5.cpp
+-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) src/tm_maple_5.cpp -o bin/tm_maple_5
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) src/tm_maple_5.cpp -o bin/tm_maple_5
+ 
+diff -r -U1 TeXmacs-1.0.7.16-src.orig/plugins/mathematica/Makefile TeXmacs-1.0.7.16-src/plugins/mathematica/Makefile
+--- TeXmacs-1.0.7.16-src.orig/plugins/mathematica/Makefile	2010-12-18 01:02:15.000000000 +0600
+++ TeXmacs-1.0.7.16-src/plugins/mathematica/Makefile	2012-09-13 00:40:18.000000000 +0700
+@@ -14,3 +14,3 @@
+ bin/realpath: src/realpath.c
+-	$(CC) $(CPPFLAGS) $(CFLAGS) src/realpath.c -o bin/realpath
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) src/realpath.c -o bin/realpath
+ 
+diff -r -U1 TeXmacs-1.0.7.16-src.orig/plugins/r/Makefile TeXmacs-1.0.7.16-src/plugins/r/Makefile
+--- TeXmacs-1.0.7.16-src.orig/plugins/r/Makefile	2010-12-18 01:02:16.000000000 +0600
+++ TeXmacs-1.0.7.16-src/plugins/r/Makefile	2012-09-13 00:41:16.000000000 +0700
+@@ -16,3 +16,3 @@
+ bin/tm_r: src/tm_r.c
+-	$(CC) $(CPPFLAGS) $(CFLAGS) -I../../src/System src/tm_r.c -o bin/tm_r -lutil
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -I../../src/System src/tm_r.c -o bin/tm_r -lutil
+ 
+diff -r -U1 TeXmacs-1.0.7.16-src.orig/plugins/shell/Makefile TeXmacs-1.0.7.16-src/plugins/shell/Makefile
+--- TeXmacs-1.0.7.16-src.orig/plugins/shell/Makefile	2010-12-18 01:02:15.000000000 +0600
+++ TeXmacs-1.0.7.16-src/plugins/shell/Makefile	2012-09-13 00:41:57.000000000 +0700
+@@ -16,3 +16,3 @@
+ bin/tm_shell: src/tm_shell.cpp
+-	$(CXX) $(CPPFLAGS) $(CXXFLAGS)  -I../../src/System  -lutil src/tm_shell.cpp -o bin/tm_shell
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)  -I../../src/System  -lutil src/tm_shell.cpp -o bin/tm_shell
+ 
--- a/app-office/texmacs/texmacs-1.0.7.16.ebuild
+++ b/app-office/texmacs/texmacs-1.0.7.16.ebuild
@ -0,0 +1,67 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.7.16.ebuild,v 1.1 2012/09/13 06:40:30 grozin Exp $
+
+EAPI=4
+
+inherit autotools eutils fdo-mime
+
+MY_P=${P/tex/TeX}-src
+
+DESCRIPTION="Wysiwyg text processor with high-quality maths"
+HOMEPAGE="http://www.texmacs.org/"
+SRC_URI="ftp://ftp.texmacs.org/pub/TeXmacs/tmftp/source/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="imlib jpeg netpbm qt4 svg spell"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-scheme/guile[deprecated]
+	virtual/latex-base
+	app-text/ghostscript-gpl
+	media-libs/freetype
+	x11-libs/libXext
+	x11-apps/xmodmap
+	qt4? ( x11-libs/qt-gui:4 )
+	imlib? ( media-libs/imlib2 )
+	jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) )
+	svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
+	netpbm? ( media-libs/netpbm )
+	spell? ( app-text/aspell )"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# respect LDFLAGS, bug #338459
+	epatch "${FILESDIR}"/${PN}-plugins.patch
+
+	# dont update mime database
+	epatch "${FILESDIR}"/${PN}-mime.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with imlib imlib2) \
+		--enable-optimize="${CXXFLAGS}" \
+		$(use_enable qt4 qt)
+}
+
+src_install() {
+	default
+	domenu "${FILESDIR}"/TeXmacs.desktop
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
--- a/app-shells/bash/files/bashrc
+++ b/app-shells/bash/files/bashrc
@ -73,6 +73,8 @@ if ${use_color} ; then
 	#BSD#@export CLICOLOR=1
 	#GNU#@alias ls='ls --color=auto'
 	alias grep='grep --colour=auto'
+	alias egrep='egrep --colour=auto'
+	alias fgrep='fgrep --colour=auto'
 else
 	if [[ ${EUID} == 0 ]] ; then
 		# show root@ when we don't have colors
--- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.77.1-r1.ebuild
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.77.1-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.77.1-r1.ebuild,v 1.1 2012/07/03 20:26:29 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.77.1-r1.ebuild,v 1.2 2012/09/13 12:24:51 ago Exp $

 EAPI=4

@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ruby"

 RDEPEND=">=app-text/build-docbook-catalog-1.1
--- a/app-text/wdiff/wdiff-1.1.2.ebuild
+++ b/app-text/wdiff/wdiff-1.1.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wdiff/wdiff-1.1.2.ebuild,v 1.1 2012/05/31 03:00:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wdiff/wdiff-1.1.2.ebuild,v 1.2 2012/09/13 11:27:05 ago Exp $

 EAPI=4

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

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="experimental test"

 RDEPEND="sys-apps/diffutils
--- a/dev-cpp/libcmis/Manifest
+++ b/dev-cpp/libcmis/Manifest
@ -1,2 +1,3 @@
 DIST libcmis-0.1.0.tar.gz 373429 SHA256 2452f9a746d85a126a9a61d71330f6ecca5449f1ab08f43924d660a143bd7e95 SHA512 8eac22ad70d01fdb756ade8c0914931ba1b6b49b10f6f7120f0276f3f13fcb64e33177b87b133b257d95394bfd54cbe4c4076fccfe65ccfdc2c69d20b7f01f5a WHIRLPOOL 95505b443850c1aed55ee671d0a940a3ad231a9acdb5fb0fdf765a94182127b3ac0d4317cf409f77218a173ab4e9ea324d8458db48ab1d804c38e795f6617d75
 DIST libcmis-0.2.3.tar.gz 432064 SHA256 a4ace7c0280e5ee8d4941b33449ee10edf1515437483d55ae387cc4de2c2bea0 SHA512 f69ff4cb6a76d3622e235b0e07c55a762c96634255cedb105565ac40daf5bb2f0fb679bae90708719824a08a921dd34b7cf4fc90d0fb8019e36b5dea3230abb0 WHIRLPOOL 86fe8e16da3148f5a73f5c8be4d5fe3bb71ef2f74e888f0727d6836df24f6013289d5c1b0433ca3d06686419b1c0fad5e0fd0bcda78d714f68d2d2f78c01e83f
+DIST libcmis-0.3.0.tar.gz 515564 SHA256 8c1271cba2494d8c52bba08fa3b14cdca7401b5f90faacb8b206364c84233ffb SHA512 2840d3f9a95652336a7b80fed62af22303db1f7e17fb233e6b08385d54a92459b1fc07d81484635e16efcc3f20865ff9267095d8d9998e9645aee05d763dff4d WHIRLPOOL 5912fe505b7b46a4c51211a37a6a160f4bda8a496dd49503327723c2da58cc1925d2327a061a27ff0dacb06358b42f8dde0b4db9deb9c9befd33ed951227b125
--- a/dev-cpp/libcmis/libcmis-0.1.0-r1.ebuild
+++ b/dev-cpp/libcmis/libcmis-0.1.0-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libcmis/libcmis-0.1.0.ebuild,v 1.9 2012/08/02 18:22:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libcmis/libcmis-0.1.0-r1.ebuild,v 1.1 2012/09/13 15:53:20 scarabeus Exp $

 EAPI=4

@ -14,11 +14,12 @@ HOMEPAGE="https://sourceforge.net/projects/libcmis/"
 [[ ${PV} == 9999 ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"

 LICENSE="|| ( GPL-2 LGPL-2 MPL-1.1 )"
-SLOT="0"
+SLOT="0.2"
 [[ ${PV} == 9999 ]] || KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs test"

 RDEPEND="
+	!dev-cpp/libcmis:0
 	dev-libs/boost
 	dev-libs/libxml2
 	<net-misc/curl-7.27.0
@ -37,6 +38,8 @@ src_prepare() {

 src_configure() {
 	econf \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--program-suffix=-${SLOT} \
 		--disable-werror \
 		$(use_enable static-libs static) \
 		$(use_enable test tests) \
@ -47,3 +50,11 @@ src_install() {
 	default
 	find "${ED}" -name '*.la' -exec rm -f {} +
 }
+
+pkg_postinst() {
+	alternatives_auto_makesym /usr/bin/cmis-client "/usr/bin/cmis-client-[0-9].[0-9]"
+}
+
+pkg_postrm() {
+	alternatives_auto_makesym /usr/bin/cmis-client "/usr/bin/cmis-client-[0-9].[0-9]"
+}
--- a/dev-cpp/libcmis/libcmis-0.2.3-r1.ebuild
+++ b/dev-cpp/libcmis/libcmis-0.2.3-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libcmis/libcmis-0.2.3.ebuild,v 1.3 2012/08/09 08:27:31 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libcmis/libcmis-0.2.3-r1.ebuild,v 1.1 2012/09/13 15:53:20 scarabeus Exp $

 EAPI=4

@ -14,11 +14,12 @@ HOMEPAGE="https://sourceforge.net/projects/libcmis/"
 [[ ${PV} == 9999 ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"

 LICENSE="|| ( GPL-2 LGPL-2 MPL-1.1 )"
-SLOT="0"
+SLOT="0.2"
 [[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs man test"

 RDEPEND="
+	!dev-cpp/libcmis:0
 	dev-libs/boost
 	dev-libs/libxml2
 	net-misc/curl
@ -39,6 +40,8 @@ src_prepare() {

 src_configure() {
 	econf \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--program-suffix=-${SLOT} \
 		--disable-werror \
 		$(use_with man) \
 		$(use_enable static-libs static) \
@ -50,3 +53,11 @@ src_install() {
 	default
 	find "${ED}" -name '*.la' -exec rm -f {} +
 }
+
+pkg_postinst() {
+	alternatives_auto_makesym /usr/bin/cmis-client "/usr/bin/cmis-client-[0-9].[0-9]"
+}
+
+pkg_postrm() {
+	alternatives_auto_makesym /usr/bin/cmis-client "/usr/bin/cmis-client-[0-9].[0-9]"
+}
--- a/dev-cpp/libcmis/libcmis-0.3.0.ebuild
+++ b/dev-cpp/libcmis/libcmis-0.3.0.ebuild
@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libcmis/libcmis-0.3.0.ebuild,v 1.1 2012/09/13 15:53:20 scarabeus Exp $
+
+EAPI=4
+
+EGIT_REPO_URI="git://gitorious.org/libcmis/libcmis.git"
+[[ ${PV} == 9999 ]] && SCM_ECLASS="git-2"
+inherit eutils alternatives autotools ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="C++ client library for the CMIS interface"
+HOMEPAGE="https://sourceforge.net/projects/libcmis/"
+[[ ${PV} == 9999 ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 LGPL-2 MPL-1.1 )"
+SLOT="0.3"
+[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs man test"
+
+RDEPEND="
+	!dev-cpp/libcmis:0
+	dev-libs/boost
+	dev-libs/libxml2
+	net-misc/curl
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	man? ( app-text/docbook2X )
+	test? ( dev-util/cppunit )
+"
+
+src_prepare() {
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--program-suffix=-${SLOT} \
+		--disable-werror \
+		$(use_with man) \
+		$(use_enable static-libs static) \
+		$(use_enable test tests) \
+		--disable-long-tests \
+		--enable-client
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
+
+pkg_postinst() {
+	alternatives_auto_makesym /usr/bin/cmis-client "/usr/bin/cmis-client-[0-9].[0-9]"
+}
+
+pkg_postrm() {
+	alternatives_auto_makesym /usr/bin/cmis-client "/usr/bin/cmis-client-[0-9].[0-9]"
+}
--- a/dev-cpp/libcmis/libcmis-9999.ebuild
+++ b/dev-cpp/libcmis/libcmis-9999.ebuild
@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libcmis/libcmis-9999.ebuild,v 1.6 2012/06/21 15:31:11 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libcmis/libcmis-9999.ebuild,v 1.7 2012/09/13 15:53:20 scarabeus Exp $

 EAPI=4

 EGIT_REPO_URI="git://gitorious.org/libcmis/libcmis.git"
 [[ ${PV} == 9999 ]] && SCM_ECLASS="git-2"
-inherit autotools ${SCM_ECLASS}
+inherit eutils alternatives autotools ${SCM_ECLASS}
 unset SCM_ECLASS

 DESCRIPTION="C++ client library for the CMIS interface"
@ -14,11 +14,12 @@ HOMEPAGE="https://sourceforge.net/projects/libcmis/"
 [[ ${PV} == 9999 ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"

 LICENSE="|| ( GPL-2 LGPL-2 MPL-1.1 )"
-SLOT="0"
+SLOT="0.3"
 [[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs man test"

 RDEPEND="
+	!dev-cpp/libcmis:0
 	dev-libs/boost
 	dev-libs/libxml2
 	net-misc/curl
@ -29,23 +30,31 @@ DEPEND="${RDEPEND}
 	test? ( dev-util/cppunit )
 "

-# It fetches the apache chemistry webapp and then try to run some magic on it
-RESTRICT="test"
-
 src_prepare() {
-	eautoreconf
+	[[ ${PV} == 9999 ]] && eautoreconf
 }

 src_configure() {
 	econf \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--program-suffix=-${SLOT} \
 		--disable-werror \
 		$(use_with man) \
 		$(use_enable static-libs static) \
 		$(use_enable test tests) \
+		--disable-long-tests \
 		--enable-client
 }

 src_install() {
 	default
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	prune_libtool_files --all
+}
+
+pkg_postinst() {
+	alternatives_auto_makesym /usr/bin/cmis-client "/usr/bin/cmis-client-[0-9].[0-9]"
+}
+
+pkg_postrm() {
+	alternatives_auto_makesym /usr/bin/cmis-client "/usr/bin/cmis-client-[0-9].[0-9]"
 }
--- a/dev-cpp/sparsehash/sparsehash-2.0.2.ebuild
+++ b/dev-cpp/sparsehash/sparsehash-2.0.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/sparsehash/sparsehash-2.0.2.ebuild,v 1.1 2012/06/16 08:22:23 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/sparsehash/sparsehash-2.0.2.ebuild,v 1.2 2012/09/13 11:27:26 ago Exp $

 EAPI="4"

@ -10,7 +10,7 @@ SRC_URI="http://sparsehash.googlecode.com/files/${P}.tar.gz"

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

 src_install() {
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@ -1 +1,2 @@
 DIST tbb40_297oss_src.tgz 2097295 SHA256 2d1d10564e536c0ecf50d2db984f9fd9c615909bab13531936f0ca2c0e7cc2c2 SHA512 d41365eb13fdaab78fbdbc20d7d39681e3b6effc3e162c887dc2298307c1b7ad510133c1df50a458d6fd30f8b90f6af7be990180fd25695c2428d096097b9af5 WHIRLPOOL 05b471a23ea2f8c1f4f04bfe48abcf3156b06e5a2b405ae10f6767f10cc80268875802c1c4a140eaafdb17c44c102d6aff69c8296e650c6dbc42ea3487576e30
+DIST tbb41_20120718oss_src.tgz 2223581 SHA256 fb5c2082b6871eedc6c77ac7cec7d46f5ce7498b848f91808d954d93469115cb SHA512 3e7b2367db84c4c46dd2f7ecb1ac35068bd8ef8adf768ec11a5b37306c9e100e02d685c877521fbcc4928d612e7b2663574ba439f938011e6a0477de750d417a WHIRLPOOL 9b323f881d72940ae17ab42e6e8051dc2ecf704bce8d3da5ec4cb111bf432323232a1dacc62e4381977ac773bb14502f01261c8fcaff9aad465c296df6ab5595
--- a/dev-cpp/tbb/files/tbb-4.1.20120718-ldflags.patch
+++ b/dev-cpp/tbb/files/tbb-4.1.20120718-ldflags.patch
@ -0,0 +1,231 @@
+From: Sebastien Fabbro <bicatali@gentoo.org>
+Date: Thu Sep 13 15:13:19 PDT 2012
+Subject: build system
+
+respect LDFLAGS properly
+wrt https://bugs.gentoo.org/show_bug.cgi?id=418453
+
+diff -Nur tbb41_20120718oss.orig/build/common_rules.inc tbb41_20120718oss/build/common_rules.inc
+--- tbb41_20120718oss.orig/build/common_rules.inc	2012-08-06 05:06:15.000000000 -0700
+++ tbb41_20120718oss/build/common_rules.inc	2012-09-13 14:58:45.556908494 -0700
+@@ -44,8 +44,6 @@
+ ifeq ($(tbb_cpf),1)
+ CPLUS_FLAGS += $(DEFINE_KEY)__TBB_CPF_BUILD=1
+ endif
+-LINK_FLAGS += $(LDFLAGS)
+-LIB_LINK_FLAGS += $(LDFLAGS)
+ CPLUS_FLAGS_NOSTRICT = $(subst -strict-ansi,-ansi,$(CPLUS_FLAGS))
+ 
+ LIB_LINK_CMD ?= $(CPLUS) $(PIC_KEY)
+diff -Nur tbb41_20120718oss.orig/build/Makefile.rml tbb41_20120718oss/build/Makefile.rml
+--- tbb41_20120718oss.orig/build/Makefile.rml	2012-08-06 05:06:15.000000000 -0700
+++ tbb41_20120718oss/build/Makefile.rml	2012-09-13 14:58:45.556908494 -0700
+@@ -103,7 +103,7 @@
+ 
+ $(RML.DLL): BUILDING_LIBRARY = $(RML.DLL)
+ $(RML.DLL): $(RML_TBB_DEP) $(RML_SERVER.OBJ) $(RML.RES) $(RML_NO_VERSION.DLL) $(RML_ASM.OBJ)
+-	$(LIB_LINK_CMD) $(LIB_OUTPUT_KEY)$(RML.DLL) $(RML_SERVER.OBJ) $(RML_TBB_DEP) $(RML_ASM.OBJ) $(RML.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS)
+	$(LIB_LINK_CMD) $(LDFLAGS) $(LIB_OUTPUT_KEY)$(RML.DLL) $(RML_SERVER.OBJ) $(RML_TBB_DEP) $(RML_ASM.OBJ) $(RML.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS)
+ 
+ ifneq (,$(RML_NO_VERSION.DLL))
+ $(RML_NO_VERSION.DLL):
+@@ -126,13 +126,13 @@
+ RML_TESTS = test_job_automaton.$(TEST_EXT) test_thread_monitor.$(TEST_EXT) test_rml_tbb.$(TEST_EXT) test_rml_omp.$(TEST_EXT) test_rml_mixed.$(TEST_EXT) test_rml_omp_c_linkage.$(TEST_EXT)
+ 
+ test_rml_tbb.$(TEST_EXT): test_rml_tbb.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(TBB_DEP_RML_TEST)
+-	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) test_rml_tbb.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(TBB_DEP_RML_TEST) $(LIBS) $(LINK_FLAGS)
+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) test_rml_tbb.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(TBB_DEP_RML_TEST) $(LIBS) $(LINK_FLAGS)
+ 
+ test_rml_omp.$(TEST_EXT): test_rml_omp.$(OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_NON_RML_TEST)
+-	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) test_rml_omp.$(OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_NON_RML_TEST) $(LIBS) $(LINK_FLAGS)
+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) test_rml_omp.$(OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_NON_RML_TEST) $(LIBS) $(LINK_FLAGS)
+ 
+ test_rml_mixed.$(TEST_EXT): test_rml_mixed.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_RML_TEST)
+-	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) test_rml_mixed.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_RML_TEST) $(LIBS) $(LINK_FLAGS)
+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) test_rml_mixed.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_RML_TEST) $(LIBS) $(LINK_FLAGS)
+ 
+ rml_omp_stub.$(OBJ): rml_omp_stub.cpp
+ 	$(CPLUS) $(COMPILE_ONLY) $(M_CPLUS_FLAGS) $(WARNING_SUPPRESS) $(T_INCLUDES) $(PIC_KEY) $<
+@@ -141,7 +141,7 @@
+ 	$(CONLY) $(C_FLAGS) $(OUTPUT_KEY)$@ test_rml_omp_c_linkage.$(OBJ) rml_omp_stub.$(OBJ) omp_dynamic_link.$(OBJ) $(LIBS) $(LINK_FLAGS)
+ 
+ test_%.$(TEST_EXT): test_%.$(OBJ) $(TBB_DEP_NON_RML_TEST)
+-	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(TBB_DEP_NON_RML_TEST) $(LIBS) $(LINK_FLAGS)
+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(TBB_DEP_NON_RML_TEST) $(LIBS) $(LINK_FLAGS)
+ 
+ ### run_cmd is usually empty
+ rml_test: $(call cross_suffix,$(RML.DLL)) $(TEST_PREREQUISITE) $(RML_TESTS)
+diff -Nur tbb41_20120718oss.orig/build/Makefile.tbb tbb41_20120718oss/build/Makefile.tbb
+--- tbb41_20120718oss.orig/build/Makefile.tbb	2012-08-06 05:06:15.000000000 -0700
+++ tbb41_20120718oss/build/Makefile.tbb	2012-09-13 14:58:45.556908494 -0700
+@@ -120,7 +120,7 @@
+ 
+ $(TBB.DLL): BUILDING_LIBRARY = $(TBB.DLL)
+ $(TBB.DLL): $(TBB.OBJ) $(TBB.RES) tbbvars.sh $(TBB_NO_VERSION.DLL)
+-	$(LIB_LINK_CMD) $(LIB_OUTPUT_KEY)$(TBB.DLL) $(TBB.OBJ) $(TBB.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS)
+	$(LIB_LINK_CMD) $(LDFLAGS) $(LIB_OUTPUT_KEY)$(TBB.DLL) $(TBB.OBJ) $(TBB.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS)
+ 
+ ifneq (,$(TBB_NO_VERSION.DLL))
+ $(TBB_NO_VERSION.DLL):
+diff -Nur tbb41_20120718oss.orig/build/Makefile.tbbmalloc tbb41_20120718oss/build/Makefile.tbbmalloc
+--- tbb41_20120718oss.orig/build/Makefile.tbbmalloc	2012-08-06 05:06:15.000000000 -0700
+++ tbb41_20120718oss/build/Makefile.tbbmalloc	2012-09-13 15:06:11.893254873 -0700
+@@ -82,7 +82,7 @@
+ 
+ $(MALLOC.DLL): BUILDING_LIBRARY = $(MALLOC.DLL)
+ $(MALLOC.DLL): $(MALLOC.OBJ) $(MALLOC.RES) $(MALLOC_NO_VERSION.DLL)
+-	$(subst $(CPLUS),$(CONLY),$(LIB_LINK_CMD)) $(LIB_OUTPUT_KEY)$(MALLOC.DLL) $(MALLOC.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(MALLOC_LINK_FLAGS)
+	$(subst $(CPLUS),$(CONLY),$(LIB_LINK_CMD)) $(LDFLAGS) $(LIB_OUTPUT_KEY)$(MALLOC.DLL) $(MALLOC.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(MALLOC_LINK_FLAGS)
+ 
+ ifneq (,$(MALLOCPROXY.DEF))
+ tbbmallocproxy.def: $(MALLOCPROXY.DEF)
+@@ -95,7 +95,7 @@
+ ifneq (,$(MALLOCPROXY.DLL))
+ $(MALLOCPROXY.DLL): BUILDING_LIBRARY = $(MALLOCPROXY.DLL)
+ $(MALLOCPROXY.DLL): $(PROXY.OBJ) $(MALLOCPROXY_NO_VERSION.DLL) $(MALLOC.DLL) $(MALLOC.RES)
+-	$(LIB_LINK_CMD) $(LIB_OUTPUT_KEY)$(MALLOCPROXY.DLL) $(PROXY.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(LINK_MALLOC.LIB) $(PROXY_LINK_FLAGS)
+	$(LIB_LINK_CMD) $(LDFLAGS) $(LIB_OUTPUT_KEY)$(MALLOCPROXY.DLL) $(PROXY.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(LINK_MALLOC.LIB) $(PROXY_LINK_FLAGS)
+ endif
+ 
+ ifneq (,$(MALLOC_NO_VERSION.DLL))
+@@ -143,38 +143,38 @@
+ endif
+ 
+ test_malloc_overload.$(TEST_EXT): test_malloc_overload.cpp
+-	$(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/MD,$(M_CPLUS_FLAGS)) $(M_INCLUDES) $< $(LIBDL) $(LIBS) $(LINK_FLAGS)
+	$(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/MD,$(M_CPLUS_FLAGS)) $(LDFLAGS) $(M_INCLUDES) $< $(LIBDL) $(LIBS) $(LINK_FLAGS)
+ test_malloc_overload_proxy.$(TEST_EXT): test_malloc_overload.cpp $(MALLOC_PROXY_LIB)
+-	$(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/MD,$(M_CPLUS_FLAGS)) $(M_INCLUDES) $< $(LIBDL) $(MALLOC_PROXY_LIB) $(LIBS) $(LINK_FLAGS)
+	$(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/MD,$(M_CPLUS_FLAGS)) $(LDFLAGS) $(M_INCLUDES) $< $(LIBDL) $(MALLOC_PROXY_LIB) $(LIBS) $(LINK_FLAGS)
+ 
+ test_malloc_whitebox.$(TEST_EXT): test_malloc_whitebox.cpp $(MALLOC_ASM.OBJ) version_string.ver
+-	$(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(M_INCLUDES) $(INCLUDE_KEY). $< $(MALLOC_ASM.OBJ) $(LIBS) $(LIBDL) $(LINK_FLAGS)
+	$(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(LDFLAGS) $(M_INCLUDES) $(INCLUDE_KEY). $< $(MALLOC_ASM.OBJ) $(LIBS) $(LIBDL) $(LINK_FLAGS)
+ 
+ test_malloc_lib_unload.$(TEST_EXT): test_malloc_lib_unload.cpp test_malloc_lib_unload_dll.$(DLL)
+-	$(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(M_INCLUDES) $< $(LIBS) test_malloc_lib_unload_dll.$(LIBEXT)  $(LIBDL) $(LINK_FLAGS)
+	$(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(LDFLAGS) $(M_INCLUDES) $< $(LIBS) test_malloc_lib_unload_dll.$(LIBEXT)  $(LIBDL) $(LINK_FLAGS)
+ 
+ # TODO: use generic rules
+ test_malloc_used_by_lib.$(TEST_EXT): test_malloc_used_by_lib.cpp test_malloc_used_by_lib.$(DLL)
+-	$(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(M_INCLUDES) $< $(LIBS) $(LIBDL) $(LINK_FLAGS)
+	$(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(LDFLAGS) $(M_INCLUDES) $< $(LIBS) $(LIBDL) $(LINK_FLAGS)
+ 
+ test_malloc_used_by_lib.$(DLL): test_malloc_used_by_lib.cpp
+ 	$(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/LD,$(M_CPLUS_FLAGS)) $(PIC_KEY) $(M_INCLUDES) $(DEFINE_KEY)_USRDLL $< $(MALLOC_LIB) $(LINK_FLAGS) $(DYLIB_KEY)
+ 
+ $(MALLOC_MAIN_TESTS): %.$(TEST_EXT): %.$(OBJ) $(MALLOC_LIB)
+-	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(MALLOC_LIB) $(LIBS) $(LINK_FLAGS)
+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(MALLOC_LIB) $(LIBS) $(LINK_FLAGS)
+ 
+ MALLOC_C_TESTS = test_malloc_pure_c.$(TEST_EXT)
+ 
+ $(MALLOC_C_TESTS): %.$(TEST_EXT): %.$(OBJ) $(MALLOC_LIB)
+-	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $^ $(LIBS) $(LINK_FLAGS)
+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $^ $(LIBS) $(LINK_FLAGS)
+ 
+ # Rules for generating a test DLL
+ %_dll.$(DLL): %_dll.$(OBJ)
+-	$(LIB_LINK_CMD) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(PIC_KEY) $< $(LIBS) $(LINK_FLAGS) $(DYLIB_KEY)
+	$(LIB_LINK_CMD) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(PIC_KEY) $< $(LIBS) $(LINK_FLAGS) $(DYLIB_KEY)
+ .PRECIOUS: %_dll.$(OBJ)
+ 
+ test_malloc_atexit.$(TEST_EXT): test_malloc_atexit.$(OBJ) test_malloc_atexit_dll.$(DLL)
+-	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(MALLOC_PROXY_LIB) $(MALLOC_LIB) test_malloc_atexit_dll.$(LIBEXT) $(LIBS) $(LINK_FLAGS)
+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(MALLOC_PROXY_LIB) $(MALLOC_LIB) test_malloc_atexit_dll.$(LIBEXT) $(LIBS) $(LINK_FLAGS)
+ 
+ MALLOC_TESTS = $(MALLOC_MAIN_TESTS) $(MALLOC_C_TESTS) test_malloc_whitebox.$(TEST_EXT) test_malloc_used_by_lib.$(TEST_EXT)
+ ifneq (,$(MALLOCPROXY.DLL))
+diff -Nur tbb41_20120718oss.orig/build/Makefile.tbbproxy tbb41_20120718oss/build/Makefile.tbbproxy
+--- tbb41_20120718oss.orig/build/Makefile.tbbproxy	2012-08-06 05:06:15.000000000 -0700
+++ tbb41_20120718oss/build/Makefile.tbbproxy	2012-09-13 14:58:45.557908491 -0700
+@@ -102,7 +102,7 @@
+ 
+ # Link rules.
+ $(PROXY_TESTS_EXES): %.$(TEST_EXT): %.$(OBJ) $(PROXY_LIB)
+-	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(PROXY_LIB) $(LIBS) $(LIBDL) $(LINK_FLAGS)
+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(PROXY_LIB) $(LIBS) $(LIBDL) $(LINK_FLAGS)
+ 
+ # Compilation rules.
+ $(PROXY_TESTS_OBJS): %.$(OBJ): %.cpp
+diff -Nur tbb41_20120718oss.orig/build/Makefile.test tbb41_20120718oss/build/Makefile.test
+--- tbb41_20120718oss.orig/build/Makefile.test	2012-08-06 05:06:15.000000000 -0700
+++ tbb41_20120718oss/build/Makefile.test	2012-09-13 15:10:46.438703091 -0700
+@@ -55,17 +55,17 @@
+ 
+ # Rule for generating executable test
+ %.$(TEST_EXT): %.$(OBJ) $(TBB.LIB) $(if $(use_proxy),$(LINK_TBB.LIB))
+-	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
+ 
+ # Rules for generating a test DLL
+ %_dll.$(DLL): %_dll.$(OBJ) $(TBB.LIB)
+-	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(PIC_KEY) $< $(LINK_TBB.LIB) $(LIBS) $(LINK_FLAGS) $(DYLIB_KEY)
+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(PIC_KEY) $< $(LINK_TBB.LIB) $(LIBS) $(LINK_FLAGS) $(DYLIB_KEY)
+ .PRECIOUS: %_dll.$(OBJ) %_dll.$(DLL)
+ 
+ # Rules for the tests, which use TBB in a dynamically loadable library
+ test_model_plugin.$(TEST_EXT): CPLUS_FLAGS := $(CPLUS_FLAGS:$(USE_PROXY_FLAG)=)
+ test_model_plugin.$(TEST_EXT): test_model_plugin.$(OBJ) test_model_plugin_dll.$(DLL)
+-	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(LIBDL) $(LIBS) $(LINK_FLAGS)
+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(LIBDL) $(LIBS) $(LINK_FLAGS)
+ 
+ 
+ # tbb_misc.$(OBJ) has to be specified here (instead of harness_inject_scheduler.h) because it carries dependency on version_string.ver
+@@ -82,31 +82,31 @@
+ $(SCHEDULER_DIRECTLY_INCLUDED): WARNING_KEY += $(WARNING_SUPPRESS)
+ 
+ $(SCHEDULER_DIRECTLY_INCLUDED): %.$(TEST_EXT) : %.$(OBJ) $(SCHEDULER_DEPENDENCIES)
+-	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $^ $(LIBDL) $(LIBS) $(LINK_FLAGS)
+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $^ $(LIBDL) $(LIBS) $(LINK_FLAGS)
+ 
+ # Tests that use some features of C++11
+ TEST_TBB_CPP11 = test_lambda.$(TEST_EXT) test_cache_aligned_allocator_STL.$(TEST_EXT)
+ 
+ $(TEST_TBB_CPP11:%.$(TEST_EXT)=%.$(OBJ)): %.$(OBJ): %.cpp
+-	$(CPLUS) $(COMPILE_ONLY) $(CPLUS_FLAGS) $(CPP11_FLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $<
+	$(CPLUS) $(COMPILE_ONLY) $(CPLUS_FLAGS) $(LDFLAGS) $(CPP11_FLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $<
+ $(TEST_TBB_CPP11): %.$(TEST_EXT): %.$(OBJ) $(TBB.LIB) $(if $(use_proxy),$(LINK_TBB.LIB))
+-	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(CPP11_FLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(CPP11_FLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
+ 
+ test_tbb_header2.$(OBJ): test_tbb_header.cpp
+-	$(CPLUS) $(COMPILE_ONLY) $(CPLUS_FLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $(DEFINE_KEY)__TBB_TEST_SECONDARY=1 $< $(OUTPUTOBJ_KEY)$@
+	$(CPLUS) $(COMPILE_ONLY) $(CPLUS_FLAGS) $(LDFLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $(DEFINE_KEY)__TBB_TEST_SECONDARY=1 $< $(OUTPUTOBJ_KEY)$@
+ 
+ # Detecting "multiple definition" linker error using the test that covers the whole library
+ test_tbb_header.$(TEST_EXT): test_tbb_header.$(OBJ) test_tbb_header2.$(OBJ) $(TBB.LIB)
+-	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) test_tbb_header.$(OBJ) test_tbb_header2.$(OBJ) $(LINK_TBB.LIB) $(LIBS) $(LINK_FLAGS)
+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) test_tbb_header.$(OBJ) test_tbb_header2.$(OBJ) $(LINK_TBB.LIB) $(LIBS) $(LINK_FLAGS)
+ 
+ # Checks that TBB atomics work correctly in position independent code
+ test_atomic_pic.$(TEST_EXT): test_atomic.cpp
+-	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(PIC_KEY) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $(DEFINE_KEY)__TBB_TEST_PIC=1 $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(PIC_KEY) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $(DEFINE_KEY)__TBB_TEST_PIC=1 $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
+ 
+ #Test of generic gcc port 
+ %_compiler_builtins.$(TEST_EXT): CPLUS_FLAGS+=$(DEFINE_KEY)__TBB_TEST_GCC_BUILTINS=1
+ %_compiler_builtins.$(TEST_EXT): %.cpp
+-	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $< $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $< $(LIBS) $(AUX_LIBS) $(LINK_FLAGS)
+ 
+ # The main list of TBB tests
+ TEST_TBB_PLAIN.EXE = test_assembly.$(TEST_EXT)   \
+@@ -192,7 +192,7 @@
+ 
+ ifdef OPENMP_FLAG
+ test_openmp.$(TEST_EXT): test_openmp.cpp
+-	$(CPLUS) $(OPENMP_FLAG) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(INCLUDES) $< $(LIBS) $(LINK_TBB.LIB) $(LINK_FLAGS)
+	$(CPLUS) $(OPENMP_FLAG) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(INCLUDES) $< $(LIBS) $(LINK_TBB.LIB) $(LINK_FLAGS)
+ test_tbb_openmp: $(TEST_PREREQUISITE) test_openmp.$(TEST_EXT)
+ 	$(run_cmd) ./test_openmp.$(TEST_EXT) 1:4
+ else
+@@ -202,7 +202,7 @@
+ 
+ ifdef CILK_AVAILABLE
+ test_cilk_dynamic_load.$(TEST_EXT): test_cilk_dynamic_load.$(OBJ) test_cilk_dynamic_load_dll.$(DLL)
+-	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(LINK_TBB.LIB) $(LIBDL) $(LIBS) $(LINK_FLAGS)
+	$(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(LINK_TBB.LIB) $(LIBDL) $(LIBS) $(LINK_FLAGS)
+ # Workaround on cilkrts linkage known issue (see Intel(R) C++ Composer XE 2011 Release Notes)
+ # The issue reveals itself if a version of binutils is prior to 2.17
+ ifeq (linux_icc,$(tbb_os)_$(compiler))
--- a/dev-cpp/tbb/tbb-4.0.297.ebuild
+++ b/dev-cpp/tbb/tbb-4.0.297.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.0.297.ebuild,v 1.10 2012/08/08 12:04:53 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.0.297.ebuild,v 1.11 2012/09/13 22:37:22 bicatali Exp $

 EAPI=4
 inherit eutils flag-o-matic multilib versionator toolchain-funcs
@ -22,12 +22,12 @@ SRC_URI="http://www.threadingbuildingblocks.org/uploads/${MYU}/${PV1}.${PV2}${MY
 LICENSE="GPL-2-with-exceptions"

 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc examples"
 # FIXME
 # https://bugs.gentoo.org/show_bug.cgi?id=412675#c10
 # restricting test for stabilization
-RESTRICT="test"
+#RESTRICT="test"

 DEPEND=""
 RDEPEND="${DEPEND}"
--- a/dev-cpp/tbb/tbb-4.1.20120718.ebuild
+++ b/dev-cpp/tbb/tbb-4.1.20120718.ebuild
@ -0,0 +1,120 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.1.20120718.ebuild,v 1.1 2012/09/13 22:37:22 bicatali Exp $
+
+EAPI=4
+inherit eutils flag-o-matic multilib versionator toolchain-funcs
+
+# those 2 below change pretty much every release
+# url number
+MYU="77/188"
+# release update
+MYR=""
+
+PV1="$(get_version_component_range 1)"
+PV2="$(get_version_component_range 2)"
+PV3="$(get_version_component_range 3)"
+MYP="${PN}${PV1}${PV2}_${PV3}oss"
+
+DESCRIPTION="High level abstract threading library"
+HOMEPAGE="http://www.threadingbuildingblocks.org/"
+SRC_URI="http://www.threadingbuildingblocks.org/uploads/${MYU}/${PV1}.${PV2}${MYR}/${MYP}_src.tgz"
+LICENSE="GPL-2-with-exceptions"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc examples"
+# FIXME
+# https://bugs.gentoo.org/show_bug.cgi?id=412675#c10
+# sep 12: still many tests are failing
+# restricting test for stabilization
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${MYP}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-4.1.20120718-ldflags.patch \
+		"${FILESDIR}"/${PN}-4.0.297-underlinking.patch
+	# use fully qualified compilers. do not force pentium4 for x86 users
+	sed -i \
+		-e "s/-O2/${CXXFLAGS}/g" \
+		-e "/CPLUS/s/g++/$(tc-getCXX)/g" \
+		-e "/CONLY/s/gcc/$(tc-getCC)/g" \
+		-e "s/shell gcc/shell $(tc-getCC)/g" \
+		-e '/CPLUS_FLAGS +=/s/-march=pentium4//' \
+		-e 's/-m64//g' \
+		-e 's/-m32//g' \
+		build/*.inc || die
+	# - Strip the $(shell ... >$(NUL) 2>$(NUL)) wrapping, leaving just the
+	#   actual command.
+	# - Force generation of version_string.tmp immediately after the directory
+	#   is created.  This avoids a race when the user builds tbb and tbbmalloc
+	#   concurrently.  The choice of Makefile.tbb (instead of
+	#   Makefile.tbbmalloc) is arbitrary.
+	#sed -i \
+	#	-e 's/^\t\$(shell \(.*\) >\$(NUL) 2>\$(NUL))\s*/\t\1/' \
+	#	-e 's!^\t@echo Created \$(work_dir)_\(debug\|release\).*$!&\n\t$(MAKE) -C "$(work_dir)_\1"  -r -f $(tbb_root)/build/Makefile.tbb cfg=\1 tbb_root=$(tbb_root) version_string.tmp!' \
+	#	src/Makefile || die
+	find include -name \*.html -delete
+
+	cat <<-EOF > ${PN}.pc
+		prefix=${EPREFIX}/usr
+		libdir=\${prefix}/$(get_libdir)
+		includedir=\${prefix}/include
+		Name: ${PN}
+		Description: ${DESCRIPTION}
+		Version: ${PV}
+		URL: ${HOMEPAGE}
+		Libs: -L\${libdir} -ltbb -ltbbmalloc
+		Cflags: -I\${includedir}
+	EOF
+}
+
+src_compile() {
+	# wrt #418453#c3
+	append-ldflags $(no-as-needed)
+
+	if [[ $(tc-getCXX) == *g++ ]]; then
+		myconf="compiler=gcc"
+	elif [[ $(tc-getCXX) == *ic*c ]]; then
+		myconf="compiler=icc"
+	fi
+	local ccconf="${myconf}"
+	if use debug || use examples; then
+		ccconf="${ccconf} tbb_debug tbbmalloc_debug"
+	fi
+	emake -C src ${ccconf} tbb_release tbbmalloc_release
+}
+
+src_test() {
+	local ccconf="${myconf}"
+	if use debug || use examples; then
+		${ccconf}="${myconf} test_debug tbbmalloc_test_debug"
+	fi
+	emake -j1 -C src ${ccconf} test_release
+}
+
+src_install(){
+	local l
+	for l in $(find build -name lib\*.so.\*); do
+		dolib.so ${l}
+		local bl=$(basename ${l})
+		dosym ${bl} /usr/$(get_libdir)/${bl%.*}
+	done
+	insinto /usr
+	doins -r include
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+	dodoc README CHANGES doc/Release_Notes.txt
+	use doc && dohtml -r doc/html/*
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples/build
+		doins build/*.inc
+		insinto /usr/share/doc/${PF}/examples
+		doins -r examples
+	fi
+}
--- a/dev-db/libdbi-drivers/Manifest
+++ b/dev-db/libdbi-drivers/Manifest
@ -1,2 +1 @@
-DIST libdbi-drivers-0.8.1.tar.gz 1147446 SHA256 1b45bb53693feccdcc7fe7d32d37474e3ae15e8013553cc7051faa101f445bcd SHA512 90f9909f87a540fbd317812a3fa1f121c42544d56ced838c72c5668122ebb070408aeb57fb5394766dd15ee4ff2309c73df5a837370f12af5750aa27721051f2 WHIRLPOOL 11dcac53d0f337eaec579575cbfa9ea7547834b893428dcd62889285d9df00cdba3fbc0c117872129c317d9ef9152519f75cc2c2df4c9ebf8e5e7535ab198269
 DIST libdbi-drivers-0.8.3-1.tar.gz 1534420 SHA256 4ab9944398ce769c0deeb64d2f73555c67bc25ccd2ade1ccf552226c7b2acf72 SHA512 c2cb76234b9137cc4a05af42a69ea7d5b08586287378406cbd4d114598598057f29cccb368bfbe0f86e19846ceab88ed636cccff6555ef9f7eebbb98bbcd3824 WHIRLPOOL fc8df681ccdf6995727b0bf7aa315090dc4af2849c02e6b78913f6d5ecdc51c5e60b7eba3f515050a4ae93e74dfa7f1dcc1f7aca7fe3c12e3f02ecfd04184700
--- a/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.1-oci8.diff
+++ b/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.1-oci8.diff
@ -1,20 +0,0 @@
--- libdbi-drivers-0.8.1/drivers/oracle/dbd_oracle.c.orig	2005-08-31 23:44:53.000000000 +0200
-+++ libdbi-drivers-0.8.1/drivers/oracle/dbd_oracle.c	2006-05-30 13:10:48.000000000 +0200
-@@ -523,7 +523,7 @@
- 	unsigned int sizeattrib;
- 	dbi_data_t *data;
- 	char *ptr, *cols[result->numfields];
-	dword status;
-+	sword status;
- 
- 	/* 
- 	 * Prefetch all cols as char *'s 
-@@ -700,7 +700,7 @@
- }
- 
- /* taken from sqlite3 driver */
-size_t dbd_quote_binary (dbi_conn_t *conn, const unsigned char *orig, size_t from_length, char **ptr_dest ) {
-+size_t dbd_quote_binary (dbi_conn_t *conn, const unsigned char *orig, size_t from_length, unsigned char **ptr_dest ) {
-   unsigned char *temp;
-   size_t len;
- 
--- a/dev-db/libdbi-drivers/libdbi-drivers-0.8.1-r1.ebuild
+++ b/dev-db/libdbi-drivers/libdbi-drivers-0.8.1-r1.ebuild
@ -1,65 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi-drivers/libdbi-drivers-0.8.1-r1.ebuild,v 1.13 2010/09/28 17:22:52 robbat2 Exp $
-
-inherit eutils
-
-DESCRIPTION="The libdbi-drivers project maintains drivers for libdbi."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://libdbi-drivers.sourceforge.net/"
-LICENSE="LGPL-2.1"
-DEPEND=">=dev-db/libdbi-0.8.0
-		mysql? ( virtual/mysql )
-		postgres? ( dev-db/postgresql-base )
-		sqlite? ( <dev-db/sqlite-3 )
-		sqlite3? ( >=dev-db/sqlite-3 )
-		firebird? ( dev-db/firebird )"
-
-IUSE="mysql postgres sqlite oci8 firebird sqlite3"
-KEYWORDS="amd64 hppa ppc ~sparc x86"
-SLOT=0
-
-src_unpack() {
-	unpack ${A}
-	EPATCH_OPTS="-p1 -d${S}" epatch "${FILESDIR}"/${P}-oci8.diff
-}
-
-src_compile() {
-	local myconf=""
-	local drivers=""
-# WARNING: the configure script does NOT work correctly
-# --without-$driver does NOT work
-# so do NOT use `use_with...`
-	use mysql && drivers="${drivers} mysql" myconf="${myconf} --with-mysql"
-	use postgres && drivers="${drivers} pgsql" myconf="${myconf} --with-pgsql"
-	use sqlite && drivers="${drivers} sqlite" myconf="${myconf} --with-sqlite"
-	use sqlite3 && drivers="${drivers} sqlite3" myconf="${myconf} --with-sqlite3"
-	use firebird && drivers="${drivers} firebird" myconf="${myconf} --with-firebird"
-	if use oci8; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			die "\$ORACLE_HOME is not set!"
-		fi
-		myconf="${myconf} --with-oracle-dir=${ORACLE_HOME} --with-oracle" drivers="${drivers} oracle"
-	fi
-# safety check
-	if [ -z "${drivers}" ]; then
-		die "You have not specified any supported databases in your use flags (mysql, pgsql, sqlite, sqlite3, oracle, firebird)"
-	fi
-
-	econf ${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install () {
-	emake install DESTDIR="${D}" || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README README.osx TODO
-}
-src_test() {
-	if [ -z "${WANT_INTERACTIVE_TESTS}" ]; then
-		ewarn "Tests disabled due to interactivity."
-		ewarn "Run with WANT_INTERACTIVE_TESTS=1 if you want them."
-		return 0
-	fi
-	einfo "Running interactive tests"
-	emake check || die "Tests failed"
-}
--- a/dev-db/libdbi-drivers/libdbi-drivers-0.8.1-r2.ebuild
+++ b/dev-db/libdbi-drivers/libdbi-drivers-0.8.1-r2.ebuild
@ -1,86 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi-drivers/libdbi-drivers-0.8.1-r2.ebuild,v 1.9 2010/09/28 17:22:52 robbat2 Exp $
-
-inherit eutils
-
-DESCRIPTION="The libdbi-drivers project maintains drivers for libdbi."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://libdbi-drivers.sourceforge.net/"
-LICENSE="LGPL-2.1"
-DEPEND=">=dev-db/libdbi-0.8.0
-		mysql? ( virtual/mysql )
-		postgres? ( dev-db/postgresql-base )
-		sqlite? ( <dev-db/sqlite-3 )
-		sqlite3? ( >=dev-db/sqlite-3 )
-		!bindist? ( firebird? ( dev-db/firebird ) )"
-
-IUSE="mysql postgres sqlite oci8 firebird sqlite3 bindist"
-KEYWORDS="amd64 hppa ppc sparc x86"
-SLOT=0
-
-src_unpack() {
-	unpack ${A}
-	EPATCH_OPTS="-p1 -d${S}" epatch "${FILESDIR}"/${P}-oci8.diff
-}
-
-pkg_setup() {
-	local drivers=""
-	use mysql && drivers="${drivers} mysql"
-	use postgres && drivers="${drivers} pgsql"
-	use sqlite && drivers="${drivers} sqlite"
-	use sqlite3 && drivers="${drivers} sqlite3"
-	if use firebird; then
-		if use bindist; then
-			eerror "The Interbase Public License is incompatible with LGPL, see bug #200284."
-			eerror "Disabling firebird in the build"
-		else
-			drivers="${drivers} firebird"
-		fi
-	fi
-	if use oci8; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			die "\$ORACLE_HOME is not set!"
-		fi
-		drivers="${drivers} oracle"
-	fi
-	# safety check
-	if [ -z "${drivers// /}" ]; then
-		die "No supported databases in your USE flags! (mysql, postgres, sqlite, sqlite3, oracle, firebird)"
-	fi
-}
-
-src_compile() {
-	local myconf=""
-	# WARNING: the configure script does NOT work correctly
-	# --without-$driver does NOT work
-	# so do NOT use `use_with...`
-	use mysql && myconf="${myconf} --with-mysql"
-	use postgres && myconf="${myconf} --with-pgsql"
-	use sqlite && myconf="${myconf} --with-sqlite"
-	use sqlite3 && myconf="${myconf} --with-sqlite3"
-	use !bindist && use firebird && myconf="${myconf} --with-firebird"
-	if use oci8; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			die "\$ORACLE_HOME is not set!"
-		fi
-		myconf="${myconf} --with-oracle-dir=${ORACLE_HOME} --with-oracle"
-	fi
-
-	econf ${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install () {
-	emake install DESTDIR="${D}" || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README README.osx TODO
-}
-src_test() {
-	if [ -z "${WANT_INTERACTIVE_TESTS}" ]; then
-		ewarn "Tests disabled due to interactivity."
-		ewarn "Run with WANT_INTERACTIVE_TESTS=1 if you want them."
-		return 0
-	fi
-	einfo "Running interactive tests"
-	emake check || die "Tests failed"
-}
--- a/dev-db/libdbi-drivers/libdbi-drivers-0.8.3-r1.ebuild
+++ b/dev-db/libdbi-drivers/libdbi-drivers-0.8.3-r1.ebuild
@ -1,96 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi-drivers/libdbi-drivers-0.8.3-r1.ebuild,v 1.3 2010/09/28 17:22:52 robbat2 Exp $
-
-EAPI=1
-inherit eutils autotools
-
-MY_PV="${PV}-1"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="The libdbi-drivers project maintains drivers for libdbi."
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-HOMEPAGE="http://libdbi-drivers.sourceforge.net/"
-LICENSE="LGPL-2.1"
-DEPEND=">=dev-db/libdbi-0.8.3
-		mysql? ( virtual/mysql )
-		postgres? ( dev-db/postgresql-base )
-		sqlite? ( <dev-db/sqlite-3 )
-		sqlite3? ( >=dev-db/sqlite-3 )
-		!bindist? ( firebird? ( dev-db/firebird ) )
-		doc? ( app-text/openjade )"
-
-IUSE="mysql postgres sqlite oci8 firebird +sqlite3 bindist doc"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-SLOT=0
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${PN}-0.8.3-doc-build-fix.patch
-	epatch "${FILESDIR}"/${PN}-0.8.3-oracle-build-fix.patch
-	epatch "${FILESDIR}"/${PN}-0.8.3-firebird-fix.patch
-	cd "${S}"
-	eautoreconf
-}
-
-pkg_setup() {
-	local drivers=""
-	use mysql && drivers="${drivers} mysql"
-	use postgres && drivers="${drivers} pgsql"
-	use sqlite && drivers="${drivers} sqlite"
-	use sqlite3 && drivers="${drivers} sqlite3"
-	if use firebird; then
-		if use bindist; then
-			eerror "The Interbase Public License is incompatible with LGPL, see bug #200284."
-			eerror "Disabling firebird in the build"
-		else
-			drivers="${drivers} firebird"
-		fi
-	fi
-	if use oci8; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			die "\$ORACLE_HOME is not set!"
-		fi
-		drivers="${drivers} oracle"
-	fi
-	# safety check
-	if [ -z "${drivers// /}" ]; then
-		die "No supported databases in your USE flags! (mysql, postgres, sqlite, sqlite3, oracle, firebird)"
-	fi
-}
-
-src_compile() {
-	local myconf=""
-	# WARNING: the configure script does NOT work correctly
-	# --without-$driver does NOT work
-	# so do NOT use `use_with...`
-	use mysql && myconf="${myconf} --with-mysql"
-	use postgres && myconf="${myconf} --with-pgsql"
-	use sqlite && myconf="${myconf} --with-sqlite"
-	use sqlite3 && myconf="${myconf} --with-sqlite3"
-	use !bindist && use firebird && myconf="${myconf} --with-firebird"
-	if use oci8; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			die "\$ORACLE_HOME is not set!"
-		fi
-		myconf="${myconf} --with-oracle-dir=${ORACLE_HOME} --with-oracle"
-	fi
-
-	econf $(use_enable doc docs) ${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install () {
-	emake install DESTDIR="${D}" || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README README.osx TODO
-}
-src_test() {
-	if [ -z "${WANT_INTERACTIVE_TESTS}" ]; then
-		ewarn "Tests disabled due to interactivity."
-		ewarn "Run with WANT_INTERACTIVE_TESTS=1 if you want them."
-		return 0
-	fi
-	einfo "Running interactive tests"
-	emake check || die "Tests failed"
-}
--- a/dev-db/libdbi-drivers/libdbi-drivers-0.8.3-r2.ebuild
+++ b/dev-db/libdbi-drivers/libdbi-drivers-0.8.3-r2.ebuild
@ -1,97 +1,86 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi-drivers/libdbi-drivers-0.8.3-r2.ebuild,v 1.1 2010/09/28 17:22:52 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi-drivers/libdbi-drivers-0.8.3-r2.ebuild,v 1.3 2012/09/13 18:43:48 scarabeus Exp $
+
+EAPI=4

-EAPI=1
 inherit eutils autotools

-MY_PV="${PV}-1"
-MY_P="${PN}-${MY_PV}"
+MY_P="${P}-1"

 DESCRIPTION="The libdbi-drivers project maintains drivers for libdbi."
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 HOMEPAGE="http://libdbi-drivers.sourceforge.net/"
 LICENSE="LGPL-2.1"
-RDEPEND=">=dev-db/libdbi-0.8.3
-		mysql? ( virtual/mysql )
-		postgres? ( dev-db/postgresql-base )
-		sqlite? ( <dev-db/sqlite-3 )
-		sqlite3? ( >=dev-db/sqlite-3 )
-		!bindist? ( firebird? ( dev-db/firebird ) )"
-DEPEND="${RDEPEND}
-		doc? ( app-text/openjade )"

-IUSE="mysql postgres sqlite oci8 firebird +sqlite3 bindist doc"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="bindist doc firebird mysql oci8 postgres +sqlite static-libs"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 SLOT=0
+
+RDEPEND="
+	>=dev-db/libdbi-0.8.3
+	firebird? ( dev-db/firebird )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql-base )
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${RDEPEND}
+	doc? ( app-text/openjade )
+"
+
 S="${WORKDIR}/${MY_P}"

-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${PN}-0.8.3-doc-build-fix.patch
-	epatch "${FILESDIR}"/${PN}-0.8.3-oracle-build-fix.patch
-	epatch "${FILESDIR}"/${PN}-0.8.3-firebird-fix.patch
-	cd "${S}"
-	eautoreconf
-}
+REQUIRED_USE="
+	firebird? ( !bindist )
+	|| ( mysql postgres sqlite firebird oci8 )
+"
+
+DOCS="AUTHORS ChangeLog NEWS README README.osx TODO"

 pkg_setup() {
-	local drivers=""
-	use mysql && drivers="${drivers} mysql"
-	use postgres && drivers="${drivers} pgsql"
-	use sqlite && drivers="${drivers} sqlite"
-	use sqlite3 && drivers="${drivers} sqlite3"
-	if use firebird; then
-		if use bindist; then
-			eerror "The Interbase Public License is incompatible with LGPL, see bug #200284."
-			eerror "Disabling firebird in the build"
-		else
-			drivers="${drivers} firebird"
-		fi
-	fi
-	if use oci8; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			die "\$ORACLE_HOME is not set!"
-		fi
-		drivers="${drivers} oracle"
-	fi
-	# safety check
-	if [ -z "${drivers// /}" ]; then
-		die "No supported databases in your USE flags! (mysql, postgres, sqlite, sqlite3, oracle, firebird)"
-	fi
+	use oci8 && [[ -z "${ORACLE_HOME}" ]] && die "\$ORACLE_HOME is not set!"
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-0.8.3-doc-build-fix.patch \
+		"${FILESDIR}"/${PN}-0.8.3-oracle-build-fix.patch \
+		"${FILESDIR}"/${PN}-0.8.3-firebird-fix.patch
+	eautoreconf
 }

-src_compile() {
+src_configure() {
 	local myconf=""
 	# WARNING: the configure script does NOT work correctly
 	# --without-$driver does NOT work
 	# so do NOT use `use_with...`
-	use mysql && myconf="${myconf} --with-mysql"
-	use postgres && myconf="${myconf} --with-pgsql"
-	use sqlite && myconf="${myconf} --with-sqlite"
-	use sqlite3 && myconf="${myconf} --with-sqlite3"
-	use !bindist && use firebird && myconf="${myconf} --with-firebird"
+	use mysql && myconf+=" --with-mysql"
+	use postgres && myconf+=" --with-pgsql"
+	use sqlite && myconf+=" --with-sqlite3"
+	use firebird && myconf+=" --with-firebird"
 	if use oci8; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			die "\$ORACLE_HOME is not set!"
-		fi
-		myconf="${myconf} --with-oracle-dir=${ORACLE_HOME} --with-oracle"
+		[[ -z "${ORACLE_HOME}" ]] && die "\$ORACLE_HOME is not set!"
+		myconf+=" --with-oracle-dir=${ORACLE_HOME} --with-oracle"
 	fi

-	econf $(use_enable doc docs) ${myconf} || die "econf failed"
-	emake || die "emake failed"
+	econf \
+		$(use_enable doc docs) \
+		$(use_enable static-libs static) \
+		${myconf}
 }

-src_install () {
-	emake install DESTDIR="${D}" || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README README.osx TODO
-}
 src_test() {
-	if [ -z "${WANT_INTERACTIVE_TESTS}" ]; then
+	if [[ -z "${WANT_INTERACTIVE_TESTS}" ]]; then
 		ewarn "Tests disabled due to interactivity."
 		ewarn "Run with WANT_INTERACTIVE_TESTS=1 if you want them."
 		return 0
 	fi
 	einfo "Running interactive tests"
-	emake check || die "Tests failed"
+	emake check
+}
+
+src_install() {
+	default
+
+	prune_libtool_files --all
 }
--- a/dev-db/libdbi/Manifest
+++ b/dev-db/libdbi/Manifest
@ -1,3 +1,2 @@
-DIST libdbi-0.8.1.tar.gz 1018608 SHA256 df940f1d98a0b2006a15e4d3a2f309a7f0fb3e1b0e357d21515cfc13287379c2 SHA512 bb8dc8b1a4e0c209630d2d1dc618f4fac79fb8d0fd382aef2c2291b94770e572a758c5f54611e58fadca29a2926255481a94e98fe1a20e476e7b1412a3529e4c WHIRLPOOL d66b0929c0db6eaa105898e85f9da0a3dd99b1673414fbc85fac18c4c2cd1926da30636eebc3aaed2c240051c86bdd2b4686a3d44275096842f0e151ce48896c
 DIST libdbi-0.8.3.tar.gz 1060714 SHA256 72e41856bebb1da7b1fd1e6369358c294913f329c5e594e338b3983e6369a5e3 SHA512 408b13deb46e03af9b05bbb258236f06942a5732b58732cd85b0867e01407474a37164703c51c0d48e44d97b7622a7106f8db66a2adf15d056bc92f96a9454a0 WHIRLPOOL 72ed96b886116587f3dd290035ee98f877595021c81c71ed47077224f250370fb7e0c232af8764c7657daa0863e26b80dabdcc7881a743827e3505935b3c35ff
 DIST libdbi-0.8.4.tar.gz 1045247 SHA256 ef38db616f0752ccb09b8ba2eac471722369b8ded50b153c25e238cac2c8de99 SHA512 7e28945a96483785840511df23fd8177383a1f9ee3929df863a3e458550b6eb943f8f86f49ede167125ce64daf718b14c40ac09b99e2e8eea474eecf7ee6a530 WHIRLPOOL 6f5770d2a10e02e0e16c6354548d053811ca0205f2942c2e261cd189097423d49a0f2f86afb8308fe7b3cbfde34afc9cb0e16c2fd1471c733c44802235879064
--- a/dev-db/libdbi/libdbi-0.8.1.ebuild
+++ b/dev-db/libdbi/libdbi-0.8.1.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi/libdbi-0.8.1.ebuild,v 1.9 2012/04/25 16:21:15 jlec Exp $
-
-DESCRIPTION="libdbi implements a database-independent abstraction layer in C, similar to the DBI/DBD layer in Perl."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://libdbi.sourceforge.net/"
-LICENSE="LGPL-2.1"
-RDEPEND=""
-DEPEND=">=sys-apps/sed-4
-		${RDEPEND}"
-PDEPEND=">=dev-db/libdbi-drivers-0.8.0"
-IUSE=""
-KEYWORDS="amd64 hppa ppc sparc x86"
-SLOT=0
-
-src_unpack() {
-	unpack ${A}
-	chown -R portage:portage "${S}"
-}
-
-src_compile() {
-	# should append CFLAGS, not replace them
-	sed -i.orig -e 's/^CFLAGS = /CFLAGS += /g' src/Makefile.in
-	econf
-	emake || die "emake failed"
-}
-
-src_install () {
-	emake install DESTDIR="${D}" || die "emake install failed"
-	dodoc AUTHORS ChangeLog README README.osx TODO
-}
--- a/dev-db/libdbi/libdbi-0.8.4.ebuild
+++ b/dev-db/libdbi/libdbi-0.8.4.ebuild
@ -1,25 +1,30 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi/libdbi-0.8.4.ebuild,v 1.3 2012/05/03 02:33:10 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi/libdbi-0.8.4.ebuild,v 1.6 2012/09/13 18:46:50 scarabeus Exp $

 EAPI=4

 inherit eutils autotools multilib

-DESCRIPTION="libdbi implements a database-independent abstraction layer in C, similar to the DBI/DBD layer in Perl."
+DESCRIPTION="libdbi is a database-independent abstraction layer in C, similar to the DBI/DBD layer in Perl."
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://libdbi.sourceforge.net/"
 LICENSE="LGPL-2.1"
-RDEPEND=""
-DEPEND=">=sys-apps/sed-4
-		virtual/pkgconfig
-		doc? ( app-text/openjade )
-		${RDEPEND}"
-PDEPEND=">=dev-db/libdbi-drivers-0.8.3" # On purpose, libdbi-drivers 0.8.4 does not exist
-IUSE="doc"
+
+IUSE="doc static-libs"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 SLOT=0

+DOCS="AUTHORS ChangeLog README README.osx TODO"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	virtual/pkgconfig
+	doc? ( app-text/openjade )
+"
+PDEPEND=">=dev-db/libdbi-drivers-0.8.3" # On purpose, libdbi-drivers 0.8.4 does not exist
+
 src_unpack() {
 	unpack ${A}
 	chown -R portage:portage "${S}"
@ -37,16 +42,15 @@ src_prepare() {
 }

 src_configure() {
-	econf $(use_enable doc docs)
-}
-
-src_compile() {
-	emake || die "emake failed"
+	econf \
+		$(use_enable doc docs) \
+		$(use_enable static-libs static)
 }

 src_install () {
-	emake install DESTDIR="${ED}" || die "make install failed"
-	dodoc AUTHORS ChangeLog README README.osx TODO
+	default
+
+	prune_libtool_files --all

 	# syslog-ng requires dbi.pc
 	insinto /usr/$(get_libdir)/pkgconfig/
--- a/dev-embedded/msp430-binutils/Manifest
+++ b/dev-embedded/msp430-binutils/Manifest
@ -3,8 +3,7 @@ DIST binutils-2.21.1.tar.bz2 18997755 SHA256 cdecfa69f02aa7b05fbcdf678e33137151f
 DIST binutils-2.22-patches-1.2.tar.bz2 19283 SHA256 441a490f515fd2c9a8103114b16baba65f88eb02c754ad57ec0e86f3286729c1 SHA512 02b8820eee2d1cc3d28f89100f0718f9a4c2821c176b6c47974d23b8f25124a7f6f500b4a42eda55c2846912e91c6577444fad114e0ec11f475dc52402d63136 WHIRLPOOL 3e8faf1aea87d129f4acb2d7fa8891adde296ff3e99b60123f1b4b111d96e82743ead3e57d7ed9e8bb660789c2e37ef0e3cbace61d5e636993e08260ebdcc959
 DIST binutils-2.22-patches-1.5.tar.bz2 37350 SHA256 51cad7b3c2d18db0f7d2e4a3e46e37f00eb720cfa663ea396e16dcfbba12a07c SHA512 407490be54fec09faf26e8062cf28d2ea2d58df669642e7582fe51776726f00af8c18194a17438e18068c91b7634fca2d0f33c7231e847ba5141f901d9743ad7 WHIRLPOOL d62be803705d4e526324719fae69c06c303cc2500aeac04cb711eff383a2732ec3f47f9d91deef954c60877e08fed2c2659636dad07086ceaf12c8b899b075f1
 DIST binutils-2.22.tar.bz2 19973532 SHA256 6c7af8ed1c8cf9b4b9d6e6fe09a3e1d3d479fe63984ba8b9b26bf356b6313ca9 SHA512 ffe8ef263ef99183e8cc823fe8487ff7d0f7bf9a8efd2853b5f4636aca0023850d13de4eac7d77a5f69413d8a50e6f95bb14569be53df86c0bce38034525ab74 WHIRLPOOL 8bea2f2082600587649a5f9fffada9c6cf14f42ebddd1e6a4b4d7be25446d7ad76e1335cf8cefe30c812ced408c9dacb55d0033e4b0eaff83efbbfb5ea5f60dc
-DIST msp430-binutils-2.21.1_p20120224.patch.bz2 61426 SHA256 c864b1e06a8d2122e3baf0573e72869181bb3564469521dc8421ba9d74cef56c SHA512 b85ffa46327872d4e454b1a9492dac26153bf78e1c43ccc8590306f64abfb8ca7cfec76504473832ba82e80d2f6e7f50e9b3aed0c01ddf81d7ed835308510451 WHIRLPOOL 7802ec2d282df5728a74938a1607dd325bade7a7a7287bf1f3ee696761393d249b557526570dd1e66e8083059ac03aeeb281c6cd20bdf6caf7a80941181caf1f
-DIST msp430-binutils-2.21.1_p20120330.patch.bz2 61385 SHA256 f0268897c44a7cff657054d2870a60a7b2b41a9b0bdedeb8c26d46326681d519 SHA512 0e9da10406f01c00ab49a49d56d1957fccf0e0646d0768871c50622189798b0c0321faa693ff68ccec86362e4d39dac88426ddc63945863175440328e9a956b3 WHIRLPOOL 25e4568519ef6f455b23d23509f69a96b1191a46e6a52e3d38546e74a36b2ec6d57f092e33832bfe8468884587fcec55a5ce4f31cba754ce52c1c0aafe16f452
 DIST msp430-binutils-2.21.1_p20120406.patch.bz2 61559 SHA256 5a3dec290e15964edb0bed302800a2c23d259fd52fb9e0b932e852412245b2da SHA512 e38ec7d031ce7b09df11581ea58b3371f7f7ef478a466ac2f2d4ce7fe828bae8d2e89e63b3332e0812d9378e183ad159ff8883331ca07967c0a1bfaeae9a50f1 WHIRLPOOL f592127f83343d9a2474a4371e1d80b3799fc1e6744aa67624632bf5f76e13ff82396a38117e5cabf929b620190552b1accf369186b5272498e3bdb64042a7f7
 DIST msp430-binutils-2.22_p20120514.patch.bz2 61809 SHA256 1717afcf14a2b09bf53d92fbbaef08b38c23091f2b65143c1fd43d640a2c2417 SHA512 c4b8cfc2fd8391cb3e76f270e43ee88c16797c7443175679a26a7f86efb36f4c6c57aff5d6c95becaf0a6dd4d3381f83f6be0193559063b45df519f8f98deb39 WHIRLPOOL 308fd55e28db061f6a89ad8bf2ccfcdd08c25fffa2876ff2d250eb8a9f5b9301993b40fb82fa1cba14705fbfa9598c271cd93409ebb9e043273779dd63d741da
 DIST msp430-binutils-2.22_p20120716.patch.bz2 64770 SHA256 7c17a35d0d40874559bf93aa269e92d66701a0b1fce920bbe2c0cde90b67d125 SHA512 9fdc1656f624b241e9a804b66176172f54888156397093c1fd45464420b23ad0838c210bb160b612767906fa10350b65d113047a8d4462f0ee3e47a232f07c34 WHIRLPOOL 608a37f3a7e5a8994f261beb8d1bb8380831bca2afe9969d5ffc17930cbb11ed13ef8155c30228ba0074d9ee766f2a0b28ab329013435fd5252bebad77c762de
+DIST msp430-binutils-2.22_p20120911.patch.bz2 65169 SHA256 b7c478448dab13c285e4261c8b63d95285c424865a8b6cf1deec4fe3201a8e93 SHA512 215a2ad97f9978bb0d79f3e659e50097b878a2e56443acf96c0d8794adb9b3e1b761c137fa671c280023493cd385462978da5e0dbc0487944a2c92959ab2e672 WHIRLPOOL baafdb22290fb1f0744bb1181ddad6e113ad1495a5151422f12a3a84897bce2d9e0cc12789d359a625fa176936de3839e7bc9995f201747c525a863f7489dfec
--- a/dev-embedded/msp430-binutils/msp430-binutils-2.21.1_p20120330.ebuild
+++ b/dev-embedded/msp430-binutils/msp430-binutils-2.21.1_p20120330.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/msp430-binutils/msp430-binutils-2.21.1_p20120330.ebuild,v 1.1 2012/04/06 08:44:02 radhermit Exp $
-
-PATCHVER="1.4"
-
-BINUTILS_VER=${PV%_p*}
-
-inherit toolchain-binutils
-
-DESCRIPTION="Tools necessary to build programs for MSP430 microcontrollers"
-SRC_URI+=" http://dev.gentoo.org/~radhermit/distfiles/${P}.patch.bz2"
-
-KEYWORDS="~amd64 ~x86"
-
-# needed to fix bug #381633
-RDEPEND=">=sys-devel/binutils-config-3-r2"
-
-pkg_setup() {
-	is_cross || die "Only cross-compile builds are supported"
-}
-
-PATCHES=(
-	"${WORKDIR}"/${P}.patch
-)
--- a/dev-embedded/msp430-binutils/msp430-binutils-2.21.1_p20120224.ebuild
+++ b/dev-embedded/msp430-binutils/msp430-binutils-2.21.1_p20120224.ebuild
@ -1,15 +1,15 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/msp430-binutils/msp430-binutils-2.21.1_p20120224.ebuild,v 1.1 2012/03/01 22:38:21 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/msp430-binutils/msp430-binutils-2.22_p20120911.ebuild,v 1.1 2012/09/14 04:12:31 radhermit Exp $

-PATCHVER="1.4"
+PATCHVER="1.5"

 BINUTILS_VER=${PV%_p*}

 inherit toolchain-binutils

 DESCRIPTION="Tools necessary to build programs for MSP430 microcontrollers"
-SRC_URI+=" http://dev.gentoo.org/~radhermit/distfiles/${P}.patch.bz2"
+SRC_URI+=" http://dev.gentoo.org/~radhermit/dist/${P}.patch.bz2"

 KEYWORDS="~amd64 ~x86"

--- a/dev-embedded/msp430-gcc/Manifest
+++ b/dev-embedded/msp430-gcc/Manifest
@ -14,3 +14,4 @@ DIST msp430-gcc-4.6.2_p20120330.patch.bz2 77344 SHA256 a560bb7197c6736d37382085b
 DIST msp430-gcc-4.6.3_p20120406.patch.bz2 77359 SHA256 b2429dc96490153e122d2b398620d8e153439fce3a153059b103203038fba501 SHA512 0931ea8d0ab5a26ab7e33a203a8f97c7ff59c4e491f9bf837f0e5e6b44c19d2ec4abddd4715d07160f092aeda26bd231659bd6c87f554efd88a149464789b551 WHIRLPOOL f96b473e03aa5595b159439bdad0074d5cc2a5535af8156865ad74ad243ea74cbe6698a753f34f80bf6df77a9ee4e5888b9d7b455d04b18fb9d3b3f0ae5e83f1
 DIST msp430-gcc-4.7.0_p20120514.patch.bz2 95159 SHA256 540aa5230e21f1fb2a9430b7c8d8f9c4ca4a186293bc701d196ff8c10cbaba12 SHA512 cd592243c307023a5a851ec00821dcc0eabfb1dd92a3eff601fae2c9f924079d4d36311de5ab346f284100d59d11cc2aab342396dd4e451b2f83352c151b3a4c WHIRLPOOL d34ad99b6ae495e8e9dc460540208d351f7e8fb8c610e605f1c8ea74279d04b894a9f8eb820cd507d4f16f9b1225cb0be3356f577e095086492225cc10dd9492
 DIST msp430-gcc-4.7.0_p20120716.patch.bz2 113438 SHA256 2398cd505115f7d1d652f5146d3471f6cf21ad37b0a9ac8952458ab2ad006cac SHA512 4074465c7a2a63debfd9a4e08c400f36e2bfc2f460636bef1f2087b9f6db7e1dd59ebdfd4bc728afefaf216bb671fe3123da4d67949f604eb0ed7a9800fa0ce9 WHIRLPOOL d1fafbace2b5617911b4cf5e32e583574418e993d0a19c7d7352897825d440197baf3871038eaafd156653f66697828448434cc7ed2b2909a8f45aacdbbd3786
+DIST msp430-gcc-4.7.0_p20120911.patch.bz2 113634 SHA256 f327f1dc4d01603f952939cee614bb3f5cc712ce7d453a06414770e7676d9d8b SHA512 3168df59fad6fb20b18ac86a8597a72251fd240bbe16fef897efe0751c402bf69f5ce5905910c4d7a2458fa4ace36509712f9477af0e1069787c59a25cf553bc WHIRLPOOL 21b1162b970bac3654c4d02d86adf43cf6f223c12d524acc99898be52daf26692a1cc06e0bb7fcac5c1935d988f2384dac0b6f0b31a1e993feae30c8fd72c11e
--- a/dev-embedded/msp430-gcc/msp430-gcc-4.7.0_p20120911.ebuild
+++ b/dev-embedded/msp430-gcc/msp430-gcc-4.7.0_p20120911.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/msp430-gcc/msp430-gcc-4.7.0_p20120911.ebuild,v 1.1 2012/09/14 04:16:04 radhermit Exp $
+
+EAPI="4"
+
+PATCH_VER="1.1"
+BRANCH_UPDATE=""
+
+inherit toolchain
+
+DESCRIPTION="The GNU Compiler Collection for MSP430 microcontrollers"
+LICENSE="GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2"
+KEYWORDS=""
+SRC_URI="${SRC_URI} http://dev.gentoo.org/~radhermit/dist/${P}.patch.bz2"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	elibc_glibc? ( >=sys-libs/glibc-2.8 )
+	${CATEGORY}/msp430-binutils"
+
+pkg_pretend() {
+	is_crosscompile || die "Only cross-compile builds are supported"
+}
+
+src_prepare() {
+	epatch "${DISTDIR}"/${P}.patch.bz2
+}
--- a/dev-haskell/cairo/cairo-0.12.3.1.ebuild
+++ b/dev-haskell/cairo/cairo-0.12.3.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cairo/cairo-0.12.3.1.ebuild,v 1.2 2012/09/12 15:13:57 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cairo/cairo-0.12.3.1.ebuild,v 1.3 2012/09/13 09:58:23 ago Exp $

 EAPI=4

@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"

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

 RDEPEND="dev-haskell/mtl[profile?]
--- a/dev-haskell/glib/glib-0.12.3.1.ebuild
+++ b/dev-haskell/glib/glib-0.12.3.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glib/glib-0.12.3.1.ebuild,v 1.2 2012/09/12 14:53:15 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glib/glib-0.12.3.1.ebuild,v 1.3 2012/09/13 09:59:17 ago Exp $

 EAPI=4

@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""

 RDEPEND=">=dev-lang/ghc-6.10.1
--- a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.3.1.ebuild
+++ b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.3.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.3.1.ebuild,v 1.2 2012/09/12 15:58:41 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.3.1.ebuild,v 1.3 2012/09/13 10:00:09 ago Exp $

 EAPI=4

@ -13,7 +13,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"

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

 RDEPEND=""
--- a/dev-haskell/network/network-2.3.0.14.ebuild
+++ b/dev-haskell/network/network-2.3.0.14.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/network/network-2.3.0.14.ebuild,v 1.2 2012/09/12 15:47:25 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/network/network-2.3.0.14.ebuild,v 1.3 2012/09/13 10:02:28 ago Exp $

 EAPI="4"

@ -13,7 +13,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="test"

 RDEPEND="dev-haskell/parsec[profile?]
--- a/dev-haskell/testpack/files/testpack-2.1.2-quickcheck-2.5.patch
+++ b/dev-haskell/testpack/files/testpack-2.1.2-quickcheck-2.5.patch
@ -0,0 +1,31 @@
+--- testpack-2.1.2-orig/src/Test/HUnit/Tools.hs	2012-02-29 09:20:32.000000000 +1100
+++ testpack-2.1.2/src/Test/HUnit/Tools.hs	2012-07-09 09:03:53.104931180 +1000
+@@ -128,7 +128,13 @@
+ >        q "Integer -> Int (safe bounds)" prop_integer_to_int_pass]
+ -}
+ qc2hu :: QC.Testable a => Int -> String -> a -> HU.Test
+-qc2hu maxTest = qccheck (stdArgs {maxSuccess = maxTest, maxDiscard = 20000})
+qc2hu maxTest = qccheck (stdArgs {maxSuccess = maxTest,
+#if MIN_VERSION_QuickCheck(2,5,0)
+                                  maxDiscardRatio = if maxTest /= 0 then 20000 `div` maxTest else 10
+#else
+                                  maxDiscard = 20000
+#endif
+                                 })
+ 
+ {- | Run verbose tests.  Example:
+ 
+@@ -174,7 +180,12 @@
+               Just (rnd,_) -> return rnd
+      test MkState{ terminal          = tm
+                  , maxSuccessTests   = maxSuccess args
+-                 , maxDiscardedTests = maxDiscard args
+                 , maxDiscardedTests =
+#if MIN_VERSION_QuickCheck(2,5,0)
+                                       maxDiscardRatio args * maxSuccess args
+#else
+                                       maxDiscard args
+#endif
+                  , computeSize       = case replay args of
+                                          Nothing    -> \n d -> (n * maxSize args)
+                                                          `div` maxSuccess args
--- a/dev-haskell/testpack/testpack-2.1.2.ebuild
+++ b/dev-haskell/testpack/testpack-2.1.2.ebuild
@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/testpack/testpack-2.1.2.ebuild,v 1.2 2012/09/12 15:38:31 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/testpack/testpack-2.1.2.ebuild,v 1.3 2012/09/13 13:24:46 gienah Exp $

 EAPI=4

 # ebuild generated by hackport 0.2.18.9999

 CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
+inherit base haskell-cabal

 DESCRIPTION="Test Utililty Pack for HUnit and QuickCheck"
 HOMEPAGE="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/testpack"
@ -25,3 +25,5 @@ RDEPEND="dev-haskell/hunit[profile?]
 		>=dev-lang/ghc-6.8.2"
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.2"
+
+PATCHES=("${FILESDIR}/${PN}-2.1.2-quickcheck-2.5.patch")
--- a/dev-haskell/uulib/uulib-0.9.14.ebuild
+++ b/dev-haskell/uulib/uulib-0.9.14.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uulib/uulib-0.9.14.ebuild,v 1.2 2012/09/12 15:25:03 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uulib/uulib-0.9.14.ebuild,v 1.3 2012/09/13 10:18:00 ago Exp $

 # ebuild generated by hackport 0.2.13

@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""

 RDEPEND=">=dev-lang/ghc-6.10.1"
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.7.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.7.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.7.ebuild,v 1.3 2012/08/31 17:53:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.7.ebuild,v 1.4 2012/09/13 07:17:17 phajdan.jr Exp $

 EAPI="4"

@ -53,7 +53,7 @@ SRC_URI="

 LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
 SLOT="1.7"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

 IUSE="+X alsa derby doc examples +fontconfig jce nsplugin pax_kernel +source"
 RESTRICT="fetch strip"
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.7.ebuild
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.7.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.7.ebuild,v 1.2 2012/08/31 17:13:18 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.7.ebuild,v 1.3 2012/09/13 07:17:42 phajdan.jr Exp $

 EAPI="4"

@ -29,7 +29,7 @@ SRC_URI="

 LICENSE="Oracle-BCLA-JavaSE"
 SLOT="1.7"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"

 IUSE="X alsa fontconfig jce nsplugin pax_kernel"
 RESTRICT="fetch strip"
--- a/dev-java/sun-jdk/sun-jdk-1.6.0.35.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.6.0.35.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.35.ebuild,v 1.3 2012/09/02 18:03:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.35.ebuild,v 1.4 2012/09/13 07:16:16 phajdan.jr Exp $

 EAPI="4"

@ -51,7 +51,7 @@ SRC_URI="

 LICENSE="Oracle-BCLA-JavaSE"
 SLOT="1.6"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

 IUSE="X alsa derby doc examples jce kernel_SunOS nsplugin pax_kernel +source"

--- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.35.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.35.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.35.ebuild,v 1.3 2012/09/02 18:03:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.35.ebuild,v 1.4 2012/09/13 07:16:49 phajdan.jr Exp $

 EAPI="4"

@ -25,7 +25,7 @@ SRC_URI="

 LICENSE="Oracle-BCLA-JavaSE"
 SLOT="1.6"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"

 IUSE="X alsa jce nsplugin pax_kernel"

--- a/dev-lang/gprolog/gprolog-1.4.1.ebuild
+++ b/dev-lang/gprolog/gprolog-1.4.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gprolog/gprolog-1.4.1.ebuild,v 1.1 2012/07/02 11:52:49 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gprolog/gprolog-1.4.1.ebuild,v 1.2 2012/09/13 12:22:07 ago Exp $

 EAPI=2

@ -13,7 +13,7 @@ S="${WORKDIR}"/${P}

 LICENSE="GPL-2 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="debug doc examples"

 DEPEND=""
--- a/dev-lang/php/files/eblits/src_configure-v54.eblit
+++ b/dev-lang/php/files/eblits/src_configure-v54.eblit
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v54.eblit,v 1.6 2012/09/11 19:36:50 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v54.eblit,v 1.7 2012/09/13 10:27:41 olemarkus Exp $

 eblit-php-src_configure() {
 	addpredict /usr/share/snmp/mibs/.index
@ -74,7 +74,7 @@ eblit-php-src_configure() {
 	$(use_enable xml xml )
 	$(use_enable xmlreader xmlreader )
 	$(use_enable xmlwriter xmlwriter )
-	$(use_with xmlrpc xmlrpc "${EPREFIX}"/usr)
+	$(use_with xmlrpc xmlrpc)
 	$(use_with xsl xsl "${EPREFIX}"/usr)
 	$(use_enable zip zip )
 	$(use_with zlib zlib "${EPREFIX}"/usr)
--- a/dev-lang/php/metadata.xml
+++ b/dev-lang/php/metadata.xml
@ -9,6 +9,7 @@
 		<flag name='fileinfo'>Add fileinfo extension support</flag>
 		<flag name='filter'>Add filter extension support</flag>
 		<flag name='fpm'>Enable the FastCGI Process Manager SAPI</flag>
+		<flag name='gd'>Adds support for gd (bundled with PHP)</flag>
 		<flag name='hash'>Enable the hash extension</flag>
 		<flag name='json'>Enable JSON support</flag>
 		<flag name='ldap-sasl'>Add SASL support for the PHP LDAP extension</flag>
--- a/dev-lang/yap/Manifest
+++ b/dev-lang/yap/Manifest
@ -1,8 +1,8 @@
 DIST yap-6.2.2-gentoo-patchset-2.tar.gz 5736 SHA256 a4c74594a1342ae748c6f00b2ddd28c0d2b8decaa42d0d481617c98a1a34fdae SHA512 046dcab1fe630da06d8b2b5c4a51551fda7ac9e359db8ac92efa2d0880a8aa57ba0fac1ae6947c3fc9aa4e3498a88644f095e69f9deeea63f5433d2c5a687bf4 WHIRLPOOL f91c1aa3d377e8194fba0970a0dcb58fc5e1d45c5ac1764ed56b0904c08433c8ef0e28241efa86c85d29259771d75156fe6a981204d34571c87302435e03e941
 DIST yap-6.2.2.tar.gz 5496746 SHA256 c9b5feb1ac6488797e8c722053db239cc208f7f6f09135f1e6d5f5802f90878e SHA512 8b357f02cd631b7e4d6a44911d82d329b82a654b24637d448ba0e4393ab34918df685c453f4e8b8ebb3aba71034f653c4522478cfafbb24f157c083b623bfc5e WHIRLPOOL 7d266b06874aab2c5b56391ee0d03be025f7cf2ae5ab9a2ca2ef5989b6ef5229bde491919a1b77f3af362798af83bc47614fd3bd293c0d9f4b74d202adb86ea5
-DIST yap-6.3.0-gentoo-patchset-1.tar.gz 5405 RMD160 59becff941dfa34d2bd691bfe08f051c1619ee9b SHA1 1c7bb8153743709f304e90fe71a97212b2037c1b SHA256 1f63e18419933b9a2b9adce2bc3d3e6dbcbb98aa10abc69d7731e8a555ab2e3a
-DIST yap-6.3.0.tar.gz 5626436 RMD160 88acf118abdbf65b0a4c1d9cc87ed9df03557af5 SHA1 43a4e784fa002dee2748fa7d690c8c8a75fd785f SHA256 db1d0c46617eab2c5c2e44788252e85a8c667dc9c73e218c9dcf8a20ecbaf94e
-DIST yap-6.3.1-gentoo-patchset-0.tar.gz 2229 RMD160 d5a8d7bb6df33787fb105f46968249345cc37ca2 SHA1 f02619afc6693496234945370c74fc04fd512db6 SHA256 e6bfb2869475bd62207038ce201583adb65aa9ef480c3cc469002053a6a0697d
-DIST yap-6.3.1.tar.gz 7868709 RMD160 cf6d7f5a04208380ab964d1e51a6e65d2bfa9134 SHA1 a1bd4a9728fcebd2164a9957ae922d4ab0c3ebef SHA256 70b779b40a3a9d4401c0ca21081c6b3034d77212d6a8892bd23bb63236ebc720
-DIST yap-6.3.2-gentoo-patchset-4.tar.gz 3422 RMD160 69f9660d91c8ef69d8c2882b6ef1bb4f0ba1820e SHA1 d32835d8433097667fbb33cede6b44633db59dbe SHA256 9a0ce4bedbfa6f457d612b92085305702d237b2b43bd4040af01d29283f0a4ad
-DIST yap-6.3.2.tar.gz 6447312 RMD160 0de4119dd4e036d17ae1226758a7bd4f0b34e1d5 SHA1 2ff85e44bef2af3d09c618afa8d9ccfffcd1577a SHA256 876a31a05a8e50a32bda8597d3381953e3ed99f37f06e7075209a501b8e2d1ed
+DIST yap-6.3.0-gentoo-patchset-1.tar.gz 5405 SHA256 1f63e18419933b9a2b9adce2bc3d3e6dbcbb98aa10abc69d7731e8a555ab2e3a
+DIST yap-6.3.0.tar.gz 5626436 SHA256 db1d0c46617eab2c5c2e44788252e85a8c667dc9c73e218c9dcf8a20ecbaf94e
+DIST yap-6.3.1-gentoo-patchset-0.tar.gz 2229 SHA256 e6bfb2869475bd62207038ce201583adb65aa9ef480c3cc469002053a6a0697d
+DIST yap-6.3.1.tar.gz 7868709 SHA256 70b779b40a3a9d4401c0ca21081c6b3034d77212d6a8892bd23bb63236ebc720
+DIST yap-6.3.2-gentoo-patchset-5.tar.gz 3755 SHA256 5b4de6e21b9581498e13534a54098fb31354f2eb2ee8706de5466c6bbd1c63e8 SHA512 a9bba94833ae008f4b122a4aa1bf8c05bb7fa16b915a95ab45794cb89ed37e136072c76f6074cc68874a515e7cf3b67869e4a09c3137f3c868670f14c48d0ecb WHIRLPOOL f0472e5bd9c089e8bf9f8d5da008219a1bc3a94e2e817400a82c1d371b30efcb2c1b16259fdc70ef8b8d33a986b9870c73ab64d77decbb439dfdc80265fd5e98
+DIST yap-6.3.2.tar.gz 6447312 SHA256 876a31a05a8e50a32bda8597d3381953e3ed99f37f06e7075209a501b8e2d1ed SHA512 8fd93d4e448e92f5dfd4b0dd18e0ce988766d99b3bf7a72bce3931d551c873a11468764bef6bbb132a5518870f2bce0a00658536614db3cdc6586af27d56555d WHIRLPOOL f4507cb41735f40bf343b608a443f017e118c2b99da38e8a59e630b397c4812ce087ce097e85d5af9552191b5f77559609b22f446d05a3513fec08582ea43804
--- a/dev-lang/yap/yap-6.3.2.ebuild
+++ b/dev-lang/yap/yap-6.3.2.ebuild
@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.3.2.ebuild,v 1.6 2012/08/18 19:30:20 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.3.2.ebuild,v 1.7 2012/09/13 18:26:04 keri Exp $

 EAPI=2

 inherit eutils flag-o-matic java-pkg-opt-2 multilib

-PATCHSET_VER="4"
+PATCHSET_VER="5"

 DESCRIPTION="YAP is a high-performance Prolog compiler."
 HOMEPAGE="http://www.dcc.fc.up.pt/~vsc/Yap/"
--- a/dev-libs/iniparser/Manifest
+++ b/dev-libs/iniparser/Manifest
@ -1,3 +1 @@
-DIST iniparser-3.0.tar.gz 17045 SHA256 d6d7546a66f071d5a2bffe4c63fe7300a7962369b88c58084a36a8b7cfb9bd6d SHA512 507d786d89573d149ae7544f9e3f63754ec91d7d5a55f6ea382749fc605887a2b51b8a5e8e148b7aab5938634ef7d278bda76c8159b758c7e83af9256300e2c7 WHIRLPOOL 7efdc1e815df6eaebe20e14cc2400be560ed92b14995daa6404e5333ac4f7439440446e1759d830c084167876964cb693ab0e625eac64a8475cd6436d0d97a2b
 DIST iniparser-3.1.tar.gz 39097 SHA256 aedf23881b834519aea5e861b2400606d211da049cd59d3cfb4568e0d9eff5c5 SHA512 8fd8324c5629fdc3e3eff00afb5f0832402ccc760c5b92db82aa29b340ec891419ca2c4fee3a4d4d67cf9bc51c76b095bc0c458e087c2b8e72ac36867c47ae86 WHIRLPOOL 1b8e6d5c34918cf51db605a7bc81eed75b521a57b403bbf26b572506735d78f58bad250512d53cfc08959c827713c8477a877b66b900a553a9c8099757df6d89
-DIST iniparser3.0b.tar.gz 26080 SHA256 8a634cadcda15c53c427fc57b783b366df8213e7065646f67ceb526c5bf37426 SHA512 f02387f8610fd70c1a0548a844d90ff2a3489fea4d6c8b4563c2b0b7521321a0b631ed9ab673f0ae26959e7d9268017b248df206d5943bfe8a36391834f2ddc4 WHIRLPOOL 6ae6ff711156399a3c4d84cb780f8ca40857336dd6caf53a3c61315e556fb0e9f6007e5a9fffa16cfe283fc673b3db6afddd2b82e9ab22616ff0e91cd179e342
--- a/dev-libs/iniparser/files/iniparser-3.0b-fix-set-functions.patch
+++ b/dev-libs/iniparser/files/iniparser-3.0b-fix-set-functions.patch
@ -1,27 +0,0 @@
-diff -aur iniparser3.0b/src/iniparser.h iniparser3.0b.patched/src/iniparser.h
--- iniparser3.0b/src/iniparser.h	2007-11-23 21:38:19.000000000 +0000
-+++ iniparser3.0b.patched/src/iniparser.h	2009-04-28 11:08:28.644706261 +0100
-@@ -39,7 +39,8 @@
-  ---------------------------------------------------------------------------*/
- /** For backwards compatibility only */
- #define iniparser_getstr(d, k)  iniparser_getstring(d, k, NULL)
-#define iniparser_setstr        iniparser_setstring
-+#define iniparser_setstr        iniparser_set
-+#define iniparser_setstring     iniparser_set
- 
- /*-------------------------------------------------------------------------*/
- /**
-@@ -215,11 +216,11 @@
-   @return   int 0 if Ok, -1 otherwise.
- 
-   If the given entry can be found in the dictionary, it is modified to
-  contain the provided value. If it cannot be found, -1 is returned.
-+  contain the provided value. If it cannot be found, it is inserted.
-   It is Ok to set val to NULL.
-  */
- /*--------------------------------------------------------------------------*/
-int iniparser_setstring(dictionary * ini, char * entry, char * val);
-+int iniparser_set(dictionary * ini, char * entry, char * val);
- 
- 
- /*-------------------------------------------------------------------------*/
--- a/dev-libs/iniparser/files/iniparser-3.0b-makefile.patch
+++ b/dev-libs/iniparser/files/iniparser-3.0b-makefile.patch
@ -1,49 +0,0 @@
-diff -Naur iniparser3.0b.orig/Makefile iniparser3.0b/Makefile
--- iniparser3.0b.orig/Makefile	2010-04-07 08:02:48.771242264 +0200
-+++ iniparser3.0b/Makefile	2010-04-07 08:10:51.403895732 +0200
-@@ -3,16 +3,16 @@
- #
- 
- # Compiler settings
-CC      = gcc
-CFLAGS  = -O2 -fPIC -Wall -ansi -pedantic
-+CC      ?= gcc
-+CFLAGS  += -fPIC -Wall -ansi -pedantic
- 
- # Ar settings to build the library
-AR	    = ar
-+AR	    ?= ar
- ARFLAGS = rcv
- 
- SHLD = ${CC} ${CFLAGS}
-LDSHFLAGS = -shared -Wl,-Bsymbolic  -Wl,-rpath -Wl,/usr/lib -Wl,-rpath,/usr/lib
-LDFLAGS = -Wl,-rpath -Wl,/usr/lib -Wl,-rpath,/usr/lib
-+LDSHFLAGS = -shared -Wl,-Bsymbolic
-+LDFLAGS += -Wl,-rpath -Wl,/usr/lib -Wl,-rpath,/usr/lib
- 
- # Set RANLIB to ranlib on systems that require it (Sun OS < 4, Mac OSX)
- # RANLIB  = ranlib
-@@ -28,7 +28,7 @@
- COMPILE.c=$(CC) $(CFLAGS) -c
- .c.o:
- 	@(echo "compiling $< ...")
-	@($(COMPILE.c) -o $@ $<)
-+	$(COMPILE.c) -o $@ $<
- 
- 
- SRCS = src/iniparser.c \
-@@ -40,11 +40,11 @@
- default:	libiniparser.a libiniparser.so
- 
- libiniparser.a:	$(OBJS)
-	@($(AR) $(ARFLAGS) libiniparser.a $(OBJS))
-	@($(RANLIB) libiniparser.a)
-+	$(AR) $(ARFLAGS) libiniparser.a $(OBJS)
-+	$(RANLIB) libiniparser.a
- 
- libiniparser.so:	$(OBJS)
-	@$(SHLD) $(LDSHFLAGS) -o $@.0 $(OBJS) $(LDFLAGS) \
-+	$(SHLD) $(LDSHFLAGS) $(LDFLAGS) -o $@.0 $(OBJS) \
- 		-Wl,-soname=`basename $@`.0
- 
- clean:
--- a/dev-libs/iniparser/iniparser-3.0.0.ebuild
+++ b/dev-libs/iniparser/iniparser-3.0.0.ebuild
@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/iniparser/iniparser-3.0.0.ebuild,v 1.4 2012/05/16 12:33:33 aballier Exp $
-
-EAPI="4"
-
-inherit autotools-utils
-
-DESCRIPTION="A free stand-alone ini file parsing library."
-HOMEPAGE="http://ndevilla.free.fr/iniparser/"
-
-#name this version 3.0.0 instead of 3.0 as 3.0.0 > 3.0b > 3.0
-SRC_URI="http://ndevilla.free.fr/iniparser/${P%.0}.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-macos"
-IUSE="doc examples static-libs"
-
-DEPEND="doc? ( app-doc/doxygen )
-		sys-devel/libtool"
-RDEPEND=""
-
-# the tests are rather examples than tests, no point in running them
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}"
-
-DOCS=( AUTHORS README )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0b-cpp.patch"
-	"${FILESDIR}/${PN}-3.0-autotools.patch"
-)
-
-AUTOTOOLS_AUTORECONF=1
-
-src_install() {
-	autotools-utils_src_install
-
-	if use doc; then
-		emake -C doc
-		dohtml -r html/*
-	fi
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins test/*.{c,ini,py}
-	fi
-}
--- a/dev-libs/iniparser/iniparser-3.0b-r1.ebuild
+++ b/dev-libs/iniparser/iniparser-3.0b-r1.ebuild
@ -1,47 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/iniparser/iniparser-3.0b-r1.ebuild,v 1.15 2010/04/11 08:18:38 dev-zero Exp $
-
-inherit eutils multilib toolchain-funcs
-
-MY_P="${PN}${PV}"
-
-DESCRIPTION="A free stand-alone ini file parsing library."
-HOMEPAGE="http://ndevilla.free.fr/iniparser/"
-SRC_URI="http://ndevilla.free.fr/iniparser/${MY_P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}/${P}-fix-set-functions.patch"
-}
-
-src_compile() {
-	echo "CFLAGS: ${CFLAGS}"
-	sed -i \
-		-e "s|\(CFLAGS  =\) -O2|\1 ${CFLAGS}|" \
-		-e "s|\(LDFLAGS =\)|\1 ${LDFLAGS}|" \
-		-e "s|/usr/lib|/usr/$(get_libdir)|" \
-		Makefile || die "sed failed"
-
-	emake CC=$(tc-getCC) AR="$(tc-getAR)" || die "emake failed"
-}
-
-src_install() {
-	dolib libiniparser.a libiniparser.so.0
-	dosym libiniparser.so.0 /usr/$(get_libdir)/libiniparser.so
-
-	insinto /usr/include
-	doins src/*.h
-
-	dodoc AUTHORS README
-	dohtml html/*
-}
--- a/dev-libs/libburn/Manifest
+++ b/dev-libs/libburn/Manifest
@ -1,4 +1,2 @@
 DIST libburn-1.0.0.pl00.tar.gz 810543 SHA256 7d9f02b29c1ddb5921fa9a3e2607495c3b54cc44c1dc3b15cd40d3f991a467fb SHA512 d8941ee544aff9f017c35c8ea6d5655e18e65c4a8dba883eb29946f7d5a457b88e19f5e6086e3e5f24a2d85c48ba49b0e744aaf335cfb8183e176b5cbb6f2d75 WHIRLPOOL 98fbd6327cc5649a426450da2db1bfe1128f7d39c4715cce8d22e2166eba6b7877159a584954f92891f9162511f7faf1e3c0ebc47d85e53d5983d096a0ecf2dc
-DIST libburn-1.1.8.tar.gz 854198 SHA256 7bec3b9f750ceddc93a91353ccea5e7031b4a4db53100fe30bb98db241a5efa0 SHA512 8b9722ea431e4fb81b60df7041f7d1840e57fb4c656c74df7d4568cc6e1f31acf66dff8e85820c85c64fdc9633be40c841e143587e5a51e8d3b1e9a76d27532e WHIRLPOOL 2ce6bb68116c068bbbea04a5c84ea7d69151747244c644db92e3f1dfd7a54db2a8b3a9841dbc7c7940d07028f47da9ab484e517fa147ea2d5ac4b5f421a60762
-DIST libburn-1.2.2.tar.gz 914127 SHA256 4641ee2be317ff146653597da4c9f3133916c5c839c0bfd3c73ed73d15972e3f SHA512 f58d955e3ba1ef996eb8252a4ad3534a06c992a01e5c55ed13f3a3021b93ed0df36fe7578f9e3ca36744ba11a284cf60a3b9dc517df37ae4248bfb05f7a73885 WHIRLPOOL 9c5627bf37e59d98d6186f0eb0baa08ba2b710c9b7dd2cb9d1e1863c85ec9c32e7513dc9221040da341a607be23c83c5d454608aeca7f5fa6998c7548856bbb6
 DIST libburn-1.2.4.tar.gz 917837 SHA256 f0598fa76d157a935b576778ab8cc772f96480894239da14be84986ef1313e4b SHA512 4d8c34bdb2c829931b2a8860580319f8e374d6ea04622e40d6b97fc2120dddcd0836d31011c7797508fce0e9e5a4bcd763332bb9d505058ce656e1118c85fe0e WHIRLPOOL ab175c6af51ab1cd1982e5b96480e3b6d17dcf6c70cd6fe3509cb0d440de81c30c5e88d9add269ebf6f4c031c814c56d299d3c125dcf6fdfae16b6ff974917f7
--- a/dev-libs/libburn/libburn-1.1.8.ebuild
+++ b/dev-libs/libburn/libburn-1.1.8.ebuild
@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libburn/libburn-1.1.8.ebuild,v 1.6 2012/05/04 18:35:46 jdhore Exp $
-
-EAPI=4
-
-DESCRIPTION="Libburn is an open-source library for reading, mastering and writing optical discs."
-HOMEPAGE="http://libburnia-project.org"
-SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ppc ppc64 x86"
-IUSE="debug static-libs track-src-odirect"
-#IUSE="cdio debug static-libs track-src-odirect"
-#Supports libcdio but needs version >=0.83 which is not yet released.
-
-RDEPEND=""
-#RDEPEND="cdio? ( >=dev-libs/libcdio-0.83 )"
-DEPEND="virtual/pkgconfig"
-
-src_configure() {
-	econf \
-	$(use_enable static-libs static) \
-	$(use_enable track-src-odirect) \
-	--disable-libcdio \
-	--disable-ldconfig-at-install \
-	$(use_enable debug)
-#	$(use_enable cdio libcdio) \
-}
-
-src_install() {
-	default
-
-	dodoc CONTRIBUTORS doc/comments
-
-	cd "${S}"/cdrskin
-	docinto cdrskin
-	dodoc changelog.txt README wiki_plain.txt
-	docinto cdrskin/html
-	dohtml cdrskin_eng.html
-
-	find "${D}" -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
-}
--- a/dev-libs/libburn/libburn-1.2.2.ebuild
+++ b/dev-libs/libburn/libburn-1.2.2.ebuild
@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libburn/libburn-1.2.2.ebuild,v 1.7 2012/07/10 15:07:01 ranger Exp $
-
-EAPI=4
-
-DESCRIPTION="Libburn is an open-source library for reading, mastering and writing optical discs."
-HOMEPAGE="http://libburnia-project.org"
-SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ppc ~ppc64 x86"
-IUSE="cdio debug static-libs track-src-odirect"
-
-RDEPEND="cdio? ( >=dev-libs/libcdio-0.83 )"
-DEPEND="$RDEPEND
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-	$(use_enable static-libs static) \
-	$(use_enable track-src-odirect) \
-	$(use_enable cdio libcdio) \
-	--disable-ldconfig-at-install \
-	$(use_enable debug)
-}
-
-src_install() {
-	default
-
-	dodoc CONTRIBUTORS doc/{comments,*.txt}
-
-	cd "${S}"/cdrskin
-	docinto cdrskin
-	dodoc *.txt README
-	docinto cdrskin/html
-	dohtml cdrskin_eng.html
-
-	find "${D}" -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
-}
--- a/dev-libs/libgamin/libgamin-0.1.10-r3.ebuild
+++ b/dev-libs/libgamin/libgamin-0.1.10-r3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgamin/libgamin-0.1.10-r3.ebuild,v 1.1 2012/07/08 11:47:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgamin/libgamin-0.1.10-r3.ebuild,v 1.2 2012/09/13 12:28:08 ago Exp $

 EAPI="4"
 PYTHON_DEPEND="python? 2"
@ -20,7 +20,7 @@ SRC_URI="${SRC_URI}

 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug kernel_linux python static-libs"

 RESTRICT="test" # needs gam-server
--- a/Show More
+++ b/Show More