gentoo resync : 21.07.2018

9 files changed, 168 insertions, 3 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 7a0bd694bcba..0bc47c35d210 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 697e47d0fed5..e0baa7c705bb 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -2,7 +2,8 @@ AUX calligra-3.1.0-doc.patch 323 BLAKE2B 56a886a5b4a4f371eebe3c4f72d5a4817b2fa19
 AUX calligra-3.1.0-no-arch-detection.patch 436 BLAKE2B 117544b6089912f34b3c4cb3ee7837fb4f4377cdc0edc8a6de91156fb99ce010bc857752cf683f7f57ca604dd6393b36eeb807a6007e59bf589e404d02d0cef1 SHA512 f8f747279eabb165da68fe83300223a2bd49a530116c04c9a31de2a32f9f2b3eb46f7866ce194c91d9fcb0ab77fde628574dc9a55e6a08c327e2716849a0da8d
 AUX calligra-3.1.0-plan-qt-5.11.patch 3818 BLAKE2B 1a1f619a491cbc3440ec8db091a1a0775c56f37ebb0be1a4ea0815ced8b6d22598b985e1a419bb572edb430c253d3fd5d0194d6f264ed4ac59c10d8d811cbc72 SHA512 fc375a35f5e29efc404f3546b995568f3c0a9cd3fb94e3c98085a897f9e9d08a1ea41ad1359665392b2f7449e552dead236c3617a4462d94ad4fa2689538150d
 AUX calligra-3.1.0-qt-5.11.patch 3537 BLAKE2B 25aa9f832eb49876e0ee28d3af945658f9e93610fa894cb73dc274083febf5d62c97de427c10277f07aa7ef8054f4e0c811c70d4b0c4068cd018a3475c9a7e80 SHA512 f895ee2b9999ab4ff6dae523e4f4ea6f72bd05a8f8163a33f05401b63c08cc3c987a1207d1008ae808db0564c0036194e3d6ab5806c681b793c5191f9e585a7e
+AUX calligra-3.1.0-stage-qt-5.11.patch 656 BLAKE2B 1a4d8f005fd03395617ba0b225302e40b4aaf75c2a838a3009a3b3b6df7e75afdc798f27f08e76b7ad0ea60766612912d06eebe87c209ad9cab45db4bb3ccf54 SHA512 685bfca658404dc9920c805b97832b0a481a0ec0614bf142978c4ae03329e5e93b28d5af09d021b53c6d7a1316404f87612ab316f6a47c3f174572b50c65989b
 DIST calligra-3.1.0.tar.xz 58037392 BLAKE2B b933012fe0031f4d6eac626054e7fb248f85635e5873224328d30f9aed31dce0a0a49f99cf6eea9c232477400af1d16ffc4dae483cdfd5081720434e95684e50 SHA512 ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b
 DIST calligraplan-3.1.0.tar.xz 3617600 BLAKE2B af45aa28529c18c9fa9fae2b7c03ea1b795d3fec3fd44dbcc4ed056a4b1b843b10cb8a9ad6dab319775a7d7032520721a4719605859dd60100a19eafdcb621ed SHA512 a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156
-EBUILD calligra-3.1.0-r2.ebuild 6801 BLAKE2B 11f72f22bf4fa6ce1c20ceb82f7299a2593d89d79cbfaf60bc18b286bb4afd7e3fe7643bb18349a9a82711ce0384f6456a9c0a8a84fac8c15d517b3192d387ff SHA512 5c367c3f46ac99908708435d2450fcef2e9ac0a875c3d8ddbda97ba11971146f1b71da1a6727292f0943768430619d03d4a11fbda0849b88fe660048f1d15e30
+EBUILD calligra-3.1.0-r2.ebuild 6841 BLAKE2B 08d6ba5579bec64f7fe865ecd47678cec0d85829063f4e8578792bf79a5a288943a6bd42fead2a557c8dc594676a8c04afe07f75762b40bc6de12957a9b3072b SHA512 1e0fdf8cc1a2b75320671be47eea2982aefaf108d158fa998d1b1a3a07e1e3332bd671075df281aa0ae34eb22fd2bc8c55f591f49fc7dec3f8b78b58555273f1
 MISC metadata.xml 1108 BLAKE2B 266bc6539219906527f6e8692cfac1a4c894164466e01bd3ddc290ed665d19af6419ae1a8939002a4ccc719826def4038264ecdd65fca3aef8627106114c804b SHA512 61655e86072fdb828475b721492c3029b834931126af3cd015b2de87f3e7d56a866707d04b04dc36319f45f77fe5f3b650131c1e82a4e65d094288d8effe1893
