Version bump, fixes bug 291617. Remove intermediate versions and stale patches.

Package-Manager: portage-2.2_rc55/cvs/Linux i686

17 files changed, 62 insertions, 557 deletions

diff --git a/dev-scheme/guile/ChangeLog b/dev-scheme/guile/ChangeLog
index 541ddb94fe8d..bbd4c861f188 100644
--- a/dev-scheme/guile/ChangeLog
+++ b/dev-scheme/guile/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for dev-scheme/guile
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/ChangeLog,v 1.73 2009/09/19 14:07:54 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/ChangeLog,v 1.74 2009/12/05 14:23:55 ulm Exp $
+
+*guile-1.8.7 (05 Dec 2009)
+
+  05 Dec 2009; Ulrich Mueller <ulm@gentoo.org>
+  -files/guile-1.4-inet_aton.patch, -files/guile-1.6.7-gcc4.patch,
+  -files/guile-1.6.7-posix.patch, -files/guile-1.6.7-scmsigs.patch,
+  -files/guile-1.8.1-autotools_fixes.patch,
+  -files/guile-1.8.1-clog-cexp.patch,
+  -files/guile-1.8.1-defaultincludes.patch, -guile-1.8.2.ebuild,
+  -guile-1.8.3.ebuild, -files/guile-1.8-rational.patch,
+  -files/fix-reader-cr.diff, -files/guile-amd64.patch,
+  -guile-1.8.3-r1.ebuild, -guile-1.8.3-r2.ebuild, +guile-1.8.7.ebuild:
+  Version bump, fixes bug 291617, proxy commit for Tomás Touceda (chiiph).
+  Remove intermediate versions and stale patches.
 
   19 Sep 2009; Markus Meier <maekke@gentoo.org> guile-1.8.5-r1.ebuild:
   arm stable, bug #245701
diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest
index e8a903272f8d..cc4938022b9e 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -1,41 +1,27 @@
 -----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 50guile-gentoo.el 38 RMD160 93ecb185b2729f847b6b34bbb1dd96a207510df2 SHA1 4363c907b30fe150f1d4de4be733f943256a0b82 SHA256 f34ea07a3270a25cce3430e4781df47d9903052c9f3a4ea24efb64b1e63bd115
 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
-AUX guile-1.6.7-gcc4.patch 483 RMD160 6efec429cb5e150c462a1e9686449c0cb3804e25 SHA1 a2fe7f0bc57e4414d1f8c450d042867363eafc77 SHA256 27949055a893c6d302bb54cf3fd51c0bc4f3316e54ede7f3ecc2a5b3234f0d39
-AUX guile-1.6.7-posix.patch 405 RMD160 57163919423e86f86335abd4ea93951e2fce0a71 SHA1 193c75207ea6698f9bdbc7d555c1dd3363391352 SHA256 3be2744874d0f60a1081b704c18fcd072b325c2dea7eae0ffadf5c26e810f582
-AUX guile-1.6.7-scmsigs.patch 319 RMD160 2493f9e7b3f343e1f88c40dc7136980019188bb1 SHA1 8ff4ba4be0549ebd5b01008329d25df398a236e2 SHA256 d35bf326527e42db802e4271ab5e20481fbd2c6a48d5f36a7f9df6ce9382806e
-AUX guile-1.8-rational.patch 4942 RMD160 6c626c63c08a3689213ca43a34a82a16cf512118 SHA1 2123ab36b99f58669d6bc5d16f07e184d496722f SHA256 5e8e652c385957d6c57edb753a3266c8a9ae53eae3d89664588b2ae860612c3f
-AUX guile-1.8.1-autotools_fixes.patch 1269 RMD160 a2df65365383482b45c5b3a9e6030534f12298a0 SHA1 06689ef12334d2eedb479ec8d3a514b68450215d SHA256 e32ea6c42f36b125c4757d49bee102f641360d70a7879c1f0995cade752df664
-AUX guile-1.8.1-clog-cexp.patch 2722 RMD160 66ae30d40324d2b0af5b864759a3f505ebb8483c SHA1 3ae36c90c6d526e446a89fc7475321e8360611bc SHA256 7f9aeb4303f8a95e68d4e8aa076cf80b28598e337ab4e3853b8c0ce03eadf40b
-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
 DIST guile-1.8.5.tar.gz 3933369 RMD160 7f8ab70e1c524f7c20a65977b13c2575eeb61655 SHA1 3ef611cf5c4998a5bdfc7935765bb68730038614 SHA256 e2f63d2d445ffeb072638eab885b1a629e372d1db711c8afb26a62bc56096289
 DIST guile-1.8.6.tar.gz 3960608 RMD160 d6695d266a6091dc5fb1c688e3f0286f1c6d382e SHA1 a3896f86044a2b3740dac43e045c349d656fba31 SHA256 69a2f9491480ff756d1cc4c8ea2bdc13d40ea8ddc8f93f26957bade8219a1d86
