gentoo resync : 28.12.2017

10 files changed, 22 insertions, 118 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 20d3cf0eaaf6..e1a613433faf 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/kraft/Manifest b/app-office/kraft/Manifest
index 4aeabaabad1c..82b28827c958 100644
--- a/app-office/kraft/Manifest
+++ b/app-office/kraft/Manifest
@@ -1,6 +1,3 @@
-AUX kraft-0.80_pre20171115-deps.patch 1564 BLAKE2B 8f80a7debb8a3a2e6312f687aeb5fc9134c4cf6f37f51b6bbbe392c63a66ce27982c7e90fc0904265fe5882eae3da07b31b53601bd73ecadbfaa3fd9835f8493 SHA512 b1d2b93a3f375ea7f05366626b3d542e1bf4b39fd9fc381082d101a61d742f68c0596c9f213836e18d0ac0746bd4351adc7eea223bed12050a78cdbb4e0ca877
-DIST kraft-0.59.tar.xz 560116 BLAKE2B bd9ab18015582c34343e0fa93601937c8bb874a063ae37a6ed481170206ba6430cbe09068c4cdc879f80a37f1cd770b350b3841752f3146ef95680a565e4126f SHA512 53576855e3a4ac054818cc3fcb5d123222c0a5839ba621ea7c1f390f1e3180b5c87b00daa09a57fbea64cbd1dc857c4cb7645c5f539635811ef236c76483dc36
-DIST kraft-0.80_pre20171115.tar.gz 572784 BLAKE2B cfc0718d137e57ba7e217ba3d92f14e64ef61daffdc38dd85acc19a6eb0169200550fae098c4fbf2238eb794676daebc0de1a3669cfed1cb7cd59bec308fecb6 SHA512 7c9fa4b8c17809c36f4f6d94f4d6b900f91083c86b332d7680db1ad721904823b25cab5b8393913220dea9b16937bc90ac403af8f57fc6f963d59af41e1f51c3
-EBUILD kraft-0.59.ebuild 755 BLAKE2B 75109107d8f906400db82a3c78cd62fee7f8af3d5838d4433e53b37ddcdc5e201edc52143cc67f920faed73168a2799b0a35cb7e7a98ae2cf54f9991714c649b SHA512 0517e87d4bb3639c1380330fe6ed94dd2e26ba355fa6e584537482dfc5c4a400bfafc5cd545663cf4bacf939a107d597a2806f7767e791c790f6553d6822f3ec
-EBUILD kraft-0.80_pre20171115.ebuild 1202 BLAKE2B eafeddcdbdedc69f5229347c01a6389f220950998c021d0b6eb3d91914257d95f022b2a64bf658e995387edb2976aeda2dcbac860d0351d5da0502df7aa50882 SHA512 95c6348f93ca01df0cf9dc55a0774b5e4186d7b3236a80bfaf7a8143038d13955c9c717966ff8f42570a364a8d610e5051076cfcba62807232e50aa3529e190b
+DIST kraft-0.80_beta3.tar.gz 625756 BLAKE2B ecbad304b76b7bec827573d4f001ac36b55c84df1a78fcdee25d71dc6efc9b341aa6d708bd288beee3a7c75d2f1b60f01aa6877a29ef750487a516d7575de5a3 SHA512 d94b00fb8b366473948641425288118acf276b429169c4e187b66dfb1ce4bc0d326ee215bd8b3dcbde25d2ec04ab2f0c3dcf4c22ada676a31e761a8278bc06da
+EBUILD kraft-0.80_beta3.ebuild 1128 BLAKE2B 5929e31d759e445ea1bcc932869abbca16723d91a26b210d91ce98903147e185999fd17aeeaf3c256840a5a5e86448bd0cf1da6ed32a048bba8a81e4e5221c5b SHA512 cad140f88e0f1569b5e500eea74d33e565fa451e7f6c57e4721d7d4cc95d458bad2f2603310f35706b72e85643d33b4f488f0fa57017b5b5456638ef43b1a473
 MISC metadata.xml 418 BLAKE2B b99b3d436a90af1cd1a791e8cd1aeaed2c654a659a45f5e88b5c5b0cd02d57bc15df8e225cd93e9041732dfbf45792721d29df8c2187d409ecf3a4202855266e SHA512 eb8a053a7375546c713741d2bcacdb4604c725322c6680d76eade40ea4166cf20d8ecef4c4f0a7ef4304961bf2740b8277f5372137e04d32a52bc254daf65232
