add fixes for libtool-2.2 bug 212723 and gcc-4.3, bug 214787

Package-Manager: portage-2.1.5_rc6

4 files changed, 185 insertions, 2 deletions

diff --git a/dev-scheme/guile/ChangeLog b/dev-scheme/guile/ChangeLog
index af09ec5847ec..1f01ca655411 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.56 2008/04/17 18:33:51 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/ChangeLog,v 1.57 2008/04/25 23:22:02 hkbst Exp $
+
+*guile-1.8.4-r1 (25 Apr 2008)
+
+  25 Apr 2008; Marijn Schouten <hkBst@gentoo.org> +files/gcc-4.3.patch,
+  +guile-1.8.4-r1.ebuild:
+  add fixes for libtool-2.2 bug 212723 and gcc-4.3, bug 214787
 
   17 Apr 2008; nixnut <nixnut@gentoo.org> guile-1.8.4.ebuild:
   Stable on ppc wrt bug 217410
diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest
index 13a3e4265f6c..0ccc3c773c02 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -1,4 +1,5 @@
 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
 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
@@ -18,6 +19,7 @@ EBUILD guile-1.8.2.ebuild 2165 RMD160 56e99fb088268cecc2661f3903aa650a053d9632 S
 EBUILD guile-1.8.3-r1.ebuild 1896 RMD160 4339a5a98770e5f9e1255e97c2d8a9e62b01e6f0 SHA1 7ee88b6446e478bf60a4f1a5687442f230207e23 SHA256 15e6f593aba273f82bf09faa11605415ea51627e9ef0253af2a76bc7854b84d2
 EBUILD guile-1.8.3-r2.ebuild 2240 RMD160 11259b8079ebcbc441edb01d39fd4e95547b41e1 SHA1 fb735afa93faaad03d686affd7ea87307edb6898 SHA256 04c75b3bbed43e66145099fbc51e073170fd4c49c509c81c46b2a4792dffb62e
 EBUILD guile-1.8.3.ebuild 1847 RMD160 3d80a6405328b3a03cf28b17438da9d854c88f09 SHA1 c114ccd7a7f9bd28e4aa7f083288b82ae655f686 SHA256 354e090b0185fd2b42814bc24ff2f712f0e1a36f1466c002f255b7b30c6e63c7
+EBUILD guile-1.8.4-r1.ebuild 2305 RMD160 16c6efcd7080ab50813d2dcef5b610b56db82eb3 SHA1 44dce21d3b8a365857eb730c73b5a4ea55f0f221 SHA256 cded5f45669a60495203bbfd445981f9f8254f05a8db3a9a4aa4e54a9a34dbf8
 EBUILD guile-1.8.4.ebuild 2200 RMD160 9e42bc9f23a7adb06d6f33dc6b010c22579734ad SHA1 1b6eaa1e703ddad669f37772fc4968c3970ee0f9 SHA256 856368be82bd60ae39137e19f98d8f82e620ee806ba9955da4878db20f9ddc1a
-MISC ChangeLog 16549 RMD160 07a1363b27b60c84949b031221ee80be10e9e358 SHA1 79405f9d49b7b9522c682126fd5cc46fb461f077 SHA256 c44f3c336c6b078171cdd99c2be176f266368e9772d0e74f8e25e2aac17c5364
+MISC ChangeLog 16741 RMD160 1973f84e04491d3956abc3244077256074932236 SHA1 f750769c712e332c16939c406747203b1021ed42 SHA256 f36f0b441b6de9336d6844a47c5734dd7d419bad4843bebc280211b08633d9ef
 MISC metadata.xml 555 RMD160 fd6eaba195ffdfb9189735c30a58f1da1600ee3c SHA1 b22e226e21b88b7124ab9365a4ba91f19ecc4ee0 SHA256 d167df240a4a0ff64e824febc1ace682c334ca7005eec9399551b35069d0e99e
