[patch] Patch to install 5.44.1 (fixing sandbox violations)

expect-ebuild-5.43.0-to-5.44.1.diff (text/plain), 2.64 KB, created by Jose Medellin on 2008-01-31 04:04:36 UTC

--- expect-5.43.0.ebuild	2008-01-30 21:59:42.000000000 -0600
+++ expect-5.44.1.ebuild	2008-01-30 21:52:11.000000000 -0600
@@ -16,29 +16,34 @@
 
 # We need dejagnu for src_test, but dejagnu needs expect
 # to compile/run, so we cant add dejagnu to DEPEND :/
-DEPEND=">=dev-lang/tcl-8.2
-	X? ( >=dev-lang/tk-8.2 )"
+# NOT tested with <tcl/tk-8.5
+DEPEND=">=dev-lang/tcl-8.5
+	X? ( >=dev-lang/tk-8.5 )"
 RDEPEND="${DEPEND}"
 
-NON_MICRO_V=${P%.[0-9]}
-S=${WORKDIR}/${NON_MICRO_V}
+WANT_AUTOCONF=2.5
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-5.42.1-multilib.patch
 
-	# fix the rpath being set to /var/tmp/portage/...
-	epatch "${FILESDIR}"/${PN}-5.39.0-libdir.patch
-
-	sed -i 's#/usr/local/bin#/usr/bin#' expect.man
-	sed -i 's#/usr/local/bin#/usr/bin#' expectk.man
-	#stops any example scripts being installed by default
-	sed -i \
-		-e '/^install:/s/install-libraries //' \
-		-e 's/^SCRIPTS_MANPAGES = /_&/' \
-		Makefile.in
-	eautoconf
+	# The testsuite is somehow (?) included by econf - but fails (at least on amd64)
+	# This seems to be a workaround for http://bugs.gentoo.org/show_bug.cgi?id=115688
+	rm -rf testsuite
+
+	epatch "${FILESDIR}"/${PN}-to-work-with-tcl-8.5.patch
+	epatch "${FILESDIR}"/expect-makefile-sandbox-patch.patch
+# Now this is a mess.
+# autoconf fails, requesting an 'expect.m4' that doesn't exist.
+# the following sed-changes are not incorporated!
+#	sed -i 's#/usr/local/bin#/usr/bin#' expect.man
+#	sed -i 's#/usr/local/bin#/usr/bin#' expectk.man
+#	#stops any example scripts being installed by default
+#	sed -i \
+#		-e '/^install:/s/install-libraries //' \
+#		-e 's/^SCRIPTS_MANPAGES = /_&/' \
+#		Makefile.in
+#	eautoconf
 }
 
 src_compile() {
@@ -53,7 +58,7 @@
 	#tkv=$(grep	 TK_VER /usr/include/tk.h  | sed 's/^.*"\(.*\)".*/\1/')
 
 	#configure needs to find the files tclConfig.sh and tclInt.h
-	myconf="--with-tcl=/usr/$(get_libdir) --with-tclinclude=/usr/$(get_libdir)/tcl${tclv}/include/generic"
+	myconf="--with-tcl=/usr/$(get_libdir)/ --with-tclinclude=/usr/$(get_libdir)/tcl${tclv}/include/generic"
 
 	if use X ; then
 		#--with-x is enabled by default
@@ -78,12 +83,13 @@
 
 src_install() {
 	dodir /usr/$(get_libdir)
-	make install INSTALL_ROOT="${D}" || die "make install failed"
+	make install INSTALL_ROOT="${D}" DESTDIR="${D}" || die "make install failed"
 
 	dodoc ChangeLog FAQ HISTORY NEWS README
 
-	local static_lib="lib${NON_MICRO_V/-/}.a"
-	rm "${D}"/usr/$(get_libdir)/${NON_MICRO_V/-/}/${static_lib}
+	# this file is not created anymore?
+	#	local static_lib="lib${NON_MICRO_V/-/}.a"
+	#	rm "${D}"/usr/$(get_libdir)/${NON_MICRO_V/-/}/${static_lib}
 
 	#install examples if 'doc' is set
 	if use doc ; then