Work around problems raised with bug #155788

Package-Manager: portage-2.1.1-r2

diff --git a/dev-games/crystalspace/ChangeLog b/dev-games/crystalspace/ChangeLog
index c66a2e25fb6d7aa76dff0b4923ad918437d3a222..3f94f3f9971163f1cdf495d31fb75b0b8ddf26fb 100644 (file)
--- a/dev-games/crystalspace/ChangeLog
+++ b/dev-games/crystalspace/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-games/crystalspace
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/ChangeLog,v 1.21 2007/01/31 22:14:56 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/ChangeLog,v 1.22 2007/02/02 06:50:41 tupone Exp $
+
+  02 Feb 2007; <tupone@gentoo.org> crystalspace-1.0.ebuild:
+  Work around problems raised with bug #155788 comment 18 by Frank Richter
 
   31 Jan 2007; <tupone@gentoo.org> crystalspace-1.0.ebuild:
   Adding environment variable definition

diff --git a/dev-games/crystalspace/Manifest b/dev-games/crystalspace/Manifest
index 496b7ab4ab573ecccce31973f39021684cfb3b40..9e72c84ec8d30ff8d082147fc829e4b6d5f7b1b7 100644 (file)
--- a/dev-games/crystalspace/Manifest
+++ b/dev-games/crystalspace/Manifest
@@ -16,14 +16,14 @@ EBUILD crystalspace-0.99_pre20050823.ebuild 2203 RMD160 f1edb03cada3a89d67e99d90
 MD5 70f0e2bf067064a5431b71d71b17a433 crystalspace-0.99_pre20050823.ebuild 2203
 RMD160 f1edb03cada3a89d67e99d906ee464b176f6c50f crystalspace-0.99_pre20050823.ebuild 2203
 SHA256 42438c6c4bc8110a50ff7b1080dbf89781fdb8029ec9250a40fd8b2a5e91b298 crystalspace-0.99_pre20050823.ebuild 2203
-EBUILD crystalspace-1.0.ebuild 2231 RMD160 e1a777317ec31cba178b1b76911dc409328fa0e0 SHA1 17f38b1b191dbd11e05d00feb95967c6f4cb759b SHA256 bc812ae34c032d4eafd063e4a574f3d7e945863bf24a6187dfaeea672302cb1c
-MD5 2fe9a80b9b6df63e9cb471662f09c3ed crystalspace-1.0.ebuild 2231
-RMD160 e1a777317ec31cba178b1b76911dc409328fa0e0 crystalspace-1.0.ebuild 2231
-SHA256 bc812ae34c032d4eafd063e4a574f3d7e945863bf24a6187dfaeea672302cb1c crystalspace-1.0.ebuild 2231
-MISC ChangeLog 3405 RMD160 ec20d1998bde8b8a0b8b820b402661510dd64463 SHA1 eb86a293e8d018eda318cbf9866a0d8f460e27ad SHA256 54326ca99b729d86f2c090d28e469a9297de18c16419307f0130e7c7fb078ac1
-MD5 7fd08ae10a7a8ce2cc5a48d68ef285f2 ChangeLog 3405
-RMD160 ec20d1998bde8b8a0b8b820b402661510dd64463 ChangeLog 3405
-SHA256 54326ca99b729d86f2c090d28e469a9297de18c16419307f0130e7c7fb078ac1 ChangeLog 3405
+EBUILD crystalspace-1.0.ebuild 2943 RMD160 1f1bc19d859f6842e9382ff60960f981ed9ba05f SHA1 ed99c0a2f43f432ea56cc1439751a8ffdd7a847a SHA256 785f2379a729f1e6e7e95d03c09a25abce4d4c17a27eb57fabff10b8ce49a96e
+MD5 80a8bb3950846a4219746f79714c1e99 crystalspace-1.0.ebuild 2943
+RMD160 1f1bc19d859f6842e9382ff60960f981ed9ba05f crystalspace-1.0.ebuild 2943
+SHA256 785f2379a729f1e6e7e95d03c09a25abce4d4c17a27eb57fabff10b8ce49a96e crystalspace-1.0.ebuild 2943
+MISC ChangeLog 3541 RMD160 b3921434004ac091b95189799d00718420eb4d72 SHA1 2579c61494c510c4eb7bfd0cff9d3cc7134b0368 SHA256 8a470fa56c444c1ac967325ab38382cebe2688c6f37260c51524c0dc7f9df12b
+MD5 25ad08996f3f84d3f5915a1f7eba6b20 ChangeLog 3541
+RMD160 b3921434004ac091b95189799d00718420eb4d72 ChangeLog 3541
+SHA256 8a470fa56c444c1ac967325ab38382cebe2688c6f37260c51524c0dc7f9df12b ChangeLog 3541
 MISC metadata.xml 959 RMD160 40012c6a95c2e1d1edd4b801f2f1b3184965a94f SHA1 e4d00b523f67093c7b3b096523dd85b3c8c921a4 SHA256 c4214f73569fde7be988f76a25ce525814a0092d5a396cf1da57162d575a4325
 MD5 e4c7a49ca08eb200cfa0a9f9246e2257 metadata.xml 959
 RMD160 40012c6a95c2e1d1edd4b801f2f1b3184965a94f metadata.xml 959
