fix bug 196639 for guile, and bug 206896 too

Package-Manager: portage-2.1.4

4 files changed, 104 insertions, 6 deletions

diff --git a/dev-scheme/guile/ChangeLog b/dev-scheme/guile/ChangeLog
index b9fef92e96b1..ab3139a904b0 100644
--- a/dev-scheme/guile/ChangeLog
+++ b/dev-scheme/guile/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-scheme/guile
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/ChangeLog,v 1.36 2007/12/17 22:33:23 hkbst Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/ChangeLog,v 1.37 2008/01/23 16:47:11 hkbst Exp $
+
+*guile-1.8.3-r2 (23 Jan 2008)
+
+  23 Jan 2008; Marijn Schouten <hkBst@gentoo.org> +guile-1.8.3-r2.ebuild:
+  fix bug 196639 for guile, and bug 206896 too
 
   17 Dec 2007; Marijn Schouten <hkBst@gentoo.org> guile-1.8.3-r25.ebuild:
   fix /-prefix install
diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest
index 7cb3d9d81039..62911a7277ba 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -67,6 +67,10 @@ EBUILD guile-1.8.3-r1.ebuild 1896 RMD160 4339a5a98770e5f9e1255e97c2d8a9e62b01e6f
 MD5 d3e4b1fa0bd7468cbbbdf9f12d0bada7 guile-1.8.3-r1.ebuild 1896
 RMD160 4339a5a98770e5f9e1255e97c2d8a9e62b01e6f0 guile-1.8.3-r1.ebuild 1896
 SHA256 15e6f593aba273f82bf09faa11605415ea51627e9ef0253af2a76bc7854b84d2 guile-1.8.3-r1.ebuild 1896
+EBUILD guile-1.8.3-r2.ebuild 2218 RMD160 46c5d14be05ca8b451f5002386cf43ab8579721f SHA1 ad274934addb0b9ca24b86348efed3d850f58c0e SHA256 6fdcf9e7c901111e0d839996eddd133c0cd93accd2021ca1f0174761f1e569f9
+MD5 15b598c13017dbef2e2440465608c72b guile-1.8.3-r2.ebuild 2218
+RMD160 46c5d14be05ca8b451f5002386cf43ab8579721f guile-1.8.3-r2.ebuild 2218
+SHA256 6fdcf9e7c901111e0d839996eddd133c0cd93accd2021ca1f0174761f1e569f9 guile-1.8.3-r2.ebuild 2218
 EBUILD guile-1.8.3-r25.ebuild 2139 RMD160 eca7eab05c0449c44f5dd85617a98d6ea4a283d2 SHA1 f369790bd4a1bc3f72fb2bc9e1d9c351274649f1 SHA256 7e5cb4e5d7d3f62423b56937d35f4195bc02bf3d9551c4cac587300e0f972fc1
 MD5 ca7d999476dc03a0514732c3e29bed01 guile-1.8.3-r25.ebuild 2139
 RMD160 eca7eab05c0449c44f5dd85617a98d6ea4a283d2 guile-1.8.3-r25.ebuild 2139
@@ -75,10 +79,10 @@ EBUILD guile-1.8.3.ebuild 1847 RMD160 3d80a6405328b3a03cf28b17438da9d854c88f09 S
 MD5 6e1f384f2aa4c9a34057ff344d0602cb guile-1.8.3.ebuild 1847
 RMD160 3d80a6405328b3a03cf28b17438da9d854c88f09 guile-1.8.3.ebuild 1847
 SHA256 354e090b0185fd2b42814bc24ff2f712f0e1a36f1466c002f255b7b30c6e63c7 guile-1.8.3.ebuild 1847
-MISC ChangeLog 12516 RMD160 b9fe8e62d40f5c60311d0b8a9828e5b704d0f7e0 SHA1 feae034c0c41131be39f5eda69a80a7264f03c23 SHA256 05817b88626c95dc58b1a8279791341783fbd75d94820724af9d534b8ad0e4f4
-MD5 83863cd56840192f674df27c02ddcda1 ChangeLog 12516
-RMD160 b9fe8e62d40f5c60311d0b8a9828e5b704d0f7e0 ChangeLog 12516
-SHA256 05817b88626c95dc58b1a8279791341783fbd75d94820724af9d534b8ad0e4f4 ChangeLog 12516
+MISC ChangeLog 12669 RMD160 ae27ee5b69355eeb4c3786a3fe9f9bd621f848d8 SHA1 b380bb590b329ce66f18cd9e5e2b1df1cd0df5b6 SHA256 fa907bc892e5d6bd59787352f94b3d2b2da742731dd655e3fac1173c69512ede
+MD5 c4c23537e8ddd3160beb97dc4a0427b6 ChangeLog 12669
+RMD160 ae27ee5b69355eeb4c3786a3fe9f9bd621f848d8 ChangeLog 12669
+SHA256 fa907bc892e5d6bd59787352f94b3d2b2da742731dd655e3fac1173c69512ede ChangeLog 12669
 MISC metadata.xml 555 RMD160 fd6eaba195ffdfb9189735c30a58f1da1600ee3c SHA1 b22e226e21b88b7124ab9365a4ba91f19ecc4ee0 SHA256 d167df240a4a0ff64e824febc1ace682c334ca7005eec9399551b35069d0e99e
 MD5 7cefc4ef3671fb0674ef38ba8a168423 metadata.xml 555
 RMD160 fd6eaba195ffdfb9189735c30a58f1da1600ee3c metadata.xml 555