diff --git a/app-office/kraft/files/kraft-0.80_pre20171115-deps.patch b/app-office/kraft/files/kraft-0.80_pre20171115-deps.patch
deleted file mode 100644
index cebf558fd355..000000000000
--- a/app-office/kraft/files/kraft-0.80_pre20171115-deps.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 63248f8004e7e0b05fe1716f6ff432b16b382e8f Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Thu, 16 Nov 2017 22:14:05 +0100
-Subject: [PATCH] Sort deps, add implicit, and split PIM from real KF5 libs
-
-Add descriptions to PIM dependencies.
----
- CMakeLists.txt | 33 ++++++++++++++++++++++++++-------
- 1 file changed, 26 insertions(+), 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 739daac..9f95ecf 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -25,21 +25,40 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII)
- 
- find_package(Qt5 CONFIG REQUIRED
-     Core
--    Network
--    Widgets
-+    Gui
-     Sql
-+    Widgets
-+    Xml
- )
- 
- find_package(KF5 REQUIRED COMPONENTS
--    Contacts
-+    Config
-+    ConfigWidgets
-+    CoreAddons
-     I18n
-+    WidgetsAddons
-     XmlGui
--    OPTIONAL_COMPONENTS
--    Akonadi
--    AkonadiContact
- )
- 
--if(KF5Akonadi_FOUND)
-+find_package(KF5Contacts REQUIRED)
-+
-+find_package(KF5Akonadi)
-+set_package_properties(KF5Akonadi PROPERTIES
-+    DESCRIPTION "Library for general Access to Akonadi"
-+    URL "https://www.kde.org/"
-+    PURPOSE "Optionally used for addressbook integration"
-+    TYPE OPTIONAL
-+)
-+
-+find_package(KF5AkonadiContact)
-+set_package_properties(KF5AkonadiContact PROPERTIES
-+    DESCRIPTION "Library for Accessing Contacts stored in Akonadi"
-+    URL "https://www.kde.org/"
-+    PURPOSE "Optionally used for addressbook integration"
-+    TYPE OPTIONAL
-+)
-+
-+if(KF5Akonadi_FOUND AND KF5AkonadiContact_FOUND)
-    add_definitions(-DHAVE_AKONADI)
- endif()
- 
diff --git a/app-office/kraft/kraft-0.59.ebuild b/app-office/kraft/kraft-0.59.ebuild
deleted file mode 100644
index 48777bb0f346..000000000000
--- a/app-office/kraft/kraft-0.59.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KDE_LINGUAS="ast bg bs cs da de en_GB eo es et fi fr ga gl hu it ja lt mai mr nds
-nl pl pt pt_BR ru sk sv tr ug uk zh_CN"
-QT3SUPPORT_REQUIRED="true"
-SQL_REQUIRED="always"
-inherit kde4-base
-
-DESCRIPTION="Software for operating a small business, creating documents such as invoices"
-HOMEPAGE="http://www.volle-kraft-voraus.de/"
-SRC_URI="mirror://sourceforge/kraft/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND="
-	dev-cpp/ctemplate
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtsql:4[mysql,sqlite]
-	$(add_kdeapps_dep kdepimlibs)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS Changes.txt README Releasenotes.txt TODO )
diff --git a/app-office/kraft/kraft-0.80_pre20171115.ebuild b/app-office/kraft/kraft-0.80_beta3.ebuild
index c6fd91b04ec3..8046838cfbcf 100644
--- a/app-office/kraft/kraft-0.80_pre20171115.ebuild
+++ b/app-office/kraft/kraft-0.80_beta3.ebuild
@@ -3,13 +3,12 @@
 
 EAPI=6
 
