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

Collapse All | Expand All

(-)expect-5.43.0.ebuild (-20 / +26 lines)
Lines 16-44 Link Here
16
16
17
# We need dejagnu for src_test, but dejagnu needs expect
17
# We need dejagnu for src_test, but dejagnu needs expect
18
# to compile/run, so we cant add dejagnu to DEPEND :/
18
# to compile/run, so we cant add dejagnu to DEPEND :/
19
DEPEND=">=dev-lang/tcl-8.2
19
# NOT tested with <tcl/tk-8.5
20
	X? ( >=dev-lang/tk-8.2 )"
20
DEPEND=">=dev-lang/tcl-8.5
21
	X? ( >=dev-lang/tk-8.5 )"
21
RDEPEND="${DEPEND}"
22
RDEPEND="${DEPEND}"
22
23
23
NON_MICRO_V=${P%.[0-9]}
24
WANT_AUTOCONF=2.5
24
S=${WORKDIR}/${NON_MICRO_V}
25
25
26
src_unpack() {
26
src_unpack() {
27
	unpack ${A}
27
	unpack ${A}
28
	cd "${S}"
28
	cd "${S}"
29
	epatch "${FILESDIR}"/${PN}-5.42.1-multilib.patch
30
29
31
	# fix the rpath being set to /var/tmp/portage/...
30
	# The testsuite is somehow (?) included by econf - but fails (at least on amd64)
32
	epatch "${FILESDIR}"/${PN}-5.39.0-libdir.patch
31
	# This seems to be a workaround for http://bugs.gentoo.org/show_bug.cgi?id=115688
33
32
	rm -rf testsuite
34
	sed -i 's#/usr/local/bin#/usr/bin#' expect.man
33
35
	sed -i 's#/usr/local/bin#/usr/bin#' expectk.man
34
	epatch "${FILESDIR}"/${PN}-to-work-with-tcl-8.5.patch
36
	#stops any example scripts being installed by default
35
	epatch "${FILESDIR}"/expect-makefile-sandbox-patch.patch
37
	sed -i \
36
# Now this is a mess.
38
		-e '/^install:/s/install-libraries //' \
37
# autoconf fails, requesting an 'expect.m4' that doesn't exist.
39
		-e 's/^SCRIPTS_MANPAGES = /_&/' \
38
# the following sed-changes are not incorporated!
40
		Makefile.in
39
#	sed -i 's#/usr/local/bin#/usr/bin#' expect.man
41
	eautoconf
40
#	sed -i 's#/usr/local/bin#/usr/bin#' expectk.man
41
#	#stops any example scripts being installed by default
42
#	sed -i \
43
#		-e '/^install:/s/install-libraries //' \
44
#		-e 's/^SCRIPTS_MANPAGES = /_&/' \
45
#		Makefile.in
46
#	eautoconf
42
}
47
}
43
48
44
src_compile() {
49
src_compile() {
Lines 53-59 Link Here
53
	#tkv=$(grep	 TK_VER /usr/include/tk.h  | sed 's/^.*"\(.*\)".*/\1/')
58
	#tkv=$(grep	 TK_VER /usr/include/tk.h  | sed 's/^.*"\(.*\)".*/\1/')
54
59
55
	#configure needs to find the files tclConfig.sh and tclInt.h
60
	#configure needs to find the files tclConfig.sh and tclInt.h
56
	myconf="--with-tcl=/usr/$(get_libdir) --with-tclinclude=/usr/$(get_libdir)/tcl${tclv}/include/generic"
61
	myconf="--with-tcl=/usr/$(get_libdir)/ --with-tclinclude=/usr/$(get_libdir)/tcl${tclv}/include/generic"
57
62
58
	if use X ; then
63
	if use X ; then
59
		#--with-x is enabled by default
64
		#--with-x is enabled by default
Lines 78-89 Link Here
78
83
79
src_install() {
84
src_install() {
80
	dodir /usr/$(get_libdir)
85
	dodir /usr/$(get_libdir)
81
	make install INSTALL_ROOT="${D}" || die "make install failed"
86
	make install INSTALL_ROOT="${D}" DESTDIR="${D}" || die "make install failed"
82
87
83
	dodoc ChangeLog FAQ HISTORY NEWS README
88
	dodoc ChangeLog FAQ HISTORY NEWS README
84
89
85
	local static_lib="lib${NON_MICRO_V/-/}.a"
90
	# this file is not created anymore?
86
	rm "${D}"/usr/$(get_libdir)/${NON_MICRO_V/-/}/${static_lib}
91
	#	local static_lib="lib${NON_MICRO_V/-/}.a"
92
	#	rm "${D}"/usr/$(get_libdir)/${NON_MICRO_V/-/}/${static_lib}
87
93
88
	#install examples if 'doc' is set
94
	#install examples if 'doc' is set
89
	if use doc ; then
95
	if use doc ; then

Return to bug 200477