commit:     d9e008bace6d9ead1f7226242adcbfda1c8f08b3
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 12 12:02:58 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Wed Jan 12 15:07:16 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9e008ba

www-apps/cvsweb: Port to EAPI 8

Closes: https://bugs.gentoo.org/819174
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 ...sweb-3.0.6-r1.ebuild => cvsweb-3.0.6-r2.ebuild} | 31 +++++++++++-----------
 www-apps/cvsweb/files/cvsweb-3.0.6-perl518.patch   |  4 +--
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/www-apps/cvsweb/cvsweb-3.0.6-r1.ebuild 
b/www-apps/cvsweb/cvsweb-3.0.6-r2.ebuild
similarity index 68%
rename from www-apps/cvsweb/cvsweb-3.0.6-r1.ebuild
rename to www-apps/cvsweb/cvsweb-3.0.6-r2.ebuild
index 5f9861b07555..08084e033d44 100644
--- a/www-apps/cvsweb/cvsweb-3.0.6-r1.ebuild
+++ b/www-apps/cvsweb/cvsweb-3.0.6-r2.ebuild
@@ -1,9 +1,9 @@
-# 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 webapp
+inherit webapp
 
 DESCRIPTION="WWW interface to a CVS tree"
 HOMEPAGE="http://www.freebsd.org/projects/cvsweb.html";
@@ -11,30 +11,31 @@ 
SRC_URI="ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/scop/${P}.tar.g
 
 LICENSE="BSD"
 KEYWORDS="~amd64 ~ppc sparc x86"
-IUSE=""
 
-RDEPEND=">=dev-lang/perl-5.8
-       >=dev-vcs/cvs-1.11
-       >=dev-vcs/rcs-5.7
-       >=dev-perl/URI-1.28
+RDEPEND="
+       >=app-text/enscript-1.6.3
+       >=dev-lang/perl-5.8
        dev-perl/IPC-Run
        dev-perl/MIME-Types
        dev-perl/String-Ediff
+       >=dev-perl/URI-1.28
+       >=dev-vcs/cvs-1.11
        >=dev-vcs/cvsgraph-1.4.0
-       >=app-text/enscript-1.6.3"
+       >=dev-vcs/rcs-5.7
+"
 
-src_prepare() {
-       epatch "${FILESDIR}/${P}-perl518.patch"
-}
+PATCHES=(
+       "${FILESDIR}"/${P}-perl518.patch
+)
 
 src_install() {
        webapp_src_preinst
 
-       cp cvsweb.conf "${D}"/${MY_HOSTROOTDIR}
-       cp css/cvsweb.css "${D}"/${MY_HTDOCSDIR}
+       cp cvsweb.conf "${ED}"/${MY_HOSTROOTDIR} || die
+       cp css/cvsweb.css "${ED}"/${MY_HTDOCSDIR} || die
        exeinto ${MY_CGIBINDIR}
        doexe cvsweb.cgi
-       chmod +x "${D}"/${MY_CGIBINDIR}/cvsweb.cgi
+       chmod +x "${ED}"/${MY_CGIBINDIR}/cvsweb.cgi
 
        dodoc README TODO NEWS ChangeLog
 

diff --git a/www-apps/cvsweb/files/cvsweb-3.0.6-perl518.patch 
b/www-apps/cvsweb/files/cvsweb-3.0.6-perl518.patch
index ba1195ae9160..288a67551d36 100644
--- a/www-apps/cvsweb/files/cvsweb-3.0.6-perl518.patch
+++ b/www-apps/cvsweb/files/cvsweb-3.0.6-perl518.patch
@@ -3,8 +3,8 @@ 
http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/www/cvsweb/patches/patch-cvsweb.cgi.d
 
 Fix warnings from newer perl versions
 
---- cvsweb.cgi.orig    2013-07-30 12:49:33.268655300 +0000
-+++ cvsweb.cgi
+--- a/cvsweb.cgi
++++ b/cvsweb.cgi
 @@ -1192,7 +1192,7 @@ EOF
  <legend>General options</legend>
  <input type="hidden" name="copt" value="1" />

Reply via email to