gentoo resync : 30.04.2018

11 files changed, 4 insertions, 193 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 26d6a69ea5ed..2b3c49ca60a1 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index 0be048f68bd3..9ac9965049cf 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,5 +1,3 @@
-DIST gnumeric-1.12.35.tar.xz 20019316 BLAKE2B 45e0097c37c05dc6295994434b9d181f447a1edca2080f699f5bd73112e794014449fe863890389f6d17370f834e9a79c1f3a1e094d3556de09956a712b63088 SHA512 0781c0d003342653a7cb57d2f23d1222903f18fdce15f4276250aae66239fc5f0da6472d900a59d29b511fbf55b529f7923a68f346752cd242775d52f99aba11
 DIST gnumeric-1.12.38.tar.xz 19807364 BLAKE2B 5b250991d2a635334d1799b421733a50cbe5dc92c3b792f0c8f3635a37bb72601f62e444ed7cb705ae7456b804fd16e8ab7c1b6567db27a9f12b4b5407b30e1b SHA512 71cf29355b865a3c0f966482ef0cbc90553326fcdc10103762d6c35c1f932371b5dffa3d3d89cd575d3f202ba041e4caaf987db08051b700757ea165508ea217
-EBUILD gnumeric-1.12.35.ebuild 1481 BLAKE2B 00e05f12dfbbe7e2fd1b0dcfa7c1e976dbeda972e26f5837753f12498a0d9e66ee2470551a961850c0b0cfab4f948bdf6763d5a895119e6ed3ac5b2543f5e1c3 SHA512 46a82a1ea94eefe58396928f2c81d342fd56e4b6f11b5492f914980efd80dd80f0366346a1e29d1a32a299780af9cd95d6cacefa01b8df39a8bbe3624224a49c
 EBUILD gnumeric-1.12.38.ebuild 1481 BLAKE2B b276ce951f9fe55b64c122dbbeef2bba20cfa60c8401c0f6d334a7578b7fb4d4470e79ff811072720e0523235ecf164cc1384a7fa31baed9eef09737413d9e8a SHA512 3d07d4c973902f3b8ad45bb5ceb0c7173ea7d6ee90e604043d04457dbab7b82d29c223f4a1b87e402eac5d1668ed3a631cafa535cbe7b7485639bb9a53ff0c4f
 MISC metadata.xml 465 BLAKE2B c246609f5d6b20c968faeb36a0c6e33df41ae8a373360ed003541fdf816ff9399f62ababfc4aea5c557bcf9dac83a71357ce9e789ca08d94e83cdeda83aaa275 SHA512 753783aee82021a573093a0ecb7807bdf56d037032fb1afa5559db44b1d06f72bdf9aedfead48cae9917d78aaa7c39d19e528946ef45b51fd6cf5357b9b020fa
diff --git a/app-office/gnumeric/gnumeric-1.12.35.ebuild b/app-office/gnumeric/gnumeric-1.12.35.ebuild
deleted file mode 100644
index e7f7097db30f..000000000000
--- a/app-office/gnumeric/gnumeric-1.12.35.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 flag-o-matic python-single-r1
-
-DESCRIPTION="The GNOME Spreadsheet"
-HOMEPAGE="http://www.gnumeric.org/"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-IUSE="+introspection libgda perl python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Missing gnome-extra/libgnomedb required version in tree
-# but its upstream is dead and will be dropped soon.
-
-# lots of missing files, also fails tests due to 80-bit long story
-# upstream bug #721556
-RESTRICT="test"
-
-RDEPEND="
-	app-arch/bzip2
-	sys-libs/zlib
-	>=dev-libs/glib-2.38.0:2
-	>=gnome-extra/libgsf-1.14.33:=
-	>=x11-libs/goffice-0.10.28:0.10
-	>=dev-libs/libxml2-2.4.12:2
-	>=x11-libs/pango-1.24.0:=
-
-	>=x11-libs/gtk+-3.8.7:3
-	x11-libs/cairo:=[svg]
-
-	introspection? ( >=dev-libs/gobject-introspection-1:= )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS}
-		>=dev-python/pygobject-3:3[${PYTHON_USEDEP}] )
-	libgda? ( gnome-extra/libgda:5[gtk] )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35.0
-	app-text/yelp-tools
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--with-zlib \
-		$(use_with libgda gda) \
-		$(use_enable introspection) \
-		$(use_with perl) \
-		$(use_with python)
-}
diff --git a/app-office/grisbi/Manifest b/app-office/grisbi/Manifest
index c8895e73ec38..9c04eb45819a 100644
--- a/app-office/grisbi/Manifest
+++ b/app-office/grisbi/Manifest
@@ -1,5 +1,3 @@
-DIST grisbi-1.0.0.tar.bz2 6933736 BLAKE2B daf2fac96452f6293e46c969a8b714cdc52f496506c5e61e341ded392b945118b817f42c43094b10b3e78a0f3fda18c9a2732931e0c6bb457064f51641492db6 SHA512 ec99f78cc4e6a7d3501bb40914491fc7a539c337e27f3360d84bcaff05bfa06dcd949f52177a7d2661cbc785ea9b27d3587cd4858363dc08a8daffac1015d77a
 DIST grisbi-1.0.2.tar.bz2 6956892 BLAKE2B dde75fbae341fc03226083567ff4731457abc7079ace92956c9e8b35ba4140dba32dc67ebe3b2a4826750229dbcd09da0f2eaf1f18c8783238d3fee274c46be9 SHA512 5988d362db8e94f135af34de1acfd7222ceeca11d229ffca533ca75c75c8054dda121bc45979106ee8f4ed2ac0660ba7836dfd053478fdbe4a2984cb94be3cf8
