Define 'environ' so linking actually succeeds on OSX (bug #111504)

Package-Manager: portage-2.0.51.22-r3

4 files changed, 49 insertions, 27 deletions

diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index 76ee212415da..991fe43726e9 100644
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/graphviz
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.68 2005/11/03 12:41:59 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.69 2005/11/09 21:55:54 grobian Exp $
+
+  09 Nov 2005; Fabian Groffen <grobian@gentoo.org>
+  +files/graphviz-2.6-macos.patch, graphviz-2.6.ebuild:
+  Define 'environ' so linking actually succeeds on OSX (bug #111504)
 
   03 Nov 2005; Luca Barbato <lu_zero@gentoo.org> graphviz-1.16-r1.ebuild:
   Backport 2.6 postinst
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 72c3b16514a4..11bea37201dc 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,29 +1,30 @@
-MD5 38675ee3bd6bdcd687e0f5cb288edc49 ChangeLog 9921
-MD5 ea7e00b7c49179d3961458a98aee9d6c files/digest-graphviz-1.10 66
-MD5 cea8244a5db85a3bc5e74e4ecd3c9a2b files/digest-graphviz-1.12 66
-MD5 54cdc52906c56a19e4e09cd0773d4633 files/digest-graphviz-1.12-r1 139
-MD5 f903a12f0ed9c89432dee821776f4e97 files/digest-graphviz-1.16 141
-MD5 5454fe576c2f133250774cc9b9633e24 files/digest-graphviz-1.16-r1 141
-MD5 9ebf9ffcce27ea71d28da323a9221356 files/digest-graphviz-2.2 65
-MD5 fd083ee967ab029fd47a155ba572ac60 files/digest-graphviz-2.2.1 67
-MD5 fd083ee967ab029fd47a155ba572ac60 files/digest-graphviz-2.2.1-r1 67
-MD5 c7e30bf4d757c98799d61d36723a8c06 files/digest-graphviz-2.4 65
-MD5 52118c7d90398202a81b72b67bf0b0d7 files/digest-graphviz-2.6 65
-MD5 5e8726d7d859188692efcfe9e9155761 files/gdgen.c.patch 756
-MD5 6700ac8c3ea388f54326ca2a57784a1c files/graphviz-1.12-build.patch 1514
-MD5 280fc858f990639d5d8fb7102b2636ac files/graphviz-1.16-build.patch 6200
-MD5 5c7f01258da58810d0175461e0c1d14b files/graphviz-1.16-common_h.patch 292
-MD5 aa19680486b2b29db8b47b6bbfc1cdec files/graphviz-1.16-tempdir.patch 867
-MD5 6f4c558cccabd9d79fe071b4b21fa67b files/graphviz-2.4.conf 236
-MD5 b208c7d4ddd47dc60e3e1b5bb78e8bfd files/graphviz-2.6-no-undefined.patch 1900
+MD5 24092f83efb0c45690148263411da673 graphviz-2.6.ebuild 1493
+MD5 885ceebba109e987a9538733178f3139 graphviz-1.16.ebuild 2226
+MD5 1d8314727c6cbd655072c67f39b30f0a graphviz-2.2.ebuild 1917
+MD5 9d9b6a6a7cb80ad8386a1a7ff72431bf graphviz-1.16-r1.ebuild 2255
 MD5 2339df982693f89bc4ea845062b0597d graphviz-1.10.ebuild 1276
 MD5 56c7e33463f29fd71f4af44c0fa687a5 graphviz-1.12-r1.ebuild 1913
-MD5 3cfddfbe2fa0fe541cb4243d9e109e69 graphviz-1.12.ebuild 1408
-MD5 9d9b6a6a7cb80ad8386a1a7ff72431bf graphviz-1.16-r1.ebuild 2255
-MD5 885ceebba109e987a9538733178f3139 graphviz-1.16.ebuild 2226
+MD5 beeeebe71f23f7a2c9d20cc4a6b86825 graphviz-2.4.ebuild 1180
+MD5 f353a2368fe2b3ec76d9fa657f6ec7ba ChangeLog 10098
 MD5 4eead72d8554c4afd813032f4ce96ddf graphviz-2.2.1-r1.ebuild 1215
 MD5 a5310746d1a39897c72cd3fd0477646c graphviz-2.2.1.ebuild 1159
-MD5 1d8314727c6cbd655072c67f39b30f0a graphviz-2.2.ebuild 1917
-MD5 beeeebe71f23f7a2c9d20cc4a6b86825 graphviz-2.4.ebuild 1180
-MD5 51d8ba2c0a81d15628290e1fa8be2d39 graphviz-2.6.ebuild 1451
 MD5 e98595ce89ff0da26058b1e6e0ce3d31 metadata.xml 1540
+MD5 3cfddfbe2fa0fe541cb4243d9e109e69 graphviz-1.12.ebuild 1408
+MD5 5c7f01258da58810d0175461e0c1d14b files/graphviz-1.16-common_h.patch 292
+MD5 fd083ee967ab029fd47a155ba572ac60 files/digest-graphviz-2.2.1 67
+MD5 b208c7d4ddd47dc60e3e1b5bb78e8bfd files/graphviz-2.6-no-undefined.patch 1900
+MD5 280fc858f990639d5d8fb7102b2636ac files/graphviz-1.16-build.patch 6200
+MD5 6700ac8c3ea388f54326ca2a57784a1c files/graphviz-1.12-build.patch 1514
+MD5 9ebf9ffcce27ea71d28da323a9221356 files/digest-graphviz-2.2 65
+MD5 c7e30bf4d757c98799d61d36723a8c06 files/digest-graphviz-2.4 65
+MD5 52118c7d90398202a81b72b67bf0b0d7 files/digest-graphviz-2.6 65
+MD5 fd083ee967ab029fd47a155ba572ac60 files/digest-graphviz-2.2.1-r1 67
+MD5 6f4c558cccabd9d79fe071b4b21fa67b files/graphviz-2.4.conf 236
+MD5 5e8726d7d859188692efcfe9e9155761 files/gdgen.c.patch 756
+MD5 54cdc52906c56a19e4e09cd0773d4633 files/digest-graphviz-1.12-r1 139
+MD5 5454fe576c2f133250774cc9b9633e24 files/digest-graphviz-1.16-r1 141
+MD5 ea7e00b7c49179d3961458a98aee9d6c files/digest-graphviz-1.10 66
+MD5 cea8244a5db85a3bc5e74e4ecd3c9a2b files/digest-graphviz-1.12 66
+MD5 f903a12f0ed9c89432dee821776f4e97 files/digest-graphviz-1.16 141
+MD5 aa19680486b2b29db8b47b6bbfc1cdec files/graphviz-1.16-tempdir.patch 867
+MD5 3d944d385ea2770498a6f99cd4d2db3f files/graphviz-2.6-macos.patch 519
diff --git a/media-gfx/graphviz/files/graphviz-2.6-macos.patch b/media-gfx/graphviz/files/graphviz-2.6-macos.patch
new file mode 100644
index 000000000000..e42d31f12170
--- /dev/null
+++ b/media-gfx/graphviz/files/graphviz-2.6-macos.patch
@@ -0,0 +1,16 @@
+diff -Naur graphviz-2.6-orig/lib/ast/pathpath.c graphviz-2.6/lib/ast/pathpath.c
+--- graphviz-2.6-orig/lib/ast/pathpath.c	2005-10-30 15:15:30.000000000 +0100
++++ graphviz-2.6/lib/ast/pathpath.c	2005-10-30 15:16:20.000000000 +0100
+@@ -33,7 +33,12 @@
+ #include <unistd.h>
+ 
+ /* #include <option.h> */
++#ifdef __APPLE__
++#include <crt_externs.h>
++#define environ (*_NSGetEnviron())
++#else
+ extern char **environ;
++#endif
+ char **opt_info_argv;
+ 
+ char *pathpath(register char *path, const char *p, const char *a, int mode)
diff --git a/media-gfx/graphviz/graphviz-2.6.ebuild b/media-gfx/graphviz/graphviz-2.6.ebuild
index de8448241b82..bdc88c74a645 100644
--- a/media-gfx/graphviz/graphviz-2.6.ebuild
+++ b/media-gfx/graphviz/graphviz-2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.6.ebuild,v 1.5 2005/10/31 05:07:01 j4rg0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.6.ebuild,v 1.6 2005/11/09 21:55:54 grobian Exp $
 
 inherit eutils
 
@@ -30,7 +30,8 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${P}-no-undefined.patch
+	epatch "${FILESDIR}/${P}"-no-undefined.patch
+	epatch "${FILESDIR}/${P}"-macos.patch
 }
 
 src_compile() {