Fix for undefined symbols on ppc-macos. Conditional on OS in Makefile rather than...

Package-Manager: portage-2.0.53_rc6

diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index f7b40cafba7f3bc082e83ca634922002beadec4b..472da50adb9b75832b0c5cfaed0380d7a94662a9 100644 (file)
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,6 +1,12 @@
 # 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.66 2005/10/28 20:26:44 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.67 2005/10/31 05:07:01 j4rg0n Exp $
+
+  31 Oct 2005; Lina Pezzella <j4rg0n@gentoo.org>
+  +files/graphviz-2.6-no-undefined.patch, graphviz-2.4.ebuild,
+  graphviz-2.6.ebuild:
+  Fix for undefined symbols on ppc-macos. Conditional on OS in Makefile rather
+  than the ebuild. Keyworded testing ppc-macos.
 
   28 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> graphviz-2.6.ebuild:
   Add ~alpha + ~ia64 keywords.
@@ -8,6 +14,9 @@
   28 Oct 2005; Simon Stelling <blubb@gentoo.org> graphviz-1.16-r1.ebuild:
   stable on amd64 wrt bug 108690
 
+  26 Oct 2005; Lina Pezzella <j4rg0n@gentoo.org> graphviz-2.4.ebuild:
+  Testing ppc-macos
+
   25 Oct 2005; Rene Nussbaumer <killerfox@gentoo.org> graphviz-2.6.ebuild:
   Unstable on hppa.
 

diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index c6b70a112d81cba75182b79e24b52f4b6c37e3f3..a11c9f8f0f3de9f7ea8c375e9b27f24d7fbf8807 100644 (file)
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,7 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e427705d0dfe3d494ee27d6cb7f56752 ChangeLog 9467
+MD5 ab16a3b05982c4554c2d0cfe577e0066 ChangeLog 9821
 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
@@ -18,6 +15,7 @@ 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 2339df982693f89bc4ea845062b0597d graphviz-1.10.ebuild 1276
 MD5 56c7e33463f29fd71f4af44c0fa687a5 graphviz-1.12-r1.ebuild 1913
 MD5 3cfddfbe2fa0fe541cb4243d9e109e69 graphviz-1.12.ebuild 1408
@@ -26,13 +24,6 @@ MD5 885ceebba109e987a9538733178f3139 graphviz-1.16.ebuild 2226
 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 a2b51df70d2c00d0934cd2f10f8c05bc graphviz-2.4.ebuild 1170
-MD5 d037d36f9a5d889d68f430dee46237a7 graphviz-2.6.ebuild 1340
+MD5 beeeebe71f23f7a2c9d20cc4a6b86825 graphviz-2.4.ebuild 1180
+MD5 51d8ba2c0a81d15628290e1fa8be2d39 graphviz-2.6.ebuild 1451
 MD5 e98595ce89ff0da26058b1e6e0ce3d31 metadata.xml 1540
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDYomPKf2g/qXtneoRAtdxAKCQK8bTCB6EA3XIEaY9V68/An+Q7wCePlf4
-aCb4vWHxH3Uae+yhChcrYe0=
-=ZTHz
------END PGP SIGNATURE-----