-COMMIT=6618f5203f80a52e673cfad1a12dcee9154e2831
 KDE_HANDBOOK="forceoptional"
-inherit kde5 vcs-snapshot
+inherit kde5
 
 DESCRIPTION="Software to manage quotes and invoices in small enterprises"
 HOMEPAGE="http://www.volle-kraft-voraus.de/"
-SRC_URI="https://github.com/dragotin/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/dragotin/${PN}/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
 
 KEYWORDS="~amd64 ~x86"
 IUSE="pim"
@@ -38,7 +37,7 @@ RDEPEND="${DEPEND}
 
 DOCS=( AUTHORS Changes.txt README Releasenotes.txt TODO )
 
-PATCHES=( "${FILESDIR}/${P}-deps.patch" )
+S="${WORKDIR}/${PN}-${PV/_/}"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest
index 3cc026a9a6e2..ce9c54a6a548 100644
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@@ -3,8 +3,8 @@ DIST texstudio-2.11.2.tar.gz 24143941 BLAKE2B 2c17b70cd497338ee9c7cd7fda0bdcb877
 DIST texstudio-2.12.2.tar.gz 26311798 BLAKE2B 1eb3add771a28918f39c69bb167eee31456ab87afcff0f4ae66ccd73d96fdfba5cbfbc57666908f7e7ffb5c69fd2d5aebf342338b9e3a56d3c31fb774f9cd1a7 SHA512 255b211fe715ffc91706ab20877ffaa4b8e0710d3e6f381e7a6b8eed19bb889d89d0913756839c1f0c427029c0da9713b78bd1e21769ccc46cf976b65c91c6f6
 DIST texstudio-2.12.4.tar.gz 26401510 BLAKE2B 53f1aca4f28154c5ae0f941e074e2da6d727dedf6b5604b301efccd95eea256a6cb91bf887985d81c65964c0e407cd1a8c2037a3bd73559aa115bec3954df744 SHA512 6e1d114ae87c854231399004504e460d078b9bf26ceb25c7fc592b79d3234f9880f8c021c3ddb2ef26a883dbddc2b94f98f368c976aa16973d3c1a6823a4150d
 DIST texstudio-2.12.6.tar.gz 26511069 BLAKE2B 95f2043222e15f96ed56dabb9bbbb937e3f8f1869cb667897bbdb48b99626089bf14a5e321c57ca5c9196d1cf2ce0beaad322b04d90f8a0b62189ff7c5be0d33 SHA512 16e846137b529f89f10dba3f847afe5a875ce1bc4029d002f76a1bcde491dd44756b27e38b4c5c159fcdb12b025759c8a0ebbbb8d8bd296e954b53032434170a