@@ -101,6 +105,9 @@ SHA256 a9322c586c42b5be7ecd73b26c77c22698e9ca10374580e8cff333b4a0d84f99 files/di
 MD5 4fe4cd56b4dc35a8d37f63428be27ade files/digest-guile-1.8.3-r1 238
 RMD160 937357c8a8075738446ba274a478fcaad8cf82d9 files/digest-guile-1.8.3-r1 238
 SHA256 a9322c586c42b5be7ecd73b26c77c22698e9ca10374580e8cff333b4a0d84f99 files/digest-guile-1.8.3-r1 238
+MD5 4fe4cd56b4dc35a8d37f63428be27ade files/digest-guile-1.8.3-r2 238
+RMD160 937357c8a8075738446ba274a478fcaad8cf82d9 files/digest-guile-1.8.3-r2 238
+SHA256 a9322c586c42b5be7ecd73b26c77c22698e9ca10374580e8cff333b4a0d84f99 files/digest-guile-1.8.3-r2 238
 MD5 4fe4cd56b4dc35a8d37f63428be27ade files/digest-guile-1.8.3-r25 238
 RMD160 937357c8a8075738446ba274a478fcaad8cf82d9 files/digest-guile-1.8.3-r25 238
 SHA256 a9322c586c42b5be7ecd73b26c77c22698e9ca10374580e8cff333b4a0d84f99 files/digest-guile-1.8.3-r25 238
diff --git a/dev-scheme/guile/files/digest-guile-1.8.3-r2 b/dev-scheme/guile/files/digest-guile-1.8.3-r2
new file mode 100644
index 000000000000..0af9cf12e8d9
--- /dev/null
+++ b/dev-scheme/guile/files/digest-guile-1.8.3-r2
@@ -0,0 +1,3 @@
+MD5 7fd016924e1bc3e273f4009a080942de guile-1.8.3.tar.gz 3871450
+RMD160 6255e99dbd175700dba6b861aaa64631c5bd6d49 guile-1.8.3.tar.gz 3871450
+SHA256 2ab59099cf2d46f57cf5421c9b84aa85f61961640046e8066c6b321257517796 guile-1.8.3.tar.gz 3871450
diff --git a/dev-scheme/guile/guile-1.8.3-r2.ebuild b/dev-scheme/guile/guile-1.8.3-r2.ebuild
new file mode 100644
index 000000000000..7a545984cdb7
--- /dev/null
+++ b/dev-scheme/guile/guile-1.8.3-r2.ebuild
@@ -0,0 +1,83 @@
+# 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.8.3-r2.ebuild,v 1.1 2008/01/23 16:47:11 hkbst Exp $
+
+inherit eutils autotools flag-o-matic
+
+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 ~x86-fbsd"
+
+DEPEND=">=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext"
+
+# Guile seems to contain some slotting support, /usr/share/guile/ is slotted,
+# but there are lots of collisions. Most in /usr/share/libguile. Therefore
+# I'm slotting this in the same slot as guile-1.6* for now.
+SLOT="12"
+MAJOR="1.8"
+
+IUSE="networking regex discouraged deprecated elisp nls debug-freelist debug-malloc debug threads"
+
+src_unpack() {
+	unpack ${A}; cd "${S}"
+
+	epatch "${FILESDIR}"/fix-reader-cr.diff
+
+	sed "s_sleep 999_sleep 1_" -i test-suite/tests/popen.test
+}
+
+src_compile() {
+	# see bug #178499
+	filter-flags -ftree-vectorize
+
+#will fail for me if posix is disabled or without modules -- hkBst
+	econf \
+		--disable-error-on-warning \
+		--disable-static \
+		--enable-posix \
+		$(use_enable networking) \
+		$(use_enable regex) \
+		$(use deprecated || use_enable discouraged) \
+		$(use_enable deprecated) \
+		$(use_enable elisp) \
+		$(use_enable nls) \
+		--disable-rpath \
+		$(use_enable debug-freelist) \
+		$(use_enable debug-malloc) \
+		$(use_enable debug guile-debug) \
+		$(use_with threads) \
+		--with-modules
+
+	emake || die "make failed"
+}
+
+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
+	echo "GUILE_LOAD_PATH=\"/usr/share/guile/${MAJOR}\"" > "${D}"/etc/env.d/50guile
+
+	# necessary for registering slib, see bug 206896
+	dodir /usr/share/guile/site
+}
+
+pkg_postinst() {
+	[ "${ROOT}" == "/" ] && pkg_config
+}
+
+pkg_config() {
+	if has_version dev-scheme/slib; then
+		einfo "Registering slib with guile"
+		install_slib_for_guile
+	fi
+}
+
+pkg_prerm() {
+	rm -f "${ROOT}"/usr/share/guile/site/slibcat
+}