add freebsd fixes from flameeyes, bug 179728

Package-Manager: portage-2.1.2.8

5 files changed, 85 insertions, 11 deletions

diff --git a/dev-scheme/guile/ChangeLog b/dev-scheme/guile/ChangeLog
index a75b93a9b6a2..0097bda8e202 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.18 2007/05/25 12:17:16 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/ChangeLog,v 1.19 2007/05/25 12:54:36 hkbst Exp $
+
+  25 May 2007; Marijn Schouten <hkBst@gentoo.org>
+  +files/guile-1.8.1-clog-cexp.patch,
+  +files/guile-1.8.1-defaultincludes.patch, guile-1.8.1-r3.ebuild:
+  add freebsd fixes from flameeyes, bug 179728
 
   25 May 2007; Marijn Schouten <hkBst@gentoo.org> guile-1.6.8.ebuild:
   re-enable -j1 for 1.6.8, bug 179738
diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest
index 9e4f10db5787..47243dab6721 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -22,6 +22,14 @@ AUX guile-1.8.1-autotools_fixes.patch 1269 RMD160 a2df65365383482b45c5b3a9e60305
 MD5 b4e9fd1078ca3827f4ba24e334e9262a files/guile-1.8.1-autotools_fixes.patch 1269
 RMD160 a2df65365383482b45c5b3a9e6030534f12298a0 files/guile-1.8.1-autotools_fixes.patch 1269
 SHA256 e32ea6c42f36b125c4757d49bee102f641360d70a7879c1f0995cade752df664 files/guile-1.8.1-autotools_fixes.patch 1269
+AUX guile-1.8.1-clog-cexp.patch 2722 RMD160 66ae30d40324d2b0af5b864759a3f505ebb8483c SHA1 3ae36c90c6d526e446a89fc7475321e8360611bc SHA256 7f9aeb4303f8a95e68d4e8aa076cf80b28598e337ab4e3853b8c0ce03eadf40b
+MD5 433eab78927dd1836832ffeb68d34d53 files/guile-1.8.1-clog-cexp.patch 2722
+RMD160 66ae30d40324d2b0af5b864759a3f505ebb8483c files/guile-1.8.1-clog-cexp.patch 2722
+SHA256 7f9aeb4303f8a95e68d4e8aa076cf80b28598e337ab4e3853b8c0ce03eadf40b files/guile-1.8.1-clog-cexp.patch 2722
+AUX guile-1.8.1-defaultincludes.patch 439 RMD160 62b6e787d3827176adedb0c450b60aa0e25bea93 SHA1 ad4294b2fbc4d589cd38212706309a25f853e8e1 SHA256 3d80265d027403edb6af42a8695da1c1fb04f98358b82a880dbb1f96319209a5
+MD5 8d19b1c40cc913d23b5224054971627d files/guile-1.8.1-defaultincludes.patch 439
+RMD160 62b6e787d3827176adedb0c450b60aa0e25bea93 files/guile-1.8.1-defaultincludes.patch 439
+SHA256 3d80265d027403edb6af42a8695da1c1fb04f98358b82a880dbb1f96319209a5 files/guile-1.8.1-defaultincludes.patch 439
 AUX guile-amd64.patch 439 RMD160 a2b2da37a0631bc33e4ca771a652bd85a5154f0e SHA1 505a6981fdadc1a05611ca19e24a4ae8fe90f0ed SHA256 23b73a81804cc816b427d3fb3804d0da7067a37dffcf9ee7316b4a10aea65a37
 MD5 979d4686f6e39379b33139182873dead files/guile-amd64.patch 439
 RMD160 a2b2da37a0631bc33e4ca771a652bd85a5154f0e files/guile-amd64.patch 439
@@ -41,14 +49,14 @@ EBUILD guile-1.6.8.ebuild 2292 RMD160 7927b0f3a9178b68ca5371769e7b165f82e65c11 S
 MD5 5af64b3b6ef9dca54bae770c1d691b6e guile-1.6.8.ebuild 2292
 RMD160 7927b0f3a9178b68ca5371769e7b165f82e65c11 guile-1.6.8.ebuild 2292
 SHA256 a15634bcf54c309467b74646866cf992bfe179ad859653555835ef990afd9ae4 guile-1.6.8.ebuild 2292
