put guile-1.6.8 bafck as some ebuilds still depend on it, thanks to tove

Package-Manager: portage-2.1.4.4
RepoMan-Options: --force

3 files changed, 84 insertions, 2 deletions

diff --git a/dev-scheme/guile/ChangeLog b/dev-scheme/guile/ChangeLog
index df576f366e04..a7982d76ea53 100644
--- a/dev-scheme/guile/ChangeLog
+++ b/dev-scheme/guile/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-scheme/guile
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/ChangeLog,v 1.46 2008/02/20 11:55:40 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/ChangeLog,v 1.47 2008/02/20 12:57:47 hkbst Exp $
+
+  20 Feb 2008; Marijn Schouten <hkBst@gentoo.org> +guile-1.6.8.ebuild:
+  put guile-1.6.8 back as some ebuilds still depend on it, thanks to tove
 
   20 Feb 2008; Marijn Schouten <hkBst@gentoo.org> -guile-1.6.7.ebuild,
   -guile-1.6.8.ebuild, -guile-1.8.1-r3.ebuild:
diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest
index 0f02addd1534..780a0c8a4171 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -9,14 +9,16 @@ AUX guile-1.8.1-clog-cexp.patch 2722 RMD160 66ae30d40324d2b0af5b864759a3f505ebb8
 AUX guile-1.8.1-defaultincludes.patch 439 RMD160 62b6e787d3827176adedb0c450b60aa0e25bea93 SHA1 ad4294b2fbc4d589cd38212706309a25f853e8e1 SHA256 3d80265d027403edb6af42a8695da1c1fb04f98358b82a880dbb1f96319209a5
 AUX guile-amd64.patch 439 RMD160 a2b2da37a0631bc33e4ca771a652bd85a5154f0e SHA1 505a6981fdadc1a05611ca19e24a4ae8fe90f0ed SHA256 23b73a81804cc816b427d3fb3804d0da7067a37dffcf9ee7316b4a10aea65a37
 AUX slibtest.patch 2916 RMD160 770b65dca197515aef7b06f98dbbf18daf019609 SHA1 2c19bff9b9087735267e19425ed3bcde3664b6a2 SHA256 df098410fd7a27b66e2d5f28763d048484635ddf3010b54739d58deb7803b9ff
+DIST guile-1.6.8.tar.gz 3114052 RMD160 9c2c6a6afe2adce458e30e97da782ae18ce75b5c SHA1 5c244f730d7aaee32db4b0cc77b688f74a5caa71 SHA256 3d4ab874f90f5c2003229be29488ba2aa6fe1f0317774283360530d5d9236011
 DIST guile-1.8.2.tar.gz 3762973 RMD160 aa7af82866457caa6521817bf49e895f6b1c350c SHA1 b5c624b152a45f302e185e20a468a02f2eb73e38 SHA256 1f7667c30228737e3cea58ff2b384bcc0eed8cb679392de827821e4d540c760e
 DIST guile-1.8.3.tar.gz 3871450 RMD160 6255e99dbd175700dba6b861aaa64631c5bd6d49 SHA1 26cf7b70d4caff8fe2a5fbcc363f2457bc591c2b SHA256 2ab59099cf2d46f57cf5421c9b84aa85f61961640046e8066c6b321257517796
 DIST guile-1.8.4.tar.gz 3821388 RMD160 58a502e553519b7f4e409ede361ad12141f20fec SHA1 1e80fe242acfde2bfa39fd1e8409a8f010e24e2b SHA256 ca03762565291708b6fbcda4224570e59889795651d3bbb5a380ff6d2c69e1b3
