Version bumpage.

7 files changed, 70 insertions, 118 deletions

diff --git a/dev-games/crystalspace/ChangeLog b/dev-games/crystalspace/ChangeLog
index d832ac8a1402..209750e0f5d9 100644
--- a/dev-games/crystalspace/ChangeLog
+++ b/dev-games/crystalspace/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-games/crystalspace
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/ChangeLog,v 1.8 2004/06/24 22:10:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/ChangeLog,v 1.9 2004/12/25 08:00:54 vapier Exp $
+
+*crystalspace-0.98.4 (25 Dec 2004)
+
+  25 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+  +crystalspace-0.98.4.ebuild, -crystalspace-20030413-r1.ebuild,
+  -crystalspace-20040604.ebuild:
+  Version bumpage.
 
   16 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org>
   crystalspace-20040604.ebuild:
diff --git a/dev-games/crystalspace/crystalspace-0.98.4.ebuild b/dev-games/crystalspace/crystalspace-0.98.4.ebuild
new file mode 100644
index 000000000000..034b4458bc32
--- /dev/null
+++ b/dev-games/crystalspace/crystalspace-0.98.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/crystalspace-0.98.4.ebuild,v 1.1 2004/12/25 08:00:54 vapier Exp $
+
+MY_P="cs${PV:2:2}_00${PV:5:1}"
+DESCRIPTION="portable 3D Game Development Kit written in C++"
+HOMEPAGE="http://crystal.sourceforge.net/"
+SRC_URI="mirror://sourceforge/crystalspace/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="ppc x86"
+IUSE="oggvorbis mikmod openal truetype 3ds mng"
+
+RDEPEND="sys-libs/zlib
+	>=media-libs/libpng-1.2.1
+	>=media-libs/jpeg-6b
+	mng? ( media-libs/libmng )
+	mikmod? ( media-libs/libmikmod )
+	3ds? ( media-libs/lib3ds )
+	truetype? ( >=media-libs/freetype-2.0 )
+	openal? ( media-libs/openal )
+	oggvorbis? (
+		>=media-libs/libogg-1.0
+		>=media-libs/libvorbis-1.0 )
+	dev-games/ode
+	>=dev-lang/perl-5.6.1
+	!dev-games/crystalspace-cvs"
+DEPEND="${RDEPEND}
+	>=sys-apps/portage-2.0.51
+	dev-util/jam
+	x86? ( dev-lang/nasm )"
+
+S="${WORKDIR}/CS"
+
+CRYSTAL_PREFIX="/opt/crystal"
+
+src_compile() {
+	./configure --prefix=${CRYSTAL_PREFIX} || die "configure failed"
+	jam all || die "compile failed"
+}
+
+src_install() {
+	jam -sprefix="${D}"${CRYSTAL_PREFIX} install
+
+	# symlink for cs-config
+	dodir /usr/bin
+	dosym ${CRYSTAL_PREFIX}/bin/cs-config /usr/bin/cs-config
+
+	# make sure these files dont have $D
+	dosed ${CRYSTAL_PREFIX}/{bin/cs-config,etc/crystalspace/vfs.cfg}
+
+	# fix perms so everyone can read these things
+	find "${D}"/${CRYSTAL_PREFIX} -type f -exec chmod a+r '{}' \;
+	find "${D}"/${CRYSTAL_PREFIX} -type d -exec chmod a+rx '{}' \;
+	chmod a+rx "${D}"/${CRYSTAL_PREFIX}/bin/*
+
+	dodir /etc/env.d
+	echo "CRYSTAL=\"${CRYSTAL_PREFIX}\"" > 90crystalspace
+	doconfd 90crystalspace
+}
diff --git a/dev-games/crystalspace/crystalspace-20030413-r1.ebuild b/dev-games/crystalspace/crystalspace-20030413-r1.ebuild
deleted file mode 100644
index 167626b233eb..000000000000
--- a/dev-games/crystalspace/crystalspace-20030413-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/crystalspace-20030413-r1.ebuild,v 1.16 2004/06/29 15:03:34 vapier Exp $
-
-DESCRIPTION="portable 3D Game Development Kit written in C++"
-HOMEPAGE="http://crystal.sourceforge.net/"
-SRC_URI="mirror://gentoo/distfiles/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE="oggvorbis mikmod openal truetype 3ds mng zlib"
-
-RDEPEND=">=media-libs/libpng-1.2.1
-	>=media-libs/jpeg-6b
-	mng? ( media-libs/libmng )
-	mikmod? ( media-libs/libmikmod )
-	3ds? ( media-libs/lib3ds )
-	truetype? ( >=media-libs/freetype-2.0 )
-	openal? ( media-libs/openal )
-	zlib? ( sys-libs/zlib )
-	oggvorbis? (
-		>=media-libs/libogg-1.0
-		>=media-libs/libvorbis-1.0 )
-	=dev-games/ode-0.039
-	>=dev-lang/perl-5.6.1
-	!dev-games/crystalspace-cvs"
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )"
-
-S="${WORKDIR}/CS"
-
-CRYSTAL_PREFIX=/opt/crystal
-
-src_compile() {
-	./configure --prefix=${CRYSTAL_PREFIX} || die
-	make all || die
-}
-
-src_install() {
-	dodir ${CRYSTAL_PREFIX}
-	make INSTALL_DIR=${D}/${CRYSTAL_PREFIX} install || die
-	dodir /usr/bin
-	dosym ${CRYSTAL_PREFIX}/bin/cs-config /usr/bin/cs-config
-	find ${D}/${CRYSTAL_PREFIX} -type f -exec chmod a+r '{}' \;
-	find ${D}/${CRYSTAL_PREFIX} -type d -exec chmod a+rx '{}' \;
-	chmod a+rx ${D}/${CRYSTAL_PREFIX}/{bin,lib}/*
-	dodir /etc/env.d
-	echo "CRYSTAL=\"${CRYSTAL_PREFIX}\"" > ${D}/etc/env.d/90crystalspace
-}
diff --git a/dev-games/crystalspace/crystalspace-20040604.ebuild b/dev-games/crystalspace/crystalspace-20040604.ebuild
deleted file mode 100644
index 3961cc84e761..000000000000
--- a/dev-games/crystalspace/crystalspace-20040604.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/crystalspace-20040604.ebuild,v 1.4 2004/06/29 15:03:34 vapier Exp $
-
-DESCRIPTION="portable 3D Game Development Kit written in C++"
-HOMEPAGE="http://crystal.sourceforge.net/"
-SRC_URI="mirror://gentoo/distfiles/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="oggvorbis mikmod openal truetype 3ds mng zlib"
-
-RDEPEND=">=media-libs/libpng-1.2.1
-	>=media-libs/jpeg-6b
-	mng? ( media-libs/libmng )
-	mikmod? ( media-libs/libmikmod )
-	3ds? ( media-libs/lib3ds )
-	truetype? ( >=media-libs/freetype-2.0 )
-	openal? ( media-libs/openal )
-	zlib? ( sys-libs/zlib )
-	oggvorbis? (
-		>=media-libs/libogg-1.0
-		>=media-libs/libvorbis-1.0 )
-	dev-games/ode
-	>=dev-lang/perl-5.6.1
-	!dev-games/crystalspace-cvs"
-DEPEND="${RDEPEND}
-	dev-util/jam
-	x86? ( dev-lang/nasm )"
-
-S="${WORKDIR}/CS"
-
-CRYSTAL_PREFIX="/opt/crystal"
-
-src_compile() {
-	./configure --prefix=${CRYSTAL_PREFIX} || die
-	jam all || die "Cannot compile"
-#	emake all || die
-}
-
-src_install() {
-	#mv ${S}/Jamconfig ${S}/Jamconfig_orig
-	#sed s%/opt/crystal%${D}/opt/crystal% ${S}/Jamconfig_orig > ${S}/Jamconfig
-
-	jam -sprefix=${D}${CRYSTAL_PREFIX} install
-
-	# symlink for cs-config
-	dodir /usr/bin
-	dosym ${CRYSTAL_PREFIX}/bin/cs-config /usr/bin/cs-config
-
-	# fix path in cs-config and vfs.cfg
-	mv ${D}/opt/crystal/bin/cs-config ${D}/opt/crystal/bin/cs-config_orig
-#	mv ${D}/opt/crystal/etc/crystal/vfs.cfg ${D}/opt/crystal/etc/crystal/vfs.cfg_orig
-	sed s%${D}%% ${D}/opt/crystal/bin/cs-config_orig > ${D}/opt/crystal/bin/cs-config
-#	sed s%${D}%% ${D}/opt/crystal/etc/crystal/vfs.cfg_orig > ${D}/opt/crystal/etc/crystal/vfs.cfg
-	# the -sprefix=... fixes cs-config but not vfs.cfg
-
-	find ${D}/${CRYSTAL_PREFIX} -type f -exec chmod a+r '{}' \;
-	find ${D}/${CRYSTAL_PREFIX} -type d -exec chmod a+rx '{}' \;
-	chmod a+rx ${D}/${CRYSTAL_PREFIX}/{bin,lib}/*
-
-	dodir /etc/env.d
-	echo "CRYSTAL=\"${CRYSTAL_PREFIX}\"" > ${D}/etc/env.d/90crystalspace
-}
diff --git a/dev-games/crystalspace/files/digest-crystalspace-0.98.4 b/dev-games/crystalspace/files/digest-crystalspace-0.98.4
new file mode 100644
index 000000000000..b66414156350
--- /dev/null
+++ b/dev-games/crystalspace/files/digest-crystalspace-0.98.4
@@ -0,0 +1 @@
+MD5 e11c3ef1d7d519a4188f52a8fa83a319 cs98_004.tar.bz2 20709835
diff --git a/dev-games/crystalspace/files/digest-crystalspace-20030413-r1 b/dev-games/crystalspace/files/digest-crystalspace-20030413-r1
deleted file mode 100644
index 76ed9c7b75de..000000000000
--- a/dev-games/crystalspace/files/digest-crystalspace-20030413-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4f1791a51d929ff14766e596b0a80841 crystalspace-20030413.tar.gz 17033685
diff --git a/dev-games/crystalspace/files/digest-crystalspace-20040604 b/dev-games/crystalspace/files/digest-crystalspace-20040604
deleted file mode 100644
index d93bf816cfb1..000000000000
--- a/dev-games/crystalspace/files/digest-crystalspace-20040604
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ed2f3dd909ba91e4dda6cac0d9a670f0 crystalspace-20040604.tar.bz2 21122141