@@ -40,7 +40,7 @@ SHA256 d9cee21b4e3c8de602272b4df4459a097cbb0c0ec3d3e59609a940b717c07836 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFwRT1bfN2jvlVAhwRAstRAJ4tdUTUap6YoRZMO5CF3KIGjG5eagCdGzJH
-togBFBiRa+Hgq7AEka8zsxU=
-=6Tt2
+iD8DBQFFwt9WbfN2jvlVAhwRAuENAKCw2stTzfrQNvVin4buMMGbpj1DGwCguP4P
+UEhDjX22Pe6SLMZ3xjFt44s=
+=/PSA
 -----END PGP SIGNATURE-----

diff --git a/dev-games/crystalspace/crystalspace-1.0.ebuild b/dev-games/crystalspace/crystalspace-1.0.ebuild
index ab181acd4a39974db31ce365f9e98c7658cfb106..c623a10ab1486cbdd063bb61ebdc3a4be168fc23 100644 (file)
--- a/dev-games/crystalspace/crystalspace-1.0.ebuild
+++ b/dev-games/crystalspace/crystalspace-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/crystalspace-1.0.ebuild,v 1.3 2007/01/31 22:14:56 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/crystalspace-1.0.ebuild,v 1.4 2007/02/02 06:50:41 tupone Exp $
 
 MY_P=${PN}-src-${PV}
 
@@ -11,8 +11,8 @@ SRC_URI="mirror://sourceforge/crystal/${MY_P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="3ds alsa cal3d cegui cg java jpeg mng ode perl png python sdl
-truetype vorbis wxwindows"
+IUSE="3ds alsa cal3d cegui cg doc java javascript jpeg mng ode perl png python
+sdl truetype vorbis wxwindows"
 
 RDEPEND="virtual/opengl
        virtual/glu
@@ -30,6 +30,7 @@ RDEPEND="virtual/opengl
        png? ( media-libs/libpng )
        wxwindows? ( x11-libs/pango
                                 x11-libs/wxGTK )
+       javascript? ( dev-lang/spidermonkey )
        x11-libs/libXaw
        x11-libs/libXxf86vm"
 
@@ -42,9 +43,26 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       # Installing doc conflict with dodoc on src_install
+       # Removing conflicting target
+       sed -i -e "/^InstallDoc/d" \
+               Jamfile.in \
+               docs/Jamfile
+}
+
 src_compile() {
        econf --enable-cpu-specific-optimizations=no \
+               --disable-separate-debug-info \
                --without-lcms \
+               --without-caca \
+               --without-bullet \
+               --without-openal \
+               --without-jackasyn \
+               --without-mikmod \
+               --disable-make-emulation \
                $(use_with perl) \
                $(use_with python) \
                $(use_with java) \
@@ -60,6 +78,7 @@ src_compile() {
                $(use_with wxwindows wx) \
                $(use_with cegui CEGUI) \
                $(use_with cg Cg) \
+               $(use_with javascript js) \
                $(use_with alsa asound)
        #remove unwanted CFLAGS added by ./configure
        sed -i -e '/COMPILER\.CFLAGS\.optimize/d' \
@@ -68,14 +87,22 @@ src_compile() {
 }
 
 src_install() {
-       make install DESTDIR=${D} || die "make install failed"
+       for installTarget in install_bin install_plugin install_lib \
+               install_include install_data install_config
+       do
+               jam -q -s DESTDIR=${D} ${installTarget} \
+                       || die "jam ${installTarget} failed"
+       done
+       if use doc; then
+               jam -q -s DESTDIR=${D} install_doc || die "make install failed"
+       fi
        # Fill cache directory for the examples
        for dir in castle flarge isomap parallaxtest partsys r3dtest stenciltest \
                terrain terrainf;
        do
-               cslight -video=null ${D}/usr/share/${PN}/data/maps/$dir;
+               ${D}/usr/bin/cslight -video=null ${D}/usr/share/${PN}/data/maps/$dir;
        done
-       dodoc README
+       dodoc README docs/history* docs/todo_*
 
        echo "CRYSTAL_PLUGIN=/usr/lib/crystalspace" >> 90crystalspace
        echo "CRYSTAL_CONFIG=/etc/crystalspace" >> 90crystalspace