--- swig-1.3.24.ebuild	2005-09-04 03:49:28.000000000 +0200
+++ swig-1.3.25.ebuild	2005-09-04 03:06:25.000000000 +0200
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swig/swig-1.3.24.ebuild,v 1.3 2005/08/10 18:10:17 kito Exp $
+# $Header: $
 
 inherit flag-o-matic mono #48511
 
@@ -11,21 +11,19 @@
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~x86"
-IUSE="java guile python tcltk ruby perl php X"
+IUSE="doc guile java perl php python ruby tcltk X"
 
 DEPEND="virtual/libc
-	python? ( >=dev-lang/python-2.0 )
+	guile? ( >=dev-util/guile-1.4 )
 	java? ( virtual/jdk )
+	perl? ( >=dev-lang/perl-5.6.1 )
+	php? ( virtual/php )
+	python? ( virtual/python )
 	ruby? ( virtual/ruby )
-	guile? ( >=dev-util/guile-1.4 )
 	tcltk? (
 		dev-lang/tcl
 		X? ( dev-lang/tk )
-	)
-	perl? ( >=dev-lang/perl-5.6.1 )
-	php? ( >=dev-php/php-4.0.0 )"
-
-S=${WORKDIR}/SWIG-${PV}
+	)"
 
 src_unpack() {
 	unpack ${A}
@@ -43,28 +41,26 @@
 	fi
 
 	econf \
-		`use_with python py` \
+		`use_with guile` \
 		`use_with java java "${JAVA_HOME}"` \
 		`use_with java javaincl "${JAVA_HOME}/include"` \
-		`use_with ruby ruby /usr/bin/ruby` \
-		`use_with guile` \
-		`use_with tcltk tcl` \
 		`use_with perl perl5 /usr/bin/perl` \
 		`use_with php php4` \
+		`use_with python py` \
+		`use_with ruby ruby /usr/bin/ruby` \
+		`use_with tcltk tcl` \
 		|| die
 
-	# fix the broken configure script
-	use tcltk || sed -i -e "s:am__append_1 =:#am__append_1 =:" Runtime/Makefile
-
-	`has_version dev-lisp/plt` && PLT=/usr/share/plt/collects
 	`has_version dev-lisp/mzscheme` && PLT=/usr/share/mzscheme/collects
+	`has_version dev-lisp/plt` && PLT=/usr/share/plt/collects
 
 	emake || die
 }
 
 src_install() {
 	make install DESTDIR=${D} || die
-	dodoc ANNOUNCE CHANGES FUTURE NEW README TODO
+	dodoc ANNOUNCE CHANGES CHANGES.current FUTURE NEW README TODO
+	use doc && dohtml -r Doc/{Devel,Manual}
 }
 
 src_test() {