Sync with portage [Wed Nov 6 16:01:41 MSK 2013].

2013-11-06 16:01:54 +04:00 · 2013-11-06 16:01:54 +04:00 · e4f3f5a289
commit e4f3f5a289
parent 6fd42ead5a
3223 changed files with 33050 additions and 12406 deletions
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@ -3,3 +3,4 @@ DIST syslog-ng_3.3.5.tar.gz 2495235 SHA256 dcca69869ab3cf2afda6db0dad549b6be717f
 DIST syslog-ng_3.4.2.tar.gz 3354842 SHA256 f2585b42e7341bc53490aa59c5f405df506536bf0672bf71f9567ea78590f381 SHA512 94d1c8008c72a7fb82c86eb4ff666cacee26e2b1d7100f58a0ea5293e4efc74ad9608a7b1e72b217f9e6ead4b6ad82f5cf9e00dfcb230a03d3243f5c51fd5305 WHIRLPOOL ddb721e940e674a74079fb150213e7595f2a52eb8709f1a032bf6def93906b6f93c9a5131991946b1e19a026ca8162c40d7c7e537498f29a3d33b401c678611a
 DIST syslog-ng_3.4.3.tar.gz 3074800 SHA256 8a00c342036109e6cc1d441aaed12438134bc884ca3492c36902ff9120a107ee SHA512 c225db659ed188104d14a03fd05bdf56a215bce240d6c2d6191c9a43e71f5bcf7abd5a05cf14aa05336506c8d60017100bb0779f5ae88ebc66223e9b0e2eea83 WHIRLPOOL e0ebbef83994179df9d098bd23f28d2bf2b15618816861e959b5bd09fe387b8c03a3c75904326bfa995cb18f0f78b5b082209a724bcb355e3ee2037ab54ced6d
 DIST syslog-ng_3.4.4.tar.gz 3200073 SHA256 6e7b7c53777ebda040f6167ad223cc958ea6472e4b4265b3eb7adef61f571caf SHA512 e479a0fde8300f5f3ede3482e89ab3da9896cfd8f18777d2ec46fa9b80667b3e699e482afd17efb0bc0ab73d580d0efc0caf5237a8f830c14963fdbe4790d82c WHIRLPOOL 7aa01b03852a4703b319d103435b4b45fff8162a7743617d872b13d84f5eb14d92f6d420e78af9f2d9e78305beff75b982441736a927e3f2dbf18bb486b8fa01
+DIST syslog-ng_3.4.5.tar.gz 3202771 SHA256 b8a69d8131efc2378d9149ff54e99f91ea1c47c69e0f4629395d910c7ff71bfb SHA512 41662ba0726a78fb55ffd08532c80b43cf8c06c6c207d9e2bc4558d5772531b602e20a6d8c0d2f0c453e757589b80d1942c533c6a5c6249092cfcb209fc94e4b WHIRLPOOL f52a95eaa9346fd383db2c7ca256a1226ceac0d59354f872ac5c047e234e4b3a379e13e18dc36bb91dbc1b6c43f1f916345c2ccde7cd421348bf21922d1767f6
--- a/app-admin/syslog-ng/syslog-ng-3.4.5.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.4.5.ebuild
@ -0,0 +1,99 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.4.5.ebuild,v 1.1 2013/11/04 17:42:33 mr_bones_ Exp $
+
+EAPI=5
+inherit eutils multilib systemd
+
+MY_PV=${PV/_/}
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="http://www.balabit.com/network-security/syslog-ng"
+SRC_URI="http://www.balabit.com/downloads/files/syslog-ng/sources/${MY_PV}/source/syslog-ng_${MY_PV}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="caps dbi geoip ipv6 json mongodb +pcre smtp spoof-source ssl systemd tcpd"
+RESTRICT="test"
+
+RDEPEND="
+	pcre? ( dev-libs/libpcre )
+	spoof-source? ( net-libs/libnet:1.1 )
+	ssl? ( dev-libs/openssl:= )
+	smtp? ( net-libs/libesmtp )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	>=dev-libs/eventlog-0.2.12
+	>=dev-libs/glib-2.10.1:2
+	json? ( >=dev-libs/json-c-0.9 )
+	caps? ( sys-libs/libcap )
+	geoip? ( >=dev-libs/geoip-1.5.0 )
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	systemd? ( sys-apps/systemd )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/flex"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_configure() {
+	econf \
+		--with-ivykis=internal \
+		--with-libmongo-client=internal \
+		--sysconfdir=/etc/syslog-ng \
+		--localstatedir=/var/lib/syslog-ng \
+		--with-pidfile-dir=/var/run \
+		--with-module-dir=/usr/$(get_libdir)/syslog-ng \
+		$(systemd_with_unitdir) \
+		$(use_enable systemd) \
+		$(use_enable caps linux-caps) \
+		$(use_enable geoip) \
+		$(use_enable ipv6) \
+		$(use_enable json) \
+		$(use_enable mongodb) \
+		$(use_enable pcre) \
+		$(use_enable smtp) \
+		$(use_enable spoof-source) \
+		$(use_enable dbi sql) \
+		$(use_enable ssl) \
+		$(use_enable tcpd tcp-wrapper)
+}
+
+src_install() {
+	# -j1 for bug #484470
+	emake -j1 DESTDIR="${D}" install
+
+	dodoc AUTHORS NEWS contrib/syslog-ng.conf* contrib/syslog2ng \
+		"${FILESDIR}/${PV%.*}/syslog-ng.conf.gentoo.hardened" \
+		"${FILESDIR}/syslog-ng.logrotate.hardened" \
+		"${FILESDIR}/README.hardened"
+
+	# Install default configuration
+	insinto /etc/syslog-ng
+	if use userland_BSD ; then
+		newins "${FILESDIR}/${PV%.*}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
+	else
+		newins "${FILESDIR}/${PV%.*}/syslog-ng.conf.gentoo" syslog-ng.conf
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/syslog-ng.logrotate" syslog-ng
+
+	newinitd "${FILESDIR}/${PV%.*}/syslog-ng.rc6" syslog-ng
+	newconfd "${FILESDIR}/${PV%.*}/syslog-ng.confd" syslog-ng
+	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	elog "For detailed documentation please see the upstream website:"
+	elog "http://www.balabit.com/sites/default/files/documents/syslog-ng-ose-3.4-guides/en/syslog-ng-ose-v3.4-guide-admin/html/index.html"
+
+	# bug #355257
+	if ! has_version app-admin/logrotate ; then
+		echo
+		elog "It is highly recommended that app-admin/logrotate be emerged to"
+		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
+		elog "for logrotate to use."
+		echo
+	fi
+}
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@ -1,4 +1,2 @@
 DIST sysstat-10.0.5.tar.bz2 282403 SHA256 3e96fdc8d6710f4b642757ff88e3c4296d55838b64ff102feaaf2175f66e875b SHA512 d40cb67c61f499445dee803ac54af50704aa49a4d20b11b5aaaf8966ab6eacfbc72d30c933cf678e324d283818cb5a0beb55cddeb689b0c3a1fdeb4813b4ac63 WHIRLPOOL 868cbbcc179e5810a9b5f1af214974f949c15f0b7f8a114554f85aeb23a755be17fa76f0c24303de9b274c438097d2c2f5f48b421c275977b8bea58e49d01ac4
