Fix #78928 again since OS X broke it.

(Portage version: 2.0.51-r15)

5 files changed, 13 insertions, 70 deletions

diff --git a/games-misc/fortune-mod/ChangeLog b/games-misc/fortune-mod/ChangeLog
index af901c01af27..eb232889413f 100644
--- a/games-misc/fortune-mod/ChangeLog
+++ b/games-misc/fortune-mod/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-misc/fortune-mod
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod/ChangeLog,v 1.14 2005/02/01 21:55:21 kito Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod/ChangeLog,v 1.15 2005/02/03 23:18:34 vapier Exp $
+
+  03 Feb 2005; Mike Frysinger <vapier@gentoo.org>
+  -files/fortune-mod-1.99.1-gentoo.diff,
+  +files/fortune-mod-1.99.1-gentoo.patch, fortune-mod-1.99.1-r1.ebuild,
+  -fortune-mod-1.99.1.ebuild:
+  Fix #78928 again since OS X broke it.
 
 *fortune-mod-1.99.1-r1 (01 Feb 2005)
 
diff --git a/games-misc/fortune-mod/files/digest-fortune-mod-1.99.1 b/games-misc/fortune-mod/files/digest-fortune-mod-1.99.1
deleted file mode 100644
index 3cc07d26a029..000000000000
--- a/games-misc/fortune-mod/files/digest-fortune-mod-1.99.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f208805b3b712e32997d7667e0ec52d8 fortune-mod-1.99.1.tar.gz 1812089
diff --git a/games-misc/fortune-mod/files/fortune-mod-1.99.1-gentoo.diff b/games-misc/fortune-mod/files/fortune-mod-1.99.1-gentoo.patch
index 2cdca1aeb3bf..377d72b804b5 100644
--- a/games-misc/fortune-mod/files/fortune-mod-1.99.1-gentoo.diff
+++ b/games-misc/fortune-mod/files/fortune-mod-1.99.1-gentoo.patch
@@ -65,7 +65,6 @@ diff -uNr fortune-mod-1.99.1/fortune/fortune.c fortune-mod-1.99.1-new/fortune/fo
      crequest = malloc(strlen(ctype) + 7 + 1);
      sprintf(crequest, "UTF-8..%s", ctype);
      recode_scan_request (request, crequest);
-Binary files fortune-mod-1.99.1/fortune/fortune.o and fortune-mod-1.99.1-new/fortune/fortune.o differ
 diff -uNr fortune-mod-1.99.1/util/rot.c fortune-mod-1.99.1-new/util/rot.c
 --- fortune-mod-1.99.1/util/rot.c	Fri Mar  5 07:29:57 2004
 +++ fortune-mod-1.99.1-new/util/rot.c	Tue Feb  1 15:29:51 2005
diff --git a/games-misc/fortune-mod/fortune-mod-1.99.1-r1.ebuild b/games-misc/fortune-mod/fortune-mod-1.99.1-r1.ebuild
index 49f9d3ccee78..5c56e9ac236c 100644
--- a/games-misc/fortune-mod/fortune-mod-1.99.1-r1.ebuild
+++ b/games-misc/fortune-mod/fortune-mod-1.99.1-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod/fortune-mod-1.99.1-r1.ebuild,v 1.1 2005/02/01 21:55:21 kito Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod/fortune-mod-1.99.1-r1.ebuild,v 1.2 2005/02/03 23:18:34 vapier Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="The notorious fortune program"
 HOMEPAGE="http://www.redellipse.net/code/fortune"
@@ -10,7 +10,7 @@ SRC_URI="http://www.redellipse.net/code/downloads/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~ppc-macos"
+KEYWORDS="alpha amd64 hppa mips ppc ppc-macos sparc x86"
 IUSE="offensive"
 
 DEPEND="virtual/libc
@@ -20,7 +20,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	epatch ${FILESDIR}/${P}-gentoo.diff
+	epatch ${FILESDIR}/${P}-gentoo.patch
 
 	sed -i \
 		-e 's:/games::' \
@@ -47,8 +47,10 @@ src_unpack() {
 
 src_compile() {
 	emake \
+		CC=$(tc-getCC) \
 		REGEXDEFS='-DHAVE_REGEX_H -DPOSIX_REGEX'
 		E_CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
 		OFFENSIVE="${off}" \
 		|| die "emake failed"
 }
diff --git a/games-misc/fortune-mod/fortune-mod-1.99.1.ebuild b/games-misc/fortune-mod/fortune-mod-1.99.1.ebuild
deleted file mode 100644
index c0488bc7b06f..000000000000
--- a/games-misc/fortune-mod/fortune-mod-1.99.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod/fortune-mod-1.99.1.ebuild,v 1.13 2005/01/29 05:20:52 vapier Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="The notorious fortune program"
-HOMEPAGE="http://www.redellipse.net/code/fortune"
-SRC_URI="http://www.redellipse.net/code/downloads/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa mips ppc sparc x86"
-IUSE="offensive"
-
-DEPEND="virtual/libc
-	app-text/recode"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	sed -i \
-		-e 's:/games::' \
-		-e 's:/fortunes:/fortune:' \
-		-e 's:FORTDIR=$(prefix)/usr:FORTDIR=$(prefix)/usr/bin:' \
-		-e 's:^CFLAGS=.*$:CFLAGS=$(DEFINES) $(E_CFLAGS):' \
-		-e '/^all:/s:$: fortune/fortune.man:' \
-		Makefile \
-		|| die "sed Makefile failed"
-	sed -i \
-		-e 's:char a, b;:short int a, b;:' util/rot.c \
-		|| die "sed util/rot.c failed"
-
-	# fixes the '-m' segfault problem on _my_ computer,
-	# it might screw something else up i don't know about.
-	sed -i \
-		-e '/if (fp->utf8_charset)/{
-			N
-			/free (output);/d
-		}' fortune/fortune.c \
-		|| die "sed fortune/fortune.c failed"
-	use offensive && off=1 || off=0
-}
-
-src_compile() {
-	emake \
-		CC=$(tc-getCC) \
-		E_CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		OFFENSIVE="${off}" \
-		|| die "emake failed"
-}
-
-src_install() {
-	make \
-		OFFENSIVE="${off}" \
-		prefix="${D}" \
-		install \
-		|| die "make install failed"
-
-	dodoc ChangeLog INDEX INSTALL Notes Offensive README TODO cookie-files
-}