Diff info2html-2.0 with a info2html-2.0-r1

/usr/portage/app-text/info2html/info2html-2.0-r1.ebuild 2019-11-06 23:09:00.000000000 +0300
1
# Copyright 1999-2018 Gentoo Foundation
1
# Copyright 1999-2019 Gentoo Authors
2 2
# Distributed under the terms of the GNU General Public License v2
3 3

  
4
EAPI=0
4
EAPI=7
5 5

  
6 6
inherit eutils webapp
7 7

  
......
13 13
# webapp.eclass deals with SLOTting
14 14
#SLOT="0"
15 15
IUSE=""
16
KEYWORDS="alpha amd64 hppa sparc x86"
16
KEYWORDS="~alpha ~amd64 ~hppa ~sparc ~x86"
17 17

  
18 18
RDEPEND="dev-lang/perl"
19

  
20
src_unpack() {
21
	local infos state line i
22
	unpack ${A}
23
	cd ${S}
24

  
19
PATCHES=(
25 20
	# filter user-provided data to prevent cross-frame/site scripting attacks
26 21
	# bug #91354 (fix from Werner Fink)
27
	epatch "${FILESDIR}"/info2html-2.0-xss.patch
22
	"${FILESDIR}"/info2html-2.0-xss.patch
23
)
24

  
25
src_prepare() {
26
	default
28 27

  
29 28
	# Fixup INFODIR for paths in /etc/profile.env INFOPATH
30 29
	infos=$(grep "^export INFOPATH=" /etc/profile.env | tail -n 1 |\
......
32 31
	# Default path to /usr/share/info and /usr/local/share/info
33 32
	[[ -z ${infos} ]] && export infos="/usr/share/info"
34 33
	infos=( ${INFOPATH//:/ } )
35
	mv ${S}/info2html.conf ${S}/info2html.conf.orig
36
	touch ${S}/info2html.conf
34
	mv "${S}"/info2html.conf "${S}"/info2html.conf.orig
35
	touch "${S}"/info2html.conf
37 36
	state="copy"
38 37
	inserted="no"
39 38
	while read line; do
......
55 54
			"skip")
56 55
				;;
57 56
		esac
58
	done < ${S}/info2html.conf.orig
57
	done < "${S}"/info2html.conf.orig
59 58
	[[ ${state} == "copy" && ${inserted} == "yes" ]] ||
60 59
		die "Setting up info2html.conf failed"
61 60
}
......
64 63
	webapp_src_preinst
65 64

  
66 65
	exeinto ${MY_CGIBINDIR}
67
	cp info2html infocat info2html.css info2html.conf ${D}/${MY_CGIBINDIR}
66
	cp info2html infocat info2html.css info2html.conf "${D}"/${MY_CGIBINDIR}
68 67
	# README zapped by info2html-gentoo.patch; it only listed
69 68
	# the homepage so it doesn't add anything useful.
70 69
	# dodoc README
Thank you!