Gentoo Archives: gentoo-commits

From: Aaron Bauman <bman@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/wiliki/files/, www-apps/wiliki/
Date: Mon, 02 Apr 2018 00:19:07
Message-Id: 1522628331.45c8b1fd53574f187c1465f695ad2940b4e4b225.bman@gentoo
1 commit: 45c8b1fd53574f187c1465f695ad2940b4e4b225
2 Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
3 AuthorDate: Mon Apr 2 00:18:51 2018 +0000
4 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
5 CommitDate: Mon Apr 2 00:18:51 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45c8b1fd
7
8 www-apps/wiliki: bump to EAPI=6, use HTTPS, and drop old
9
10 www-apps/wiliki/files/wiliki-0.6.1-cgi-gentoo.patch | 4 ++--
11 www-apps/wiliki/files/wiliki-po-gentoo.patch | 6 +++---
12 .../{wiliki-0.6.1.ebuild => wiliki-0.6.1-r1.ebuild} | 16 ++++++++--------
13 3 files changed, 13 insertions(+), 13 deletions(-)
14
15 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
16 index 55def56d051..173f25fc4ca 100644
17 --- a/www-apps/wiliki/files/wiliki-0.6.1-cgi-gentoo.patch
18 +++ b/www-apps/wiliki/files/wiliki-0.6.1-cgi-gentoo.patch
19 @@ -1,5 +1,5 @@
20 ---- src/wiliki.cgi.orig 2008-01-11 08:52:19.000000000 -0500
21 -+++ src/wiliki.cgi 2009-01-30 11:54:41.000000000 -0500
22 +--- a/src/wiliki.cgi.orig 2008-01-11 08:52:19.000000000 -0500
23 ++++ b/src/wiliki.cgi 2009-01-30 11:54:41.000000000 -0500
24 @@ -52,13 +52,13 @@
25 (define (main args)
26 (wiliki-main
27
28 diff --git a/www-apps/wiliki/files/wiliki-po-gentoo.patch b/www-apps/wiliki/files/wiliki-po-gentoo.patch
29 index 3e5e93f7943..5ce0cca9736 100644
30 --- a/www-apps/wiliki/files/wiliki-po-gentoo.patch
31 +++ b/www-apps/wiliki/files/wiliki-po-gentoo.patch
32 @@ -1,6 +1,6 @@
33 ---- po/Makefile.in.orig 2008-01-31 21:38:35.000000000 -0500
34 -+++ po/Makefile.in 2009-01-09 14:34:08.000000000 -0500
35 -@@ -28,7 +28,7 @@
36 +--- a/po/Makefile.orig 2018-04-01 19:58:29.879110970 -0400
37 ++++ b/po/Makefile.in 2018-04-01 19:59:14.929385523 -0400
38 +@@ -28,7 +28,7 @@ ALL_LINGUAS = @ALL_LINGUAS@
39 PO_FILES = $(addsuffix .po,$(ALL_LINGUAS))
40 MO_FILES = $(addsuffix .gmo,$(ALL_LINGUAS))
41
42
43 diff --git a/www-apps/wiliki/wiliki-0.6.1.ebuild b/www-apps/wiliki/wiliki-0.6.1-r1.ebuild
44 similarity index 84%
45 rename from www-apps/wiliki/wiliki-0.6.1.ebuild
46 rename to www-apps/wiliki/wiliki-0.6.1-r1.ebuild
47 index b3d0f900c44..4add1c335f6 100644
48 --- a/www-apps/wiliki/wiliki-0.6.1.ebuild
49 +++ b/www-apps/wiliki/wiliki-0.6.1-r1.ebuild
50 @@ -1,15 +1,15 @@
51 -# Copyright 1999-2014 Gentoo Foundation
52 +# Copyright 1999-2018 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54
55 -EAPI="3"
56 +EAPI=6
57
58 -inherit webapp eutils
59 +inherit webapp
60
61 MY_PN="WiLiKi"
62 MY_P=${MY_PN}-${PV}
63
64 DESCRIPTION="WiLiKi is a lightweight Wiki engine written in and running on Gauche Scheme"
65 -HOMEPAGE="http://practical-scheme.net/wiliki/"
66 +HOMEPAGE="https://practical-scheme.net/wiliki/"
67 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
68
69 LICENSE="BSD"
70 @@ -28,10 +28,10 @@ WEBAPP_MANUAL_SLOT="yes"
71
72 S="${WORKDIR}"/${MY_P}
73
74 -src_prepare() {
75 - epatch "${FILESDIR}"/${PN}-po-gentoo.patch
76 - epatch "${FILESDIR}"/${P}-cgi-gentoo.patch
77 -}
78 +PATCHES=(
79 + "${FILESDIR}"/${PN}-po-gentoo.patch
80 + "${FILESDIR}"/${P}-cgi-gentoo.patch
81 +)
82
83 src_install() {
84 webapp_src_preinst