merge fixes from new cel ebuild

diff --git a/dev-games/cel-cvs/cel-cvs-0.97.ebuild b/dev-games/cel-cvs/cel-cvs-0.97.ebuild
index cf53d5e000057a56749fd7680d3826d0e2d228e1..d115f46a096b491d34544fec6f6004d1b5dd9ebb 100644 (file)
--- a/dev-games/cel-cvs/cel-cvs-0.97.ebuild
+++ b/dev-games/cel-cvs/cel-cvs-0.97.ebuild
@@ -1,40 +1,43 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/cel-cvs/cel-cvs-0.97.ebuild,v 1.8 2004/06/29 18:12:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cel-cvs/cel-cvs-0.97.ebuild,v 1.9 2004/12/25 08:59:00 vapier Exp $
 
-inherit cvs
 ECVS_SERVER="cvs.cel.sourceforge.net:/cvsroot/cel"
 ECVS_MODULE="cel"
 ECVS_TOP_DIR="${DISTDIR}/cvs-src/${PN}"
-S=${WORKDIR}/${ECVS_MODULE}
+inherit cvs
 
 DESCRIPTION="A game entity layer based on Crystal Space"
 HOMEPAGE="http://cel.sourceforge.net/"
+SRC_URI=""
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="x86"
-IUSE=""
+KEYWORDS="ppc x86"
+IUSE="python"
 
-DEPEND="dev-games/crystalspace
-       >=sys-apps/sed-4
+RDEPEND="dev-games/crystalspace
        dev-util/jam
-       !dev-games/cel-cvs"
+       !dev-games/cel-cvs
+       python? ( virtual/python )"
+DEPEND="${RDEPEND}
+       >=sys-apps/sed-4"
 
-CEL_PREFIX=/opt/crystal
-CS_PREFIX=/opt/crystal
+S=${WORKDIR}/${ECVS_MODULE}
 
 src_compile() {
-       ./autogen.sh || die
-       env PATH="${CEL_PREFIX}/bin:${PATH}" ./configure \
-               --prefix=${CEL_PREFIX} --with-cs-prefix=${CEL_PREFIX} || die
+       local prefix=$(cs-config --prefix)
+       ./autogen.sh || die "autogen failed"
+       PATH="${prefix}/bin:${PATH}" \
+       ./configure \
+               --prefix="${prefix}" \
+               --with-cs-prefix="${prefix}" \
+               $(use_with python) \
+               || die "configure failed"
        jam || die
 }
 
 src_install() {
-       sed -i -e "s:/usr/local/cel:${CEL_PREFIX}:g" cel.cex
-       # attention don't put a / between ${D} and ${CEL_PREFIX} jam has a bug where
-       # it fails with 3 following slashes.
-       jam -sFILEMODE=0644 -sEXEMODE=0755 -sprefix=${D}${CEL_PREFIX} install || die
-       dobin cel.cex
+       local prefix=$(cs-config --prefix)
+       jam -sprefix="${D}"${prefix} install || die
 }