[patch] gcl.diff

gcl.diff (text/plain), 4.55 KB, created by Matthew Kennedy (RETIRED) on 2006-01-12 13:55:44 UTC

Index: Manifest
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lisp/gcl/Manifest,v
retrieving revision 1.48
diff -u -r1.48 Manifest
--- Manifest	15 Nov 2005 13:40:52 -0000	1.48
+++ Manifest	12 Jan 2006 21:51:13 -0000
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 795461872d3d5c4d287dea7639b40611 gcl-2.6.7.ebuild 3808
-MD5 8ff2948460c4a0929a03fcdd99283577 gcl-2.6.6.ebuild 3802
 MD5 a4ba1573c362751377faeb74d21bdecf ChangeLog 5061
-MD5 76c0f2f918c95b927960b6dd7f700d32 metadata.xml 414
+MD5 1d2903807a9ecc5ea090f1daebe0f956 files/2.6.7-fix-configure.in-gentoo.patch 1452
 MD5 91930d3515af8406b00bbddaa287b9a3 files/digest-gcl-2.6.6 62
 MD5 bc36d4fbf49d4faa858862d3551da607 files/digest-gcl-2.6.7 62
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDeeVyKRy60XGEcJIRAp4XAJ4t/jLPQuitywpdDqR40anjEjYlrwCgtNnK
-SYFrKXf5EgjXffpxftmtU6Y=
-=HBho
------END PGP SIGNATURE-----
+MD5 8ff2948460c4a0929a03fcdd99283577 gcl-2.6.6.ebuild 3802
+MD5 209734c60737de3e6ce5b701f6986d20 gcl-2.6.7.ebuild 4032
+MD5 76c0f2f918c95b927960b6dd7f700d32 metadata.xml 414
Index: gcl-2.6.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lisp/gcl/gcl-2.6.7.ebuild,v
retrieving revision 1.5
diff -u -r1.5 gcl-2.6.7.ebuild
--- gcl-2.6.7.ebuild	15 Nov 2005 13:40:33 -0000	1.5
+++ gcl-2.6.7.ebuild	12 Jan 2006 21:51:13 -0000
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/gcl-2.6.7.ebuild,v 1.5 2005/11/15 13:40:33 gustavoz Exp $
 
-inherit elisp-common flag-o-matic
+inherit elisp-common flag-o-matic autotools
 
 DESCRIPTION="GNU Common Lisp"
 HOMEPAGE="http://www.gnu.org/software/gcl/gcl.html"
@@ -13,21 +13,27 @@
 KEYWORDS="x86 ~ppc amd64 sparc"
 IUSE="emacs readline debug X tcltk custreloc dlopen gprof doc ansi"
 
-DEPEND=">=app-text/texi2html-1.64
-	emacs? ( virtual/emacs )
+RDEPEND="emacs? ( virtual/emacs )
 	X? ( virtual/x11 )
 	readline? ( sys-libs/readline )
 	>=dev-libs/gmp-4.1
-	doc? ( virtual/tetex )
 	tcltk? ( dev-lang/tk )"
 
+DEPEND="$RDEPEND
+	doc? ( virtual/tetex )
+	>=app-text/texi2html-1.64
+	>=sys-devel/autoconf-2.52"
+
 src_unpack() {
 	unpack ${A}
 	sed -e "s/gcl-doc/${PF}/g" ${S}/info/makefile > ${T}/makefile
 	mv ${T}/makefile ${S}/info/makefile
+	epatch ${FILESDIR}/${PV}-fix-configure.in-gentoo.patch || die
 }
 
 src_compile() {
+	eautoconf || die
+
 	export SANDBOX_ON=0
 	local myconfig=""
 
@@ -148,6 +154,10 @@
 
 	dodoc readme* RELEASE* ChangeLog* doc/*
 
+	for i in ${D}/usr/share/doc/gcl-{tk,si}; do
+		mv $i ${D}/usr/share/doc/${PF}
+	done
+
 	find ${D}/usr/lib/gcl-${PV}/ -type f \( -perm 640 -o -perm 750 \) -exec chmod 0644 '{}' \;
 }
 
Index: files/2.6.7-fix-configure.in-gentoo.patch
===================================================================
RCS file: files/2.6.7-fix-configure.in-gentoo.patch
diff -N files/2.6.7-fix-configure.in-gentoo.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/2.6.7-fix-configure.in-gentoo.patch	12 Jan 2006 21:51:13 -0000
@@ -0,0 +1,42 @@
+diff -ur gcl-2.6.7.orig/configure.in gcl-2.6.7/configure.in
+--- gcl-2.6.7.orig/configure.in	2005-01-15 13:17:17.000000000 -0600
++++ gcl-2.6.7/configure.in	2006-01-12 15:10:46.000000000 -0600
+@@ -526,26 +526,26 @@
+ AC_CHECK_PROGS(MAKEINFO,makeinfo,"false")
+ AC_SUBST(MAKEINFO)
+ 
+-if test -f /usr/lib/NextStep/software_version; then
+-    system=NEXTSTEP-`${AWK} '/3/,/3/' /usr/lib/NextStep/software_version`
+-else
++dnl if test -f /usr/lib/NextStep/software_version; then
++dnl     system=NEXTSTEP-`${AWK} '/3/,/3/' /usr/lib/NextStep/software_version`
++dnl else
+     system=`uname -s`-`uname -r`
+     if test "$?" -ne 0 ; then
+ 	AC_MSG_RESULT([unknown (can't find uname command)])
+ 	system=unknown
+     else
+-	# Special check for weird MP-RAS system (uname returns weird
+-	# results, and the version is kept in special file).
++dnl 	# Special check for weird MP-RAS system (uname returns weird
++dnl 	# results, and the version is kept in special file).
+     
+-	if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-	    system=MP-RAS-`${AWK} '{print $3}' /etc/.relid'`
+-	fi
+-	if test "`uname -s`" = "AIX" ; then
+-	    system=AIX-`uname -v`.`uname -r`
+-	fi
++dnl 	if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
++dnl 	    system=MP-RAS-`${AWK} '{print $3}' /etc/.relid'`
++dnl 	fi
++dnl 	if test "`uname -s`" = "AIX" ; then
++dnl 	    system=AIX-`uname -v`.`uname -r`
++dnl 	fi
+ 	AC_MSG_RESULT($system)
+     fi
+-fi
++dnl fi
+ 
+ # sysconf
+