gentoo resync : 20.03.2021

3 files changed, 2 insertions, 43 deletions

diff --git a/app-text/diff-pdf/Manifest b/app-text/diff-pdf/Manifest
index 0267f73e534d..c9c5842732ba 100644
--- a/app-text/diff-pdf/Manifest
+++ b/app-text/diff-pdf/Manifest
@@ -1,6 +1,4 @@
 AUX diff-pdf-0.4.1-no-poppler-cairo-check.patch 798 BLAKE2B f3932e5e7babd37b0df89f37536b91eee4978b3ac34b8c9e628f0db3f2d0a617f872b137cabc257e6cf470d6b80aade4c835e91310ec84b296d46d24c457f5f3 SHA512 2f4c399e482ace0e00995a732f0489d8b614e31396ed6279b0399e8c009b228386319a611ee52b784ba2313561e7aef27ae5b9090d3fb78fa09660992d483cc8
-DIST diff-pdf-0.3.tar.gz 132862 BLAKE2B bb3fa163337482785778fa7cbeab3e9f883d8537e4a905592eb20f4bb876597f500beaa2d9f13706887e1d340dd378c68c231b91a4dd478fb206b32f2cbd768c SHA512 b85585162b498c5abf14020ad04616ebdb5efce25b20604dab81c6068a036a818d7e10ddbbdb69d278d4b5a46ab9b9aa782a52e37f278f3e9db7b4d2259aaa08
 DIST diff-pdf-0.4.1.tar.gz 137715 BLAKE2B f77b7a690f2a99aa003c1a36015113f0b3355acc45346637535231f763aa733174eca6b1f962058c625e06176fa13868965b3b67ddf6ffe249202ff799051e37 SHA512 4b7b49d7008b5920be86af8398dea41933888677b66505af0ca4daecbd1662dc0b3c04e7b2631d86680cdae4b0b58d24bcd4ddc2b7589127b682d4b97a179b88
-EBUILD diff-pdf-0.3.ebuild 1289 BLAKE2B 3eef9f78e56f7f0da662a8ad3fb75e8b5683d58c3dcdc6d4df426d78814b834afec798b0189bf22c65da304d5ccfea1afd324d7f066536f0b162f89715af6596 SHA512 5f667ed5f3391c1fd6bbf426d7947b50e5c75ae0aab61dbe20c1c6efd3710b18d9d2a8c1407e657219db6a58b9450542eacd52bbd382361ba7341d99b00ada23
-EBUILD diff-pdf-0.4.1-r2.ebuild 1412 BLAKE2B c8b69c608f797be990cd7ff2bba3d8394efe6a9fcf0824e386d78a65194f37db2002a33f85316dea65263083d6990201a94b32717b0678b98a64c4657d332546 SHA512 bbbf7c920ce7663f518c8f0517c022a58e1d7d2632312d89c9356fb8dc855a4fbc77c98fb766fc2ac2775fddeedee3a1e34e413ee97b34338f52a2d86150b361
+EBUILD diff-pdf-0.4.1-r2.ebuild 1411 BLAKE2B 78fbab50fa4d9f795edbf09793f753ba30d2dc7be1cea8d480e62fac471f2bd3e93528746622b70f6e608a7530bc06f44a92fa62b8d939b20783a42c87128da5 SHA512 5c4b8cd1e8c3c0c693b1a6508e0a0b2b057f8ef7798ca271e16f781df1e5a15f7a0424480aa833c6f16afd5a1552201f94348e43e22795b954a96134e770b5db
 MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742
diff --git a/app-text/diff-pdf/diff-pdf-0.3.ebuild b/app-text/diff-pdf/diff-pdf-0.3.ebuild
deleted file mode 100644
index 60b53a0e7912..000000000000
--- a/app-text/diff-pdf/diff-pdf-0.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# No EAPI=7 support in wxwidgets.eclass.
-EAPI=6
-
-inherit wxwidgets
-
-DESCRIPTION="A simple tool for visually comparing two PDF files"
-HOMEPAGE="http://vslavik.github.io/diff-pdf/ https://github.com/vslavik/diff-pdf/"
-SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-# The COPYING.icons file states that two icons were taken from
-# version 2.16.5 of GTK+, which is licensed LGPL-2+.
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-# The build system checks for "poppler-glib", which is provided only
-# when app-text/poppler is built with USE=cairo. Moreover the glib ABI
-# of poppler is relatively stable, and I can only assume that diff-pdf
-# uses that rather than the low-level libpoppler.so API. Since the
-# subslot on app-text/poppler is ONLY for the low-level API, we
-# therefore don't need a subslot dependency on app-text/poppler.
-#
-# Since diff-pdf.cpp includes glib.h directly, I've included
-# dev-libs/glib as an explicit dependency. Ditto for x11-libs/cairo.
-DEPEND="app-text/poppler[cairo]
-	dev-libs/glib
-	x11-libs/cairo
-	x11-libs/wxGTK:3.0[X]"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	WX_GTK_VER="3.0"
-	setup-wxwidgets
-	default
-}
diff --git a/app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild b/app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild
index 992e9b377978..0a5bdf8683ff 100644
--- a/app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild
+++ b/app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}/${P}.tar.gz"
 # version 2.16.5 of GTK+, which is licensed LGPL-2+.
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 # The build system checks for "poppler-glib", which is provided only