bump, fixes bug 171349, add amd64, fixes bug 192831

Package-Manager: portage-2.1.3.9

5 files changed, 154 insertions, 15 deletions

diff --git a/dev-lisp/lush/ChangeLog b/dev-lisp/lush/ChangeLog
index 25c71b74f0cf..538a54f44a97 100644
--- a/dev-lisp/lush/ChangeLog
+++ b/dev-lisp/lush/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lisp/lush
 # Copyright 2000-2007 Gentoo Foundation and Matthew Kennedy <mkennedy@gentoo.org>; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/lush/ChangeLog,v 1.10 2007/07/22 08:02:26 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/lush/ChangeLog,v 1.11 2007/09/18 17:28:55 hkbst Exp $
+
+*lush-1.2.1 (18 Sep 2007)
+
+  18 Sep 2007; Marijn Schouten <hkBst@gentoo.org> +files/aclocal.m4.patch,
+  +lush-1.2.1.ebuild:
+  bump, fixes bug 171349, add amd64, fixes bug 192831
 
   22 Jul 2007; Hans de Graaff <graaff@gentoo.org> lush-1.0.ebuild,
   lush-1.1.ebuild:
diff --git a/dev-lisp/lush/Manifest b/dev-lisp/lush/Manifest
index a1df6e9149f2..9f1862975812 100644
--- a/dev-lisp/lush/Manifest
+++ b/dev-lisp/lush/Manifest
@@ -1,12 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.1-gcc4.patch 2538 RMD160 83109221ebb78d9f4d12f442671172777b871685 SHA1 e8adbf19ce1ed29b7c31b3e549f0f7fc483332bf SHA256 94db2e5fa364c2ab20199505efcdcd6764ffb3e406e86a0391b5d8c73dc01d0b
 MD5 fc95799c7314b04d3fd8136fd7093e67 files/1.1-gcc4.patch 2538
 RMD160 83109221ebb78d9f4d12f442671172777b871685 files/1.1-gcc4.patch 2538
 SHA256 94db2e5fa364c2ab20199505efcdcd6764ffb3e406e86a0391b5d8c73dc01d0b files/1.1-gcc4.patch 2538
+AUX aclocal.m4.patch 3279 RMD160 55982b58ea03b6174fb2fc2a5752ac9795932a52 SHA1 f08fba5ca38b9eae4c0c7a00cb103a8c312df845 SHA256 796672589a95c5135ab1d71e456157e5e2bcb259d819cb17ba90ebee41397f10
+MD5 932f5902f05eeeec350d76ddf7858419 files/aclocal.m4.patch 3279
+RMD160 55982b58ea03b6174fb2fc2a5752ac9795932a52 files/aclocal.m4.patch 3279
+SHA256 796672589a95c5135ab1d71e456157e5e2bcb259d819cb17ba90ebee41397f10 files/aclocal.m4.patch 3279
 DIST lush-1.0.tar.gz 4155938 RMD160 347fc8252a6206f20e923d6513434956793b91eb SHA1 5a649b59ed7c4ace9213cc19aa323347b035f115 SHA256 8c68e8931f9d393751439602475fea4a48a95a9f1c54b6595fc2550044b2d682
 DIST lush-1.1.tar.gz 4385751 RMD160 3e32242a8a9391e4077144bbda10a013f4791d48 SHA1 89d83c88d968f5216c59ce0d7a249e992f6aea41 SHA256 38fc6296af992dd7f20ddb8e64e0c39789bed9c90dd30ea1ab2268f6dc536fcb
+DIST lush-1.2.1.tar.gz 4431778 RMD160 22622b256aab3ad1712b3bbb0c2f892de017002f SHA1 c378f339320e98b6c7b9177aec6284567f4aa088 SHA256 1423085ef7c4ed83374333ba7a552e7f5f35add8db0c2478c8b00c96931ad8c9
 EBUILD lush-1.0.ebuild 745 RMD160 bfabebdb68a4261c3fa12d9ef916d4a0d10c0c48 SHA1 ce0b221547a4bf5d5c184d4fa6658457ef63481a SHA256 7cdc8711a814729f1d8ce13870816cc23f3a4c8af00bbb53ba297423a8b019e1
 MD5 1ce64aed33ee958adc6afed057b1e522 lush-1.0.ebuild 745
 RMD160 bfabebdb68a4261c3fa12d9ef916d4a0d10c0c48 lush-1.0.ebuild 745