+DIST guile-1.8.7.tar.gz 4026804 RMD160 3ccd581cff4ad743fc1328597bd8cb241cbd3fd6 SHA1 24cd2f06439c76d41d982a7384fe8a0fe5313b54 SHA256 bfee6339d91955a637e7f541d96f5b1d53271b42bb4a37b8867d186a6c66f0b3
 EBUILD guile-1.6.8.ebuild 2278 RMD160 0bd994ae6af1c0275ba74f8911f68f686b69eca3 SHA1 eb2e3660d5aff05ea346ebc79e534a615cd3e8ac SHA256 cd483a95233b82dcd9c136a4e81f2b2118d3713d1c71b577ecf29236acfe9a4a
-EBUILD guile-1.8.2.ebuild 2181 RMD160 de22e1f33a6d15ecba321d7a29f1b6982dad7fb9 SHA1 d5f24e4d042a00c5a0018f6f872d288661fea4ef SHA256 6660865a86cc877af7b620b69011a13d7c0fe7ca387d42fdbca34dd444686344
-EBUILD guile-1.8.3-r1.ebuild 1910 RMD160 fa1ffd42d767242b13dd2d5fffa120a7c0cf07ac SHA1 a09817d3b10f93001c786848f64f78a51e2c8188 SHA256 6008c8581c93b242258f39f84f182fe1b0ec4393eb6982e2b769cae771365921
-EBUILD guile-1.8.3-r2.ebuild 2250 RMD160 e8bf9d8f7e037b2153b92aa06fa009124719f742 SHA1 2e81868bc5e62cad252ebbe2c309ff1781cda2de SHA256 eb040ece03137f6de704ffdd90d3e6ea75008c68ab4f1ac7f99ed692f7cf9b74
-EBUILD guile-1.8.3.ebuild 1861 RMD160 868f52416918b71e56ed313280b1997cce2108ad SHA1 554a31989de9d2161e2ece3ed74f85a448dabc4c SHA256 61cfe6428ec1acb3b20cf0561b70525210539c2848985422227b9a9201bf1531
 EBUILD guile-1.8.4-r1.ebuild 2489 RMD160 0f7137d1af1d768db4ea53c858ce894b9e2cb809 SHA1 ab5ad6d3703aaec124947affa483af791b66eb5c SHA256 8b0c7c8521d7a52f6e1f018b5aca0dc7f06cc605e0bc9cf364f8f4dc3e9874c1
 EBUILD guile-1.8.4.ebuild 2208 RMD160 b835240de302dc2ea8247fe1648a93b93984dc88 SHA1 c20942dfe3be6b4906a03871aee598906ddc9018 SHA256 957b4c1ec3d01d5cefedf290c9306ac4ff6e6b8eb93746b7b9ada4f40641156c
 EBUILD guile-1.8.5-r1.ebuild 2964 RMD160 62df6e7cdb13bb77d0df0d85ca24bc817f1f7077 SHA1 ca8812f09fde0f8b487c520a1fe595d3fdc7872b SHA256 2ca5ce8a6a214e836d98b5d5aa7179c4a15bffe7a9fe1a45e0f1263f9c2350f6
 EBUILD guile-1.8.5.ebuild 2426 RMD160 f7cae837c44b9a5f86b243bb29fd9acead3ba89d SHA1 b9a9b0464c1742193edd9ad94307251454b29f3a SHA256 1f22d34aa444f0269686199c06c49e7c01dd9340ef323bcdc61b3fe2bdd138f4
 EBUILD guile-1.8.6.ebuild 2955 RMD160 aaa5f4597fff6e8086199a34e7726427084ad9d8 SHA1 035b8da88b1b51983e1b438d2aad71735b7cbdfb SHA256 c5eb7a65d8283443054f1de73310a73b67ee90491f19b1b26959a438d4a56d77
