commit: 4bc0d6dbbda9ba1edb52d90a5320f83ef8d61a68 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Sun Jul 25 07:07:51 2021 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Sun Jul 25 07:07:51 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bc0d6db
x11-misc/xscreensaver: Replace src_prepare weirdness Add an AM_PROG_INSTALL_SH line to configure.ac instead. Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> .../files/xscreensaver-6.01-configure-install_sh.patch | 12 ++++++++++++ x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild | 14 ++------------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-configure-install_sh.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-configure-install_sh.patch new file mode 100644 index 00000000000..490e32f6817 --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-configure-install_sh.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/803479 + +--- a/configure.ac ++++ b/configure.ac +@@ -1062,6 +1062,7 @@ + AC_PROG_INSTALL + AC_PROG_INSTALL_DIRS + AC_PROG_MAKE_SET ++AM_PROG_INSTALL_SH + + # By default, autoconf sets INSTALL_SCRIPT to '${INSTALL_PROGRAM}'. + # That's wrong: it should be set to '${INSTALL}', so that one can diff --git a/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild index fc75283e450..609e6c132c7 100644 --- a/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-6.01-r3.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit autotools flag-o-matic font multilib optfeature pam DESCRIPTION="modular screen saver and locker for the X Window System" @@ -87,6 +88,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch "${FILESDIR}"/${PN}-6.01-non-gtk-install.patch "${FILESDIR}"/${PN}-6.01-gtk-detection.patch + "${FILESDIR}"/${PN}-6.01-configure-install_sh.patch ) src_prepare() { @@ -125,19 +127,7 @@ src_prepare() { eapply_user # Must be eauto*re*conf, to force the rebuild - # it is NOT an entirely normal autoconf so there is weirdness! eautoreconf - eautoheader - - # Afterwards, fix the linguas - # doesn't populate @install_sh@ properly - # https://bugs.gentoo.org/803479 - # requires LINGUAS to trigger - sed -i.orig \ - -e "/^install_sh = /s!=.*!= ${S}/install-sh!g" \ - "${S}/po/Makefile.in.in" || die - grep -e install_sh \ - "${S}/po/Makefile.in.in" || die } src_configure() {
