Imported prefix changes

Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64

4 files changed, 152 insertions, 8 deletions

diff --git a/dev-scheme/gauche/Manifest b/dev-scheme/gauche/Manifest
index 3a97b6eea8c6..6cf8cfe04770 100644
--- a/dev-scheme/gauche/Manifest
+++ b/dev-scheme/gauche/Manifest
@@ -8,17 +8,17 @@ DIST Gauche-0.8.10.tgz 3184850 RMD160 95630b50b8269803ea73a3f0c30c2f4a3473f551 S
 DIST Gauche-0.8.13.tgz 3377336 RMD160 0430e6b99b85b5d1b5cc636d2ebbceac9ad1c80e SHA1 fbbd3496a1088c5b36d446c4479f9db1dac2d1e0 SHA256 bc0a9fff8b4b326eb1b827be36fcdfee851f16f5107de5b770dce720c9884fe7
 DIST Gauche-0.8.14.tgz 3718343 RMD160 55964a874faa23fd8a483f0c0960a31317610403 SHA1 44732f513b0a1a6bfdf9b76aa7d76fd3c0b44518 SHA256 8d847d23f12233ccc95c5f3a38e51f07b50c33c520116765a43eef9128342bee
 DIST Gauche-0.9.tgz 3938498 RMD160 3e0dfc1d498849b0d647e13f49addd0a56cc56fe SHA1 ebc18917c36201d6c3fda29dfdc52fce2d856a5f SHA256 9faa8e79d83152599e945380e874718642d25657803432b5c826a7d3711c9250
-EBUILD gauche-0.8.10.ebuild 1073 RMD160 42c4b68be4660699d8841b0017f002cb80aa40d7 SHA1 b5e2bd4a8f2c9eeea655f12d706b6b5d7bc38515 SHA256 5d9bf7cb4abd2aeccfefb8de85e69b9e706147e6ff7264bd7d208e8f25cc29b4
-EBUILD gauche-0.8.13.ebuild 1000 RMD160 067b1b4f80d2917d0bda31de35fe681d86c53464 SHA1 b7e7f1e0cdd3350354709aa23028622cfe8e7772 SHA256 ebd0bf8e010f1892114ad8b341ca23d7921c1e422663e6242cc9c1be7cd2ce2a
-EBUILD gauche-0.8.14.ebuild 1000 RMD160 6b9caacf309ff8bdd217f3d1acecea1574832aa4 SHA1 19b300a05274e61dc8adfbdda07ba53b6d29a6bd SHA256 1f1ed328a9b983a768e7cc5394f644c38a4417b185cc8eec244126db58d9c630
+EBUILD gauche-0.8.10.ebuild 1079 RMD160 86e4e3a7e9b1ab63e17842763a68f85e986a61e9 SHA1 6622d2b37ac999d77874257cb212e07f04ddcd63 SHA256 38d132e0c2a03c38b8ca35e6ed5f2424101acb0c3f9977e7d51d2e37bc77e05d
+EBUILD gauche-0.8.13.ebuild 1006 RMD160 26d3e2899cd5b2593f9a421ecc9af148b3560ac8 SHA1 322a53f052365d8e853f3deafcb777c969882379 SHA256 fd618c15c9de27efcde531c8f42982ab82ad89551401376403ec78dedc10d3e7
+EBUILD gauche-0.8.14.ebuild 1006 RMD160 ba4fa75f8c00bfe8be1a1e2884bfd153f609b4eb SHA1 0d4901683d05a5fe3141569f47849c3285d87744 SHA256 0f841c32d4274e38cdeac05aa1263517101952e781cec209b4e10636a68a1e30
 EBUILD gauche-0.9-r1.ebuild 1119 RMD160 5af9d7d035df8e9b758ad1804cae588623abca26 SHA1 fd7b971a4b477a4608e8a89e80cf46b0f71139fd SHA256 e17637122ede4228caa418f588d32df1dd83c8b76deb835a6ae89d664850c2af
 EBUILD gauche-0.9-r2.ebuild 1166 RMD160 710315b1ee97f604a60e1c370f573a30b2726a48 SHA1 2d425b460abea234173ceed40fbef13c5993a48c SHA256 18c891e6f0b79657dcadf66f7e3a42438689cb20b55ffe81cd09f52961065e3b
-MISC ChangeLog 10679 RMD160 cc65c9e46f53a2f985b96b3f451c37c4a2b7bcb7 SHA1 bc0941c361eb967a8741722fc20e4e85dbe919ad SHA256 3f6fa88118e052173258809054635094594c62c5ad78ef30345ebd8fe375703b
+MISC ChangeLog 10843 RMD160 c52ac0645d69f0e67c9277192047f1d876c65faf SHA1 44511dc37763660aaa4336faaf1715e69caccaf2 SHA256 2355a89fab2cc4e73bcc2a517da9f153405a83cfc75ca14c57fea9e81ec3e672
 MISC metadata.xml 618 RMD160 f3b6bbdae7bcc31493dc39db9f591f13507d3a5e SHA1 fdbb980eb4099af0ad0ce190d9da3a4ea2e41697 SHA256 6d0e517f7647823b2c87f3d25174a04713e5422a6ecf383abfb8ffae7493f70a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzgBf4ACgkQgAnW8HDreRYNkACgwjcIYGKJZBvZ/flQmD6HGwFX