+EBUILD guile-1.6.8.ebuild 2278 RMD160 0bd994ae6af1c0275ba74f8911f68f686b69eca3 SHA1 eb2e3660d5aff05ea346ebc79e534a615cd3e8ac SHA256 cd483a95233b82dcd9c136a4e81f2b2118d3713d1c71b577ecf29236acfe9a4a
 EBUILD guile-1.8.2.ebuild 2161 RMD160 7dc8319518d9788b9edd4dc7f2c5ac1f1c4911c7 SHA1 93b995afa2de5e5ea36912d7114ca94b69a72905 SHA256 7b3a5ac877d56bcb2c03c49945d8f5c2b912e3cca48ae814f9d68b26f9929761
 EBUILD guile-1.8.3-r1.ebuild 1896 RMD160 4339a5a98770e5f9e1255e97c2d8a9e62b01e6f0 SHA1 7ee88b6446e478bf60a4f1a5687442f230207e23 SHA256 15e6f593aba273f82bf09faa11605415ea51627e9ef0253af2a76bc7854b84d2
 EBUILD guile-1.8.3-r2.ebuild 2243 RMD160 f8893e1fd91dc00ae829a5ed650eaf73eabb5839 SHA1 1da6c7c1ee98fa15c9af780166d8eac88ab27ac4 SHA256 98a45bbbd8632ba50240d3ee11a393819fa367c714388bb3208dc4cc6dc296d1
 EBUILD guile-1.8.3-r25.ebuild 2167 RMD160 edd8e99196e3efd5f2654271877457766b73a617 SHA1 944d0d1513b25b1a43c79082aa14dd8aab3e6a3e SHA256 7de765d4b958a0c262445e33911eeab51c1e2ee8ebf843bca271bbde7bcf798a
 EBUILD guile-1.8.3.ebuild 1847 RMD160 3d80a6405328b3a03cf28b17438da9d854c88f09 SHA1 c114ccd7a7f9bd28e4aa7f083288b82ae655f686 SHA256 354e090b0185fd2b42814bc24ff2f712f0e1a36f1466c002f255b7b30c6e63c7
 EBUILD guile-1.8.4.ebuild 2203 RMD160 a9fb8e9b08069def8d2c631cf04112ba8cd5c2ff SHA1 cdf957fa30c8e533f780115271c466fa3c6abe66 SHA256 53ff584681ce7299fa5ad65dc6d70f61648ddd3dcaf9e4028db9d9cd768ef930
-MISC ChangeLog 15173 RMD160 8d1804c462412250e3cc4b0a75705dbabf05fe7b SHA1 ea3fae28f42c2abb0a337f09961ff1f3a9b1b01a SHA256 7496d497de160b6656ed936fa19d1ae9b4c73cefa44b16b9a2477442bfc88dea
+MISC ChangeLog 15319 RMD160 d34398ed49a4fe6b005516ab5239b95ea6aa4190 SHA1 10b07d6903380bcf28a2cd20f65a6f37edb55834 SHA256 84f93a37f2d4cf8883551da0ca01c1a0179bfa5f748efe19f4527cc135de38be
 MISC metadata.xml 555 RMD160 fd6eaba195ffdfb9189735c30a58f1da1600ee3c SHA1 b22e226e21b88b7124ab9365a4ba91f19ecc4ee0 SHA256 d167df240a4a0ff64e824febc1ace682c334ca7005eec9399551b35069d0e99e
diff --git a/dev-scheme/guile/guile-1.6.8.ebuild b/dev-scheme/guile/guile-1.6.8.ebuild
new file mode 100644
index 000000000000..d2736f7de6a3
--- /dev/null
+++ b/dev-scheme/guile/guile-1.6.8.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-1.6.8.ebuild,v 1.15 2008/02/20 12:57:47 hkbst Exp $
+
+inherit flag-o-matic eutils libtool
+
+DESCRIPTION="Scheme interpreter"
+HOMEPAGE="http://www.gnu.org/software/guile/"
+SRC_URI="mirror://gnu/guile/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+# bug 179738
+MAKEOPTS="${MAKEOPTS} -j1"
+
+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_unpack() {
+	unpack ${A}
+	cd "${S}"/test-suite/tests/
+	epatch "${FILESDIR}"/slibtest.patch
+	sed 's_sleep 999_sleep 1_' -i popen.test
+}
+
+src_compile() {
+	use ppc && replace-flags -O3 -O2
+
+	# 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
+
+	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
+
+	emake || die "make failed"
+#	./pre-inst-guile -c "(use-modules (ice-9 slib)) (require 'new-catalog)"
+}
+
+src_install() {
+	einstall || die "install failed"
+	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
+
+#	# install a symlink to slib; probably not worth it to test for slib use flag
+#	dosym /usr/lib/slib/ /usr/share/guile/slib
+}
+
+# keeping this in slib for now
+#pkg_postinst() {
+#	if use slib; then
+#		einfo "Installing slib for guile..."
+#		guile -c "(use-modules (ice-9 slib)) (require 'new-catalog)"
+#	fi
+#}