Modified to work on ppc-macos

Package-Manager: portage-2.0.51-r15

7 files changed, 53 insertions, 25 deletions

diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index 1586595010c2..f75462862d22 100644
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/graphviz
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.37 2004/12/18 20:07:46 lu_zero Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.38 2005/02/19 05:09:04 j4rg0n Exp $
+
+  18 Feb 2005; Lina Pezzella <j4rg0n@gentoo.org>
+  +files/graphviz-1.16-common_h.patch, +files/graphviz-1.16-panic.patch,
+  graphviz-1.16.ebuild:
+  Patched to build on ppc-macos
 
   18 Dec 2004; Luca Barbato <lu_zero@gentoo.org>
   +files/graphviz-1.16-build.patch, graphviz-1.16.ebuild:
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index f5e3d7d5918b..f7698bf6851e 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,13 +1,14 @@
-MD5 4e0a2a27c3cb84d8e84220d34a1c67f7 graphviz-1.12.ebuild 1385
-MD5 67732cb5b21729d0b06c9ace3c2c8b19 graphviz-1.10.ebuild 1288
-MD5 8b0273ef6af8ab79235d87d1c09ee85c graphviz-1.12-r1.ebuild 1888
-MD5 9d5c7ef8de90c45062bdf6046df1a660 ChangeLog 5229
-MD5 471f3434ce3b8613003755dbec97b3c1 graphviz-1.16.ebuild 1671
+MD5 ac19dd73c805147519e6592764f777b2 ChangeLog 5407
+MD5 c984115aba076256f2fcce02f63fb625 graphviz-1.10.ebuild 1285
+MD5 6c4b71d19fbcec7d57ac69a7e612ebc6 graphviz-1.12-r1.ebuild 1887
+MD5 5b20f6746e2bc63d38738782bf17fe5c graphviz-1.12.ebuild 1382
 MD5 e98595ce89ff0da26058b1e6e0ce3d31 metadata.xml 1540
-MD5 436cf9347b2758967b44b6f4db7174f2 files/digest-graphviz-1.16 66
+MD5 f479f1b5bfb42239527c1b8f5378e8d7 graphviz-1.16.ebuild 2105
 MD5 ea7e00b7c49179d3961458a98aee9d6c files/digest-graphviz-1.10 66
-MD5 54cdc52906c56a19e4e09cd0773d4633 files/digest-graphviz-1.12-r1 139
-MD5 280fc858f990639d5d8fb7102b2636ac files/graphviz-1.16-build.patch 6200
 MD5 cea8244a5db85a3bc5e74e4ecd3c9a2b files/digest-graphviz-1.12 66
-MD5 6700ac8c3ea388f54326ca2a57784a1c files/graphviz-1.12-build.patch 1514
+MD5 54cdc52906c56a19e4e09cd0773d4633 files/digest-graphviz-1.12-r1 139
 MD5 5e8726d7d859188692efcfe9e9155761 files/gdgen.c.patch 756
+MD5 6700ac8c3ea388f54326ca2a57784a1c files/graphviz-1.12-build.patch 1514
+MD5 436cf9347b2758967b44b6f4db7174f2 files/digest-graphviz-1.16 66
+MD5 280fc858f990639d5d8fb7102b2636ac files/graphviz-1.16-build.patch 6200
+MD5 5c7f01258da58810d0175461e0c1d14b files/graphviz-1.16-common_h.patch 292
diff --git a/media-gfx/graphviz/files/graphviz-1.16-common_h.patch b/media-gfx/graphviz/files/graphviz-1.16-common_h.patch
new file mode 100644
index 000000000000..e4c6f53dc004
--- /dev/null
+++ b/media-gfx/graphviz/files/graphviz-1.16-common_h.patch
@@ -0,0 +1,11 @@
+--- lefty/common.h.sav	Thu Sep 16 09:15:07 2004
++++ lefty/common.h	Thu Sep 16 09:15:42 2004
+@@ -17,6 +17,8 @@
+ #ifndef _COMMON_H
+ #define _COMMON_H
+ 
++#include <sys/types.h>
++
+ /* some config and conversion definitions from graphviz distribution */
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
diff --git a/media-gfx/graphviz/graphviz-1.10.ebuild b/media-gfx/graphviz/graphviz-1.10.ebuild
index ef0eb6c739ec..5dbb4faabaae 100644
--- a/media-gfx/graphviz/graphviz-1.10.ebuild
+++ b/media-gfx/graphviz/graphviz-1.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-1.10.ebuild,v 1.21 2004/11/07 20:37:10 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-1.10.ebuild,v 1.22 2005/02/19 05:09:04 j4rg0n Exp $
 
 inherit gnuconfig
 
