Adding a patch by <tchiwam at gentoo dot org> on order to successfully compile on ppc-macos. Marking ~ppc-macos

Package-Manager: portage-2.0.51.22-r2

4 files changed, 31 insertions, 9 deletions

diff --git a/app-editors/jed/ChangeLog b/app-editors/jed/ChangeLog
index 31c6b346eea6..f794e784694e 100644
--- a/app-editors/jed/ChangeLog
+++ b/app-editors/jed/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/jed
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/ChangeLog,v 1.26 2005/01/01 13:28:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/ChangeLog,v 1.27 2005/08/16 16:06:29 grobian Exp $
+
+  16 Aug 2005; Fabian Groffen <grobian@gentoo.org>
+  +files/jed-0.99.16-darwin.patch, jed-0.99.16-r2.ebuild:
+  Adding a patch by <tchiwam at gentoo dot org> on order to successfully compile
+  on ppc-macos.  Marking ~ppc-macos
 
   25 Nov 2004; Alastair Tse <liquidx@gentoo.org> jed-0.99.16-r2.ebuild:
   fix typo for -r2 with RDEPEND/DEPEND (#72396)
diff --git a/app-editors/jed/Manifest b/app-editors/jed/Manifest
index 4f43c3eafaea..edba5bf7cc15 100644
--- a/app-editors/jed/Manifest
+++ b/app-editors/jed/Manifest
@@ -1,9 +1,10 @@
-MD5 5fc12cc9539600cac3cf7624205ab69d ChangeLog 3138
+MD5 5b492ce98d0b3d3d6c7b3234c67c96fa jed-0.99.16-r2.ebuild 2316
 MD5 1451826d37dc5678b29430bb5ee8d0c6 jed-0.99.16-r1.ebuild 2021
-MD5 ca120bb8e227d25f739f5a760fe751c6 jed-0.99.16-r2.ebuild 2124
+MD5 2003fe6af342892401e972d5096e85b5 ChangeLog 3362
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
+MD5 57236ca58f912a25d88e6c9520df83a2 files/jed.info.diff 333
+MD5 6188b28b6d9082938ad8e148bb3c3d89 files/jed-0.99.16-darwin.patch 479
+MD5 b972e25cececf15ffc9e56d76d9f86a1 files/jed-0.99.16-jed.info.patch 1508
+MD5 9ddff99ca56880f5128ffcc4336460fe files/jed-0.99.16-gentoo-shmode.sl 2434
 MD5 6ecd48789e4a99f0f3725102b42f4297 files/digest-jed-0.99.16-r1 64
 MD5 6ecd48789e4a99f0f3725102b42f4297 files/digest-jed-0.99.16-r2 64
-MD5 9ddff99ca56880f5128ffcc4336460fe files/jed-0.99.16-gentoo-shmode.sl 2434
-MD5 b972e25cececf15ffc9e56d76d9f86a1 files/jed-0.99.16-jed.info.patch 1508
-MD5 57236ca58f912a25d88e6c9520df83a2 files/jed.info.diff 333
diff --git a/app-editors/jed/files/jed-0.99.16-darwin.patch b/app-editors/jed/files/jed-0.99.16-darwin.patch
new file mode 100644
index 000000000000..f77486ae8aa1
--- /dev/null
+++ b/app-editors/jed/files/jed-0.99.16-darwin.patch
@@ -0,0 +1,12 @@
+diff -ur jed-0.99-16/src/pty.c jed-0.99-16-patched/src/pty.c
+--- jed-0.99-16/src/pty.c	2002-10-20 14:55:31.000000000 +0800
++++ jed-0.99-16-patched/src/pty.c	2005-08-16 21:48:28.000000000 +0800
+@@ -18,7 +18,7 @@
+ 
+ #include <errno.h>
+ 
+-#if !defined (__linux__) && !defined(__CYGWIN__) && defined(HAVE_GRANTPT)
++#if !defined (__linux__) && !defined(__MACH__) && !defined(__CYGWIN__) && defined(HAVE_GRANTPT)
+ # define USE_SYSV_PTYS
+ # include <sys/types.h>
+ # include <stropts.h>
diff --git a/app-editors/jed/jed-0.99.16-r2.ebuild b/app-editors/jed/jed-0.99.16-r2.ebuild
index 706889a142ee..74be136803dd 100644
--- a/app-editors/jed/jed-0.99.16-r2.ebuild
+++ b/app-editors/jed/jed-0.99.16-r2.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/app-editors/jed/jed-0.99.16-r2.ebuild,v 1.13 2005/01/01 13:28:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/jed-0.99.16-r2.ebuild,v 1.14 2005/08/16 16:06:29 grobian Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.uni-stuttgart.de/pub/unix/misc/slang/jed/v0.99/${P0}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc amd64 ~ppc64"
+KEYWORDS="amd64 ppc ~ppc-macos ~ppc64 sparc x86"
 IUSE="X gpm truetype"
 
 RDEPEND=">=sys-libs/slang-1.4.5
@@ -27,6 +27,7 @@ PROVIDE="virtual/editor"
 src_unpack() {
 	unpack ${A}
 	cd ${S}; epatch ${FILESDIR}/${P}-jed.info.patch
+	use userland_Darwin && epatch ${FILESDIR}/${P}-darwin.patch
 }
 
 src_compile() {
@@ -65,9 +66,12 @@ src_compile() {
 }
 
 src_install() {
+	# make install in ${S} claims everything is up-to-date,
+	# so we manually cd ${S}/src before installing
+	cd ${S}/src
 	make DESTDIR=${D} install || die
 
-	cd doc
+	cd ${S}/doc
 	cp README AUTHORS
 
 	cd ${S}