summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sping@gentoo.org>2012-02-11 23:01:23 +0000
committerSebastian Pipping <sping@gentoo.org>2012-02-11 23:01:23 +0000
commit3cc3a0b76e6098df772edeb7ebadbd1a55188698 (patch)
treedc097968f7bf1702c5577d6b8b113bb5ba93ec26 /media-libs/opencollada
parentVersion bump for dev channel release. Disable gold linker flags. Depend on >=... (diff)
downloadhistorical-3cc3a0b76e6098df772edeb7ebadbd1a55188698.tar.gz
historical-3cc3a0b76e6098df772edeb7ebadbd1a55188698.tar.bz2
historical-3cc3a0b76e6098df772edeb7ebadbd1a55188698.zip
media-libs/opencollada: Append LDPATH to env.d file
Package-Manager: portage-2.1.10.45/cvs/Linux x86_64
Diffstat (limited to 'media-libs/opencollada')
-rw-r--r--media-libs/opencollada/ChangeLog10
-rw-r--r--media-libs/opencollada/Manifest10
-rw-r--r--media-libs/opencollada/opencollada-0_p864-r1.ebuild (renamed from media-libs/opencollada/opencollada-0_p864.ebuild)10
3 files changed, 23 insertions, 7 deletions
diff --git a/media-libs/opencollada/ChangeLog b/media-libs/opencollada/ChangeLog
index cd2e62818fc7..132ecaaa3b38 100644
--- a/media-libs/opencollada/ChangeLog
+++ b/media-libs/opencollada/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for media-libs/opencollada
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencollada/ChangeLog,v 1.2 2012/01/27 16:47:42 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencollada/ChangeLog,v 1.3 2012/02/11 23:01:22 sping Exp $
+
+*opencollada-0_p864-r1 (11 Feb 2012)
+
+ 11 Feb 2012; Sebastian Pipping <sping@gentoo.org> -opencollada-0_p864.ebuild,
+ +opencollada-0_p864-r1.ebuild:
+ Make sure installed libs can be linked against despite their
+ /usr/lib*/opencollada location (thanks to Anthoine Bourgeois!), workaround
+ parallel make issues
27 Jan 2012; Sebastian Pipping <sping@gentoo.org> opencollada-0_p864.ebuild:
Fix installation on arch x86 (bug #400823)
diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
index 528dbfb7f055..6e14e2f14d88 100644
--- a/media-libs/opencollada/Manifest
+++ b/media-libs/opencollada/Manifest
@@ -3,13 +3,13 @@ Hash: SHA1
AUX opencollada-0_p864-expat.patch 353 RMD160 73fc958e3af8cd4f5892bf78b48230aaf0584fd0 SHA1 a86bb3079c08699ad5b0dff14e9d8c2e76792a3d SHA256 e7d7f303921b09db1b92a0299ad464d6185ac1f470e028829443785ed98bf1a2
DIST opencollada-0_p864.tar.xz 5255868 RMD160 8054b3513dcc1f5d6b40db38f8a581319d01b633 SHA1 bc1406e144273faaded4759f48234d5f45cb267b SHA256 e939fba12d7118378a6166c3799cb51b29e22dbdeda5204407a261fc06c10d05
-EBUILD opencollada-0_p864.ebuild 1699 RMD160 fbd3219ff9b889ee005dea85ddec99306d90486f SHA1 eed3e116180afb621aab4476d46991967a8dac1b SHA256 8e98d9de5b180570623e749ba16dc5b3e12048ef4df55ec33b2c483b7910d2ef
-MISC ChangeLog 571 RMD160 2a4f989f91aeb3b36bd4998b617fdcf17817dde0 SHA1 9548eb286f07f112a00499715bbc6da712c2f60d SHA256 4c98f873fede260a45c801d2024657d8b6f5e0d168018409e3d1544cacb090c7
+EBUILD opencollada-0_p864-r1.ebuild 1882 RMD160 e4e8176d36f925259b56e264b5ca5f023e72fcb0 SHA1 be34c87a4d08315663855adfd73430e30732d41a SHA256 fb33786522eca8848592a0ffdab551645ae6d9ae9084263c754815975f1ff3d5
+MISC ChangeLog 886 RMD160 eaed83468f21982621476ae168ed40746c61b8ae SHA1 d4d7f09021f1e883346d3a0f840e53bbb1588298 SHA256 5e694393f07b7958f2402d5d9a554be926e9a5b4a51635a69283a40955b6c3e4
MISC metadata.xml 235 RMD160 e964157be48c204555d79827e1bf79c9d9fb23a5 SHA1 767b5eb408113ae55d84adcb94d44a692285d175 SHA256 095e4ee6b3ae673e7ddf0d4e166a632d3384d6374c6dd86d8c401a8f5c43f7fe
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iEYEARECAAYFAk8i1R0ACgkQsAvGakAaFgCnfQCgjDp4lONjEW9rWGhLdnKioCue
-IfcAn2DDGFHINIWG1UfBu9S5iFhGvdSK
-=1ihq
+iEYEARECAAYFAk828y0ACgkQsAvGakAaFgCDXQCfQq0Rp4hbMVsARIWVvsz6ovc0
+OnwAniZQS5E77rxLvgZFN616NFaW57ce
+=+YF4
-----END PGP SIGNATURE-----
diff --git a/media-libs/opencollada/opencollada-0_p864.ebuild b/media-libs/opencollada/opencollada-0_p864-r1.ebuild
index d741d87ad16a..f50de8bc3daa 100644
--- a/media-libs/opencollada/opencollada-0_p864.ebuild
+++ b/media-libs/opencollada/opencollada-0_p864-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencollada/opencollada-0_p864.ebuild,v 1.2 2012/01/27 16:47:42 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencollada/opencollada-0_p864-r1.ebuild,v 1.1 2012/02/11 23:01:22 sping Exp $
EAPI="3"
@@ -51,11 +51,19 @@ src_configure() {
cmake-utils_src_configure
}
+src_compile() {
+ MAKEOPTS="${MAKEOPTS} -j1" default # TODO
+}
+
src_install() {
cmake-utils_src_install
if [[ $(get_libdir) != 'lib' ]]; then
mv "${D}"/usr/{lib,$(get_libdir)} || die
fi
+ dodir /etc/env.d || die
+ echo "LDPATH=/usr/$(get_libdir)/opencollada" \
+ > "${D}"/etc/env.d/99opencollada || die
+
dobin build/bin/OpenCOLLADAValidator || die
}