gentoo resync : 16.01.2018

9 files changed, 177 insertions, 6 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index ba33c5561899..79a6af6bad04 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index a20d52b9c0a7..5a0a621f8270 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1,6 +1,9 @@
+AUX gnucash-2.7.3-no-gtest-src.patch 518 BLAKE2B e61dbf22ab7f02af16289bee02ca1617e135d9e92526836efd04952e03ebe7a7e8c8710b174c2b5a9c03565ece674fd04403a146ddba793f9ec02ee4a9b22636 SHA512 d5279af31d454fc71b18c4308cb0d854c1e654190a1c43324d6bd5ab7d91415c4905c008fcd4320ebd49f12236eb43bd60da11d0c6ea6f791f7f6a8ce718e0f4
 DIST gnucash-2.6.15.tar.bz2 13406483 BLAKE2B 927838c5c9c11a19eb9f8e11726825458d5b414f4ef24baf1a7ae15c33825eeed2fd87892e728b37c43385360fd06a60df0bade4244b5c93dac5522f09849c92 SHA512 6ec0652565025ac8281152ed64f2f820ecdb17ead5f17738728e094d116e638a08af57a46c0d5b59679f30f142ce372a5f61bd164f68f6b608d09de37cec38c6
 DIST gnucash-2.6.19.tar.bz2 13612124 BLAKE2B cc66e4d7994274bb2ad97437333dbe62b0e9228e20e05e01fc7861bc45a8f07bc56d2a69850eda301d5e7f679d96a9d28c24c56a4860cff6727b66867482deae SHA512 0a979caf48ba96d6f37a929036e7172855cfb03af8832f479966bce72fad3400903925134d33aaa31eb6b36a2041f5e0d3f74b88e95b83c7d76e96b1503bec13
+DIST gnucash-2.7.3.tar.bz2 13736166 BLAKE2B 352c7bd9fe11b3b1b039acedb43be6f48960fac7ef6e4eaca5ca1ce944808d2d36c3a22b15b7150b8026bad10bfa0766fd19ac8d1b4f5f2cb2bcb8c112ee87bc SHA512 78c482eb3146406d561320866c480101cf35c51d8ab789e8d2688c7f7e16d1870b33feb7bcdb3cd8feaca300ce9bcf9fa05ba8e1804b221526d181763dcea611
 EBUILD gnucash-2.6.15-r1.ebuild 3216 BLAKE2B 1989921ba59e5fdf7da887aa85e9a9ad966ab7b037df69fa2827703652e679180762785ef20cc7f0c12b99a20eccb61d4cb30d70a23cc88060690fc55e5ea424 SHA512 8823d1681347cf1f4b52dce75302ca431c0b9b675c5bd6e2e97978237027511acf7f25309755f02d329aa62814881f5df927948c432339c47ef7387ed2bbbe54
 EBUILD gnucash-2.6.15.ebuild 3238 BLAKE2B 5f11f80f426e510fb46e8cdedc0dd9a8ba7f783e5d9eada1185cd4507b34945be105083a28eefacfe91f692e49436cfec3dd7747bd1a60dd87226897cb7e4098 SHA512 00fb4c31296021b9cbb7bc1a83662ff04c89aa5425f4a814ba91cab19ca6ebf8ffd29f60f641770a56b8af48d7ba8c195c0d641c3046e8d2365a841639ef74fb
 EBUILD gnucash-2.6.19.ebuild 3331 BLAKE2B 67b53dbb60ab5b8160c0e73d3135a200e41f21fd5cfceb7e7f652967af5fcf0381bcd5436f9120fb025bf4ab22a4bd4eae94ac9dacfcdfcda9efec5375fd52d4 SHA512 3c928dd6a952c570f744bae0d843b5dfd48548e12b40c15f73cc4651e49d81989eb845643ec99b175b3eaf01a042f8bf5ceadb02917ea2e998595db0b3e68b8b
