summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2010-11-10 16:42:06 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2010-11-10 16:42:06 +0000
commit26f49aef4d1cdca8742773ac218150c58ddc2190 (patch)
treedd1ccdebdfcb0dcd7b55d775fa2a5b2e1122a343 /dev-games
parentx86 stable per bug #343607 (diff)
downloadhistorical-26f49aef4d1cdca8742773ac218150c58ddc2190.tar.gz
historical-26f49aef4d1cdca8742773ac218150c58ddc2190.tar.bz2
historical-26f49aef4d1cdca8742773ac218150c58ddc2190.zip
fix paths in environment file with patch from Sven Eden (bug #335921)
Package-Manager: portage-2.1.8.3/cvs/Linux i686
Diffstat (limited to 'dev-games')
-rw-r--r--dev-games/crystalspace/ChangeLog6
-rw-r--r--dev-games/crystalspace/Manifest4
-rw-r--r--dev-games/crystalspace/crystalspace-1.4.0.ebuild16
3 files changed, 16 insertions, 10 deletions
diff --git a/dev-games/crystalspace/ChangeLog b/dev-games/crystalspace/ChangeLog
index dca80abf26fc..0fcf1b08d6dc 100644
--- a/dev-games/crystalspace/ChangeLog
+++ b/dev-games/crystalspace/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-games/crystalspace
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/ChangeLog,v 1.48 2010/09/17 10:56:51 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/ChangeLog,v 1.49 2010/11/10 16:42:06 mr_bones_ Exp $
+
+ 10 Nov 2010; Michael Sterrett <mr_bones_@gentoo.org>
+ crystalspace-1.4.0.ebuild:
+ fix paths in environment file with patch from Sven Eden (bug #335921)
17 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
crystalspace-1.2.1.ebuild:
diff --git a/dev-games/crystalspace/Manifest b/dev-games/crystalspace/Manifest
index 26f5479f8678..cd6a9e298aff 100644
--- a/dev-games/crystalspace/Manifest
+++ b/dev-games/crystalspace/Manifest
@@ -3,6 +3,6 @@ AUX crystalspace-1.4.0-bullet.patch 501 RMD160 8a5c37029c5c1470d1c73b5e0b38df093
DIST crystalspace-src-1.2.1.tar.bz2 47313388 RMD160 0f6582a9c68694189811a574bc63b5ce1a6a1166 SHA1 0f1b5604b217dfd9f65f54caeef5362d0ab92203 SHA256 23312a5a0330b281f517555207fed151e3d08c1096bb0cc9dd72dcabdced1b10
DIST crystalspace-src-1.4.0.tar.bz2 45670477 RMD160 af89e74a96bac7f55079a6cdad7fd938a38af602 SHA1 10f4dd50c654ad9292602a91189a0ee78a8fe353 SHA256 a8e1bfc9328470121bfbc6cf98f2c310a34f6998978065aa2f6df7e02a0101ba
EBUILD crystalspace-1.2.1.ebuild 3389 RMD160 dee1285462261f72b05ac4c345247c7955337e1b SHA1 72dfd0e2c37ee02721d649ba21d92d399db96d3d SHA256 860c4361dbe356e0f4889542375f191f973b522487948d249cf07f59d56109af
-EBUILD crystalspace-1.4.0.ebuild 3505 RMD160 07f7877a23679d82ad22809662f8cac39ef62e72 SHA1 8b6a163b1276a918985e4814dc2e7099eb5cc801 SHA256 8ef349dfc66d9d906068e131b020d1081e1c33b7344489b64c17e226ef96b185
-MISC ChangeLog 7523 RMD160 2d45c0e0641860c13226d57310afc1a5da43192e SHA1 151e64e73304a6d5588d11cc3a4acca36e3971e7 SHA256 d568f9a4c8417d0a9671c2747819954926f5c92eaf586eec70500f8f7ef5d764
+EBUILD crystalspace-1.4.0.ebuild 3581 RMD160 ad54340ecb99d7389c5a771011350c19e8190560 SHA1 c06a0b80d4b7e9eec921ddd308a4e3db8cddbc26 SHA256 d04ebbb9b79b9df345e68d245aad986b2894b5c834904aa533e3e68e9ba949a8
+MISC ChangeLog 7680 RMD160 2885efbf5af3dbd66bc6a18df248fd3a39980a2d SHA1 a659f6fcb3546c43c6c8fdc81ce032a9d4bae69e SHA256 e6a74c6ad7e45d52661cbd17a91f7c91e1bc35c5dbf91b7d1a8e97d7cc2a3ade
MISC metadata.xml 1309 RMD160 4ec4d408ea75402333583b2b19d91dcd95b2be9c SHA1 4ed88885584d54c8dd3ddaad2ae7aefb972b180b SHA256 94be39659027a6759ea4645650771553d5982ee01253f860bc526270e83cc283
diff --git a/dev-games/crystalspace/crystalspace-1.4.0.ebuild b/dev-games/crystalspace/crystalspace-1.4.0.ebuild
index 1f7d78305bb5..de56f4e37f4c 100644
--- a/dev-games/crystalspace/crystalspace-1.4.0.ebuild
+++ b/dev-games/crystalspace/crystalspace-1.4.0.ebuild
@@ -1,11 +1,13 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/crystalspace-1.4.0.ebuild,v 1.6 2010/06/24 11:33:47 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/crystalspace-1.4.0.ebuild,v 1.7 2010/11/10 16:42:06 mr_bones_ Exp $
EAPI=2
-inherit eutils flag-o-matic multilib java-pkg-opt-2 autotools wxwidgets
+inherit eutils flag-o-matic multilib java-pkg-opt-2 autotools wxwidgets versionator
MY_P=${PN}-src-${PV}
+PATH_P=${PN}-$(get_version_component_range 1-2)
+
DESCRIPTION="Portable 3D Game Development Kit written in C++"
HOMEPAGE="http://crystal.sourceforge.net/"
SRC_URI="mirror://sourceforge/crystal/${MY_P}.tar.bz2"
@@ -47,7 +49,7 @@ DEPEND="${COMMON_DEP}
dev-lang/swig
dev-util/pkgconfig"
-S="${WORKDIR}"/${MY_P}
+S=${WORKDIR}/${MY_P}
src_prepare() {
# Installing doc conflict with dodoc on src_install
@@ -63,7 +65,7 @@ src_prepare() {
}
src_configure() {
- if useq wxwidgets; then
+ if use wxwidgets; then
WX_GTK_VER="2.8"
need-wxwidgets gtk2
fi
@@ -114,8 +116,8 @@ src_install() {
fi
dodoc README docs/history*
- echo "CRYSTAL_PLUGIN=/usr/$(get_libdir)/${P}" > 90crystalspace
- echo "CRYSTAL_CONFIG=/etc/${P}" >> 90crystalspace
+ echo "CRYSTAL_PLUGIN=/usr/$(get_libdir)/${PATH_P}" > 90crystalspace
+ echo "CRYSTAL_CONFIG=/etc/${PATH_P}" >> 90crystalspace
doenvd 90crystalspace
}
@@ -127,6 +129,6 @@ pkg_postinst() {
for dir in castle flarge isomap parallaxtest partsys r3dtest stenciltest \
terrain terrainf;
do
- elog "cslight -video=null /usr/share/${P}/data/maps/${dir}"
+ elog "cslight -video=null /usr/share/${PATH_P}/data/maps/${dir}"
done
}