diff --git a/media-gfx/graphviz/graphviz-1.12-r1.ebuild b/media-gfx/graphviz/graphviz-1.12-r1.ebuild
index 941832fabd66..105cd1e5ede7 100644
--- a/media-gfx/graphviz/graphviz-1.12-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-1.12-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-1.12-r1.ebuild,v 1.5 2004/12/14 10:17:47 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-1.12-r1.ebuild,v 1.6 2005/02/19 05:09:04 j4rg0n Exp $
 
 inherit gnuconfig eutils
 
diff --git a/media-gfx/graphviz/graphviz-1.12.ebuild b/media-gfx/graphviz/graphviz-1.12.ebuild
index 9e9f1d1946eb..9f4fe26d3948 100644
--- a/media-gfx/graphviz/graphviz-1.12.ebuild
+++ b/media-gfx/graphviz/graphviz-1.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-1.12.ebuild,v 1.4 2004/11/07 20:37:10 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-1.12.ebuild,v 1.5 2005/02/19 05:09:04 j4rg0n Exp $
 
 inherit gnuconfig
 
diff --git a/media-gfx/graphviz/graphviz-1.16.ebuild b/media-gfx/graphviz/graphviz-1.16.ebuild
index a0e2208ea91c..0799f397a051 100644
--- a/media-gfx/graphviz/graphviz-1.16.ebuild
+++ b/media-gfx/graphviz/graphviz-1.16.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-1.16.ebuild,v 1.3 2004/12/18 20:07:46 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-1.16.ebuild,v 1.4 2005/02/19 05:09:04 j4rg0n Exp $
 
-inherit gnuconfig eutils
+inherit gnuconfig eutils flag-o-matic
 
 DESCRIPTION="open source graph drawing software"
 HOMEPAGE="http://www.research.att.com/sw/tools/graphviz/"
-SRC_URI="http://www.graphviz.org/pub/graphviz/ARCHIVE/${P}.tar.gz"
+SRC_URI="http://www.graphviz.org/pub/graphviz/ARCHIVE/${P}.tar.gz
+		 mirror://gentoo/${P}-panic.patch.tar.bz2"
 
 LICENSE="as-is ATT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~ppc-macos"
 IUSE="tcltk"
 
 #Can use freetype-1.3 or 2.0, but not both
@@ -27,12 +28,21 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}-build.patch
+
+	if use ppc-macos; then
+		# fixes weird make issue
+		epatch ${WORKDIR}/${P}-panic.patch
+		epatch ${FILESDIR}/${P}-common_h.patch
+	fi
+
 	# Run gnuconfig_update on all arches, needed at least for mips
 	gnuconfig_update
 
-	#EPATCH_OPTS="-p1 -d${S}" epatch ${FILESDIR}/${P}-fontconfig-externalgd.diff || die "Failed to patch"
-	einfo "Running aclocal/automake/autoconf"
-	aclocal && libtoolize --copy --force && automake && autoconf || die "Failed to aclocal/libtoolize/automake/autoconf"
+	if ! use ppc-macos; then
+		#EPATCH_OPTS="-p1 -d${S}" epatch ${FILESDIR}/${P}-fontconfig-externalgd.diff || die "Failed to patch"
+		einfo "Running aclocal/automake/autoconf"
+		aclocal && libtoolize --copy --force && automake && autoconf || die "Failed	to aclocal/libtoolize/automake/autoconf"
+	fi
 }
 
 src_compile() {
@@ -43,6 +53,7 @@ src_compile() {
 	use tcltk || myconf="${myconf} --without-tcl --without-tk"
 
 	myconf="${myconf} --enable-dynagraph --with-mylibgd"
+	use ppc-macos && myconf="${myconf} --with-expatincludedir=/usr/X11R6/include --with-expatlibdir=/usr/X11R6/lib --with-fontconfigincludedir=/usr/X11R6/include --with-fontconfiglibdir=/usr/X11R6/lib"
 	econf ${myconf} || die "econf failed"
 
 	emake || die