gentoo resync : 24.12.2018

3 files changed, 3 insertions, 44 deletions

diff --git a/app-office/glabels/Manifest b/app-office/glabels/Manifest
index 816ba226dcf1..aa72d76a3931 100644
--- a/app-office/glabels/Manifest
+++ b/app-office/glabels/Manifest
@@ -1,5 +1,3 @@
-DIST glabels-3.4.0.tar.xz 3412796 BLAKE2B 10c711d5fbfb2a418abf7296c17102e3557b62b8c8eec7f9a54f54aa4a4c64ef19b09ed4ab3cd759800ebf070b247e840a0a1c7d1992abe7623f5483559b59cb SHA512 ae67474645b58418c75cd186c088ce7ec6916192d5dd207f429fe8e0f37ba34e467a6d707352ee120fd47e551d793545968dd916bf4f635a75dff094b1f86357
 DIST glabels-3.4.1.tar.xz 3467992 BLAKE2B 87da586052995a61b1031c5598a21142e525851c5d94b2870e6f62b0d2a6227f44b55ce1aaf6a4c52bd6bb81d9005fde0e58befe26834acb37f4b6728a378cdd SHA512 d3cb98a3b8e33aaace5773a5715ebe45a28a046dd89443b97126078261954fe4713abdc70c38d0d2b932a37eef02ea266726fd28433153bb5aef33c5d5f8175f
-EBUILD glabels-3.4.0.ebuild 858 BLAKE2B 570e66477aac88612bc0deef0dc6e70ee79dcd22bd81d32407c49d4c3ac330b1607a936278ec7fc7fc46808887486095f9b4e4e47ac034a01e831474e1c2353a SHA512 4e50b30816b591f0fadb5a731f88dbbc104cd44df9506ad25d97a6e08476ba89dba97d8cf261cd61e2f92b5259d42d3273b075076ddf322c05d28670755b0ed6
-EBUILD glabels-3.4.1.ebuild 871 BLAKE2B 647098e1fa235b6f049f70759d0082fb9f0896893416bdbecefca12275b177b670a4822cd07fdc4b5945fb796c11558b3c461d074942b23d3367063cd5e4394d SHA512 d3d7e4a473e07bd5cc535ed49bb43b567e86c1d856d86ca4714875b86cc2752ecc3a80192773ab9e7c3fbf9e7ee287bb8479a9d1a400ec513623c1d15f72bc03
+EBUILD glabels-3.4.1.ebuild 866 BLAKE2B ab2a53804180a53827fc32e17330d20aa65f27c2a7cc18bba9e3935feade771c8359507c27fe3f1b61276838ba180e1628a08fd9591e6918b9050e7699e82528 SHA512 b6b82274bbc5894463a83c73ae403482bd9a43380ac906c11fe43f94c1f6000ebf91bb61b2ab309e80af9677227f8534917e9b8879e8a8daacce4103beb768b3
 MISC metadata.xml 628 BLAKE2B afeffa1b3692fcee50a89de00d3cd5c205b0a75516d8c92fbbc0270de1cc76f022043a6a4f59648f61dbd3a058abc964ca3a24c3f791755cc811999575026401 SHA512 d82beb6241d972fab78633ecab172c67145c6bab44cfaa458dcfaebae65f00f5200f8233e97d97b4cb2a555aa92a1bb2669726d93b0af1744408d7235c6c1e3e
diff --git a/app-office/glabels/glabels-3.4.0.ebuild b/app-office/glabels/glabels-3.4.0.ebuild
deleted file mode 100644
index f0ef6a58dba6..000000000000
--- a/app-office/glabels/glabels-3.4.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit eutils gnome2
-
-DESCRIPTION="Program for creating labels and business cards"
-HOMEPAGE="http://www.glabels.org/"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE="barcode eds"
-
-RDEPEND="
-	>=dev-libs/glib-2.42.0:2
-	>=x11-libs/gtk+-3.14.0:3
-	>=dev-libs/libxml2-2.9.0:2
-	>=gnome-base/librsvg-2.39.0:2
-	>=x11-libs/cairo-1.14.0
-	>=x11-libs/pango-1.36.1
-	barcode? (
-		>=app-text/barcode-0.98
-		>=media-gfx/qrencode-3.1 )
-	eds? ( >=gnome-extra/evolution-data-server-3.12.0:= )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.28
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_with eds libebook) \
-		--disable-static
-}
diff --git a/app-office/glabels/glabels-3.4.1.ebuild b/app-office/glabels/glabels-3.4.1.ebuild
index 3d345d6e3d67..15f966049969 100644
--- a/app-office/glabels/glabels-3.4.1.ebuild
+++ b/app-office/glabels/glabels-3.4.1.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"
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.glabels.org/"
 
 LICENSE="GPL-3+ LGPL-3+ CC-BY-SA-3.0 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="barcode eds"
 
 RDEPEND="