diff --git a/dev-scheme/guile/files/gcc-4.3.patch b/dev-scheme/guile/files/gcc-4.3.patch
new file mode 100644
index 000000000000..35ac8b149339
--- /dev/null
+++ b/dev-scheme/guile/files/gcc-4.3.patch
@@ -0,0 +1,87 @@
+diff -urN guile-1.8-1.8.3+1.old/libguile/c-tokenize.c guile-1.8-1.8.3+1/libguile/c-tokenize.c
+--- guile-1.8-1.8.3+1.old/libguile/c-tokenize.c	2007-06-13 22:00:56.000000000 +0000
++++ guile-1.8-1.8.3+1/libguile/c-tokenize.c	2008-02-23 01:40:11.000000000 +0000
+@@ -579,6 +579,8 @@
+ #include <stdlib.h>
+ #include <string.h>
+   
++#define YY_NO_INPUT
++
+ int yylex(void);
+ 
+ int yyget_lineno (void);
+diff -urN guile-1.8-1.8.3+1.old/libguile/c-tokenize.lex guile-1.8-1.8.3+1/libguile/c-tokenize.lex
+--- guile-1.8-1.8.3+1.old/libguile/c-tokenize.lex	2007-05-09 20:22:03.000000000 +0000
++++ guile-1.8-1.8.3+1/libguile/c-tokenize.lex	2008-02-23 01:39:42.000000000 +0000
+@@ -18,7 +18,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-  
++ 
++#define YY_NO_INPUT
++ 
+ int yylex(void);
+ 
+ int yyget_lineno (void);
+diff -urN guile-1.8-1.8.3+1.old/libguile/inline.h guile-1.8-1.8.3+1/libguile/inline.h
+--- guile-1.8-1.8.3+1.old/libguile/inline.h	2007-05-09 20:22:03.000000000 +0000
++++ guile-1.8-1.8.3+1/libguile/inline.h	2008-02-23 01:43:22.000000000 +0000
+@@ -55,6 +55,12 @@
+ extern unsigned scm_newcell2_count;
+ extern unsigned scm_newcell_count;
+ 
++#ifdef __GNUC_STDC_INLINE__
++#define SCM_C_GNU_INLINE SCM_C_INLINE __attribute__((__gnu_inline__))
++#else
++#define SCM_C_GNU_INLINE SCM_C_INLINE
++#endif
++
+ #if defined SCM_C_INLINE && ! defined SCM_INLINE_C_INCLUDING_INLINE_H
+ /* definitely inlining */
+ #ifdef __GNUC__
+@@ -62,7 +68,7 @@
+ #else
+ static
+ #endif
+-SCM_C_INLINE
++SCM_C_GNU_INLINE
+ #endif
+ SCM
+ scm_cell (scm_t_bits car, scm_t_bits cdr)
+@@ -138,7 +144,7 @@
+ #else
+ static
+ #endif
+-SCM_C_INLINE
++SCM_C_GNU_INLINE
+ #endif
+ SCM
+ scm_double_cell (scm_t_bits car, scm_t_bits cbr,
+@@ -213,7 +219,7 @@
+ #else
+ static
+ #endif
+-SCM_C_INLINE
++SCM_C_GNU_INLINE
+ #endif
+ SCM
+ scm_array_handle_ref (scm_t_array_handle *h, ssize_t p)
+@@ -228,7 +234,7 @@
+ #else
+ static
+ #endif
+-SCM_C_INLINE
++SCM_C_GNU_INLINE
+ #endif
+ void
+ scm_array_handle_set (scm_t_array_handle *h, ssize_t p, SCM v)
+@@ -243,7 +249,7 @@
+ #else
+ static
+ #endif
+-SCM_C_INLINE
++SCM_C_GNU_INLINE
+ #endif
+ int
+ scm_is_pair (SCM x)
diff --git a/dev-scheme/guile/guile-1.8.4-r1.ebuild b/dev-scheme/guile/guile-1.8.4-r1.ebuild
new file mode 100644
index 000000000000..1996f808a965
--- /dev/null
+++ b/dev-scheme/guile/guile-1.8.4-r1.ebuild
@@ -0,0 +1,88 @@
+# 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.4-r1.ebuild,v 1.1 2008/04/25 23:22:02 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="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"
+
+# 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
+
+	#bug 214787
+	epatch "${FILESDIR}"/gcc-4.3.patch
+
+	#for libtool-2.2*, bug 212723
+	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
+
+	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
+	keepdir /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
+}