gentoo resync : 20.03.2021

4 files changed, 22 insertions, 25 deletions

diff --git a/x11-misc/xdialog/Manifest b/x11-misc/xdialog/Manifest
index e3452554f9d4..e62e5f1a5cf2 100644
--- a/x11-misc/xdialog/Manifest
+++ b/x11-misc/xdialog/Manifest
@@ -1,5 +1,5 @@
-AUX xdialog-2.3.1-install.patch 347 BLAKE2B 4635818c220dafd96ed2a9131d0639ebf47933b66dea33d618b94f797eaa33f055ae7daf73a515ffab598fdf0746da3c12e60f6ecaac1779837e38f06c988b2a SHA512 756aec03d9ee6ba0fa2f567d6c3db69916290a3b65474c2f1dd912d6f11095343c2d74a8ab60fc7d9d861165058e8ad8bbb8fc2827e663927e85747b9538ed05
-AUX xdialog-2.3.1-no-strip.patch 1449 BLAKE2B 30beb344c1ae3bb074bec78d334ad329ab6af8291639c40bdfa6ada510155120a7629fc4805c543af29c719f6f9ca80a2f158c4de98779e361351d4b14901528 SHA512 352ea269be3d48aaec50ff6ec49524da80a5df837ef13851646f0cf4d38e5901e639881b4106112b3d515f764042dce70f423d501ea1dda2493b4061dbba9ea6
+AUX xdialog-2.3.1-install.patch 352 BLAKE2B 75c9c6e7443ba0404e378d5a76d413d46930663840818a4b8a107ba1329647bd1adf90d19f01500212bbc60e7a213a9a22f177fb6742bd4499bc91cf3a8fb8b9 SHA512 fd89f4407c34b4850608248d707d9868a33c3d7bf5517b7f307410570322043c2cee8eaaa4afe9b12074fccf2205a7a127f7ab703732a0e086a5ee6f15c3c36d
+AUX xdialog-2.3.1-no-strip.patch 1385 BLAKE2B 5928f4989bb2d0e150790674d72ad11a97206f4370ad1049bce64ed71d8bfc504e214bda3fb76bc35ab2d5279ed4bcc02e29792526b3c649a49b5d6ef78eb59b SHA512 d210139d4e5b8fc4842f4fec4ebb7a9bc7d44a807d389d405b8c3c08b31f83a8b0f3fc6358e9cd858cf0fa2bc1f5e8d0c5f4fd23d63055c5cec0572e5e7ae23c
 DIST Xdialog-2.3.1.tar.bz2 457938 BLAKE2B d532bf9d25a349865baa3b9f484ca86d5bd7d946ca7e5b786f29eb65d297dafd9e58aa333ba671b836906d9620b900148d203be961d5ca3754977d01fc128fac SHA512 2a0f6e15297ae3ef54a41da1b1fe2ef376d28757d47433df2b8e9918cd4f95871a630b94ec544bd848e518df7f86934030a71bf0371a1466286bf7d912335525
-EBUILD xdialog-2.3.1.ebuild 919 BLAKE2B 5580d2b27d1be56e73223524f32bc7df1bc113de5f89c1f3d3581b741b855e0a8ed9d6dd68c291871555881d0306078bf09c81777a159badd9500d4ad4933565 SHA512 27f69db64fd717954e2ab394bb89b20ce8ab97289bc600bfa094fdea899b45460bfbe49597d729c4e96c493d46d35cc696320be1e20d517ef4eeb54e60d191b3
+EBUILD xdialog-2.3.1.ebuild 929 BLAKE2B 5e6d753f2561386d6318a2ccf9eb66a6b268b52abf9f9837d1a916de3577be77a5ef302aca15afaaeff86360f171efb38e225b98ad89d91c36ea119fa730873a SHA512 d4088304be09a6ae932412aea50bb0f8b8a4aae823afbecf516f3dd5250a726e3890b875f7fee504f070846f39aec0909aab500d5357f0d51c4d6719b9990dd4
 MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/x11-misc/xdialog/files/xdialog-2.3.1-install.patch b/x11-misc/xdialog/files/xdialog-2.3.1-install.patch
index f5a02b099d92..8ca19e598a34 100644
--- a/x11-misc/xdialog/files/xdialog-2.3.1-install.patch
+++ b/x11-misc/xdialog/files/xdialog-2.3.1-install.patch
@@ -1,7 +1,7 @@
-http://bugs.gentoo.org/327353
+https://bugs.gentoo.org/327353
 
---- doc/Makefile.am
-+++ doc/Makefile.am
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
 @@ -6,7 +6,7 @@
  
  CLEANFILES = index.html compatibility.html changelog.html license.html Xdialog.1
diff --git a/x11-misc/xdialog/files/xdialog-2.3.1-no-strip.patch b/x11-misc/xdialog/files/xdialog-2.3.1-no-strip.patch
index a507f3f0cfbb..fea929d99fe4 100644
--- a/x11-misc/xdialog/files/xdialog-2.3.1-no-strip.patch
+++ b/x11-misc/xdialog/files/xdialog-2.3.1-no-strip.patch
@@ -1,6 +1,6 @@
-diff -Nru Xdialog-2.3.1.vanilla/configure.in Xdialog-2.3.1/configure.in
---- Xdialog-2.3.1.vanilla/configure.in	2009-02-11 09:54:10.000000000 +0000
-+++ Xdialog-2.3.1/configure.in	2009-02-11 09:59:28.000000000 +0000
+diff -Nru a/configure.in b/configure.in
+--- a/configure.in	2009-02-11 09:54:10.000000000 +0000
++++ b/configure.in	2009-02-11 09:59:28.000000000 +0000
 @@ -36,13 +36,8 @@
    CPPFLAGS="$CPPFLAGS -DUSE_GTK2"
    AC_MSG_RESULT(Compiling for GTK2)
diff --git a/x11-misc/xdialog/xdialog-2.3.1.ebuild b/x11-misc/xdialog/xdialog-2.3.1.ebuild
index 3be9830a8b33..e2052afacdc9 100644
--- a/x11-misc/xdialog/xdialog-2.3.1.ebuild
+++ b/x11-misc/xdialog/xdialog-2.3.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools eutils
+inherit autotools
 
-DESCRIPTION="drop-in replacement for cdialog using GTK"
+DESCRIPTION="Drop-in replacement for cdialog using GTK"
 HOMEPAGE="http://xdialog.free.fr/"
 SRC_URI="http://${PN}.free.fr/Xdialog-${PV}.tar.bz2"
 
@@ -18,21 +18,20 @@ RDEPEND="
 	dev-libs/glib:2
 	>=x11-libs/gtk+-2.2:2
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 "
 
 S="${WORKDIR}/${P/x/X}"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-{no-strip,install}.patch
-)
+DOCS=( AUTHORS BUGS ChangeLog README )
 
-src_prepare() {
-	epatch "${PATCHES[@]}"
+PATCHES=( "${FILESDIR}"/${P}-{no-strip,install}.patch )
 
+src_prepare() {
+	default
 	eautoreconf
 }
 
@@ -45,11 +44,9 @@ src_configure() {
 src_install() {
 	default
 
-	rm -rv "${D}"/usr/share/doc || die
-
-	dodoc AUTHORS BUGS ChangeLog README
-
-	use doc && dohtml -r doc/
+	rm -r "${D}"/usr/share/doc || die
+	use doc && local HTML_DOCS=( doc/. )
+	einstalldocs
 
 	if use examples; then
 		insinto "/usr/share/doc/${PF}/examples"