[gentoo-commits] repo/gentoo:master commit in: www-apps/wiliki/files/, www-apps/wiliki/

[gentoo-commits] repo/gentoo:master commit in: www-apps/wiliki/files/, www-apps/wiliki/

[Aaron Bauman]

commit:     45c8b1fd53574f187c1465f695ad2940b4e4b225
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  2 00:18:51 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon Apr  2 00:18:51 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45c8b1fd

www-apps/wiliki: bump to EAPI=6, use HTTPS, and drop old

 www-apps/wiliki/files/wiliki-0.6.1-cgi-gentoo.patch      |  4 ++--
 www-apps/wiliki/files/wiliki-po-gentoo.patch             |  6 +++---
 .../{wiliki-0.6.1.ebuild => wiliki-0.6.1-r1.ebuild}      | 16 ++++++++--------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/www-apps/wiliki/files/wiliki-0.6.1-cgi-gentoo.patch b/www-apps/wiliki/files/wiliki-0.6.1-cgi-gentoo.patch
index 55def56d051..173f25fc4ca 100644
--- a/www-apps/wiliki/files/wiliki-0.6.1-cgi-gentoo.patch
+++ b/www-apps/wiliki/files/wiliki-0.6.1-cgi-gentoo.patch
@@ -1,5 +1,5 @@
---- src/wiliki.cgi.orig	2008-01-11 08:52:19.000000000 -0500
-+++ src/wiliki.cgi	2009-01-30 11:54:41.000000000 -0500
+--- a/src/wiliki.cgi.orig	2008-01-11 08:52:19.000000000 -0500
++++ b/src/wiliki.cgi	2009-01-30 11:54:41.000000000 -0500
 @@ -52,13 +52,13 @@
  (define (main args)
    (wiliki-main

diff --git a/www-apps/wiliki/files/wiliki-po-gentoo.patch b/www-apps/wiliki/files/wiliki-po-gentoo.patch
index 3e5e93f7943..5ce0cca9736 100644
--- a/www-apps/wiliki/files/wiliki-po-gentoo.patch
+++ b/www-apps/wiliki/files/wiliki-po-gentoo.patch
@@ -1,6 +1,6 @@
---- po/Makefile.in.orig	2008-01-31 21:38:35.000000000 -0500
-+++ po/Makefile.in	2009-01-09 14:34:08.000000000 -0500
-@@ -28,7 +28,7 @@
+--- a/po/Makefile.orig	2018-04-01 19:58:29.879110970 -0400
++++ b/po/Makefile.in	2018-04-01 19:59:14.929385523 -0400
+@@ -28,7 +28,7 @@ ALL_LINGUAS = @ALL_LINGUAS@
  PO_FILES = $(addsuffix .po,$(ALL_LINGUAS))
  MO_FILES = $(addsuffix .gmo,$(ALL_LINGUAS))
  

diff --git a/www-apps/wiliki/wiliki-0.6.1.ebuild b/www-apps/wiliki/wiliki-0.6.1-r1.ebuild
similarity index 84%
rename from www-apps/wiliki/wiliki-0.6.1.ebuild
rename to www-apps/wiliki/wiliki-0.6.1-r1.ebuild
index b3d0f900c44..4add1c335f6 100644
--- a/www-apps/wiliki/wiliki-0.6.1.ebuild
+++ b/www-apps/wiliki/wiliki-0.6.1-r1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="3"
+EAPI=6
 
-inherit webapp eutils
+inherit webapp
 
 MY_PN="WiLiKi"
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="WiLiKi is a lightweight Wiki engine written in and running on Gauche Scheme"
-HOMEPAGE="http://practical-scheme.net/wiliki/"
+HOMEPAGE="https://practical-scheme.net/wiliki/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
 
 LICENSE="BSD"
@@ -28,10 +28,10 @@ WEBAPP_MANUAL_SLOT="yes"
 
 S="${WORKDIR}"/${MY_P}
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-po-gentoo.patch
-	epatch "${FILESDIR}"/${P}-cgi-gentoo.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-po-gentoo.patch
+	"${FILESDIR}"/${P}-cgi-gentoo.patch
+)
 
 src_install() {
 	webapp_src_preinst