Moved fortune-mod-9708 to fortune-mod-1.0.9708 and added fortune-mod-1.99.1 as ~x86. This should solve the version change in the upstream packaging. It will require a downgrade for all stable arches, and will even show up as a downgrade on ~arch machines due to the nature of the old versioning. This closes bug #43906.

6 files changed, 79 insertions, 10 deletions

diff --git a/games-misc/fortune-mod/ChangeLog b/games-misc/fortune-mod/ChangeLog
index 3ae92b05471a..3aec93dbca9a 100644
--- a/games-misc/fortune-mod/ChangeLog
+++ b/games-misc/fortune-mod/ChangeLog
@@ -1,7 +1,17 @@
 # ChangeLog for games-misc/fortune-mod
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod/ChangeLog,v 1.2 2003/09/10 20:25:52 vapier Exp $
-
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod/ChangeLog,v 1.3 2004/05/12 21:29:43 wolf31o2 Exp $
+
+*fortune-mod-1.99.1 (12 May 2004)
+
+  12 May 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  +fortune-mod-1.0.9708-r1.ebuild, +fortune-mod-1.99.1.ebuild,
+  -fortune-mod-9708-r1.ebuild:
+  Moved fortune-mod-9708 to fortune-mod-1.0.9708 and added fortune-mod-1.99.1 as
+  ~x86. This should solve the version change in the upstream packaging. It will
+  require a downgrade for all stable arches, and will even show up as a
+  downgrade on ~arch machines due to the nature of the old versioning. This
+  closes bug #43906.
 
 *fortune-mod-9708-r1 (20 Jul 2002)
 
diff --git a/games-misc/fortune-mod/Manifest b/games-misc/fortune-mod/Manifest
index b52efcf93a37..7eff5dbe4eff 100644
--- a/games-misc/fortune-mod/Manifest
+++ b/games-misc/fortune-mod/Manifest
@@ -1,6 +1,8 @@
-MD5 d3adb40b7c5f63929f86ed102af1ca66 ChangeLog 1961
-MD5 80d30c8c706eddc5b88284a711285313 fortune-mod-9708-r1.ebuild 1431
+MD5 d9c282d0a25b44eea5df80ef503e1a5c fortune-mod-1.0.9708-r1.ebuild 1453
+MD5 c62c1bbe8b6e302138cd80b79ed8a3f9 fortune-mod-1.99.1.ebuild 1246
+MD5 32b761b9d23e6256e3887e9a7e0f9340 ChangeLog 2476
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 45891a0eae39a7ec90b6f2433147874f files/digest-fortune-mod-1.0.9708-r1 69
+MD5 5ff47d4205e2b0ea5e0a538115a58237 files/digest-fortune-mod-1.99.1 71
 MD5 69ebce3aec1f10dead82c52fd02c1350 files/9708-Makefile.patch 1305
 MD5 53d07a3874dcef229e5e19296a9d8db1 files/9708-ppc-rot.patch 226
-MD5 45891a0eae39a7ec90b6f2433147874f files/digest-fortune-mod-9708-r1 69
diff --git a/games-misc/fortune-mod/files/digest-fortune-mod-9708-r1 b/games-misc/fortune-mod/files/digest-fortune-mod-1.0.9708-r1
index 679b925ad361..679b925ad361 100644
--- a/games-misc/fortune-mod/files/digest-fortune-mod-9708-r1
+++ b/games-misc/fortune-mod/files/digest-fortune-mod-1.0.9708-r1
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
new file mode 100644
index 000000000000..3cc07d26a029
--- /dev/null
+++ b/games-misc/fortune-mod/files/digest-fortune-mod-1.99.1
@@ -0,0 +1 @@
+MD5 f208805b3b712e32997d7667e0ec52d8 fortune-mod-1.99.1.tar.gz 1812089
diff --git a/games-misc/fortune-mod/fortune-mod-9708-r1.ebuild b/games-misc/fortune-mod/fortune-mod-1.0.9708-r1.ebuild
index 71d2f07473d3..9478046133f3 100644
--- a/games-misc/fortune-mod/fortune-mod-9708-r1.ebuild
+++ b/games-misc/fortune-mod/fortune-mod-1.0.9708-r1.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod/fortune-mod-9708-r1.ebuild,v 1.4 2004/05/04 00:21:18 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod/fortune-mod-1.0.9708-r1.ebuild,v 1.1 2004/05/12 21:29:43 wolf31o2 Exp $
 
 inherit eutils
 
+MY_P="${PN}-9708.tar.gz"
 #The original (http://www.progsoc.uts.edu.au/~dbugger/hacks/hacks.html) is dead
 # but the guy setup his 'perm' home with LSM (http://lsm.execpc.com/)
 DESCRIPTION="The notorious fortune program"
 HOMEPAGE="ftp://sunsite.unc.edu/pub/Linux/games/amusements/fortune/"
-SRC_URI="http://www.ibiblio.org/pub/Linux/games/amusements/fortune/${P}.tar.gz"
+SRC_URI="http://www.ibiblio.org/pub/Linux/games/amusements/fortune/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -26,8 +27,8 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PV}-Makefile.patch
-	epatch ${FILESDIR}/${PV}-ppc-rot.patch
+	epatch ${FILESDIR}/9708-Makefile.patch
+	epatch ${FILESDIR}/9708-ppc-rot.patch
 }
 
 src_compile() {
diff --git a/games-misc/fortune-mod/fortune-mod-1.99.1.ebuild b/games-misc/fortune-mod/fortune-mod-1.99.1.ebuild
new file mode 100644
index 000000000000..836f2b7f56d8
--- /dev/null
+++ b/games-misc/fortune-mod/fortune-mod-1.99.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.1 2004/05/12 21:29:43 wolf31o2 Exp $
+
+inherit eutils
+
+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="~x86"
+IUSE="offensive"
+
+DEPEND="virtual/glibc
+	app-text/recode"
+
+[ `use offensive` ] && off=1 || off=0
+
+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) ${CFLAGS}:" \
+		Makefile
+	sed -i 's:char a, b;:short int a, b;:' util/rot.c
+
+	# fixes the '-m' segfault problem on _my_ computer, it might screw something else up i don't know about.
+	sed -i \
+		'/if (fp->utf8_charset)/{
+			N
+			/free (output);/d
+		}' fortune/fortune.c
+}
+
+src_compile() {
+	emake \
+		OFFENSIVE="${off}" \
+		|| die
+}
+
+src_install() {
+	make \
+		OFFENSIVE="${off}" \
+		prefix="${D}" \
+		install \
+		|| die
+
+	dodoc ChangeLog INDEX INSTALL Notes Offensive README TODO cookie-files
+}