-MISC ChangeLog 20569 RMD160 5189a7166471ad81321025b85b866e7c5edafd81 SHA1 17fa0328da881e174e6e8f241b974cb85a1b7196 SHA256 cef018bc9c221761a2a74617f228211067321f5faa11bf33facdf27110b5e93a
+EBUILD guile-1.8.7.ebuild 2866 RMD160 4214c6c3778d5f57147b64202316a8600af60819 SHA1 8600cd2cfa99343172e9bcfc407cbb52c013a7d4 SHA256 dee3e61fc25c87471830358798c3917b2be0eaf4cf98cdb7f6270ee30f8476bb
+MISC ChangeLog 21232 RMD160 8c6ecec0ddc92104bffc6a812d4ff9c6f088063b SHA1 5876eb384b559a4ce20e7f461398c57c3cde7fd7 SHA256 bd9b5cbab1b30f1e2ca780ba54f9c7fde8967193beafdb748a9247a347fc2ac9
 MISC metadata.xml 1055 RMD160 e9a2a4c3c6629e0a521791f59c373ce1e8b68220 SHA1 fb4541c5f46e23719cc55024c2ab31344bf73f13 SHA256 87841c9e125b7de272c87c8abcc3e9c53c6934cec6f4fe5e3ad60c09566bbbff
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
+Version: GnuPG v1.4.10 (GNU/Linux)
 
-iEYEARECAAYFAkrbs6UACgkQlPl3HsVfCDpt8wCfWpkrx5eBvdnOuMC6P9dGQ+GB
-rVgAoIBRPPy+mX54KdSQm0IsI8cGPQkX
-=NzRy
+iEYEARECAAYFAksabZoACgkQOeoy/oIi7uwR6gCgi58uT0szo+SkhhlJqQBGPDeW
+rMEAoJmOfDnYBnQ9HBsH7iHe6k1Sebze
+=RH/b
 -----END PGP SIGNATURE-----
