gentoo resync : 25.03.2018

9 files changed, 12 insertions, 198 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 670f4018a4f1..9bbe20e81805 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/auto-multiple-choice/Manifest b/app-office/auto-multiple-choice/Manifest
index 6370e8d323af..03eb77105788 100644
--- a/app-office/auto-multiple-choice/Manifest
+++ b/app-office/auto-multiple-choice/Manifest
@@ -1,5 +1,5 @@
 AUX auto-multiple-choice-1.3.0-conf.patch 1889 BLAKE2B aa39f1525f6067e8025094b3c7437f72c11eec7cb5b0fcbbe68388b80c1ff01050f2fc224671e1a6901f52d51e761f2702d17ce0e75f5ca67ffc8d721ef37cb6 SHA512 6c7cce8383dbbb23646b96785b69dd75f6d3e842d6712b3b5741a5151f7dde5a9ee05bd35e3dee374641f453128e8008304cc6001d9a1db707528ecb7b1ba496
 AUX auto-multiple-choice-1.3.0-desktop.patch 637 BLAKE2B bf06b2761d35b669b88a0915a273022045e169e09dd76ca4ae40723d44d57fabb518dec83f811124421cfc82a53cd1435c60c6763b534d6a3ae4449b2bc00de6 SHA512 b1eec21b2f640bfdf7a4d7d956a71b2fa9889a6d5428cc7eedc1352e845477c3a81607d0c1502b4f57967264384aff5dcc2162bb552544b962c383dc7f978ffa
 DIST auto-multiple-choice_1.3.0_sources.tar.gz 4328255 BLAKE2B 7c6337cfa0a12d8dcd9fa640e636c300234ba7e7a34e95a523c5f9836f934da336f6ce792932fffb97b28ae02c577166a3d4d3ea4fd6959786a5c60510b454a2 SHA512 fcfacd071072f5773556c706b6fa0aea4ff3f3752f3a1f40c9e6de7ec870e939adc57e6bd4c90cac80241cc798e02a71c9fc80d9ccf25ad3a10752f937d06da5
-EBUILD auto-multiple-choice-1.3.0-r1.ebuild 2492 BLAKE2B 7e1a401b2d055c334c2f606f38e3ece39ed30999a5719b2679937ee2d7e8c110e677e939bc8c78bdc7da4c94639baf13d7c4b57e6f6b2db22bb4dd1c5103e9b0 SHA512 d7d29544cd7608021c8706bd2d15cbf75c7ba59306be20fe8ae3027f57c11acfa2930b0137ce94eb008ce599c182762b3befc82cc7c48e3a62caae452558f505
+EBUILD auto-multiple-choice-1.3.0-r1.ebuild 2486 BLAKE2B 1c4b23c10a1a39156a08b0b35d8711da08bbf0d2f8964bb1740ecad9eed2fc470ad3011d5456b8f709557a8c06880fc8996c7986d0f512fc1a7075601e7b52bc SHA512 dbbb20f11e87687a7effe92cb50fc0e1362bab557d1fbe76a34ee9c3d60f100e79e8bdae1f53792dab3264bb6cb8ce05299b2e56a0044afe0fe0043616ad5535
 MISC metadata.xml 501 BLAKE2B c68be06e9c151e4a61fea79f981c1e62a74ca9f5d5b8e172313f05466476528cd45b95e58a7dc55ccbe01fc533502a3c190272ea58548ac2e62b4b4116b04a5b SHA512 d779df58826ceda811954becb0c8862bd6da1d99f19726d00ecbbb14e2080aa6afa7a01d8c7fc8af12e7071247528186e7eb94547c718ea97acdf766bc60d768
diff --git a/app-office/auto-multiple-choice/auto-multiple-choice-1.3.0-r1.ebuild b/app-office/auto-multiple-choice/auto-multiple-choice-1.3.0-r1.ebuild
index 925afe07ad38..a3734539e03f 100644
--- a/app-office/auto-multiple-choice/auto-multiple-choice-1.3.0-r1.ebuild
+++ b/app-office/auto-multiple-choice/auto-multiple-choice-1.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ for lala in ${LANGS}; do
 done
 
 CDEPEND="