-DIST sysstat-10.1.5.tar.bz2 298103 SHA256 933c669c62316b24697efdbec77999a5d9290cb815679ba179b44c58b0ec4922 SHA512 601c66dfc14f8050b03d8016056d7def4c6094bcbdda5cab60d55e48e8986621d061ec609276ac007c3b75243f216b08c10a7127080f5cab3916a685a816ec0e WHIRLPOOL 9ab9e92b9669d452a0cd38042c65937868c4395b135b819425ac9f8827a1a08f51a1a7e44e76b02890fd6c9b764afa9ec52c4b934327e153559a3471bd1a1909
-DIST sysstat-10.1.6.tar.bz2 301218 SHA256 8b1d2bcec5f1c0cec4fd293603c90eaa9746abb786bb4a8018c8339fef6264b5 SHA512 6fed9ca15a272a34b36541f815550fa5db966e3209bc580eec25e637d9c7e882ff0809fb1470c25ffca0fdcb46c3431570857ace2b1ef1597518fd9aa54a5ce3 WHIRLPOOL 99bd0a7003e0a23861eb2c425b991227a67b516a7e7938b990c99ea88813d81e4af35b47b97377786cf8d1fc9be8834a3b6776a0031fd9df38ac07c4db8fbc3e
-DIST sysstat-10.1.7.tar.bz2 303949 SHA256 a5d9a92eacf85783c53e0e34dbf4f4499b24ef61f4873a1c77b4a5396ae2f1a9 SHA512 af3b0abf23c8d749a6e21e86bdf8cf24887d1f759cfa50155facd0cf9a1d262b0ce187be9e4306503c746e9d951c0978b8ccd9d32ef0770209333a61ec3bfa1c WHIRLPOOL dfc00ef2edd94034f4e177fe08bb39d108907f841698ed481265a80ba498c350b9f417778124fec18a948799d70d377d34af2ae15c122db49e338160339fc0d9
+DIST sysstat-10.2.0.tar.bz2 307186 SHA256 8e494c30a2e5c4f11d6398b39df297a732fa3d4e3f5d5aa086044fccfe77f6d2 SHA512 6bc8b1217402845a4236c5ffc18f024700fa08e179b558eb65e23a7b95e1d1f1c45c2da6c323e59e74c938903fa0a6820997091d4e84a811fad7cb715dc25320 WHIRLPOOL 61097f59757032c03445410985d8fc98f5feef83d417e8bf666c56728517796c8007869b6328feabcb9fff3024b990fff7fcb4f045215f4614584f08c0db006d
--- a/app-admin/sysstat/sysstat-10.1.5.ebuild
+++ b/app-admin/sysstat/sysstat-10.1.5.ebuild
@ -1,92 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-10.1.5.ebuild,v 1.1 2013/04/02 19:34:55 jer Exp $
-
-EAPI=5
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="${HOMEPAGE}${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cron debug +doc isag nls lm_sensors"
-
-SYSSTAT_LINGUAS="
-	af cs da de eo es eu fi fr hr id it ja ky lv mt nb nl nn pl pt pt_BR ro ru
-	sk sr sv uk vi zh_CN zh_TW
-"
-
-for SYSSTAT_LINGUA in ${SYSSTAT_LINGUAS}; do
-	IUSE="${IUSE} linguas_${SYSSTAT_LINGUA}"
-done
-
-RDEPEND="
-	cron? ( sys-process/cronbase )
-	isag? (
-		dev-lang/tk
-		dev-vcs/rcs
-		sci-visualization/gnuplot
-	)
-	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	local po_count li_count lingua NLSDIR="${S}/nls"
-
-	count() { echo ${#}; }
-	po_count=$(count ${NLSDIR}/*.po)
-	li_count=$(count ${SYSSTAT_LINGUAS})
-	[[ ${po_count} = ${li_count} ]] \
-		|| die "Number of LINGUAS does not match number of .po files"
-	unset count
-
-	for lingua in ${SYSSTAT_LINGUAS}; do
-		if ! use linguas_${lingua}; then
-			rm -f "${NLSDIR}/${lingua}.po" || die
-		fi
-	done
-	epatch "${FILESDIR}"/${PN}-10.0.4-flags.patch
-}
-
-src_configure() {
-	tc-export AR
-	sa_lib_dir=/usr/$(get_libdir)/sa \
-		conf_dir=/etc \
-		rcdir=Gentoo-does-not-use-rc.d \
-		econf \
-			$(use_enable cron install-cron) \
-			$(use_enable debug debuginfo) \
-			$(use_enable doc documentation ) \
-			$(use_enable isag install-isag) \
-			$(use_enable lm_sensors sensors) \
-			$(use_enable nls)
-}
-
-src_compile() {
-	emake LFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	keepdir /var/log/sa
-
-	use cron && dodir /etc/cron.{daily,hourly}
-
-	emake \
-		DESTDIR="${D}" \
-		DOC_DIR=/usr/share/doc/${PF} \
-		install
-
-	dodoc contrib/sargraph/sargraph
-
-	newinitd "${FILESDIR}"/sysstat.init.d sysstat
-
-	use doc && rm -f "${D}"usr/share/doc/${PF}/COPYING
-}
--- a/app-admin/sysstat/sysstat-10.1.7.ebuild
+++ b/app-admin/sysstat/sysstat-10.1.7.ebuild
@ -1,80 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-10.1.7.ebuild,v 1.1 2013/09/23 15:50:58 jer Exp $
-
-EAPI=5
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="${HOMEPAGE}${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cron debug +doc isag nls lm_sensors"
-
-RDEPEND="
-	cron? ( sys-process/cronbase )
-	isag? (
-		dev-lang/tk
-		dev-vcs/rcs
-		sci-visualization/gnuplot
-	)
-	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	if use nls; then
-		strip-linguas -i nls/
-		local lingua pofile
-		for pofile in nls/*.po; do
-			lingua=${pofile/nls\/}
-			lingua=${lingua/.po}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm "nls/${lingua}.po" || die
-			fi
-		done
-	fi
-	epatch "${FILESDIR}"/${PN}-10.0.4-flags.patch
-}
-
-src_configure() {
-	tc-export AR
-	sa_lib_dir=/usr/$(get_libdir)/sa \
-		conf_dir=/etc \
-		rcdir=Gentoo-does-not-use-rc.d \
-		econf \
-			$(use_enable cron install-cron) \
-			$(use_enable debug debuginfo) \
-			$(use_enable doc documentation ) \
-			$(use_enable isag install-isag) \
-			$(use_enable lm_sensors sensors) \
-			$(use_enable nls)
-}
-
-src_compile() {
-	emake LFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	keepdir /var/log/sa
-
-	use cron && dodir /etc/cron.{daily,hourly}
-
-	emake \
-		DESTDIR="${D}" \
-		DOC_DIR=/usr/share/doc/${PF} \
-		install
-
-	dodoc contrib/sargraph/sargraph
-
-	newinitd "${FILESDIR}"/sysstat.init.d sysstat
-
-	use doc && rm -f "${D}"usr/share/doc/${PF}/COPYING
-}
--- a/app-admin/sysstat/sysstat-10.2.0.ebuild
+++ b/app-admin/sysstat/sysstat-10.2.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-10.1.6.ebuild,v 1.1 2013/06/09 16:56:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-10.2.0.ebuild,v 1.1 2013/11/04 01:17:02 jer Exp $

 EAPI=5
 inherit eutils multilib toolchain-funcs
--- a/app-arch/pigz/Manifest
+++ b/app-arch/pigz/Manifest
@ -1,3 +1,4 @@
 DIST pigz-2.2.4.tar.gz 49505 SHA256 7e7967c47f66c07be97cbfa25c8816b72f9d35258466ea31eddc7666c914160e SHA512 ebedc10d79de9fc21cacf302eb323dd3d1c73492da9407b7a2d69be65728bac1619a4b0c6c26cdcb2b955a47572f176ee3e18f9ebc230e4db981b1ab9347da30 WHIRLPOOL a9a8882312ae0588926fc2b1c4dae0ac9a56b1f59ea8211d976d7f30fe2b798a71249d03b4d33c590b62cbddb63c6b7998c1de200880770098dc062bd367d343
 DIST pigz-2.2.5.tar.gz 49717 SHA256 e37498cbf3a475d7ebe2519751188c29564bf8dd27ba68bd3c7fe1ac08792759 SHA512 b399dee20c3484b5425490ee06404f8c6e3335a1c8eda8f625b62025dba99d2ebdd398a6acd7dd9c44cdb5370ccf66e0a6334bb5aace0a5dee30351cfd3abd4c WHIRLPOOL 178efcb07a79fd7667029c837a19291a73c089cac6dc4c2c8dceeef0ff5e836e26bdfc39d04888ed4896c36c4b52b3d96d344dbf73165acc1f320e1abea83077
+DIST pigz-2.3.1.tar.gz 86651 SHA256 629b0ce5422a3978f31742bf8275d0be2f84987140d18f390f1e3b4e46e0af54 SHA512 7cb00ab87802352c817d9b2f745948199a7e571181aec3ef161305c1d8b828790bc2fb0083d6068ba5aead5d8b8c7f53ec25ab641ae2e98eda9adf14f195dbc6 WHIRLPOOL 242e38d05215269c3c9b6602191cc6e02fd9e781b0425738c3907ccf60da9a4a36ebcda866c9c0e949ad5988dad6b468f97102352d2ed13adb7e890688c221f7
 DIST pigz-2.3.tar.gz 83636 SHA256 74bbd5962f9420549fc987ddd1ccda692ec2b29d2d612fbbe26edf3fa348ff21 SHA512 58080cb3b68d3329c3e9554b7f41b7ffe961c27cce0732e00d200f84bd4910452026cc90b026a4130dc4fef6eeaf9f6340d039521f32474ca45566f8e985301d WHIRLPOOL 808e05bfa337b421d4c18da0982d12cf880b78885ad2da37c6f84960d2102a9fc34ce078700a3ececca5805014b385e544ef17912b83444d726315af2616ffc5
--- a/app-arch/pigz/pigz-2.3.1.ebuild
+++ b/app-arch/pigz/pigz-2.3.1.ebuild
@ -0,0 +1,39 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pigz/pigz-2.3.1.ebuild,v 1.1 2013/11/04 20:56:35 radhermit Exp $
+
+EAPI=5
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="A parallel implementation of gzip"
+HOMEPAGE="http://www.zlib.net/pigz/"
+SRC_URI="http://www.zlib.net/pigz/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~sparc ~x86 ~amd64-linux ~sparc64-solaris"
+IUSE="static symlink test"
+
+LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	test? ( app-arch/ncompress )"
+
+src_compile() {
+	use static && append-ldflags -static
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}
+	dosym ${PN} /usr/bin/un${PN}
+	dodoc README
+	doman ${PN}.1
+
+	if use symlink; then
+		dosym ${PN} /usr/bin/gzip
+		dosym un${PN} /usr/bin/gunzip
+	fi
+}
--- a/app-arch/xz-utils/xz-utils-5.0.5-r1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.0.5-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.5-r1.ebuild,v 1.6 2013/11/01 13:35:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-5.0.5-r1.ebuild,v 1.7 2013/11/04 01:57:29 mattst88 Exp $

 # Remember: we cannot leverage autotools in this ebuild in order
 #           to avoid circular deps with autotools
@ -17,7 +17,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 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~arm-linux ~ia64-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 ~hppa-hpux ~ia64-hpux ~amd64-linux ~arm-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
--- a/app-crypt/pgpdump/pgpdump-0.28-r1.ebuild
+++ b/app-crypt/pgpdump/pgpdump-0.28-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pgpdump/pgpdump-0.28-r1.ebuild,v 1.1 2013/08/10 22:57:02 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pgpdump/pgpdump-0.28-r1.ebuild,v 1.2 2013/11/02 18:52:10 nimiux Exp $

 EAPI=5
 inherit eutils
@ -11,7 +11,7 @@ SRC_URI="http://www.mew.org/~kazu/proj/pgpdump/${P}.tar.gz"

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

 DEPEND="sys-libs/zlib
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@ -5,4 +5,5 @@ DIST doxygen-1.5.8.src.tar.gz 4125837 SHA256 01540aaf7e929e7784e3392331f2c915480
 DIST doxygen-1.7.6.1.src.tar.gz 4791654 SHA256 0e60e794fb172d3fa4a9a9535f0b8e0eeb04e8366153f6b417569af0bcd61fcd SHA512 614e8b52b32c4ff0a37cabfa2fbd6ea2d79567fdd903eb3e5031e61cd106bb3bfa42ccfdbc6636e5da08bd7a7fa226fb8d9c104b344d16098e9aedc3a601127a WHIRLPOOL f70aa1d0f93746871c5b24538231fac775e849ac88eeff9d1afc0919464bc9c7a27b1391d1aa50624ca11c48f3e2e953a4c41ed7ec5be3ad7972f03510576c5c
 DIST doxygen-1.8.3.1.src.tar.gz 6196887 SHA256 0c749f68101b6c04ccb0d9696dd37836a6ba62cd8002add275058a975ee72b55 SHA512 365e553364ad61950a29477d8e751e98f4af9ce4a999c788cd25ce5a58ebbd931960689c4faddabd71cda60174777e41ed814ba633c19287c9f9696e0d7fa169 WHIRLPOOL cab6bbad971b794e07e95bee548ed9b9233b7b420dd96db8d4cb7b68a1b1232546c3976556b043e9a31c2e32e8619a57a0a7a58aa846a4806b9cc08aa1a9bc80
 DIST doxygen-1.8.4.src.tar.gz 6456090 SHA256 526442fb70bea79a4086cc98c22692cc05edc2f4cf231feb7993b5d188ef584e SHA512 984b4aa88afd3edb067e054b08de624f8afe927d31a45466349e83aa125e061c1ecac2d5f021e0d345fddf3ed7d5211509a445433af54d629a09bbb24b27e026 WHIRLPOOL d5137d0c2cbda8d1d768b1a92b6778312862d3cb4113c9be59489f061d0ad80c5162417d8bf9efef54852b23f985390791049c843a45be5eafcd586628f96d9c
+DIST doxygen-1.8.5.src.tar.gz 6511944 SHA256 243a8b67db12ad68d6ea5b51c6f60dc2cc3a34fa47abf1b5b4499196c3d7cc25 SHA512 56d2b262feae41fe9acf3c0c8ad3dd1d8868a52c17e2d9882a553570311482ec73548c0a70ae0ad7ccd7d1011a69968f284031beb93f915bab3a4c740b943f47 WHIRLPOOL 934cb01d7898cbdf04d2f293534ade1b8ce1c48a378fb141e063a83455ccf94c733aec525e6e6740e6b92fb473a6bc2b31dca09b0324de78801c7a2d19638182
 DIST doxywizard.png 4231 SHA256 eb648ebd3a194a56d9ed6e47cc8dbf1af2e124d83c2c42af9bf86bd837984209 SHA512 5e2d26e7427b86866ebe75ec2c66c0f1100d230f3f3e4d66bac424a8dd0d42f0831d936ff03318dfa1bf73cbd9fb53717636d0c91ae3eea0f4e24641479d25d5 WHIRLPOOL bb0c13b382c4069ca310ff53a03b36499a2bf6e0e8c0647efc032530f429f483b5d6f2925b7e996d4f84c8f2b77eb883533f4b7abc88745a2cfa596d3dd4f3fb
--- a/app-doc/doxygen/doxygen-1.8.5.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.5.ebuild
@ -0,0 +1,233 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.8.5.ebuild,v 1.2 2013/11/06 07:50:09 xarthisius Exp $
+
+EAPI=4
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit eutils fdo-mime flag-o-matic python-any-r1 qt4-r2 toolchain-funcs
+
+DESCRIPTION="Documentation system for most programming languages"
+HOMEPAGE="http://www.doxygen.org/"
+SRC_URI="http://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
+	http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc dot qt4 latex sqlite elibc_FreeBSD userland_GNU"
+
+#missing SerbianCyrilic, JapaneseEn, KoreanEn, Chinesetraditional
+
+LANGS=(hy ar pt_BR ca zh cs de da eo es fa fi fr el hr hu id it ja ko lt mk
+nl nb pl pt ro ru sl sk sr sv tr uk vi af)
+for X in "${LANGS[@]}" ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+RDEPEND="qt4? ( dev-qt/qtgui:4 )
+	latex? ( app-text/texlive[extra] )
+	dev-lang/perl
+	virtual/libiconv
+	media-libs/libpng
+	app-text/ghostscript-gpl
+	sqlite? ( dev-db/sqlite:3 )
+	dot? (
+		media-gfx/graphviz
+		media-libs/freetype
+	)"
+
+DEPEND="sys-apps/sed
+	sys-devel/flex
+	sys-devel/bison
+	doc? ( ${PYTHON_DEPS} )
+	${RDEPEND}"
+
+RESTRICT="mirror"
+EPATCH_SUFFIX="patch"
+
+get_langs() {
+	# using only user set linguas also fixes #263641
+	my_linguas=()
+	for lingua in ${LINGUAS}; do
+		if has ${lingua} "${LANGS[@]}"; then
+			case ${lingua} in
+				hy) lingua=am ;;
+			    pt_BR) lingua=br ;;
+				zh*) lingua=cn ;;
+				cs) lingua=cz ;;
+				da) lingua=dk ;;
+				el*) lingua=gr ;;
+				ja*) lingua=jp ;;
+				ko) lingua=kr ;;
+				nb) lingua=no ;;
+				sl) lingua=si ;;
+			    tr*) lingua=tr ;;
+			    uk) lingua=ua ;;
+			    af) lingua=za ;;
+			esac
+			has ${lingua} "${my_linguas[@]}" ||
+				my_linguas+=(${lingua})
+		fi
+	done
+	f_langs="${my_linguas[@]}"
+	echo ${f_langs// /,}
+}
+
+pkg_setup() {
+	tc-export CC CXX
+	use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# use CFLAGS, CXXFLAGS, LDFLAGS
+	export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}"
+
+	sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \
+		-e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \
+		-e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \
+		-e "s:^\(TMAKE_CXX\s*\)=.*$:\1= $(tc-getCXX):" \
+		-e "s:^\(TMAKE_LINK\s*\)=.*$:\1= $(tc-getCXX):" \
+		-e "s:^\(TMAKE_LINK_SHLIB\s*\)=.*$:\1= $(tc-getCXX):" \
+		-e "s:^\(TMAKE_CC\s*\)=.*$:\1= $(tc-getCC):" \
+		-e "s:^\(TMAKE_AR\s*\)=.*$:\1= $(tc-getAR) cqs:" \
+		tmake/lib/{{linux,gnu,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++,linux-64}/tmake.conf \
+		|| die
+
+	# Ensure we link to -liconv
+	if use elibc_FreeBSD; then
+		for pro in */*.pro.in */*/*.pro.in; do
+		echo "unix:LIBS += -liconv" >> "${pro}"
+		done
+	fi
+
+	# Call dot with -Teps instead of -Tps for EPS generation - bug #282150
+	sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die
+
+	# prefix search tools patch, plus OSX fixes
+	epatch "${FILESDIR}"/${PN}-1.8.1-prefix-misc-alt.patch
+	epatch "${FILESDIR}"/${PN}-1.8.3.1-empty-line-sigsegv.patch #454348
+
+	# fix pdf doc
+	sed -i.orig -e "s:g_kowal:g kowal:" \
+		doc/maintainers.txt || die
+
+	sed -e "s/\$(DATE)/$(LC_ALL="C" LANG="C" date)/g" \
+		-i Makefile.in || die #428280
+
+	if is-flagq "-O3" ; then
+		echo
+		ewarn "Compiling with -O3 is known to produce incorrectly"
+		ewarn "optimized code which breaks doxygen."
+		echo
+		elog "Continuing with -O2 instead ..."
+		echo
+		replace-flags "-O3" "-O2"
+	fi
+}
+
+src_configure() {
+	# set ./configure options (prefix, Qt based wizard, docdir)
+
+	local my_conf="--shared --enable-langs $(get_langs)"
+
+	if use debug ; then
+		my_conf="${my_conf} --debug"
+	else
+		my_conf="${my_conf} --release "
+	fi
+
+	use qt4 && my_conf="${my_conf} --with-doxywizard"
+
+	use sqlite && my_conf="${my_conf} --with-sqlite3"
+
+	# On non GNU userland (e.g. BSD), configure script picks up make and bails
+	# out because it is not GNU make, so we force the right value.
+	use userland_GNU || my_conf="${my_conf} --make ${MAKE} --install install"
+
+	export LINK="${QMAKE_LINK}"
+	export LINK_SHLIB="${QMAKE_CXX}"
+
+	if use qt4 ; then
+		pushd addon/doxywizard &> /dev/null
+		eqmake4 doxywizard.pro -o Makefile.doxywizard
+		popd &> /dev/null
+	fi
+
+	./configure --prefix "${EPREFIX}/usr" ${my_conf} \
+			|| die
+}
+
+src_compile() {
+
+	emake CFLAGS+="${ECFLAGS}" CXXFLAGS+="${ECXXFLAGS}" \
+		LFLAGS+="${ELDFLAGS}" all
+
+	# generate html and pdf (if tetex in use) documents.
+	# errors here are not considered fatal, hence the ewarn message
+	# TeX's font caching in /var/cache/fonts causes sandbox warnings,
+	# so we allow it.
+	if use doc; then
+		if ! use dot; then
+			sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \
+				{Doxyfile,doc/Doxyfile} \
+				|| ewarn "disabling dot failed"
+		fi
+		if use latex; then
+			addwrite /var/cache/fonts
+			addwrite /var/cache/fontconfig
+			addwrite /usr/share/texmf/fonts/pk
+			addwrite /usr/share/texmf/ls-R
+			make pdf || ewarn '"make pdf docs" failed.'
+		else
+			cp doc/Doxyfile doc/Doxyfile.orig
+			cp doc/Makefile doc/Makefile.orig
+			sed -i.orig -e "s/GENERATE_LATEX    = YES/GENERATE_LATEX    = NO/" \
+				doc/Doxyfile
+			sed -i.orig -e "s/@epstopdf/# @epstopdf/" \
+				-e "s/@cp Makefile.latex/# @cp Makefile.latex/" \
+				-e "s/@sed/# @sed/" doc/Makefile
+			make docs || ewarn '"make docs" failed.'
+		fi
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" MAN1DIR=share/man/man1 install
+
+	if use qt4; then
+		doicon "${DISTDIR}/doxywizard.png"
+		make_desktop_entry doxywizard "DoxyWizard ${PV}" \
+			"/usr/share/pixmaps/doxywizard.png" \
+			"Development"
+	fi
+
+	dodoc LANGUAGE.HOWTO README.md
+
+	# pdf and html manuals
+	if use doc; then
+		dohtml -r html/*
+		use latex && dodoc latex/doxygen_manual.pdf
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	elog
+	elog "The USE flags qt4, doc, and latex will enable doxywizard, or"
+	elog "the html and pdf documentation, respectively.  For examples"
+	elog "and other goodies, see the source tarball.  For some example"
+	elog "output, run doxygen on the doxygen source using the Doxyfile"
+	elog "provided in the top-level source dir."
+	elog
+	elog "Disabling the dot USE flag will remove the GraphViz dependency,"
+	elog "along with Doxygen's ability to generate diagrams in the docs."
+	elog "See the Doxygen homepage for additional helper tools to parse"
+	elog "more languages."
+	elog
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
--- a/app-editors/diakonos/diakonos-0.9.1-r1.ebuild
+++ b/app-editors/diakonos/diakonos-0.9.1-r1.ebuild
@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/diakonos/diakonos-0.9.1-r1.ebuild,v 1.1 2013/11/02 20:10:30 mrueg Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20"
+inherit ruby-ng
+
+DESCRIPTION="A Linux editor for the masses"
+HOMEPAGE="http://diakonos.pist0s.ca"
+SRC_URI="http://diakonos.pist0s.ca/archives/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )
+	test? ( dev-ruby/bacon )"
+
+each_ruby_install() {
+	${RUBY} install.rb --dest-dir "${D}" --doc-dir /usr/share/doc/${P} || die "install failed"
+}
+
+all_ruby_install() {
+	if use doc; then
+		rake docs || die
+		dodoc -r doc/*
+	fi
+}
+
+each_ruby_test() {
+	${RUBY} -S bacon -Ilib spec/*.rb spec/*/*.rb || die
+}
--- a/app-editors/scite/scite-3.3.5.ebuild
+++ b/app-editors/scite/scite-3.3.5.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-3.3.5.ebuild,v 1.1 2013/10/05 10:36:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-3.3.5.ebuild,v 1.3 2013/11/02 11:56:51 ago Exp $

 EAPI="4"

@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"

 LICENSE="HPND lua? ( MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="lua"

 RDEPEND="dev-libs/glib
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@ -1,4 +1,5 @@
 DIST org-6.36c.tar.gz 2706358 SHA256 26db6b9c319a2dd54f3a8da78f761594b7c8e7edeb9106f14a1c3a6ff94786a0 SHA512 81dfd13f4a3540bf8e6c3cd9a49f02882bb1aa20ac4ecc97beaa159bd8ab7ca4bf10bf5ca23c40619788f8999cee8ae6b0439d1d51b561197c24e6efd34f5d56 WHIRLPOOL 9c89b8508338553a05458bd9c532aaf951dd8803a755f432bd3136629e17e2244c06377b5516cee5cb04a69edd9301cdeafac70da1f3e83715d41643bf65dd2b
 DIST org-7.9.2.tar.gz 4141885 SHA256 14c91bf456c271ac17f2f083f86227d4e5f09483fdb69adbf314de4392e25469 SHA512 9b0f90ec47660dcc9faf7ad742b62c816a031119a2a89864f6fd183e343bd08027f5cf8439314b1593b9f5d76ff08f57b0b30aa188e1a94a426b3573c33c434c WHIRLPOOL 3ac9a49157375cd3628c4fb1248af071d8ed725307effbcce81961bd1d35117ae7f5a371baffa6159e0c57fd4f896cdf4a7b0d3ac67942ea177d8717a19ce47f
 DIST org-8.0.2.tar.gz 4171893 SHA256 e129bdb654c7e1cf7404cc55e65ff479712b1d9549ecdbb4f3904b4bff8c7034 SHA512 d1de4ac6a86449446e438a0f2edc98672144ab25721d4eb482ff1bc60122fded9775274d0ca7085d7ed6e98d972734bbd041970f65d8ed73db99f388dc41b2db WHIRLPOOL c51da4cd3b5697585d1f0ee08f8d782240d63395316ccc0570deefaec6944c384bb16963e3bfd3e495bbb8d5c003bfc7d388aa29d487d16da6a6eadb83858033
+DIST org-8.2.1.tar.gz 4215666 SHA256 625e2b6786158bcf6c43194075f7638ab8048c68a60025289a051c407e467823 SHA512 366504c8bc4637c96d6255603e949951fed1d89b9b58aa938072c982cca14d5eedfa2a45aabbae55d4862aa9dcc984b379f969cf5b6da50f73d2e0044cd687fb WHIRLPOOL 024166ee4eb6bb994f44249ea819ac3b4aad9c133bfcbc438d57a4dce54b3c8a108519eabf9318e769768be36d1733066bbec58cfaf03fc600de72fd55e3c29d
 DIST org-8.2.tar.gz 4216548 SHA256 88819e5bc15dd342523cbf26e4e9967bb67f6f206d96b609d9bf08d0730d1286 SHA512 4ef195d7cae62efb7f6c24dcf03395db147579c5d22a0403ac09c0bafbdccf2d5d9c0e5ae8e3500ba93d9610be202190468ff2e248fec1bd3ab3f3adca9a79a9 WHIRLPOOL 5fc724800828ace482c4dd064fc5cbb23e179dbc227af451f8d3fdf74ea21d544121bbe623fae7d75859b17f3b8a939598273d1cacc54d72cc2317103e78f4a9
--- a/app-emacs/org-mode/org-mode-8.2.1.ebuild
+++ b/app-emacs/org-mode/org-mode-8.2.1.ebuild
@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-8.2.1.ebuild,v 1.1 2013/11/02 10:26:02 ulm Exp $
+
+EAPI=5
+NEED_EMACS=23
+
+inherit elisp
+
+DESCRIPTION="An Emacs mode for notes and project planning"
+HOMEPAGE="http://www.orgmode.org/"
+SRC_URI="http://orgmode.org/org-${PV}.tar.gz"
+
+LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos"
+IUSE="contrib doc odt-schema"
+RESTRICT="test"
+
+DEPEND="doc? ( virtual/texi2dvi )"
+
+S="${WORKDIR}/org-${PV}"
+SITEFILE="50${PN}-gentoo-8.el"
+
+src_compile() {
+	emake datadir="${EPREFIX}${SITEETC}/${PN}"
+	use doc && emake pdf card
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		ETCDIRS="styles $(use odt-schema && echo schema)" \
+		lispdir="${EPREFIX}${SITELISP}/${PN}" \
+		datadir="${EPREFIX}${SITEETC}/${PN}" \
+		infodir="${EPREFIX}/usr/share/info" \
+		install
+
+	cp "${FILESDIR}/${SITEFILE}" "${T}/${SITEFILE}"
+
+	if use contrib; then
+		elisp-install ${PN}/contrib contrib/lisp/{org,ob,ox}*.el
+		insinto /usr/share/doc/${PF}/contrib
+		doins -r contrib/README contrib/scripts
+		find "${ED}/usr/share/doc/${PF}/contrib" -type f -name '.*' \
+			-exec rm -f '{}' '+'
+		# add the contrib subdirectory to load-path
+		sed -i -e 's:\(.*@SITELISP@\)\(.*\):&\n\1/contrib\2:' \
+			"${T}/${SITEFILE}" || die
+	fi
+
+	elisp-site-file-install "${T}/${SITEFILE}"
+	dodoc README doc/library-of-babel.org doc/orgcard.txt etc/ORG-NEWS
+	use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
+}
--- a/app-emacs/pymacs/Manifest
+++ b/app-emacs/pymacs/Manifest
@ -1,3 +1,2 @@
 DIST Pymacs-0.23.tar.gz 92161 SHA256 eb419e307c9670ac5ad76de44c8803bd91ff0a1a8d6b6035fa4d0427a85f5163 SHA512 c07cc4fa75ca3f03a517563172c9647f1f8402bfe7cdac45aa285c838fe15ab4fd08cb2a0364d985fc4d0ad5670436c4f2c6fa81efe1424b10d2a430699308d3 WHIRLPOOL 5477b4eaf9c134f80101be9a83c2285d8105aeaa189e4f39190abb024073e942c660fe74eff2defb42f5422d64fe73cb24b8e206c53f624aec0e1a9795db4f58
-DIST pymacs-0.24_beta2.tar.gz 116284 SHA256 126501a8fb24fdaeccea9bd4e24117620bf9f8fcfa1e0464ad0c78de331feb5b SHA512 1b6643c2825d7c7729bbece599245dbc977e4ddde59554fe1c012917dce5fd2e28cc55654da26ee3232b49ad9638b5fb359bc0f8bf9e71fcc373cb25b9a870a1 WHIRLPOOL 69999fc5d7dcfcd5649b2f61a8830cef3a895179c76b50be803de91028cd173048dc0d4f7e332394b9fa1e767786d903506f3060e9088c17b369fb6b8ec2c7e9
 DIST pymacs-0.25.tar.gz 120597 SHA256 51dc21b33316e6e244e78e5e88d8ae9a88afc0dcef34ba702ea9be589839bec2 SHA512 e17f7ee754413e21403d23894ee263fb0edae180a60c746b02cf101b2f0c782116e7bb61215bd0a8c689a991e211d780d220d4672b58f43108e7218a6f0c8dc0 WHIRLPOOL 90a211d1b62387e05deb759786fd82eeed23c1800307f1345e1c06c579c0455480433c24fda34a881f887595e169076a6ed56f6e8774933f0431aa96940e0152
--- a/app-emacs/pymacs/pymacs-0.24_beta2.ebuild
+++ b/app-emacs/pymacs/pymacs-0.24_beta2.ebuild
@ -1,47 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/pymacs/pymacs-0.24_beta2.ebuild,v 1.1 2011/10/07 20:58:00 ulm Exp $
-
-EAPI=3
-SUPPORT_PYTHON_ABIS=1
-
-inherit distutils elisp
-
-DESCRIPTION="A tool that allows both-side communication beetween Python and Emacs Lisp"
-HOMEPAGE="http://pymacs.progiciels-bpi.ca/"
-# taken from https://github.com/pinard/Pymacs/tarball/v0.24-beta2
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc"
-
-DEPEND="doc? ( >=dev-python/docutils-0.7
-			virtual/latex-base )"
-RDEPEND=""
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_unpack() {
-	unpack ${A}
-	mv pinard-Pymacs-* "${S}" || die
-}
-
-src_compile() {
-	emake || die
-	elisp-compile pymacs.el || die
-	if use doc; then
-		VARTEXFONTS="${T}"/fonts \
-			emake RST2LATEX=rst2latex.py pymacs.pdf || die
-	fi
-}
-
-src_install() {
-	elisp_src_install
-	distutils_src_install
-	dodoc THANKS pymacs.rst || die
-	if use doc; then
-		dodoc pymacs.pdf || die
-	fi
-}
--- a/app-emacs/python-mode/Manifest
+++ b/app-emacs/python-mode/Manifest
@ -1,4 +1,4 @@
 DIST python-mode-5.2.0.tgz 73566 SHA256 84ee977fb7c639bc96cd4e8db0145c7a182489456e4d95a71c3612258b5013ac SHA512 cc31962bd99f76d5a250418ce53a88d6b06282810389d737c383637fba867716a8845a72390c0f87213963647315af34de857e5beb674b921461bf02212b62ca WHIRLPOOL 38e2097f65737bcf0e208bd50b2e34b8d2478160344806b8fcbddebb74f7622ffda97014be551515b996235900a7973fae912930853b1fb362dbb3d763de449d
 DIST python-mode.el-6.0.12.tar.gz 297981 SHA256 85a1ae9b8514330613887ef2cd305cef22c8338192942c09a82c6feab211cd39 SHA512 1b9c86e994d3e607a13cbfe743f5a7b527c00def756ad9a21d04681a755707580919517e5957cb16e64cf31e9204bc56e490e8d11c00d016590d04061a9ecb42 WHIRLPOOL 385296fd06b0c055e25d113f43a5bbf0a0cbc7280234508af7d334d5ae992551f1e4d8dec02eafc4c080650b071b4c36cf4bcc2e2c7ab75b249dacf493b7d3d9
-DIST python-mode.el-6.1.0.tar.gz 301949 SHA256 9399ae1e905815cd51f34799c1e91fbefe497431206311c3ed6a2b9aafbae61d SHA512 fa9d25b8d542222dd26b7ac25e4337f6d713617e54bc41bc258eac2d2165dc482c0673480a86f1d008c3b1922561b4e74d92e37c7f4d1355807ceefdfa1aaace WHIRLPOOL 3867e3c1e9f38a55cb3d84f28c1eb4e0543c9a094f86e062e81d3012435d725dc7e1879abb20e61b11b27c71ac564aec8e11410b33db04dea66e5c27989cc221
 DIST python-mode.el-6.1.1.tar.gz 313595 SHA256 3eea9722d8407024dcad38b26029992333b357009c9f0d755e2ef7ac06c55a85 SHA512 66226db207421cd33812505e74b986b279534876386fa1b2bc90d58fb35cacfb9fd2790a3dd760becd2797a390d0960035f2ee0d5636c83daf6d0c699d122609 WHIRLPOOL a020e7ce9ceccb8e8d34e88e45bcee668462d286463a6b87ce26c14108c6c66b862bcd78ea7a962ff3f6644a6d4c8ffa06e290eff2a8fb828a21d5f45b44f441
+DIST python-mode.el-6.1.2.tar.gz 330107 SHA256 ae1223bba504c6db08b7a4fc5ef2e148ad861048b4146f5966ddb4ce39e244e3 SHA512 967ad7fdb3503c2dc37df79ba9f45ed7627a5b8e287cae9e8963a259a6568282c16d509e873c7d8b97e4acaafbd71dcec00e5ac71ed695b20ecddca5da20ba96 WHIRLPOOL 05a9f6f60fa0dca16695c1b9fd43fe5c9d9304cc564292412df12d1894f971c119b0d4a57c297684968e58e0bb4a5e9f4472700d7d9fff461f20294c4c5faabe
--- a/app-emacs/python-mode/python-mode-6.1.2.ebuild
+++ b/app-emacs/python-mode/python-mode-6.1.2.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/python-mode/python-mode-6.1.0.ebuild,v 1.1 2013/01/04 10:50:38 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/python-mode/python-mode-6.1.2.ebuild,v 1.1 2013/11/02 09:23:03 ulm Exp $

-EAPI=4
+EAPI=5

-inherit elisp
+inherit readme.gentoo elisp

 MY_P="${PN}.el-${PV}"
 DESCRIPTION="An Emacs major mode for editing Python source"
@ -18,9 +18,5 @@ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-free
 S="${WORKDIR}/${MY_P}"
 SITEFILE="50${PN}-gentoo.el"
 DOCS="NEWS README"
-
-pkg_postinst() {
-	elisp-site-regen
-	elog "Note that doctest and pymacs are in their own packages,"
-	elog "app-emacs/doctest-mode and app-emacs/pymacs, respectively."
-}
+DOC_CONTENTS="Note that doctest and pymacs are in their own packages,
+	app-emacs/doctest-mode and app-emacs/pymacs, respectively."
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@ -1,3 +1,4 @@
 DIST libvirt-1.0.5.6.tar.gz 23998470 SHA256 171e2497d4d4109f4839f6f4b727b92f02530776b87b7246189d7ca6b44372bf SHA512 119c8c7a584a0fb6ea8e6385d5d5aac814e9f0a975adf4e75ee012d116a139c558ecb121da544e073700f1eb95a9b360fb457ce6cfebeddfb703fe42d41546a7 WHIRLPOOL 5f3b17f07e124816facf847d43bde74cbcd90213206085f770b1cb86240b0ba2a7cde8f1846665ecdaaf261d1ca44eb14226d27223e98b652efcbb834d00a103
 DIST libvirt-1.1.3-062ad8b2.tar.xz 18836 SHA256 a16a72d9cc6b49564e234b39f94a987e20da9fd511203ec1cb4534ccf4570121 SHA512 0734836972ef3e7a2d8bcb1d1ab001b3f15202c2921107c28a17f6ccf4002849c920133969b611560a88ca7f969eea468b1a8bc14b432b270f624c6594fc1ade WHIRLPOOL 340ca175f7322ede982455ba311a19cd5cbb33ea49e1fa3a7ab13a0fdb31c37a8a0fc58cec189efb19a861a21d6c677c3c3533e58e9fb9eaa4ce0f3dde721ec9
 DIST libvirt-1.1.3.tar.gz 26578000 SHA256 af83e65b4b26520662ddd183c1358be0d05138dba3e66745419f06441eff5a7c SHA512 895f8ccf1fdf7a36918e4d460b44b1bf67d06842e39142c89c620f6191e299b53c50f80ab47677d7cba6bd570177d79b5ee0d7d2a11472991590389db51fab9d WHIRLPOOL c046f1182976bbd6bf65b460b2017996e63f67b5cce44f0af859d90f892278d0236192e6e7172e16c85183da6e258a003d9c8757af2079ab4d77de9ca300d986
+DIST libvirt-1.1.4.tar.gz 26799019 SHA256 5910f5cf607a50c606d959e6b1e5d6e67966b7aa7324982afd7f85d9c24bd98f SHA512 64455585b8d7e5c0f701e9803ae00d277ee27f9bec92b9890e487cd0298f5f8ff9075d0b2bc81be67e8d8e03bfe58eb2e4fd6292439acd9d22a3f3e7f5b87efc WHIRLPOOL c8de6024b51988415847463064ccf2bcc9d7cb42be8765fbfcf901b594d963351f312d962ca4fb2a5ecce7c2247a60b6201e57a41ba44caa6211148585d65352
--- a/app-emulation/libvirt/libvirt-1.1.4.ebuild
+++ b/app-emulation/libvirt/libvirt-1.1.4.ebuild
@ -0,0 +1,433 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.1.4.ebuild,v 1.1 2013/11/04 14:34:58 cardoe Exp $
+
+EAPI=5
+
+#BACKPORTS=062ad8b2
+AUTOTOOLIZE=yes
+
+MY_P="${P/_rc/-rc}"
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit eutils python-single-r1 user autotools linux-info systemd readme.gentoo
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
+	AUTOTOOLIZE=yes
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
+		ftp://libvirt.org/libvirt/${MY_P}.tar.gz
+		${BACKPORTS:+
+			http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
+	KEYWORDS="~amd64 ~x86"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="http://www.libvirt.org/"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="audit avahi +caps firewalld fuse iscsi +libvirtd lvm lxc +macvtap nfs \
+	nls numa openvz parted pcap phyp policykit python +qemu rbd sasl \
+	selinux +udev uml +vepa virtualbox virt-network xen elibc_glibc \
+	systemd"
+REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
+	lxc? ( caps libvirtd )
+	openvz? ( libvirtd )
+	qemu? ( libvirtd )
+	uml? ( libvirtd )
+	vepa? ( macvtap )
+	virtualbox? ( libvirtd )
+	xen? ( libvirtd )
+	virt-network? ( libvirtd )
+	firewalld? ( virt-network )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent
+RDEPEND="sys-libs/readline
+	sys-libs/ncurses
+	>=net-misc/curl-7.18.0
+	dev-libs/libgcrypt
+	>=dev-libs/libxml2-2.7.6
+	dev-libs/libnl:3
+	>=net-libs/gnutls-1.0.25
+	net-libs/libssh2
+	sys-apps/dmidecode
+	>=sys-apps/util-linux-2.17
+	sys-devel/gettext
+	>=net-analyzer/netcat6-1.0-r2
+	app-misc/scrub
+	audit? ( sys-process/audit )
+	avahi? ( >=net-dns/avahi-0.6[dbus] )
+	caps? ( sys-libs/libcap-ng )
+	fuse? ( >=sys-fs/fuse-2.8.6 )
+	iscsi? ( sys-block/open-iscsi )
+	lxc? ( sys-power/pm-utils )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
+	nfs? ( net-fs/nfs-utils )
+	numa? (
+		>sys-process/numactl-2.0.2
+		sys-process/numad
+	)
+	openvz? ( sys-kernel/openvz-sources )
+	parted? (
+		>=sys-block/parted-1.8[device-mapper]
+		sys-fs/lvm2
+	)
+	pcap? ( >=net-libs/libpcap-1.0.0 )
+	policykit? ( >=sys-auth/polkit-0.9 )
+	python? ( ${PYTHON_DEPS} )
+	qemu? (
+		>=app-emulation/qemu-0.13.0
+		dev-libs/yajl
+		sys-power/pm-utils
+	)
+	rbd? ( sys-cluster/ceph )
+	sasl? ( dev-libs/cyrus-sasl )
+	selinux? ( >=sys-libs/libselinux-2.0.85 )
+	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
+	xen? ( app-emulation/xen-tools app-emulation/xen )
+	udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
+	virt-network? ( net-dns/dnsmasq
+		>=net-firewall/iptables-1.4.10
+		net-misc/radvd
+		net-firewall/ebtables
+		sys-apps/iproute2[-minimal]
+		firewalld? ( net-firewall/firewalld )
+	)
+	elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
+# one? ( dev-libs/xmlrpc-c )
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	app-text/xhtml1
+	dev-lang/perl
+	dev-libs/libxslt"
+
+DOC_CONTENTS="For the basic networking support (bridged and routed networks)
+you don't need any extra software. For more complex network modes
+including but not limited to NATed network, you can enable the
+'virt-network' USE flag.\n\n
+If you are using dnsmasq on your system, you will have
+to configure /etc/dnsmasq.conf to enable the following settings:\n\n
+ bind-interfaces\n
+ interface or except-interface\n\n
+Otherwise you might have issues with your existing DNS server."
+
+LXC_CONFIG_CHECK="
+	~CGROUPS
+	~CGROUP_FREEZER
+	~CGROUP_DEVICE
+	~CGROUP_CPUACCT
+	~CGROUP_SCHED
+	~CGROUP_PERF
+	~BLK_CGROUP
+	~NET_CLS_CGROUP
+	~NETPRIO_CGROUP
+	~CPUSETS
+	~RESOURCE_COUNTERS
+	~NAMESPACES
+	~UTS_NS
+	~IPC_NS
+	~PID_NS
+	~NET_NS
+	~USER_NS
+	~DEVPTS_MULTIPLE_INSTANCES
+	~VETH
+	~MACVLAN
+	~POSIX_MQUEUE
+	~SECURITYFS
+	~!GRKERNSEC_CHROOT_MOUNT
+	~!GRKERNSEC_CHROOT_DOUBLE
+	~!GRKERNSEC_CHROOT_PIVOT
+	~!GRKERNSEC_CHROOT_CHMOD
+	~!GRKERNSEC_CHROOT_CAPS
+"
+
+VIRTNET_CONFIG_CHECK="
+	~BRIDGE_NF_EBTABLES
+	~BRIDGE_EBT_MARK_T
+	~NETFILTER_ADVANCED
+	~NETFILTER_XT_TARGET_CHECKSUM
+	~NETFILTER_XT_CONNMARK
+	~NETFILTER_XT_MARK
+"
+
+MACVTAP_CONFIG_CHECK=" ~MACVTAP"
+
+LVM_CONFIG_CHECK=" ~BLK_DEV_DM ~DM_SNAPSHOT ~DM_MULTIPATH"
+
+pkg_setup() {
+	enewgroup qemu 77
+	enewuser qemu 77 -1 -1 qemu kvm
+
+	# Some people used the masked ebuild which was not adding the qemu
+	# user to the kvm group originally. This results in VMs failing to
+	# start for some users. bug #430808
+	egetent group kvm | grep -q qemu
+	if [[ $? -ne 0 ]]; then
+		gpasswd -a qemu kvm
+	fi
+
+	python-single-r1_pkg_setup
+
+	# Handle specific kernel versions for different features
+	kernel_is lt 3 6 && LXC_CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
+	kernel_is ge 3 6 &&	LXC_CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
+
+	CONFIG_CHECK=""
+	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
+	use lvm && CONFIG_CHECK+="${LVM_CONFIG_CHECK}"
+	use lxc && CONFIG_CHECK+="${LXC_CONFIG_CHECK}"
+	use macvtap && CONFIG_CHECK+="${MACVTAP_CONFIG_CHECK}"
+	use virt-network && CONFIG_CHECK+="${VIRTNET_CONFIG_CHECK}"
+	if [[ -n ${CONFIG_CHECK} ]]; then
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	touch "${S}/.mailmap"
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
+
+	if [[ ${PV} = *9999* ]]; then
+
+		# git checkouts require bootstrapping to create the configure script.
+		# Additionally the submodules must be cloned to the right locations
+		# bug #377279
+		./bootstrap || die "bootstrap failed"
+		(
+			git submodule status | sed 's/^[ +-]//;s/ .*//'
+			git hash-object bootstrap.conf
+		) >.git-module-status
+	fi
+
+	epatch_user
+
+	[[ -n ${AUTOTOOLIZE} ]] && eautoreconf
+
+	# Tweak the init script
+	local avahi_init=
+	local iscsi_init=
+	local rbd_init=
+	local firewalld_init=
+	cp "${FILESDIR}/libvirtd.init-r13" "${S}/libvirtd.init"
+	use avahi && avahi_init='avahi-daemon'
+	use iscsi && iscsi_init='iscsid'
+	use rbd && rbd_init='ceph'
+	use firewalld && firewalld_init='need firewalld'
+
+	sed -e "s/USE_FLAG_FIREWALLD/${firewalld_init}/" -i "${S}/libvirtd.init"
+	sed -e "s/USE_FLAG_AVAHI/${avahi_init}/" -i "${S}/libvirtd.init"
+	sed -e "s/USE_FLAG_ISCSI/${iscsi_init}/" -i "${S}/libvirtd.init"
+	sed -e "s/USE_FLAG_RBD/${rbd_init}/" -i "${S}/libvirtd.init"
+}
+
+src_configure() {
+	local myconf=""
+
+	## enable/disable daemon, otherwise client only utils
+	myconf="${myconf} $(use_with libvirtd)"
+
+	## enable/disable the daemon using avahi to find VMs
+	myconf="${myconf} $(use_with avahi)"
+
+	## hypervisors on the local host
+	myconf="${myconf} $(use_with xen) $(use_with xen xen-inotify)"
+	myconf+=" --without-xenapi"
+	if use xen && has_version ">=app-emulation/xen-tools-4.2.0"; then
+		myconf+=" --with-libxl"
+	else
+		myconf+=" --without-libxl"
+	fi
+	myconf="${myconf} $(use_with openvz)"
+	myconf="${myconf} $(use_with lxc)"
+	if use virtualbox && has_version app-emulation/virtualbox-ose; then
+		myconf="${myconf} --with-vbox=/usr/lib/virtualbox-ose/"
+	else
+		myconf="${myconf} $(use_with virtualbox vbox)"
+	fi
+	myconf="${myconf} $(use_with uml)"
+	myconf="${myconf} $(use_with qemu)"
+	myconf="${myconf} $(use_with qemu yajl)" # Use QMP over HMP
+	myconf="${myconf} $(use_with phyp)"
+	myconf="${myconf} --with-esx"
+	myconf="${myconf} --with-vmware"
+
+	## additional host drivers
+	myconf="${myconf} $(use_with virt-network network)"
+	myconf="${myconf} --with-storage-fs"
+	myconf="${myconf} $(use_with lvm storage-lvm)"
+	myconf="${myconf} $(use_with iscsi storage-iscsi)"
+	myconf="${myconf} $(use_with parted storage-disk)"
+	myconf="${myconf} $(use_with lvm storage-mpath)"
+	myconf="${myconf} $(use_with rbd storage-rbd)"
+	myconf="${myconf} $(use_with numa numactl)"
+	myconf="${myconf} $(use_with numa numad)"
+	myconf="${myconf} $(use_with selinux)"
+	myconf="${myconf} $(use_with fuse)"
+
+	# udev for device support details
+	myconf="${myconf} $(use_with udev)"
+
+	# linux capability support so we don't need privileged accounts
+	myconf="${myconf} $(use_with caps capng)"
+
+	## auth stuff
+	myconf="${myconf} $(use_with policykit polkit)"
+	myconf="${myconf} $(use_with sasl)"
+
+	# network bits
+	myconf="${myconf} $(use_with macvtap)"
+	myconf="${myconf} $(use_with pcap libpcap)"
+	myconf="${myconf} $(use_with vepa virtualport)"
+	myconf="${myconf} $(use_with firewalld)"
+
+	## other
+	myconf="${myconf} $(use_enable nls)"
+	myconf="${myconf} $(use_with python)"
+
+	# user privilege bits fir qemu/kvm
+	if use caps; then
+		myconf="${myconf} --with-qemu-user=qemu"
+		myconf="${myconf} --with-qemu-group=qemu"
+	else
+		myconf="${myconf} --with-qemu-user=root"
+		myconf="${myconf} --with-qemu-group=root"
+	fi
+
+	# audit support
+	myconf="${myconf} $(use_with audit)"
+
+	## stuff we don't yet support
+	myconf="${myconf} --without-netcf"
+
+	# we use udev over hal
+	myconf="${myconf} --without-hal"
+
+	# locking support
+	myconf="${myconf} --without-sanlock"
+
+	# systemd unit files
+	use systemd && myconf="${myconf} --with-init-script=systemd"
+
+	# this is a nasty trick to work around the problem in bug
+	# #275073. The reason why we don't solve this properly is that
+	# it'll require us to rebuild autotools (and we don't really want
+	# to do that right now). The proper solution has been sent
+	# upstream and should hopefully land in 0.7.7, in the mean time,
+	# mime the same functionality with this.
+	case ${CHOST} in
+		*cygwin* | *mingw* )
+			;;
+		*)
+			ac_cv_prog_WINDRES=no
+			;;
+	esac
+
+	econf \
+		${myconf} \
+		--disable-static \
+		--docdir=/usr/share/doc/${PF} \
+		--with-remote \
+		--localstatedir=/var
+
+	if [[ ${PV} = *9999* ]]; then
+		# Restore gnulib's config.sub and config.guess
+		# bug #377279
+		(cd .gnulib && git reset --hard > /dev/null)
+	fi
+}
+
+src_test() {
+	# Explicitly allow parallel build of tests
+	export VIR_TEST_DEBUG=1
+	HOME="${T}" emake check || die "tests failed"
+}
+
+src_install() {
+	emake install \
+		DESTDIR="${D}" \
+		HTML_DIR=/usr/share/doc/${PF}/html \
+		DOCS_DIR=/usr/share/doc/${PF} \
+		EXAMPLE_DIR=/usr/share/doc/${PF}/examples \
+		SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)" \
+		|| die "emake install failed"
+
+	find "${D}" -name '*.la' -delete || die
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	newinitd "${S}/libvirtd.init" libvirtd || die
+	newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die
+	newinitd "${FILESDIR}/virtlockd.init" virtlockd || die
+
+	keepdir /var/lib/libvirt/images
+
+	use python && python_optimize
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# we only ever want to generate this once
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
+	fi
+
+	# We really don't want to use or support old PolicyKit cause it
+	# screws with the new polkit integration
+	if has_version sys-auth/policykit; then
+		rm -rf "${D}"/usr/share/PolicyKit/policy/org.libvirt.unix.policy
+	fi
+
+	# Only sysctl files ending in .conf work
+	dodir /etc/sysctl.d
+	mv "${D}"/usr/lib/sysctl.d/libvirtd.conf "${D}"/etc/sysctl.d/libvirtd.conf
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
+	fi
+
+	# support for dropped privileges
+	if use qemu; then
+		fperms 0750 "${EROOT}/var/lib/libvirt/qemu"
+		fperms 0750 "${EROOT}/var/cache/libvirt/qemu"
+	fi
+
+	if use caps && use qemu; then
+		fowners -R qemu:qemu "${EROOT}/var/lib/libvirt/qemu"
+		fowners -R qemu:qemu "${EROOT}/var/cache/libvirt/qemu"
+	elif use qemu; then
+		fowners -R root:root "${EROOT}/var/lib/libvirt/qemu"
+		fowners -R root:root "${EROOT}/var/cache/libvirt/qemu"
+	fi
+
+	if ! use policykit; then
+		elog "To allow normal users to connect to libvirtd you must change the"
+		elog "unix sock group and/or perms in /etc/libvirt/libvirtd.conf"
+	fi
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	readme.gentoo_print_elog
+
+	if use caps && use qemu; then
+		elog "libvirt will now start qemu/kvm VMs with non-root privileges."
+		elog "Ensure any resources your VMs use are accessible by qemu:qemu"
+	fi
+}
--- a/app-emulation/spice/files/spice-0.12.4-alsa-conditional.patch
+++ b/app-emulation/spice/files/spice-0.12.4-alsa-conditional.patch
@ -0,0 +1,51 @@
+From 58195c195110f0dbb24d831b5eefb2f094848b26 Mon Sep 17 00:00:00 2001
+From: Christian Ruppert <idl0r@qasl.de>
+Date: Sun, 03 Nov 2013 17:38:55 +0000
+Subject: Require alsa only with --enable-client
+
+Hey guys,
+
+the alsa libraries/header seem to be required only when configured with
+--enable-client so I wrote a patch to make configure respect it.
+
+--
+Regards,
+Christian Ruppert
+
+From 53683cc75ba092799f856f710cb45b2aacfb6123 Mon Sep 17 00:00:00 2001
+From: Christian Ruppert <idl0r@gentoo.org>
+Date: Sun, 3 Nov 2013 18:36:26 +0100
+Subject: [PATCH] Require alsa only with --enable-client
+---
+diff --git a/configure.ac b/configure.ac
+index 7e81329..882bf1b 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -246,12 +246,6 @@ fi
+ AC_MSG_RESULT([found])
+ fi
+ 
+-if test "$os_linux" = yes; then
+-	PKG_CHECK_MODULES(ALSA, alsa)
+-	AC_SUBST(ALSA_CFLAGS)
+-	AC_SUBST(ALSA_LIBS)
+-fi
+-
+ PKG_CHECK_MODULES(SSL, openssl)
+ AC_SUBST(SSL_CFLAGS)
+ AC_SUBST(SSL_LIBS)
+@@ -280,6 +274,12 @@ AC_SUBST(GL_LIBS)
+ SPICE_NONPKGCONFIG_LIBS+=" $GL_LIBS"
+ 
+ if test "x$red_target" = "xx11" && test "x$enable_client" = "xyes" ; then
+	if test "$os_linux" = yes; then
+		PKG_CHECK_MODULES(ALSA, alsa)
+		AC_SUBST(ALSA_CFLAGS)
+		AC_SUBST(ALSA_LIBS)
+	fi
+
+ 	PKG_CHECK_MODULES(XRANDR, xrandr)
+ 	PKG_CHECK_MODULES(XFIXES, xfixes)
+ 	PKG_CHECK_MODULES(MISC_X, x11 xext xrender)
+--
+cgit v0.9.0.2-2-gbebe
--- a/app-emulation/spice/spice-0.12.4-r1.ebuild
+++ b/app-emulation/spice/spice-0.12.4-r1.ebuild
@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice/spice-0.12.4.ebuild,v 1.5 2013/10/09 05:24:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice/spice-0.12.4-r1.ebuild,v 1.1 2013/11/05 20:37:41 idl0r Exp $

 EAPI=5

 PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )

-inherit eutils python-any-r1
+inherit autotools eutils python-any-r1

 DESCRIPTION="SPICE server and client."
 HOMEPAGE="http://spice-space.org/"
@ -19,7 +19,6 @@ IUSE="client sasl smartcard static-libs" # static

 RDEPEND=">=x11-libs/pixman-0.17.7
 	>=dev-libs/glib-2.22:2
-	media-libs/alsa-lib
 	>=media-libs/celt-0.5.1.1:0.5.1
 	dev-libs/openssl
 	virtual/jpeg