diff --git a/dev-scheme/guile/files/50guile-gentoo.el b/dev-scheme/guile/files/50guile-gentoo.el
index d7098b12e412..431f7e90ae73 100644
--- a/dev-scheme/guile/files/50guile-gentoo.el
+++ b/dev-scheme/guile/files/50guile-gentoo.el
@@ -1,4 +1 @@
-
-;;; guile site-lisp configuration
-
 (add-to-list 'load-path "@SITELISP@")
diff --git a/dev-scheme/guile/files/fix-reader-cr.diff b/dev-scheme/guile/files/fix-reader-cr.diff
deleted file mode 100644
index 09e9ecae6725..000000000000
--- a/dev-scheme/guile/files/fix-reader-cr.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- orig/libguile/read.c
-+++ mod/libguile/read.c
-@@ -150,7 +150,7 @@ static SCM *scm_read_hash_procedures;
- /* `isblank' is only in C99.  */
- #define CHAR_IS_BLANK_(_chr)					\
-   (((_chr) == ' ') || ((_chr) == '\t') || ((_chr) == '\n')	\
--   || ((_chr) == '\f'))
-+   || ((_chr) == '\f') || ((_chr) == '\r'))
- 
- #ifdef MSDOS
- # define CHAR_IS_BLANK(_chr)			\
diff --git a/dev-scheme/guile/files/guile-1.4-inet_aton.patch b/dev-scheme/guile/files/guile-1.4-inet_aton.patch
deleted file mode 100644
index 9294e1a895af..000000000000
--- a/dev-scheme/guile/files/guile-1.4-inet_aton.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- guile-1.4-r3/work/guile-1.4/libguile/net_db.c	2000-06-14 01:26:05.000000000 +0100
-+++ guile-1.4.1/work/guile-1.4.1/libguile/net_db.c	2002-05-04 03:16:13.000000000 +0100
-@@ -82,9 +80,12 @@
- int close ();
- #endif /* STDC_HEADERS */
- 
-+#ifndef HAVE_INET_ATON
-+/* for our definition in inet_aton.c, not usually needed.  */
- extern int inet_aton ();
-+#endif
- 
--SCM_DEFINE (scm_inet_aton, "inet-aton", 1, 0, 0, 
-+SCM_DEFINE (scm_inet_aton, "inet-aton", 1, 0, 0,
-             (SCM address),
- 	    "Converts a string containing an Internet host address in the traditional\n"
- 	    "dotted decimal notation into an integer.\n\n"
diff --git a/dev-scheme/guile/files/guile-1.6.7-gcc4.patch b/dev-scheme/guile/files/guile-1.6.7-gcc4.patch
deleted file mode 100644
index 6d2f18d5b156..000000000000
--- a/dev-scheme/guile/files/guile-1.6.7-gcc4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- guile-1.6.7/libguile/guile.c	2002-12-07 22:41:32.000000000 +0000
-+++ guile-1.6.7.az/libguile/guile.c	2005-04-24 15:43:21.000000000 +0000
-@@ -88,7 +88,7 @@
- {
- #ifdef DYNAMIC_LINKING
-   /* libtool automagically inserts this variable into your executable... */
--  extern const scm_lt_dlsymlist lt_preloaded_symbols[];
-+  extern const scm_lt_dlsymlist *lt_preloaded_symbols;
-   scm_lt_dlpreload_default (lt_preloaded_symbols);
- #endif
-   scm_boot_guile (argc, argv, inner_main, 0);
diff --git a/dev-scheme/guile/files/guile-1.6.7-posix.patch b/dev-scheme/guile/files/guile-1.6.7-posix.patch
deleted file mode 100644
index a4cd2bcaef51..000000000000
--- a/dev-scheme/guile/files/guile-1.6.7-posix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- libguile/posix.c.sav	Tue Jan 25 19:01:44 2005
-+++ libguile/posix.c	Tue Jan 25 19:01:55 2005
-@@ -1257,6 +1257,13 @@
-     SCM_MEMORY_ERROR;
-   strncpy (ptr, SCM_STRING_CHARS (str), SCM_STRING_LENGTH (str));
-   ptr[SCM_STRING_LENGTH (str)] = 0;
-+#if defined(macosx)
-+  if (!strchr(ptr, '=')) {
-+    unsetenv(ptr);
-+    rv = 0;
-+  }
-+  else
-+#endif
-   rv = putenv (ptr);
-   if (rv < 0)
-     SCM_SYSERROR;
diff --git a/dev-scheme/guile/files/guile-1.6.7-scmsigs.patch b/dev-scheme/guile/files/guile-1.6.7-scmsigs.patch
deleted file mode 100644
index 65b5b52c3dc7..000000000000
--- a/dev-scheme/guile/files/guile-1.6.7-scmsigs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libguile/scmsigs.c.sav	Tue Feb 11 22:07:54 2003
-+++ libguile/scmsigs.c	Tue Feb 11 22:08:18 2003
-@@ -66,7 +66,7 @@
- /* The thread system has its own sleep and usleep functions.  */
- #ifndef USE_THREADS
- 
--#if defined(MISSING_SLEEP_DECL)
-+#if defined(MISSING_SLEEP_DECL) && ! defined(macosx)
- int sleep ();
- #endif
- 
diff --git a/dev-scheme/guile/files/guile-1.8-rational.patch b/dev-scheme/guile/files/guile-1.8-rational.patch
deleted file mode 100644
index 0f9159358783..000000000000
--- a/dev-scheme/guile/files/guile-1.8-rational.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-2006-12-23  Han-Wen Nienhuys  <hanwen@lilypond.org>
-
-	* numbers.c (scm_i_fraction_reduce): move logic into
-	scm_i_make_ratio(), so fractions are only read.
-	scm_i_fraction_reduce() modifies a fraction when reading it.  A
-	race condition might lead to fractions being corrupted by reading
-	them concurrently.
-
-	Also, the REDUCED bit alters the SCM_CELL_TYPE(), making
-	comparisons between reduced and unreduced fractions go wrong.
-	
-	* numbers.h: remove SCM_FRACTION_SET_NUMERATOR,
-	SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
-	SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
-	SCM_FRACTION_REDUCED.
-
-Index: libguile/numbers.c
-===================================================================
-RCS file: /cvsroot/guile/guile/guile-core/libguile/numbers.c,v
-retrieving revision 1.285
-diff -p -u -u -r1.285 numbers.c
---- libguile/numbers.c	9 Oct 2006 23:17:30 -0000	1.285
-+++ libguile/numbers.c	23 Dec 2006 20:31:20 -0000
-@@ -452,28 +452,21 @@ scm_i_make_ratio (SCM numerator, SCM den
- 
-   /* No, it's a proper fraction.
-    */
--  return scm_double_cell (scm_tc16_fraction,
--			  SCM_UNPACK (numerator),
--			  SCM_UNPACK (denominator), 0);
-+  {
-+    SCM divisor = scm_gcd (numerator, denominator);
-+    if (!(scm_is_eq (divisor, SCM_I_MAKINUM(1))))
-+      {
-+	numerator = scm_divide (numerator, divisor);
-+	denominator = scm_divide (denominator, divisor);
-+      }
-+      
-+    return scm_double_cell (scm_tc16_fraction,
-+			    SCM_UNPACK (numerator),
-+			    SCM_UNPACK (denominator), 0);
-+  }
- }
- #undef FUNC_NAME
- 
--static void scm_i_fraction_reduce (SCM z)
--{
--  if (!(SCM_FRACTION_REDUCED (z)))
--    {
--      SCM divisor;
--      divisor = scm_gcd (SCM_FRACTION_NUMERATOR (z), SCM_FRACTION_DENOMINATOR (z));
--      if (!(scm_is_eq (divisor, SCM_I_MAKINUM(1))))
--	{
--	  /* is this safe? */
--	  SCM_FRACTION_SET_NUMERATOR (z, scm_divide (SCM_FRACTION_NUMERATOR (z), divisor));
--	  SCM_FRACTION_SET_DENOMINATOR (z, scm_divide (SCM_FRACTION_DENOMINATOR (z), divisor));
--	}
--      SCM_FRACTION_REDUCED_SET (z);
--    }
--}
--
- double
- scm_i_fraction2double (SCM z)
- {
-@@ -2387,7 +2380,6 @@ SCM_DEFINE (scm_number_to_string, "numbe
-     }
-   else if (SCM_FRACTIONP (n))
-     {
--      scm_i_fraction_reduce (n);
-       return scm_string_append (scm_list_3 (scm_number_to_string (SCM_FRACTION_NUMERATOR (n), radix),
- 					    scm_from_locale_string ("/"), 
- 					    scm_number_to_string (SCM_FRACTION_DENOMINATOR (n), radix)));
-@@ -2441,7 +2433,6 @@ int
- scm_i_print_fraction (SCM sexp, SCM port, scm_print_state *pstate SCM_UNUSED)
- {
-   SCM str;
--  scm_i_fraction_reduce (sexp);
-   str = scm_number_to_string (sexp, SCM_UNDEFINED);
-   scm_lfwrite (scm_i_string_chars (str), scm_i_string_length (str), port);
-   scm_remember_upto_here_1 (str);
-@@ -3109,8 +3100,6 @@ scm_complex_equalp (SCM x, SCM y)
- SCM
- scm_i_fraction_equalp (SCM x, SCM y)
- {
--  scm_i_fraction_reduce (x);
--  scm_i_fraction_reduce (y);
-   if (scm_is_false (scm_equal_p (SCM_FRACTION_NUMERATOR (x),
- 			       SCM_FRACTION_NUMERATOR (y)))
-       || scm_is_false (scm_equal_p (SCM_FRACTION_DENOMINATOR (x),
-@@ -5424,10 +5413,7 @@ scm_numerator (SCM z)
-   else if (SCM_BIGP (z))
-     return z;
-   else if (SCM_FRACTIONP (z))
--    {
--      scm_i_fraction_reduce (z);
--      return SCM_FRACTION_NUMERATOR (z);
--    }
-+    return SCM_FRACTION_NUMERATOR (z);
-   else if (SCM_REALP (z))
-     return scm_exact_to_inexact (scm_numerator (scm_inexact_to_exact (z)));
-   else
-@@ -5446,10 +5432,7 @@ scm_denominator (SCM z)
-   else if (SCM_BIGP (z)) 
-     return SCM_I_MAKINUM (1);
-   else if (SCM_FRACTIONP (z))
--    {
--      scm_i_fraction_reduce (z);
--      return SCM_FRACTION_DENOMINATOR (z);
--    }
-+    return SCM_FRACTION_DENOMINATOR (z);
-   else if (SCM_REALP (z))
-     return scm_exact_to_inexact (scm_denominator (scm_inexact_to_exact (z)));
-   else
-Index: libguile/numbers.h
-===================================================================
-RCS file: /cvsroot/guile/guile/guile-core/libguile/numbers.h,v
-retrieving revision 1.103
-diff -p -u -u -r1.103 numbers.h
---- libguile/numbers.h	9 Oct 2006 23:17:57 -0000	1.103
-+++ libguile/numbers.h	23 Dec 2006 20:31:21 -0000
-@@ -157,14 +157,6 @@
- #define SCM_FRACTIONP(x) (!SCM_IMP (x) && SCM_TYP16 (x) == scm_tc16_fraction)
- #define SCM_FRACTION_NUMERATOR(x) (SCM_CELL_OBJECT_1 (x))
- #define SCM_FRACTION_DENOMINATOR(x) (SCM_CELL_OBJECT_2 (x))
--#define SCM_FRACTION_SET_NUMERATOR(x, v) (SCM_SET_CELL_OBJECT_1 ((x), (v)))
--#define SCM_FRACTION_SET_DENOMINATOR(x, v) (SCM_SET_CELL_OBJECT_2 ((x), (v)))
--
--  /* I think the left half word is free in the type, so I'll use bit 17 */
--#define SCM_FRACTION_REDUCED_BIT 0x10000
--#define SCM_FRACTION_REDUCED_SET(x) (SCM_SET_CELL_TYPE((x), (SCM_CELL_TYPE (x) | SCM_FRACTION_REDUCED_BIT)))
--#define SCM_FRACTION_REDUCED_CLEAR(x) (SCM_SET_CELL_TYPE((x), (SCM_CELL_TYPE (x) & ~SCM_FRACTION_REDUCED_BIT)))
--#define SCM_FRACTION_REDUCED(x)     (0x10000 & SCM_CELL_TYPE (x))
- 
- 
- 
diff --git a/dev-scheme/guile/files/guile-1.8.1-autotools_fixes.patch b/dev-scheme/guile/files/guile-1.8.1-autotools_fixes.patch
deleted file mode 100644
index 65908c9aa455..000000000000
--- a/dev-scheme/guile/files/guile-1.8.1-autotools_fixes.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- libguile/Makefile.am	2006/11/18 18:14:55	1.209
-+++ libguile/Makefile.am	2007/01/15 23:28:25	1.210
-@@ -285,7 +285,7 @@
- .c.x:
- 	./guile-snarf -o $@ $< $(snarfcppopts)
- .c.doc:
--	-(test -n "${AWK+set}" || AWK="@AWK@"; ${AWK} -f ./guile-func-name-check $<)
-+	-$(AWK) -f ./guile-func-name-check $<
- 	(./guile-snarf-docs $(snarfcppopts) $< | \
- 	./guile_filter_doc_snarfage$(EXEEXT) --filter-snarfage) > $@ || { rm $@; false; }
- 
---- test-suite/standalone/Makefile.am	2006/02/03 23:38:51	1.13
-+++ test-suite/standalone/Makefile.am	2006/12/02 23:09:03	1.13.2.2
-@@ -29,7 +29,7 @@
- 
- TESTS_ENVIRONMENT = "${top_builddir}/pre-inst-guile-env"
- 
--test_cflags := \
-+test_cflags = \
-   -I$(top_srcdir)/test-suite/standalone \
-   -I$(top_srcdir) \
-   -I$(top_srcdir)/libguile-ltdl $(EXTRA_DEFS) $(GUILE_CFLAGS)
-@@ -38,7 +38,8 @@
- 
- snarfcppopts = \
-   $(DEFS) $(DEFAULT_INCLUDES) $(CPPFLAGS) $(CFLAGS) -I$(top_srcdir)
--%.x: %.c
-+SUFFIXES = .x
-+.c.x:
- 	${top_builddir}/libguile/guile-snarf -o $@ $< $(snarfcppopts)
- 
- CLEANFILES = *.x
---- configure.in	2006/11/29 23:30:43	1.268.2.22
-+++ configure.in	2006/12/02 23:53:16	1.268.2.23
-@@ -68,6 +68,8 @@
- AC_MINIX
- 
- AM_PROG_CC_STDC
-+# for per-target cflags in the libguile subdir
-+AM_PROG_CC_C_O
- 
- AC_LIBTOOL_DLOPEN
- AC_PROG_LIBTOOL
diff --git a/dev-scheme/guile/files/guile-1.8.1-clog-cexp.patch b/dev-scheme/guile/files/guile-1.8.1-clog-cexp.patch
deleted file mode 100644
index 24ada81d7471..000000000000
--- a/dev-scheme/guile/files/guile-1.8.1-clog-cexp.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: guile-1.8.1/configure.in
-===================================================================
---- guile-1.8.1.orig/configure.in
-+++ guile-1.8.1/configure.in
-@@ -602,6 +602,7 @@ AC_CHECK_HEADERS([assert.h crt_externs.h
- #       (DINFINITY and DQNAN are actually global variables, not functions)
- #   chsize - an MS-DOS-ism, found in mingw
- #   clog10 - not in mingw (though others like clog and csqrt are)
-+#   clog,cexp - not in FreeBSD (though others are, like cabs)
- #   fesetround - available in C99, but not older systems
- #   ftruncate - posix, but probably not older systems (current mingw
- #               has it as an inline for chsize)
-@@ -614,7 +615,7 @@ AC_CHECK_HEADERS([assert.h crt_externs.h
- #   isblank - available as a GNU extension or in C99
- #   _NSGetEnviron - Darwin specific
- #
--AC_CHECK_FUNCS([DINFINITY DQNAN chsize clog10 ctermid fesetround ftime ftruncate fchown getcwd geteuid gettimeofday gmtime_r ioctl lstat mkdir mknod nice readdir_r readlink rename rmdir select setegid seteuid setlocale setpgid setsid sigaction siginterrupt stat64 strftime strptime symlink sync sysconf tcgetpgrp tcsetpgrp times uname waitpid strdup system usleep atexit on_exit chown link fcntl ttyname getpwent getgrent kill getppid getpgrp fork setitimer getitimer strchr strcmp index bcopy memcpy rindex truncate unsetenv isblank _NSGetEnviron])
-+AC_CHECK_FUNCS([DINFINITY DQNAN chsize clog10 clog cexp ctermid fesetround ftime ftruncate fchown getcwd geteuid gettimeofday gmtime_r ioctl lstat mkdir mknod nice readdir_r readlink rename rmdir select setegid seteuid setlocale setpgid setsid sigaction siginterrupt stat64 strftime strptime symlink sync sysconf tcgetpgrp tcsetpgrp times uname waitpid strdup system usleep atexit on_exit chown link fcntl ttyname getpwent getgrent kill getppid getpgrp fork setitimer getitimer strchr strcmp index bcopy memcpy rindex truncate unsetenv isblank _NSGetEnviron])
- 
- # Reasons for testing:
- #   netdb.h - not in mingw
-Index: guile-1.8.1/libguile/numbers.c
-===================================================================
---- guile-1.8.1.orig/libguile/numbers.c
-+++ guile-1.8.1/libguile/numbers.c
-@@ -6018,7 +6018,7 @@ SCM_DEFINE (scm_log, "log", 1, 0, 0,
- {
-   if (SCM_COMPLEXP (z))
-     {
--#if HAVE_COMPLEX_DOUBLE
-+#if HAVE_COMPLEX_DOUBLE && HAVE_CLOG
-       return scm_from_complex_double (clog (SCM_COMPLEX_VALUE (z)));
- #else
-       double re = SCM_COMPLEX_REAL (z);
-@@ -6084,7 +6084,7 @@ SCM_DEFINE (scm_exp, "exp", 1, 0, 0,
- {
-   if (SCM_COMPLEXP (z))
-     {
--#if HAVE_COMPLEX_DOUBLE
-+#if HAVE_COMPLEX_DOUBLE && HAVE_CEXP
-       return scm_from_complex_double (cexp (SCM_COMPLEX_VALUE (z)));
- #else
-       return scm_c_make_polar (exp (SCM_COMPLEX_REAL (z)),
diff --git a/dev-scheme/guile/files/guile-1.8.1-defaultincludes.patch b/dev-scheme/guile/files/guile-1.8.1-defaultincludes.patch
deleted file mode 100644
index 3adb844f2c32..000000000000
--- a/dev-scheme/guile/files/guile-1.8.1-defaultincludes.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: guile-1.8.1/libguile/Makefile.am
-===================================================================
---- guile-1.8.1.orig/libguile/Makefile.am
-+++ guile-1.8.1/libguile/Makefile.am
-@@ -22,6 +22,7 @@
- AUTOMAKE_OPTIONS = gnu
- 
- ## Prevent automake from adding extra -I options
-+DEFAULT_INCLUDES = 
- DEFS = @DEFS@
- ## Check for headers in $(srcdir)/.., so that #include
- ## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're
diff --git a/dev-scheme/guile/files/guile-amd64.patch b/dev-scheme/guile/files/guile-amd64.patch
deleted file mode 100644
index dc9cea254f05..000000000000
--- a/dev-scheme/guile/files/guile-amd64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- guile-1.6.4/libguile/gc_os_dep.c	2003-04-16 20:16:21.000000000 +0000
-+++ guile-1.6.4-amd64/libguile/gc_os_dep.c	2003-10-20 01:52:11.543267320 +0000
-@@ -205,6 +205,10 @@
- #    define I386
- #    define mach_type_known
- # endif
-+# if defined(LINUX) && defined(__x86_64__)
-+#    define IA64
-+#    define mach_type_known
-+# endif
- # if defined(LINUX) && (defined(__ia64__) || defined(__ia64))
- #    define IA64
- #    define mach_type_known
diff --git a/dev-scheme/guile/guile-1.8.2.ebuild b/dev-scheme/guile/guile-1.8.2.ebuild
deleted file mode 100644
index 466522029ec4..000000000000
--- a/dev-scheme/guile/guile-1.8.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-1.8.2.ebuild,v 1.12 2009/07/31 17:26:07 ssuominen Exp $
-
-EAPI=1
-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}"
-
-	sed "s_sleep 999_sleep 1_" -i test-suite/tests/popen.test
-
-	# for xbindkeys
-#	cp /usr/share/gettext/config.rpath .
-#	epatch ${FILESDIR}/guile-1.8.1-autotools_fixes.patch
-
-	# for free-bsd, bug 179728
-#	epatch $FILESDIR/guile-1.8.1-defaultincludes.patch
-#	epatch $FILESDIR/guile-1.8.1-clog-cexp.patch
-
-#	eautoreconf
-
-	# for lilypond 2.11.x
-#	epatch ${FILESDIR}/guile-1.8-rational.patch
-}
-
-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
-}
diff --git a/dev-scheme/guile/guile-1.8.3-r1.ebuild b/dev-scheme/guile/guile-1.8.3-r1.ebuild
deleted file mode 100644
index 03d96ad11697..000000000000
--- a/dev-scheme/guile/guile-1.8.3-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2009 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-r1.ebuild,v 1.2 2009/07/31 17:26:07 ssuominen Exp $
-
-EAPI=1
-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
-}
diff --git a/dev-scheme/guile/guile-1.8.3.ebuild b/dev-scheme/guile/guile-1.8.3.ebuild
deleted file mode 100644
index b4bada5c65a5..000000000000
--- a/dev-scheme/guile/guile-1.8.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2009 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.ebuild,v 1.2 2009/07/31 17:26:07 ssuominen Exp $
-
-EAPI=1
-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}
-
-	sed "s_sleep 999_sleep 1_" -i "${S}"/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
-}
diff --git a/dev-scheme/guile/guile-1.8.3-r2.ebuild b/dev-scheme/guile/guile-1.8.7.ebuild
index 8f1ac22d8a25..3ab31eb55de6 100644
--- a/dev-scheme/guile/guile-1.8.3-r2.ebuild
+++ b/dev-scheme/guile/guile-1.8.7.ebuild
@@ -1,19 +1,23 @@
 # Copyright 1999-2009 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.12 2009/10/19 00:32:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-1.8.7.ebuild,v 1.1 2009/12/05 14:23:55 ulm Exp $
 
 EAPI=1
-inherit eutils autotools flag-o-matic
+inherit flag-o-matic elisp-common
 
 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"
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+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"
+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
@@ -21,21 +25,26 @@ DEPEND=">=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext"
 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
+
+#	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
+	#will fail for me if posix is disabled or without modules -- hkBst
 	econf \
 		--disable-error-on-warning \
 		--disable-static \
@@ -51,15 +60,23 @@ src_compile() {
 		$(use_enable debug-malloc) \
 		$(use_enable debug guile-debug) \
 		$(use_with threads) \
-		--with-modules
+		--with-modules \
+		EMACS=no
 
 	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 SNAPSHOTS THANKS
+	dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS
 
 	# texmacs needs this, closing bug #23493
 	dodir /etc/env.d
@@ -67,10 +84,20 @@ src_install() {
 
 	# 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() {
 	[ "${ROOT}" == "/" ] && pkg_config
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
 }
 
 pkg_config() {