-EBUILD grisbi-1.0.0-r1.ebuild 851 BLAKE2B 821e9ec1798bfde343baf8442101019c9b215073a6517f52bbb476aba10af2b4e3c200f778fd86eb4bad4e72b721a7fe438a3a08ff8c0e52447bb62044f3451d SHA512 c449d4c1c5195f0f4222ae53386d1e56dd7fe6119b78f68b87d50c5e0e88643aacd0f44643fa8843993c1e3acc7dd8714eb6c3fae9019ce3523f21a06caa37f3
 EBUILD grisbi-1.0.2.ebuild 851 BLAKE2B ed663f8a87f1f917b1854bd0d077562d82559df468efe624972619379038a7fbb53a8eb8dffc69b002599ffbf5d04092f95ec0cb4d286c2232f7f9018ec6474c SHA512 b424233da058418dfc40a4fadef7beba94e4e3caf58441b1ba18215a5f7203ded75bf31f1e4a056350cc2a22fab88ddb111379a59d0b4380ccecaa73cd52e012
 MISC metadata.xml 635 BLAKE2B df6fdefe6d4474ec7b1a5c1a68572dcd5879ccaa2fd09c217ac28790156f964a0a62e5460e54113389c664437d8f8b3917d1334fec2a78317b9105f31b9fb205 SHA512 c1c5f6e2bbe4a11958cc78c3f61d8045dc89bddd640c15ef93c52de9acdd7cc00f483ad1c06f3dbd36fdda998a45ca0c31d6e188ba17ed4bae72f8a3b2c21766