diff --git a/media-gfx/graphviz/files/graphviz-2.6-no-undefined.patch b/media-gfx/graphviz/files/graphviz-2.6-no-undefined.patch
new file mode 100644 (file)
index 0000000..172833c
--- /dev/null
+++ b/media-gfx/graphviz/files/graphviz-2.6-no-undefined.patch
@@ -0,0 +1,49 @@
+--- lib/expr/Makefile.in.orig    2005-10-30 18:39:17.000000000 -0500
++++ lib/expr/Makefile.in 2005-10-30 18:42:16.000000000 -0500
+@@ -362,7 +362,11 @@
+ pkglib_LTLIBRARIES = libexpr.la
+ man_MANS = expr.3
+ pdf_DATA = expr.pdf
++ifeq ($(host_os),darwin)
++libexpr_la_LDFLAGS = -version-info @VERSION_INFO@
++else
+ libexpr_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
++endif
+ libexpr_la_SOURCES = excc.c excontext.c exdata.c exerror.c \
+        exeval.c exexpr.c exlexname.c exopen.c exrewind.c extoken.c \
+        extype.c exzero.c exparse.y
+--- lib/plugin/Makefile.in.orig 2005-08-28 09:11:26.000000000 -0400
++++ lib/plugin/Makefile.in      2005-10-30 20:53:38.000000000 -0500
+@@ -370,7 +370,13 @@
+        libgvplugin_dot_layout.la \
+        libgvplugin_usershape_gd.la
+ 
+-libgvplugin_neato_layout_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
++ifneq ($(host_os),darwin)
++EXTRALDFLAGS="-no_undefined"
++else
++EXTRALDFLAGS=""
++endif
++
++libgvplugin_neato_layout_la_LDFLAGS = -version-info @VERSION_INFO@ $(EXTRALDFLAGS) 
+ libgvplugin_neato_layout_la_SOURCES = \
+        gvplugin_neato_layout.c \
+        gvlayout_neato_layout.c
+@@ -384,7 +390,7 @@
+        $(top_builddir)/lib/pack/libpack.la \
+        $(top_builddir)/lib/gvc/libgvc.la
+ 
+-libgvplugin_dot_layout_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
++libgvplugin_dot_layout_la_LDFLAGS = -version-info @VERSION_INFO@ $(EXTRALDFLAGS)
+ libgvplugin_dot_layout_la_SOURCES = \
+        gvplugin_dot_layout.c \
+        gvlayout_dot_layout.c
+@@ -394,7 +400,7 @@
+        $(top_builddir)/lib/pathplan/libpathplan.la \
+        $(top_builddir)/lib/gvc/libgvc.la 
+ 
+-libgvplugin_usershape_gd_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
++libgvplugin_usershape_gd_la_LDFLAGS = -version-info @VERSION_INFO@ $(EXTRALDFLAGS)
+ libgvplugin_usershape_gd_la_SOURCES = \
+        gvplugin_usershape_gd.c \
+        gvusershape_gd.c 

diff --git a/media-gfx/graphviz/graphviz-2.4.ebuild b/media-gfx/graphviz/graphviz-2.4.ebuild
index 17992d8c36378160a1b0b69d48ebc435173cac97..75115a6a10f63c8b6b39079fe30a54dcbdfbff03 100644 (file)
--- a/media-gfx/graphviz/graphviz-2.4.ebuild
+++ b/media-gfx/graphviz/graphviz-2.4.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.4.ebuild,v 1.2 2005/09/24 05:53:14 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.4.ebuild,v 1.3 2005/10/31 05:07:01 j4rg0n Exp $
 
 DESCRIPTION="Open Source Graph Visualization Software"
 HOMEPAGE="http://www.graphviz.org/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.graphviz.org/pub/graphviz/ARCHIVE/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc-macos ~ppc64 ~s390 ~x86"
 IUSE="cairo dynagraph tcltk X"
 
 RDEPEND=">=sys-libs/zlib-1.1.3

diff --git a/media-gfx/graphviz/graphviz-2.6.ebuild b/media-gfx/graphviz/graphviz-2.6.ebuild
index 8c77113d9454cbf9d55ae1ad3f0f0f247a159565..de8448241b82e9754b659b8e161e880f916c1e21 100644 (file)
--- a/media-gfx/graphviz/graphviz-2.6.ebuild
+++ b/media-gfx/graphviz/graphviz-2.6.ebuild
@@ -1,6 +1,8 @@
 # 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.4 2005/10/28 20:26:44 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.6.ebuild,v 1.5 2005/10/31 05:07:01 j4rg0n Exp $
+
+inherit eutils
 
 DESCRIPTION="Open Source Graph Visualization Software"
 HOMEPAGE="http://www.graphviz.org/"
@@ -8,7 +10,7 @@ SRC_URI="http://www.graphviz.org/pub/graphviz/ARCHIVE/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~ppc-macos ~s390 ~sparc ~x86"
 IUSE="cairo dynagraph tcltk X static"
 
 RDEPEND=">=sys-libs/zlib-1.1.3
@@ -25,6 +27,12 @@ RDEPEND=">=sys-libs/zlib-1.1.3
 DEPEND="${RDEPEND}
        dev-util/pkgconfig"
 
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+       epatch ${FILESDIR}/${P}-no-undefined.patch
+}
+
 src_compile() {
        econf --with-mylibgd \
                --disable-dependency-tracking \