Revert "x11-libs/motif: use HTTPS, add missing die."

This reverts commit 637bf7adde0a6284c8a89270fe50bbbb2791b39e.
In-place update of stable ebuild without approval of maintainer.
Also introduced a new QA issue.

Signed-off-by: Ulrich Müller <ulm@gentoo.org>

diff --git a/x11-libs/motif/motif-2.3.8-r1.ebuild b/x11-libs/motif/motif-2.3.8-r1.ebuild
index 4c9e39515e16c99d801913a4f0e2b5c17bde840c..2258ff7c47cc5b4a856b66530be1ec9647ba2a00 100644 (file)
--- a/x11-libs/motif/motif-2.3.8-r1.ebuild
+++ b/x11-libs/motif/motif-2.3.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit autotools flag-o-matic multilib toolchain-funcs multilib-minimal
 
 DESCRIPTION="The Motif user interface component toolkit"
 HOMEPAGE="https://sourceforge.net/projects/motif/
-       https://motif.ics.com/"
+       http://motif.ics.com/"
 SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}.tar.gz
        https://dev.gentoo.org/~ulm/distfiles/${PN}-2.3.6-patches-2.tar.xz"
 
@@ -39,10 +39,10 @@ src_prepare() {
        eapply_user
 
        # disable compilation of demo binaries
-       sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am || die
+       sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am
 
        # add X.Org vendor string to aliases for virtual bindings
-       echo -e '"The X.Org Foundation"\t\t\t\t\tpc' >>bindings/xmbind.alias || die
+       echo -e '"The X.Org Foundation"\t\t\t\t\tpc' >>bindings/xmbind.alias
 
        AT_M4DIR=. eautoreconf
 
@@ -108,7 +108,7 @@ multilib_src_install_all() {
        newins "${FILESDIR}"/Mwm.defaults Mwm
 
        # cleanup
-       rm -rf "${ED}"/usr/share/Xm || die
+       rm -rf "${ED}"/usr/share/Xm
        find "${D}" -type f -name "*.la" -delete || die
 
        dodoc BUGREPORT ChangeLog README RELEASE RELNOTES TODO