From 3cc3a0b76e6098df772edeb7ebadbd1a55188698 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Sat, 11 Feb 2012 23:01:23 +0000 Subject: media-libs/opencollada: Append LDPATH to env.d file Package-Manager: portage-2.1.10.45/cvs/Linux x86_64 --- media-libs/opencollada/ChangeLog | 10 +++- media-libs/opencollada/Manifest | 10 ++-- .../opencollada/opencollada-0_p864-r1.ebuild | 69 ++++++++++++++++++++++ media-libs/opencollada/opencollada-0_p864.ebuild | 61 ------------------- 4 files changed, 83 insertions(+), 67 deletions(-) create mode 100644 media-libs/opencollada/opencollada-0_p864-r1.ebuild delete mode 100644 media-libs/opencollada/opencollada-0_p864.ebuild (limited to 'media-libs/opencollada') 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 -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 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-r1.ebuild b/media-libs/opencollada/opencollada-0_p864-r1.ebuild new file mode 100644 index 000000000000..f50de8bc3daa --- /dev/null +++ b/media-libs/opencollada/opencollada-0_p864-r1.ebuild @@ -0,0 +1,69 @@ +# 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-r1.ebuild,v 1.1 2012/02/11 23:01:22 sping Exp $ + +EAPI="3" + +inherit eutils multilib cmake-utils + +DESCRIPTION="Stream based read/write library for COLLADA files" +HOMEPAGE="http://www.opencollada.org/" +SRC_URI="http://www.hartwork.org/public/${P}.tar.xz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="expat" + +RDEPEND="dev-libs/libpcre + expat? ( dev-libs/expat ) + !expat? ( dev-libs/libxml2 ) + media-libs/lib3ds + sys-libs/zlib + dev-libs/zziplib" +DEPEND="${RDEPEND} + sys-apps/findutils + sys-apps/sed" + +CMAKE_BUILD_DIR="${S}"/build + +src_prepare() { + # Remove some bundled dependencies + edos2unix CMakeLists.txt || die + epatch "${FILESDIR}"/${P}-expat.patch + rm -R Externals/{expat,lib3ds,LibXML,pcre,zlib,zziplib} || die + ewarn "$(echo "Remaining bundled dependencies:"; + find Externals -mindepth 1 -maxdepth 1 -type d | sed 's|^|- |')" + + # Remove unused build systems + rm Makefile scripts/{unixbuild.sh,vcproj2cmake.rb} || die + find "${S}" -name SConscript -delete || die +} + +src_configure() { + local mycmakeargs=" -DUSE_SHARED=ON -DUSE_STATIC=OFF" + + # Master CMakeLists.txt says "EXPAT support not implemented" + # Something like "set(LIBEXPAT_LIBRARIES expat)" is missing to make it build + use expat \ + && mycmakeargs+=' -DUSE_EXPAT=ON -DUSE_LIBXML=OFF' \ + || mycmakeargs+=' -DUSE_EXPAT=OFF -DUSE_LIBXML=ON' + 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 +} diff --git a/media-libs/opencollada/opencollada-0_p864.ebuild b/media-libs/opencollada/opencollada-0_p864.ebuild deleted file mode 100644 index d741d87ad16a..000000000000 --- a/media-libs/opencollada/opencollada-0_p864.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# 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 $ - -EAPI="3" - -inherit eutils multilib cmake-utils - -DESCRIPTION="Stream based read/write library for COLLADA files" -HOMEPAGE="http://www.opencollada.org/" -SRC_URI="http://www.hartwork.org/public/${P}.tar.xz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="expat" - -RDEPEND="dev-libs/libpcre - expat? ( dev-libs/expat ) - !expat? ( dev-libs/libxml2 ) - media-libs/lib3ds - sys-libs/zlib - dev-libs/zziplib" -DEPEND="${RDEPEND} - sys-apps/findutils - sys-apps/sed" - -CMAKE_BUILD_DIR="${S}"/build - -src_prepare() { - # Remove some bundled dependencies - edos2unix CMakeLists.txt || die - epatch "${FILESDIR}"/${P}-expat.patch - rm -R Externals/{expat,lib3ds,LibXML,pcre,zlib,zziplib} || die - ewarn "$(echo "Remaining bundled dependencies:"; - find Externals -mindepth 1 -maxdepth 1 -type d | sed 's|^|- |')" - - # Remove unused build systems - rm Makefile scripts/{unixbuild.sh,vcproj2cmake.rb} || die - find "${S}" -name SConscript -delete || die -} - -src_configure() { - local mycmakeargs=" -DUSE_SHARED=ON -DUSE_STATIC=OFF" - - # Master CMakeLists.txt says "EXPAT support not implemented" - # Something like "set(LIBEXPAT_LIBRARIES expat)" is missing to make it build - use expat \ - && mycmakeargs+=' -DUSE_EXPAT=ON -DUSE_LIBXML=OFF' \ - || mycmakeargs+=' -DUSE_EXPAT=OFF -DUSE_LIBXML=ON' - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - if [[ $(get_libdir) != 'lib' ]]; then - mv "${D}"/usr/{lib,$(get_libdir)} || die - fi - - dobin build/bin/OpenCOLLADAValidator || die -} -- cgit v1.2.3-65-gdbad