-VmkAn2bxXWirRUd4uCzOyPWs5/RWPdTf
-=JWKg
+iEYEARECAAYFAkzgBrMACgkQgAnW8HDreRZOaQCdHFF2gLMFnXO9sgZWoTzCd7A5
+ZaIAn1gr+zyORfIaBJaomcPHROXJU+7n
+=Zdh5
 -----END PGP SIGNATURE-----
diff --git a/dev-scheme/guile/ChangeLog b/dev-scheme/guile/ChangeLog
index 963cb0ad08b7..866a0aeb7895 100644
--- a/dev-scheme/guile/ChangeLog
+++ b/dev-scheme/guile/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-scheme/guile
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/ChangeLog,v 1.79 2010/09/24 16:34:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/ChangeLog,v 1.80 2010/11/14 15:53:58 jlec Exp $
+
+*guile-1.8.7-r2 (14 Nov 2010)
+
+  14 Nov 2010; Justin Lecher <jlec@gentoo.org>
+  +files/guile-1.8.6-interix.patch, +guile-1.8.7-r2.ebuild:
+  Imported prefix changes
 
 *guile-1.8.7-r1 (24 Sep 2010)
 
diff --git a/dev-scheme/guile/files/guile-1.8.6-interix.patch b/dev-scheme/guile/files/guile-1.8.6-interix.patch
new file mode 100644
index 000000000000..08777b3a84e9
--- /dev/null
+++ b/dev-scheme/guile/files/guile-1.8.6-interix.patch
@@ -0,0 +1,20 @@
+diff -ru guile-1.8.6.orig/libguile/iselect.h guile-1.8.6/libguile/iselect.h
+--- guile-1.8.6.orig/libguile/iselect.h	2009-09-25 13:44:23 +0200
++++ guile-1.8.6/libguile/iselect.h	2009-09-25 13:45:36 +0200
+@@ -38,7 +38,16 @@
+ #ifdef FD_SET
+ 
+ #define SELECT_TYPE fd_set
++#ifdef __INTERIX
++// interix' FD_SETSIZE should be == OPEN_MAX, but it seems
++// that there is an error in the headers, which makes it
++// four times as big, and thus causes errno 22 on select
++// (invalid argument).
++#include <limits.h>
++#define SELECT_SET_SIZE OPEN_MAX
++#else
+ #define SELECT_SET_SIZE FD_SETSIZE
++#endif
+ 
+ #else /* no FD_SET */
+ 
diff --git a/dev-scheme/guile/guile-1.8.7-r2.ebuild b/dev-scheme/guile/guile-1.8.7-r2.ebuild
new file mode 100644
index 000000000000..c17edc8c3829
--- /dev/null
+++ b/dev-scheme/guile/guile-1.8.7-r2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-1.8.7-r2.ebuild,v 1.1 2010/11/14 15:53:58 jlec Exp $
+
+EAPI=3
+inherit eutils autotools flag-o-matic elisp-common
+
+DESCRIPTION="Scheme interpreter"
+HOMEPAGE="http://www.gnu.org/software/guile/"
+SRC_URI="mirror://gnu/guile/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="networking +regex discouraged +deprecated elisp emacs nls debug-freelist debug-malloc debug +threads"
+RESTRICT="!regex? ( test )"
+
+DEPEND="
+	>=dev-libs/gmp-4.1
+	>=sys-devel/libtool-1.5.6
+	sys-devel/gettext
+	emacs? ( virtual/emacs )"
+RDEPEND="${DEPEND}"
+
+# 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"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.8.6-interix.patch
+
+	sed "s_sleep 999_sleep 1_" -i test-suite/tests/popen.test
+	epatch "${FILESDIR}/${P}-fix_tests.patch"
+	epatch "${FILESDIR}"/${P}-gcc45.patch  # 317175
+
+#	cp configure.in configure.in.old
+
+	#for libtool-2.2*, bug 212723
+#	sed 's/AC_CONFIG_MACRO_DIR(\[m4\])/AC_CONFIG_MACRO_DIR(\[guile-config\])/' -i configure.in
+
+#	diff -u configure.in.old configure.in
+
+	eautoreconf
+}
+
+src_configure() {
+	# 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 \
+		EMACS=no
+}
+
+src_compile()  {
+	emake || die "make failed"
+
+	# Above we have disabled the build system's Emacs support;
+	# for USE=emacs we compile (and install) the files manually
+	if use emacs; then
+		cd emacs
+		elisp-compile *.el || die
+	fi
+}
+
+src_install() {
+	einstall || die "install failed"
+
+	dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS || die
+
+	# texmacs needs this, closing bug #23493
+	dodir /etc/env.d
+	echo "GUILE_LOAD_PATH=\"${EPREFIX}/usr/share/guile/${MAJOR}\"" > "${ED}"/etc/env.d/50guile
+
+	# necessary for registering slib, see bug 206896
+	keepdir /usr/share/guile/site
+
+	if use emacs; then
+		elisp-install ${PN} emacs/*.{el,elc} || die
+		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" || die
+	fi
+}
+
+pkg_postinst() {
+	[ "${EROOT}" == "/" ] && pkg_config
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
+
+pkg_config() {
+	if has_version dev-scheme/slib; then
+		einfo "Registering slib with guile"
+		install_slib_for_guile
+	fi
+}
+
+_pkg_prerm() {
+	rm -f "${EROOT}"/usr/share/guile/site/slibcat
+}