--- a/molscript-2.1.2-r2.ebuild	2021-11-19 00:56:00.000000000 +0100
+++ b/molscript-2.1.2-r2.ebuild	2022-01-25 16:13:30.717248769 +0100
@@ -1,15 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit epatch toolchain-funcs
+inherit toolchain-funcs
+
+GITHUB_REV="280abee66893162d28cc47c3f1e0cd71214e18a0"
 
 DESCRIPTION="Display 3D molecules (e.g., proteins) in schematic and detailed representations"
-HOMEPAGE="http://www.avatar.se/molscript/"
-SRC_URI="${P}.tar.gz"
+HOMEPAGE="https://kraulis.se/MolScript/"
+SRC_URI="https://github.com/pekrau/MolScript/archive/${GITHUB_REV}.zip -> ${P}.zip"
 
-LICENSE="glut molscript"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
@@ -26,20 +28,17 @@
 		)"
 RDEPEND="${DEPEND}"
 
-RESTRICT="fetch"
+PATCHES=(
+	"${FILESDIR}"/fix-makefile-shared.patch
+	"${FILESDIR}"/${PV}-ldflags.patch
+	"${FILESDIR}"/${PV}-prll.patch
+	"${FILESDIR}"/${PV}-libpng15.patch
+)
 
-pkg_nofetch() {
-	elog "Please visit ${HOMEPAGE}"
-	elog "and get ${A}."
-	elog "Place it into your DISTDIR directory."
-}
+S="${WORKDIR}/MolScript-${GITHUB_REV}/code"
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/fix-makefile-shared.patch \
-		"${FILESDIR}"/${PV}-ldflags.patch \
-		"${FILESDIR}"/${PV}-prll.patch \
-		"${FILESDIR}"/${PV}-libpng15.patch
+	default
 
 	# Provide glutbitmap.h, because freeglut doesn't have it
 	cp "${FILESDIR}"/glutbitmap.h "${S}"/clib/ || die
@@ -63,5 +62,7 @@
 
 src_install() {
 	dobin molscript molauto
-	dohtml "${S}"/doc/*.html
+	DOCS=( ../docs/*.pdf )
+	HTML_DOCS=( ../docs/*.html ../docs/images )
+	einstalldocs
 }