diff --git a/app-office/grisbi/grisbi-1.0.0-r1.ebuild b/app-office/grisbi/grisbi-1.0.0-r1.ebuild
deleted file mode 100644
index e1b84aefc7d1..000000000000
--- a/app-office/grisbi/grisbi-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Grisbi is a personal accounting application for Linux"
-HOMEPAGE="http://www.grisbi.org"
-SRC_URI="mirror://sourceforge/grisbi/grisbi%20stable/1.0.x/${P}.tar.bz2"
-IUSE="libressl nls ofx ssl"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND="
-	dev-libs/libxml2:2
-	>=dev-libs/glib-2.18.0:2
-	>=x11-libs/gtk+-2.12.0:2
-	x11-misc/xdg-utils
-	ssl? (
-		libressl? ( dev-libs/libressl:0= )
-		!libressl? ( >=dev-libs/openssl-0.9.5:0= ) )
-	ofx? ( >=dev-libs/libofx-0.7.0 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--with-libxml2 \
-		--without-cunit \
-		--disable-static \
-		$(use_with ssl openssl) \
-		$(use_with ofx) \
-		$(use_enable nls)
-}
diff --git a/app-office/gtimelog/Manifest b/app-office/gtimelog/Manifest
deleted file mode 100644
index c73aaee0714f..000000000000
--- a/app-office/gtimelog/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gtimelog-0.8.1.tar.gz 188353 BLAKE2B 00f7b82e325991b3e8619d21c97a3a8ca90e98fba8d9c9c2feb55db94648dc52cc015331366cebf6d23dc9c603a42cd8f103b10016a13dcb70ae13be4efcdc6a SHA512 bec4e3182d08be1a75da79f30b58b76e77e1b678477b33edeba529fdf15d8f61d9913c0f43d7ed46cf39b571ab481a8620c5f20b60fb251e16f530aa6465ce98
-EBUILD gtimelog-0.8.1.ebuild 1683 BLAKE2B 8d9f0e6e7cf27c9893a828bd892a8f1120d76dc62de41e0fb0c8ff186fdd87a2658e5cbfe472e829fb260dc94c8fc3ff151cd216e01507411bdd4ce5871b7cb8 SHA512 4c1ccc22b1ce68d3785b600c96d37301c59af32bf7d5716b57b1f471c76b4f848adabc56092b793388c2404fdb4ea16b652daaac78265c5d3c1a06ce83e3befa
-MISC metadata.xml 215 BLAKE2B 1274babdade745b392492158ef88dbfb742f5183846b179d9579c5be2111a120865b5c044444f604c034cf34889c4baf818eba01e93f7b7fd0252147c1aa8646 SHA512 17d528e6b23f28c9dcaf8a7a995c8426086e4e58586803942c34370bfcf6dc21f3d2d6adf15d72990a8a53063525eb4a10c929b19080948297cc4bb1c0eebd30
diff --git a/app-office/gtimelog/gtimelog-0.8.1.ebuild b/app-office/gtimelog/gtimelog-0.8.1.ebuild
deleted file mode 100644
index 7f8038eefe8b..000000000000
--- a/app-office/gtimelog/gtimelog-0.8.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_IN_SOURCE_BUILD=true
-DISTUTILS_SINGLE_IMPL=true
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="A small Gtk+ application for keeping track of your time"
-HOMEPAGE="http://mg.pov.lt/gtimelog/"
-LICENSE="GPL-2"
-SLOT="0"
-
-SRC_URI="https://launchpad.net/gtimelog/devel/${PV}/+download/${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-
-IUSE="ayatana test"
-
-# gnome-base/gnome-desktop provides gnome-week.png
-RDEPEND="
-	dev-libs/gobject-introspection
-	dev-python/dbus-python
-	dev-python/pygobject:3
-	gnome-base/gnome-desktop:2
-	x11-libs/gtk+:3[introspection]
-	x11-libs/pango[introspection]
-	ayatana? ( dev-libs/libappindicator:3[introspection] )
-"
-DEPEND="test? (
-	${RDEPEND}
-	ayatana? ( dev-libs/libappindicator:3[introspection] ) )
-"
-
-DOCS="HACKING.txt NEWS.txt NOTES.txt README.txt"
-
-src_prepare() {
-	# Support prefixed installation
-	sed -e "s:\"/usr:\"${EPREFIX}/usr:g" \
-		-i src/gtimelog/main.py || die "sed failed"
-
-	sed -i -e 's/python2.3/python/' scripts/export-my-calendar.py || die
-
-	sed -i -e 's/Application;//' gtimelog.desktop || die #462958
-
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	VIRTUALX_COMMAND=distutils-r1_src_test virtualmake
-}
-
-src_install() {
-	domenu gtimelog.desktop
-	doicon src/gtimelog/gtimelog-*.png
-	insinto /usr/share/gtimelog
-	doins src/gtimelog/*.ui src/gtimelog/gtimelog.png
-	exeinto /usr/share/gtimelog/scripts
-	doexe scripts/*.py
-
-	distutils-r1_src_install
-	python_fix_shebang "${ED}"
-
-	# Don't install icons in /usr/lib/python*
-	find "${ED}/$(python_get_sitedir)" -regex '.*\(png\|ui\)$' -exec rm -f {} + || die
-}
diff --git a/app-office/gtimelog/metadata.xml b/app-office/gtimelog/metadata.xml
deleted file mode 100644
index 38e0c10c87f0..000000000000
--- a/app-office/gtimelog/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<upstream>
-		<remote-id type="launchpad">gtimelog</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index bc4f258be37d..a173c3b16828 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,4 +1,4 @@
 AUX kmymoney-5.0.1-cmake.patch 1089 BLAKE2B 5574c6bebd5502a4f6046a57c14593b5b305734981bf04fe19bc500ccb76dcc56e851213b011c4cef41795d9134e970fb5a83e7372cf928136efbbf84451ace1 SHA512 dc894facca9ff086b92397b8fde830fee54593130eb52523ba8d3c517d037f98af8639918007a4970ce1c0e1df88208dd06a80fa6cf5d00ea6a7e06269702b74
 DIST kmymoney-5.0.1.tar.xz 13307860 BLAKE2B df61285f848df693510f1807bbf66b7cfec4498f2c540df3420731734a8ced8c4ae6426e338af2cecc85278120087eddc261a9e35bad50722991e3bb617d4a9c SHA512 74ace8d98f144c503d572c68cf50c27664a49bc5f4428788b69a1da52b8f72e97e1bb70914dbf041c43884c3b6340e28390618dec179ebe3d1b3ea63bede93e7
-EBUILD kmymoney-5.0.1-r2.ebuild 3139 BLAKE2B 8e372597b3e759bc9b2d98b911e2bf0f1ea5b44bea5423ed7b349c29e0642f447f8d68e0024f817260bf80772c5f528c541f39e04a0c27e71620901e4cdf88fc SHA512 b806f365594fdc062993a6b0441f4c918e2178348828a4cdc5b6a9efeea328f6fac2f9b6e81f5ed31b4d55985d7c077d10f034ff825ff80736e803d9afdbb093
-MISC metadata.xml 787 BLAKE2B 090845c035b23d5dd951c6836a154c74736597c05f52a6841596d1d3663085176aae10ae54489eb6152faa82a5c77dbe7001861c63ca1b6191a534022e1be5bc SHA512 19f3d92cb3b3e92ce1692d76af59bc474257948a4740300484f17eecca391b0a4f6f5517fe6dd06d513231706c1123cf1e955ea6fb3a321d2fbc71063da68586
+EBUILD kmymoney-5.0.1-r2.ebuild 3098 BLAKE2B ed4c52096ca0dba934af17e1c692938575a296fa6a14b877319cff9f10eded23639b0845d1fc9e078e573726edb8a42d51c2c4a1d69292f4bd315bb18c323c84 SHA512 20048a1ce4a9a4f323bd8237823c1d3558b923fc42fdd6c9ba240dfdb6360a62e097677487dd5c38b4b628d6ec570a0da1dde4aafe760434b8c79f11712c1ccc
+MISC metadata.xml 793 BLAKE2B 0ecca47b6d189eb9d19c4b61d43579429def819e075267f203a382fe3fb55cedfc14faeb409efed1e975688df260e3574bf03c29601e102f9cce662ecc15d81c SHA512 5c52ef57a4c75b2b439036ba561fed505a9bb331e1eac61a0816287b068687cfe3c22c260baba788aae68c0a304ad9e6aa72599d12a1fb511765d9722749e06c
diff --git a/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild b/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild
index c1e3975e0277..44363179fe05 100644
--- a/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild
+++ b/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild
@@ -70,10 +70,7 @@ COMMON_DEPEND="
 		>=net-libs/aqbanking-5.6.5
 		>=sys-libs/gwenhywfar-4.15.3-r1[qt5]
 	)
-	holidays? ( || (
-		$(add_frameworks_dep kholidays)
-		$(add_kdeapps_dep kholidays)
-	) )
+	holidays? ( $(add_frameworks_dep kholidays) )
 	ofx? ( dev-libs/libofx )
 	weboob? (
 		${PYTHON_DEPS}
diff --git a/app-office/kmymoney/metadata.xml b/app-office/kmymoney/metadata.xml
index 728b63474546..34cd0358c540 100644
--- a/app-office/kmymoney/metadata.xml
+++ b/app-office/kmymoney/metadata.xml
@@ -9,7 +9,7 @@
 		<flag name="activities">Enable <pkg>kde-frameworks/kactivities</pkg> integration</flag>
 		<flag name="addressbook">Enable <pkg>kde-apps/akonadi</pkg> contact integration</flag>
 		<flag name="hbci">Enable HBCI support using <pkg>net-libs/aqbanking</pkg></flag>
-		<flag name="holidays">Enable <pkg>kde-apps/kholidays</pkg> integration</flag>
+		<flag name="holidays">Enable <pkg>kde-frameworks/kholidays</pkg> integration</flag>
 		<flag name="quotes">Enable Online Stock Quote retrieval</flag>
 		<flag name="weboob">Enable import of online banking transactions extracted by <pkg>www-client/weboob</pkg></flag>
 	</use>