fixes #20383

7 files changed, 58 insertions, 73 deletions

diff --git a/dev-libs/cel/ChangeLog b/dev-libs/cel/ChangeLog
index 603f83912ab3..329b0e85ab7e 100644
--- a/dev-libs/cel/ChangeLog
+++ b/dev-libs/cel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/cel
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cel/ChangeLog,v 1.5 2003/07/02 23:19:29 blauwers Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cel/ChangeLog,v 1.6 2003/07/10 22:40:20 vapier Exp $
+
+*cel-20030413-r2 (10 Jul 2003)
+
+  10 Jul 2003; Mike Frysinger <vapier@gentoo.org> :
+  Bumped to fix all known problems with cel.  Many thanks to people on
+  #20383, especially Matze Braun <matze@braunis.de>.
 
 *cel-20030413-r1 (02 Jul 2003)
 
@@ -13,8 +19,10 @@
 
   10 Jun 2003; <msterret@gentoo.org> cel-20030413.ebuild:
   DEPEND on sed >= 4
+
   13 Apr 2003; Philip Walls <malverian@gentoo.org> cel-20030413.ebuild :
   Cel snapshot that works with Planeshift
+
   19 May 2003; Thomas Raschbacher <lordvan@gentoo.org> cel-20030413.ebuild:
   installing cel.cex to /opt/crystal/bin now so cs-config can find it
 