@ -27,6 +26,7 @@ RDEPEND=">=x11-libs/pixman-0.17.7
 	sasl? ( dev-libs/cyrus-sasl )
 	smartcard? ( >=app-emulation/libcacard-0.1.2 )
 	client? (
+		media-libs/alsa-lib
 		>=x11-libs/libXrandr-1.2
 		x11-libs/libX11
 		x11-libs/libXext
@ -69,9 +69,11 @@ pkg_setup() {

 src_prepare() {
 	epatch \
-		"${FILESDIR}/0.11.0-gold.patch"
+		"${FILESDIR}/0.11.0-gold.patch" \
+		"${FILESDIR}/${P}-alsa-conditional.patch"

 	epatch_user
+	eautoreconf
 }

 src_configure() {
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@ -1,3 +1,4 @@
 DIST VBoxGuestAdditions_4.1.26.iso 52281344 SHA256 d824f920ce69cf3710b980b972f9158e27d081e89b114a597b181eca1842687d SHA512 f4fb80a61f36a22d7bbeacc0e342671e0a3aa18c12fe90c35edf29e586bcb43157f0c20ce19bcbf7a48a5cd8568337d35afc44ae35f2f55f4cdd077600cbe747 WHIRLPOOL 0f81aece690cce386fa21d8e109cf7730ad91becbce68be7df21839dbfbf52252f360f9530a4af1d5b15bf38551c1b53d141bd05fdc61cc0c5e5b87b529d0e34
 DIST VBoxGuestAdditions_4.2.18.iso 59656192 SHA256 f11a7f13dfe7bf9f246fb877144bb467fe6deadcd876568ec79b6ccd3b59d767 SHA512 2e5b0bc0d63e3b51f95fb5e6827088f130f07c2af1648c46282a3ae6af8150832f29724106b4d8335a0a51178f1ffdf069376cc46a964c24bbe06fea36d012a5 WHIRLPOOL 39afc0ce9f905f8fdac2aaa1db5f80e856ddd5f4229d21f31ce6684c93a4ec556632c8af605979461e3a1849531bcc771d6bbfb98a75a4c39fa430ecb08754d3
 DIST VBoxGuestAdditions_4.3.0.iso 64145408 SHA256 eb6337ddd2d19d16ad7a9dafeea4fa49804e3d7ff217313250a5d14f34cefc97 SHA512 bb31bd07d7cb5c7c55b07f87ce54a1ad9f0bd5bf50d207452701c62b67bfa6b93a0c9550787d17511068273628e0e802d1f9a23c85a0926faec08bacf841be9d WHIRLPOOL ddad5d14bab35bed8d2a77675f22543ec818d936ba1d53f450d4557414499e1a12a25f518f5c02c348ecfcd1c3348ad149a402b9fce5e429aa0868e1af3389dc
+DIST VBoxGuestAdditions_4.3.2.iso 64153600 SHA256 f0b8fec99c65231641d5d01558abb53fe8b81f131dc71519cb7994c9e297300d SHA512 bf732076ce99883732bb33b5feba8f93c88dd493e6db603d0c327225dfe5ad71db44f4aa1efc26f7c2ed4dc27896a45cabb97dc98062176be3cb0d4531c776a9 WHIRLPOOL 00276a9f7449ab7ab97fe6625c26f7516da06e4d11b0ad0633f9e3ac000565a6568b90f067fe6da2098e179bf7c04794ab7ae65ca5e37ff28667d42eb6c4aaf3
--- a/app-emulation/virtualbox-additions/virtualbox-additions-4.3.2.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-4.3.2.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2013 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.3.2.ebuild,v 1.1 2013/11/02 15:12:38 polynomial-c Exp $
+
+EAPI=5
+
+inherit eutils
+
+MY_PN=VBoxGuestAdditions
+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/${MY_PV}/${MY_P}.iso"
+
+LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	!=app-emulation/virtualbox-9999"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	return 0
+}
+
+src_install() {
+	insinto /usr/share/${PN/-additions}
+	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
+}
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@ -1,12 +1,16 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.26-84997.tar.gz 10856343 SHA256 b392c2f8ed8d813a18597679a90eed9d76efd12d161373cbc5bd7de8165f5ce2 SHA512 581672dd46910cea77d0762d217f4e5afe28f5b45dcec68568885214e745af637a8588a96a85c5b8cb1b761ad68b05e8148d580f30ebf851228d34888c77998e WHIRLPOOL 6c9e3971259bfbf4f54ff6c7eb571f47bf78a51e5d1f4cce01529f7727444c366b70c343c1d0ebfc8fa1adb4bdd57ea4644f813f2991b6cb8f2d381a34f69372
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.2.18-88780.tar.gz 11665435 SHA256 1d1737b59d0f30f5d42beeabaff168bdc0a75b8b28df685979be6173e5adbbba SHA512 58d0990f8318a79da426c1390e6dd6df10639b5fc2b478044541d300c366881cba87ac0843e8524a7c489b95f0152e3942e6e28b178c85e582d70a1fb951bbdb WHIRLPOOL 33fc03dc5bcc0e5604aa9eb3d3c8fcc636a067d92a30689a98fd6d9ea16fa6b295e2f140af48b5747439b2ab3189bc645b0157848aed6d503d35e66232924714
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.0-89960.tar.gz 12735473 SHA256 718c822acedce96c6ab2af93ec8efdf1789bdd03b7cfabb2c9d2f94e2047b399 SHA512 6c7e6c0076ca9d7fd83a0f57a0138d4390fc6c05a862503f92c4ee7b0bf5435e7b9fe1cbcf7f66685252cfeead311bbf777ea9477331c839aa9fbb06c7454b44 WHIRLPOOL c5545101060d8350bb6332eb7ff86f4f015c15c90521c04679944b9175a238ed5914aa23c6656b780f0f9a4fc34b4e99ff1b3102342125c763c1c90d84d53188
+DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.2-90405.tar.gz 10417726 SHA256 c42f7ef2ac97138551f73db38180aa56f63dd44b3823156da470f7e9ee3dc8e5 SHA512 b04be4edb2e8794b79e3fe96dc416a9c4697a4ca0e41474c6f8563fc4d1fbb7fe784ec5d53545a873d1df06a93ea00f0bc64158db4553e2b9b2f679a97a220ed WHIRLPOOL f8bc92e44ecc4e8eedd657f5097e3b94823b223cc72db1143c5e1822cc01ca7d4e7f0302e8f85647989f445f56935711fa759a5f17eb84f218d5d7fa506a7948
 DIST VirtualBox-4.1.26-84997-Linux_amd64.run 78611922 SHA256 53d68de15bbdff02212e5f1fede92ce026817e6757079b6bfe19e170b780c096 SHA512 ab231749a2a7394d820032bab274dc2b66a0aaf3ff0e2ea069524191a80158410d1a5d3615094c5d185f214f402b4f5cf14474b3443c06dd4cc9a6b584329747 WHIRLPOOL de1b6ccb48af500e453fda213876d0da56b26cf9e86a068d3234a6d52cdeaf572399e0be0342a969ea1b2e7d7e21b392ec8f3bc40c4b5cb0ab96eeaa036dcfb5
 DIST VirtualBox-4.1.26-84997-Linux_x86.run 78489038 SHA256 67c690b9a419bae86eaf621ef05a7ba497d55adead4aa27c5d61412960b2f0c2 SHA512 0db76dac6b1fbb9a46cb37dc6b66647ab1658f41a8890ff4b4dbd84933aaaacc0a569e84a6f49e30c96fece3574bd29e4e921dbd1260ab3c7ddb4cbc17e9aeca WHIRLPOOL 4fea84cb7dcdb4bd4f2d5c20efd5d0ec9d1d665c16b6f4ba29ab10d18fc9d098fe3bdd782c41653476eeba42fcfd2cbb4be010eb45f04678798fc629e36e9ad0
 DIST VirtualBox-4.2.18-88781-Linux_amd64.run 85226961 SHA256 2fdc201bb24fe7268dd034b8f22f1d245ed7c9ea2fcbe34f512615e56590abc2 SHA512 e931eec1b7860b2413dd76852dee3c8d8dfada09d638ad9663e076774f238df8357f0265bdb89ad6c869c20e54be8b2b35cc6634d6d1e4ccb9642066374a80d9 WHIRLPOOL 8b2a7834f02c7e20874fb4744b634e9f234145a47fa13f8201d4b4ab765447cde772fd18e403373dc6b3913c40bdca71f85471b0471bc9c7ca1ba9858ecf8a54
 DIST VirtualBox-4.2.18-88781-Linux_x86.run 85052878 SHA256 edc36d7f86d10cb5e56c812e17a46fb78a39c85b5173c18e1b4ae6cd837caa4a SHA512 3a7b0a064f5c89ccfe719d5ef4885adda8bdedd9aee9663485abbf34fd5d0e2661feaf0630989dc97903538ff4adc00049b110bdb382b61ec591b74541fa5f85 WHIRLPOOL 2dce592ea0d59a3234660008791db2ad799c07b5a971eae530a0338d85827b9089546145bf4dff5c101d8974193892cf16118d98da1a19ad697629095a6c5726
 DIST VirtualBox-4.3.0-89960-Linux_amd64.run 90695121 SHA256 ee4357c07d83a8a4def25553ae725e46b9d6bd9debc4b26bfae8a39bb4f20899 SHA512 2b9a1f2e11d9f5780c9d23711174f091741d39f4c7f139724cfad9946514d18d3c7569fc67cce257a4f6429eaddda90ed8d3a69981fc5584a5d130ee513ad8d8 WHIRLPOOL bfb387e7efd0b79ac2c331ada9a31da3808671c6ad5050bc8140bafc7d0c501b9d30245538dbcf8b3d59d94ca33bdb714c49d5efd73c55564020090e959de642
 DIST VirtualBox-4.3.0-89960-Linux_x86.run 90070476 SHA256 b0a9fe944ef861732831722d8de16b0d77c01f5c9b11127e3fb5ec845db169c7 SHA512 61440d29e2c0bb868581855ab002e8b9d867ab6fc4feb8c49c92e65cca1cd97c8eb674b1c916d161830a5129f86505efe12ac1db6a54cc24c830202b922fa8e3 WHIRLPOOL 60ddfebf36b6a9e8e4899fd558208271bcff9a39bda8bf9d7a3c7a29475fb8d0799671d8af297e1b647fd9742c59328ef5168446cd2efc89eaa1a7a73ac79634
+DIST VirtualBox-4.3.2-90405-Linux_amd64.run 90633680 SHA256 b933ac5b08bec74004d005189e8d791defce878a2b1561ff99b3db58e5aefd49 SHA512 6b0d21a2a179b553644cf027f0c583069beb8fb08e26ce556194b36893830e1b06e2f2c83b6841868e623562042229b475e4f86b8268a4f8ead4218cb4129780 WHIRLPOOL 9e0988e167563e02c5ccdae45bbc6f5b5594279b3d617def357229019fd921447f609b027a6fc04dea633ee9d8c8dcee4e7f6ac19ff19131c8f08de4da8d638c
+DIST VirtualBox-4.3.2-90405-Linux_x86.run 90070475 SHA256 cc2a338e805cbb6503597665f811b546b347f79d80a44852a14da03022fd8299 SHA512 d1b0d05da634605e1c9f64ebc5b70575e17818669250015c50c6528d3345390692bf14148799d52bd7d76eee5794ecab9492ccccbdfc9502c37b8ec1a9c1b64d WHIRLPOOL 8165b0fb4f72deaa002b3f9799ad6ae7e685617013d04c998011b89c978867d82d8b2facf20f5d57f30d3d9d42f3c42833ab1bcacb32f774a99081bde61ca89e
 DIST VirtualBoxSDK-4.1.26-84997.zip 8805729 SHA256 5fbfd1773d0ef0bd72400b387cdf1b9a469499e442f400b98b22f9759c9f3026 SHA512 a888b622447a55157b5de23e7559ef9f45066bf55a4f082fdb1b4c313eecc84e908658239199c2b1f1c61bab2ab31ddb4ac597d648502cb28b9aa1053e2d954c WHIRLPOOL 4cb49c5041d50c068f2ae5d1772f4e1335c05a0fd6003aa54b9109536c090145e029e4c47c845f82ee7468cf262440ba15ee0bde7b9cc28d97f8ee25910a0756
 DIST VirtualBoxSDK-4.2.18-88780.zip 9736718 SHA256 d448607a416f0289334b7bb868522f6f92847c4ceaabe848b850fbb97126b58f SHA512 be96647826aa13d6780aec759121c4e297b0c6334b237e5e7194ff8bd05d0f8bada87de851aee4ef7bef11e9d676ce08207dbc8e19cf9b1c594dab5cf2d5a0ad WHIRLPOOL b712e93e503625d22dcfad6aa6c627243049ff557c68da816ac231f333dee1ccdb4a086a0e01940f1f77b1cae1ff738a49206ea1299a12b5ad6d23518435e406
 DIST VirtualBoxSDK-4.3.0-89960.zip 11272314 SHA256 fcf2c55b00cc0e31789692c290e11787eadc490ccadfb172203ddfa46a373718 SHA512 b23d1ff91752f6174e268877ad8a4265161acf8dda7c7a81284df26487846261549d199859c6fb6676a5ecff56a65a4629c8b33fda9f2244a27e45ed15cdc895 WHIRLPOOL 573ff8590f090cb8371b88213c9b17da0e59bd4f2c3b845d1a1265e815649f3bdf303e4fac3dcab2188a9a626e4890d181bca3f162139363b8881fea133a4096
+DIST VirtualBoxSDK-4.3.2-90405.zip 11271777 SHA256 0922dd7606d681f3edade16a6f02bc86e3da87f84d4fb0d4ee3dc3b70e0c4b77 SHA512 b2675126dc768a76410fe9a72b53a0872c58c76df3484bd31cdffa8248807e99bc7674713046237f74f279bc314bc490a5dda7d84c0b346da224ad986dab8867 WHIRLPOOL 22f26f4d349d195e7a2c12f7bc6876d83374a399b38f7933d65175b370509d3a948b0372b1bdb045a40c4a2ac4dd6218fa1f1c56f7a805d66301421514f67774
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.3.0.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.3.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.3.0.ebuild,v 1.2 2013/10/16 06:46:45 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.3.0.ebuild,v 1.3 2013/11/02 15:12:13 polynomial-c Exp $

 EAPI=5

@ -268,7 +268,7 @@ src_install() {
 	dosym /opt/VirtualBox/VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so

 	local each
-	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,TestOGL,ExtPackHelperApp}; do
+	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,NetNAT,TestOGL,ExtPackHelperApp}; do
 		fowners root:vboxusers /opt/VirtualBox/${each}
 		fperms 0750 /opt/VirtualBox/${each}
 		pax-mark -m "${D}"/opt/VirtualBox/${each}
@ -276,6 +276,7 @@ src_install() {
 	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
 	fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
 	fperms 4750 /opt/VirtualBox/VBoxNetDHCP
+	fperms 4750 /opt/VirtualBox/VBoxNetNAT

 	if ! use headless ; then
 		# Hardened build: Mark selected binaries set-user-ID-on-execution
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.3.2.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.3.2.ebuild
@ -0,0 +1,351 @@
+# Copyright 1999-2013 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.3.2.ebuild,v 1.1 2013/11/02 15:12:13 polynomial-c Exp $
+
+EAPI=5
+
+inherit eutils unpacker fdo-mime gnome2 pax-utils udev
+
+MY_PV=${PV/beta/BETA}
+MY_PV=${MY_PV/rc/RC}
+VBOX_PV=${MY_PV}-90405
+SDK_PV=${VBOX_PV}
+EXTP_PV=${VBOX_PV}
+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/${MY_PV}/${MY_P}_amd64.run )
+	x86? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )
+	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"
+KEYWORDS="~amd64 ~x86"
+IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
+RESTRICT="mirror"
+
+if [[ "${PV}" != *beta* ]] ; then
+	SRC_URI+="
+		sdk? ( http://download.virtualbox.org/virtualbox/${MY_PV}/VirtualBoxSDK-${SDK_PV}.zip )"
+	IUSE+=" sdk"
+fi
+
+DEPEND="app-arch/unzip"
+
+RDEPEND="!!app-emulation/virtualbox
+	!app-emulation/virtualbox-additions
+	~app-emulation/virtualbox-modules-${PV}
+	!headless? (
+		x11-libs/libXcursor
+		media-libs/libsdl[X]
+		x11-libs/libXrender
+		x11-libs/libXfixes
+		media-libs/libpng
+		x11-libs/libXi
+		x11-libs/libXrandr
+		x11-libs/libXinerama
+		x11-libs/libXft
+		media-libs/freetype
+		media-libs/fontconfig
+		x11-libs/libXext
+		dev-libs/glib
+		chm? ( dev-libs/expat )
+	)
+	x11-libs/libXt
+	dev-libs/libxml2
+	x11-libs/libXau
+	x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXdmcp
+	python? ( || (
+			dev-lang/python:2.7
+			dev-lang/python:2.6
+		) )"
+
+S=${WORKDIR}
+
+QA_TEXTRELS_amd64="opt/VirtualBox/VBoxVMM.so"
+QA_TEXTRELS_x86="opt/VirtualBox/VBoxGuestPropSvc.so
+	opt/VirtualBox/VBoxSDL.so
+	opt/VirtualBox/VBoxDbg.so
+	opt/VirtualBox/VBoxSharedFolders.so
+	opt/VirtualBox/VBoxDD2.so
+	opt/VirtualBox/VBoxOGLrenderspu.so
+	opt/VirtualBox/VBoxPython.so
+	opt/VirtualBox/VBoxPython2_6.so
+	opt/VirtualBox/VBoxPython2_7.so
+	opt/VirtualBox/VBoxDD.so
+	opt/VirtualBox/VBoxVRDP.so
+	opt/VirtualBox/VBoxDDU.so
+	opt/VirtualBox/VBoxREM64.so
+	opt/VirtualBox/VBoxSharedClipboard.so
+	opt/VirtualBox/VBoxHeadless.so
+	opt/VirtualBox/VBoxRT.so
+	opt/VirtualBox/VRDPAuth.so
+	opt/VirtualBox/VBoxREM.so
+	opt/VirtualBox/VBoxSettings.so
+	opt/VirtualBox/VBoxKeyboard.so
+	opt/VirtualBox/VBoxSharedCrOpenGL.so
+	opt/VirtualBox/VBoxVMM.so
+	opt/VirtualBox/VirtualBox.so
+	opt/VirtualBox/VBoxOGLhosterrorspu.so
+	opt/VirtualBox/components/VBoxC.so
+	opt/VirtualBox/components/VBoxSVCM.so
+	opt/VirtualBox/VBoxREM32.so
+	opt/VirtualBox/VBoxXPCOMC.so
+	opt/VirtualBox/VBoxOGLhostcrutil.so
+	opt/VirtualBox/VBoxNetDHCP.so
+	opt/VirtualBox/VBoxGuestControlSvc.so"
+QA_PRESTRIPPED="opt/VirtualBox/VBoxDD.so
+	opt/VirtualBox/VBoxDD2.so
+	opt/VirtualBox/VBoxDDU.so
+	opt/VirtualBox/VBoxDbg.so
+	opt/VirtualBox/VBoxGuestControlSvc.so
+	opt/VirtualBox/VBoxGuestPropSvc.so
+	opt/VirtualBox/VBoxHeadless
+	opt/VirtualBox/VBoxHeadless.so
+	opt/VirtualBox/VBoxKeyboard.so
+	opt/VirtualBox/VBoxManage
+	opt/VirtualBox/VBoxNetAdpCtl
+	opt/VirtualBox/VBoxNetDHCP
+	opt/VirtualBox/VBoxNetDHCP.so
+	opt/VirtualBox/VBoxOGLhostcrutil.so
+	opt/VirtualBox/VBoxOGLhosterrorspu.so
+	opt/VirtualBox/VBoxOGLrenderspu.so
+	opt/VirtualBox/VBoxPython.so
+	opt/VirtualBox/VBoxPython2_6.so
+	opt/VirtualBox/VBoxPython2_7.so
+	opt/VirtualBox/VBoxREM.so
+	opt/VirtualBox/VBoxREM32.so
+	opt/VirtualBox/VBoxREM64.so
+	opt/VirtualBox/VBoxRT.so
+	opt/VirtualBox/VBoxSDL
+	opt/VirtualBox/VBoxSDL.so
+	opt/VirtualBox/VBoxSVC
+	opt/VirtualBox/VBoxSettings.so
+	opt/VirtualBox/VBoxSharedClipboard.so
+	opt/VirtualBox/VBoxSharedCrOpenGL.so
+	opt/VirtualBox/VBoxSharedFolders.so
+	opt/VirtualBox/VBoxTestOGL
+	opt/VirtualBox/VBoxTunctl
+	opt/VirtualBox/VBoxVMM.so
+	opt/VirtualBox/VBoxVRDP.so
+	opt/VirtualBox/VBoxXPCOM.so
+	opt/VirtualBox/VBoxXPCOMC.so
+	opt/VirtualBox/VBoxXPCOMIPCD
+	opt/VirtualBox/VRDPAuth.so
+	opt/VirtualBox/VirtualBox
+	opt/VirtualBox/VirtualBox.so
+	opt/VirtualBox/accessible/libqtaccessiblewidgets.so
+	opt/VirtualBox/components/VBoxC.so
+	opt/VirtualBox/components/VBoxSVCM.so
+	opt/VirtualBox/components/VBoxXPCOMIPCC.so
+	opt/VirtualBox/kchmviewer
+	opt/VirtualBox/libQtCoreVBox.so.4
+	opt/VirtualBox/libQtGuiVBox.so.4
+	opt/VirtualBox/libQtNetworkVBox.so.4
+	opt/VirtualBox/libQtOpenGLVBox.so.4
+	opt/VirtualBox/vboxwebsrv"
+
+PYTHON_UPDATER_IGNORE="1"
+
+src_unpack() {
+	unpack_makeself ${MY_P}_${ARCH}.run
+	unpack ./VirtualBox.tar.bz2
+
+	mkdir "${S}"/${EXTP_PN} || die
+	pushd "${S}"/${EXTP_PN} &>/dev/null || die
+	unpack ${EXTP_PN}-${EXTP_PV}.tar.gz
+	popd &>/dev/null || die
+
+	if [[ "${PV}" != *beta* ]] && use sdk ; then
+		unpack VirtualBoxSDK-${SDK_PV}.zip
+	fi
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	# create virtualbox configurations files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-config" vbox.cfg
+
+	if ! use headless ; then
+		pushd "${S}"/icons &>/dev/null || die
+		for size in * ; do
+			if [ -f "${size}/virtualbox.png" ] ; then
+				insinto "/usr/share/icons/hicolor/${size}/apps"
+				newins "${size}/virtualbox.png" ${PN}.png
+			fi
+		done
+		dodir /usr/share/pixmaps
+		cp "48x48/virtualbox.png" "${D}/usr/share/pixmaps/${PN}.png" \
+			|| die
+		popd &>/dev/null || die
+
+		newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
+	fi
+
+	pushd "${S}"/${EXTP_PN} &>/dev/null || die
+	insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+	popd &>/dev/null || die
+	rm -rf "${S}"/${EXTP_PN}
+
+	insinto /opt/VirtualBox
+	dodir /opt/bin
+
+	doins UserManual.pdf
+
+	if [[ "${PV}" != *beta* ]] && use sdk ; then
+		doins -r sdk
+	fi
+
+	if use additions; then
+		doins -r additions
+	fi
+
+	if use vboxwebsrv; then
+		doins vboxwebsrv
+		fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
+		fperms 0750 /opt/VirtualBox/vboxwebsrv
+		dosym /opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	if use rdesktop-vrdp; then
+		doins rdesktop-vrdp
+		doins -r rdesktop-vrdp-keymaps
+		fperms 0750 /opt/VirtualBox/rdesktop-vrdp
+		dosym /opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
+	fi
+
+	if ! use headless && use chm; then
+		doins kchmviewer VirtualBox.chm
+		fowners root:vboxusers /opt/VirtualBox/kchmviewer
+		fperms 0750 /opt/VirtualBox/kchmviewer
+	fi
+
+	if use python; then
+		local pyslot
+		for pyslot in 2.6 2.7; do
+			if has_version "dev-lang/python:${pyslot}" && [ -f "${S}/VBoxPython${pyslot/./_}.so" ] ; then
+				doins VBoxPython${pyslot/./_}.so
+			fi
+		done
+	fi
+
+	rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
+		vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
+		VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
+		webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
+		90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
+		VBoxPython?_*.so
+
+	if use headless ; then
+		rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
+	fi
+
+	doins -r * || die
+
+	# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
+	dosym /opt/VirtualBox/VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
+	dosym /opt/VirtualBox/VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
+	dosym /opt/VirtualBox/VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
+	dosym /opt/VirtualBox/VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
+	dosym /opt/VirtualBox/VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
+
+	local each
+	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,NetNAT,TestOGL,ExtPackHelperApp}; do
+		fowners root:vboxusers /opt/VirtualBox/${each}
+		fperms 0750 /opt/VirtualBox/${each}
+		pax-mark -m "${D}"/opt/VirtualBox/${each}
+	done
+	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
+	fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
+	fperms 4750 /opt/VirtualBox/VBoxNetDHCP
+	fperms 4750 /opt/VirtualBox/VBoxNetNAT
+
+	if ! use headless ; then
+		# Hardened build: Mark selected binaries set-user-ID-on-execution
+		for each in VBox{SDL,Headless} VirtualBox; do
+			fowners root:vboxusers /opt/VirtualBox/${each}
+			fperms 4510 /opt/VirtualBox/${each}
+			pax-mark -m "${D}"/opt/VirtualBox/${each}
+		done
+
+		dosym /opt/VirtualBox/VBox.sh /opt/bin/VirtualBox
+		dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxSDL
+	else
+		# Hardened build: Mark selected binaries set-user-ID-on-execution
+		fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
+		fperms 4510 /opt/VirtualBox/VBoxHeadless
+		pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless
+	fi
+
+	exeinto /opt/VirtualBox
+	newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh"
+	fowners root:vboxusers /opt/VirtualBox/VBox.sh
+	fperms 0750 /opt/VirtualBox/VBox.sh
+
+	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxManage
+	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxVRDP
+	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxHeadless
+	dosym /opt/VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	local udevdir="$(udev_get_udevdir)"
+	insinto ${udevdir}/rules.d
+	doins "${FILESDIR}"/10-virtualbox.rules
+	sed "s@%UDEVDIR%@${udevdir}@" \
+		-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
+	# move udev scripts into ${udevdir} (bug #372491)
+	mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"${udevdir} || die
+	fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	gnome2_icon_cache_update
+
+	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
+
+	elog ""
+	if ! use headless ; then
+		elog "To launch VirtualBox just type: \"VirtualBox\""
+		elog ""
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "Please visit http://www.virtualbox.org/wiki/Editions for"
+	elog "an overview about the different features of ${PN}"
+	elog "and virtualbox-ose"
+	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+		elog ""
+		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@ -1,3 +1,4 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.1.26-84997.tar.gz 10856343 SHA256 b392c2f8ed8d813a18597679a90eed9d76efd12d161373cbc5bd7de8165f5ce2 SHA512 581672dd46910cea77d0762d217f4e5afe28f5b45dcec68568885214e745af637a8588a96a85c5b8cb1b761ad68b05e8148d580f30ebf851228d34888c77998e WHIRLPOOL 6c9e3971259bfbf4f54ff6c7eb571f47bf78a51e5d1f4cce01529f7727444c366b70c343c1d0ebfc8fa1adb4bdd57ea4644f813f2991b6cb8f2d381a34f69372
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.2.18-88780.tar.gz 11665435 SHA256 1d1737b59d0f30f5d42beeabaff168bdc0a75b8b28df685979be6173e5adbbba SHA512 58d0990f8318a79da426c1390e6dd6df10639b5fc2b478044541d300c366881cba87ac0843e8524a7c489b95f0152e3942e6e28b178c85e582d70a1fb951bbdb WHIRLPOOL 33fc03dc5bcc0e5604aa9eb3d3c8fcc636a067d92a30689a98fd6d9ea16fa6b295e2f140af48b5747439b2ab3189bc645b0157848aed6d503d35e66232924714
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.0-89960.tar.gz 12735473 SHA256 718c822acedce96c6ab2af93ec8efdf1789bdd03b7cfabb2c9d2f94e2047b399 SHA512 6c7e6c0076ca9d7fd83a0f57a0138d4390fc6c05a862503f92c4ee7b0bf5435e7b9fe1cbcf7f66685252cfeead311bbf777ea9477331c839aa9fbb06c7454b44 WHIRLPOOL c5545101060d8350bb6332eb7ff86f4f015c15c90521c04679944b9175a238ed5914aa23c6656b780f0f9a4fc34b4e99ff1b3102342125c763c1c90d84d53188
+DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.2-90405.tar.gz 10417726 SHA256 c42f7ef2ac97138551f73db38180aa56f63dd44b3823156da470f7e9ee3dc8e5 SHA512 b04be4edb2e8794b79e3fe96dc416a9c4697a4ca0e41474c6f8563fc4d1fbb7fe784ec5d53545a873d1df06a93ea00f0bc64158db4553e2b9b2f679a97a220ed WHIRLPOOL f8bc92e44ecc4e8eedd657f5097e3b94823b223cc72db1143c5e1822cc01ca7d4e7f0302e8f85647989f445f56935711fa759a5f17eb84f218d5d7fa506a7948
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.2.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.2.ebuild
@ -0,0 +1,35 @@
+# Copyright 1999-2013 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.3.2.ebuild,v 1.1 2013/11/02 15:12:56 polynomial-c Exp $
+
+EAPI=5
+
+inherit eutils multilib
+
+MY_BUILD=90405
+MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
+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/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
+
+LICENSE="PUEL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror strip"
+
+RDEPEND="~app-emulation/virtualbox-${PV}"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}/.*"
+
+src_install() {
+	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+}
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@ -1,3 +1,4 @@
 DIST VirtualBox-4.1.26.tar.bz2 74552384 SHA256 229773b45bb18374aa091d4ef585f3893307fb4ccb6f489055b048c0f93c36ab SHA512 da3dc07a390f423446190ba68221a9389423381def888a6eb754dc02fed75f0b99e41263ffc6d36f955b6018b8f7e928da55397bb544eae16cd5b0cbcc66ed89 WHIRLPOOL 9f5d74e44950d41887955250307bc1af99ca0007e3d4b0f6549b35ff3fb9a48d546f9b7dab6d346ac5a0e88bbb1af092665024d1e792aa9befdc04b6017c62bf
 DIST VirtualBox-4.2.18.tar.bz2 76893031 SHA256 9dbddf393b029c549249f627d12040c1d257972bc09292969b8819a31ab78d74 SHA512 c267cef156476992773135b5a154164f30841c4f2d4afa5e6c7c74a320384f621d141bff5f7164968767c3d86035befcb59e34b7a912a8a5ae3bede2d24e9c60 WHIRLPOOL 665e4895db5c0fd623fd08c6b9f4df69e5e5d27ebd3063a4216721460782691d2936567be68a4af7bed57b88fd5b2a41805df76551b1aac200ccff0101055a56
 DIST VirtualBox-4.3.0.tar.bz2 89452701 SHA256 8ea8988a041163c34bff1da6b278d7729cecd4596f5eb778575c5ac9ac95bc12 SHA512 455907296efa9fed98efd435554a00c168f5b3b1c2b237dfb41281a2cfa6da76e4f6d8cd763db15dbe8be20b145ba30690f61e4f4dd4efafd31b3014752da3f1 WHIRLPOOL 728613d31bf0dadcb45d4a55886afb617648e76ed41e3094a6fd750e5a98ce70b21df3188174fefb4b8db5f3c688697ee07830c0a0a0c0c4307163ac457726e1
+DIST VirtualBox-4.3.2.tar.bz2 89709005 SHA256 137ee464dcf3ec81fd74793022ecb53d7f4399682759e00cafd322b0dc92967e SHA512 5a622636ab5f25ebd18a51c07ce16a98aac5a020d356060321a7433682e110983442ed3c17c4d70e40dca343caeedb5f15bc34a924c95c29239c2e5b1ba6bd6e WHIRLPOOL 34b34f5cc9b495d8a67c0a41db205aeed1b9bd514586261ec6acaff652192832c04993df8867ec8f886ff4d56e0500225800449d3b1684c90fc93ec5dc5ac4a7
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.2.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.2.ebuild
@ -0,0 +1,202 @@
+# Copyright 1999-2013 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.3.2.ebuild,v 1.1 2013/11/02 15:17:22 polynomial-c Exp $
+
+EAPI=5
+
+inherit eutils linux-mod systemd user
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo 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 )
+	sys-apps/dbus
+	!!x11-drivers/xf86-input-virtualbox"
+DEPEND="${RDEPEND}
+		>=dev-util/kbuild-0.1.9998_pre20120806
+		>=dev-lang/yasm-0.6.2
+		sys-devel/bin86
+		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 /dev/null 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" \
+				KBUILD_VERBOSE=2
+		done
+
+		if use X; then
+				cd "${S}"/src/VBox/Additions/x11/VBoxClient
+				MAKE="kmk" emake TOOL_YASM_AS=yasm \
+				KBUILD_PATH="${S}/kBuild"
+		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}-8.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
+
+		systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+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 video driver."
+		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 driver, use the following"
+		elog "file as your /etc/X11/xorg.conf:"
+		elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
+		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,3 +1,4 @@
 DIST vbox-kernel-module-src-4.1.26.tar.xz 460260 SHA256 69f7397a23b0a0fb55e2b9337d0770a4a1b2d11c2e53d9bc620f7629952bac8f SHA512 5b0312ddf71979d86ecb052e09efb6c19ae6c42a2f86c4cfd14f0b66e71d8e635713fd67f160f44195b77b350408d36ccd794bbbb6e3815cfdd174c4c29dbd00 WHIRLPOOL c1a351d1d5ba5b8bc50dc7a791ac3526aa1fc1fb12f1f8db412c774778eae010abab7d3cfdb3ba4e56dd72120c25ccc40d3b775fd14c67eeca71353110bf7291
 DIST vbox-kernel-module-src-4.2.18.tar.xz 493892 SHA256 2ff5bb1ba83dc45b15877305be6c36226f861fd0b0056812040237db1ef1158e SHA512 d8d5a188905b4fc94ff293620c1a92723846f88dd86c0aa34990a385280e78463333c777f67e656e5a363a0b981d6000fb6df1dc927da4c8854c3a9e94576979 WHIRLPOOL 946473710a7fa550afceb961967dd619ca224ad4dbb59c738975aaccbeb142dbd50daa6b652fcebe15769516d7edd1eca311b75fa082753b02b31b470c7a86dc
 DIST vbox-kernel-module-src-4.3.0.tar.xz 515512 SHA256 802362abd5e7429b6c8aa7604da650aec6d094dc9b49f07bc1a818f86d542ff5 SHA512 3e968a43991cc2de4e07f394504b64fbfda9f82aaeb84f0a3de419b2e46c6b18e20df8c7dfa0acf5bb1d57f8e6840d1385970eed91e634fda41288f5fbd74c3d WHIRLPOOL 59839e26ca557e5d9e6bfcd4d78276ad6eeafe80c921588db7d5721a39af7b4c6810ba77218ef8eb0a2de4957227ad337a9d3287eb79ef877229d9058748fad6
+DIST vbox-kernel-module-src-4.3.2.tar.xz 515836 SHA256 d8336c68d8fb899eaaf2774770e082f3227fa6cbb9fdd7f755cbd952e28a5677 SHA512 6b077da50ce98c13cbbd1c9d625950c97a7c64ee7e1ac2b5158e8bb47b59aa560bc28ed34c92f4ddb956b779a566150757307e066563db2c3898149b146d4f43 WHIRLPOOL 3675097a4844ade76e2187edcfddf3755dc8b72b57160c575d3baf4f5bb8c6a95e5f003483dd2254e8c19db6f60273b32ad54166f7699d5923a23be5b64a81b2
--- a/app-emulation/virtualbox-modules/virtualbox-modules-4.3.2.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.3.2.ebuild
@ -0,0 +1,56 @@
+# Copyright 1999-2013 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.3.2.ebuild,v 1.1 2013/11/02 15:12:01 polynomial-c Exp $
+
+# XXX: the tarball here is just the kernel modules split out of the binary
+#      package that comes from virtualbox-bin
+
+EAPI=5
+
+inherit eutils linux-mod user
+
+MY_P=vbox-kernel-module-src-${PV}
+DESCRIPTION="Kernel Modules for Virtualbox"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pax_kernel"
+
+RDEPEND="!=app-emulation/virtualbox-9999"
+
+S=${WORKDIR}
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+	enewgroup vboxusers
+}
+
+src_prepare() {
+	if kernel_is -ge 2 6 33 ; then
+		# evil patch for new kernels - header moved
+		grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
+	fi
+
+	if use pax_kernel && kernel_is -ge 3 0 0 ; then
+		epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
+	fi
+}
+
+src_install() {
+	linux-mod_src_install
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	elog "Please add \"vboxdrv\", \"vboxnetflt\" and \"vboxnetadp\" to:"
+	elog "/etc/conf.d/modules"
+}
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@ -1,5 +1,6 @@
 DIST VirtualBox-4.1.26.tar.bz2 74552384 SHA256 229773b45bb18374aa091d4ef585f3893307fb4ccb6f489055b048c0f93c36ab SHA512 da3dc07a390f423446190ba68221a9389423381def888a6eb754dc02fed75f0b99e41263ffc6d36f955b6018b8f7e928da55397bb544eae16cd5b0cbcc66ed89 WHIRLPOOL 9f5d74e44950d41887955250307bc1af99ca0007e3d4b0f6549b35ff3fb9a48d546f9b7dab6d346ac5a0e88bbb1af092665024d1e792aa9befdc04b6017c62bf
 DIST VirtualBox-4.2.18.tar.bz2 76893031 SHA256 9dbddf393b029c549249f627d12040c1d257972bc09292969b8819a31ab78d74 SHA512 c267cef156476992773135b5a154164f30841c4f2d4afa5e6c7c74a320384f621d141bff5f7164968767c3d86035befcb59e34b7a912a8a5ae3bede2d24e9c60 WHIRLPOOL 665e4895db5c0fd623fd08c6b9f4df69e5e5d27ebd3063a4216721460782691d2936567be68a4af7bed57b88fd5b2a41805df76551b1aac200ccff0101055a56
 DIST VirtualBox-4.3.0.tar.bz2 89452701 SHA256 8ea8988a041163c34bff1da6b278d7729cecd4596f5eb778575c5ac9ac95bc12 SHA512 455907296efa9fed98efd435554a00c168f5b3b1c2b237dfb41281a2cfa6da76e4f6d8cd763db15dbe8be20b145ba30690f61e4f4dd4efafd31b3014752da3f1 WHIRLPOOL 728613d31bf0dadcb45d4a55886afb617648e76ed41e3094a6fd750e5a98ce70b21df3188174fefb4b8db5f3c688697ee07830c0a0a0c0c4307163ac457726e1
