gentoo resync : 25.01.2018

3 files changed, 148 insertions, 76 deletions

diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index 68264a80cb27..b994c3696a20 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -9,5 +9,5 @@ AUX kmymoney-4.8.0-tests.patch 7303 BLAKE2B 9af6e4438ddd5f0a992744f9b063a3b5e4d1
 DIST kmymoney-4.8.0.tar.xz 20785888 BLAKE2B 23819f5ef4f1ec0951f8b598041b7516efae94ccc6677404b133039023e6141e078226938d2c6d6fa6332803d4ee23d1c855e4db1945ada3d02d8302103876d0 SHA512 883635a94333341cbe3d6c835fe1dbc1cc5ed5cc834f76c945030ec680aee4fc6ceb367fdde811672a392eb5cd7b735c858e0be5a7f7964a4ccf5f9ba8865381
 DIST kmymoney-4.8.1.1.tar.xz 20963444 BLAKE2B d2be72a1c7dc41f48405ee406c419b9eb74cc02a80949965b8241331c00fbec23c32177aea0a401a76ef64a97e25e9e532c28e4f29bf88c9c2fd04f608790df6 SHA512 1f730f7db9117469aebaab33891f6064f648fa0ad25afff9ac1fab8d638c376d8e1f013401512c4be060436d6bbdfdacad6427b1e0911ac6b46288db1e242783
 EBUILD kmymoney-4.8.0-r3.ebuild 2080 BLAKE2B 47916c64c9bc3f9fcc906d11c2e1a02df5224f40297454ab228b99f8a5d8ca4df5dd068052fccc0a218efe3bcf9e8b16f53bad2b0d691acf0a0357d12dda9362 SHA512 f74c37356f2059c14c224aa600af5fc0b6cb6217be1ce431bf57223d93299ca515ecdd1801487c06502703b61bb81faa42be6358e3cda17c4099335d6c19dfaf
-EBUILD kmymoney-4.8.1.1.ebuild 1637 BLAKE2B 5d4356523d4258df4691253bc15186a26e9a2c5620442c409a59f86515d61599e8c2818fd86eba336e70aa4d7524e2394ae0e3355c7439239e8aa1a8ad502966 SHA512 b3383ff299aa42d89d274c4c4244d9d058634f558f46e13fbb39f7a215a9448fc1a1494500b696eaee701c977df6fd4e404e62eb0d7420028be09abe7934bc78
+EBUILD kmymoney-4.8.1.1-r1.ebuild 3311 BLAKE2B 7ea9f95e3b07439bb0745d7fdc8e783f82343747c5c601c19ccdd7723fed22b23aff47a3f245d69496fe107287853360f319f4eee5e898234e801a2e6318e325 SHA512 bc5b019ba2ab8c5871e86cf30cf7090b687052ca66ba3ed5dda8645f7c1290f875b5a3ad2d39c9e2bb3f236fda243ad4f8087ef719dde904ce79fafd8d43fa23
 MISC metadata.xml 607 BLAKE2B 3c2d771c20d49a41fef17d5b82bb7530f7db7611f19fa708045a81c55392cb06c0a82df7c0e9c80f8f2fb089e9233ea5a570700c37d3f0ca8782505ddf5216df SHA512 53ff98b9a6a419763e03670c0f6b5da707ff0b17f9f6ac8c03df46502599225d8780c099627fe8bc1c35f13452b80deb88d6fd0da450634f42a9aed827d256e1