-	app-text/texlive[dvi2tty,extra,graphics,png,pstricks,science,truetype,xml,X,luatex,xetex,humanities,omega,publishers]
+	app-text/texlive[dvi2tty,extra,graphics,png,pstricks,science,truetype,xml,X,luatex,xetex,humanities,publishers]
 	app-text/poppler:=
 	dev-perl/XML-LibXML
 	media-libs/netpbm
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index 0a94c6a157ba..c30840fb4f94 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1,12 +1,10 @@
 AUX gnucash-2.7.4-double_free.patch 553 BLAKE2B 3c59299aaf868e52834a8b7c594afedcfde35b7e6058fbe87a8fce57f2773d914b971566c831ae0a998680a3cfc69c5b1c75664087abaf1023e84fd650751592 SHA512 458bf645e16cb88e7ab37b218b442a11b02f6d3eb95fd1c4ae368813bff08bb3455666942c719f17df5348a5c775bc7e0e14507825896463624252aa24a056c9
 AUX gnucash-2.7.4-fix-tests-for-32bit-platforms.patch 1840 BLAKE2B 4de54cb147d563686febad739dddbc7e7e4f1cf92a5f1961fe4ccf452e8e2c495e7a4773a615a77835f4f1ef99d0f5d22c871c1643ada67bec216ae96dff3ce2 SHA512 f89f560e3e6d594836a431831a4a384301e405be49fccece0a761f1d2c17340a68f71ddc8cde4f7e99a2e05e2d3ddc6bda5b59e54ca0baa3a76ac63f7399d48b
-DIST gnucash-2.6.19.tar.bz2 13612124 BLAKE2B cc66e4d7994274bb2ad97437333dbe62b0e9228e20e05e01fc7861bc45a8f07bc56d2a69850eda301d5e7f679d96a9d28c24c56a4860cff6727b66867482deae SHA512 0a979caf48ba96d6f37a929036e7172855cfb03af8832f479966bce72fad3400903925134d33aaa31eb6b36a2041f5e0d3f74b88e95b83c7d76e96b1503bec13
 DIST gnucash-2.7.4.tar.bz2 13364512 BLAKE2B 0a552efe5a4f024517c054516eb25b51abb2f934e6fc904afd4b0fb48283f9ebb89583b83b0efefba66d014df16c8997c413d05278d4290c44e4fa2278564b61 SHA512 d096ec2a3907dcd09c936f0a49ef6fb5028a17d2e0ade9e68eae7303530480ce19e08c1864efd862d363fda9ef6343260396b794b3c4ac74544baa2628a310eb
 DIST gnucash-2.7.5.tar.bz2 13330271 BLAKE2B e06328050a2dd8e80e224cf13f51c1c7151e73f9a1c9f14581f33bfcf8bf07b273962620b7281637101eab8c5eff67a3e5e8e34d81f0c8d263ac33bf6d1eb40c SHA512 68cd6e6f61a43b8837e9efe693d22f62ebe10a8bb7d593814fb6a12d035d74ec1e444f53010ad53c6b1adf28c75aa482403c06052314a91636c2a8baa30e09af
 DIST gnucash-2.7.7.tar.bz2 13368946 BLAKE2B 06e6815af713235ea31859532911303db4fa5e8dcd50b9111aa513795963eaca29a612eeced27399441f43563753d977468dfd901a49dfa689b5d36e7b985ebf SHA512 b7d91e87c4bc4e604560f4502a86deaafa4f636e9fe2af26db53b11da9f48986c970ba0ed08cb7172ca08a5fb2da451d26976963241206c388a33555c80f28fe
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
-EBUILD gnucash-2.6.19.ebuild 3331 BLAKE2B 67b53dbb60ab5b8160c0e73d3135a200e41f21fd5cfceb7e7f652967af5fcf0381bcd5436f9120fb025bf4ab22a4bd4eae94ac9dacfcdfcda9efec5375fd52d4 SHA512 3c928dd6a952c570f744bae0d843b5dfd48548e12b40c15f73cc4651e49d81989eb845643ec99b175b3eaf01a042f8bf5ceadb02917ea2e998595db0b3e68b8b
 EBUILD gnucash-2.7.4-r1.ebuild 3952 BLAKE2B 011a368e9bf441c05aaaf3681ed666151ad7a68fb849c2ceca50079f47b91265f9ef10b2cf10367393f3df5243bd59e76c7a2362c3ff498c855058412112c977 SHA512 9cdf9f7b57fa0eda3d5d3d154b194bb869fc360fdac5049e327eedb9b27d91a2e4022a3388d1c372a6d84f337c7d1be96722603e05ac4028073e6a9b7baaadc2
 EBUILD gnucash-2.7.5.ebuild 3922 BLAKE2B 072fd6a6232473c97276a2a1b1988b8f3f69b6c9de963c2429150e39a444b3035e5b33fb4417bf9cea906487165bd54bcab3dd3332d429c33c411edde499cb1c SHA512 1a57b87c6c4d894e1ca4a3948916b613756e6797b1c0eafff0dea3ba380c7c28dbd53d849eae08f80522496ed710e9578ad3c48ca69a1b4f5b349abefc4a588c