diff --git a/dev-libs/cel/Manifest b/dev-libs/cel/Manifest
index 2875f3ae8c10..f300a4a904de 100644
--- a/dev-libs/cel/Manifest
+++ b/dev-libs/cel/Manifest
@@ -1,5 +1,4 @@
-MD5 e47c76555f03b342ebc6f122183eb0ad ChangeLog 1021
-MD5 8f00227bc5bfbfbf419bad1b8b74862a cel-20030413.ebuild 977
-MD5 a6e1302e6ab00befb61c33e2249750ea cel-20030413-r1.ebuild 1112
-MD5 17683292d3b178749a2b7d93eb6218cb files/digest-cel-20030413 64
-MD5 17683292d3b178749a2b7d93eb6218cb files/digest-cel-20030413-r1 64
+MD5 94eb2343401fe4897e1f20711cccc080 files/cel-20030413-install.patch 819
+MD5 17683292d3b178749a2b7d93eb6218cb files/digest-cel-20030413-r2 64
+MD5 28fd250bc58f20aa2b5fb59cc0fb0782 ChangeLog 1230
+MD5 30628e8073db34f546f0a9666c1fb488 cel-20030413-r2.ebuild 1131
diff --git a/dev-libs/cel/cel-20030413-r1.ebuild b/dev-libs/cel/cel-20030413-r1.ebuild
deleted file mode 100644
index 14b82a840301..000000000000
--- a/dev-libs/cel/cel-20030413-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cel/cel-20030413-r1.ebuild,v 1.1 2003/07/02 23:19:29 blauwers Exp $
-
-inherit games
-
-HOMEPAGE="http://cel.sourceforge.net/"
-SRC_URI="mirror://gentoo/distfiles/${P}.tar.gz"
-DESCRIPTION="A game entity layer based on Crystal Space"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-DEPEND="dev-libs/crystalspace
-	dev-util/jam
-	!dev-libs/cel-cvs"
-
-S=${WORKDIR}/${PN}
-
-CEL_PREFIX=${GAMES_PREFIX_OPT}/crystal
-
-src_compile() {
-	./autogen.sh || die
-	PATH="${CEL_PREFIX}/bin:${PATH}" ./configure --prefix=${CEL_PREFIX} || die
-	jam || die
-
-	# Put the correct path there
-	mv cel.cex cel.cex.DIST
-	sed -e "s:/usr/local/cel:${CEL_PREFIX}:g" cel.cex.DIST > cel.cex
-	# Make an environment config file
-	echo "CEL=${CEL_PREFIX}" > 99cel-env
-}
-
-src_install() {
-	into ${CEL_PREFIX}
-	dolib.so *.so
-
-	dobin cel.cex
-	dobin celtst
-
-	for inc in bl pf pl; do
-		insinto ${CEL_PREFIX}/include/${inc}
-		doins include/${inc}/*
-	done
-
-	insinto /etc/env.d
-	doins 99cel-env
-
-	prepgamesdirs
-}
diff --git a/dev-libs/cel/cel-20030413.ebuild b/dev-libs/cel/cel-20030413-r2.ebuild
index 09f38418b0f1..f4f8478c5dbb 100644
--- a/dev-libs/cel/cel-20030413.ebuild
+++ b/dev-libs/cel/cel-20030413-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cel/cel-20030413.ebuild,v 1.3 2003/06/10 20:48:27 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cel/cel-20030413-r2.ebuild,v 1.1 2003/07/10 22:40:20 vapier Exp $
 
 inherit games
 
@@ -13,33 +13,31 @@ SLOT="0"
 KEYWORDS="x86"
 
 DEPEND="dev-libs/crystalspace
-	>=sys-apps/sed-4
 	dev-util/jam
 	!dev-libs/cel-cvs"
 
 S=${WORKDIR}/${PN}
 
 CEL_PREFIX=${GAMES_PREFIX_OPT}/crystal
+CS_PREFIX=${GAMES_PREFIX_OPT}/crystal
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-install.patch
+}
 
 src_compile() {
 	./autogen.sh || die
-	PATH="${CEL_PREFIX}/bin:${PATH}" ./configure --prefix=${CEL_PREFIX} || die
+	PATH="${CEL_PREFIX}/bin:${PATH}" ./configure --prefix=${CEL_PREFIX} --with-cs-prefix=${CEL_PREFIX} || die
 	jam || die
 }
 
 src_install() {
 	sed -i -e "s:/usr/local/cel:${CEL_PREFIX}:g" cel.cex
-
-	insinto ${CEL_PREFIX}
-	doins `find include -iname '*.h'`
-
-	into ${CEL_PREFIX}
-	dolib.so *.so
-
-	insinto ${CEL_PREFIX}/bin
-	doins	cel.cex
-	#dogamesbin cel.cex
-	mv celtst ${D}/${CEL_PREFIX}/
-
+	# attention don't put a / between ${D} and ${CEL_PREFIX} jam has a bug where
+	# it fails with 3 following slashes.
+	jam -sFILEMODE=0640 -sEXEMODE=0750 -sprefix=${D}${CEL_PREFIX} install || die
+	dogamesbin cel.cex
 	prepgamesdirs
 }
diff --git a/dev-libs/cel/files/cel-20030413-install.patch b/dev-libs/cel/files/cel-20030413-install.patch
new file mode 100644
index 000000000000..4e0b1a51acc1
--- /dev/null
+++ b/dev-libs/cel/files/cel-20030413-install.patch
@@ -0,0 +1,32 @@
+diff -ur celorig/Jamrules.in cel/Jamrules.in
+--- celorig/Jamrules.in	2003-02-24 18:13:13.000000000 +0100
++++ cel/Jamrules.in	2003-05-03 14:41:11.000000000 +0200
+@@ -6,6 +6,7 @@
+ PYTHON_LIBS = "@PYTHON_LIBS@" ;
+ PYTHON_CFLAGS = "@PYTHON_CFLAGS@" ;
+ 
++Cc = @CC@ ;
+ C++ = @CXX@ ;
+ LINK = $(C++) ;
+ 
+@@ -13,13 +14,13 @@
+ C++FLAGS += $(CRYSTAL_C++FLAGS) ;
+ LINKLIBS += $(CRYSTAL_LIBS) ;
+ 
+-prefix = "@prefix@" ;
+-exec_prefix = "@exec_prefix@" ;
+-libdir = "@libdir@" ;
+-plugindir = "@libdir@/cel" ;
+-csconfdir = "@bindir@" ;
+-bindir = "@bindir@" ;
+-includedir = "@includedir@" ;
++prefix ?= "@prefix@" ;
++exec_prefix ?= "@exec_prefix@" ;
++libdir ?= "@libdir@" ;
++plugindir ?= "@libdir@/cel" ;
++csconfdir ?= "@bindir@" ;
++bindir ?= "@bindir@" ;
++includedir ?= "@includedir@" ;
+ 
+ C++FLAGS += "-DLIBDIR='\"$(plugindir)/\"'" ;
+ 
diff --git a/dev-libs/cel/files/digest-cel-20030413-r1 b/dev-libs/cel/files/digest-cel-20030413-r1
deleted file mode 100644
index 4aaec9630308..000000000000
--- a/dev-libs/cel/files/digest-cel-20030413-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1ae2fe6e7d51e9ff0e287167265854f3 cel-20030413.tar.gz 207382
diff --git a/dev-libs/cel/files/digest-cel-20030413 b/dev-libs/cel/files/digest-cel-20030413-r2
index 4aaec9630308..4aaec9630308 100644
--- a/dev-libs/cel/files/digest-cel-20030413
+++ b/dev-libs/cel/files/digest-cel-20030413-r2