gentoo · RobinDX · Jan 28, 2016 · Jan 29, 2016 · Jan 29, 2016 · Jan 29, 2016
diff --git a/app-admin/drush/metadata.xml b/app-admin/drush/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>mjo@gentoo.org</email>
-    <name>Michael Orlitzky</name>
-  </maintainer>
   <longdescription lang="en">
     Drush is a command line shell and scripting interface for Drupal,
     a veritable Swiss Army knife designed to make life easier for

diff --git a/app-cdr/disc-cover/disc-cover-1.5.6-r1.ebuild b/app-cdr/disc-cover/disc-cover-1.5.6-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Creates CD-Covers via LaTeX by fetching cd-info from freedb.org or local file"
+HOMEPAGE="http://www.vanhemert.co.uk/disc-cover.html"
+SRC_URI="http://www.vanhemert.co.uk/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+SLOT="0"
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	dev-perl/Audio-CD-disc-cover
+	virtual/latex-base
+"
+
+src_compile() {
+	pod2man disc-cover > disc-cover.1 || die
+}
+
+src_install() {
+	dobin disc-cover
+	dodoc AUTHORS CHANGELOG TODO
+	doman disc-cover.1
+	insinto /usr/share/${PN}/templates
+	doins templates/*
+}
diff --git a/app-crypt/keybase/Manifest b/app-crypt/keybase/Manifest
@@ -5,3 +5,4 @@ DIST keybase-0.8.23.tar.gz 7101472 SHA256 20e7e7e7a125ddb3b0e7023c3dcaf12f12c7b1
 DIST keybase-0.8.24.tar.gz 7109062 SHA256 680eaadbae16724912c4bbbd916b20a116fb5d290e4f8e91d2c7093261a26856 SHA512 65b2a4a21f814617363615153bc034c94854297d0b53cd538cc90320fc48ae8e6c9c13e3c06ae729a4fbe035b6cbbb5020d6a0618aed2c94b0ee858f8b919cd2 WHIRLPOOL 889b90879b1f18650c13c048bf888aca85c4ca162d85cd60ba527eccfe3d8da9b9a313f7d6c6cd757feb949f200dbb2021daa2b45af70ad99403826241f0773a
 DIST keybase-0.8.25.tar.gz 7109238 SHA256 e34b128f48e27a1c3066b5f3f19d99df735f9be4f1c867d1d3d408c8e12983fd SHA512 b6986063c34a18bd91148e588d43545f8baf7849cf80ea03b88d26e1f3dd6684cc9e5ebd5e10ff5ac0639fa308c2e07f577b6a7ded6f5bf4bd4510e64bb31025 WHIRLPOOL 1413eed7f26ec6b2d17f63d6315baac48d6a7f0935c3608e4ffcd5cd8df7f13db01e8d93ce76b33b4e0ceb322f508a3601e37be6cad86c20e976bb33012f28db
 DIST keybase-1.0.8.0.tar.gz 42949716 SHA256 b43fc29e9ec6d06fb7371a597ad7a2f28ee8e125ae8b9c9c34d1c4d176b6a76d SHA512 a4030d00415961d2c7d5d65ca682a11f6cd82b0d64bcbf9de6e4ce8f969faea05f3fc8a0084def9bd39528a75dfd80dcb6bbdae16e73d71b1c9dc6a7ece58771 WHIRLPOOL f8a59464759875e195068fe7422962ad570794442c408e99a55c4f4724108a086727c67fe753e698f3d653f1101278d1be657ca2889d7aaa878489f232574745
+DIST keybase-1.0.9.0.tar.gz 43337746 SHA256 01999048454877bc3b6a2934a8c1bfda4ebef31400698627a23b94450d5b2409 SHA512 7b6e0defe378fd3fa7d4577f95484947c6898079541448cb0f8c180fe5efdc43da42bd6b67c350c38701a01e62802041c5840315be877ace88e8d1f26d667c7f WHIRLPOOL f63c07b79eb9a96673cd5b909ce1c1877a4d5ff45a2275a8dfc9a6262c8a6f2784b05301023f9fce6b98044d4703721513751aec31bc4fa99dafc27e0deca04a
diff --git a/app-crypt/keybase/keybase-1.0.9.0.ebuild b/app-crypt/keybase/keybase-1.0.9.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils versionator
+
+MY_PV=$(replace_version_separator 3 '-')
+
+DESCRIPTION="Client for keybase.io"
+HOMEPAGE="https://keybase.io/"
+SRC_URI="https://github.com/keybase/client/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-lang/go-1.5:0"
+RDEPEND="
+	app-crypt/gnupg"
+
+S="${WORKDIR}/src/github.com/keybase/client"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	mkdir -p "$(dirname "${S}")" || die
+	mv "client-${MY_PV}" "${S}" || die
+}
+
+src_compile() {
+	GO15VENDOREXPERIMENT=1 \
+		GOPATH="${WORKDIR}:${S}/go/vendor" \
+		go build -v -x \
+		-tags production \
+		-o "${T}/keybase" \
+		github.com/keybase/client/go/keybase || die
+}
+
+src_install() {
+	dobin "${T}/keybase"
+}
diff --git a/app-crypt/keynote/keynote-2.3-r3.ebuild b/app-crypt/keynote/keynote-2.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="ssl"
 
-RDEPEND="ssl? ( dev-libs/openssl )"
+RDEPEND="ssl? ( dev-libs/openssl:0 )"
 DEPEND="${RDEPEND}
 	virtual/yacc"
 

diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
@@ -1 +1,2 @@
 DIST libsecret-0.18.3.tar.xz 481256 SHA256 f2bf1d0c5ab4640664f3e3c7ef6b086c180e50ff415720b5e22f96750dbf84c9 SHA512 ff2cdc01f2d68eaa4e3de925616e22532aa41b489ba3da7d071eef64a11b652e78ed44447c5c161eca4aa13d7f3cfb5a6ddef67fee9e520cb58782cc0acac258 WHIRLPOOL b78eb8a3a0cdc7fecd2c74a96eeb6fab9b48f7d994b0a2b0b3e60763956426ce1aab3db3da92cbc1dfdee993a9b7b70920f863fd1859dd2fc047ce659ef5e8e0
+DIST libsecret-0.18.4.tar.xz 499132 SHA256 0f29b51698198e6999c91f4adce3119c8c457f546b133a85baea5ea9010a19ed SHA512 2350d43d8a8db77a4330bc1a8b6ac82270aee7e455373f3e433d5e35539ce5c212fea7a840b0fcf76cf6ec209eb168a64864c582b36e7ec6e1d6b9f78276dcaf WHIRLPOOL cd1952cb97459767b16765c25767c59ccbe028eb8f92c5174f49529cf3caf2c955a72d1396514507a7aced60c993d69d7ed47dbb667338908226da37e6eab1eb
diff --git a/app-crypt/libsecret/libsecret-0.18.4.ebuild b/app-crypt/libsecret/libsecret-0.18.4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+PYTHON_COMPAT=( python2_7 )
+VALA_USE_DEPEND=vapigen
+
+inherit gnome2 python-any-r1 vala virtualx
+
+DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
+HOMEPAGE="https://wiki.gnome.org/Projects/Libsecret"
+
+LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
+SLOT="0"
+
+IUSE="+crypt +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	crypt? ( >=dev-libs/libgcrypt-1.2.2:0= )
+	introspection? ( >=dev-libs/gobject-introspection-1.29:= )
+"
+PDEPEND=">=gnome-base/gnome-keyring-3
+"
+# PDEPEND to avoid circular dep (bug #547456)
+# Add ksecrets to PDEPEND when it's added to portage
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.35.0
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		dev-python/mock
+		introspection? (
+			${PYTHON_DEPS}
+			>=dev-libs/gjs-1.32
+			dev-python/pygobject:3 )
+	)
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-manpages \
+		--disable-strict \
+		--disable-coverage \
+		--disable-static \
+		$(use_enable crypt gcrypt) \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
+
+src_test() {
+	Xemake check
+}
diff --git a/app-dicts/gnome-dictionary/Manifest b/app-dicts/gnome-dictionary/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-dictionary-3.16.2.tar.xz 847024 SHA256 a2981a76ecf57a5e5f1ebc88697f228a40e550c3371535aa15cc959fe51badd5 SHA512 f6c50a8d10e360320ac2ed34a56723f9e7eb72f81f27d40bc69a63eab23cad31e7ff45fb6712ff14b84b3ec2f82ae35bfab0ddde7980766b77d1416be67f384a WHIRLPOOL 6fe96815b79e1d217377ca61d74e2a61ab67a89057e3131cbbbb24b6c43fc908298cab4b34d3ab1c0700859deb18b7ed45d4870261fd0009118f168535157365
 DIST gnome-dictionary-3.18.0.tar.xz 852072 SHA256 5338962124f6d784920ed4968d98734a7589513b36e4f4a6ff00d1ed5afb4ead SHA512 ea276880329422e08923cc9346821bfd7c9bc1b71c09c6521a28f01a6bee34ec4be3b7f503ed8d37916a9b6351074ffd6d4333fed46d7c820198ebf0e62f5eb4 WHIRLPOOL 1c70faa84b96ddebafc2297ed6ea08ea3cec62a76340d5dc0800c2176603dec187b33f1a406538b832907196356f4015cf3c029868447998ef8e22f6f7cb0aef
+DIST gnome-dictionary-3.18.1.tar.xz 864460 SHA256 92cf2d519335b125018468c22405499fdb320e4446201c7b0f55f1a441bf05cc SHA512 efe4d1f8810bf218bae4d393be1d26938ed3a814ed22fb96c0bded5f874c32229b215351b08462eef1c92b756640a3d4e1c0f5ea1ee49f67e519bcf0d53aba74 WHIRLPOOL c20c73504e8ce0745170ec21296191d14770f252c80b208e4ac08659f80d2ece79cd2d408b4e3bdee992475a67be2ec77f4c16e501e8bbbebe8c0a95c3911e7b
diff --git a/app-dicts/gnome-dictionary/gnome-dictionary-3.18.1.ebuild b/app-dicts/gnome-dictionary/gnome-dictionary-3.18.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit gnome2
+
+DESCRIPTION="Dictionary utility for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Dictionary"
+
+LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
+SLOT="0/9" # subslot = suffix of libgdict-1.0.so
+IUSE="+introspection ipv6"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.39:2[dbus]
+	x11-libs/cairo:=
+	>=x11-libs/gtk+-3.14:3
+	x11-libs/pango
+	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gsettings-desktop-schemas
+	!<gnome-extra/gnome-utils-3.4
+"
+# ${PN} was part of gnome-utils before 3.4
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.15
+	>=dev-util/intltool-0.40
+	dev-util/itstool
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		$(use_enable ipv6)
+}
diff --git a/app-doc/gnucash-docs/Manifest b/app-doc/gnucash-docs/Manifest
@@ -1,2 +1,2 @@
-DIST gnucash-docs-2.6.7.tar.gz 58975368 SHA256 80b8188675f3202aa0385f005a99d720a96aa380d2689c9c15f9aa7ecb08de7e SHA512 a73692e72f7613bf5f30869db8f8b42cc209af337ffb95327198a153a764ee0427fda12ee89a14ab932b15dfb8a3f8be318f50910e63b0419a13fb1b9773b262 WHIRLPOOL f6365eda03da9f005f4c6b19887dece44ce3893b57e37902ca2c55605755a9bd56ab00b405089631756fd65fba41a07361fd359e3edd8e76c08a7b7fa439e5c0
+DIST gnucash-docs-2.6.11.tar.gz 66441458 SHA256 dd461bb1168f0b194924c47b182d237f08ec8e13bc7068c901fe834cd2011eeb SHA512 3c78edbdcb757c6f2ef9d6738e150a2c44405a069d92f4177841fbb3df18f8031cc31654f35c2229d73444211124dbfe72b2757864e31e947738fb351a3931e6 WHIRLPOOL fe500754b22b251921a6494f920f51116525d565db12e789d6fceff67a248dff09d86cfdc071ebe3c31e1f0cdbac90c5e9f012209b4444396b7ad367febc263b
 DIST gnucash-docs-2.6.9.tar.gz 63820580 SHA256 5bd92664321c7447b61183d9eb0b57d7bab736f807b36fa901a2553aee06341b SHA512 f3f44912f400bd53fed20d310224e78053a2458a2afb31bb1a19432691bcf4c343a364b97ab62f5fabba45a3006d279139bdd2e8306989c167551435f81ce4ec WHIRLPOOL ae6bffffe84b03a7a75d9da46b98ec255bfbd4f5ff957473c655c880b4f1f48f209af028e865e3f33479e4cea37680b0f3cf6abaa0957ea768c41bb6262ee63e
diff --git a/...oc/gnucash-docs/gnucash-docs-2.6.7.ebuild → ...c/gnucash-docs/gnucash-docs-2.6.11.ebuild b/...oc/gnucash-docs/gnucash-docs-2.6.7.ebuild → ...c/gnucash-docs/gnucash-docs-2.6.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/gnucash/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2 FDL-1.1"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 RDEPEND="!<=app-office/gnucash-2.2.1"

diff --git a/app-editors/gobby/gobby-0.4.13-r1.ebuild b/app-editors/gobby/gobby-0.4.13-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://gobby.0x539.de/"
 SRC_URI="http://releases.0x539.de/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="gnome zeroconf"
 
 RDEPEND="

diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
@@ -204,9 +204,21 @@ src_unpack() {
 	if [[ ${PV} == "9999" ]] ; then
 		git-r3_src_unpack
 		if use staging; then
+			local WINE_COMMIT=${EGIT_VERSION}
+
 			EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
 			unset ${PN}_LIVE_REPO;
+			unset EGIT_COMMIT;
+
 			EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
+
+			local STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
+
+			if [[ "${WINE_COMMIT}" != "${STAGING_COMMIT}" ]]; then
+				einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
+				einfo "If src_prepare fails, try emerging with the env var EGIT_COMMIT."
+				einfo "Example: EGIT_COMMIT=${STAGING_COMMIT} emerge -1 wine"
+			fi
 		fi
 	else
 		unpack ${P}.tar.bz2

diff --git a/app-misc/carbon-c-relay/Manifest b/app-misc/carbon-c-relay/Manifest
@@ -1,3 +1,3 @@
-DIST carbon-c-relay-0.45.tar.gz 63208 SHA256 ba76d93d0448eae64147d580c2767ed42a8a9dd4a6c0f3e15a41276793bc53df SHA512 7a5068a6a1502c80b03c642abb72639de644351edc2967736c6f40939a6e28598727ad7bec9008eb76c3211552d6583f0ec9670e7c32952c0f49f6b4cb9a6085 WHIRLPOOL 089a9a6c3fb40e1bfc680b7002bf9967c4a182ae00616933cd5b3ba9febda20853e716df69d552ade131aa272cd16dafb65d1ba84afeacb4383d87f9e028bf97
 DIST carbon-c-relay-1.4.tar.gz 71367 SHA256 8575be832d204a0c12e4cd793ae05d5c2683974a90e93aeb70e69199b7991d45 SHA512 389d08bccdbd2e566a2580017fb14afd37b0c609f20ecdef526f4810d50c84e06f396a161f0ad4eb7d1810cada9f24640b19afe7a18dd241a16d435cc72d8d0d WHIRLPOOL ad639e96e7589e7cd84e71d4840afeab9f18e768ee98fa9ab6e3d69e4255ad74e5b715e71667eaf330e9a7cc20ce2158058683081bb91785863cbcd5e6a4dccf
 DIST carbon-c-relay-1.5.tar.gz 71236 SHA256 59a64e9567204a6bf2e294123a3b31b483ea3cf6bf1395d3a17272d7ee9ad0b0 SHA512 ca8709a72aaa78de9aedd26a7b953be4550c226d8afaf494d96cb6de683bec871bc7e3d7e8c1ec593dc59783b8ca3c6dff46d83b208c1ffaf86edaa09e44c357 WHIRLPOOL ce328538515cd433d016f24fb11f3b90ef959414d2c3f47c6acab3101893ef42df6de73eebf4a6291d9b471c87e4bc5ec1e046ef50aaf737cc7f08d56cdeda2a
+DIST carbon-c-relay-1.7.tar.gz 71240 SHA256 5cc3c14fa6d466143bd97bcde2c79e0d497e441378178e38da496ccdcde09111 SHA512 2820d9fe83ee5dd0f0ff4a7855951ff1ea1ccb23e585fd2b0932975335a8121b7578a3de9d78a09619689e70262db6a31099471f49b861cec2fa87ffee35a737 WHIRLPOOL 13fb7516a9b594c0d819c00b267a9f12cb428de005d16094a7d6bbc910c8a6d15ce2be3253fe7105dec2b96d91363fce86e37d63cf7a6d683f4757ba6a61a728
diff --git a/...carbon-c-relay/carbon-c-relay-0.45.ebuild → .../carbon-c-relay/carbon-c-relay-1.7.ebuild b/...carbon-c-relay/carbon-c-relay-0.45.ebuild → .../carbon-c-relay/carbon-c-relay-1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 

diff --git a/app-misc/screen/files/screen-9999-bool_visual_bell.patch b/app-misc/screen/files/screen-9999-bool_visual_bell.patch
diff --git a/app-misc/screen/screen-9999.ebuild b/app-misc/screen/screen-9999.ebuild
@@ -36,9 +36,6 @@ src_prepare() {
 	# Don't use utempter even if it is found on the system
 	epatch "${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
 
-	# visual_bell is no longer an int
-	epatch "${FILESDIR}"/${PN}-9999-bool_visual_bell.patch
-
 	# sched.h is a system header and causes problems with some C libraries
 	mv sched.h _sched.h || die
 	sed -i '/include/ s:sched.h:_sched.h:' screen.h || die

diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
@@ -1,3 +1,3 @@
 DIST gnucash-2.6.10.tar.bz2 13513267 SHA256 a8f61651b029b54b89e63763b58ce907aeffc08ecf08320e9fb47d9c878cdb27 SHA512 b7de3cbffef3ee58f66104a097b91b946fa32c65200f2d7e2995296f034a9c9461c86b1ea2cda685df05e00a65cba4b40184b60842be94f562583a62b2120be0 WHIRLPOOL 744c8f0350e3e3840ca89d2647fae9fa7a46fdea20e6ab38c02a509df5578d6d78f79f41a56a65d1ef8e0d1c896cb8f2f14b1f0b754b5073e5879d1a792059f3
-DIST gnucash-2.6.7.tar.bz2 13529748 SHA256 6c15b12eeddc095d6926d9ea84d885c20b8f52781602c15aa3f672a1f7e2beef SHA512 a5711d5d6b89e9c44a28b9733dd185ed9afbe8d2c719675ced9d3e56ecdb03b62313faa5fee42cff70869baf4a3c29d4f69abc54967e46c3aa7ad766fc5a489d WHIRLPOOL b6aff7d48557a4619bfe27c2088ede6c3d2e6820947f457d2db42bc763d5dc24011afd28eb94e66f7a6f5405f2e44f03ae8a43e2fe7679502ea38ad2bee0e36a
+DIST gnucash-2.6.11.tar.bz2 13626927 SHA256 516d97afa61971ca0a16f56319f3f7129db2da1a9d2c77ab7d8b4e6e9e018ac6 SHA512 f3708018f85d17377e11ce55452be7cedd6041da12f66e00047e3cdafb0190da850eb4cbb5699f01cbd79c540af7ef75b44b93c2d5929e13c2a47484741e6a7e WHIRLPOOL 3a5d78835a89718ee539a4c8a62e963172f2e41b8ce1c01ead2425f24529edc8ebc76f41f84596bf8f1438c81e687cc13ed2a4cbd72e87ca35725d88fcdf7d7f
 DIST gnucash-2.6.9.tar.bz2 13230536 SHA256 cdaa61b393133e03bccce3d2740bb358d6bf590de16dd19c790c983d032d8247 SHA512 cf2846c840055c8415183028101c03a2320ef16665961e6819c4ae3a37b486b5b1e6c62adc9f7173e72c9aa68bc4c29aa35602f83639fd5cc1936a3064bf2806 WHIRLPOOL c3c5669f6214c6c47a4b51b5727bdca6247d606f376f02b9cd7e78459ad7c3fbbb7b11aa05dd3d945a192eb593e8981ad4faa8051f8257256f82cebf7d255e0d
diff --git a/app-office/gnucash/gnucash-2.6.7.ebuild → app-office/gnucash/gnucash-2.6.11.ebuild b/app-office/gnucash/gnucash-2.6.7.ebuild → app-office/gnucash/gnucash-2.6.11.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="chipcard debug +doc gnome-keyring hbci mysql ofx postgres python quotes sqlite"
 
 # FIXME: rdepend on dev-libs/qof when upstream fix their mess (see configure.ac)
@@ -49,10 +49,10 @@ RDEPEND="
 	mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] )
 "
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
 	dev-util/intltool
 	gnome-base/gnome-common
 	sys-devel/libtool
+	virtual/pkgconfig
 "
 PDEPEND="doc? ( >=app-doc/gnucash-docs-2.2.0 )"
 
@@ -64,6 +64,10 @@ src_prepare() {
 	# Skip test that needs some locales to be present
 	sed -i -e '/test_suite_gnc_date/d' src/libqof/qof/test/test-qof.c || die
 
+	# Fix automagic on guile detection
+	# https://bugzilla.gnome.org/show_bug.cgi?id=760015
+	epatch "${FILESDIR}"/${PN}-2.6.9-automagic-guile.patch
+
 	eautoreconf
 	gnome2_src_prepare
 }
@@ -79,32 +83,22 @@ src_configure() {
 		myconf+=" --disable-dbi"
 	fi
 
-	# guile wrongly exports LDFLAGS as LIBS which breaks modules
-	# Filter until a better ebuild is available, bug #202205
-	local GUILE_LIBS=""
-	local lib
-	for lib in $(guile-config link); do
-		if [ "${lib#-Wl}" = "$lib" ]; then
-			GUILE_LIBS="$GUILE_LIBS $lib"
-		fi
-	done
-
 	# gtkmm is experimental and shouldn't be enabled, upstream bug #684166
 	gnome2_src_configure \
 		$(use_enable debug) \
 		$(use_enable gnome-keyring password-storage) \
 		$(use_enable ofx) \
 		$(use_enable hbci aqbanking) \
 		$(use_enable python) \
+		--with-guile=1.8 \
 		--disable-doxygen \
 		--disable-gtkmm \
 		--enable-locale-specific-tax \
 		--disable-error-on-warning \
-		 GUILE_LIBS="${GUILE_LIBS}" ${myconf}
+		${myconf}
 }
 
 src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
 	GUILE_WARN_DEPRECATED=no \
 	GNC_DOT_DIR="${T}"/.gnucash \
 	emake check