@@ -15,10 +17,14 @@ EBUILD lush-1.1.ebuild 815 RMD160 2baed628209e767863cdac4714cdd7200ae8065a SHA1
 MD5 7b2cf795212c3b5439f778e03f77ce12 lush-1.1.ebuild 815
 RMD160 2baed628209e767863cdac4714cdd7200ae8065a lush-1.1.ebuild 815
 SHA256 4baf34ef009ed5a61f02b08065df0642e85f7007c59c0c120b1547cee262d1cb lush-1.1.ebuild 815
-MISC ChangeLog 1471 RMD160 e76b8a1930c691e98b18cd89f55c43932052abe8 SHA1 3ce74a65288713955e8c54e1a091c4466cf3f465 SHA256 f9647813bf86ca61780932d0ac63c4259c698b75fa501ba548f69325698a8e31
-MD5 ce996366fa7e35360efc252cbc857d16 ChangeLog 1471
-RMD160 e76b8a1930c691e98b18cd89f55c43932052abe8 ChangeLog 1471
-SHA256 f9647813bf86ca61780932d0ac63c4259c698b75fa501ba548f69325698a8e31 ChangeLog 1471
+EBUILD lush-1.2.1.ebuild 981 RMD160 976a4b4d5bd1bb125e54c8d31903d198e63b1ebb SHA1 755c5f890a02cd597300c07b2e0bb9c3b79032e9 SHA256 ded6e128dce58c4cef4e1ed544504f74150f0b8b3513a05cae3643f0048b9b20
+MD5 36b89eefed648ffb99d2b151e4440b41 lush-1.2.1.ebuild 981
+RMD160 976a4b4d5bd1bb125e54c8d31903d198e63b1ebb lush-1.2.1.ebuild 981
+SHA256 ded6e128dce58c4cef4e1ed544504f74150f0b8b3513a05cae3643f0048b9b20 lush-1.2.1.ebuild 981
+MISC ChangeLog 1649 RMD160 8681cdf67aebdbacbc067058cf5e0435c71b28ad SHA1 1d44c6027ec490acd331826fa3a4d368edf75189 SHA256 75983fff0f14c08e4f43c7177992a3fc3dc97821392988daeb6026e2fe206212
+MD5 08de743d89411ecf32bef339d657b266 ChangeLog 1649
+RMD160 8681cdf67aebdbacbc067058cf5e0435c71b28ad ChangeLog 1649
+SHA256 75983fff0f14c08e4f43c7177992a3fc3dc97821392988daeb6026e2fe206212 ChangeLog 1649
 MISC metadata.xml 537 RMD160 3457043c7929c6de3e2d3e8ada80cc58819b7fd2 SHA1 957cdc8ffbe99297623a939fc7ccc8094f8df2c3 SHA256 8023472b52c7d3512b1c1b645b797d7081a036c8272f7f78df29245689e4525b
 MD5 fa384f93c4c1dceb916464d4ea982416 metadata.xml 537
 RMD160 3457043c7929c6de3e2d3e8ada80cc58819b7fd2 metadata.xml 537
