[gentoo-commits] repo/gentoo:master commit in: dev-lang/inform/

[Ionen Wolkens]

commit:     cb6d0a25657464be4a988b9c10d92f7e0e4c8b1c
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  2 07:39:24 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Nov  2 08:25:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb6d0a25

dev-lang/inform: EAPI5->8 old version, remove broken symlink

Wouldn't hurt to keep this version longer, preferably without
keeping EAPI-5. Trivial, so going straight-to-stable.

Closes: https://bugs.gentoo.org/723062
Closes: https://bugs.gentoo.org/819627
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-lang/inform/inform-6.33.1_p2.ebuild | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/dev-lang/inform/inform-6.33.1_p2.ebuild b/dev-lang/inform/inform-6.33.1_p2.ebuild
index 939c464d759..f07551c95d9 100644
--- a/dev-lang/inform/inform-6.33.1_p2.ebuild
+++ b/dev-lang/inform/inform-6.33.1_p2.ebuild
@@ -1,25 +1,31 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-MY_P=${P/_p/-b}
-DESCRIPTION="design system for interactive fiction"
-HOMEPAGE="http://www.inform-fiction.org/"
-SRC_URI="http://mirror.ifarchive.org/if-archive/infocom/compilers/inform6/source/${MY_P}.tar.gz"
+EAPI=8
+
+MY_P="${P/_p/-b}"
+
+DESCRIPTION="Design system for interactive fiction"
+HOMEPAGE="https://www.inform-fiction.org/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="Artistic-2 Inform"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="emacs"
-PDEPEND="emacs? ( app-emacs/inform-mode )"
 
-S=${WORKDIR}/${MY_P}
+PDEPEND="emacs? ( app-emacs/inform-mode )"
 
 src_install() {
 	default
+
 	dodoc VERSION
+
 	docinto tutorial
 	dodoc tutor/README tutor/*.inf
-	mv "${ED}"/usr/share/${PN}/manual "${ED}"/usr/share/doc/${PF}/html
-	rmdir "${ED}"/usr/share/inform/{include,module}
+
+	mv "${ED}"/usr/share/{${PN}/manual,doc/${PF}/html} || die
+	rmdir "${ED}"/usr/share/inform/{include,module} || die
+	rm "${ED}"/usr/share/inform/6.33b2/include/SmartCantGo.h || die #723062
 }