-EBUILD texstudio-2.11.2-r1.ebuild 2084 BLAKE2B cec2c5d81a213802cc5c6d39ccb553435c28938886d22a9d8e4ef854e8cd5428b7cf206528df341c80268c3533bd0ac5c11c46f1ebc4b0328385c8526c1a147c SHA512 6b33a086416a4f027562443a52e3a88eeef683c6347c389acb793b183767a5b89690a5a069e8936ecdce676d336d6ef39cc626bd1e76986d441aad6d39873f65
-EBUILD texstudio-2.12.2.ebuild 1976 BLAKE2B 7f9b30872088bb657eaeddf4b1c74ca4a78947838a9430ef4bb579826f36db030ea257aaee9cbf9553b4036ba0628612d8bc53602ceace0c7419585a612a6b80 SHA512 bf4b526c1817384ae6311616b70e6bfaa8b6bc3d19c487f5559e8b31df63903d65ed9c6a1bb4f6f0d0fdd5ef6a0c5c56f8eabdfe9d49ae3014e5cae42f3f4fa2
-EBUILD texstudio-2.12.4.ebuild 1976 BLAKE2B 7f9b30872088bb657eaeddf4b1c74ca4a78947838a9430ef4bb579826f36db030ea257aaee9cbf9553b4036ba0628612d8bc53602ceace0c7419585a612a6b80 SHA512 bf4b526c1817384ae6311616b70e6bfaa8b6bc3d19c487f5559e8b31df63903d65ed9c6a1bb4f6f0d0fdd5ef6a0c5c56f8eabdfe9d49ae3014e5cae42f3f4fa2
-EBUILD texstudio-2.12.6.ebuild 2248 BLAKE2B 983ea1e64a01e11a445f17543bbe8b3dcf003363bcc9878bd39f37a2ff87b2f0f0378ee8e19ac39988392f05af8589fde263c3a4265759d8fd13fe8515a876da SHA512 22846835b22e661fb38097e065166b9a8f856faaf657461651b83c5144b41694ed1d1b53d14fda4683f990147a19d6059ae7753a1b04f81bbb6b85c43c11c8dc
+EBUILD texstudio-2.11.2-r1.ebuild 2078 BLAKE2B 30839bf7a4381478264178bae93d8a27b5685dd166b241254b0550b6d2388bbbf0f965937fd4a7c6123d7988d6df76a72ee450c830446c15dba9e0185772a7fe SHA512 98cf771d4aaaeec2a8ee95dc97c90978f29501e212eeafde332dcd505c2bc65475ddbc4828aa742b2d0b5a910bdf43a358f2aaddbcf8aca2f9f4271cf20e46c1
+EBUILD texstudio-2.12.2.ebuild 1970 BLAKE2B 41567a33175fe3bc434f64a861b5e9a0f15ad2a49a834f1a2c8aa1d4d73ea231557c399d04067031ef10f88dac35926561be6c7533819e3c0431db8eedae16cb SHA512 be81a9aafadd25daec6248bd09bf31cf9c9611b49d3996c79caf912e70d47a16f5430a0b37e25fee408374309130b924f1fd58e8ffcd6ea69e98d8b1175ff8ec
+EBUILD texstudio-2.12.4.ebuild 1970 BLAKE2B 41567a33175fe3bc434f64a861b5e9a0f15ad2a49a834f1a2c8aa1d4d73ea231557c399d04067031ef10f88dac35926561be6c7533819e3c0431db8eedae16cb SHA512 be81a9aafadd25daec6248bd09bf31cf9c9611b49d3996c79caf912e70d47a16f5430a0b37e25fee408374309130b924f1fd58e8ffcd6ea69e98d8b1175ff8ec
+EBUILD texstudio-2.12.6.ebuild 2251 BLAKE2B d4b417dc49f30348d25d6f73f261db4cddb310e9de70c6d315c1242fd1d2908eebade81409cb7574e9a4a9d72a5b88b19965c2c0ca206f098c1be0b61cef9c07 SHA512 0716eaefca1b0eac1c55c96939e39fa52089df304458d3853a411e3470804f39dcb1800b373e2000cd14a9c4608c9ba6766143f1e46ae21464c94bce3edad10b
 MISC metadata.xml 402 BLAKE2B 175128174922bf7356817c3752f7207f5c6b2827c0d52e8e0d837fbd19b4429eb6d0154b729d89ff5eff2ed777fad5f05b43c52a3bd5d57ebca3d31c09439964 SHA512 f587cb59a103c39e4685815677a9cc6de4b0db189332b520aaefb3011fe1537485f184395e19f2c18a24dd7f2101e5d5dc2f3eed38f18623cb7a69ebd52da41f