-MISC metadata.xml 697 BLAKE2B 49ebf92faf650b5ff054cb7f23f907b8a6cab2d26889acf57fb55e67164c468b37a70e830c903c5041df8e48e47bfef4ef7248c52e889f3d3c168ad678c5d6ec SHA512 f58b4f51e04ed60f4d84265592fe4f49753ba00e621181f89e9a447c5138435aa277918c0111c1034c9d1a3ec6378de00a9943c5f9c14032a98306a12cca6aad
+EBUILD gnucash-2.7.3.ebuild 3507 BLAKE2B b686ba37ab8566cfde98d7f0606b0b6fd5738a59ac2d08c3149fbfc00ccef117cef80ee6c0f3494480f3f81fb524a8dacb547fbf260a82ffb78dde6672a6b347 SHA512 507aa648e1dbc301b4f80b5433c0d5d925793909f31304f5b744f6ef4553a36f541adc69f08f0d6bfc2a5c1969b405c777c82c6b68d9ce034d8dd99471359d73
+MISC metadata.xml 842 BLAKE2B 32276a0205e3726e5dc547bbac615cb04f1137cf9f34389810921ec6fe55312af21f31732cbfd998a2f1678b06b8f54a16601d0b02e580e3c4a609159f0628dd SHA512 ef6c9aacda5849e8d6a8bc03ff9266fbf38b2256f085b4e4cd3c4a91007f3a4a81740417f18d7f5f437fbf4167de4ffbdb4742e381ded06b12a8433b550ed542
diff --git a/app-office/gnucash/files/gnucash-2.7.3-no-gtest-src.patch b/app-office/gnucash/files/gnucash-2.7.3-no-gtest-src.patch
new file mode 100644
index 000000000000..66c1f9fec852
--- /dev/null
+++ b/app-office/gnucash/files/gnucash-2.7.3-no-gtest-src.patch
@@ -0,0 +1,15 @@
+Bug: https://bugs.gentoo.org/643566
+
+--- a/common/test-core/Makefile.am
++++ b/common/test-core/Makefile.am
+@@ -80,9 +80,9 @@
+         libgmock.a
+ nodist_libgtest_a_SOURCES = ${GTEST_SRC}/src/gtest-all.cc
+ libgtest_a_CPPFLAGS = ${AM_CPPFLAGS} -I${GTEST_HEADERS} -I${GTEST_SRC}
+-endif
+ nodist_libgmock_a_SOURCES = ${GMOCK_SRC_PATH}/gmock-all.cc
+ libgmock_a_CPPFLAGS = ${libgtest_a_CPPFLAGS} -I${GMOCK_HEADERS} -I${GMOCK_SRC}
++endif
+ 
+ gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash
+ gncscmmod_DATA = unittest-support.scm
diff --git a/app-office/gnucash/gnucash-2.7.3.ebuild b/app-office/gnucash/gnucash-2.7.3.ebuild
new file mode 100644
index 000000000000..9bf87b6b7157
--- /dev/null
+++ b/app-office/gnucash/gnucash-2.7.3.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# 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
+GNOME2_EAUTORECONF="yes"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit 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"
+
+# Add doc back in for 3.0 and bump app-doc/gnucash-docs
+IUSE="aqbanking chipcard debug gnome-keyring mysql nls ofx postgres python
+	  quotes -register2 sqlite"
+REQUIRED_USE="
+	chipcard? ( aqbanking )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+# libdbi version requirement for sqlite taken from bug #455134
+#
+# dev-libs/boost must always be built with nls enabled.
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2
+	>=dev-libs/libxml2-2.7.0:2
+	>=dev-scheme/guile-2.0.0:12=[regex]
+	>=sys-libs/zlib-1.1.4
+	>=x11-libs/gtk+-3.14.0:3
+	dev-libs/boost:=[icu,nls]
+	dev-libs/icu:=
+	dev-libs/libxslt
+	gnome-base/dconf
+	net-libs/webkit-gtk:4=
+	aqbanking? (
+		>=net-libs/aqbanking-5[gtk,ofx?]
+		sys-libs/gwenhywfar[gtk]
+		chipcard? ( sys-libs/libchipcard )
+	)
+	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+	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-cpp/gtest-1.8.0
+		(
+			dev-cpp/gmock
+			dev-cpp/gtest
+		)
+	)
+	dev-lang/perl
+	dev-perl/XML-Parser
+	dev-util/intltool
+	gnome-base/gnome-common
+	sys-devel/libtool
+	virtual/pkgconfig
+"
+
+# Uncomment for 3.0
+# PDEPEND="doc? (
+# 	~app-doc/gnucash-docs-${PV}
+# 	gnome-extra/yelp
+# )"
+
+# Bug 643566: Conditional didn't enclose everything related to gtest source
+# files and they're not needed.
+PATCHES=( "${FILESDIR}"/gnucash-2.7.3-no-gtest-src.patch )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local myconf
+
+	if use sqlite || use mysql || use postgres ; then
+		myconf+=" --enable-dbi"
+	else
+		myconf+=" --disable-dbi"
+	fi
+
+	# As of 2.7.3, the presence of --disable-register2 would enable register2 as
+	# well.
+	use register2 && myconf+=" --enable-register2"
+
+	gnome2_src_configure \
+		--disable-doxygen \
+		--disable-error-on-warning \
+		--disable-binreloc \
+		$(use_enable nls) \
+		$(use_enable debug) \
+		$(use_enable gnome-keyring password-storage) \
+		$(use_enable aqbanking) \
+		$(use_enable ofx) \
+		$(use_enable python) \
+		${myconf}
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	rm "${ED}"/usr/share/doc/${PF}/{COPYING,INSTALL,projects.html} || die
+	rm "${ED}"/usr/share/doc/${PF}/*win32-bin.txt || die
+
+	use aqbanking && dodoc doc/README.HBCI
+	use ofx && dodoc doc/README.OFX
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	ewarn "Backup all financial files or databases before using GnuCash >=2.7.0!"
+	ewarn
+	ewarn "GnuCash 2.7.0 introduced large changes in its file format and database"
+	ewarn "schema that WILL prevent you from reverting back to GnuCash 2.6."
+
+}
diff --git a/app-office/gnucash/metadata.xml b/app-office/gnucash/metadata.xml
index 97283552223d..4c84c7d43e6d 100644
--- a/app-office/gnucash/metadata.xml
+++ b/app-office/gnucash/metadata.xml
@@ -10,11 +10,13 @@
 		<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="quotes">Enable Online Stock Quote retrieval</flag>
+		<flag name="register2">Use the new register (Experimental)</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">gnucash</remote-id>
diff --git a/app-office/kraft/Manifest b/app-office/kraft/Manifest
index 82b28827c958..a3c3874b323a 100644
--- a/app-office/kraft/Manifest
+++ b/app-office/kraft/Manifest
@@ -1,3 +1,3 @@
-DIST kraft-0.80_beta3.tar.gz 625756 BLAKE2B ecbad304b76b7bec827573d4f001ac36b55c84df1a78fcdee25d71dc6efc9b341aa6d708bd288beee3a7c75d2f1b60f01aa6877a29ef750487a516d7575de5a3 SHA512 d94b00fb8b366473948641425288118acf276b429169c4e187b66dfb1ce4bc0d326ee215bd8b3dcbde25d2ec04ab2f0c3dcf4c22ada676a31e761a8278bc06da
-EBUILD kraft-0.80_beta3.ebuild 1128 BLAKE2B 5929e31d759e445ea1bcc932869abbca16723d91a26b210d91ce98903147e185999fd17aeeaf3c256840a5a5e86448bd0cf1da6ed32a048bba8a81e4e5221c5b SHA512 cad140f88e0f1569b5e500eea74d33e565fa451e7f6c57e4721d7d4cc95d458bad2f2603310f35706b72e85643d33b4f488f0fa57017b5b5456638ef43b1a473
+DIST kraft-0.80_beta5.tar.gz 626664 BLAKE2B 431e6908414fbbdd13b19f4ddac54395099cbefb96ea1dc73ecdb97fbfba66f5b4c42dd77bf479f81fdbcfa867e5d75a3a0b1aaf6fcc0c908bff3092d81787f7 SHA512 0a39fa8d98cf2aa156a9219d5950006b88bd45af59cf23fd4486e27ec54288e1bb18d8887dd53fc99c7e9f47ceeea20e27e55a281d8ccb1e29a82c073e2c0360
+EBUILD kraft-0.80_beta5.ebuild 1128 BLAKE2B fd1f01b8dd6fab92035a94582c2774e5f0ef35265fa13266bc2a81be75619ba7ad1e4b426b9f088d3505c80bb8127d5c55091cf6feb1745d4fcbe8a017a4b338 SHA512 f6dbd645a7bb1534de65552dd5e92d28a59a062b58e28ebee61a4f6987191e5f31f8441e5e49cf0e4534ebc89e2a47ac76c5838b53469b730965971f1e67ed1d
 MISC metadata.xml 418 BLAKE2B b99b3d436a90af1cd1a791e8cd1aeaed2c654a659a45f5e88b5c5b0cd02d57bc15df8e225cd93e9041732dfbf45792721d29df8c2187d409ecf3a4202855266e SHA512 eb8a053a7375546c713741d2bcacdb4604c725322c6680d76eade40ea4166cf20d8ecef4c4f0a7ef4304961bf2740b8277f5372137e04d32a52bc254daf65232
diff --git a/app-office/kraft/kraft-0.80_beta3.ebuild b/app-office/kraft/kraft-0.80_beta5.ebuild
index 8046838cfbcf..c064cd20d985 100644
--- a/app-office/kraft/kraft-0.80_beta3.ebuild
+++ b/app-office/kraft/kraft-0.80_beta5.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
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 93960a060369..115dc114b9ec 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -9,6 +9,6 @@ AUX scribus-9999-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c272
 DIST scribus-1.4.6.tar.xz 73601104 BLAKE2B 5968a48410d1a2a4caa333c9f83b43f68c964862d9aa3cb20e136760201ef2ef6cb82f770026b6f962758c9d397f25a017d906433f52f88bec11c57105c27f6b SHA512 74d8a89eb767535bcd8fe5e3c55d03709d59ff8fc5280005bcc2ad36cae1d37c8442ab85abaea86fdee9f351a901c86947231001324e2d8df00cbd8e5c18d1e3
 DIST scribus-1.5.3.tar.xz 74222084 BLAKE2B ffb50c728c0669ab8a22c416c143e8dd47c818120247b4cf5a890872857326b53491be99004a344d78ea2cf2b174ae2987ddcddb4cef39a6e95fe1695be45d48 SHA512 487cea685869397bc52acc7be8e8e9f4bad3f594c1f95740207e4d9e26b07461a7fd2a95d5337b38f1b0fa6504a9f6059cca6740c78cc165eab0b779ffdfe980
 EBUILD scribus-1.4.6.ebuild 4501 BLAKE2B b30fa6004319b54965b5b61f9cc466535135a8dd78434b090ff827df779ec003af1cf9ed00903d1614b6102be34298a95a1c3c609b1c5ec7a707b09b42bfe393 SHA512 0ede0bf314d6aea40da9316ea1778b9e2810780d715fe5fb66221354467147c54694b3b6f620faa7da6ad386034cb4b8b03df9acb3cd372b17ecc4415543531b
-EBUILD scribus-1.5.3-r1.ebuild 7027 BLAKE2B 5b25c5f90dca16433427427d257d36ab4a8d587f8a71e0a95f717628ae11a69e9d0861ca45aed2db10406e312c7b5aa1086d242e0949a4958504d43c3322a0ba SHA512 fd96085999ccc2354b671e603357d396031d0a697b0fc20b4f8ce91c75cdf8c22e0dc52c180da85bbe7a5b81d62d3c25609fbd84a5e7d75f07bc09c74f8462fd
+EBUILD scribus-1.5.3-r1.ebuild 7026 BLAKE2B 139b7d8c68bf429b36286e1835eaba88cdfa72b957c34895c9131b148e9639cc95be968bf62db98de084a6c299b5fde0b30e92625a3487deaf5d442c4e11a3de SHA512 db437b2d712c5f995654392e939e8f83f47241d240824e963a436823957658562b1a54bd9c9b3a7f3f94488ae469eede495c848ec20d9b4d6b98aff580ca0923
 EBUILD scribus-9999.ebuild 6947 BLAKE2B 98d7eacf3fe442b1539519139e9a127a3d7c0ea7fa5b9e75c6b7b220353ce7635c97675df9f2df1f272116c44f6825817e8c62fff75860d4cfeb75bc4fa388f8 SHA512 fd3911b80f04485f8fc11f2b30bc3f3e1ced644217b6e1d00716e48a68154b5b12102267e363b39dcaeaff129eb46b246f415c581f724951f45b3a9e174355af
 MISC metadata.xml 895 BLAKE2B 9f470d1d5f1eec9f76aca47dce40a3b276f3c7646f0a89ecc69f09f2644af7622655eadbe76486e3f1312fc282400592d7bfcddf3fe4c12b865c7642f61174b6 SHA512 a4b3ba4d363b674e781faa22cab86ef0455b235d9aa1bc4da12b4cc1ae4f23b954f81fdd4ca2348057d2c5108b141a4d6f3307eaf8ff79f76a2754538b80faa1
diff --git a/app-office/scribus/scribus-1.5.3-r1.ebuild b/app-office/scribus/scribus-1.5.3-r1.ebuild
index e1ed169825aa..2faefea4a252 100644
--- a/app-office/scribus/scribus-1.5.3-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk"
 
 #a=$((ls resources/translations/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'; ls resources/loremipsum/*xml | sed -e 's:\.: :g' -e 's:loremipsum\/: :g'| awk '{print $2}'; ls resources/dicts/hyph*dic | sed -e 's:\.: :g' -e 's:hyph_: :g' | awk '{print $2}'; ls resources/dicts/README_*txt | sed -e 's:_hyph::g' -e 's:\.: :g' -e 's:README_: :g' | awk '{print $2}') | sort | uniq); echo $a