gentoo resync : 15.05.2018

3 files changed, 9 insertions, 36 deletions

diff --git a/app-doc/gnucash-docs/Manifest b/app-doc/gnucash-docs/Manifest
index a476088cc8ec..68636e756b82 100644
--- a/app-doc/gnucash-docs/Manifest
+++ b/app-doc/gnucash-docs/Manifest
@@ -1,7 +1,5 @@
-DIST gnucash-docs-2.6.15.tar.gz 81292273 BLAKE2B ae484822394dd9bacc8124dd177be07fc5f299c71e15f815bb239a928bc97a61deabf9828a43b94e31efd4ef60bd9ae066d299ed8c43fc3752b645fae3df4bc5 SHA512 025fc6df6aa22eb857a956552f46f3810e02ebc39d4f6678124a3523cd934fbaeea831e330305fcc11e69857076c4e6a8477ffeff273785615a4cc55c9757d26
-DIST gnucash-docs-2.6.19.tar.gz 92214378 BLAKE2B ad4235ceee561928a27bdb36eb0042e6128660962a4de6ad6b8bf925e63535ef08e498f3650c79a96f051beae69ee4f50a8c8b36d2bb96b2053dd238ede3ee7e SHA512 5832e52057cf9a6347005a8edca74c251230a3b658eac94a9c66e038c81c8068c2bad16b77a7a0f71c9827f115a251421f72180ca00bc6fdf8ca11f7d2a7ef2b
 DIST gnucash-docs-3.0.tar.gz 92420576 BLAKE2B 95d8c310b3616b44a814c7c5d6e8b1b586eef12831ea967818bef302e0dde3f0ab8e1b1d4fd0d504173625d87d54738a392ad3d53b8bfa079fd5ba87ac3a2d91 SHA512 908694725de6d9595cb73d4b334f157287a864ff7ba1057bdff7c0fb55660c5828a6b5c1e868eea7fbd0fca4b3b594fb3989092f270446dbd56c07479c6036cf
-EBUILD gnucash-docs-2.6.15.ebuild 780 BLAKE2B 3f6a86c31874bb568579757c0db419e5a15d524ca5f0c70fe6d474164f0245fded2d9715f90ee71b4004b16248516cdc71e07c2b93ca0ddd798e347dd72d98d3 SHA512 04ac1e219a5c30fd4bcc1e79a57cb77bd4a62324e66fff901f298a333a37faaf8c896d541586c6ca14559412c1f3b333c69765820a6a1b5f73f7708f7f1ab7af
-EBUILD gnucash-docs-2.6.19.ebuild 782 BLAKE2B 17d21bb53b7beff0bf4036828c7a14279fb18068be568f1c2ba6ca8c70de993d32d132f8abe92debc9e766b82d1abf26b96bd219d4eea3a2d352f66a4dab0531 SHA512 863c7d8059501800849070f96f1cd4ec9edad2427fb3d7f140347fde49fbb602cdd4699e62995a2863cb95206f9982349aa77ae3baa173e76afb13d1719e1222
+DIST gnucash-docs-3.1.tar.gz 92421041 BLAKE2B b169d26cb9fb07a265fb5b8fc492fa8b0ed240be094278416d54542dd4ca074b3d4a182421b75d09c1f6c435891c5637aed646f0d11bdd57a9b71cbc999676dd SHA512 4af1f0b895cc928c109ae4f883efd1b483a5b318e02fcd6ca4ff7631ed4e13bc0f89f28b2f8ea895f9e37f596eb7b84e84732dfac6b2d4fe98b7405603149339
 EBUILD gnucash-docs-3.0.ebuild 861 BLAKE2B 16e5e35a8c624de231dab411108eb463f1d151312c5e33eec0f4b78f3efaec73a505149373297ee0376ea6576e83982325254c19a3e808f733a70c748e4451ac SHA512 33c547e298a0f2d601977e59ad3a19af7036ec4af5aef73de8f0d5fde47e1c4a878b34abd56e6e9fcfa4cfea7ddd9c9c8324ad17b1145a29c80236d55e022497
+EBUILD gnucash-docs-3.1.ebuild 861 BLAKE2B 16e5e35a8c624de231dab411108eb463f1d151312c5e33eec0f4b78f3efaec73a505149373297ee0376ea6576e83982325254c19a3e808f733a70c748e4451ac SHA512 33c547e298a0f2d601977e59ad3a19af7036ec4af5aef73de8f0d5fde47e1c4a878b34abd56e6e9fcfa4cfea7ddd9c9c8324ad17b1145a29c80236d55e022497
 MISC metadata.xml 444 BLAKE2B d5ab61b0738eb3124b32f94da3b3f38ef8993039a4797eab95f0c2c2af427c6262cdb2b5885d0e4dfc659e15bad9c492db706f134f8128595eeef6afbcd4b663 SHA512 7a97c9139b410b8054093bd666c6043e6383e5b3ad9f19a52e7b4d2aaafa1b915082408d575064e7be1f0c4b14eae660837d608e88956a4e51fa1c647a19b5b2
diff --git a/app-doc/gnucash-docs/gnucash-docs-2.6.15.ebuild b/app-doc/gnucash-docs/gnucash-docs-2.6.15.ebuild
deleted file mode 100644
index 5e8b7f06954e..000000000000
--- a/app-doc/gnucash-docs/gnucash-docs-2.6.15.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Documentation package for GnuCash"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="mirror://sourceforge/gnucash/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2 FDL-1.1"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="test"
-
-RDEPEND="!<=app-office/gnucash-2.2.1"
-DEPEND="${RDEPEND}
-	>=dev-libs/libxml2-2.5.10:2
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/rarian
-	test? ( app-text/docbook-xml-dtd:4.4 )
-"
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	has_version dev-java/fop || elog "You need dev-java/fop to generate pdf files."
-	has_version gnome-extra/yelp || elog "You need gnome-extra/yelp to view the docs."
-}
diff --git a/app-doc/gnucash-docs/gnucash-docs-2.6.19.ebuild b/app-doc/gnucash-docs/gnucash-docs-3.1.ebuild
index f8c548bca9a6..19bdd1d2ff8c 100644
--- a/app-doc/gnucash-docs/gnucash-docs-2.6.19.ebuild
+++ b/app-doc/gnucash-docs/gnucash-docs-3.1.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit gnome2
+inherit autotools gnome2
 
 DESCRIPTION="Documentation package for GnuCash"
 HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="mirror://sourceforge/gnucash/${P}.tar.gz"
+SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2 FDL-1.1"
@@ -23,6 +23,11 @@ DEPEND="${RDEPEND}
 	test? ( app-text/docbook-xml-dtd:4.4 )
 "
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 pkg_postinst() {
 	gnome2_pkg_postinst
 	has_version dev-java/fop || elog "You need dev-java/fop to generate pdf files."