Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 567260 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-8 / +22 lines)
Line  Link Here
0
-- plan9port/plan9port-20140306.ebuild
0
++ plan9port.new/plan9port-20140306.ebuild
Lines 21-39 RDEPEND="${DEPEND}" Link Here
21
S="${WORKDIR}/${PN}"
21
S="${WORKDIR}/${PN}"
22
22
23
PLAN9=/usr/lib/plan9
23
PLAN9=/usr/lib/plan9
24
EPLAN9="${EPREFIX}"${PLAN9}
24
QA_MULTILIB_PATHS="${PLAN9}/.*/.*"
25
QA_MULTILIB_PATHS="${PLAN9}/.*/.*"
25
26
26
src_prepare() {
27
src_prepare() {
27
	epatch "${FILESDIR}/${PN}-"{noexecstack,cflags,builderr}".patch"
28
	epatch "${FILESDIR}/${PN}-"{noexecstack,cflags,builderr}".patch"
28
29
30
	# don't hardcode /bin and /usr/bin in PATH
31
	sed -i '/PATH/s,/bin:/usr/bin:,,' INSTALL || die "sed on INSTALL failed"
32
33
	# don't hardcode /usr/{,local/}include and prefix /usr/include/*
34
	for f in src/cmd/fontsrv/freetyperules.sh INSTALL \
35
		$(find -name makefile); do
36
		sed -r -i -e 's,-I/usr(|/local)/include ,,g' \
37
		-e "s,-I/usr(|/local)/include,-I${EPREFIX}/usr\1/include,g" ${f} \
38
		|| die "sed on ${f} failed"
39
	done
40
29
	# Fix paths, done in place of ./INSTALL -c
41
	# Fix paths, done in place of ./INSTALL -c
30
	einfo "Fixing hard-coded /usr/local/plan9 paths"
42
	einfo "Fixing hard-coded /usr/local/plan9 paths"
31
	grep  --null -l -r '/usr/local/plan9' |
43
	grep  --null -l -r '/usr/local/plan9' |
32
	xargs --null sed -i "s!/usr/local/plan9!${PLAN9}!g"
44
	xargs --null sed -i "s!/usr/local/plan9!${EPLAN9}!g"
33
}
45
}
34
46
35
src_configure() {
47
src_configure() {
36
	if ! use X; then
48
	if use X; then
49
		echo "X11=${EPREFIX}/usr" >> LOCAL.config
50
	else
37
		echo "WSYSTYPE=nowsys" >> LOCAL.config
51
		echo "WSYSTYPE=nowsys" >> LOCAL.config
38
	fi
52
	fi
39
}
53
}
Lines 54-67 src_install() { Link Here
54
	docompress -x $PLAN9/man
68
	docompress -x $PLAN9/man
55
69
56
	# do* plays with the executable bit, and we should not modify them
70
	# do* plays with the executable bit, and we should not modify them
57
	cp -a * "${D}/${PLAN9}"
71
	cp -a * "${ED}/${PLAN9}"
58
72
59
	# build the environment variables and install them in env.d
73
	# build the environment variables and install them in env.d
60
	cat > "${T}/30plan9" <<-EOF
74
	cat > "${T}/30plan9" <<-EOF
61
		PLAN9="${PLAN9}"
75
		PLAN9="${EPLAN9}"
62
		PATH="${PLAN9}/bin"
76
		PATH="${EPLAN9}/bin"
63
		ROOTPATH="${PLAN9}/bin"
77
		ROOTPATH="${EPLAN9}/bin"
64
		MANPATH="${PLAN9}/man"
78
		MANPATH="${EPLAN9}/man"
65
	EOF
79
	EOF
66
	doenvd "${T}/30plan9"
80
	doenvd "${T}/30plan9"
67
}
81
}

Return to bug 567260