Fix Emacs support, bug 234898.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686

4 files changed, 136 insertions, 2 deletions

diff --git a/dev-scheme/guile/ChangeLog b/dev-scheme/guile/ChangeLog
index 2b868e672d13..7774d5845aea 100644
--- a/dev-scheme/guile/ChangeLog
+++ b/dev-scheme/guile/ChangeLog
@@ -1,6 +1,12 @@
 # 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.61 2008/07/28 18:14:53 pchrist Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/ChangeLog,v 1.62 2008/08/22 10:58:04 ulm Exp $
+
+*guile-1.8.5-r1 (22 Aug 2008)
+
+  22 Aug 2008; Ulrich Mueller <ulm@gentoo.org> +files/50guile-gentoo.el,
+  +guile-1.8.5-r1.ebuild:
+  Fix Emacs support, bug 234898.
 
   28 Jul 2008; Panagiotis Christopoulos <pchrist@gentoo.org> metadata.xml:
   Update metadata.xml to include USE flag descriptions. Entries taken from
diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest
index a717c6968f11..3ff0c86dd69a 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -1,3 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 50guile-gentoo.el 74 RMD160 e64895b1e48ca842f32301a2ac68ae099e25844e SHA1 ec3a8ab924b595fc5323eec7c33f938e9d26a911 SHA256 ad625c24e5bb48b001eb4a68d441f10037acf467f5f91f68106c538dbee965b5
 AUX fix-reader-cr.diff 359 RMD160 852538454e948cb1d6bd605a4c1651463e148de4 SHA1 f5ee616ece18ef9cd2e2acaae5de0f76527c6596 SHA256 96972332fb3c2a66ce47e0326216cb110f26f450305fc66b511cd3fdf2f5077d
 AUX gcc-4.3.patch 2097 RMD160 9143d75c389f3bc2d57fab7d197064899ec573aa SHA1 339a5e22e528204d85b1d049f01d58d5f9be409f SHA256 3702a63fef213535d2df8dfa093f73d5642640537a4ae3a1f1bc7f9ada5333b4
 AUX guile-1.4-inet_aton.patch 624 RMD160 af4fb5713ed861821b9a0cf0ae8ad47a7591b95e SHA1 917c260608b18fa58dcf5e34f57bdf1415d043be SHA256 4fab8cbc26b94c490c47e6f3eb1ba46543e405a32854f7546f4b18680631a331
@@ -22,6 +26,14 @@ EBUILD guile-1.8.3-r2.ebuild 2240 RMD160 11259b8079ebcbc441edb01d39fd4e95547b41e
 EBUILD guile-1.8.3.ebuild 1847 RMD160 3d80a6405328b3a03cf28b17438da9d854c88f09 SHA1 c114ccd7a7f9bd28e4aa7f083288b82ae655f686 SHA256 354e090b0185fd2b42814bc24ff2f712f0e1a36f1466c002f255b7b30c6e63c7
 EBUILD guile-1.8.4-r1.ebuild 2475 RMD160 2c747153f660634327915154ac6086ac12f89834 SHA1 5708ddf76c41508a69112293afd803ac2c76d493 SHA256 014bbe1f4643ba1b73aec1f655263ac1bd0e997d5abd9a10b07024a427c9c02e
 EBUILD guile-1.8.4.ebuild 2200 RMD160 9e42bc9f23a7adb06d6f33dc6b010c22579734ad SHA1 1b6eaa1e703ddad669f37772fc4968c3970ee0f9 SHA256 856368be82bd60ae39137e19f98d8f82e620ee806ba9955da4878db20f9ddc1a
+EBUILD guile-1.8.5-r1.ebuild 2913 RMD160 94dad48877a8b75b0487b6b2164870d63041e0fe SHA1 65869a54bc47c6d211133e35e8ef46ef1b2f68be SHA256 90360fe6993bb3cebc49b744cfd1eb8e7cf9b8f71a5c2c269d974cf971b7bc6c
 EBUILD guile-1.8.5.ebuild 2412 RMD160 07dad911f1fc16d29f5864db46ed155680fb731e SHA1 57fc1d366b024b8882f4fc04b29046c25ded2444 SHA256 c47faaafeec179c33522b307a00b7113c0dda1d392dfb63ff0e96eb81a74ccc9
-MISC ChangeLog 18980 RMD160 4b539a72aac3ea472ac7cc756b25d40efc2da49b SHA1 11752f64154cee877b7b570d5ded5c58305bf7d2 SHA256 054944e3fca513a4ae39cc4282ccf1fd2b7ec387e7488b87950d6d7694d8d80e
+MISC ChangeLog 19140 RMD160 674edf8cba7f90727df5b25bf221116605637481 SHA1 26e9b244a8f49988fe1eb2db828a2f9bb0df52d9 SHA256 032f681a8ec56ec9a6f6ea41821379e7a97c37112291a1ecf525c508d3a8663d
 MISC metadata.xml 1055 RMD160 e9a2a4c3c6629e0a521791f59c373ce1e8b68220 SHA1 fb4541c5f46e23719cc55024c2ab31344bf73f13 SHA256 87841c9e125b7de272c87c8abcc3e9c53c6934cec6f4fe5e3ad60c09566bbbff
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEARECAAYFAkium9EACgkQOeoy/oIi7ux4VQCgjnm0Uxwh8DskPsc+ZXEye23O
+VegAnjUz05dagOBFH34vY9tKrMEitPL1
+=wgfD
+-----END PGP SIGNATURE-----
diff --git a/dev-scheme/guile/files/50guile-gentoo.el b/dev-scheme/guile/files/50guile-gentoo.el
new file mode 100644
index 000000000000..d7098b12e412
--- /dev/null
+++ b/dev-scheme/guile/files/50guile-gentoo.el
@@ -0,0 +1,4 @@
+
+;;; guile site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
diff --git a/dev-scheme/guile/guile-1.8.5-r1.ebuild b/dev-scheme/guile/guile-1.8.5-r1.ebuild
new file mode 100644
index 000000000000..13578e19f12f
--- /dev/null
+++ b/dev-scheme/guile/guile-1.8.5-r1.ebuild
@@ -0,0 +1,112 @@
+# 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.5-r1.ebuild,v 1.1 2008/08/22 10:58:04 ulm Exp $
+
+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"
+RESTRICT="!regex? ( test )"
+
+DEPEND=">=dev-libs/gmp-4.1
+	>=sys-devel/libtool-1.5.6
+	sys-devel/gettext
+	emacs? ( virtual/emacs )"
+
+# 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 emacs nls debug-freelist debug-malloc debug threads"
+
+src_unpack() {
+	unpack ${A}; cd "${S}"
+
+	sed "s_sleep 999_sleep 1_" -i test-suite/tests/popen.test
+
+#	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_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 \
+		EMACS=no
+
+	emake || die "make failed"
+
+	# above we disable the build system's Emacs support;
+	# do it manually for USE=emacs
+	if use emacs; then
+		elisp-compile emacs/*.el || die "elisp-compile failed"
+	fi
+}
+
+src_install() {
+	einstall || die "install failed"
+
+	dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README 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
+	keepdir /usr/share/guile/site
+
+	if use emacs; then
+		elisp-install ${PN} emacs/*.{el,elc} || die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
+			|| die "elisp-site-file-install failed"
+	fi
+}
+
+pkg_postinst() {
+	[ "${ROOT}" == "/" ] && 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 "${ROOT}"/usr/share/guile/site/slibcat
+}