-EBUILD guile-1.8.1-r3.ebuild 1904 RMD160 5dea40561c924653586f450fa07434cacfe123d7 SHA1 d1458e064d383614fea8b656720b68e051cba9f5 SHA256 3c0553c2105d127e75d762bc4903f4d63653d1d2dd30493511c69d8b1923b94a
-MD5 d64010062ec33509bb1e5ced12e3c901 guile-1.8.1-r3.ebuild 1904
-RMD160 5dea40561c924653586f450fa07434cacfe123d7 guile-1.8.1-r3.ebuild 1904
-SHA256 3c0553c2105d127e75d762bc4903f4d63653d1d2dd30493511c69d8b1923b94a guile-1.8.1-r3.ebuild 1904
-MISC ChangeLog 9522 RMD160 caa642b1c59462cc730c0bc9eb6c93d24d7de6d5 SHA1 4d73b72ed2e2dc4eca99765f55060cddae74ffaa SHA256 95057d84789c41906fe3d9b8c586c48cd5da67c03738a7b73b44d648c001df91
-MD5 c0ee6b842dd1e823930c7fc86e6c8c90 ChangeLog 9522
-RMD160 caa642b1c59462cc730c0bc9eb6c93d24d7de6d5 ChangeLog 9522
-SHA256 95057d84789c41906fe3d9b8c586c48cd5da67c03738a7b73b44d648c001df91 ChangeLog 9522
+EBUILD guile-1.8.1-r3.ebuild 2035 RMD160 d6ef2290d28c5ff79c6909c314acea736be2c116 SHA1 896eb7f45ffc53463e4bbcd4f7245de543ba648b SHA256 1c4d70c4998012936cfd470721f26be5b815f0bc13f276327b5bcb43a39b43df
+MD5 6f8289d62f5f174d8e97ebec06100e47 guile-1.8.1-r3.ebuild 2035
+RMD160 d6ef2290d28c5ff79c6909c314acea736be2c116 guile-1.8.1-r3.ebuild 2035
+SHA256 1c4d70c4998012936cfd470721f26be5b815f0bc13f276327b5bcb43a39b43df guile-1.8.1-r3.ebuild 2035
+MISC ChangeLog 9725 RMD160 ec1b2cf3f7e3408bee68e9f4bb94b9761e7d85db SHA1 b49af63b6bc01b5ed90daaee317a4aec58e2ddcd SHA256 db55afcf49e3320cba0c2d2639ba0074dadce8b3bd525f6f00a18a903a8d3d77
+MD5 f5b01ecdc74ed5937908983b749a7118 ChangeLog 9725
+RMD160 ec1b2cf3f7e3408bee68e9f4bb94b9761e7d85db ChangeLog 9725
+SHA256 db55afcf49e3320cba0c2d2639ba0074dadce8b3bd525f6f00a18a903a8d3d77 ChangeLog 9725
 MISC metadata.xml 555 RMD160 fd6eaba195ffdfb9189735c30a58f1da1600ee3c SHA1 b22e226e21b88b7124ab9365a4ba91f19ecc4ee0 SHA256 d167df240a4a0ff64e824febc1ace682c334ca7005eec9399551b35069d0e99e
 MD5 7cefc4ef3671fb0674ef38ba8a168423 metadata.xml 555
 RMD160 fd6eaba195ffdfb9189735c30a58f1da1600ee3c metadata.xml 555
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
new file mode 100644
index 000000000000..24ada81d7471
--- /dev/null
+++ b/dev-scheme/guile/files/guile-1.8.1-clog-cexp.patch
@@ -0,0 +1,43 @@
+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
new file mode 100644
index 000000000000..3adb844f2c32
--- /dev/null
+++ b/dev-scheme/guile/files/guile-1.8.1-defaultincludes.patch
@@ -0,0 +1,12 @@
+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/guile-1.8.1-r3.ebuild b/dev-scheme/guile/guile-1.8.1-r3.ebuild
index 9fc4aa65899c..dacf2d528bdf 100644
--- a/dev-scheme/guile/guile-1.8.1-r3.ebuild
+++ b/dev-scheme/guile/guile-1.8.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-1.8.1-r3.ebuild,v 1.1 2007/03/03 16:13:25 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-1.8.1-r3.ebuild,v 1.2 2007/05/25 12:54:36 hkbst Exp $
 
 inherit eutils autotools
 
@@ -13,7 +13,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 
 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.
+# 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"
 
@@ -30,6 +32,10 @@ src_unpack() {
 
 	# for lilypond 2.11.x
 	epatch ${FILESDIR}/guile-1.8-rational.patch
+
+	# for free-bsd, bug 179728
+	epatch $FILESDIR/guile-1.8.1-defaultincludes.patch
+	epatch $FILESDIR/guile-1.8.1-clog-cexp.patch
 }
 
 src_compile() {