[gentoo-commits] repo/gentoo:master commit in: x11-misc/xdialog/

[gentoo-commits] repo/gentoo:master commit in: x11-misc/xdialog/

[Patrice Clement]

commit:     494465adec701e2f4bd4979747deca27016aa2ff
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed May 18 09:32:29 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed May 18 09:32:54 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=494465ad

x11-misc/xdialog: Housekeeping + missing die.

Package-Manager: portage-2.2.28

 x11-misc/xdialog/xdialog-2.3.1.ebuild | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/x11-misc/xdialog/xdialog-2.3.1.ebuild b/x11-misc/xdialog/xdialog-2.3.1.ebuild
index 967790e..a4980a7 100644
--- a/x11-misc/xdialog/xdialog-2.3.1.ebuild
+++ b/x11-misc/xdialog/xdialog-2.3.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
+
 inherit autotools eutils
 
 DESCRIPTION="drop-in replacement for cdialog using GTK"
@@ -24,10 +25,15 @@ DEPEND="
 	nls? ( sys-devel/gettext )
 "
 
-S=${WORKDIR}/${P/x/X}
+S="${WORKDIR}/${P/x/X}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-{no-strip,install}.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-{no-strip,install}.patch
+	epatch "${PATCHES[@]}"
+
 	eautoreconf
 }
 
@@ -39,14 +45,15 @@ src_configure() {
 
 src_install() {
 	default
-	rm -rf "${D}"/usr/share/doc
+
+	rm -rv "${D}"/usr/share/doc || die
 
 	dodoc AUTHORS BUGS ChangeLog README
 
 	use doc && dohtml -r doc/
 
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
+		insinto "/usr/share/doc/${PF}/examples"
 		doins samples/*
 	fi
 }

[gentoo-commits] repo/gentoo:master commit in: x11-misc/xdialog/

[Sam James]

commit:     1ca361f8af93577b80d29ef027b371dfad0ea1ad
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  4 03:38:30 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan  4 04:31:56 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ca361f8

x11-misc/xdialog: EAPI 8

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{xdialog-2.3.1.ebuild => xdialog-2.3.1-r1.ebuild}  | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/x11-misc/xdialog/xdialog-2.3.1.ebuild b/x11-misc/xdialog/xdialog-2.3.1-r1.ebuild
similarity index 73%
rename from x11-misc/xdialog/xdialog-2.3.1.ebuild
rename to x11-misc/xdialog/xdialog-2.3.1-r1.ebuild
index e2052afacdc9..b04058431d62 100644
--- a/x11-misc/xdialog/xdialog-2.3.1.ebuild
+++ b/x11-misc/xdialog/xdialog-2.3.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
@@ -28,10 +28,16 @@ S="${WORKDIR}/${P/x/X}"
 
 DOCS=( AUTHORS BUGS ChangeLog README )
 
-PATCHES=( "${FILESDIR}"/${P}-{no-strip,install}.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-no-strip.patch
+	"${FILESDIR}"/${P}-install.patch
+)
 
 src_prepare() {
 	default
+
+	sed -i -e 's:configure.in:configure.ac:' configure.in || die
+
 	eautoreconf
 }
 
@@ -44,12 +50,12 @@ src_configure() {
 src_install() {
 	default
 
-	rm -r "${D}"/usr/share/doc || die
+	rm -r "${ED}"/usr/share/doc || die
 	use doc && local HTML_DOCS=( doc/. )
 	einstalldocs
 
 	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples"
-		doins samples/*
+		docinto examples
+		dodoc samples/*
 	fi
 }