+DIST VirtualBox-4.3.2.tar.bz2 89709005 SHA256 137ee464dcf3ec81fd74793022ecb53d7f4399682759e00cafd322b0dc92967e SHA512 5a622636ab5f25ebd18a51c07ce16a98aac5a020d356060321a7433682e110983442ed3c17c4d70e40dca343caeedb5f15bc34a924c95c29239c2e5b1ba6bd6e WHIRLPOOL 34b34f5cc9b495d8a67c0a41db205aeed1b9bd514586261ec6acaff652192832c04993df8867ec8f886ff4d56e0500225800449d3b1684c90fc93ec5dc5ac4a7
 DIST virtualbox-4.1.22-patches-01.tar.xz 3752 SHA256 2ff58f8d2bdfdcbf1ae4bbe9f68ad1256f1ae37091fd4b392582a062d206962f SHA512 9bba2a4352d52cddd27f55b4ad0e9de250c1d29359a8859f61fc413e53ac62206321c5e347391ca478b942967bd7974a3a469eb3bb133c79d7033692afe559dd WHIRLPOOL 1aa98913e7d4e1ddf5f775db200cddc18a7ed4d7dd915dda0dab6bffbf33bfd63a785cc7381bca74e4780e7dce21f18314dc093b9c6ba02addfd1330f3b61aa9
 DIST virtualbox-4.2.18-patches-01.tar.xz 3788 SHA256 9a147e3a3da7e1e07b70aed67042c822897c7874ccaa3690c9497862373d8222 SHA512 021f8a566ede223ead5a2605bff3917195165c543f760ee7af004ab97d5dcf0771e6ccb62148d7986a34872ea8c35db952286fb8534b1f69804e192701bd8108 WHIRLPOOL 9818df1703636fecfbda1bbeb4d167d845701fe9de2827a97573a26ffb3cb9feaa22ee2849c45d3ea700a9c305185eb404b15572b0f4e666f8a8e6158a48b9eb
