gentoo resync : 24.12.2018

3 files changed, 3 insertions, 45 deletions

diff --git a/app-office/grisbi/Manifest b/app-office/grisbi/Manifest
index 70b0a1c5579b..e4cd1b45a300 100644
--- a/app-office/grisbi/Manifest
+++ b/app-office/grisbi/Manifest
@@ -1,5 +1,3 @@
-DIST grisbi-1.0.2.tar.bz2 6956892 BLAKE2B dde75fbae341fc03226083567ff4731457abc7079ace92956c9e8b35ba4140dba32dc67ebe3b2a4826750229dbcd09da0f2eaf1f18c8783238d3fee274c46be9 SHA512 5988d362db8e94f135af34de1acfd7222ceeca11d229ffca533ca75c75c8054dda121bc45979106ee8f4ed2ac0660ba7836dfd053478fdbe4a2984cb94be3cf8
 DIST grisbi-1.0.4.tar.bz2 6965398 BLAKE2B f53b5cd7f2e4b0cdcf14732ba7e03315ec7d419c7f6ab3a290fd30a9dc9f7c0dde69b473dca3873aeb90b793cd90287c516f2fe4b7a50d71368abc3e12ce16f6 SHA512 9761ed94db563c39cab793ee076b6a729470231e3111d7ce57d188a6f1681cbb715174f67c15741320f295d4efdf0784f6e3d4d4d58267759efbad56561c7064
-EBUILD grisbi-1.0.2.ebuild 851 BLAKE2B ed663f8a87f1f917b1854bd0d077562d82559df468efe624972619379038a7fbb53a8eb8dffc69b002599ffbf5d04092f95ec0cb4d286c2232f7f9018ec6474c SHA512 b424233da058418dfc40a4fadef7beba94e4e3caf58441b1ba18215a5f7203ded75bf31f1e4a056350cc2a22fab88ddb111379a59d0b4380ccecaa73cd52e012
-EBUILD grisbi-1.0.4.ebuild 853 BLAKE2B d311fc979e49e45d4d9460abfeda1c11b12646db3d918b6c648cec31a756b89a3f2edfbf1b319669bbdaa857d599e8b2f14d4f9c10ea0c8d73de8aa3785c37e0 SHA512 1346634be750f248aadf7347b9a83546b1aff2452babd389e75291ac42508c79a838942dd5e04dfb659557242f38d71aa434d58516c116256bb1d0dea81996bb
+EBUILD grisbi-1.0.4.ebuild 848 BLAKE2B cdab027ce150b2947949f4f3ffb4d33b7229fda1c92a5e18eb80ba797600afbb75c998be877856beaaa167dceaba9a6a243269c4beb709dd5125e914d0c2e700 SHA512 473f2bf7f32edf9305263604682c296159695aa964a9a70428884a7cd3f0a885f5eeeb67ef26b76751d03eb1d674ab78814c32e137d2eee06aff245f56a959c6
 MISC metadata.xml 635 BLAKE2B df6fdefe6d4474ec7b1a5c1a68572dcd5879ccaa2fd09c217ac28790156f964a0a62e5460e54113389c664437d8f8b3917d1334fec2a78317b9105f31b9fb205 SHA512 c1c5f6e2bbe4a11958cc78c3f61d8045dc89bddd640c15ef93c52de9acdd7cc00f483ad1c06f3dbd36fdda998a45ca0c31d6e188ba17ed4bae72f8a3b2c21766
diff --git a/app-office/grisbi/grisbi-1.0.2.ebuild b/app-office/grisbi/grisbi-1.0.2.ebuild
deleted file mode 100644
index d3e60f15cf74..000000000000
--- a/app-office/grisbi/grisbi-1.0.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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.0.4.ebuild b/app-office/grisbi/grisbi-1.0.4.ebuild
index 392f5fbf64ad..996e90a1e3c2 100644
--- a/app-office/grisbi/grisbi-1.0.4.ebuild
+++ b/app-office/grisbi/grisbi-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ IUSE="libressl nls ofx ssl"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	dev-libs/libxml2:2