diff --git a/app-office/kmymoney/kmymoney-4.8.1.1-r1.ebuild b/app-office/kmymoney/kmymoney-4.8.1.1-r1.ebuild
new file mode 100644
index 000000000000..612279679a18
--- /dev/null
+++ b/app-office/kmymoney/kmymoney-4.8.1.1-r1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic virtualx
+
+DESCRIPTION="Personal finance manager by KDE"
+HOMEPAGE="https://kmymoney.org/"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="calendar debug doc +handbook hbci ofx quotes test weboob"
+
+COMMON_DEPEND="
+	>=app-crypt/gpgme-1.7.0[cxx]
+	<app-office/libalkimia-6.0.0
+	dev-libs/gmp:0=
+	dev-libs/libgpg-error
+	dev-qt/qtcore:4[ssl]
+	dev-qt/qtdbus:4
+	dev-qt/qtgui:4
+	dev-qt/qtsql:4
+	dev-qt/qtsvg:4
+	kde-frameworks/kdelibs:4
+	x11-misc/shared-mime-info
+	calendar? ( dev-libs/libical:= )
+	hbci? (
+		>=net-libs/aqbanking-5.5.1
+		>=sys-libs/gwenhywfar-4.15.3[qt4]
+	)
+	ofx? ( >=dev-libs/libofx-0.9.4 )
+	weboob? ( www-client/weboob )
+"
+RDEPEND="${COMMON_DEPEND}
+	kde-frameworks/oxygen-icons:*
+	handbook? ( kde-frameworks/kdelibs:4[handbook] )
+	quotes? ( dev-perl/Finance-Quote )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	handbook? (
+		app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xsl-stylesheets
+	)
+	test? ( dev-qt/qttest:4 )
+"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if [[ -v LINGUAS ]] ; then
+		pushd po > /dev/null || die
+		local lang
+		for lang in *; do
+			if [[ -e ${lang} ]] && ! has ${lang/.po/} ${LINGUAS} ; then
+				case ${lang} in
+					CMakeLists.txt) ;;
+					*) rm -r ${lang} || die ;;
+				esac
+				cmake_comment_add_subdirectory ${lang}
+				sed -e "/add_subdirectory([[:space:]]*${lang}\/.*[[:space:]]*)/d" \
+					-i CMakeLists.txt || die
+			fi
+		done
+		popd > /dev/null || die
+	fi
+
+	if ! use handbook; then
+		cmake_comment_add_subdirectory doc
+	else
+		if [[ -d doc && -v LINGUAS ]] ; then
+			pushd doc > /dev/null || die
+			local lang
+			for lang in *; do
+				if ! has ${lang} ${LINGUAS} && [[ ${lang} != "en_US" ]]; then
+					cmake_comment_add_subdirectory ${lang}
+				fi
+			done
+			popd > /dev/null || die
+		fi
+	fi
+
+	# don't install as executable
+	sed -i kmymoney/CMakeLists.txt \
+		-e "/install.*kmymoney.appdata/ s/PROGRAMS/FILES/" || die
+}
+
+src_configure() {
+	use debug || append-cppflags -DQT_NO_DEBUG
+
+	local mycmakeargs=(
+		-DUSE_QT_DESIGNER=OFF
+		-DENABLE_LIBICAL=$(usex calendar)
+		-DUSE_DEVELOPER_DOC=$(usex doc)
+		-DENABLE_KBANKING=$(usex hbci)
+		-DENABLE_LIBOFX=$(usex ofx)
+		-DCMAKE_DISABLE_FIND_PACKAGE_KdepimLibs=ON
+		-DKDE4_BUILD_TESTS=$(usex test)
+		-DENABLE_WEBOOB=$(usex weboob)
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && cmake-utils_src_compile apidoc
+}
+
+src_test() {
+	local kded4_pid
+
+	_test_runner() {
+		export $(dbus-launch)
+		kded4 2>&1 > /dev/null &
+		kded4_pid=$!
+
+		cmake-utils_src_test
+	}
+
+	unset DBUS_SESSION_BUS_ADDRESS DBUS_SESSION_BUS_PID
+
+	local myctestargs=( -E "(kmymoney-querytabletest)" ) # requires ktimezoned
+	virtx _test_runner
+
+	if [[ -n "${kded4_pid}" ]] ; then
+		kill ${kded4_pid}
+	fi
+
+	if [[ -n "${DBUS_SESSION_BUS_PID}" ]] ; then
+		kill ${DBUS_SESSION_BUS_PID}
+	fi
+}
+
+src_install() {
+	use doc && HTML_DOCS=( "${BUILD_DIR}/apidocs/html/." )
+	cmake-utils_src_install
+
+	# We don't want /usr/share/doc/HTML to be compressed,
+	# because then khelpcenter can't find the docs
+	[[ -d ${ED%/}/usr/share/doc/HTML ]] &&
+		docompress -x /usr/share/doc/HTML
+}
diff --git a/app-office/kmymoney/kmymoney-4.8.1.1.ebuild b/app-office/kmymoney/kmymoney-4.8.1.1.ebuild
deleted file mode 100644
index 24a7abd20135..000000000000
--- a/app-office/kmymoney/kmymoney-4.8.1.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-SQL_REQUIRED="always"
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit kde4-base
-
-DESCRIPTION="Personal finance manager by KDE"
-HOMEPAGE="https://kmymoney.org/"
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="calendar debug doc hbci ofx quotes weboob"
-
-COMMON_DEPEND="
-	>=app-crypt/gpgme-1.7.0[cxx]
-	<app-office/libalkimia-6.0.0
-	dev-libs/gmp:0=
-	dev-libs/libgpg-error
-	x11-misc/shared-mime-info
-	calendar? ( dev-libs/libical:= )
-	hbci? (
-		>=net-libs/aqbanking-5.5.1
-		>=sys-libs/gwenhywfar-4.15.3[qt4]
-	)
-	ofx? ( >=dev-libs/libofx-0.9.4 )
-	weboob? ( www-client/weboob )
-"
-RDEPEND="${COMMON_DEPEND}
-	quotes? ( dev-perl/Finance-Quote )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	# don't install as executable
-	sed -i kmymoney/CMakeLists.txt \
-		-e "/install.*kmymoney.appdata/ s/PROGRAMS/FILES/" || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_QT_DESIGNER=OFF
-		-DENABLE_LIBICAL=$(usex calendar)
-		-DUSE_DEVELOPER_DOC=$(usex doc)
-		-DENABLE_KBANKING=$(usex hbci)
-		-DENABLE_LIBOFX=$(usex ofx)
-		-DCMAKE_DISABLE_FIND_PACKAGE_KdepimLibs=ON
-		-DENABLE_WEBOOB=$(usex weboob)
-	)
-	kde4-base_src_configure
-}
-
-src_compile() {
-	kde4-base_src_compile
-	use doc && kde4-base_src_compile apidoc
-}
-
-src_install() {
-	use doc && HTML_DOCS=("${BUILD_DIR}/apidocs/html/")
-	kde4-base_src_install
-}