diff --git a/app-office/texstudio/texstudio-2.11.2-r1.ebuild b/app-office/texstudio/texstudio-2.11.2-r1.ebuild
index 717dc846c4bb..f89cc3500ab7 100644
--- a/app-office/texstudio/texstudio-2.11.2-r1.ebuild
+++ b/app-office/texstudio/texstudio-2.11.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit fdo-mime gnome2-utils prefix qmake-utils
+inherit gnome2-utils prefix qmake-utils xdg-utils
 
 DESCRIPTION="Free cross-platform LaTeX editor (fork from texmakerX)"
 HOMEPAGE="http://texstudio.sourceforge.net/"
@@ -17,7 +17,7 @@ IUSE="video"
 COMMON_DEPEND="
 	app-text/hunspell:=
 	app-text/poppler[qt5]
-	>=dev-libs/quazip-0.7.2[qt5]
+	>=dev-libs/quazip-0.7.2[qt5(+)]
 	dev-qt/designer:5
 	dev-qt/qtcore:5
 	dev-qt/qtconcurrent:5
@@ -86,11 +86,11 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
diff --git a/app-office/texstudio/texstudio-2.12.2.ebuild b/app-office/texstudio/texstudio-2.12.2.ebuild
index 0c8d76e1c1ce..c877b493c4cb 100644
--- a/app-office/texstudio/texstudio-2.12.2.ebuild
+++ b/app-office/texstudio/texstudio-2.12.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit fdo-mime gnome2-utils prefix qmake-utils
+inherit gnome2-utils prefix qmake-utils xdg-utils
 
 DESCRIPTION="Free cross-platform LaTeX editor (fork from texmakerX)"
 HOMEPAGE="http://texstudio.sourceforge.net/"
@@ -17,7 +17,7 @@ IUSE="video"
 COMMON_DEPEND="
 	app-text/hunspell:=
 	app-text/poppler[qt5]
-	>=dev-libs/quazip-0.7.2[qt5]
+	>=dev-libs/quazip-0.7.2[qt5(+)]
 	dev-qt/designer:5
 	dev-qt/qtcore:5
 	dev-qt/qtconcurrent:5
@@ -81,11 +81,11 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
diff --git a/app-office/texstudio/texstudio-2.12.4.ebuild b/app-office/texstudio/texstudio-2.12.4.ebuild
index 0c8d76e1c1ce..c877b493c4cb 100644
--- a/app-office/texstudio/texstudio-2.12.4.ebuild
+++ b/app-office/texstudio/texstudio-2.12.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit fdo-mime gnome2-utils prefix qmake-utils
+inherit gnome2-utils prefix qmake-utils xdg-utils
 
 DESCRIPTION="Free cross-platform LaTeX editor (fork from texmakerX)"
 HOMEPAGE="http://texstudio.sourceforge.net/"
@@ -17,7 +17,7 @@ IUSE="video"
 COMMON_DEPEND="
 	app-text/hunspell:=
 	app-text/poppler[qt5]
-	>=dev-libs/quazip-0.7.2[qt5]
+	>=dev-libs/quazip-0.7.2[qt5(+)]
 	dev-qt/designer:5
 	dev-qt/qtcore:5
 	dev-qt/qtconcurrent:5
@@ -81,11 +81,11 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
diff --git a/app-office/texstudio/texstudio-2.12.6.ebuild b/app-office/texstudio/texstudio-2.12.6.ebuild
index cd646408ec2c..7423c9bac35b 100644
--- a/app-office/texstudio/texstudio-2.12.6.ebuild
+++ b/app-office/texstudio/texstudio-2.12.6.ebuild
@@ -22,7 +22,7 @@ IUSE="video"
 COMMON_DEPEND="
 	app-text/hunspell:=
 	app-text/poppler[qt5]
-	>=dev-libs/quazip-0.7.2[qt5]
+	>=dev-libs/quazip-0.7.2[qt5(+)]
 	dev-qt/designer:5
 	dev-qt/qtcore:5
 	dev-qt/qtconcurrent:5