-EBUILD gnucash-2.7.7.ebuild 3932 BLAKE2B 6ee11719030dd3f9c727d69d491578fcb805be530823b7e9f97869a13cc860fd6448f39d20cd9878f163977c077c7dae12934d754cf1818e37f8fb5f6f91b219 SHA512 c2b4b6067554594c2e5a7af7d495b78f7dfd74a2cefeb4c962dad2ef14f3ce2ae5a5496e4de70edbd78c5916f464a1709e6783ec0700e4f01f3e3d6605f56e5a
-MISC metadata.xml 842 BLAKE2B 32276a0205e3726e5dc547bbac615cb04f1137cf9f34389810921ec6fe55312af21f31732cbfd998a2f1678b06b8f54a16601d0b02e580e3c4a609159f0628dd SHA512 ef6c9aacda5849e8d6a8bc03ff9266fbf38b2256f085b4e4cd3c4a91007f3a4a81740417f18d7f5f437fbf4167de4ffbdb4742e381ded06b12a8433b550ed542
+EBUILD gnucash-2.7.7-r1.ebuild 3938 BLAKE2B caeec758f850e9bf89d6baad7e2884cf9fefa3892dbaf0dbab63be92d28664dcac46122a3f5a00bcee2b7a88cd788e611e8823da3dcc5a3ee12cf066fce2da52 SHA512 0025632752b6f45f7ec5259560ff9b7998bb8247be8ead416db1c281efded6da014770b23718e067cf54e7044537b7cbf6343d8c016ef6e1230041ea0cf123cb
+MISC metadata.xml 766 BLAKE2B 8da7802829c98dfc8a219d6ad339081af2ed5506668e0331ce944e61a69eb7c9bfb5ac2b7a27616cf2b59081aee348654774937336b5540bab8f2333c1d577c5 SHA512 5e64d4d0a7e9570bb12793d983852deacf8a94a79a153c18e490109d68f1275f82dc584d0bda4b5e3df119660cba90c7c03852ee046a7c7a29626c05cdea6784
diff --git a/app-office/gnucash/gnucash-2.6.19.ebuild b/app-office/gnucash/gnucash-2.6.19.ebuild
deleted file mode 100644
index b9f08f0f1f42..000000000000
--- a/app-office/gnucash/gnucash-2.6.19.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools gnome2 python-single-r1
-
-DESCRIPTION="A personal finance manager"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="chipcard debug +doc gnome-keyring hbci mysql ofx postgres python quotes sqlite"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# README.dependencies mentions qof, but ${PN} has their own fork in the
-# source code that appears to have deviated from that project.
-#
-# libdbi version requirement for sqlite taken from bug #455134
-RDEPEND="
-	>=dev-libs/glib-2.32.0:2
-	>=dev-libs/libxml2-2.5.10:2
-	>=dev-libs/popt-1.5
-	>=dev-scheme/guile-1.8.5:12=[deprecated,regex]
-	<dev-scheme/guile-2.2
-	>=net-libs/webkit-gtk-1.2:2
-	>=sys-libs/zlib-1.1.4
-	>=x11-libs/goffice-0.7.0:0.8[gnome]
-	>=x11-libs/gtk+-2.24:2
-	dev-libs/libxslt
-	dev-scheme/guile-www
-	gnome-base/dconf
-	gnome-base/libgnomecanvas
-	x11-libs/pango
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	hbci? (
-		>=net-libs/aqbanking-5[gtk,ofx?]
-		sys-libs/gwenhywfar[gtk]
-		chipcard? ( sys-libs/libchipcard )
-	)
-	mysql? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[mysql]
-	)
-	ofx? ( >=dev-libs/libofx-0.9.1 )
-	postgres? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[postgres]
-	)
-	python? ( ${PYTHON_DEPS} )
-	quotes? (
-		>=dev-perl/Finance-Quote-1.11
-		dev-perl/Date-Manip
-		dev-perl/HTML-TableExtract
-	)
-	sqlite? (
-		>=dev-db/libdbi-0.9.0
-		>=dev-db/libdbi-drivers-0.9.0[sqlite]
-	)
-"
-
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	gnome-base/gnome-common
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-
-PDEPEND="doc? (
-	~app-doc/gnucash-docs-${PV}
-	gnome-extra/yelp
-)"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-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
-
-	# We need to run eautoreconf to prevent linking against system libs,
-	# this can be noticed, for example, when updating an old version
-	# compiled against guile-1.8 to a newer one relying on 2.0
-	# https://bugs.gentoo.org/show_bug.cgi?id=590536#c39
-	# https://bugzilla.gnome.org/show_bug.cgi?id=775634
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf
-
-	DOCS="doc/README.OFX doc/README.HBCI"
-
-	if use sqlite || use mysql || use postgres ; then
-		myconf+=" --enable-dbi"
-	else
-		myconf+=" --disable-dbi"
-	fi
-
-	# gtkmm is experimental and shouldn't be enabled, upstream bug #684166
-	gnome2_src_configure \
-		--disable-doxygen \
-		--disable-error-on-warning \
-		--disable-gtkmm \
-		--enable-locale-specific-tax \
-		$(use_enable debug) \
-		$(use_enable gnome-keyring password-storage) \
-		$(use_enable hbci aqbanking) \
-		$(use_enable ofx) \
-		$(use_enable python) \
-		${myconf}
-}
-
-src_install() {
-	# Parallel installation fails from time to time, bug #359123
-	# Usually reproducible after removing any gnucash installed copy
-	MAKEOPTS="${MAKEOPTS} -j1" GNC_DOC_INSTALL_DIR=/usr/share/doc/${PF} \
-	gnome2_src_install
-
-	rm -rf "${ED}"/usr/share/doc/${PF}/{examples/,COPYING,INSTALL,*win32-bin.txt,projects.html}
-	mv "${ED}"/usr/share/doc/${PF} "${T}"/cantuseprepalldocs || die
-	dodoc "${T}"/cantuseprepalldocs/*
-}
diff --git a/app-office/gnucash/gnucash-2.7.7.ebuild b/app-office/gnucash/gnucash-2.7.7-r1.ebuild
index 11fc957fcffb..5b5dde99e048 100644
--- a/app-office/gnucash/gnucash-2.7.7.ebuild
+++ b/app-office/gnucash/gnucash-2.7.7-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 # google{test,mock} version
 GV="1.8.0"
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{4,5,6} )
 
 inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
 
diff --git a/app-office/gnucash/metadata.xml b/app-office/gnucash/metadata.xml
index 4c84c7d43e6d..f0b8ab6233e1 100644
--- a/app-office/gnucash/metadata.xml
+++ b/app-office/gnucash/metadata.xml
@@ -10,11 +10,12 @@
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
 	<use>
-		<flag name="aqbanking">Connect to some internet banks via AqBanking</flag>
-		<flag name="chipcard">Enable support for chipcard reading and
-		processing.</flag>
-		<flag name="hbci">Enable HBCI support, for connecting to some internet
-		banks</flag>
+		<flag name="aqbanking">
+			Connect to some internet banks via AqBanking
+		</flag>
+		<flag name="chipcard">
+			Enable support for chipcard reading and processing.
+		</flag>
 		<flag name="quotes">Enable Online Stock Quote retrieval</flag>
 		<flag name="register2">Use the new register (Experimental)</flag>
 	</use>
diff --git a/app-office/orage/Manifest b/app-office/orage/Manifest
index cda82b087f6a..23f6f77f97bc 100644
--- a/app-office/orage/Manifest
+++ b/app-office/orage/Manifest
@@ -1,4 +1,3 @@
 DIST orage-4.12.1.tar.bz2 2590788 BLAKE2B 0f00b5704e11923c2ceaac81f0956457402a90f65709c165c98b6942745ea3adee176691555a18548ead258951693187e1b3ce9a718abb3b13c2a1c2a4754e7e SHA512 3fec0201171140586cdc9bcf151450a7086515e18b5815afe4fe4c4726ba554c50582b0479e52985b330140c51b7233ef81f678f986f848afbeee74c66b2d196
 EBUILD orage-4.12.1-r1.ebuild 1540 BLAKE2B 32e995bf7b5a3518a30f3dddb2a1ccb74f45fd5c249605dcf168ce9bc6e9cac557cae37d927f1754faa6aacf6b04b48c384a491c4ff941a21d8722f5781c6530 SHA512 43a08917b88afe4b324975dd098fa7046353fe42734d1a4ec156955622800397f4154581a4c70fa67b8328077ab926db8a93db866c3e84f6875f526f6a409b2b
-EBUILD orage-4.12.1.ebuild 1606 BLAKE2B 9615f3a1c20a94c697ef5ee6225deedcd5089e40a1fb7d7257ad46b8a3bc69e0f32d51e1c4407424d9124534e78bb3e942e7ea4e78fc896cc3453dcb7546ad3f SHA512 465baef549d375d3a9105f10f8b638e16e6a7aa681aec26da41895e09ada76fab153f127c3266eba7d177a5a8f95bb1b214effb5895499cdda76d65ad7ea3cd1
 MISC metadata.xml 355 BLAKE2B 4ddbf38a80be81b7e131d7c616dfb88dff1e900952c17c4cc4dd26711e720351177d92d8225825dd57354399ecdb8b7bccd18f883fcd927846e8614dd4ac4a99 SHA512 a5d3f875ac31caa10ca77ce8eb38449b3007094d1b9d7d307bd15ee29644c09530d44ac6a4953e10adfa3bd45b6a3fe44dbbb3b80ab7d0c8572c48523ef287eb
diff --git a/app-office/orage/orage-4.12.1.ebuild b/app-office/orage/orage-4.12.1.ebuild
deleted file mode 100644
index b8aee6929704..000000000000
--- a/app-office/orage/orage-4.12.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit multilib xfconf
-
-DESCRIPTION="A time managing application (and panel plug-in) for the Xfce desktop environment"
-HOMEPAGE="https://git.xfce.org/apps/orage/"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="berkdb dbus debug libnotify +xfce_plugins_clock"
-
-RDEPEND=">=dev-libs/libical-0.48:=
-	dev-libs/popt:=
-	>=x11-libs/gtk+-2.10:2=
-	berkdb? ( >=sys-libs/db-4:= )
-	dbus? ( >=dev-libs/dbus-glib-0.100:= )
-	libnotify? ( >=x11-libs/libnotify-0.7:= )
-	xfce_plugins_clock? ( >=xfce-base/xfce4-panel-4.10:= )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	>=sys-devel/libtool-2.2.6
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		--libexecdir="${EPREFIX}/usr/$(get_libdir)"
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}/html
-		$(use_enable xfce_plugins_clock libxfce4panel)
-		$(use_enable dbus)
-		$(use_enable libnotify)
-		$(use_with berkdb bdb4)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-	# PM doesn't let directory to be replaced by a symlink, see src_install()
-	rm -rf "${EROOT}"/usr/share/${PN}/doc
-}
-
-src_install() {
-	xfconf_src_install \
-		docdir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		imagesdir="${EPREFIX}"/usr/share/doc/${PF}/html/images
-
-	# Create compability symlink for retarded path hardcoding in src/{mainbox,parameters}.c
-	dosym /usr/share/doc/${PF}/html /usr/share/${PN}/doc/C
-}