diff --git a/app-office/calligra/calligra-3.1.0-r2.ebuild b/app-office/calligra/calligra-3.1.0-r2.ebuild
index 0389b5b7c9d7..e2a76aa73c6f 100644
--- a/app-office/calligra/calligra-3.1.0-r2.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r2.ebuild
@@ -142,6 +142,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-no-arch-detection.patch
 	"${FILESDIR}"/${P}-doc.patch
 	"${FILESDIR}"/${P}-qt-5.11.patch
+	"${FILESDIR}"/${P}-stage-qt-5.11.patch
 )
 
 pkg_pretend() {
diff --git a/app-office/calligra/files/calligra-3.1.0-stage-qt-5.11.patch b/app-office/calligra/files/calligra-3.1.0-stage-qt-5.11.patch
new file mode 100644
index 000000000000..120864e11d45
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.1.0-stage-qt-5.11.patch
@@ -0,0 +1,23 @@
+From ee83e0f2c251072e47a2799619cdc79efe67e651 Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Tue, 3 Apr 2018 00:31:19 +0200
+Subject: Fix compilation with Qt 5.11 (missing include)
+
+---
+ stage/part/KPrPresentationTool.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/stage/part/KPrPresentationTool.cpp b/stage/part/KPrPresentationTool.cpp
+index ae743da..3007f91 100644
+--- a/stage/part/KPrPresentationTool.cpp
++++ b/stage/part/KPrPresentationTool.cpp
+@@ -32,6 +32,7 @@
+ #include <QDesktopServices>
+ #include <QUrl>
+ #include <QDBusConnection>
++#include <QFrame>
+ 
+ #include <KoShape.h>
+ #include <KoShapeManager.h>
+-- 
+cgit v0.11.2
diff --git a/app-office/ledger/Manifest b/app-office/ledger/Manifest
index d638b9ecadaf..28ec2c6f7dce 100644
--- a/app-office/ledger/Manifest
+++ b/app-office/ledger/Manifest
@@ -1,5 +1,7 @@
 AUX 50ledger-gentoo-3.1.1.el 166 BLAKE2B f833556da775338829a7dbb288b89f267cbc9723b82fe21a502e96253a132043a12b3737c208f025635cfa8edf8e3d406bc236ad8debf708a66fca3edb162446 SHA512 d5e2450d19d5d24e2db22429fa2ee8d46ae7284c91b1f2ed6eb32a0e6b70e1996f4b2f41812084b0330011d33fbcb2da11bf2d5b9f28a157f4c05d1106c418d5
 AUX ledger-3.1.1-boost.patch 774 BLAKE2B e201dbf7d7af357081112518cf6b615162802307fd708d58df59ad79f12aaf19c3f2ff4645e025145e6afe6078b48f6df27d4128cd71e12e7605c976a4650aa0 SHA512 7f7eaa69ef377df1e9e449981c446ea52ef1d2311a9d96e325bf067af702f0361b05d70d6d52bdeefc7c9471cb68eceaa6fae313976e9b9676110b4e97198ba8
+AUX ledger-3.1.1-r1-boost-python.patch 368 BLAKE2B c9a07bfdf02908bab8f20ebc9da5d9dc21c9fa4f8ffe626b8cb71e9e7d10f675eb1541dd845681839965ae387c5ae9a3244c877e1660f55be467cb4183079964 SHA512 5a63031fd5567234d9f12bc0fecb2e5b92da813c7e528c8e042d55b86d1c177acea4aabc94b6058fead2e8c4f835cd213b67531018e17ee805d7975fb71b50a7
 DIST ledger-3.1.1.tar.gz 842364 BLAKE2B 83f9008f6daf4da39ece192388e0231719bc7297d2a911f1209662f57d2963b9ea09a5b6de9450ed29c5973efa47d9d6a250e052c155d9ba742cdb3ee075f341 SHA512 3f81b98a414cdfc0e272de4e958770149fb1acc8bda880d270e1459ce35294a220c52820bb9af49a751ac3a80b878f81fc7799ba41e0a1be43eba72081351bf5
+EBUILD ledger-3.1.1-r1.ebuild 2636 BLAKE2B 79c1885af47d053f0a0a5e8f86bc87f7e457095209079ab0bf88d167cb6c9659810b26e3ec14c269e09e309ff3476dcaaf8b3ebef2bc0f49e4c3227748d03112 SHA512 fa6103bb7636ab421c7e805261841d02e1c930fe2a180e7671b87d2d886b289b7d83057d8bd1323e4f3c67ec39bf2fcf1c56d6a0c72ddf4fc15d5c9ff1d5594e
 EBUILD ledger-3.1.1.ebuild 3207 BLAKE2B 7a6764868596f6ba5d807a06abb17123a86ecca02e977d5c5f983b41176f6f5a48947acb0e2084459f44615cb52efe5b0669f1304e7bdc7ec7e86a335fd2efb1 SHA512 d8543a0877eb080b97c01eb5306ad2967dab2cf5d522875cc03d07d4b6f899aaa01cb0333e5e0aaba8341939e09207a4f19acfa62c1ea0c1c67d6afd9b413fde
 MISC metadata.xml 306 BLAKE2B 58c3d0307a4358f50e8ede8ddf3f598a55ad03dd9af3351b4f15a46465a844c24f9d5966ee5fbbcb9a68d65eb509a18a87aa95400094539475f65493e34f1839 SHA512 c83b1be9474bbfa3296040c56bf14e22afd214835a44907bcb4db2a8047f05e1fe49b1d1ebe5bcd72fe5ed2f27c832d20169aa813f0d9bd619fc1f7a1c5e15cb
diff --git a/app-office/ledger/files/ledger-3.1.1-r1-boost-python.patch b/app-office/ledger/files/ledger-3.1.1-r1-boost-python.patch
new file mode 100644
index 000000000000..6839b3f60674
--- /dev/null
+++ b/app-office/ledger/files/ledger-3.1.1-r1-boost-python.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f8dbd892..6aacd5b3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -67,7 +67,7 @@ if (USE_PYTHON)
+ 
+   find_package(PythonLibs)
+   if (PYTHONLIBS_FOUND)
+-    set(BOOST_PYTHON python)
++    set(BOOST_PYTHON python-2.7)
+     set(HAVE_BOOST_PYTHON 1)
+     include_directories(SYSTEM ${PYTHON_INCLUDE_DIRS})
+   else()
diff --git a/app-office/ledger/ledger-3.1.1-r1.ebuild b/app-office/ledger/ledger-3.1.1-r1.ebuild
new file mode 100644
index 000000000000..3618c77570fb
--- /dev/null
+++ b/app-office/ledger/ledger-3.1.1-r1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit check-reqs cmake-utils elisp-common python-single-r1
+
+DESCRIPTION="A double-entry accounting system with a command-line reporting interface"
+HOMEPAGE="https://www.ledger-cli.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="doc emacs python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="test"
+
+SITEFILE=50${PN}-gentoo-${PV}.el
+
+CHECKREQS_MEMORY=8G
+
+RDEPEND="
+	dev-libs/boost:=[python?]
+	dev-libs/gmp:0=
+	dev-libs/mpfr:0=
+	emacs? ( virtual/emacs )
+	python? (
+		dev-libs/boost:=[${PYTHON_USEDEP}]
+		dev-python/cheetah
+		${PYTHON_DEPS}
+	)
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/utfcpp
+	doc? (
+		sys-apps/texinfo
+		virtual/texi2dvi
+		dev-texlive/texlive-fontsrecommended
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-${PV}-boost.patch" # bug 609108
+	"${FILESDIR}/${PF}-boost-python.patch" # bug 654326
+	)
+
+# Building with python integration seems to fail without 8G available
+# RAM(!)  Since the memory check in check-reqs doesn't count swap, it
+# may be unfair to fail the build entirely on the memory test alone.
+# Therefore check-reqs_pkg_pretend is deliberately omitted so that we
+# ewarn but not eerror.
+pkg_pretend() {
+	:
+}
+
+pkg_setup() {
+	if use python; then
+		check-reqs_pkg_setup
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Want to type "info ledger" not "info ledger3"
+	sed -i -e 's/ledger3/ledger/g' \
+		doc/ledger3.texi \
+		doc/CMakeLists.txt \
+		test/CheckTexinfo.py \
+		tools/cleanup.sh \
+		tools/gendocs.sh \
+		tools/prepare-commit-msg \
+		tools/spellcheck.sh \
+		|| die "Failed to update info file name in file contents"
+
+	mv doc/ledger{3,}.texi || die "Failed to rename info file name"
+
+	eapply_user
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EMACSLISP="$(usex emacs)"
+		-DBUILD_DOCS="$(usex doc)"
+		-DBUILD_WEB_DOCS="$(usex doc)"
+		-DUSE_PYTHON="$(usex python)"
+		-DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}"
+		-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	use doc && cmake-utils_src_make doc
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	use emacs && elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	einfo
+	einfo "Since version 3, vim support is released separately."
+	einfo "See https://github.com/ledger/vim-ledger"
+	einfo
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
+
+# rainy day TODO:
+# - IUSE test
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 2372d3a99c43..c7173139d648 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -2,5 +2,5 @@ AUX lyx-2.3.0-autotools.patch 1022 BLAKE2B 2238110e621af6b3b3964b6129ee6af55d982
 AUX lyx-2.3.0-python.patch 1049 BLAKE2B 94591099e6b0d52429fa1e066475283ae35ba89a5d07f190dd80aa38ad040cbf53dda3f85f4f12894fc39822309aa7b4cc2bf947d8720caf228c734b7fcee8b1 SHA512 8f2fda91c4c35ffdf3325fc6613df1c5ecd87ced88e4d690aef5c7085edda1b66c0ae704e266521627f7a82eb8b4e2f35fed0f14b37feb367422ef1c5693e31d
 AUX lyx-2.3.0-qt-5.11.patch 481 BLAKE2B 86883721e9d59d0b05d465419e93038c64ee5b473e32cd182487661383ad4921e92d89fe24610046b9434c87b361e66927db385fb9faf0bc2c7e5a85fb84f416 SHA512 aac667b6b28c2053eabbd66516e59970ccfec26504185e8ebc481427c159255ef3e2434bd57aa45a9960fabf7e36549f44302c3fa146f26009e0582ee0cfa8f4
 DIST lyx-2.3.0.tar.xz 15676680 BLAKE2B 4b09f4c3979f51a8b30825c07fe3b24f080bfc8f42d54e94809e342087b683ca24edcb835994583b28d5b9c13868736f850d6c88b229e2d7f6f6bc0fd64c722c SHA512 77366d365f600069564b6d508ba2169744bbc7bc4dc9cb7e9d5f44941796dd7a027ca9ad08f5a67fd6863cbd1f6308ce5233b6e8685ebc6cf78ed19eef84ccb5
-EBUILD lyx-2.3.0.ebuild 4193 BLAKE2B 743e4af8d258ecbd42d31c93b0831e388759780fe19cf642f92eada8af58e4bae44718acb1b8837b18658c815560df2608476cb24a614cc8f26e5c3634f99110 SHA512 751af5cea41d673b4b8180de7eab01e003978132c4fcd99e26a83c7f87fd422dd3bc35b3a80cdc823b31d8d40a67154f0509174929a4bea86d94d38aa3185228
+EBUILD lyx-2.3.0.ebuild 4153 BLAKE2B 70acac07e3bb81db76fc06793e3e926f93950da5029dadf28be8422bc962558d6c2c394294a43d1c4da132c90b0b1925fb56992f400afea855812ed285cf713b SHA512 fa01460363dde26c2e772fcdd2a5ddecdd3da26569866251bcd57a802d9f3f9ca1ca4dd6b3dd8a8f0b66d2d99ca460a1da6db7ac3a0bd43e6d62c46885e1ef23
 MISC metadata.xml 1539 BLAKE2B 124b453cd6f7a6eccaa0e4db033edf451f9e21f16915de2576fb8c8920af472fe330e4b3bde2c7659d57a512f571b543b745bdb2177f6bd28b29da7e9fa703af SHA512 603a568a98ca584f5baebdfbdb6c83c892fba1df71fab12449d625e5c58b8961322bbdf1263d2493dbb68f61c747655d2b84360b7f34851c235fa10c3f3c2f52
diff --git a/app-office/lyx/lyx-2.3.0.ebuild b/app-office/lyx/lyx-2.3.0.ebuild
index c5452baaac77..d98d6f051aef 100644
--- a/app-office/lyx/lyx-2.3.0.ebuild
+++ b/app-office/lyx/lyx-2.3.0.ebuild
@@ -51,7 +51,7 @@ RDEPEND="${PYTHON_DEPS}
 		dev-texlive/texlive-latexextra
 		dev-texlive/texlive-mathscience
 		dev-texlive/texlive-pictures
-		|| ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericextra )
+		dev-texlive/texlive-plaingeneric
 		|| (
 			dev-tex/hevea
 			dev-tex/latex2html