gentoo resync : 05.02.2020

4 files changed, 3 insertions, 90 deletions

diff --git a/app-office/grisbi/Manifest b/app-office/grisbi/Manifest
index b44452489ef0..3b5a17aab722 100644
--- a/app-office/grisbi/Manifest
+++ b/app-office/grisbi/Manifest
@@ -1,7 +1,3 @@
-DIST grisbi-1.0.4.tar.bz2 6965398 BLAKE2B f53b5cd7f2e4b0cdcf14732ba7e03315ec7d419c7f6ab3a290fd30a9dc9f7c0dde69b473dca3873aeb90b793cd90287c516f2fe4b7a50d71368abc3e12ce16f6 SHA512 9761ed94db563c39cab793ee076b6a729470231e3111d7ce57d188a6f1681cbb715174f67c15741320f295d4efdf0784f6e3d4d4d58267759efbad56561c7064
-DIST grisbi-1.2.1.tar.bz2 7314316 BLAKE2B b34aaaba79608561383e09fa1af7749f8c3cfa322f47a6d9cf350af1a3b96c575140246ed65b33127d92f84a57d959f24c99ef748ab80097ffce2ed8f16319aa SHA512 0193d5777ed191f7f3dac67fc9754f5588f35b9486567f3a7e7f9dd998865ff2130ad04b78a98dae1e1164fbd400a58328bdee777e9d0ff1100d1fd189a5aa2f
 DIST grisbi-1.2.2.tar.bz2 7325947 BLAKE2B 559ffc8c46edc629fd17aa38042a7d9a39dd9c1866bddc86560bae2750a53916a6e0a451dc6e482b9d21bc1d8d493701d656dfa85b131f5f9b5b3c014249dcd2 SHA512 7d627f9ae588c0d5a8235bb86f3ed160a572114ccfec1dce9c7137296e5525411600033ca4e42b242004edddc42f2160e95c18c0c0cd13516cf62486e081acdd
-EBUILD grisbi-1.0.4.ebuild 848 BLAKE2B cdab027ce150b2947949f4f3ffb4d33b7229fda1c92a5e18eb80ba797600afbb75c998be877856beaaa167dceaba9a6a243269c4beb709dd5125e914d0c2e700 SHA512 473f2bf7f32edf9305263604682c296159695aa964a9a70428884a7cd3f0a885f5eeeb67ef26b76751d03eb1d674ab78814c32e137d2eee06aff245f56a959c6
-EBUILD grisbi-1.2.1.ebuild 985 BLAKE2B f21a415e2b3163150acee52ce18c3b73eb0960cc5c624e5bca607654fb406089f7d2be162468bf29b819d73f0b304df8d84b70686121170fa6af15382f9ee25b SHA512 95b72ff46513a35ff80d1da97850e2dc830b0e537e5fad69c13de0e731062d8ff645c88897b38a589888575601b891060a6c34655ad15f77b857cbd5efc8f741
-EBUILD grisbi-1.2.2.ebuild 985 BLAKE2B f21a415e2b3163150acee52ce18c3b73eb0960cc5c624e5bca607654fb406089f7d2be162468bf29b819d73f0b304df8d84b70686121170fa6af15382f9ee25b SHA512 95b72ff46513a35ff80d1da97850e2dc830b0e537e5fad69c13de0e731062d8ff645c88897b38a589888575601b891060a6c34655ad15f77b857cbd5efc8f741
+EBUILD grisbi-1.2.2.ebuild 983 BLAKE2B 14cbcad4fbac6e25a309fb979b905914a7e450e6ba7285a4b033f10defbf2418ce89de112588b8dd6603bf5685bd638e06f3cb2a8469ef32b1d2652091e2cac3 SHA512 2660e6bfdc05f3b6ceb587e8d13baab51e44dd9cc3b7342973ab987ad38fd5aecf06b525e470555aeb7b5c51dd37ceb854866bb051d053e73c0316ecd02023d1
 MISC metadata.xml 711 BLAKE2B be72967e4680a341903aa29e9f2627beb6a9084696d6b0f8b5048e2902220b5ed2a1fee71e7458f7a2df8639a532b554fe437dbabc2a055ab8ce05dd942a699e SHA512 f8fca475d676c5a4fd504f045471a767e67cc397d4ecb5a6d6e2b89d0532d3e59e12a693f56adb12101283b7614e8e62eed269c9785ffeee5b7ab9c26e568230
diff --git a/app-office/grisbi/grisbi-1.0.4.ebuild b/app-office/grisbi/grisbi-1.0.4.ebuild
deleted file mode 100644
index 996e90a1e3c2..000000000000
--- a/app-office/grisbi/grisbi-1.0.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Grisbi is a personal accounting application for Linux"
-HOMEPAGE="http://www.grisbi.org"
-SRC_URI="mirror://sourceforge/grisbi/grisbi%20stable/1.0.x/${P}.tar.bz2"
-IUSE="libressl nls ofx ssl"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND="
-	dev-libs/libxml2:2
-	>=dev-libs/glib-2.18.0:2
-	>=x11-libs/gtk+-2.12.0:2
-	x11-misc/xdg-utils
-	ssl? (
-		libressl? ( dev-libs/libressl:0= )
-		!libressl? ( >=dev-libs/openssl-0.9.5:0= ) )
-	ofx? ( >=dev-libs/libofx-0.7.0 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--with-libxml2 \
-		--without-cunit \
-		--disable-static \
-		$(use_with ssl openssl) \
-		$(use_with ofx) \
-		$(use_enable nls)
-}
diff --git a/app-office/grisbi/grisbi-1.2.1.ebuild b/app-office/grisbi/grisbi-1.2.1.ebuild
deleted file mode 100644
index 1cb4dfed2119..000000000000
--- a/app-office/grisbi/grisbi-1.2.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Grisbi is a personal accounting application for Linux"
-HOMEPAGE="http://www.grisbi.org https://github.com/grisbi/grisbi"
-SRC_URI="mirror://sourceforge/${PN}/grisbi%20stable/1.2.x/${P}.tar.bz2"
-IUSE="goffice libressl nls ofx ssl"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND="
-	>=dev-libs/libxml2-2.5:2
-	>=dev-libs/glib-2.44.0:2
-	>=x11-libs/gtk+-3.20:3
-	x11-misc/xdg-utils
-	>=gnome-extra/libgsf-1.14
-	ssl? (
-		libressl? ( dev-libs/libressl:0= )
-		!libressl? ( >=dev-libs/openssl-1.0.0:0= ) )
-	ofx? ( >=dev-libs/libofx-0.9.0 )
-	goffice? ( >=x11-libs/goffice-0.10.0 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--with-libxml2 \
-		--without-cunit \
-		--disable-static \
-		$(use_with ssl openssl) \
-		$(use_with ofx) \
-		$(use_with goffice) \
-		$(use_enable nls)
-}
diff --git a/app-office/grisbi/grisbi-1.2.2.ebuild b/app-office/grisbi/grisbi-1.2.2.ebuild
index 1cb4dfed2119..4ef1aa7ac930 100644
--- a/app-office/grisbi/grisbi-1.2.2.ebuild
+++ b/app-office/grisbi/grisbi-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ IUSE="goffice libressl nls ofx ssl"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	>=dev-libs/libxml2-2.5:2