--- a/app-emulation/virtualbox/virtualbox-4.3.2.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.3.2.ebuild
@ -0,0 +1,405 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.3.2.ebuild,v 1.1 2013/11/02 15:15:59 polynomial-c Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils fdo-mime flag-o-matic linux-info multilib pax-utils python-single-r1 qt4-r2 toolchain-funcs java-pkg-opt-2 udev
+
+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
+	http://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-4.2.18-patches-01.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
+HOMEPAGE="http://www.virtualbox.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+additions alsa doc extensions headless java multilib pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	~app-emulation/virtualbox-modules-${PV}
+	dev-libs/libIDL
+	>=dev-libs/libxslt-1.1.19
+	net-misc/curl
+	dev-libs/openssl
+	dev-libs/libxml2
+	media-libs/libpng
+	media-libs/libvpx
+	sys-libs/zlib
+	>=virtual/udev-171
+	!headless? (
+		qt4? (
+			dev-qt/qtgui:4
+			dev-qt/qtcore:4
+			opengl? ( dev-qt/qtopengl:4 )
+			x11-libs/libXinerama
+		)
+		opengl? ( virtual/opengl media-libs/freeglut )
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXt
+		media-libs/libsdl:0[X,video]
+	)
+	vnc? ( >=net-libs/libvncserver-0.9.9 )
+	java? ( || ( virtual/jre:1.7 virtual/jre:1.6 ) )"
+DEPEND="${RDEPEND}
+	>=dev-util/kbuild-0.1.9998_pre20120806
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-power/iasl
+	pam? ( sys-libs/pam )
+	sys-libs/libcap
+	doc? (
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+	)
+	java? ( || ( virtual/jdk:1.7 virtual/jdk:1.6 ) )
+	virtual/pkgconfig
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	!headless? ( x11-libs/libXinerama )
+	pulseaudio? ( media-sound/pulseaudio )
+	vboxwebsrv? ( <net-libs/gsoap-2.8.13 )
+	${PYTHON_DEPS}"
+PDEPEND="additions? ( ~app-emulation/virtualbox-additions-${PV} )
+	extensions? ( ~app-emulation/virtualbox-extpack-oracle-${PV} )"
+
+QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
+	usr/lib/virtualbox/VBoxSDL.so
+	usr/lib/virtualbox/VBoxSharedFolders.so
+	usr/lib/virtualbox/VBoxDD2.so
+	usr/lib/virtualbox/VBoxOGLrenderspu.so
+	usr/lib/virtualbox/VBoxPython.so
+	usr/lib/virtualbox/VBoxDD.so
+	usr/lib/virtualbox/VBoxDDU.so
+	usr/lib/virtualbox/VBoxREM64.so
+	usr/lib/virtualbox/VBoxSharedClipboard.so
+	usr/lib/virtualbox/VBoxHeadless.so
+	usr/lib/virtualbox/VBoxRT.so
+	usr/lib/virtualbox/VBoxREM.so
+	usr/lib/virtualbox/VBoxSettings.so
+	usr/lib/virtualbox/VBoxKeyboard.so
+	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
+	usr/lib/virtualbox/VBoxVMM.so
+	usr/lib/virtualbox/VirtualBox.so
+	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
+	usr/lib/virtualbox/components/VBoxC.so
+	usr/lib/virtualbox/components/VBoxSVCM.so
+	usr/lib/virtualbox/components/VBoxDDU.so
+	usr/lib/virtualbox/components/VBoxRT.so
+	usr/lib/virtualbox/components/VBoxREM.so
+	usr/lib/virtualbox/components/VBoxVMM.so
+	usr/lib/virtualbox/VBoxREM32.so
+	usr/lib/virtualbox/VBoxPython2_4.so
+	usr/lib/virtualbox/VBoxPython2_5.so
+	usr/lib/virtualbox/VBoxPython2_6.so
+	usr/lib/virtualbox/VBoxPython2_7.so
+	usr/lib/virtualbox/VBoxXPCOMC.so
+	usr/lib/virtualbox/VBoxOGLhostcrutil.so
+	usr/lib/virtualbox/VBoxNetDHCP.so
+	usr/lib/virtualbox/VBoxNetNAT.so"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? (
+		( sdk )
+	)
+	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
+"
+
+pkg_setup() {
+	if ! use headless && ! use qt4 ; then
+		einfo "No USE=\"qt4\" selected, this build will not include"
+		einfo "any Qt frontend."
+	elif use headless && use qt4 ; then
+		einfo "You selected USE=\"headless qt4\", defaulting to"
+		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
+	fi
+
+	if ! use opengl ; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	if ! use python ; then
+		einfo "You have disabled the \"python\" USE flag. This will only"
+		einfo "disable the python bindings being installed."
+	fi
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -rf kBuild/bin tools
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-4-localconfig > LocalConfig.kmk || die
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam ; then
+		elog "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+	fi
+
+	# add correct java path
+	if use java ; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+
+	if ! gcc-specs-pie ; then
+		EPATCH_EXCLUDE="050_${PN}-4.2.0-nopie.patch"
+	fi
+
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/patches"
+
+	# fix location of ifconfig binary (bug #455902)
+	local ifcfg="$(type -p ifconfig)"
+	if [ "${ifcfg}" != "/sbin/ifconfig" ] ; then
+		sed "/VBOXADPCTL_IFCONFIG_PATH/s@/sbin/ifconfig@${ifcfg}@" \
+			-i "${S}"/src/apps/adpctl/VBoxNetAdpCtl.cpp \
+			|| die
+	fi
+}
+
+src_configure() {
+	local myconf
+	use alsa       || myconf+=" --disable-alsa"
+	use doc        || myconf+=" --disable-docs"
+	use java       || myconf+=" --disable-java"
+	use opengl     || myconf+=" --disable-opengl"
+	use pulseaudio || myconf+=" --disable-pulse"
+	use python     || myconf+=" --disable-python"
+	use vboxwebsrv && myconf+=" --enable-webservice"
+	use vnc        && myconf+=" --enable-vnc"
+	if ! use headless ; then
+		use qt4 || myconf+=" --disable-qt4"
+	else
+		myconf+=" --build-headless --disable-opengl"
+	fi
+	if use amd64 && ! use multilib ; then
+		myconf+=" --disable-vmmraw"
+	fi
+	# not an autoconf script
+	./configure \
+		--with-gcc="$(tc-getCC)" \
+		--with-g++="$(tc-getCXX)" \
+		--disable-kmods \
+		--disable-dbus \
+		--disable-devmapper \
+		${myconf} \
+		|| die "configure failed"
+}
+
+src_compile() {
+	source ./env.sh
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	# and strip all flags
+	# strip-flags
+
+	MAKE="kmk" emake \
+		VBOX_BUILD_PUBLISHER=_Gentoo \
+		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
+		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
+		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
+		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
+		VBOX_GCC_OPT="${CXXFLAGS}" \
+		TOOL_YASM_AS=yasm KBUILD_PATH="${S}/kBuild" \
+		KBUILD_VERBOSE=2 \
+		all
+}
+
+src_install() {
+	cd "${S}"/out/linux.${ARCH}/release/bin || die
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the right libdir
+	sed -i \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Symlink binaries to the shipped wrapper
+	exeinto /usr/$(get_libdir)/${PN}
+	newexe "${FILESDIR}/${PN}-ose-3-wrapper" "VBox"
+	fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBox
+	fperms 0750 /usr/$(get_libdir)/${PN}/VBox
+
+	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxManage
+	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxVRDP
+	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxHeadless
+	dosym /usr/$(get_libdir)/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
+
+	# Install binaries and libraries
+	insinto /usr/$(get_libdir)/${PN}
+	doins -r components
+
+	if use sdk ; then
+		doins -r sdk
+	fi
+
+	if use vboxwebsrv ; then
+		doins vboxwebsrv
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/vboxwebsrv
+		fperms 0750 /usr/$(get_libdir)/${PN}/vboxwebsrv
+		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	local gcfiles="*gc"
+	if use amd64 && ! use multilib ; then
+		gcfiles=""
+	fi
+
+	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,NetNAT,ExtPackHelperApp} *so *r0 ${gcfiles} ; do
+		doins $each
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
+		fperms 0750 /usr/$(get_libdir)/${PN}/${each}
+	done
+	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
+	fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetAdpCtl
+	fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetDHCP
+	fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetNAT
+
+	# 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
+			fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
+			fperms 4750 /usr/$(get_libdir)/${PN}/${each}
+			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each}
+		done
+
+		if use opengl && use qt4 ; then
+			doins VBoxTestOGL
+			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
+			fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL
+		fi
+
+		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxSDL
+
+		if use qt4 ; then
+			doins VirtualBox
+			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox
+			fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox
+			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox
+
+			dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VirtualBox
+
+			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
+		fi
+
+		pushd "${S}"/src/VBox/Resources/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		popd &>/dev/null || die
+	else
+		doins VBoxHeadless
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless
+		fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless
+		pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless
+	fi
+
+	insinto /usr/$(get_libdir)/${PN}
+	# Install EFI Firmware files (bug #320757)
+	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
+	for fwfile in VBoxEFI{32,64}.fd ; do
+		doins ${fwfile}
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${fwfile}
+	done
+	popd &>/dev/null || die
+
+	# New way of handling USB device nodes for VBox (bug #356215)
+	local udevdir="$(udev_get_udevdir)"
+	insinto ${udevdir}
+	doins VBoxCreateUSBNode.sh
+	fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
+	fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+	insinto ${udevdir}/rules.d
+	doins "${FILESDIR}"/10-virtualbox.rules
+	sed "s@%UDEVDIR%@${udevdir}@" \
+		-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
+
+	insinto /usr/share/${PN}
+	if ! use headless && use qt4 ; then
+		doins -r nls
+	fi
+
+	# VRDPAuth only works with this (bug #351949)
+	dosym VBoxAuth.so  /usr/$(get_libdir)/${PN}/VRDPAuth.so
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=/usr/$(get_libdir)/${PN}" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if use java ; then
+		java-pkg_regjar "${D}/usr/$(get_libdir)/${PN}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+		java-pkg_regso "${D}/usr/$(get_libdir)/${PN}/libvboxjxpcom.so"
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
+
+	if ! use headless && use qt4 ; then
+		elog "To launch VirtualBox just type: \"VirtualBox\"."
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "IMPORTANT!"
+	elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
+	elog "\"env-update\" as root and logout and relogin as the user you wish"
+	elog "to run ${PN} as."
+	elog ""
+	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
+	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	elog "package."
+	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+		elog ""
+		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
--- a/app-emulation/vmware-modules/files/279-3.10.0.patch
+++ b/app-emulation/vmware-modules/files/279-3.10.0.patch
@ -1,809 +0,0 @@
--- a/vmnet-only/bridge.c
-+++ b/vmnet-only/bridge.c
-@@ -105,8 +105,6 @@ static Bool VNetBridgeCycleDetect(VNetJack *this, int generation);
- static Bool VNetBridgeIsDeviceWireless(struct net_device *dev);
- static void VNetBridgePortsChanged(VNetJack *this);
- static int  VNetBridgeIsBridged(VNetJack *this);
-static int  VNetBridgeProcRead(char *page, char **start, off_t off,
-                               int count, int *eof, void *data);
- static void VNetBridgeComputeHeaderPosIPv6(struct sk_buff *skb);
- static PacketStatus VNetCallSMACFunc(struct SMACState *state,
-                                      struct sk_buff **skb, void *startOfData,
-@@ -225,6 +223,53 @@ VNetBridgeDevCompatible(VNetBridge *bridge,      // IN: Bridge
- /*
-  *----------------------------------------------------------------------
-  *
-+ * VNetBridgeProcShow --
-+ *
-+ *      Callback for read operation on this bridge entry in vnets proc fs.
-+ *
-+ * Results:
-+ *      Length of read operation.
-+ *
-+ * Side effects:
-+ *      None.
-+ *
-+ *----------------------------------------------------------------------
-+ */
-+
-+int
-+VNetBridgeProcShow(struct seq_file *seqf, // IN/OUT: buffer to write into
-+                   void    *data)   // IN: client data - pointer to bridge
-+{
-+   VNetBridge *bridge = (VNetBridge*)data;
-+
-+   if (!bridge) {
-+      return 0;
-+   }
-+
-+   VNetPrintPort(&bridge->port, seqf);
-+
-+   seq_printf(seqf, "dev %s ", bridge->name);
-+
-+   seq_printf(seqf, "\n");
-+
-+   return 0;
-+}
-+
-+static int proc_bridge_open(struct inode *inode, struct file *file)
-+{
-+       return single_open(file, VNetBridgeProcShow, PDE_DATA(inode));
-+}
-+
-+static const struct file_operations proc_bridge_fops = {
-+       .open           = proc_bridge_open,
-+       .read           = seq_read,
-+       .llseek         = seq_lseek,
-+       .release        = seq_release,
-+};
-+
-+/*
-+ *----------------------------------------------------------------------
-+ *
-  * VNetBridge_Create --
-  *
-  *      Creates a bridge. Allocates struct, allocates internal device,
-@@ -319,17 +364,14 @@ VNetBridge_Create(const char *devName, // IN:  name of device (e.g., "eth0")
-     * Make proc entry for this jack.
-     */
- 
-   retval = VNetProc_MakeEntry(bridge->port.jack.name, S_IFREG,
-                               &bridge->port.jack.procEntry);
-+   retval = VNetProc_MakeEntryOps(bridge->port.jack.name, S_IFREG,
-+                               &bridge->port.jack.procEntry, &proc_bridge_fops, bridge);
-    if (retval) {
-       if (retval == -ENXIO) {
-          bridge->port.jack.procEntry = NULL;
-       } else {
-          goto out;
-       }
-   } else {
-      bridge->port.jack.procEntry->read_proc = VNetBridgeProcRead;
-      bridge->port.jack.procEntry->data = bridge;
-    }
- 
-    /*
-@@ -1719,45 +1761,3 @@ VNetBridgeReceiveFromDev(struct sk_buff *skb,         // IN: packet to receive
-    return 0;
- }
- 
-
-/*
- *----------------------------------------------------------------------
- *
- * VNetBridgeProcRead --
- *
- *      Callback for read operation on this bridge entry in vnets proc fs.
- *
- * Results:
- *      Length of read operation.
- *
- * Side effects:
- *      None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-VNetBridgeProcRead(char    *page,   // IN/OUT: buffer to write into
-                   char   **start,  // OUT: 0 if file < 4k, else offset into page
-                   off_t    off,    // IN: (unused) offset of read into the file
-                   int      count,  // IN: (unused) maximum number of bytes to read
-                   int     *eof,    // OUT: TRUE if there is nothing more to read
-                   void    *data)   // IN: client data - pointer to bridge
-{
-   VNetBridge *bridge = (VNetBridge*)data;
-   int len = 0;
-
-   if (!bridge) {
-      return len;
-   }
-
-   len += VNetPrintPort(&bridge->port, page+len);
-
-   len += sprintf(page+len, "dev %s ", bridge->name);
-
-   len += sprintf(page+len, "\n");
-
-   *start = 0;
-   *eof   = 1;
-   return len;
-}
--- a/vmnet-only/driver.c
-+++ b/vmnet-only/driver.c
-@@ -1785,21 +1785,17 @@ VNetSetMACUnique(VNetPort *port,            // IN:
-  *----------------------------------------------------------------------
-  */
- 
-int
-+void
- VNetPrintJack(const VNetJack *jack, // IN: jack
-              char           *buf)  // OUT: info about jack
-+              struct seq_file *seqf)  // OUT: info about jack
- {
-   int len = 0;
-
-    read_lock(&vnetPeerLock);
-    if (!jack->peer) {
-      len += sprintf(buf+len, "connected not ");
-+      seq_printf(seqf, "connected not ");
-    } else {
-      len += sprintf(buf+len, "connected %s ", jack->peer->name);
-+      seq_printf(seqf, "connected %s ", jack->peer->name);
-    }
-    read_unlock(&vnetPeerLock);
-
-   return len;
- }
- 
- 
-@@ -1819,52 +1815,48 @@ VNetPrintJack(const VNetJack *jack, // IN: jack
-  *----------------------------------------------------------------------
-  */
- 
-int
-+void
- VNetPrintPort(const VNetPort *port, // IN: port
-              char           *buf)  // OUT: info about port
-+              struct seq_file *seqf)  // OUT: info about port
- {
-   int len = 0;
-+   VNetPrintJack(&port->jack, seqf);
- 
-   len += VNetPrintJack(&port->jack, buf+len);
-
-   len += sprintf(buf+len, "mac %02x:%02x:%02x:%02x:%02x:%02x ",
-+   seq_printf(seqf, "mac %02x:%02x:%02x:%02x:%02x:%02x ",
-                   port->paddr[0], port->paddr[1], port->paddr[2],
-                   port->paddr[3], port->paddr[4], port->paddr[5]);
- 
-   len += sprintf(buf+len, "ladrf %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x ",
-+   seq_printf(seqf, "ladrf %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x ",
-                   port->ladrf[0], port->ladrf[1], port->ladrf[2],
-                   port->ladrf[3], port->ladrf[4], port->ladrf[5],
-                   port->ladrf[6], port->ladrf[7]);
- 
-   len += sprintf(buf+len, "flags IFF_RUNNING");
-+   seq_printf(seqf, "flags IFF_RUNNING");
- 
-    if (port->flags & IFF_UP) {
-      len += sprintf(buf+len, ",IFF_UP");
-+      seq_printf(seqf, ",IFF_UP");
-    }
- 
-    if (port->flags & IFF_BROADCAST) {
-      len += sprintf(buf+len, ",IFF_BROADCAST");
-+      seq_printf(seqf, ",IFF_BROADCAST");
-    }
- 
-    if (port->flags & IFF_DEBUG) {
-      len += sprintf(buf+len, ",IFF_DEBUG");
-+      seq_printf(seqf, ",IFF_DEBUG");
-    }
- 
-    if (port->flags & IFF_PROMISC) {
-      len += sprintf(buf+len, ",IFF_PROMISC");
-+      seq_printf(seqf, ",IFF_PROMISC");
-    }
- 
-    if (port->flags & IFF_MULTICAST) {
-      len += sprintf(buf+len, ",IFF_MULTICAST");
-+      seq_printf(seqf, ",IFF_MULTICAST");
-    }
- 
-    if (port->flags & IFF_ALLMULTI) {
-      len += sprintf(buf+len, ",IFF_ALLMULTI");
-+      seq_printf(seqf, ",IFF_ALLMULTI");
-    }
- 
-   len += sprintf(buf+len, " ");
-
-   return len;
-+   seq_printf(seqf, " ");
- }
- 
- 
--- a/vmnet-only/hub.c
-+++ b/vmnet-only/hub.c
-@@ -25,6 +25,7 @@
- #include <linux/sched.h>
- #include <linux/slab.h>
- #include <linux/poll.h>
-+#include <linux/seq_file.h>
- 
- #include <linux/netdevice.h>
- #include <linux/etherdevice.h>
-@@ -71,8 +72,6 @@ static void VNetHubReceive(VNetJack *this, struct sk_buff *skb);
- static Bool VNetHubCycleDetect(VNetJack *this, int generation);
- static void VNetHubPortsChanged(VNetJack *this);
- static int  VNetHubIsBridged(VNetJack *this);
-static int  VNetHubProcRead(char *page, char **start, off_t off,
-                            int count, int *eof, void *data);
- 
- static VNetHub *vnetHub;
- static DEFINE_SPINLOCK(vnetHubLock);
-@@ -241,6 +240,53 @@ VNetHub_AllocPvn(uint8 id[]) // IN: the PVN ID to alloc on
- /*
-  *----------------------------------------------------------------------
-  *
-+ * VNetHubProcShow --
-+ *
-+ *      Callback for read operation on hub entry in vnets proc fs.
-+ *
-+ * Results:
-+ *      Length of read operation.
-+ *
-+ * Side effects:
-+ *      None.
-+ *
-+ *----------------------------------------------------------------------
-+ */
-+
-+int
-+VNetHubProcShow(struct seq_file  *seqf,   // IN/OUT: buffer to write into
-+                void    *data)   // IN: client data - not used
-+{
-+   VNetJack *jack = (VNetJack*)data;
-+   VNetHub *hub;
-+
-+   if (!jack || !jack->private) {
-+      return 0;
-+   }
-+   hub = (VNetHub*)jack->private;
-+
-+   VNetPrintJack(jack, seqf);
-+
-+   seq_printf(seqf, "tx %u ", hub->stats[jack->index].tx);
-+   seq_printf(seqf, "\n");
-+   return 0;
-+}
-+
-+static int proc_hub_open(struct inode *inode, struct file *file)
-+{
-+       return single_open(file, VNetHubProcShow, PDE_DATA(inode));
-+}
-+
-+static const struct file_operations proc_hub_fops = {
-+       .open           = proc_hub_open,
-+       .read           = seq_read,
-+       .llseek         = seq_lseek,
-+       .release        = seq_release,
-+};
-+
-+/*
-+ *----------------------------------------------------------------------
-+ *
-  * VNetHubAlloc --
-  *
-  *      Allocate a jack on this hub.
-@@ -354,7 +400,7 @@ VNetHubAlloc(Bool allocPvn, // IN: TRUE for PVN, FALSE for vnet
-           * Make proc entry for this jack.
-           */
- 
-         retval = VNetProc_MakeEntry(jack->name, S_IFREG, &jack->procEntry);
-+         retval = VNetProc_MakeEntryOps(jack->name, S_IFREG, &jack->procEntry, &proc_hub_fops, jack);
-          if (retval) {
-             if (retval == -ENXIO) {
-                jack->procEntry = NULL;
-@@ -362,9 +408,6 @@ VNetHubAlloc(Bool allocPvn, // IN: TRUE for PVN, FALSE for vnet
- 	       hub->used[i] = FALSE;
-                return NULL;
-             }
-         } else {
-            jack->procEntry->read_proc = VNetHubProcRead;
-            jack->procEntry->data = jack;
-          }
- 
-          /*
-@@ -686,46 +729,3 @@ VNetHubIsBridged(VNetJack *this)
- }
- 
- 
-/*
- *----------------------------------------------------------------------
- *
- * VNetHubProcRead --
- *
- *      Callback for read operation on hub entry in vnets proc fs.
- *
- * Results:
- *      Length of read operation.
- *
- * Side effects:
- *      None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-VNetHubProcRead(char    *page,   // IN/OUT: buffer to write into
-                char   **start,  // OUT: 0 if file < 4k, else offset into page
-                off_t    off,    // IN: offset of read into the file
-                int      count,  // IN: maximum number of bytes to read
-                int     *eof,    // OUT: TRUE if there is nothing more to read
-                void    *data)   // IN: client data - not used
-{
-   VNetJack *jack = (VNetJack*)data;
-   VNetHub *hub;
-   int len = 0;
-
-   if (!jack || !jack->private) {
-      return len;
-   }
-   hub = (VNetHub*)jack->private;
-
-   len += VNetPrintJack(jack, page+len);
-
-   len += sprintf(page+len, "tx %u ", hub->stats[jack->index].tx);
-
-   len += sprintf(page+len, "\n");
-
-   *start = 0;
-   *eof   = 1;
-   return len;
-}
--- a/vmnet-only/netif.c
-+++ b/vmnet-only/netif.c
-@@ -62,8 +62,6 @@ static int  VNetNetifStartXmit(struct sk_buff *skb, struct net_device *dev);
- static struct net_device_stats *VNetNetifGetStats(struct net_device *dev);
- static int  VNetNetifSetMAC(struct net_device *dev, void *addr);
- static void VNetNetifSetMulticast(struct net_device *dev);
-static int  VNetNetIfProcRead(char *page, char **start, off_t off,
-                              int count, int *eof, void *data);
- 
- /*
-  *----------------------------------------------------------------------
-@@ -116,6 +114,53 @@ VNetNetIfSetup(struct net_device *dev)  // IN:
- 
- }
- 
-+/*
-+ *----------------------------------------------------------------------
-+ *
-+ * VNetNetIfProcShow --
-+ *
-+ *      Callback for read operation on this netif entry in vnets proc fs.
-+ *
-+ * Results: 
-+ *      Length of read operation.
-+ *
-+ * Side effects:
-+ *      None.
-+ *
-+ *----------------------------------------------------------------------
-+ */
-+
-+int
-+VNetNetIfProcShow(struct seq_file *seqf, // IN/OUT: buffer to write into
-+                  void   *data)  // IN: client data
-+{
-+   VNetNetIF *netIf = data; 
-+   
-+   if (!netIf) {
-+      return 0;
-+   }
-+   
-+   VNetPrintPort(&netIf->port, seqf);
-+
-+   seq_printf(seqf, "dev %s ", netIf->dev->name);
-+   
-+   seq_printf(seqf, "\n");
-+
-+   return 0;
-+}
-+
-+static int proc_netif_open(struct inode *inode, struct file *file)
-+{
-+       return single_open(file, VNetNetIfProcShow, PDE_DATA(inode));
-+}
-+
-+static const struct file_operations proc_netif_fops = {
-+       .open           = proc_netif_open,
-+       .read           = seq_read,
-+       .llseek         = seq_lseek,
-+       .release        = seq_release,
-+};
-+
- 
- /*
-  *----------------------------------------------------------------------
-@@ -180,16 +225,13 @@ VNetNetIf_Create(char *devName,  // IN:
-     * Make proc entry for this jack.
-     */
- 
-   retval = VNetProc_MakeEntry(netIf->port.jack.name, S_IFREG,
-                               &netIf->port.jack.procEntry);
-+   retval = VNetProc_MakeEntryOps(netIf->port.jack.name, S_IFREG,
-+                               &netIf->port.jack.procEntry, &proc_netif_fops, netIf);
-    if (retval) {
-       netIf->port.jack.procEntry = NULL;
-       if (retval != -ENXIO) {
-          goto outFreeDev;
-       }
-   } else {
-      netIf->port.jack.procEntry->read_proc = VNetNetIfProcRead;
-      netIf->port.jack.procEntry->data = netIf;
-    }
- 
-    /*
-@@ -553,45 +595,3 @@ VNetNetifGetStats(struct net_device *dev) // IN:
-    return &netIf->stats;
- }
- 
-
-/*
- *----------------------------------------------------------------------
- *
- * VNetNetIfProcRead --
- *
- *      Callback for read operation on this netif entry in vnets proc fs.
- *
- * Results: 
- *      Length of read operation.
- *
- * Side effects:
- *      None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-VNetNetIfProcRead(char   *page,  // IN/OUT: buffer to write into
-                  char  **start, // OUT: 0 if file < 4k, else offset into page
-                  off_t   off,   // IN: (unused) offset of read into the file
-                  int     count, // IN: (unused) maximum number of bytes to read
-                  int    *eof,   // OUT: TRUE if there is nothing more to read
-                  void   *data)  // IN: client data
-{
-   VNetNetIF *netIf = data; 
-   int len = 0;
-   
-   if (!netIf) {
-      return len;
-   }
-   
-   len += VNetPrintPort(&netIf->port, page+len);
-
-   len += sprintf(page+len, "dev %s ", netIf->dev->name);
-   
-   len += sprintf(page+len, "\n");
-
-   *start = 0;
-   *eof   = 1;
-   return len;
-}
--- a/vmnet-only/procfs.c
-+++ b/vmnet-only/procfs.c
-@@ -45,10 +45,6 @@
- 
- #if defined(CONFIG_PROC_FS)
- 
-static int VNetProcMakeEntryInt(VNetProcEntry *parent, char *name, int mode,
-                                VNetProcEntry **ret);
-static void VNetProcRemoveEntryInt(VNetProcEntry *node, VNetProcEntry *parent);
-
- static VNetProcEntry *base = NULL;
- 
- 
-@@ -71,7 +67,12 @@ static VNetProcEntry *base = NULL;
- int
- VNetProc_Init(void)
- {
-   return VNetProcMakeEntryInt(NULL, "vmnet", S_IFDIR, &base);
-+	base = proc_mkdir("vmnet", NULL);
-+	if(IS_ERR(base)) {
-+		base = NULL;
-+		return PTR_ERR(base);
-+	}
-+	return 0;
- }
- 
- 
-@@ -94,14 +95,14 @@ VNetProc_Init(void)
- void
- VNetProc_Cleanup(void)
- {
-   VNetProcRemoveEntryInt(base, NULL);
-+   proc_remove(base);
-    base = NULL;
- }
- 
- /*
-  *----------------------------------------------------------------------
-  *
- * VNetProcMakeEntryInt --
-+ * VNetProc_MakeEntryOps --
-  *
-  *      Make an entry in the vnets proc file system.
-  *
-@@ -116,72 +117,21 @@ VNetProc_Cleanup(void)
-  */
- 
- int
-VNetProcMakeEntryInt(VNetProcEntry  *parent, // IN:
-		     char            *name,  // IN:
-+VNetProc_MakeEntryOps(char            *name,  // IN:
- 		     int              mode,  // IN:
-		     VNetProcEntry  **ret)   // OUT:
-+		     VNetProcEntry  **ret,
-+		     const struct file_operations *fops,
-+		     void *data
-+		     )   // OUT:
- {
-    VNetProcEntry *ent;
-   ent = create_proc_entry(name, mode, parent);
-+   ent = proc_create_data(name, mode, base, fops, data);
-    *ret = ent;
-    if (!ent)
-       return -ENOMEM;
-    return 0;
- }
- 
-
-/*
- *----------------------------------------------------------------------
- *
- * VNetProcRemoveEntryInt --
- *
- *      Remove a previously installed proc entry.
- *
- * Results: 
- *      None.
- *
- * Side effects:
- *      None.
- *
- *----------------------------------------------------------------------
- */
-
-void
-VNetProcRemoveEntryInt(VNetProcEntry *node,
-                       VNetProcEntry *parent)
-{
-   if (node) {
-      remove_proc_entry(node->name, parent);
-   }
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * VNetProc_MakeEntry --
- *
- *      Make an entry in the vnets proc file system.
- *
- * Results: 
- *      errno. If errno is 0 and ret is non NULL then ret is filled
- *      in with the resulting proc entry.
- *      
- * Side effects:
- *      None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-VNetProc_MakeEntry(char            *name,  // IN:
-		   int              mode,  // IN:
-		   VNetProcEntry  **ret)   // OUT:
-{
-   return VNetProcMakeEntryInt(base, name, mode, ret);
-}
-
-
- /*
-  *----------------------------------------------------------------------
-  *
-@@ -201,7 +151,8 @@ VNetProc_MakeEntry(char            *name,  // IN:
- void
- VNetProc_RemoveEntry(VNetProcEntry *node)
- {
-   VNetProcRemoveEntryInt(node, base);
-+	if(node)
-+		proc_remove(node);
- }
- 
- 
-@@ -253,31 +204,6 @@ VNetProc_Cleanup(void)
- }
- 
- 
-/*
- *----------------------------------------------------------------------
- *
- * VNetProc_MakeEntry --
- *
- *      Make an entry in the vnets proc file system.
- *
- * Results: 
- *      errno. If errno is 0 and ret is non NULL then ret is filled
- *      in with the resulting proc entry.
- *      
- * Side effects:
- *      None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-VNetProc_MakeEntry(char            *name,
-                   int              mode,
-                   VNetProcEntry  **ret)
-{
-   return -ENXIO;
-}
-
- 
- /*
-  *----------------------------------------------------------------------
--- a/vmnet-only/userif.c
-+++ b/vmnet-only/userif.c
-@@ -389,7 +389,7 @@ VNetUserIfReceive(VNetJack       *this, // IN
- /*
-  *----------------------------------------------------------------------
-  *
- * VNetUserIfProcRead --
-+ * VNetUserIfProcShow --
-  *
-  *      Callback for read operation on this userif entry in vnets proc fs.
-  *
-@@ -403,30 +403,23 @@ VNetUserIfReceive(VNetJack       *this, // IN
-  */
- 
- static int
-VNetUserIfProcRead(char    *page,  // IN/OUT: buffer to write into
-                   char   **start, // OUT: 0 if file < 4k, else offset into
-                                   //      page
-                   off_t    off,   // IN: offset of read into the file
-                   int      count, // IN: maximum number of bytes to read
-                   int     *eof,   // OUT: TRUE if there is nothing more to
-                                   //      read
-+VNetUserIfProcShow(struct seq_file    *seqf,  // IN/OUT: buffer to write into
-                    void    *data)  // IN: client data - not used
- {
-    VNetUserIF *userIf = (VNetUserIF*)data; 
-   int len = 0;
-    
-    if (!userIf) {
-      return len;
-+      return 0;
-    }
-    
-   len += VNetPrintPort(&userIf->port, page+len);
-+   VNetPrintPort(&userIf->port, seqf);
-    
-   len += sprintf(page+len, "read %u written %u queued %u ",
-+   seq_printf(seqf, "read %u written %u queued %u ",
-                   userIf->stats.read,
-                   userIf->stats.written,
-                   userIf->stats.queued);
-    
-   len += sprintf(page+len, 
-+   seq_printf(seqf, 
- 		  "dropped.down %u dropped.mismatch %u "
- 		  "dropped.overflow %u dropped.largePacket %u",
-                   userIf->stats.droppedDown,
-@@ -434,13 +427,23 @@ VNetUserIfProcRead(char    *page,  // IN/OUT: buffer to write into
-                   userIf->stats.droppedOverflow,
- 		  userIf->stats.droppedLargePacket);
- 
-   len += sprintf(page+len, "\n");
-+   seq_printf(seqf, "\n");
-    
-   *start = 0;
-   *eof   = 1;
-   return len;
-+   return 0;
-+}
-+
-+static int proc_userif_open(struct inode *inode, struct file *file)
-+{
-+       return single_open(file, VNetUserIfProcShow, PDE_DATA(inode));
- }
- 
-+static const struct file_operations proc_userif_fops = {
-+       .open           = proc_userif_open,
-+       .read           = seq_read,
-+       .llseek         = seq_lseek,
-+       .release        = seq_release,
-+};
-+
- 
- /*
-  *----------------------------------------------------------------------
-@@ -1036,8 +1039,8 @@ VNetUserIf_Create(VNetPort **ret) // OUT
-     * Make proc entry for this jack.
-     */
-    
-   retval = VNetProc_MakeEntry(userIf->port.jack.name, S_IFREG,
-                               &userIf->port.jack.procEntry);
-+   retval = VNetProc_MakeEntryOps(userIf->port.jack.name, S_IFREG,
-+                               &userIf->port.jack.procEntry, &proc_userif_fops, userIf);
-    if (retval) {
-       if (retval == -ENXIO) {
-          userIf->port.jack.procEntry = NULL;
-@@ -1045,9 +1048,6 @@ VNetUserIf_Create(VNetPort **ret) // OUT
-          kfree(userIf);
-          return retval;
-       }
-   } else {
-      userIf->port.jack.procEntry->read_proc = VNetUserIfProcRead;
-      userIf->port.jack.procEntry->data = userIf;
-    }
- 
-    /*
--- a/vmnet-only/vnetInt.h
-+++ b/vmnet-only/vnetInt.h
-@@ -171,12 +171,14 @@ VNetJack *VNetDisconnect(VNetJack *jack);
- 
- void VNetSend(const VNetJack *jack, struct sk_buff *skb);
- 
-int VNetProc_MakeEntry(char *name, int mode,
-                       VNetProcEntry **ret);
-+int VNetProc_MakeEntryOps(char *name, int mode,
-+                       VNetProcEntry **ret,
-+		       const struct file_operations *fops,
-+		       void *data);
- 
- void VNetProc_RemoveEntry(VNetProcEntry *node);
- 
-int VNetPrintJack(const VNetJack *jack, char *buf);
-+void VNetPrintJack(const VNetJack *jack, struct seq_file *seqf);
- 
- int VNet_MakeMACAddress(VNetPort *port);
- 
-@@ -196,7 +198,7 @@ Bool VNetPacketMatch(const uint8 *destAddr, const uint8 *ifAddr,
- 
- Bool VNetCycleDetectIf(const char *name, int generation);
- 
-int VNetPrintPort(const VNetPort *port, char *buf);
-+void VNetPrintPort(const VNetPort *port, struct seq_file *seqf);
- 
- int VNetSnprintf(char *str, size_t size, const char *format, ...);
- 
-- 
--- a/vmblock-only/linux/control.c	2013-05-21 19:21:19.165750556 +0200
-+++ b/vmblock-only/linux/control.c	2013-05-21 19:22:18.363747723 +0200
-@@ -208,9 +208,10 @@
-    VMBlockSetProcEntryOwner(controlProcMountpoint);
- 
-    /* Create /proc/fs/vmblock/dev */
-   controlProcEntry = create_proc_entry(VMBLOCK_CONTROL_DEVNAME,
-                                        VMBLOCK_CONTROL_MODE,
-                                        controlProcDirEntry);
-+   controlProcEntry = proc_create(VMBLOCK_CONTROL_DEVNAME,
-+                                  VMBLOCK_CONTROL_MODE,
-+                                  controlProcDirEntry,
-+                                  &ControlFileOps);
-    if (!controlProcEntry) {
-       Warning("SetupProcDevice: could not create " VMBLOCK_DEVICE "\n");
-       remove_proc_entry(VMBLOCK_CONTROL_MOUNTPOINT, controlProcDirEntry);
-@@ -218,7 +219,6 @@
-       return -EINVAL;
-    }
- 
-   controlProcEntry->proc_fops = &ControlFileOps;
-    return 0;
- }
- 
--- a/app-emulation/vmware-modules/files/279-vmblock.patch
+++ b/app-emulation/vmware-modules/files/279-vmblock.patch
@ -1,16 +1,14 @@
-diff -ur vmblock-onlya/linux/control.c vmblock-only/linux/control.c
--- vmblock-only/linux/control.c        2013-02-26 10:17:29.000000000 +0200
-+++ vmblock-only/linux/control.c        2013-07-05 19:56:48.298553173 +0300
-@@ -208,17 +208,18 @@
+diff -ruN work.orig/vmblock-only/linux/control.c work/vmblock-only/linux/control.c
+--- work.orig/vmblock-only/linux/control.c	2013-11-02 18:05:39.960226399 +0100
+++ work/vmblock-only/linux/control.c	2013-11-02 18:09:11.760231432 +0100
+@@ -208,17 +208,14 @@
    VMBlockSetProcEntryOwner(controlProcMountpoint);
 
    /* Create /proc/fs/vmblock/dev */
 -   controlProcEntry = create_proc_entry(VMBLOCK_CONTROL_DEVNAME,
-+   /*controlProcEntry = create_proc_entry(VMBLOCK_CONTROL_DEVNAME,
-                                         VMBLOCK_CONTROL_MODE,
+-                                        VMBLOCK_CONTROL_MODE,
 -                                        controlProcDirEntry);
 -   if (!controlProcEntry) {
-+                                        controlProcDirEntry);*/
 +   controlProcEntry = proc_create(VMBLOCK_CONTROL_DEVNAME, VMBLOCK_CONTROL_MODE, controlProcDirEntry, &ControlFileOps);
 +   if (controlProcEntry == NULL) {
       Warning("SetupProcDevice: could not create " VMBLOCK_DEVICE "\n");
@ -20,8 +18,6 @@ diff -ur vmblock-onlya/linux/control.c vmblock-only/linux/control.c
    }
 
 -   controlProcEntry->proc_fops = &ControlFileOps;
-+   /* controlProcEntry->proc_fops = &ControlFileOps; */
    return 0;
- } 
-
+ }
 
--- a/app-emulation/vmware-modules/vmware-modules-279.0.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-279.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-279.0.ebuild,v 1.1 2013/10/19 11:42:47 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-279.0.ebuild,v 1.3 2013/11/02 17:27:17 dilfridge Exp $

 EAPI=5

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

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

 RDEPEND=""
@ -65,8 +65,7 @@ src_prepare() {
 	use pax_kernel && epatch "${FILESDIR}/hardened.patch"
 	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
 	kernel_is ge 3 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-putname.patch"
-	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10.0.patch"
-	kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-vmblock.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-vmblock.patch"

 	# Allow user patches so they can support RC kernels and whatever else
 	epatch_user
--- a/app-emulation/vmware-workstation/vmware-workstation-10.0.0.1295980.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-10.0.0.1295980.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-10.0.0.1295980.ebuild,v 1.1 2013/10/19 11:38:38 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-10.0.0.1295980.ebuild,v 1.2 2013/11/02 17:25:14 dilfridge Exp $

 EAPI="4"

@ -24,7 +24,7 @@ SRC_URI="
 	"
 LICENSE="vmware GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="cups doc ovftool server vix vmware-tools"
 RESTRICT="mirror strip"

--- a/app-emulation/xen-tools/files/fix-gold-ld.patch
+++ b/app-emulation/xen-tools/files/fix-gold-ld.patch
@ -0,0 +1,14 @@
+diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile
+index cbd60b4..d2b83dd 100644
+--- a/tools/libfsimage/common/Makefile
+++ b/tools/libfsimage/common/Makefile
+@@ -5,7 +5,7 @@ MAJOR = 1.0
+ MINOR = 0
+ 
+ LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS
+-LDFLAGS-$(CONFIG_Linux) = -Wl,mapfile-GNU
+LDFLAGS-$(CONFIG_Linux) =
+ LDFLAGS = $(LDFLAGS-y)
+ 
+ CFLAGS += $(PTHREAD_CFLAGS)
+
--- a/app-emulation/xen-tools/metadata.xml
+++ b/app-emulation/xen-tools/metadata.xml
@ -14,6 +14,7 @@
 		<flag name='pygrub'>Install the pygrub boot loader</flag>
 		<flag name='screen'>Enable support for running domain U console in an <pkg>app-misc/screen</pkg> session</flag>
 		<flag name='xend'>Enable support the xend and xm to manage xen</flag>
-                <flag name='ocaml'>Enable support for the ocaml language</flag>
+		<flag name='ocaml'>Enable support for the ocaml language</flag>
+		<flag name='pam'>Enable pam support</flag>
 	</use>
 </pkgmetadata>
--- a/app-emulation/xen-tools/xen-tools-4.2.2-r4.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.2.2-r4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.2-r4.ebuild,v 1.7 2013/10/04 18:06:23 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.2-r4.ebuild,v 1.8 2013/11/04 12:58:47 idella4 Exp $

 EAPI=5

@ -233,6 +233,9 @@ src_prepare() {
 	# Bug 445986
 	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' -i tools/firmware/Makefile || die

+	# Bug 379537
+	epatch "${FILESDIR}"/fix-gold-ld.patch
+
 	epatch_user
 }

--- a/app-emulation/xen-tools/xen-tools-4.3.0-r2.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.3.0-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.0.ebuild,v 1.20 2013/10/04 18:06:23 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.0-r2.ebuild,v 1.1 2013/11/04 16:12:31 idella4 Exp $

 EAPI=5

@ -32,7 +32,9 @@ DOCS=( README docs/README.xen-bugtool )

 LICENSE="GPL-2"
 SLOT="0"
-IUSE="api custom-cflags debug doc flask hvm qemu ocaml python pygrub screen static-libs xend"
+# Inclusion of IUSE ocaml on stabalizing requires aballier to (get off his hands and) make >=dev-lang/ocaml-4 stable
+# Otherwise IUSE ocaml and ocaml capable build need be purged
+IUSE="api custom-cflags debug doc flask hvm qemu ocaml +pam python pygrub screen static-libs xend"

 REQUIRED_USE="hvm? ( qemu )"

@ -40,10 +42,9 @@ DEPEND="dev-libs/lzo:2
 	dev-libs/yajl
 	dev-libs/libgcrypt
 	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pypam[${PYTHON_USEDEP}]
+	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
 	sys-libs/zlib
 	sys-power/iasl
-	dev-ml/findlib
 	hvm? ( media-libs/libsdl )
 	${PYTHON_DEPS}
 	api? ( dev-libs/libxml2
@ -69,10 +70,11 @@ DEPEND="dev-libs/lzo:2
 	)
 	hvm? ( x11-proto/xproto
 		!net-libs/libiscsi )
-	qemu? ( x11-libs/pixman )"
+	qemu? ( x11-libs/pixman )
+	ocaml? ( dev-ml/findlib
+		>=dev-lang/ocaml-4 )"
 RDEPEND="sys-apps/iproute2
 	net-misc/bridge-utils
-	ocaml? ( >=dev-lang/ocaml-4 )
 	screen? (
 		app-misc/screen
 		app-admin/logrotate
@ -222,11 +224,15 @@ src_prepare() {
 	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
 	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' -i tools/firmware/Makefile || die

+	# Bug 379537
+	epatch "${FILESDIR}"/fix-gold-ld.patch
+
 	epatch_user
 }

 src_configure() {
 	local myconf="--prefix=/usr --disable-werror"
+
 	if use ocaml
 	then
 		myconf="${myconf} $(use_enable ocaml ocamltools)"
@ -234,6 +240,11 @@ src_configure() {
 		myconf="${myconf} --disable-ocamltools"
 	fi

+	if ! use pam
+	then
+		myconf="${myconf} --disable-pam"
+	fi
+
 	econf ${myconf}
 }

--- a/app-emulation/xen/files/xen-CVE-2013-4368-XSA-67.patch
+++ b/app-emulation/xen/files/xen-CVE-2013-4368-XSA-67.patch
@ -0,0 +1,37 @@
+x86: check segment descriptor read result in 64-bit OUTS emulation
+
+When emulating such an operation from a 64-bit context (CS has long
+mode set), and the data segment is overridden to FS/GS, the result of
+reading the overridden segment's descriptor (read_descriptor) is not
+checked. If it fails, data_base is left uninitialized.
+
+This can lead to 8 bytes of Xen's stack being leaked to the guest
+(implicitly, i.e. via the address given in a #PF).
+
+Coverity-ID: 1055116
+
+This is CVE-2013-4368 / XSA-67.
+
+Signed-off-by: Matthew Daley <mattjd@gmail.com>
+
+Fix formatting.
+
+Signed-off-by: Jan Beulich <jbeulich@suse.com>
+
+--- a/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
+@@ -1993,10 +1993,10 @@ static int emulate_privileged_op(struct 
+                     break;
+                 }
+             }
+-            else
+-                read_descriptor(data_sel, v, regs,
+-                                &data_base, &data_limit, &ar,
+-                                0);
+            else if ( !read_descriptor(data_sel, v, regs,
+                                       &data_base, &data_limit, &ar, 0) ||
+                      !(ar & _SEGMENT_S) || !(ar & _SEGMENT_P) )
+                goto fail;
+             data_limit = ~0UL;
+             ar = _SEGMENT_WR|_SEGMENT_S|_SEGMENT_DPL|_SEGMENT_P;
+         }
--- a/app-emulation/xen/files/xen-CVE-2013-4375-XSA-71.patch
+++ b/app-emulation/xen/files/xen-CVE-2013-4375-XSA-71.patch
@ -0,0 +1,39 @@
+From 23260e589e52ec83349f22198eab2331b5a1684e Mon Sep 17 00:00:00 2001
+From: Matthew Daley <mattjd@gmail.com>
+Date: Wed, 25 Sep 2013 12:28:47 +1200
+Subject: [PATCH] xen_disk: mark ioreq as mapped before unmapping in error
+ case
+
+Commit c6961b7d ("xen_disk: use bdrv_aio_flush instead of bdrv_flush")
+modified the semantics of ioreq_{un,}map so that they are idempotent if
+called when they're not needed (ie., twice in a row). However, it neglected
+to handle the case where batch mapping is not being used (the default), and
+one of the grants fails to map. In this case, ioreq_unmap will be called to
+unwind and unmap any mappings already performed, but ioreq_unmap simply
+returns due to the aforementioned change (the ioreq has not already been
+marked as mapped).
+
+The frontend user can therefore force xen_disk to leak grant mappings, a
+per-backend-domain limited resource.
+
+Fix by marking the ioreq as mapped before calling ioreq_unmap in this
+situation.
+
+This is XSA-71 / CVE-2013-4375
+
+Signed-off-by: Matthew Daley <mattjd@gmail.com>
+---
+ hw/xen_disk.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff -ur xen-4.3.0.orig/tools/qemu-xen-traditional/hw/xen_disk.c xen-4.3.0/tools/qemu-xen-traditional/hw/xen_disk.c
+--- tools/qemu-xen-traditional/hw/xen_disk.c	2013-06-18 00:39:51.000000000 +0800
+++ tools/qemu-xen-traditional/hw/xen_disk.c	2013-11-06 11:05:44.977888267 +0800
+@@ -298,6 +298,7 @@
+ 		xen_be_printf(&ioreq->blkdev->xendev, 0,
+ 			      "can't map grant ref %d (%s, %d maps)\n",
+ 			      ioreq->refs[i], strerror(errno), ioreq->blkdev->cnt_map);
+		ioreq->mapped = 1;
+ 		ioreq_unmap(ioreq);
+ 		return -1;
+ 	    }
--- a/app-emulation/xen/files/xen-CVE-2013-4494-XSA-73.patch
+++ b/app-emulation/xen/files/xen-CVE-2013-4494-XSA-73.patch
@ -0,0 +1,105 @@
+From 068bfa76bbd52430e65853375e1d5db99d193e2f Mon Sep 17 00:00:00 2001
+From: Andrew Cooper <andrew.cooper3@citrix.com>
+Date: Thu, 31 Oct 2013 20:49:00 +0000
+Subject: [PATCH] gnttab: correct locking order reversal
+
+Coverity ID 1087189
+
+Correct a lock order reversal between a domains page allocation and grant
+table locks.
+
+This is CVE-2013-4494 / XSA-73.
+
+Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
+
+Consolidate error handling.
+
+Signed-off-by: Jan Beulich <jbeulich@suse.com>
+Reviewed-by: Keir Fraser <keir@xen.org>
+Tested-by: Matthew Daley <mattjd@gmail.com>
+---
+ xen/common/grant_table.c |   52 +++++++++++++++++++++++++++++++++++++++-------
+ 1 file changed, 44 insertions(+), 8 deletions(-)
+
+diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c
+index f42bc7a..48df928 100644
+--- a/xen/common/grant_table.c
+++ b/xen/common/grant_table.c
+@@ -1517,6 +1517,8 @@ gnttab_transfer(
+ 
+     for ( i = 0; i < count; i++ )
+     {
+        bool_t okay;
+
+         if (i && hypercall_preempt_check())
+             return i;
+ 
+@@ -1625,16 +1627,18 @@ gnttab_transfer(
+          * pages when it is dying.
+          */
+         if ( unlikely(e->is_dying) ||
+-             unlikely(e->tot_pages >= e->max_pages) ||
+-             unlikely(!gnttab_prepare_for_transfer(e, d, gop.ref)) )
+             unlikely(e->tot_pages >= e->max_pages) )
+         {
+-            if ( !e->is_dying )
+-                gdprintk(XENLOG_INFO, "gnttab_transfer: "
+-                        "Transferee has no reservation "
+-                        "headroom (%d,%d) or provided a bad grant ref (%08x) "
+-                        "or is dying (%d)\n",
+-                        e->tot_pages, e->max_pages, gop.ref, e->is_dying);
+             spin_unlock(&e->page_alloc_lock);
+
+            if ( e->is_dying )
+                gdprintk(XENLOG_INFO, "gnttab_transfer: "
+                         "Transferee (d%d) is dying\n", e->domain_id);
+            else
+                gdprintk(XENLOG_INFO, "gnttab_transfer: "
+                         "Transferee (d%d) has no headroom (tot %u, max %u)\n",
+                         e->domain_id, e->tot_pages, e->max_pages);
+
+             rcu_unlock_domain(e);
+             put_gfn(d, gop.mfn);
+             page->count_info &= ~(PGC_count_mask|PGC_allocated);
+@@ -1646,6 +1650,38 @@ gnttab_transfer(
+         /* Okay, add the page to 'e'. */
+         if ( unlikely(domain_adjust_tot_pages(e, 1) == 1) )
+             get_knownalive_domain(e);
+
+        /*
+         * We must drop the lock to avoid a possible deadlock in
+         * gnttab_prepare_for_transfer.  We have reserved a page in e so can
+         * safely drop the lock and re-aquire it later to add page to the
+         * pagelist.
+         */
+        spin_unlock(&e->page_alloc_lock);
+        okay = gnttab_prepare_for_transfer(e, d, gop.ref);
+        spin_lock(&e->page_alloc_lock);
+
+        if ( unlikely(!okay) || unlikely(e->is_dying) )
+        {
+            bool_t drop_dom_ref = (domain_adjust_tot_pages(e, -1) == 0);
+
+            spin_unlock(&e->page_alloc_lock);
+
+            if ( okay /* i.e. e->is_dying due to the surrounding if() */ )
+                gdprintk(XENLOG_INFO, "gnttab_transfer: "
+                         "Transferee (d%d) is now dying\n", e->domain_id);
+
+            if ( drop_dom_ref )
+                put_domain(e);
+            rcu_unlock_domain(e);
+
+            put_gfn(d, gop.mfn);
+            page->count_info &= ~(PGC_count_mask|PGC_allocated);
+            free_domheap_page(page);
+            gop.status = GNTST_general_error;
+            goto copyback;
+        }
+
+         page_list_add_tail(page, &e->page_list);
+         page_set_owner(page, e);
+ 
+-- 
+1.7.10.4
+
--- a/app-emulation/xen/xen-4.2.2-r1.ebuild
+++ b/app-emulation/xen/xen-4.2.2-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.2-r1.ebuild,v 1.5 2013/07/28 09:13:36 jcallen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.2-r1.ebuild,v 1.6 2013/11/06 06:45:18 idella4 Exp $

 EAPI=5

@ -92,6 +92,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-4-CVE-2013-1918-XSA-45_[1-7].patch \
 		"${FILESDIR}"/${PN}-4.2-2013-2076-XSA-52to54.patch \
 		"${FILESDIR}"/${PN}-4.2-CVE-2013-1432-XSA-58.patch
+
 	epatch_user
 }

--- a/app-emulation/xen/xen-4.3.0-r2.ebuild
+++ b/app-emulation/xen/xen-4.3.0-r2.ebuild
@ -0,0 +1,138 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.3.0-r2.ebuild,v 1.1 2013/11/06 06:45:18 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+if [[ $PV == *9999 ]]; then
+	KEYWORDS=""
+	REPO="xen-unstable.hg"
+	EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
+	S="${WORKDIR}/${REPO}"
+	live_eclass="mercurial"
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz"
+fi
+
+inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass}
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="http://xen.org/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug efi flask pae xsm"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+RESTRICT="test"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="flask? ( xsm )"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	elif use xsm ; then
+		export "XSM_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Drop .config and fix gcc-4.6
+	epatch  "${FILESDIR}"/${PN/-pvgrub/}-4.3-fix_dotconfig-gcc.patch
+
+	if use efi; then
+		epatch "${FILESDIR}"/${PN}-4.2-efi.patch
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="boot"
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \; || die "failed to re-set custom-cflags"
+	fi
+
+	# not strictly necessary to fix this
+	sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
+
+	#Security patches
+	epatch "${FILESDIR}"/${PN}-CVE-2013-1442-XSA-62.patch \
+		"${FILESDIR}"/${PN}-CVE-2013-4355-XSA-63.patch \
+		"${FILESDIR}"/${PN}-CVE-2013-4356-XSA-64.patch \
+		"${FILESDIR}"/${PN}-CVE-2013-4361-XSA-66.patch \
+		"${FILESDIR}"/${PN}-CVE-2013-4368-XSA-67.patch \
+		"${FILESDIR}"/${PN}-CVE-2013-4375-XSA-71.patch \
+		"${FILESDIR}"/${PN}-CVE-2013-4494-XSA-73.patch
+
+	epatch_user
+}
+
+src_configure() {
+	use debug && myopt="${myopt} debug=y"
+	use pae && myopt="${myopt} pae=y"
+
+	if use custom-cflags; then
+		filter-flags -fPIE -fstack-protector
+		replace-flags -O3 -O2
+	else
+		unset CFLAGS
+	fi
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+	use pae && myopt="${myopt} pae=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the unoffical wiki page:"
+	elog " http://www.gentoo.org/doc/en/xen-guide.xml"
+	elog " http://en.gentoo-wiki.com/wiki/Xen/"
+
+	use pae && ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!"
+	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+}
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@ -2,3 +2,4 @@ DIST ibus-1.4.1.tar.gz 1479412 SHA256 2f46de279ef3c0a48d3f52061794cfc6544ad8cfe3
 DIST ibus-1.4.2.tar.gz 1489482 SHA256 2418d9960d177c0ce7d3dc5ef8ab75cfc00e30f5e2c730b7d82f4f22666a04d7 SHA512 0070f7d0a4bc6510692851f60e06e487f75fdbe47f50a2371f62dd06b89f20950161b5f1bb91e025dd8dced654d9e90eb910bb5be8e8923869e96e5048f8316d WHIRLPOOL c480ef6fabfe24f2350a0222945860e3b890b32373e159032cc4a9bb1a1df2ad22b6ce11fb9845c5ebacdb7662b9dd26bffb7dd8f6d366551e9ec226e2b14d8d
 DIST ibus-1.5.2.tar.gz 1882764 SHA256 394f5653e336c6bc02cb055b8eac9f0c9b2a337d582b278e3e825e8cf3f0230d SHA512 6dbf7c59ea57f1683c80595d292ccbe218b419513df2f03978f058a31f1df472bb82331f3432154991bec384a941f7c2bf13fa56e1fbb351f85faf51ee6f1e23 WHIRLPOOL c8113db0ddc021efbde74ef30edf9a3f063b657262614c78bdac12834afff2e446cc4e3873799ab06b44f925a9f1f8bb3cd9d860b1a5ccee78879911e93aca68
 DIST ibus-1.5.3.tar.gz 1976957 SHA256 2afc6371c24873f0e37554ef07effd022042f8eca6cb649d1bb02d8c57528b8c SHA512 fe961f3a6143ea8cb9f14531cfdf6f6058bf8aba7285e6746b1750fb8267947730986e1fc0abb77c4545ddc0d835a41f76f316f7387c85de7bbf4010c10e79db WHIRLPOOL db0f5dd7784b5440d5c95d5d4eb8c1433277dc20789b6b5f20cef0504ebc1fe1cf4c1fe26c1dde90e78a1349534bdcdf09af1156605c77b3f973f4f5908db09f
+DIST ibus-1.5.4.tar.gz 2026656 SHA256 703ebaba3f01b54a86119fb6161d85b9d1ccdb4edb79782d0d23ccde64d214fd SHA512 754cb402c5cd620955b553ab10a397e6f2e8a7db3016c83508fdfefeca0326e9a467bd2d5cc564914082cb1044e2bedeb79f7a20972395f58f58bad0d0855124 WHIRLPOOL 558fca78dcc2c05fdd154ca0940520a2caf579e6ca31b6f284ee2885fb3a5c2b6bc98d114589177f9fd7f5a7c27e036452e85d4c0fa646c7e7e7a947c485f759
--- a/app-i18n/ibus/ibus-1.5.4.ebuild
+++ b/app-i18n/ibus/ibus-1.5.4.ebuild
@ -0,0 +1,176 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.5.4.ebuild,v 1.1 2013/11/04 08:55:26 naota Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+VALA_MIN_API_VERSION="0.18"
+VALA_USE_DEPEND="vapigen"
+# Vapigen is needed for the vala binding
+# Valac is needed when building from git for the engine
+
+inherit bash-completion-r1 eutils gnome2-utils multilib python-single-r1 vala virtualx
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="http://code.google.com/p/ibus/"
+SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="dconf deprecated +gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
+REQUIRED_USE="|| ( gtk gtk3 X )
+	deprecated? ( python )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		|| ( deprecated ( gtk3 introspection ) ) )" #342903
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.26:2
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	app-text/iso-codes
+
+	dconf? ( >=gnome-base/dconf-0.13.4 )
+	gconf? ( >=gnome-base/gconf-2.12:2 )
+	gtk? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	python? ( ${PYTHON_DEPS} )
+	X? (
+		x11-libs/libX11
+		x11-libs/gtk+:2 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
+	nls? ( virtual/libintl )
+	wayland? ( dev-libs/wayland )"
+RDEPEND="${COMMON_DEPEND}
+	x11-apps/setxkbmap
+	python? (
+		dev-python/pyxdg
+		deprecated? (
+			>=dev-python/dbus-python-0.83
+			dev-python/pygobject:2
+			dev-python/pygtk:2 )
+		gtk3? (
+			dev-python/pygobject:3
+			x11-libs/gdk-pixbuf:2[introspection]
+			x11-libs/pango[introspection]
+			x11-libs/gtk+:3[introspection] )
+	)"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5.8.1
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.16.1 )
+	vala? ( $(vala_depend) )
+	gnome-base/gconf"
+
+# stress test in bus/ fails
+# IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed
+RESTRICT="test"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations
+	sed -e 's/dconf update/$(NULL)/' \
+		-i data/dconf/Makefile.{am,in} || die
+	use vala && vala_src_prepare
+	cp "${S}"/client/gtk2/ibusimcontext.c "${S}"/client/gtk3/ibusimcontext.c || die
+}
+
+src_configure() {
+	local python_conf
+	if use python; then
+		python_conf="PYTHON=${PYTHON}
+			$(use_enable deprecated python-library)
+			$(use_enable gtk3 setup)"
+	else
+		python_conf="--disable-python-library --disable-setup"
+	fi
+	econf \
+		$(use_enable dconf) \
+		$(use_enable introspection) \
+		$(use_enable gconf) \
+		$(use_enable gtk gtk2) \
+		$(use_enable gtk xim) \
+		$(use_enable gtk3) \
+		$(use_enable gtk3 ui) \
+		$(use_enable nls) \
+		$(use_enable test tests) \
+		$(use_enable X xim) \
+		$(use_enable vala) \
+		$(use_enable wayland) \
+		${python_conf}
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check || die
+}
+
+src_install() {
+	default
+
+	prune_libtool_files --all
+
+	mv "${ED}"/usr/share/bash-completion/completions/ibus.bash ${T}
+	rm -rf "${ED}"/usr/share/bash-completion || die
+	newbashcomp "${T}"/ibus.bash ${PN}
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-ibus ibus.conf
+
+	keepdir /usr/share/ibus/{engine,icons} #289547
+
+	use deprecated && python_optimize
+	use python && use gtk3 && python_optimize
+}
+
+pkg_preinst() {
+	use gconf && gnome2_gconf_savelist
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	if use dconf; then
+		ebegin "Updating dconf system databases"
+		dconf update
+		eend $?
+	fi
+	use gconf && gnome2_gconf_install
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	gnome2_icon_cache_update
+
+	elog "To use ibus, you should:"
+	elog "1. Get input engines from sunrise overlay."
+	elog "   Run \"emerge -s ibus-\" in your favorite terminal"
+	elog "   for a list of packages we already have."
+	elog
+	elog "2. Setup ibus:"
+	elog
+	elog "   $ ibus-setup"
+	elog
+	elog "3. Set the following in your user startup scripts"
+	elog "   such as .xinitrc, .xsession or .xprofile:"
+	elog
+	elog "   export XMODIFIERS=\"@im=ibus\""
+	elog "   export GTK_IM_MODULE=\"ibus\""
+	elog "   export QT_IM_MODULE=\"xim\""
+	elog "   ibus-daemon -d -x"
+}
+
+pkg_postrm() {
+	if use dconf; then
+		ebegin "Updating dconf system databases"
+		dconf update
+		eend $?
+	fi
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	gnome2_icon_cache_update
+}
--- a/app-i18n/man-pages-ru/Manifest
+++ b/app-i18n/man-pages-ru/Manifest
@ -1,3 +1,3 @@
-DIST man-pages-ru_3.41-2145-1724-20130102.tar.bz2 669902 SHA256 23e76ba0025616b3670716363227440e6fdda17bd8498be5beb565561b25f8ba SHA512 1bc37cbea0ee559985f2ded4dec136e5b178db26d25d571fe9fbf10f611d91be65d08973b5d9a2db1e80aa1da3f0b54ae6a28a8b6d63ac0c559f606e4779e403 WHIRLPOOL ea224a6182c1de420a75e5a851bae9ddf3522ed14a053d9ad835fb156301410bb392c704273a205421ab50bd27f264dcc2da9c95fb4ad1889e6fb708a1cd8845
 DIST man-pages-ru_3.49-2170-1764-20130606.tar.bz2 727102 SHA256 a0e8d5960511786aa2ed377471f265c8c6153cb82f01a0a1ab8d58fadd6336a4 SHA512 de428e1382b99211ad20a5ff47a41dfd78b0c8356725f0264412dbd15f89f3dcb67f7493de1eefe4b0ce897860884733f1bbf4628c9b9ef972a3ac5ccdf4421d WHIRLPOOL e049d78bd7c1479c7baf205f39e9ba7e8e05f443b9e1a70bbd8e0b2c1baf549c9e6cc10d82698897690a4905fd4fac6e8f1a173ca5d446d01eaf7ee4efe311ea
 DIST man-pages-ru_3.51-2170-1766-20130613.tar.bz2 732257 SHA256 ae64c5676ce3c39ac1093c25feca27113b7282139479fd10e458c7b35b3df8f6 SHA512 8b521b6d7fa9cc51ca1d1b65ac2002d80d59ede8a4f7eb1dcfcb8eef89eccbb45b21b1331f32591b13493b525ea314d0d5857ea87420e9d4bc51348b3829cdf0 WHIRLPOOL d81a8c4994227c4099e6dd911779df6815c89e44d3d4282b1d679aaa0b5dc918e603c41a7d690c9af8d5d052a5370ff645ac35adc16c9e2a39b0b34b57921e24
+DIST man-pages-ru_3.54-2171-1790-20131020.tar.bz2 764794 SHA256 ff2140c48bfcdce930189a9122ed2eda9e61170352daa48dac2a2fa4bc51dc5a SHA512 3dc4194fef836b3fb4fdcc85de0b80f29a805d0ca5a88207e11a2296726b2bd0023853c986dba4ae61a533cef7372314b05fb476d55d84007fc1355ebf8c5494 WHIRLPOOL cbc305f57b866ddff58e3730311d8534eb64bc726760eb89f60c0fbe66154a3ac6a8fbbd6d9a8fc71748a2a7cc7977c87ee6a2545c270a9c6b7a47d2034a521d
--- a/app-i18n/man-pages-ru/man-pages-ru-3.54.2171.1790.20131020.ebuild
+++ b/app-i18n/man-pages-ru/man-pages-ru-3.54.2171.1790.20131020.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-ru/man-pages-ru-3.41.2145.1724.20130102.ebuild,v 1.14 2013/09/29 10:17:59 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-ru/man-pages-ru-3.54.2171.1790.20131020.ebuild,v 1.1 2013/11/06 07:38:25 pinkbyte Exp $

 EAPI="5"

@ -14,8 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${MY_PV}.tar.bz2"

 LICENSE="FDL-1.3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"

 DEPEND=""
 RDEPEND="virtual/man"
--- a/app-laptop/tpacpi-bat/Manifest
+++ b/app-laptop/tpacpi-bat/Manifest
@ -1 +1 @@
-DIST tpacpi-bat-1.0.tar.gz 16111 SHA256 4e75c2876852f99185b21e6962ade1a1398bcb501423c1d57cc50310a5d6bb92 SHA512 c12060e2ce949d693edca68705018820a27e1a21b1350a5408570ffda20c24439927435e39f527997c7b11990595941feaffcbbeb783cf5e44133d5e56711d6d WHIRLPOOL 8109bb5833005f1900936e051958b5fde8d4037545f536a515abbcc5915080126e4172c75c72879c23e11fec8a66ef38fb93e1184802347093570202967cec80
+DIST tpacpi-bat-1.1.tar.gz 17781 SHA256 99bfeae60c672d981ea70a98470b8c2a1a9da52da0fce7f669270f216d2230a3 SHA512 7b8838e6db7f98cd5bb674a99dbb880ba6574529de68d97ce704bf225ba416183971aae3c2dd623bc8750767c54a2a52cd0b525bce70640ecf0b307fdba03821 WHIRLPOOL 3a057e57da77f997ed27f679c2503a139d760949027c02aa5dd5bef71579d525acc866655e0008b59ef6ae8b0c567f7de627838baac5c7ed2969523a7355a879
--- a/app-laptop/tpacpi-bat/files/tpacpi-bat.initd.1
+++ b/app-laptop/tpacpi-bat/files/tpacpi-bat.initd.1
@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright (C) 2012 Christoph Junghans <ottxor@gentoo.org>
+# Copyright (C) 2012-2013 Christoph Junghans <ottxor@gentoo.org>
 #
 # Distributed under the terms of the GNU General Public License, v2 or later

@ -57,8 +57,8 @@ set_all() {

 	for bat in ${BATS}; do
 		ebegin "  setting thresholds for ${bat}: $tstart $tstop"
-		/usr/bin/tpacpi-bat startChargeThreshold ${bat} ${tstart}
-		/usr/bin/tpacpi-bat stopChargeThreshold ${bat} ${tstop}
+		/usr/bin/tpacpi-bat -s startChargeThreshold ${bat} ${tstart}
+		/usr/bin/tpacpi-bat -s stopChargeThreshold ${bat} ${tstop}
 		eend $?
 	done
 }
@ -71,8 +71,8 @@ info() {
 	require_started

 	for bat in ${BATS}; do
-		tstart=$(/usr/bin/tpacpi-bat startChargeThreshold ${bat})
-		tstop=$(/usr/bin/tpacpi-bat stopChargeThreshold ${bat})
+		tstart=$(/usr/bin/tpacpi-bat -g startChargeThreshold ${bat})
+		tstop=$(/usr/bin/tpacpi-bat -g stopChargeThreshold ${bat})
 		einfo "Battery ${bat}: ${tstart} ${tstop}"
 	done
 }
--- a/app-laptop/tpacpi-bat/tpacpi-bat-1.0-r1.ebuild
+++ b/app-laptop/tpacpi-bat/tpacpi-bat-1.0-r1.ebuild
@ -1,18 +1,17 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/tpacpi-bat/tpacpi-bat-1.0-r1.ebuild,v 1.1 2013/09/21 00:49:05 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/tpacpi-bat/tpacpi-bat-1.1.ebuild,v 1.1 2013/11/04 18:54:09 ottxor Exp $

 EAPI=5

-inherit eutils
+inherit eutils systemd

 if [ "${PV}" = "9999" ]; then
 	inherit git-2
-	EGIT_REPO_URI="git://github.com/teleshoes/tpacpi-bat.git"
+	EGIT_REPO_URI="git://github.com/teleshoes/tpacpi-bat.git http://github.com/teleshoes/tpacpi-bat.git"
 	KEYWORDS=""
 else
-	inherit vcs-snapshot
-	SRC_URI="mirror://github/teleshoes/tpacpi-bat/tarball/v${PV} -> ${P}.tar.gz"
+	SRC_URI="https://github.com/teleshoes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 DESCRIPTION="Control battery thresholds of recent ThinkPads, which are not supported by tp_smapi"
@ -29,6 +28,7 @@ RDEPEND="sys-power/acpi_call
 src_install() {
 	dodoc README battery_asl
 	dobin tpacpi-bat
-	newinitd "${FILESDIR}"/${PN}.initd.0 ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd.1 ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd.0 ${PN}
+	systemd_newunit tpacpi.service ${PN}.service
 }
--- a/app-laptop/tpacpi-bat/tpacpi-bat-9999.ebuild
+++ b/app-laptop/tpacpi-bat/tpacpi-bat-9999.ebuild
@ -1,18 +1,17 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/tpacpi-bat/tpacpi-bat-9999.ebuild,v 1.3 2013/01/11 22:39:50 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/tpacpi-bat/tpacpi-bat-9999.ebuild,v 1.5 2013/11/04 18:54:09 ottxor Exp $

 EAPI=5

-inherit eutils
+inherit eutils systemd

 if [ "${PV}" = "9999" ]; then
 	inherit git-2
-	EGIT_REPO_URI="git://github.com/teleshoes/tpacpi-bat.git"
+	EGIT_REPO_URI="git://github.com/teleshoes/tpacpi-bat.git http://github.com/teleshoes/tpacpi-bat.git"
 	KEYWORDS=""
 else
-	inherit vcs-snapshot
-	SRC_URI="mirror://github/teleshoes/tpacpi-bat/tarball/v${PV} -> ${P}.tar.gz"
+	SRC_URI="https://github.com/teleshoes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 DESCRIPTION="Control battery thresholds of recent ThinkPads, which are not supported by tp_smapi"
@ -29,6 +28,7 @@ RDEPEND="sys-power/acpi_call
 src_install() {
 	dodoc README battery_asl
 	dobin tpacpi-bat
-	newinitd "${FILESDIR}"/${PN}.initd.0 ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd.1 ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd.0 ${PN}
+	systemd_newunit tpacpi.service ${PN}.service
 }
--- a/app-misc/anki/anki-2.0.12.ebuild
+++ b/app-misc/anki/anki-2.0.12.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/anki-2.0.12.ebuild,v 1.4 2013/08/18 13:47:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/anki-2.0.12.ebuild,v 1.5 2013/11/05 14:49:50 tomka Exp $

 EAPI=5

@ -36,8 +36,8 @@ pkg_setup(){

 src_prepare() {
 	rm -r thirdparty || die
-	sed -i -e "s/suppressUpdate=False/suppressUpdate=True/" \
-		aqt/profiles.py
+	sed -i -e "s/updates=True/updates=False/" \
+		aqt/profiles.py || die
 }

 # Nothing to configure or compile
--- a/app-misc/anki/anki-2.0.16.ebuild
+++ b/app-misc/anki/anki-2.0.16.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/anki-2.0.16.ebuild,v 1.1 2013/11/01 12:09:05 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/anki-2.0.16.ebuild,v 1.2 2013/11/05 14:49:50 tomka Exp $

 EAPI=5

@ -36,8 +36,8 @@ pkg_setup(){

 src_prepare() {
 	rm -r thirdparty || die
-	sed -i -e "s/suppressUpdate=False/suppressUpdate=True/" \
-		aqt/profiles.py
+	sed -i -e "s/updates=True/updates=False/" \
+		aqt/profiles.py || die
 }

 # Nothing to configure or compile
--- a/app-misc/binwalk/Manifest
+++ b/app-misc/binwalk/Manifest
@ -1 +1,2 @@
 DIST binwalk-1.2.1.tar.gz 89964 SHA256 5d286900b01af22499ac86f9fab7f8fb430e00e2c4cdafc142573837e16eb0c1 SHA512 a330e7ddd67faed1d1511a9c20d71fb96ba9637a78fb10165445c8c40ca7deb9b115b4f694d30a4327a26253830724fad4494048e251b74564bf4405439eb8c7 WHIRLPOOL fa1cf8c760407f0c685997b4454138399dd1d34caf355cf1fb34ae8423e549591f1f221e477e4286efdcdce38ad4ab0fd5a551901539a1fa7e2ac46b537e94fb
+DIST binwalk-1.2.2-1.tar.gz 100036 SHA256 32971bc0f02e26debfdebc8514b37d809c5a31e43e79fa3cb9d88dcf526dfb57 SHA512 64802aa9ec24744a824db29d943fb54042aba83fe59bc245eab767b1d812befd14e062fb4f709f08b49ea45dd516f813222029e1284c1d95c9c7315044642aef WHIRLPOOL 35ddf0482a9ddcd558066917475f11b4def3eaea19a8f75f2a1089c2cddb3100bee8accee298d79dd3fa94f6e8239178bc7fa93eb31084442154ef5cf92d71ed
--- a/app-misc/binwalk/binwalk-1.2.2_p1.ebuild
+++ b/app-misc/binwalk/binwalk-1.2.2_p1.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/binwalk/binwalk-1.2.2_p1.ebuild,v 1.1 2013/11/06 06:56:15 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1
+
+MY_P=${P/_p/-}
+DESCRIPTION="A tool for identifying files embedded inside firmware images"
+HOMEPAGE="http://code.google.com/p/binwalk/"
+SRC_URI="http://binwalk.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+IUSE="graph"
+
+RDEPEND="sys-apps/file[python]
+	graph? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}/src
+
+DOCS=( ../docs/README ../docs/API )
+
+python_configure_all() {
+	mydistutilsargs=( --no-prereq-checks )
+}
--- a/app-misc/conmux/conmux-0.15.1-r3.ebuild
+++ b/app-misc/conmux/conmux-0.15.1-r3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/conmux/conmux-0.15.1-r2.ebuild,v 1.1 2013/11/01 20:04:40 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/conmux/conmux-0.15.1-r3.ebuild,v 1.1 2013/11/05 19:11:23 hwoarang Exp $

 EAPI=5

@ -12,7 +12,7 @@ SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"

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

 RDEPEND="dev-perl/IO-Multiplex
--- a/app-misc/conmux/files/conmux.initd
+++ b/app-misc/conmux/files/conmux.initd
@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

+depend() {
+	use net
+	need conmux-registry
+}
+
 checkconfig() {
 	if [[ ! -f ${CONMUX_CONFIG} ]]; then
 		eerror ""
@ -22,13 +27,13 @@ start() {
 	# Make sure conmux finds everything
 	export PATH="${PATH}:/usr/share/conmux/drivers:/usr/share/conmux/helpers"
 	ebegin "Starting conmux daemon"
-	start-stop-daemon -m b --start -1 ${CONMUX_LOG} \
-		-2 ${CONMUX_LOG} -p /run/conmux.pid \
+	start-stop-daemon -m -b --start -1 ${CONMUX_LOG} \
+		-2 ${CONMUX_LOG} -p /run/${SVCNAME}.pid \
 		--exec /usr/sbin/conmux -- ${CONMUX_CONFIG}
 }

 stop() {
 	ebegin "Stopping conmux daemon"
-	start-stop-daemon --stop --pidfile /run/conmux.pid
+	start-stop-daemon --stop --pidfile /run/${SVCNAME}.pid
 	eend $?
 }
--- a/app-misc/g15composer/metadata.xml
+++ b/app-misc/g15composer/metadata.xml
@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>robbat2@gentoo.org</email>
-</maintainer>
+  <maintainer>
+    <email>robbat2@gentoo.org</email>
+  </maintainer>
+  <maintainer>
+    <email>polynomial-c@gentoo.org</email>
+    <name>Lars Wendler</name>
+  </maintainer>
 </pkgmetadata>
--- a/app-misc/g15daemon/metadata.xml
+++ b/app-misc/g15daemon/metadata.xml
@ -4,4 +4,8 @@
 	<maintainer>
 		<email>robbat2@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
 </pkgmetadata>
--- a/app-misc/g15macro/metadata.xml
+++ b/app-misc/g15macro/metadata.xml
@ -4,4 +4,8 @@
 	<maintainer>
 		<email>robbat2@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
 </pkgmetadata>
--- a/app-misc/g15message/metadata.xml
+++ b/app-misc/g15message/metadata.xml
@ -4,4 +4,8 @@
 	<maintainer>
 		<email>robbat2@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
 </pkgmetadata>
--- a/app-misc/g15stats/metadata.xml
+++ b/app-misc/g15stats/metadata.xml
@ -4,5 +4,9 @@
 	<maintainer>
 		<email>robbat2@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
 </pkgmetadata>

--- a/app-misc/gentoo/Manifest
+++ b/app-misc/gentoo/Manifest
@ -1,3 +1,4 @@
 DIST gentoo-0.19.13.tar.gz 1541738 SHA256 6afafeacd54a18d97e217ad10df1b555274ac856f050e10888109d405ebdc092 SHA512 51bffcc73a1c81697bed975169286afefc46f02b956da17985a5a4082188ffe155f0943d4cf0718c1097823e4f7d41399efda8309a5ecc6e2c02bd80adee4bac WHIRLPOOL be4d1fa32c814ecbfc2dc149931104c9c9d93b3e9491c4de5630ae737cc5f01f6b389e9a7a435b4423e9fc714aaa526782624b2739d8f80304618f05d1de1936
 DIST gentoo-0.20.1.tar.gz 1552672 SHA256 3f7a57681a2bade54a0096bdcaad1ff776bca51486fd42cb7518d33e29b3835f SHA512 30a7adf6c8987cb9b158545cc11f8b87691f4b85056d1b2653143055b53232a9a6bc2995b7f0d9c1f2b79350a03d57470c6b0656ab07ed72bcda29a7a86ca507 WHIRLPOOL a531a7b2c2d005be4157c3a7c0756b1dbb09e9a7416752a7156d35ffb03d5bb6a6e282daa5a456d078a6d4b9430945090288c9b4d4d4f06677f89a9df085131e
 DIST gentoo-0.20.3.tar.gz 1554789 SHA256 0d3f8cb103916ae3e86e5f01379634ab21568a312f77ba3f90cd3ce876170fb0 SHA512 d237a0ecb9d4efd8506518c3fa6b388509dcf890d742d539978f1e724e34efa71e77b2e0e117494832fe2c98052401540abf98311a7d30e2f573f07d5f41c1ba WHIRLPOOL 62daadb711b2506a0c200389a1ddc6ebc6e1e93b7880d1ef00f5c3995a00bb5e9509ccacc02c1ef0e232a2fb293566bedf45688123adb690bcd406eb539ca854
+DIST gentoo-0.20.4.tar.gz 1559764 SHA256 2993ceb7509c45db10e7f3d515389ede978b24d6cb9932a59588fd7c9923bc80 SHA512 841726987cbbd81a48dac9195ae41557c4af54fba0bad99c1346a52b6cc25129b245b431ea8b42b8e47d30ee783928857fc772acf6228809bdb86b7eb74eda31 WHIRLPOOL aaff175847753c2f712e044278ad6fd2e092e62ca7cdcfc41751adeaf31e8e9873ad469e8e9df2008ff857673ffe6db0d7cce6e4192d2679a392226801f44535
--- a/app-misc/gentoo/gentoo-0.20.3.ebuild
+++ b/app-misc/gentoo/gentoo-0.20.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.20.3.ebuild,v 1.1 2013/08/24 16:48:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.20.3.ebuild,v 1.2 2013/11/03 17:03:42 jer Exp $

 EAPI=5
 inherit autotools eutils
@ -35,7 +35,7 @@ src_prepare() {
 		-e 's^icons/gnome/16x16/mimetypes^gentoo/icons^' \
 		gentoorc.in || die
 	sed -i \
-		-e '/GTK_DISABLE_DEPRECATED/ d' \
+		-e '/GTK_DISABLE_DEPRECATED/d' \
 		-e '/^GENTOO_CFLAGS=/s|".*"|"${CFLAGS}"|g' \
 		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
 		configure.in || die #357343
--- a/app-misc/gentoo/gentoo-0.20.4.ebuild
+++ b/app-misc/gentoo/gentoo-0.20.4.ebuild
@ -0,0 +1,62 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.20.4.ebuild,v 1.1 2013/11/03 17:03:42 jer Exp $
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="A modern GTK+ based filemanager for any WM"
+HOMEPAGE="http://www.obsession.se/gentoo/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="nls"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/pango
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+DOCS=(
+	AUTHORS BUGS CONFIG-CHANGES CREDITS NEWS README TODO docs/{FAQ,menus.txt}
+)
+
+src_prepare() {
+	sed -i \
+		-e 's^icons/gnome/16x16/mimetypes^gentoo/icons^' \
+		gentoorc.in || die
+	sed -i \
+		-e '/GTK_DISABLE_DEPRECATED/d' \
+		-e '/^GENTOO_CFLAGS=/s|".*"|"${CFLAGS}"|g' \
+		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
+		configure.ac || die #357343
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/gentoo \
+		$(use_enable nls)
+}
+
+src_install() {
+	default
+
+	dohtml -r docs/{images,config,*.{html,css}}
+	newman docs/gentoo.1x gentoo.1
+	docinto scratch
+	dodoc docs/scratch/*
+
+	make_desktop_entry ${PN} Gentoo \
+		/usr/share/${PN}/icons/${PN}.png \
+		"System;FileTools;FileManager"
+}
--- a/app-misc/gourmet/files/desktop-entry.patch
+++ b/app-misc/gourmet/files/desktop-entry.patch
@ -0,0 +1,10 @@
+--- gourmet.desktop.in
+++ gourmet.desktop.in
+@@ -4,6 +4,6 @@ _Comment=Organize recipes, create shopping lists, calculate nutritional informat
+ Exec=gourmet
+ Terminal=false
+ Type=Application
+-Categories=GNOME;Application;Utility;
+Categories=GNOME;Utility;
+ StartupNotify=true
+ Icon=gourmet
--- a/app-misc/gourmet/files/no-docs.patch
+++ b/app-misc/gourmet/files/no-docs.patch
@ -0,0 +1,10 @@
+--- setup.py	2013-03-16 15:26:19.760162984 -0400
+++ setup.py	2013-03-16 15:26:26.966497095 -0400
+@@ -119,7 +119,6 @@
+ 
+     files.extend(data_files)
+     files.extend([(os.path.join(base,'ui'), glob.glob(os.path.join('ui','*.ui')))])
+-    files.extend([(os.path.join('share','doc','gourmet'), ['FAQ', 'LICENSE'])])
+     #print 'DATA FILES:',files
+     return files
+ 
--- a/app-misc/gourmet/files/nutritional-db-fix.patch
+++ b/app-misc/gourmet/files/nutritional-db-fix.patch
@ -0,0 +1,29 @@
+--- gourmet/plugins/nutritional_information/data_plugin.py	2013-08-28 19:13:38.000000000 -0400
+++ gourmet/plugins/nutritional_information/data_plugin.py	2013-10-30 23:37:51.358616037 -0400
+@@ -20,7 +20,7 @@
+             pass
+         self.db._setup_object_for_table(self.db.usda_weights_table, UsdaWeight)
+     
+-    def setup_nutrition_conversions_table (self):
+    def setup_nutritionconversions_table (self):
+         self.db.nutritionconversions_table = Table('nutritionconversions',self.db.metadata,
+                                                 Column('id',Integer(),primary_key=True),
+                                                 Column('ingkey',String(length=255),**{}),
+@@ -58,7 +58,7 @@
+         
+         self.setup_usda_weights_table()
+         self.setup_nutritionaliases_table()
+-        self.setup_nutrition_conversions_table()
+        self.setup_nutritionconversions_table()
+         self.db.do_add_nutrition = self.do_add_nutrition
+ 
+     def update_version (self, gourmet_stored, plugin_stored, gourmet_current, plugin_current):
+@@ -68,7 +68,7 @@
+             print 'RECREATE USDA WEIGHTS TABLE'
+             self.db.alter_table('usda_weights',self.setup_usda_weights_table,{},
+                              [name for lname,name,typ in parser_data.WEIGHT_FIELDS])
+-            self.db.alter_table('nutritionconversions',self.setup_nutrition_conversions_table,{},
+            self.db.alter_table('nutritionconversions',self.setup_nutritionconversions_table,{},
+                              ['ingkey','unit','factor'])
+         if plugin_stored == '1':
+             # Add choline
--- a/app-misc/gourmet/gourmet-0.16.1-r1.ebuild
+++ b/app-misc/gourmet/gourmet-0.16.1-r1.ebuild
@ -0,0 +1,61 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gourmet/gourmet-0.16.1-r1.ebuild,v 1.1 2013/11/05 03:41:51 nixphoeni Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="sqlite"
+# Parallel builds fail when building translations
+DISTUTILS_NO_PARALLEL_BUILD=1
+
+inherit distutils-r1
+
+DESCRIPTION="Recipe Organizer and Shopping List Generator for Gnome"
+HOMEPAGE="http://thinkle.github.com/gourmet/"
+SRC_URI="https://github.com/thinkle/gourmet/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome-print pdf rtf spell web"
+
+RDEPEND=">dev-python/pygtk-2.3.96
+	dev-python/sqlalchemy
+	!=dev-python/sqlalchemy-0.6.4
+	virtual/python-imaging
+	dev-db/metakit[python]
+	spell? ( dev-python/gtkspell-python )
+	pdf? ( dev-python/reportlab dev-python/python-poppler )
+	rtf? ( dev-python/pyrtf )
+	gnome-print? ( dev-python/libgnomeprint-python
+	               dev-python/python-poppler )
+	web? ( dev-python/beautifulsoup )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	>dev-python/python-distutils-extra-2.20"
+
+PATCHES=( ${FILESDIR}/no-docs.patch \
+	${FILESDIR}/nutritional-db-fix.patch \
+	${FILESDIR}/desktop-entry.patch)
+# distutils gets a bunch of default docs
+DOCS=( ChangeLog CODING FAQ TESTS TODO )
+
+python_prepare_all() {
+	# Modify these lines before copying them out
+	sed -i "s:base_dir = '..':base_dir = '/usr/share':" gourmet/settings.py || die
+	sed -i 's:data_dir = os.path.join(base_dir, "gourmet", "data"):data_dir = os.path.join(base_dir, "gourmet"):' gourmet/settings.py || die
+	sed -i 's:\(icon_base = os.path.join(data_dir,\) "icons",:\1 "gourmet",:' gourmet/settings.py || die
+	sed -i 's:\(locale_base = os.path.join(base_dir, "gourmet",\) "build",:\1:' gourmet/settings.py || die
+	sed -i 's:\(plugin_base = os.path.join(base_dir,\) "gourmet", "build", "share",:\1:' gourmet/settings.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_prepare() {
+	distutils-r1_python_prepare
+	sed -i "s:\(lib_dir = \)'../gourmet':\1'$(python_get_sitedir)':" gourmet/settings.py || die
+}
+
+src_install() {
+	distutils-r1_src_install
+	doman gourmet.1
+}
--- a/app-misc/gourmet/metadata.xml
+++ b/app-misc/gourmet/metadata.xml
@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+		<email>nixphoeni@gentoo.org</email>
 	</maintainer>
 	<longdescription>
 		Gourmet Recipe Manager is an application to store, organize
@ -26,5 +26,7 @@
 		<flag name='rtf'>Enable export to RTF</flag>
 		<flag name='gnome-print'>Enable pretty Python printing with
 			gnome-print</flag>
+		<flag name='web'>Enable the web import plugin</flag>
+		<flag name='spell'>Enable spell checking support</flag>
 	</use>
 </pkgmetadata>
--- a/app-misc/recoll/metadata.xml
+++ b/app-misc/recoll/metadata.xml
@ -2,8 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer>
-	<email>hwoarang@gentoo.org</email>
-	<name>Markos Chandras</name>
+	<email>maintainer-needed@gentoo.org</email>
 </maintainer>
 <use>
 	<flag name='inotify'>Use the Linux Kernel notification subsystem for monitoring file alterations in realtime</flag>
--- a/app-mobilephone/obexftp/files/obexftp-0.23-fix-ruby19.patch
+++ b/app-mobilephone/obexftp/files/obexftp-0.23-fix-ruby19.patch
@ -0,0 +1,37 @@
+Replace functions removed with ruby 1.9
+See also http://dev.zuckschwerdt.org/openobex/ticket/49
+
+
+diff --git a/swig/charmap.i b/swig/charmap.i
+index e1f1fc1..b8e17de 100644
+--- a/swig/charmap.i
+++ b/swig/charmap.i
+@@ -89,8 +89,8 @@
+ 	$2 = PyString_Size($input);
+ #elif defined SWIGRUBY
+ /* VALUE str = StringValue($input); // perhaps better? */
+-	$1 = STR2CSTR($input);
+-	$2 = (int) RSTRING($input)->len;
+	$1 = StringValuePtr($input);
+	$2 = (int) RSTRING_LEN($input);
+ #elif defined SWIGTCL
+ 	$1 = Tcl_GetStringFromObj($input,&$2);
+ #else
+diff --git a/swig/ruby/ruby_wrap.c b/swig/ruby/ruby_wrap.c
+index 57e40bf..31b1a9d 100644
+--- a/swig/ruby/ruby_wrap.c
+++ b/swig/ruby/ruby_wrap.c
+@@ -2579,8 +2579,8 @@ _wrap_Client_put_data(int argc, VALUE *argv, VALUE self) {
+     
+     
+     /* VALUE str = StringValue(argv[0]); // perhaps better? */
+-    arg2 = STR2CSTR(argv[0]);
+-    arg3 = (int) RSTRING(argv[0])->len;
+    arg2 = StringValuePtr(argv[0]);
+    arg3 = (int) RSTRING_LEN(argv[0]);
+     
+     
+     
+-- 
+1.8.4.2
+
--- a/app-mobilephone/obexftp/obexftp-0.23-r2.ebuild
+++ b/app-mobilephone/obexftp/obexftp-0.23-r2.ebuild
@ -0,0 +1,106 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.23-r2.ebuild,v 1.1 2013/11/05 00:15:54 mrueg Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+GENTOO_DEPEND_ON_PERL=no
+
+inherit distutils-r1 eutils perl-module flag-o-matic autotools
+
+DESCRIPTION="File transfer over OBEX for mobile phones"
+HOMEPAGE="http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp"
+SRC_URI="mirror://sourceforge/openobex/${P}.tar.bz2"
+SLOT="0"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="bluetooth debug perl python ruby tcl"
+
+RDEPEND="dev-libs/openobex
+	bluetooth? ( net-wireless/bluez )
+	perl? ( dev-lang/perl )
+	ruby? ( dev-lang/ruby:1.9 )
+	tcl? ( dev-lang/tcl )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fixruby.patch \
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-fix-ruby19.patch
+	# Python bindings are built/installed manually.
+	sed -e "/MAYBE_PYTHON_ = python/d" -i swig/Makefile.am || die "sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	if use debug ; then
+		strip-flags
+		append-flags "-g -DOBEXFTP_DEBUG=5"
+	fi
+
+	local MYRUBY
+	use ruby && MYRUBY="RUBY=/usr/bin/ruby19"
+
+	econf \
+		$(use_enable bluetooth) \
+		$(use_enable perl) \
+		$(use_enable python) \
+		$(use_enable tcl) \
+		$(use_enable ruby) \
+		${MYRUBY}
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		pushd swig/python/
+		distutils-r1_src_compile
+		popd
+	fi
+}
+
+src_install() {
+	# -j1 because "make -fMakefile.ruby install" fails
+	# upstream added -j1 to that command so it should be removed
+	# from here in the next version bump
+	emake -j1 DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	if use python; then
+		pushd swig/python/
+		distutils-r1_src_install
+		popd
+	fi
+
+	dodoc AUTHORS ChangeLog NEWS README* THANKS TODO
+	dohtml doc/*.html
+
+	# Install examples
+	insinto /usr/share/doc/${PF}/examples
+	doins examples/*.c
+	use perl && doins examples/*.pl
+	use python && doins examples/*.py
+	use ruby && doins examples/*.rb
+	use tcl && doins examples/*.tcl
+
+	if use perl ; then
+		perl_delete_localpod
+		perl_delete_packlist
+	fi
+}
+
+pkg_postinst() {
+	use perl && perl-module_pkg_postinst
+	use python && distutils-r1_pkg_postinst
+}
+
+pkg_postrm() {
+	use perl && perl-module_pkg_postrm
+	use python && distutils-r1_pkg_postrm
+}
--- a/app-office/geierlein/Manifest
+++ b/app-office/geierlein/Manifest
@ -2,3 +2,4 @@ DIST geierlein-0.4.1.tar.gz 805387 SHA256 8f036ce307d4693827b3ccfc3634da37f7841b
 DIST geierlein-0.4.2.tar.gz 804902 SHA256 3df2b8c9f708cfc6e2d490c22c283a99b12add86fe529ab826a896f66bd5fc9b SHA512 963d42e3a5344fc1681adeea6b92fed8d623b8c80d2c317f0eecddcd1edcbfe3b94bb7f1f62e2f97039a52e69bb8b3a9cfdd370682d1bc22a9ea8889debaae21 WHIRLPOOL b180ff0999fb7a9faa04e0a31772541d8d4dd397542b173e7ea0b512f2e37dc7425f93a84ad7dc6261e7a415cfe845328950a5aa888a51e83014005acd40cec1
 DIST geierlein-0.5.1.tar.gz 817701 SHA256 2811e034ca1d2f9c224c0505baec87802fce65cb0baa75f4fc82d2941762a744 SHA512 2ebc6ef9df246cc9578eda5f2d49f95ebd7a557f84465a8f9ce6955c606e5de32ee6f24eb0be85ab543d2cbdebeba7dc9975f049ca48d4006e945ba4dd6a4f33 WHIRLPOOL 9f02fcdba320d52fc9f286d836d6ec8b9786a727895d9d93286dd9fa3c6cbc23fcb5e5db8881230370c80d4ef474bf61630fff4f51f3cc65bd27d4fd01713fed
 DIST geierlein-0.6.0.tar.gz 994928 SHA256 c795111bea6e472978fee2718908af889e6d76d0eec233ba0dd5ff342377812d SHA512 ed58366394d5f19fdf1202718c9d1ff44fd3ce87179fc3127f5595d47086fae10ddaefb69afb5aeea5f7adccb6a336d4ffb4a8a69ae8172572d593a54e81fd25 WHIRLPOOL 7b324db744b54b784db4470cd39179dc965228148aa121cd38da9a6cd8f67003ba990e88e729dc344842706b4b88ada5c516a40750dc629659d09abe0f8e3d86
+DIST geierlein-0.6.1.tar.gz 994969 SHA256 f7f66b3c4fba41b071cc5c7339ec76854d12e515f45be185f83a84e2ab015474 SHA512 6810baed24999c069922488fd2efa6b0095174621088f48245927b8a3a89dd6a683db76016649ba143e3cc0cff29ff3699c3afa12a00fce067ddcab61197bfe3 WHIRLPOOL 3b1358f2c71bf337179a0dee4259e3358d963be832ec9d8e4e4d328530cf729478543a990351a1b98eb58e3c885c4d3c46515ce86cdd843c0af340109613be7c
--- a/app-office/geierlein/geierlein-0.6.1.ebuild
+++ b/app-office/geierlein/geierlein-0.6.1.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/geierlein/geierlein-0.6.1.ebuild,v 1.1 2013/11/03 22:02:06 hanno Exp $
+
+EAPI=5
+
+DESCRIPTION="Submit tax forms (Umsatzsteuervoranmeldung) to the german digital tax project ELSTER."
+HOMEPAGE="http://stesie.github.com/geierlein/"
+SRC_URI="https://github.com/stesie/geierlein/archive/V${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RDEPEND="|| ( www-client/firefox www-client/firefox-bin )"
+DEPEND=""
+
+# needs nodejs and a couple of modules we don't have packaged
+RESTRICT="test"
+
+src_compile() {
+	emake prefix=/usr
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		prefix=/usr \
+		install || die
+	dodoc README.md
+}
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@ -1,24 +1,24 @@
-DIST amd64-debug-libreoffice-base-4.0.4.2.tar.xz 834170168 SHA256 be688e57f6d90e0a1481e6172ee718ea2ea18235534e17bfa8aa3eb938a76f70 SHA512 cc42f32aa0cb02b43bc3e07ef6543e033ca737b7acdf87624ef61facc72682a4cd37610d9ade5357f570129628eef7083a479fcd7e5cb74aff32c7d7f007278b WHIRLPOOL 10c385ccfd6e510df8b45f3ce4eb0aa075f125f388946eefa2c5522a8498b9d3effbe3f3a5f49df539226b818fdeefab9db87f9f43ed6f9fee1c203b835a3f23
 DIST amd64-debug-libreoffice-base-4.1.2.3.tar.xz 958196788 SHA256 8a1d3cd528aed0522bd1a582270d97d21b64352134af0f9b87d8c01ae1eeba9a SHA512 50bbd6dffc25ad6197cf9ef1acf5f198cb8c75f8ba5b81032429c52b7a2565ae1eb0c60faf30318ede00fe5e3ac03b39632f81304e8bcfac76f99059d5a39067 WHIRLPOOL 95c0da2db2df6ab81f807c2d456da01f5602bd6057fa2f71407b3eae44a246c0e91963312efad06f84d36bb2d30418e4fd693a23e385e4bf818268cbbdd3d3bb
-DIST amd64-debug-libreoffice-base-java-4.0.4.2.tar.xz 838854628 SHA256 1608f2d7841707c8fc787121407d86eee271f70b0eec9234cac275640f74cb33 SHA512 755b3acdbf49b0735aea16a7750001929fe45ce757522426003b0fea2a6e6525f539c5450d69974f5dc315c235bc73eaa2ec997b7b99d31a14f15936175ec2fe WHIRLPOOL 457f0d1c96ca7459a89e213ca9fa4530a9140eb1de1d2872e360588f423ad8ce9caeb758ff22e1795976c32b53fa163fa76b3a66db06ff911949b164d718981d
+DIST amd64-debug-libreoffice-base-4.1.3.2.tar.xz 955407260 SHA256 3e72dc4686f25915f787fd66010775c20dfbdb888fdbb6fbbdb12bdda43cfd3a SHA512 190a0692cda1414d3c903e307d71c7f87528657419d0cc10fa8e3ff18f7e183d86db297f32798f0aa0682eff081aad1b163c7c35e69a502868603644255b4111 WHIRLPOOL f9413d4d1a9cc1bb6f97514c432ab6bfc7a96f53819e8f0d1375b10a1ea897f5f42fc048c4a7d6297d1e3b17176ed21c2601e8a72ff436bf7bf8fde63bb0f4c5
 DIST amd64-debug-libreoffice-base-java-4.1.2.3.tar.xz 963983160 SHA256 ae51aa73737f1e9eb40dc51f3b27a96eeff94fa04f5a02894d1db613d6b5e31b SHA512 686fb5da30963c191d6b37eca1b4f501128737cbc62250a1bde776c45678c99efcdf296773d979e0fdc49109f7efaf2480c23da6fd99838c9021fa04e37f348f WHIRLPOOL 6360b03344ee9dec343cbaffa06f712563eb9121df88af03a6642fdd60a6d8d55ee3a757dda153b1c010e535aa97b10d56e5edff3f1bb1fe44bdfcf5efbba905
-DIST amd64-debug-libreoffice-gnome-4.0.4.2.tar.xz 836135384 SHA256 a610f8d75b36177b44cd02a3cf87a1f0adfd7da3ecb78ba1c97ed72194212b27 SHA512 df136a30fb5a8cedf98764d7a90c893ce3becf7e33efaedfa6dca91cd81142a2bb395225d7acf3e0f4a1ff46d1bc1650b488cd1f18cfca516676a0776499c9aa WHIRLPOOL e5738ec60ec174ec8b6e367c724b72e3549567df3904427a7046ac4d5359af79f146d0d4d93cc5e4839c362821d5be646b81328aff763bf245452bad03d7b808
+DIST amd64-debug-libreoffice-base-java-4.1.3.2.tar.xz 961176396 SHA256 7b5cc10cab324974c59fa488711ca6d6ecd1589c5752e850d4edd2a9d972781b SHA512 8c14ad133b5bf4b3c161dc8a9533eaa0d27173282f233ae0fce2204f2b8ad9901c24aa9a05e36c0aa4cb9610d7df49a04c5f757c2af897aca37db211af6fdddb WHIRLPOOL c2da48208cccce1f07fbf0945297a6cabd9a4ca470e741e8ae713c192296d5693ea44ebf55e9d61b662e3957bdd651343ff102c897702a404547f6235c858384
 DIST amd64-debug-libreoffice-gnome-4.1.2.3.tar.xz 960147772 SHA256 411a0a1e4d3ddfa97cc36cd062d68b349bb7c008e03535f1fa83f2cec395a96e SHA512 510d2a9b067421ef7a1f8ae6b9eaf8584d8ab10665e279f73f3c99b7950de2a1c4b987add9317ed64581cbd3adb55245f2bfd47726403a435b5a0fc523427b99 WHIRLPOOL 4b1f83814ff95762089efc97a3fbe0b94c69f469148437668775c22bae7f843ed93cedbdf8eb19fe33facd10d33b06623fc50d0e086c44cf6cef7ce94dd9a3ac
-DIST amd64-debug-libreoffice-gnome-java-4.0.4.2.tar.xz 840819452 SHA256 6d22a7e0a50a16609969bf2bc7345a50326b0429990b3b4d1a9ab906935ac47a SHA512 4ada558bbc4f4411988658ae8b857ef265a6ccb73caa64e15807bd9dcb58b561b68109b834897fd6b137a5a2727244a3d944fc6c7883eb483ec30f585637800a WHIRLPOOL 786633cf13b48130bbcbce44d0843391dea21949339044b4d99db690f199292f6214b5301a731d061b1186a9c33b38f3b9b7cf27caa758543e75bbd1d2e1b554
+DIST amd64-debug-libreoffice-gnome-4.1.3.2.tar.xz 957353656 SHA256 1d6272d65d2a226ddab4f8324eb1638fabcd4a2e0982f155bedd4ce227b0a330 SHA512 e0b75fb9b60e095b167cbe0489e81007f50da2ecb6cdb115ccb7c92352c3ce22434d6ab9fee134e9685334bb5086de9538d697b64b906d530dd8e934d7939e8e WHIRLPOOL 79b08db479780d757034050d1c16b8a586ab589039c3c52b83a055d04da887b69fb2ee06fb0e5b97b3d42bed99a5e4f8b72d9c44fb4ea337d8c4ee70b02c1c30
 DIST amd64-debug-libreoffice-gnome-java-4.1.2.3.tar.xz 965971704 SHA256 c3a5a3c7719877c9aff53e4cb35ea9d719687fd7a08f5d7973035050ee5f49b3 SHA512 10bb93e3e19d35595fe8ccf54b709c94f0cdab98a168bfd99b5cf4c4ced8e2d816697ac10e4e7f7f6fef6c02513c179ee57342d1f300b040e562e9bb0a8dc219 WHIRLPOOL c2cd2d696497f780f40cf9035a454774c6084a83b9bf7dd313d840b1cc66b86cf2fe639e41e507b43d6b409a8cfd736bb907e6bef66519cca6b64983d1733487
-DIST amd64-debug-libreoffice-kde-4.0.4.2.tar.xz 835447712 SHA256 044913d9ea73a5458ec6f1b1300747d7b869a1e37ce1177516cac570327d8962 SHA512 f715285e267ff11f430a568ac3528465759dc92098e05529f2ee2e6c4ef542d9a9e9290ae86d33e0790b2a6fff35712d6226d3f848f805cb16a142f6476cd636 WHIRLPOOL 8ce4f9d584a0c535ae8c7d2645b3bb65cd024d0d771a8e6b05eb896e8068a993c213e2bca7cf5f9fdb62c6d99b3478b6793d233ec9b0ecdaf4e07c55244687f0
+DIST amd64-debug-libreoffice-gnome-java-4.1.3.2.tar.xz 963108692 SHA256 9014bdfdef73b44369c0ed6fde624ec12916f0621818326076954ab9d996c001 SHA512 21511038e08595216777b64a026f3b893e6d9c30f6cf749f2bdc2ee5055b501af242a49474483081a33b3a80687149ae6f96ca1a7e6f5eafe375f34c0a61f4b5 WHIRLPOOL f422421a1204e5cab371a6c88dd71258f8fca297fe1c5c811f603a6b2a9f53fe07ee99d620a6ec6eebfa6ae2166e2f4b3d34ffbb08a89e4aec563c9da66a710c
 DIST amd64-debug-libreoffice-kde-4.1.2.3.tar.xz 959761312 SHA256 d122dc7f67cc52dc5481b1ff65d04b4f77bf6a6a46b8006f4d409355ed385710 SHA512 3fbcea6f97cdca65e915060d87ad50d1571d8e0860d26a022e40d9e8e95a473b2e34351360de5470bb58e83c61f819013485040e93ce982e0e11ba1ff84b75b6 WHIRLPOOL af22c04b0373dd3fdfc1c7105100717c8c9f2827c53326cc4b80dc1c6a4ec1f6b7293437395c623c71ce1a2bab4e31653ae524093f66fb6eb6a01bd3321f7835
-DIST amd64-debug-libreoffice-kde-java-4.0.4.2.tar.xz 840102712 SHA256 4bd3fa856e488516a1e8a47cfbf0a958115892628d6c3b85b0645fb03f2fb05a SHA512 4c86b4fb83a30b0234f1f014f609b3f336880cb6280ac5a7f73f5fcb1100c028032114bde037e627f0055aff4918046659ad5771b6f0b896e7bf52771215f09a WHIRLPOOL cd3a845f04b29fa4dc7c2e87fd70d7843e70b777df2646f6a17746792d89bee8b1ef1dd1afa55d5cbd82e0528e1c32c6be788f82dc57bf5f7751091387be5926
+DIST amd64-debug-libreoffice-kde-4.1.3.2.tar.xz 956948200 SHA256 cca06186cd2c3a666a869585eb04e644cb2d064f2e1142c2f60726f3a9e6952a SHA512 14117a0bf0ffef7c78292f7b24ef6b887f5d96b227e860a57f4c4f46b6e9552c080db47379577076a148cd130721f8dfea3e970fdc2c867f2889fb1d369fe6f0 WHIRLPOOL 607a04bc92693ccf54859c714079cbc31c59224889832f34a582cc02c0b8eb0ed943656f934e315c7d17094f1a1d69f26d0faa2a43553fcb656fbc737f823747
 DIST amd64-debug-libreoffice-kde-java-4.1.2.3.tar.xz 965557164 SHA256 146509c8738f3a256505016b1ac8951733b488a789f86d5aa8a2f864aca9295c SHA512 4988537aead15952f7b75ec6ef6dc63a10d39e88c597d68c8ba071bd56195b6207534e402c1837b7e590a161d580b66d475385fa9a0f25b5734a3c35865a712d WHIRLPOOL da3e5e5ee00f4b1c8eeb2c813d2e0613ed8317bf4de1b193f9032ad348bde1a62e33dbcdaef10a160e4cc9391df7aadbf7981ee54272ef9c132c0c1d42b0529e
-DIST x86-debug-libreoffice-base-4.0.4.2.tar.xz 782822812 SHA256 8d738a4dd8ddaf902893eacb0206b49e3ed1c664f705dad834969e4636120de7 SHA512 dfba4e2904281157e622e43343fdbe81421d7dc8995c5c889a259cdb5c864d7691e48fb33d3b584f549a882cb2cf1fd7dba83e27db943a5e873f53d79677333d WHIRLPOOL c1814ba6b03f2254b83cac7379d0cdd970c6f32a305e22e2cfffe4a64a052500dcef8fd911f8b5f025f0de892fb843a1ad131aabe714738db321473dffa11ccd
+DIST amd64-debug-libreoffice-kde-java-4.1.3.2.tar.xz 962776644 SHA256 6b60c2f7ffeecf060db17dea04f702322f91d2c3500a821bff30608fcba2c71a SHA512 c83cf9c083e6e27eb0453d1ab299da6df59278a5c72a5ef0bac8d93ffc04690615ffb56ce7dda30738373fc5508a21eaf752a8fa755d51eb3940c024730cf087 WHIRLPOOL 72d78b60966b50b49840e47ac594125a32fa3be44932bd4a1b02db0608b3b94cce7570d0bec43f89b82a7133f94ded8764e42eeb4aec6c693aea48a25239fa0b
 DIST x86-debug-libreoffice-base-4.1.2.3.tar.xz 891947864 SHA256 bd6f0c14cda4d37339a451596407ce3e65718a6b0cba45e48cae761d97284a5d SHA512 9905c84e14c41bb1a8e6d54d8ec5a3c1ad9aa0d57ebd11c8c69e401246693121b0ced85cceb263bedfcf067271b619d5c2e971eba9121774fae1968cfba6f095 WHIRLPOOL 7564e261c6e5ece378bac2b211d4706bb3b2e6a696c84559e022869c3d5e3742727abce8601e6506e066bafd03f2914cc9d41c5ebdecb12e3a5a92157ee18c46
-DIST x86-debug-libreoffice-base-java-4.0.4.2.tar.xz 787096064 SHA256 04934932f65735398640cf3a4ad1b11ab33afa3769a0d038ff00727ef6802912 SHA512 163fd7df816c9dfb3cb49d8aef01076123adb913489d8ca632107d658b94b04df5c18b18dd3cc9a95353d797b26f534ab06afbbdc965e1a0aefbd21cc22c8058 WHIRLPOOL bc7f48a98aba797a5d7043befa764c598e8a4b54a6f49df63ea43ccba6ed91cd1380f79eaa71fd3126c708ff83fb56789d04e83587a6acc43fdce5104b6b0cbc
+DIST x86-debug-libreoffice-base-4.1.3.2.tar.xz 889357300 SHA256 980593b221566b7ba173827e992e80c57fccaf29617abfba2a2efd3d57a91dfa SHA512 cbca94ee2229c727ced6366be1f13adef0a705509bafb2bdcbfa6bfd5e48183b32b6da9ea6103ad53e9577d8ce037edf104bf7e22b512a80454a7af825bd1392 WHIRLPOOL a73591126be777acc90cc1d18e28b0344475560ab50d975a2bacd7c89d4fef50e21419784c4c82edff0cf0bb7c001dd75db8279608c940ce4588651987b885fb
 DIST x86-debug-libreoffice-base-java-4.1.2.3.tar.xz 897133180 SHA256 b0f0c22ef6541a02fdcd1d0f289a980b3e599ffa9d2b1f40278b23727510fc36 SHA512 de817d5c967e9b3ef217d51551e4d3cf8a67cf509ec0c12ee0338f7170cdfd158b6fabe666f508991d68ae30aa0d2da16619ebc3780464ae130b42ccfce95662 WHIRLPOOL 5859ac7394ed03fd7d618ffb3bc5f5217c6a9f481a2c44ebc4d409c22a427814fe9c788dba9ff8e6f10222b06a706a31012fd8c4d3d2a30ac5aa8085c45bb878
-DIST x86-debug-libreoffice-gnome-4.0.4.2.tar.xz 784681768 SHA256 58ac1eba1d7d15c254c212e176050d9d11cb6427289d7efca6cc4bf234f5f040 SHA512 5ad80acf841703c256029408ca276dcf9d623f2c6f0606898ffbf982eb299257dc6a5a57838d5356f3fc86094a90dd79194a80a509db6b71569a9fab3f3203e0 WHIRLPOOL 0ff569f6458154a3be5d6c3e2dd589c9b84febf393ddfa409c72c86932c2352b918c83d004daf084549150d7b6df9214ea863861700acefe10c29c0ab33fe379
+DIST x86-debug-libreoffice-base-java-4.1.3.2.tar.xz 894436680 SHA256 091ffcd893ab380c05e61a43606a371db1c8bc895636c8c01ef29780d2d34e98 SHA512 423b67459527586142c32b70e1be133071d6417a4b71335d176c41fc4acd13d0fdee0c8b097acc759d40140f98392ad80486c398463cdd303cbd40eaaf18b6fd WHIRLPOOL 0bd25692c86e8fe11425540654163bbaed8c985f20f2fad5c9e525aae2ec1abf9002f76b33de66f13c9a6e5836517fd50582a06b614b4236a3a6a57c0f171783
 DIST x86-debug-libreoffice-gnome-4.1.2.3.tar.xz 893806224 SHA256 d7654df90f34555954718371eb166b07ab303963c23453ac7f55dc6fd88cd3ce SHA512 5d23bee6e6d94ab67600659ba05aa8bd577ce31036df1d9d9c655edda6f58acdc799594878981ed8d2d54617c85cc5deb58c9c88897c4056dfe0a6494a669921 WHIRLPOOL 4a55f4c5669607bc4c749560144fb0d77fd3e6d35e74d5618371331e23e4657e70e872e4092cad06f9db705dc325c2e7a3eb02dce1f363d85d8835af455fa558
-DIST x86-debug-libreoffice-gnome-java-4.0.4.2.tar.xz 788944208 SHA256 40c7efdfbf6170b9ff13cfa799457a42bbd7c263ea67f5cd043d19a27933cd2f SHA512 63b713d773443f28ae26e1bb704a21ec50138aaf323b113b5377faa91f8b197f6e315eb3fe94cceaffdd181c13fd9d3f621e61bf71bd9d359fc3387f2ffd9793 WHIRLPOOL 3f3c32b09f8bc8362776625d20622cc043282a585def759b81121e8ad57ef0cdc2f837f1d3b610f24f1b9c0a005bdc73a2c4962a2de255fa7f17c29b150c03d9
+DIST x86-debug-libreoffice-gnome-4.1.3.2.tar.xz 891220228 SHA256 617f520468f82d9e5d56dd626a7ac17d63f2694d5d83820bce54a955bba9b7dd SHA512 dc8edf02d5f85365cd2e7968fdc38d95b359636bc846e72963250db0bc192d9caa91cb42aa49e1bcd93b8519d5158656013a72e98dad55a15c3af9cdf2113767 WHIRLPOOL c587165c9c3e0b0cca855eed3d9f54b4b5de64f8638145c153d56f9b8da6e3cf5bd9dae1c728b6178b302f8590cbe5047d5e808111cdc3ffd6cb15cfc0f97eda
 DIST x86-debug-libreoffice-gnome-java-4.1.2.3.tar.xz 898970136 SHA256 08651668092a6216b2288d4b1d742e7049daf48eed5621c05b84351d13b395ae SHA512 23636dc6ac4ec6275501f9f78344fcae180cd2f6dc7fae7a942de698fe230c94a9d55fe31f290136bb1b9735dc6def11eec77fad17f0ae024723ea0c5a429f85 WHIRLPOOL bf04dc71cf650ccdc19f3934e89a089182f4a75c97a1db815735602971df41c1f3b91723a7991110ae90ac680649484de2100d1fbe0811555f9ad72c80ef021b
-DIST x86-debug-libreoffice-kde-4.0.4.2.tar.xz 784067860 SHA256 809b67a5dfa880e94595e9f9794be406b71617de23e5f628c4da02bf9d97e090 SHA512 a1e9b1937de21e51a9540512a9d00e982a13444e0f7ae00586ab06c8deb1cec4f2ca5b938d86c6c224d58a8b3b752984a91ec4d62fea1766cd810516b22da014 WHIRLPOOL ac3e09abcd7f81bc5bf24d85c902e616508f495f2df3861224c0a97176076a8b099758a80b22554886bbd0ed20aee6b3145fcf1e00dea6071ab2a6b3309b6700
+DIST x86-debug-libreoffice-gnome-java-4.1.3.2.tar.xz 896237344 SHA256 d5d0b915d40d19aa292d0042f1af9f89763f36ef7716b9d11874b7d6ea533be4 SHA512 48f80c93b8ec3cb82710447fa8a7599f039a67174a81b18640fed7abe75deb8440697968ecbadb9307eb6eba26760fa91f56a3d2513e9283fcfbff82edd1bf0c WHIRLPOOL 667346e55a28215ba23117d4484984e9be137b3897e259a10c21d6cc2c8e3993cd5cc3e98c0c43cf9a9e9503266144b577748fa58bd2212c32eecd3f0dd296d4
 DIST x86-debug-libreoffice-kde-4.1.2.3.tar.xz 893383540 SHA256 e81b0679f256c4ce643fc7e5193939834253f6aad9e5764c7649bafbb7222ee5 SHA512 c45cf60817cd49c16a93863e42608c818639f23531593144392488cd03dd7ad6bef3dd3d5b576c1aefb6e61b49efcf12312d6154751babf21a936fe4066bd7fe WHIRLPOOL 320e8b8137f1c068f4e9281627a9907918d5a774aa6f7a19d9bb04d25429fd322eedcf3f6f153ceb2a284ef04985af5116faa2bb12779e9a31c1a5e659f69320
-DIST x86-debug-libreoffice-kde-java-4.0.4.2.tar.xz 788317636 SHA256 9a1f7458597ff559263dada46b5d8e22c4df06f816e1916a46a2f7d011bc343a SHA512 2e448143d3f20388473041057255c1dbcb70b0e30cb33f0c78c69d4f5e87d36565cd42c373ad1f241cea7dccc9a3d8230058b3cb38fda1e6218d4bb5a78448c0 WHIRLPOOL 7e3c462df097e0aa7d493233be7383ca04be9abdbc05d9c9f9236dabd6d535dad92875505e7645a5d2ad7ca87ca3d6a90a4510919e2e080652957f28a63bf980
+DIST x86-debug-libreoffice-kde-4.1.3.2.tar.xz 890747752 SHA256 ecf8b4e36734defd8d61cf95cdc8b553441b05d715e0af9bb350a745f5f2ed9e SHA512 c173fadcb63bcf38dfc36736ad2850018df6a2e8d6ff7de258a008f29ff2730bb3730fd4a59d8683098e613e718c3eee213777f8f8cfe7d67d3b4708a1fa2616 WHIRLPOOL 0a4aa6abf6bb2ee0de80fc50663cc00d8b5fa6a394eeed0a76e2410f31326b13898a017e3860aeaf356ceacdd5ece01554241ae944fff4ce8d2aaf53527ecb34
 DIST x86-debug-libreoffice-kde-java-4.1.2.3.tar.xz 898585060 SHA256 724912cf06d9bf11b22bdc40d11acb44c36370b6d557db6ff732cbce2a165a88 SHA512 1334e8958e1d67974735259815dfe00646abd54e4c6dd5144a46c68f8787270006fe4fdb504b465fa76435700ea40a7e96703c7644cad2b7bcf1b47335366684 WHIRLPOOL 94dbeb85cd717ed562c5523e5982068a31cd4ae0efd25e73fc9c2631366bc27380caf126fded524072835bc7652924814154255745d470be4dcb7ce16acf5a1c
+DIST x86-debug-libreoffice-kde-java-4.1.3.2.tar.xz 895837124 SHA256 d457b6a104dce62df4442fe191cdfcd3136384f12f97941ae06ff3019737979b SHA512 741b0124dcc8eaeb164550b2af2382de031a72c87c5cef2f4bf15de1e1fdebb2ca25158b934a27082d749682e809de58c66e2f8234df4bd7f7897b8020d8370c WHIRLPOOL 045e819dc290e028fc885075d1ee2d7eddeec5ba23fd066956d0598091ac3bc231f8e4372a0fed70867fd3f0d5344ada9a3ce598c38344406a6d9d5e4668494e
--- a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-4.1.3.2.ebuild
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-4.1.3.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin-debug/libreoffice-bin-debug-4.0.4.2.ebuild,v 1.3 2013/07/28 14:08:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin-debug/libreoffice-bin-debug-4.1.3.2.ebuild,v 1.1 2013/11/02 09:57:11 dilfridge Exp $

 EAPI=5

@ -46,7 +46,7 @@ SRC_URI="
 IUSE="gnome java kde"
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"

 RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]"

--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@ -1,24 +1,24 @@
-DIST amd64-bin-libreoffice-base-4.0.4.2.tar.xz 68176636 SHA256 53af3b3b7364e7af7cbb450624a39bec5135091634eb20d26cff11707bf16bb9 SHA512 ec6d5e3d3b52bd359f1f65c455a46948373699030b6368679145a5adf830c6fcce3fa7379780faeeee4c943738e43d1359940dfdee0753b3e5d6494de5c36c39 WHIRLPOOL f4208570557592d6d9add45297f0ab1a9c6907c2f57e767625c6d2ccc02687f2968259807fbcabd74eae36873c597eb086bc61474d27dea02ca682f84622d1ad
 DIST amd64-bin-libreoffice-base-4.1.2.3.tar.xz 83027128 SHA256 3943264b367a2bfc2cf13e9c591e63db8fe2ffe7642d6555d2e5ff56ddbdfa3d SHA512 18ce95d4abe481dfb117582f6530526c8e829d8265aff835881fc9d1adee7a79598947bab4a2e4dcf573fb7957a5621848f23e8835eaa126933931a5da63b678 WHIRLPOOL 9ce912b7c62fb04f5e49c1f547e15953cd41aa0311ca8ede55573ff3fa824955884b1754018a1570c05b3bf5e516020bad3c5348d73130320dc6b1de1b6ab719
-DIST amd64-bin-libreoffice-base-java-4.0.4.2.tar.xz 71695008 SHA256 be9c2c19c0381a97b52ec1cfdd7677565996f0989b2e063b8f3cf60b9fcd897c SHA512 91a3625e5307a8958c9c25588300105aa43b69efbf3882f84ad6f1d99a867fb715df65657c2da657841dfbea81059fd1755dc39a604dc9a137fc3082800a48ca WHIRLPOOL 6efd4aab715389c9807027f9588ee702d326c3ebb3952402ed85515b0ccb56b3082c1c4536f18b9de982bb323a30023ae100f424b0aedb646f3a25bdb76f0a36
+DIST amd64-bin-libreoffice-base-4.1.3.2.tar.xz 81407616 SHA256 efd38f01613caf69a19cf33d62bc65cc83fd03fcbb3c66190702f37566c2a9a8 SHA512 671a059d54e2a826eead5d372a53d52cad8ea6db8aad2a932183ba8e0cb5a65003661ebbd53fbd991d79c4c71e5d901e8a7eaa52c0f656f0a7590d95890cc718 WHIRLPOOL a2db29c506cbcdec21ac42c0cc90de0ed38e916592b9ec4830281d2d2492c22f42adbc4176b91128fc96421f9c45474e54b0bcccecb50b6d243d7eda003adf53
 DIST amd64-bin-libreoffice-base-java-4.1.2.3.tar.xz 86406900 SHA256 e7efa5a7459d88af0032d25f90b04bad4bf131307293777fd9d4df42bf387019 SHA512 fe0e32ca192959aa615ef1cfa1592ab09baf0347237fb37b4146e90366e7bf38327b0e47755e65090912a729b80d2333f44545713b779254522e7c2404ec7e05 WHIRLPOOL a7cc19baeeecc6eb241a882d390b466121eb7900d1c3c8311d26581c0c3e90e97a714637eeadb9be1a59a1423607cbc4ce272dde119c42640fd00547f33dfcba
-DIST amd64-bin-libreoffice-gnome-4.0.4.2.tar.xz 68305864 SHA256 e2242b660701cb9de3fd663f154ae705f3cecc70b0a785dccbc0482652b2c861 SHA512 106a447b5caafca6f76e3c30f282a95a51d98b8cfa57591c684f0d76a4c3eae96630845117d80195eec97815aec24dc35464454050ee83c5af5034871446566f WHIRLPOOL f13a8c6ccc84e15485f6b061dfca3b88e0ed293c514da0600a415b0f70fd9e76a99a9a8f57c68b04831579585e4fe034618c0282e2d2079d0ae8a2f22c3c0a02
+DIST amd64-bin-libreoffice-base-java-4.1.3.2.tar.xz 84729120 SHA256 9eb2d612f5740515491a5a1c2103d6822cd466f62783b389dd7df9a421ae251a SHA512 3b921d1e4a5ed5ffd9a7b6f52479ccef0d12343e1e5a106d5337af25c4d589751be8aaa9ec79ef01f8fe89b4079963814a856540abd2a7ad1abf1b2eeb150af4 WHIRLPOOL 90aa96144fb6703981ece80efe55f85e7985ded0c8242cf890f05d62f9c796b72f8e1d622b3fcac88c9c711715d4197f68d3b776cd2165b23ae26bcb3c7fd5e6
 DIST amd64-bin-libreoffice-gnome-4.1.2.3.tar.xz 83154304 SHA256 91213169a64ce9947aaad4e728d522c07ec559c931a705b76803119e93d9c115 SHA512 8d8dc0bdca3caedab2ac2ca4c8019d86f4bd3e9db122968981181cca63ed508ab902c9abf2fc42a6d7229902a878c4a99b36f11a1d73c7e831845ee034b3d89a WHIRLPOOL 389fa3aeb9c3690a8e08b9d75736eff123fef2eaf79cca2cc5719ed706003307421b30a9dc39fd61fc245e82fea030485e5fd9f095278d85f79ce5722e0d7ba2
-DIST amd64-bin-libreoffice-gnome-java-4.0.4.2.tar.xz 71818144 SHA256 a2243af72e3538ea68ca57a192f35509098dde9c11af4baaf5a1380012c3c584 SHA512 0d8839b5342e58f20d58adf992da2e6d6ab59ecfb4d21f352d943b4fd2a66e6e92a556067192a6f4cb63508e598d51eeb84edd98c775abfa1a06d137a81e5062 WHIRLPOOL ddaf069b52e59150ab85c02d3b7736ae710f08bd37efb90bd327e6b85e22184594713448bb2e89f04b422700f97d4c036c0dd57d45bb50946f4228ff89a0277d
+DIST amd64-bin-libreoffice-gnome-4.1.3.2.tar.xz 81514548 SHA256 2e456ddd92e5bc15047bde81d7eb2f77d5d8dc63584db969004cd46e4af1ea9f SHA512 19ad63449c0a8748d6c2e4b3a452aa77bbea1d8034cc890215bbca3408c6329921f3107c69a6d50f3cb1bf48e6b6d34a8e1bf424ad2f3f954478e6af8cd895a6 WHIRLPOOL 9e02ebb4f836f1fe4257f3f53b71c868de436eec43a30a454230d16238ce0b5753dc1dbab72389af1820165482d7aad53952085dc32188e2f0bcd221d095d1fa
 DIST amd64-bin-libreoffice-gnome-java-4.1.2.3.tar.xz 86514236 SHA256 08beb3d2bcbfbe2ac10968d435f71f2bcd6b1be5b6de646d6db2999866164704 SHA512 194bc52dcfbb18c48deebb22d187b4eebe5349152a40914ecb280b97c0a4e77dbfc313c9dfd40c9cd3e05d3ccc0afeb09dcaaf1f487ffb9f0c034554cefa76af WHIRLPOOL 034cc1c2ee0b04b7b1657ae52a05f960ff15d4d34270a3287faee502d677d9ab5a0e0a1ab8e3b3c6974b77d3fc474817a0fe29feccccceff144f964fcb7334ba
-DIST amd64-bin-libreoffice-kde-4.0.4.2.tar.xz 68206468 SHA256 e0878607cf36e8cdbd070a6755b84ba01c27a9f7ba66b2a2c379c3c1af524721 SHA512 4d2f3f029ec87276a2489e9e00a06d9c7dfca4f8b6333319aca663e6545fc962ddde5eb9b753a9a7dcd413790df064c552bec14af268f34d59e275a5b1f8e274 WHIRLPOOL ca052159d24c4aafcd87fe347e0dcc93d34e813e45a5ded0eb2d8b4eab781106b4ffb2ab6428ed5c50db71fe1e1852bc605fc32f2201fcf1e878dd142f87976d
+DIST amd64-bin-libreoffice-gnome-java-4.1.3.2.tar.xz 84822140 SHA256 6e151f003d2a56922c74a22c311b97d96f3948c778da4b1da7751d0c49ba1975 SHA512 a00e8dd9ac1a636a2157d19174464532714d9470578d030635dba681a8aeee3980bf97afed82e781c6a4e870467df72560d3018a9339c18cde2638db33cd525b WHIRLPOOL 78a6b40b498b81159d9ef4a43e26fa1783097cbb14338281b5ad67842cc87e2ac8d727559dadd9513fc6d81f1bdb4aa2b054466e1d3b3930a85f4295e20093ac
 DIST amd64-bin-libreoffice-kde-4.1.2.3.tar.xz 83073396 SHA256 a32e52bfc59c1f8fcf27431eff629b081bf90f16ae218e7cc31aa78a6fc4396d SHA512 aba8bc03bf1e15c6b41b51eafa1073dae42e7add5178182397c323f61caaa56484933c8698451386e1d1ad9cfe148485314654c6dcd71f30e0e266ff1985938a WHIRLPOOL 97fdd74be5a84a27a50700045aca1d0347ef0f10c01efb355e2ad38ed07231c9431fe123d123e7267c652269e90cb2ab7860392ec9fa7ddde89bd140393d7921
-DIST amd64-bin-libreoffice-kde-java-4.0.4.2.tar.xz 71725180 SHA256 7759254be790135dc8d6cbb03296ace9e208c969004d5bb6ce3069842f7e7d3a SHA512 e8015b988fc21c82264175f2d8e09eda351e8f750b2ca60731114fbf15d83dd6cdbafda1169a0ba59d153927d496c1b6051085e5dd3f995c6a291ea2eaae686f WHIRLPOOL 2a00ba0e93bc700c1cac1660840dcc836e7135c6d120a0861ee223bc353634bf56c7f51a832ff4f6b86138e2e9ed85acaed6074bc4c87c2257d2f2d2e3e8026f
+DIST amd64-bin-libreoffice-kde-4.1.3.2.tar.xz 81453240 SHA256 b63ce8f7b19919a5cab941410bc0865ad703c5e5641e7f3df8d71ae1ed005549 SHA512 12a70ebde32ea802b5f530137a811d8b939f867239fd714f7bf6678f1930542ee74bf375f75e7d04806c7d3490db50c03a32d4df596f48647c4ad771c936e514 WHIRLPOOL 56815b987023788d9ce125638a0f4628c3de9f63a99f518802c81ebaf70942d61995a19c9065860ed5ede181c431fe44f5191bcecf099cf18ab30b06f8d29b2f
 DIST amd64-bin-libreoffice-kde-java-4.1.2.3.tar.xz 86429448 SHA256 62997b4f95fd99f5e045334d59da5edf46174c2c82353bfb055931ef67150989 SHA512 686f93ac5865565cf3b89b226e615c358e96bc1aff66fa8143ba08651a21c67ede8ad7acd0a8be517112a843f4527ed8a38144f2effca8eeacf5108ba86bb210 WHIRLPOOL cdfcf20621a61a821b8c9aaaab4eb81c20a21463f5bf12f88b8d4bf8acbc21f666a3102ed03f11e34f994fbdd2dd4beeb238dee3a3ec4a0cb119e7a7d7697335
-DIST x86-bin-libreoffice-base-4.0.4.2.tar.xz 67099064 SHA256 e11495a6588c3ba8f25c89a4d6dce79e5a230a617a22d60e4fc549266315be3d SHA512 f587fd02c6c9733379c7b2e48a3704426eb4bb44b321ca866c74835f3d7f4132e4361a89c793321ccd00bbc8f9323817ebf05603c0111ff1c958d3ba8775fffc WHIRLPOOL 371de209e765841a24189a494a33b698c2fc5c37fe7a1aaaa9dcc3d89182e74548cc87838bd72142dd824dd15275c2d58c9e425b3287f19d0c3f9088f76e76d9
+DIST amd64-bin-libreoffice-kde-java-4.1.3.2.tar.xz 84779568 SHA256 cb0dbbc17e73a9adcaf4e9629a83746cd99529401524f5b2b3c0da4ee8ca60f8 SHA512 7181346f37d6fbea8468f0ca2e9e31474d4b20031b490fef8d53b494aade44590aefd54decf6c4768f1762dd0c0a2fbe64ff665aa1d812e402428916b1e0d84b WHIRLPOOL 38d3bc5ede5d805b7f48981bd5e284f3ca8a5702cdb709ae5e41724c4c60e0cdb241fc243e28362c89bfbe971261e47fc73e51f2ee9dd6dbe43fb16c0ebd0f2e
 DIST x86-bin-libreoffice-base-4.1.2.3.tar.xz 82506664 SHA256 278d1bcc60c47e93c25dd2a729473501c72e203d937e5def1321f94222c2e9fa SHA512 07a9eb0b1b95b187e57c9286df0c11e57ca0749f7e235a8ff63e84cb351f64e40885c085b96c0d92a713b6279626643420120d3d525e302798702a7780da96bb WHIRLPOOL 8826b952ed6bfecf45590bb3d855f40d548148ef37d338cbd740690d9a419b15249074bc6b7cf6305b5f71332930177f8e5e6dc828a95d3b8f411fe71096e65b
-DIST x86-bin-libreoffice-base-java-4.0.4.2.tar.xz 70622860 SHA256 feba2e04f80eeb842262bb4a72a2dc4425c0ffbebdd8230fa3986235780f41af SHA512 7df9b4aa64b040dbc54c9763720240b188aede8aba57eca767f96d8b280ea2c496293c9a9271beed3d22b8dfeab138e36eb6fd417abf4621d99ac4ee23263cb1 WHIRLPOOL 383c3cb46f915b1f7f86685e555a730a2f9c5337d6f849e79b7154769186aaa32ebb09ce1ca0a5231a07071b03defc9dd232f3f3e70bdec223e0ee6c568c0163
+DIST x86-bin-libreoffice-base-4.1.3.2.tar.xz 80904512 SHA256 7fbfdf0f2ad5d8ab8d007205cd5c86d1bbd3cdd7e9eeeeb9c6c0c31f90e1b808 SHA512 9f5073fe5c0e8124a18502ccc2cc19cd2e8012a8152a03f9f3def1384579971835fd109bfdcb8e066e00d2facad9861e4e8208f621a1025f7212b7481a1e8991 WHIRLPOOL 33a49ab7d5886c368d0fa8080ab15221ddb2f006f058c29fc8e273dc71be1c37785b9e85f20e4c80b875649c3a9385ad1f6420da9f23898a69c4b21ad447c405
 DIST x86-bin-libreoffice-base-java-4.1.2.3.tar.xz 85867312 SHA256 b0e45380ce6b90334c388e850acf20454088c3ed7412a3b747f2a95724db1b34 SHA512 01bee2328dd79055984c0c12b4e65f42c0c27de01c1a13b7b593838bfa2b609269d07b2ffeb1dc475a240b7ecaa8eadb0fdc80b6e183659cc09f80efc490f44b WHIRLPOOL c428c1f4efbf67ef9a9fa2defe86e1c7449b5755f8ad8e9115f133d630f6bc8d8a1229ed1f0e3a2a8124be24c7a984480dc07c8f89004a81305fbcd925efdb30
-DIST x86-bin-libreoffice-gnome-4.0.4.2.tar.xz 67230928 SHA256 f97a56782cd9602df863fd2eebd06eaf13b79a05e6c6b155571cc191d7f324d8 SHA512 1df5cebde905f60a6fc9b0d78d314325d6e3b7990f36861a74fbb531d261fd922006e8d04e2e247419df21a81c536eb40cd92d04028c967de4923c3ce52e6e3d WHIRLPOOL 701dcf7e4ed43f922986b569855cb3085eaba501fbbdb94d9bd4d6eef694d3c034d111f046d733f1bd1fc5b4f25405b1146aabd90bc3b77d9b20553b391eb904
+DIST x86-bin-libreoffice-base-java-4.1.3.2.tar.xz 84221544 SHA256 4914e4ec27e6634db9504ef10ec4c415bea651e77f22059bb05307485cadaab9 SHA512 5ab488b181cc908491bd0e315842fcb60e4f7cca27c1b8d1742d1c84e4280982a3021791b0affc350041586c724f5eed621b993c0f9fccc7ac2826cbc1d7f8d9 WHIRLPOOL 959b77d7bd5c8c0df610a313ef461d40e30ba6da1b54df3152620046085f9dff409413c2c0a383eaf0a972dbfb1194b46e0b251c0a9557215ae59d07f0fbb23a
 DIST x86-bin-libreoffice-gnome-4.1.2.3.tar.xz 82627804 SHA256 c57d3f6c4b05219fc5d0593c36bc51beb9c1584caeac2bad6f71e69eacebfaa7 SHA512 0be3a3c31bbb2edb9419fec4a74dedbf4693994553bf8f53915d6c1af80351c229b8dc754b5fb503c071383bd348f8436a3eafaf55d069692c0fc54be0cfb266 WHIRLPOOL 3db22ed9243ba1657457b64112818d1ec32ab3dbacb3f43c3f644a59aa6e6d15cb20b328011a41032b3b7e4ca95edfe97f174fe25773d8ba47d971900ea696b5
-DIST x86-bin-libreoffice-gnome-java-4.0.4.2.tar.xz 70740904 SHA256 0bab833b7698c531901dff382a997ca50a9239418bf02822e21f9239acd6e304 SHA512 71453440b9852175964ebcc9f14e00bc2c31771bdac8471967d4d412b118db4cf1eddb68997bfee4356fc5319e06b66f08f7a804a25701e69c57f3dc8ccd4b2d WHIRLPOOL 11d4328c4ded4ccc72650bbd67461f42a920a86abb06ae3eed55a0f7a0da20053ae6673bfa698be286c5cb7cadb0bbb5b76b16d3128ec53512b6a9979893281c
+DIST x86-bin-libreoffice-gnome-4.1.3.2.tar.xz 81014616 SHA256 b1e617154eb13706fcc7b130d19c449c6d5ca247c005cde60bac0d64e57a4046 SHA512 5dfeb6e531187f1e900627dc252f2b57bb28d642d0e2202b4cec5acd331bbb3d48af44fb81f94e86a368153fe78d524221426757b1553607c6989fd7af7b10ff WHIRLPOOL 67542fa97d25dff7d810db23d3066fed4cf374d917429c8cbee03fee40e0a9ff79124e8642fbc7f8bac88f16f59d646915cf73708337ac3b86eafdfe4ddb639f
 DIST x86-bin-libreoffice-gnome-java-4.1.2.3.tar.xz 85971340 SHA256 4a5ec50578f8eca9a7af72c4cd0f762fb881a72c8c9cdf9a7a2edfb5fe8ce50d SHA512 dc18ed6f9698b3a545eb7d3dee3cd22a51276ad2348564dda55c8957f2ef760b51ee1ffc4c3cbf3bf52651531efd0cd658a5424c224411c90f86a1e47cb625ec WHIRLPOOL 4996a2dd01ab7fa10b4f72b46d65f7b59463ec9a208929a86d109c3247cf1e780ebd63d77dfe7cb66ccd937f6720c462fcb7ef01d42e1d656b7665024758cb43
-DIST x86-bin-libreoffice-kde-4.0.4.2.tar.xz 67144016 SHA256 9869dd633778218445a11efbdcd94aa28e8d0aff923370352d720f942ece929d SHA512 4ebef16308bfe505a1f986947adaf7dd6ad026bd52078e2ec02b79ab00ebb5fd7f521c39cd8d06b9f6a28f6745490d951567f7f9409b76e30b4df5bf181e9fa6 WHIRLPOOL 0ea9c634246aa0439ab18b55f922d78b80866d1d8db36ff4d66acdb48109c7a76c818b624958409462bdfbe0277c081eac50385c7783ba54c873d502be29a787
+DIST x86-bin-libreoffice-gnome-java-4.1.3.2.tar.xz 84327392 SHA256 7bb5ebb151d7a74e273e950e54865c1881dcee1b672929685f979fc6093e9c07 SHA512 c926a63e544f0e76466cb6eaeb81687db3bfa8d15d2602189f145e0fb4456a87b31b93400a9706b3b6a831a601170ddc44b9e38e5d44a76c06178ea752317aef WHIRLPOOL 25cbfb572767a01bfd013b70870f0103d32dd60f08782983a06476f6eaa4bd85d64e6c86cb66a3dd683a4692b07ab117bb3c053e8b99365da3fbd1aabafb889b
 DIST x86-bin-libreoffice-kde-4.1.2.3.tar.xz 82550148 SHA256 e51947b649c01b91515b9a0048c77c1233e0c0d03b8d84f13147833224a49577 SHA512 367a808d6b40b15f5b88a25ad4a416e3b28b3e34b1e98626191683e1a855012f7f26e668c4aaa976af7cb1d0f01a1e7f5951382b62f892ba3be52f86cd2269f3 WHIRLPOOL 6d6c5aff100bb5dc42216d31b4f9f66b0403560c3d48fec19974a1bcdfcf675f1a899be7189a3e4b573df269a7340a3e0b6a7c79f2c9bbd233ca075c1e31e77c
-DIST x86-bin-libreoffice-kde-java-4.0.4.2.tar.xz 70649076 SHA256 393483f5867935edcf3d12e5505d22a7a199cc8c103908ba61a4babd45a5e7af SHA512 298f6265089be935b66d688a22e158efa9b9731a7304e547f3f353347379fbf4ed3459c337fc8573726a721e9b11556fc3a9fc25e667e91e6fa26defed61fb4e WHIRLPOOL b0a5ebcc084f234256481c89ebb6b9b655f1ad707c97e3f709adfacac8024a2654e74e764d2a34fb2db21a67f0d044db101977cac7de45e4425b906f7119e5c8
+DIST x86-bin-libreoffice-kde-4.1.3.2.tar.xz 80932548 SHA256 b7b0fbedb7419722eb8eb1c47143c46937bb0b63facc6cbb74dfa1864290f1e9 SHA512 dd035964102d7c1a195b430517fd6548fd3f3085bd40eb8c64a6895fdcacf2894c74091c4f6cec2121a3665d2804a1a4d976e61463caf7a768c24b1fbd0667eb WHIRLPOOL 3cdad97c533e22636aa38d09aabc7795eb3319b95f31cbfe60afc48e1016a54edfe7164aa8b5d0a87d3ac168e48172e0e933407856ef176442f1a6c02ea8bcce
 DIST x86-bin-libreoffice-kde-java-4.1.2.3.tar.xz 85905960 SHA256 2e440db2c2de72cf4c56a36baea2b72399c94da13715fb08f2c6cca4ecb9931b SHA512 37612aa3c0d84c24728263d328e2d336deaee50e4f083c03ef737a9be8044e7c86e79d00537c12872cd0f65179199a241975e72f6b380e6f1c8a3e295da24c56 WHIRLPOOL b7094a5deea9c918fe888994427a5d23b9a71309a5714c9d2698a8d356665160019da6ebe0102f2f152e74213cde824f90b652f038bc4e2bfc77e7089c9b7fba
+DIST x86-bin-libreoffice-kde-java-4.1.3.2.tar.xz 84279764 SHA256 9548f8f2824f339b754d11c8985e277dd73d298ef9e3925f81972bed7f0ec7de SHA512 68b2c2afbe08c3dc80fd1d3e1214e795af36267882acaca219e5ae1636a4afaddfcabb0ca9cc005843d0a7d8ad2c68318edb12bb7fe9199faa4d80a0e3f07166 WHIRLPOOL 2e149399b546a12cec007b258140ad12c2cc93d87531178e2aafbec3dd6114e9b5863d35e3dc6ef2c7b64b27963f80f0bbd01234c1030cabed59d01b3255fc56
--- a/app-office/libreoffice-bin/libreoffice-bin-4.1.2.3.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-4.1.2.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-4.1.2.3.ebuild,v 1.7 2013/10/31 15:49:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-4.1.2.3.ebuild,v 1.8 2013/11/04 21:07:27 dilfridge Exp $

 EAPI=5

@ -63,7 +63,7 @@ BIN_COMMON_DEPEND="
 	dev-libs/icu:0/51.1
 	=media-gfx/graphite2-1.2*
 	=media-libs/harfbuzz-0.9.12
-	=media-libs/libpng-1.5.15
+	=media-libs/libpng-1.5*
 	>=sys-libs/glibc-2.15-r3
 	kde? ( >=kde-base/kdelibs-4.10.5-r1:4 >=dev-qt/qtcore-4.8.4-r5:4 )
 	|| ( <media-libs/libjpeg-turbo-1.3.0-r2 =media-libs/jpeg-8* )
--- a/app-office/libreoffice-bin/libreoffice-bin-4.1.3.2.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-4.1.3.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-4.0.4.2.ebuild,v 1.6 2013/09/16 11:32:37 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-4.1.3.2.ebuild,v 1.2 2013/11/04 21:07:27 dilfridge Exp $

 EAPI=5

@ -54,17 +54,18 @@ SRC_URI="
 IUSE="debug gnome java kde"
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"

 BIN_COMMON_DEPEND="
 	=app-text/libexttextcat-3.4*
-	app-text/poppler:0/35
-	=dev-libs/boost-1.49*
-	dev-libs/icu:0/51.1
+	app-text/poppler:0/43
+	dev-libs/boost:0/1.52
+	dev-libs/icu:0/51.2
 	=media-gfx/graphite2-1.2*
+	=media-libs/harfbuzz-0.9.12
 	=media-libs/libpng-1.5*
 	>=sys-libs/glibc-2.15-r3
-	kde? ( >=kde-base/kdelibs-4.10.4:4 >=dev-qt/qtcore-4.8.4-r5:4 )
+	kde? ( >=kde-base/kdelibs-4.10.5-r1:4 >=dev-qt/qtcore-4.8.4-r5:4 )
 	|| ( <media-libs/libjpeg-turbo-1.3.0-r2 =media-libs/jpeg-8* )
 "

@ -83,6 +84,8 @@ COMMON_DEPEND="
 	>=app-text/libexttextcat-3.2
 	app-text/liblangtag
 	app-text/libmspub
+	>=app-text/libmwaw-0.1.7
+	app-text/libodfgen
 	app-text/libwpd:0.9[tools]
 	app-text/libwpg:0.2
 	>=app-text/libwps-0.2.2
@ -90,18 +93,20 @@ COMMON_DEPEND="
 	>=dev-cpp/clucene-2.3.3.4-r2
 	>=dev-cpp/libcmis-0.3.1:0.3
 	dev-db/unixODBC
+	>=dev-libs/boost-1.46:=
 	dev-libs/expat
 	>=dev-libs/hyphen-2.7.1
 	>=dev-libs/icu-4.8.1.1:=
-	=dev-libs/liborcus-0.3*
+	>=dev-libs/liborcus-0.5.1:=
 	>=dev-libs/nspr-4.8.8
 	>=dev-libs/nss-3.12.9
 	>=dev-lang/perl-5.0
 	>=dev-libs/openssl-1.0.0d
-	>=dev-libs/redland-1.0.14[ssl]
+	>=dev-libs/redland-1.0.16[ssl]
 	media-gfx/graphite2
 	>=media-libs/fontconfig-2.8.0
 	media-libs/freetype:2
+	>=media-libs/harfbuzz-0.9.10:=[icu(+)]
 	media-libs/lcms:2
 	>=media-libs/libpng-1.4
 	>=media-libs/libcdr-0.0.5
@ -138,7 +143,7 @@ RDEPEND="${COMMON_DEPEND}
 "

 PDEPEND="
-	=app-office/libreoffice-l10n-4.0*
+	=app-office/libreoffice-l10n-${PV}*
 "

 DEPEND=""
--- a/app-office/qcharselect/Manifest
+++ b/app-office/qcharselect/Manifest
@ -1 +1,2 @@
 DIST qcharselect-0.2.tar.bz2 174408 SHA256 7291e4e18e9a24feedcbb10cd3167bff412192c2fe76946e8203b429f024c266 SHA512 a6f1f5cef4a4a78c26530cca495293750aa170a821db92cf9ba1476d1a83665925fa2f8a3e34b8bfb2b1ca2a16462e3fbd87c91ee74d5cec2239a4f128e5575c WHIRLPOOL 690d7808fc440f6f770ca8c0f625bf2e75c0fb4456421ed9cc3b6638b76d2267da82f8c9c2f15f26f4e2f747bfeb88b087cb2ae78ab54e8e27fac32cd726993b
+DIST qcharselect-0.3.tar.bz2 136257 SHA256 1a7d3476aeae005e957333ae0ca009b05975870a12db3beec8ffaa914d31e7f0 SHA512 810b8b5463960ebb7c95d1a85543f57c0fb140342f63804d0c1c43006c78f29b3969c262a2fb7544e64cf5d5f4f7848a7b2923217cc1ebfa734c8d23ff4e236b WHIRLPOOL 2c165925d62f2769c927a30f1506124bf53e9dc6d58a8384d6f54e77748a2b2ca49a2b5b13daaf1ce4de3bc9cc527f92315a7c29c150633fb5e73009f73a2890
--- a/app-office/qcharselect/qcharselect-0.3.ebuild
+++ b/app-office/qcharselect/qcharselect-0.3.ebuild
@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/qcharselect/qcharselect-0.3.ebuild,v 1.2 2013/11/03 12:41:16 yngwin Exp $
+
+EAPI=5
+inherit multilib
+
+DESCRIPTION="A Qt4 port of KCharSelect from KDE 3.5"
+HOMEPAGE="http://qcharselect.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="dev-qt/qtgui:4[qt3support]"
+DEPEND="$RDEPEND
+	x11-misc/makedepend"
+
+src_prepare() {
+	sed -e 's:update-mime-database:true:g' \
+		-e 's:data/desktop/qcharselect:src/QCharSelect:' \
+		-i Makefile.in || die
+
+	sed -e 's: %m::' \
+		-e '/Path=/d' \
+		-i src/QCharSelect.desktop || die
+}
+
+src_configure() {
+	local myconf
+	use debug && myconf="--enable-debug"
+
+	econf \
+		--with-qtdir=/usr \
+		--with-qtlibdir=/usr/$(get_libdir)/qt4 \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc README
+}
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@ -2,3 +2,4 @@ DIST texmaker-4.0.1.tar.bz2 13065488 SHA256 7ef9a5e1e24e734bfb7edb084ec6574fa3fc
 DIST texmaker-4.0.2.tar.bz2 13676919 SHA256 a0a81b65b8aede12f0a7bbc303374fd910f39976db68b4035d7f1d69c2276b45 SHA512 0e7f36ee2b3c18e2367aed78f377f959750bfe43112f8fbc1aa7055cb965f227674121bd6de4ab4ee69c3a6165f742acfc4b4aa3f474f8e7f5dad928fd5cf15a WHIRLPOOL a511d846d35a8dd4b434c7109a553f692b5726a66afa06d161e6f76b93fe501968a7c8b6288029538b28977c8c4e2e594555fd9db04ca9a7d3e0895affd0d5ca
 DIST texmaker-4.0.3.tar.bz2 9697288 SHA256 7b157645914fcb8ad4475c2c6010ffeb52a6547a8ee17bcfdcf720369bbb24bd SHA512 8c91ce920f7a828a3e1e78123fa4464c7b826c37343a009cbb70b1d4ce7cd3fd3e3ddea7e9b2b2c0235ddf6280e18ca3844b9ccaaa577d28f76e1a12e76d551f WHIRLPOOL 65a7413f3c727b495cdde6aefb7448b61818b3409ec2e727258c210bad7e5e10a6a88cdf50508e2b2f367fa7c1c8c0a3a3cf4b53ea34c1409bac15b77fc1a476
 DIST texmaker-4.0.4.tar.bz2 9688431 SHA256 770b12b95a7300e8180bcb85d68fdb19ff8c959655914fc172bb9bf4c39b5def SHA512 02c98253bc45668939d040367a348c29019cb5a5e94522c5786ccc93bc7691ad2edeaf5bee8850081c7db0c3f5338932b94825713215d2b7de3ef201ab77bc16 WHIRLPOOL db7d08d0323816edd16cbdcd7d8aae6ab2df542e59e6988ac196dcafd33751d4714f1f70c6435fec4c2a7d07c683ce329492dea7da8c2f77b1dfb9e88c020578
+DIST texmaker-4.1.tar.bz2 10524563 SHA256 d5a460b15200421c68e10bf736cb3be0c26148de55f642a41be7226b6f89bc20 SHA512 2e29175ccca106e4097efa6e3dde1be3101fa22171d23532999a844720b1d63e81783b6a38ea7705b88951327edfc72ea5706afc260c02f1b69ef46d62b9011b WHIRLPOOL cb42fba1198e2deff90dc46c80e384129383f25010a7c62df327be7a5e165d9f97485fb13d899b0112a79fbe4210c4a74f629bf97c58b68d2d9ed6186c5a7256
--- a/app-office/texmaker/files/texmaker-4.1-unbundle.patch
+++ b/app-office/texmaker/files/texmaker-4.1-unbundle.patch
@ -0,0 +1,105 @@
+ configdialog.cpp |  2 +-
+ texmaker.cpp     |  4 ++--
+ texmaker.pro     | 42 +-----------------------------------------
+ 3 files changed, 4 insertions(+), 44 deletions(-)
+
+diff --git a/configdialog.cpp b/configdialog.cpp
+index e596a2c..3660429 100644
+--- a/configdialog.cpp
+++ b/configdialog.cpp
+@@ -220,7 +220,7 @@ void ConfigDialog::browseAspell()
+ QDir spelldir(QCoreApplication::applicationDirPath());
+ #else
+ #ifdef DEBIAN_SPELLDIR
+-QDir spelldir(PREFIX"/share/myspell/dicts");
+QDir spelldir(PREFIX"/share/myspell");
+ #else
+ QDir spelldir(PREFIX"/share/texmaker");
+ #endif
+diff --git a/texmaker.cpp b/texmaker.cpp
+index 51d2082..607f66e 100644
+--- a/texmaker.cpp
+++ b/texmaker.cpp
+@@ -4363,7 +4363,7 @@ geometry_options=config->value("Quick/GeometryOptions","left=2cm,right=2cm,top=2
+ QString dicDir=QCoreApplication::applicationDirPath() + "/";
+ #else
+ #ifdef DEBIAN_SPELLDIR
+-QString dicDir=PREFIX"/share/myspell/dicts/";
+QString dicDir=PREFIX"/share/myspell/";
+ #else
+ QString dicDir=PREFIX"/share/texmaker/";
+ #endif
+@@ -10835,4 +10835,4 @@ if (singlemode && currentEditorView())
+ 	    UpdateBibliography();
+ 	    }
+ 	}
+-}
+\ No newline at end of file
+}
+diff --git a/texmaker.pro b/texmaker.pro
+index bce8dd4..2f205bb 100644
+--- a/texmaker.pro
+++ b/texmaker.pro
+@@ -95,29 +95,6 @@ HEADERS	+= texmaker.h \
+ 	unicodedialog.h \
+ 	unicodeview.h \
+ 	quickbeamerdialog.h \
+-	hunspell/affentry.hxx \
+-	hunspell/affixmgr.hxx \
+-	hunspell/atypes.hxx \
+-	hunspell/baseaffix.hxx \
+-	hunspell/csutil.hxx \
+-	hunspell/dictmgr.hxx \
+-	hunspell/hashmgr.hxx \
+-	hunspell/htypes.hxx \
+-	hunspell/hunspell.hxx \
+-	hunspell/hunspell.h \
+-	hunspell/langnum.hxx \
+-	hunspell/license.hunspell \
+-	hunspell/phonet.hxx \
+-	hunspell/suggestmgr.hxx \
+-	hunspell/license.myspell \
+-	hunspell/filemgr.hxx \
+-	hunspell/hunzip.hxx \
+-	hunspell/replist.hxx \
+-	hunspell/w_char.hxx \
+-	singleapp/qtlocalpeer.h \
+-	singleapp/qtlockedfile.h \
+-	singleapp/qtsingleapplication.h \
+-	singleapp/qtsinglecoreapplication.h \
+ 	encodingprober/CharDistribution.h \
+ 	encodingprober/ChineseGroupProber.h \
+ 	encodingprober/ctype_test_p.h \
+@@ -204,22 +181,6 @@ SOURCES	+= main.cpp \
+ 	unicodedialog.cpp \
+ 	unicodeview.cpp \
+ 	quickbeamerdialog.cpp \
+-	hunspell/affentry.cxx \
+-	hunspell/affixmgr.cxx \
+-	hunspell/csutil.cxx \
+-	hunspell/dictmgr.cxx \
+-	hunspell/hashmgr.cxx \
+-	hunspell/hunspell.cxx \
+-	hunspell/phonet.cxx \
+-	hunspell/suggestmgr.cxx \
+-	hunspell/utf_info.cxx \
+-	hunspell/filemgr.cxx \
+-	hunspell/replist.cxx \
+-	hunspell/hunzip.cxx \
+-	singleapp/qtlocalpeer.cpp \
+-	singleapp/qtlockedfile.cpp \
+-	singleapp/qtsingleapplication.cpp \
+-	singleapp/qtsinglecoreapplication.cpp \
+ 	encodingprober/CharDistribution.cpp \
+ 	encodingprober/ChineseGroupProber.cpp \
+ 	encodingprober/JapaneseGroupProber.cpp \
+@@ -328,8 +289,7 @@ icon.path = $${ICONDIR}
+ 
+ INSTALLS = target
+ HEADERS	+= x11fontdialog.h 
+-SOURCES	+= x11fontdialog.cpp \
+-	  singleapp/qtlockedfile_unix.cpp
+SOURCES	+= x11fontdialog.cpp
+ FORMS += x11fontdialog.ui
+ 
+ utilities.files = doc/doc1.png \
--- a/app-office/texmaker/texmaker-4.1.ebuild
+++ b/app-office/texmaker/texmaker-4.1.ebuild
@ -0,0 +1,85 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-4.1.ebuild,v 1.1 2013/11/03 10:51:38 jlec Exp $
+
+EAPI=5
+
+inherit qt4-r2 versionator
+
+# The upstream version numbering is bad, so we have to remove a dot in the
+# minor version number
+MAJOR="$(get_major_version)"
+MINOR_1="$(($(get_version_component_range 2)/10))"
+MINOR_2="$(($(get_version_component_range 2)%10))"
+if [ ${MINOR_2} -eq "0" ] ; then
+	MY_P="${PN}-${MAJOR}.${MINOR_1}"
+else
+	MY_P="${PN}-${MAJOR}.${MINOR_1}.${MINOR_2}"
+fi
+
+MY_P="${P}"
+
+DESCRIPTION="A nice LaTeX-IDE"
+HOMEPAGE="http://www.xm1math.net/texmaker/"
+SRC_URI="http://www.xm1math.net/texmaker/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON_DEPEND="
+	app-text/hunspell
+	app-text/poppler:=[qt4]
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXext
+	dev-qt/qtgui:4
+	dev-qt/qtcore:4
+	dev-qt/qtsingleapplication
+	dev-qt/qtwebkit:4
+"
+RDEPEND="${COMMON_DEPEND}
+	virtual/latex-base
+	app-i18n/ibus-qt
+	app-text/psutils
+	app-text/ghostscript-gpl
+	media-libs/netpbm"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-unbundle.patch )
+
+DOCS=( utilities/AUTHORS utilities/CHANGELOG.txt )
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	find singleapp hunspell -delete || die
+
+	qt4-r2_src_prepare
+
+	cat >> ${PN}.pro <<- EOF
+	exists(texmakerx_my.pri):include(texmakerx_my.pri)
+	EOF
+	cp "${FILESDIR}"/texmakerx_my.pri . || die
+
+	sed \
+		-e '/^#include/s:hunspell/::g' \
+		-e '/^#include/s:singleapp/::g' \
+		-i *.cpp *.h || die
+}
+
+src_configure() {
+	eqmake4 \
+		${PN}.pro \
+		PREFIX="${EPREFIX}/usr" \
+		DESKTOPDIR="${EPREFIX}/usr/share/applications" \
+		ICONDIR="${EPREFIX}/usr/share/pixmaps"
+}
+
+pkg_postinst() {
+	elog "A user manual with many screenshots is available at:"
+	elog "${EPREFIX}/usr/share/${PN}/usermanual_en.html"
+}
--- a/app-portage/pfl/pfl-2.3.ebuild
+++ b/app-portage/pfl/pfl-2.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/pfl/pfl-2.3.ebuild,v 1.8 2013/02/02 12:39:58 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/pfl/pfl-2.3.ebuild,v 1.9 2013/11/05 19:10:18 billie Exp $

 EAPI=4

@ -67,9 +67,9 @@ pkg_postinst() {
 	python_mod_optimize ${PN}

 	if [[ ! -e "${EROOT%/}/var/lib/${PN}/pfl.info" ]]; then
-		touch "${EROOT%/}/var/lib/${PN}/pfl.info"
-		chown -R 0:portage "${EROOT%/}/var/lib/${PN}"
-		chmod 775 "${EROOT%/}/var/lib/${PN}"
+		touch "${EROOT%/}/var/lib/${PN}/pfl.info" || die
+		chown -R 0:portage "${EROOT%/}/var/lib/${PN}" || die
+		chmod 775 "${EROOT%/}/var/lib/${PN}" || die
 	fi
 }

--- a/app-portage/pfl/pfl-2.4-r1.ebuild
+++ b/app-portage/pfl/pfl-2.4-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/pfl/pfl-2.4-r1.ebuild,v 1.2 2013/10/20 23:17:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/pfl/pfl-2.4-r1.ebuild,v 1.4 2013/11/05 19:10:18 billie Exp $

 EAPI=5

@ -15,7 +15,7 @@ SRC_URI="http://files.portagefilelist.de/${P}.tar.bz2"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm hppa ~ppc ~sparc ~x86 ~amd64-fbsd ~x64-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm hppa ~ppc ~sparc ~x86 ~amd64-fbsd ~x64-freebsd ~amd64-linux ~x86-linux"
 IUSE="+network-cron"

 DEPEND=""
@ -40,8 +40,8 @@ python_install_all() {

 pkg_postinst() {
 	if [[ ! -e "${EROOT%/}/var/lib/${PN}/pfl.info" ]]; then
-		touch "${EROOT%/}/var/lib/${PN}/pfl.info"
-		chown -R 0:portage "${EROOT%/}/var/lib/${PN}"
-		chmod 775 "${EROOT%/}/var/lib/${PN}"
+		touch "${EROOT%/}/var/lib/${PN}/pfl.info" || die
+		chown -R 0:portage "${EROOT%/}/var/lib/${PN}" || die
+		chmod 775 "${EROOT%/}/var/lib/${PN}" || die
 	fi
 }
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@ -1,3 +1,4 @@
 DIST fish-1.23.1.tar.bz2 876148 SHA256 1ea3d6532226c315993fabd6096ec865fdcde4d43df9e26f9ed020e11e631f93 SHA512 2f51cf10d4d03ddd776a616c9ac6ff9c4dd4af9ffcfc41a0db38fc67a45f661c24cd163762091cea7e42f952b9fc621a5e7434302f1d1043b7d01057fee44a80 WHIRLPOOL 9d635ef1674753812da37d287c2827ac6b841e6fb9aef25fbe3c84ee881c57bea31d27dd80c8a5ff4fbbceea177241f80461eba77bae41713b1b0b260ae38cf2
 DIST fish-2.0.0.tar.gz 1540652 SHA256 7e4c4a0b3c518769a3d31b235e743de7a8d52f851ad19d2df9d53534e6238303 SHA512 a41e1b3737d5b556e08728312f486c55d1405492dd0be8a97694dabc0974b90ecbacfc74d3e427d63e9b3a639a03844b98ecded68cb3060522eee68879c28ce1 WHIRLPOOL f4e0013ceffcc04be6e9a2187da621db5e1e0592c5c9707bda114d2c9162758a83371392bedbecb5c8ff6eb9d065c2c356581fc21309527986ac2bc3fb0866cf
+DIST fish-2.1.0-docdir.patch 1925 SHA256 9a6ed852cd58a9d8a24ac2c222026f1e6f6aa7bb8e515b5a1aa64414dedb81b5 SHA512 724120855bbb4cd6c9db440ff9b001a92c01a67f75c86be95fc890c52d3802f6857c27ee989f183a39aa5aace576fce72e9e36c6b7f0457f1ba4c9d6f54efb6f WHIRLPOOL ca31e6560bd36147184443b84ad96987003cfb486d14fccb74f19a88489f355814ed2ac136b4fcc14e5fb9986b069a395ef4e60aa0a30a0ce55d893499711003
 DIST fish-2.1.0.tar.gz 1707921 SHA256 af527af9d145df5675ca3031c1a87007d4f4753a1cde49da88f4eb883a1cf044 SHA512 cd8a678df948baefafbf54a14ece7b52fff6620939d82ba0d0f4cd8ad1ae59842a847231de8465a4471e48fb86866f1113bba4ec9cd6433851bb538b1f965075 WHIRLPOOL 45cf56f2711380764065963a374f7613d83f07c8c2bc7e9724c5f2bfb55720989d52dad2bba85354013de98af58c10dad64a2cbc2b6f409f997f2ed8a2720881
--- a/app-shells/fish/fish-2.1.0-r1.ebuild
+++ b/app-shells/fish/fish-2.1.0-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/fish-2.1.0.ebuild,v 1.1 2013/10/31 02:44:10 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/fish-2.1.0-r1.ebuild,v 1.1 2013/11/04 09:51:08 polynomial-c Exp $

 EAPI=5

@ -8,7 +8,8 @@ inherit base autotools

 DESCRIPTION="fish is the Friendly Interactive SHell"
 HOMEPAGE="http://fishshell.com/"
-SRC_URI="http://fishshell.com/files/${PV}/${P}.tar.gz"
+SRC_URI="http://fishshell.com/files/${PV}/${P}.tar.gz
+	https://github.com/fish-shell/fish-shell/commit/9a3643501607bff8b314977931916081dd39646a.patch -> ${P}-docdir.patch"

 LICENSE="GPL-2"
 SLOT="0"
@ -23,6 +24,8 @@ DEPEND="sys-libs/ncurses
 RDEPEND="${DEPEND}"

 src_prepare() {
+	epatch "${DISTDIR}"/${P}-docdir.patch #489934
+
 	eautoreconf
 }

--- a/app-shells/fish/metadata.xml
+++ b/app-shells/fish/metadata.xml
@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>jdhore@gentoo.org</email>
-		<name>Jeff Horelick</name>
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
 	</maintainer>
 </pkgmetadata>
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@ -1,3 +1,4 @@
 DIST highlight-3.12.tar.bz2 679786 SHA256 32f22fc63243c48ee7499c7834af50de4ed0ec84b12bd9acfaf7649e36083000 SHA512 850f59ebab9da6f38b0e42bdcdee1dd182cac31fcb8523ef88d0600cc44b682230e365918d3b97fd06ad167fcaaf69fbc0315bc848d485bcb071ff8009b10bf5 WHIRLPOOL 8fdb8eaa64ec16cc51d41dded86f0da833b7e07d92b697c0b6580f89a1cefbb9b102fe113e1f45b1289b09ad422d41f4282e4f2b3a241e7041d409456fa81353
+DIST highlight-3.16.tar.bz2 613356 SHA256 994e8da0b86549fb16c4590769731315d01db68e973c44d43931fcc628e79d77 SHA512 b637107f589ff475bda22e14a7a55a5af5adbae67a5c1b9081bd312646dc712ee8b9e04d3f760e485d4c311b0ef69ef71a5121ab7d70e0f55d3990a5c6134443 WHIRLPOOL 09af3cc7f77e409d3bdeec3979f390e30b9ffc47484274fc326de9011b55e7b10e825586a9bc2be5aa1e73dc1ab8b3623caa408766e2f7b9efff07fff470e4fc
 DIST highlight-3.3.tar.bz2 740651 SHA256 96c415d62488c6522e9933ecdfce447eb8eecd3b88a1064f42908c936ea02d87 SHA512 10530f485e57aa8068edddca3b0f75fcdd1c756d45740e7dd4eeaeb8b87cebd022f6283ecd37a057ef18f30e8cb56eeb412e8ba0c0542320a751b8b9c3dbf1c9 WHIRLPOOL 8b0ccfa97d5343b0edb2cf11d92116df4ebdac5d7157569d758c8eb2a113dd07612438ef9eeeda9138a7aa9d64c027ba5dab31054700acbc6823b6868ff4a77c
 DIST highlight-3.9.tar.bz2 683718 SHA256 4ae69795e3ca4ffef47355a7b6dc371e2d781735efd44fa12ff3a1ffc990daef SHA512 4f75232eae5f18f37666e04467993eab8ba983ec86ba6fbef4fbd6fea1e4b2a388beff75a72cfb00c1a90a6fa6dcab9cd68d40cde940f6aaff5174304102cada WHIRLPOOL 1d0ab7fa034fa16cf07318a1140d261942ad98b73108b1b83c578e98f836c9d933ad731320b8aa183f958572e10f3970f64b822954fe5065f8ec6692290f6e9a
--- a/app-text/highlight/highlight-3.16.ebuild
+++ b/app-text/highlight/highlight-3.16.ebuild
@ -0,0 +1,66 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.16.ebuild,v 1.1 2013/11/04 23:58:51 radhermit Exp $
+
+EAPI=5
+
+inherit toolchain-funcs qt4-r2 flag-o-matic
+
+DESCRIPTION="converts source code to formatted text ((X)HTML, RTF, (La)TeX, XSL-FO, XML) with syntax highlight"
+HOMEPAGE="http://www.andre-simon.de/"
+SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="examples qt4"
+
+RDEPEND="dev-lang/lua
+	qt4? (
+		dev-qt/qtgui:4
+		dev-qt/qtcore:4
+	)"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
+		src/core/datadir.cpp || die
+
+	if has_version '<dev-lang/lua-5.2' ; then
+		sed -i 's/-DUSE_LUA52//' src/makefile || die
+	fi
+}
+
+src_compile() {
+	myhlopts=(
+		"CXX=$(tc-getCXX)"
+		"AR=$(tc-getAR)"
+		"LDFLAGS=${LDFLAGS}"
+		"CFLAGS=${CXXFLAGS}"
+		"DESTDIR=${D}"
+		"PREFIX=${EPREFIX}/usr"
+		"HL_CONFIG_DIR=${EPREFIX}/etc/highlight/"
+		"HL_DATA_DIR=${EPREFIX}/usr/share/highlight/"
+		"doc_dir=${EPREFIX}/usr/share/doc/${PF}/"
+		"conf_dir=${EPREFIX}/etc/highlight/"
+	)
+	emake -f makefile "${myhlopts[@]}"
+	if use qt4 ; then
+		cd src/gui-qt
+		eqmake4 'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"'
+		emake
+	fi
+}
+
+src_install() {
+	emake -f makefile "${myhlopts[@]}" install
+	use qt4 && emake -f makefile "${myhlopts[@]}" install-gui
+
+	if use examples ; then
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples
+	fi
+}
--- a/app-text/pandoc/pandoc-1.12.ebuild
+++ b/app-text/pandoc/pandoc-1.12.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.12.ebuild,v 1.2 2013/09/18 11:04:06 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.12.ebuild,v 1.3 2013/11/05 11:55:36 chainsaw Exp $

 EAPI=5

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

 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="embed_data_files +http-conduit"

 RDEPEND=">=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.7:=[profile?]
--- a/Show more
+++ b/Show more