Bumped to fix BUG #39937.

4 files changed, 68 insertions, 12 deletions

diff --git a/dev-util/guile/ChangeLog b/dev-util/guile/ChangeLog
index b99928536b88..edc8723843f4 100644
--- a/dev-util/guile/ChangeLog
+++ b/dev-util/guile/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/guile
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/guile/ChangeLog,v 1.32 2004/06/25 02:35:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/guile/ChangeLog,v 1.33 2004/09/19 15:20:01 kugelfang Exp $
+
+*guile-1.6.4-r2 (19 Sep 2004)
+
+  19 Sep 2004; Danny van Dyk <kugelfang@gentoo.org> +guile-1.6.4-r2.ebuild:
+  Bumped to version 1.6.4-r2. This version is only necessary for gnucash on
+  amd64. It disables deprecations that leave undefined references in shared
+  libraries.
 
   13 May 2004; Michael McCabe <randy@gentoo.org> guile-1.6.4-r1.ebuild:
   Added s390 keywords
diff --git a/dev-util/guile/Manifest b/dev-util/guile/Manifest
index 8da52ca4d477..cc2a51dfc108 100644
--- a/dev-util/guile/Manifest
+++ b/dev-util/guile/Manifest
@@ -1,22 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 c591ed3b4f2f2d826f8de3940e9339c4 ChangeLog 3882
 MD5 75f1ab9c42417b333e70164b082c0cd8 guile-1.4-r3.ebuild 770
 MD5 ed7cdc734d8520dd1cf4c24cffb38724 guile-1.4.1.ebuild 890
 MD5 c785837afe92a888521c91326cfa1821 guile-1.6.4-r1.ebuild 1662
 MD5 80a9d48737b0b0771237fdb2c81f6d46 guile-1.6.4.ebuild 1117
 MD5 327369d7f77a3211382c3d8f3cc2eba5 metadata.xml 313
+MD5 6fcd79b90bab9cc88448e1f2d3afc543 guile-1.6.4-r2.ebuild 1818
 MD5 983ca0d7ff0dc5899a453df89e714538 files/digest-guile-1.4-r3 62
 MD5 c6e6b728591d901172031cc9a0997d31 files/digest-guile-1.4.1 64
 MD5 c8ef00401b82bbfae1fa78785341e8dc files/digest-guile-1.6.4 64
 MD5 c8ef00401b82bbfae1fa78785341e8dc files/digest-guile-1.6.4-r1 64
-MD5 d1fb6c8666d46479606eda12e5c3ebfd files/net_db.c 17525
 MD5 979d4686f6e39379b33139182873dead files/guile-amd64.patch 439
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBJpZZHTu7gpaalycRAqhwAKCd9kbJqQugedWb84WnzIwlQfroVwCfbY4g
-iFKCs2DxUScI+GKF2UoyeCk=
-=fEOZ
------END PGP SIGNATURE-----
+MD5 d1fb6c8666d46479606eda12e5c3ebfd files/net_db.c 17525
+MD5 c8ef00401b82bbfae1fa78785341e8dc files/digest-guile-1.6.4-r2 64
diff --git a/dev-util/guile/files/digest-guile-1.6.4-r2 b/dev-util/guile/files/digest-guile-1.6.4-r2
new file mode 100644
index 000000000000..38ecb5be9df7
--- /dev/null
+++ b/dev-util/guile/files/digest-guile-1.6.4-r2
@@ -0,0 +1 @@
+MD5 a4aceb5f185878c1de4e8aa7c38b6d1d guile-1.6.4.tar.gz 2778075
diff --git a/dev-util/guile/guile-1.6.4-r2.ebuild b/dev-util/guile/guile-1.6.4-r2.ebuild
new file mode 100644
index 000000000000..55ec62563357
--- /dev/null
+++ b/dev-util/guile/guile-1.6.4-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/guile/guile-1.6.4-r2.ebuild,v 1.1 2004/09/19 15:20:01 kugelfang Exp $
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="Scheme interpreter"
+HOMEPAGE="http://www.gnu.org/software/guile/"
+SRC_URI="mirror://gnu/guile/${P}.tar.gz"
+
+LICENSE="GPL-2"
+# This version is only necessary for using gnucash on amd64.
+KEYWORDS="-* ~amd64"
+IUSE=""
+
+DEPEND=">=sys-libs/ncurses-5.1
+	>=sys-libs/readline-4.1"
+
+# NOTE: in README-PACKAGERS, guile recommends different versions be installed
+#       in parallel. They're talking about LIBRARY MAJOR versions and not
+#       the actual guile version that was used in the past.
+#
+#       So I'm slotting this as 12 beacuse of the library major version
+SLOT="12"
+MAJOR="1.6"
+
+src_compile() {
+	# Fix for bug 26484: This package fails to build when built with
+	# -g3, at least on some architectures.  (19 Aug 2003 agriffis)
+	filter-flags -g3
+
+	if [ "${ARCH}" = "amd64" ]; then
+		epatch ${FILESDIR}/guile-amd64.patch
+	fi
+
+	econf \
+		--with-threads \
+		--with-modules \
+		--enable-deprecation=no || die
+	# Please keep --enable-deprecation=no in future bumps.
+	# Danny van Dyk <kugelfang@gentoo.org 2004/09/19
+
+	# Problems with parallel builds (#34029), so I'm taking the safer route
+	emake -j1 || die
+}
+
+src_install() {
+	einstall || die
+	dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README SNAPSHOTS THANKS
+	#texmacs needs this, closing bug #23493
+	dodir /etc/env.d
+	#We don't slot the env.d entry because /usr/bin/guile-config is there anyway,
+	#and will only match the last guile installed. so the GUILE_LOAD_PATH will
+	#match the data available from guile-config.
+	echo "GUILE_LOAD_PATH=\"/usr/share/guile/${MAJOR}\"" > ${D}/etc/env.d/50guile
+}