@@ -29,10 +35,6 @@ SHA256 c562b3ea9d3fc91002b2f80839567312130ff4698a423ae8fc4400438d382860 files/di
 MD5 15c8915e49dcc49925737842e3b1cee2 files/digest-lush-1.1 229
 RMD160 2938fa65f4e49ef087864e91d6f01189d14b8835 files/digest-lush-1.1 229
 SHA256 6f3812790ac027b4f9bcc13a20efd5c8105437703bd5df5b39c5e1c3ed513c15 files/digest-lush-1.1 229
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFGow8Q0BM77Tkv120RAgdkAKD6OAgVuW5jHaWvFjS0JGQNpPXKaACgvYz3
-k5nar3WIwAe3bBakaytFH2Q=
-=mmzQ
------END PGP SIGNATURE-----
+MD5 c2c7d2663586dab48783356bb86a692b files/digest-lush-1.2.1 235
+RMD160 763994738879ba4b3ae27c0377c47642f410bcbb files/digest-lush-1.2.1 235
+SHA256 6e43b116fcaad1f4c8766ee2de26f655d89f504df26b748375d665c9f9c96178 files/digest-lush-1.2.1 235
diff --git a/dev-lisp/lush/files/aclocal.m4.patch b/dev-lisp/lush/files/aclocal.m4.patch
new file mode 100644
index 000000000000..8c1a4798cac9
--- /dev/null
+++ b/dev-lisp/lush/files/aclocal.m4.patch
@@ -0,0 +1,91 @@
+--- aclocal.m4.old	2007-09-18 19:07:48.000000000 +0200
++++ aclocal.m4	2007-09-18 19:15:29.000000000 +0200
+@@ -102,49 +102,49 @@
+         [ac_cpu=$withval])
+ 
+    AC_ARG_VAR(OPTS, [Optimization flags for all compilers.])
+-   if test x${OPTS+set} = xset ; then
+-     saved_CFLAGS="$CFLAGS"
+-     CFLAGS=
+-     for opt in $saved_CFLAGS ; do
+-       case $opt in
+-         -O*|-g*) ;;
+-         *) CFLAGS="$CFLAGS $opt" ;;
+-       esac
+-     done
+-     AC_MSG_CHECKING([user provided debugging flags])
++#   if test x${OPTS+set} = xset ; then
++#     saved_CFLAGS="$CFLAGS"
++#     CFLAGS=
++#     for opt in $saved_CFLAGS ; do
++#       case $opt in
++#         -O*|-g*) ;;
++#         *) CFLAGS="$CFLAGS $opt" ;;
++#       esac
++#     done
++#     AC_MSG_CHECKING([user provided debugging flags])
+      AC_MSG_RESULT($OPTS)
+-   else 
+-     saved_CFLAGS="$CFLAGS"
+-     CFLAGS=
+-     for opt in $saved_CFLAGS ; do
+-       case $opt in
+-         -O*) ;;
+-         -g*) OPTS="$OPTS $opt" ;;
+-         *) CFLAGS="$CFLAGS $opt" ;;
+-       esac
+-     done
++#   else 
++#     saved_CFLAGS="$CFLAGS"
++#     CFLAGS=
++#     for opt in $saved_CFLAGS ; do
++#       case $opt in
++#         -O*) ;;
++#         -g*) OPTS="$OPTS $opt" ;;
++#         *) CFLAGS="$CFLAGS $opt" ;;
++#       esac
++#     done
+      if test x$ac_debug = xno ; then
+        OPTS=-DNO_DEBUG
+-       AC_CHECK_CC_OPT([-Wall],[OPTS="$OPTS -Wall"])
+-       AC_CHECK_CC_OPT([-O3],[OPTS="$OPTS -O3"],
+-         [ AC_CHECK_CC_OPT([-O2], [OPTS="$OPTS -O2"] ) ] )
+-       if test -z "$ac_cpu" ; then
+-        AC_MSG_WARN([guessing cpu type (use --with-cpu=cpuname to override.)])
+-       fi
+-       opt="-march=${ac_cpu-${host_cpu}}"
+-       AC_CHECK_CC_OPT([$opt], [OPTS="$OPTS $opt"],
+-	  [ opt="-mcpu=${ac_cpu-${host_cpu}}"
+-            AC_CHECK_CC_OPT([$opt], [OPTS="$OPTS $opt"]) ] )
+-       if test -z "$ac_cpu" -a "$host_cpu" = "i686" ; then
+-            AC_CHECK_CC_OPT([-mmmx],[OPTS="$OPTS -mmmx"
+-              AC_MSG_WARN([use --with-cpu=cpuname to avoid assuming that MMX works.])])
+-            if test -r /proc/cpuinfo && grep -q sse /proc/cpuinfo ; then
+-              AC_CHECK_CC_OPT([-msse],[OPTS="$OPTS -msse"
+-                AC_MSG_WARN([use --with-cpu=cpuname to avoid assuming that SSE works.])])
+-            fi
+-       fi
++#       AC_CHECK_CC_OPT([-Wall],[OPTS="$OPTS -Wall"])
++#       AC_CHECK_CC_OPT([-O3],[OPTS="$OPTS -O3"],
++#         [ AC_CHECK_CC_OPT([-O2], [OPTS="$OPTS -O2"] ) ] )
++#       if test -z "$ac_cpu" ; then
++#        AC_MSG_WARN([guessing cpu type (use --with-cpu=cpuname to override.)])
++#       fi
++#       opt="-march=${ac_cpu-${host_cpu}}"
++#       AC_CHECK_CC_OPT([$opt], [OPTS="$OPTS $opt"],
++#	  [ opt="-mcpu=${ac_cpu-${host_cpu}}"
++#            AC_CHECK_CC_OPT([$opt], [OPTS="$OPTS $opt"]) ] )
++#       if test -z "$ac_cpu" -a "$host_cpu" = "i686" ; then
++#            AC_CHECK_CC_OPT([-mmmx],[OPTS="$OPTS -mmmx"
++#              AC_MSG_WARN([use --with-cpu=cpuname to avoid assuming that MMX works.])])
++#            if test -r /proc/cpuinfo && grep -q sse /proc/cpuinfo ; then
++#              AC_CHECK_CC_OPT([-msse],[OPTS="$OPTS -msse"
++#                AC_MSG_WARN([use --with-cpu=cpuname to avoid assuming that SSE works.])])
++#            fi
++#       fi
+      fi
+-   fi
++#   fi
+ ])
+ 
+ 
diff --git a/dev-lisp/lush/files/digest-lush-1.2.1 b/dev-lisp/lush/files/digest-lush-1.2.1
new file mode 100644
index 000000000000..a0146d7870b9
--- /dev/null
+++ b/dev-lisp/lush/files/digest-lush-1.2.1
@@ -0,0 +1,3 @@
+MD5 04dd0caa0e59909f3f42ca95531737ae lush-1.2.1.tar.gz 4431778
+RMD160 22622b256aab3ad1712b3bbb0c2f892de017002f lush-1.2.1.tar.gz 4431778
+SHA256 1423085ef7c4ed83374333ba7a552e7f5f35add8db0c2478c8b00c96931ad8c9 lush-1.2.1.tar.gz 4431778
diff --git a/dev-lisp/lush/lush-1.2.1.ebuild b/dev-lisp/lush/lush-1.2.1.ebuild
new file mode 100644
index 000000000000..cbd50c8d60b8
--- /dev/null
+++ b/dev-lisp/lush/lush-1.2.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/lush/lush-1.2.1.ebuild,v 1.1 2007/09/18 17:28:55 hkbst Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="Lush is the Lisp User Shell"
+HOMEPAGE="http://lush.sourceforge.net/"
+SRC_URI="mirror://sourceforge/lush/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="X"
+
+DEPEND="X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libSM )"
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack ${A}; cd "${S}"
+#	cp aclocal.m4 aclocal.m4.old
+#	sed "/dnl @synopsis AC_CC_OPTIMIZE/,/^])/d" -i aclocal.m4
+#	sed "/.*AC_CHECK_CC_OPT.*OPTS.*/d" -i aclocal.m4
+#	sed "/AC_CC_OPTIMIZE/d" -i configure.ac
+	epatch ${FILESDIR}/aclocal.m4.patch
+#	diff -u aclocal.m4.old aclocal.m4
+	eautoreconf
+}
+
+src_compile() {
+	econf $(use_with X X)
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake -j1 DESTDIR=${D} install || die "emake install failed"
+}