From a2de047462fcdeed5e83195c02d921c9c201d181 Mon Sep 17 00:00:00 2001 From: Sebastien Fabbro Date: Tue, 6 Jan 2009 11:35:21 +0000 Subject: Fixed installation directory for include files and pkgconfig location, closing bug #253785 Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.25-gentoo-r7 x86_64 --- sci-physics/bullet/ChangeLog | 12 +++++- sci-physics/bullet/Manifest | 14 +++---- sci-physics/bullet/bullet-2.69.ebuild | 47 ---------------------- sci-physics/bullet/bullet-2.73-r1.ebuild | 44 ++++++++++++++++++++ sci-physics/bullet/bullet-2.73.ebuild | 44 -------------------- .../bullet/files/bullet-2.73-autotools.patch | 10 ++--- 6 files changed, 65 insertions(+), 106 deletions(-) delete mode 100644 sci-physics/bullet/bullet-2.69.ebuild create mode 100644 sci-physics/bullet/bullet-2.73-r1.ebuild delete mode 100644 sci-physics/bullet/bullet-2.73.ebuild (limited to 'sci-physics/bullet') diff --git a/sci-physics/bullet/ChangeLog b/sci-physics/bullet/ChangeLog index a5384c9a847a..9257e728e61f 100644 --- a/sci-physics/bullet/ChangeLog +++ b/sci-physics/bullet/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sci-physics/bullet -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/bullet/ChangeLog,v 1.3 2008/12/08 00:29:02 bicatali Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-physics/bullet/ChangeLog,v 1.4 2009/01/06 11:35:21 bicatali Exp $ + +*bullet-2.73-r1 (06 Jan 2009) + + 06 Jan 2009; Sébastien Fabbro + files/bullet-2.73-autotools.patch, -bullet-2.69.ebuild, + -bullet-2.73.ebuild, +bullet-2.73-r1.ebuild: + Fixed installation directory for include files and pkgconfig location, + closing bug #253785 *bullet-2.73 (08 Dec 2008) diff --git a/sci-physics/bullet/Manifest b/sci-physics/bullet/Manifest index 1db5edc44d39..d9f630478d4d 100644 --- a/sci-physics/bullet/Manifest +++ b/sci-physics/bullet/Manifest @@ -1,17 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX bullet-2.73-autotools.patch 15359 RMD160 5094e5eec8bd74dd47e9ae58a28a32ae663c0487 SHA1 dca42fde76e6393534a50a6cc43361e0e44456d5 SHA256 94c360fecb6aa6199ae7d62a71b0f6dc30dd208bbef64be2a02a64073653468e -DIST bullet-2.69.tgz 7787598 RMD160 06db9fd7760a081e6727ef4e8f71af0ba96b101b SHA1 9b5892c9b6a30bd6ddd046595a7336b39996a668 SHA256 3e0efee45eb7feee6ba1bf86a05faac29a5aee3f35184599853cce20a265a464 +AUX bullet-2.73-autotools.patch 15392 RMD160 dccb5f307c155b4ab2cc4c404a6cc8bc8c6d1d0c SHA1 71e2f9865021c946568d012c8b7852a98bd0ebdc SHA256 1be99fdfe6d0281d96571392a0a9341ac84afddd8ba8297a2012d0807e166ccf DIST bullet-2.73-sp1.tgz 7852929 RMD160 03cb9a66775f97d7b5d1fe2e4b3f942b13339b7c SHA1 61c42af1ac66d06460a42a9e055aad90541a1e5f SHA256 4e00ac981663475b412de765b46f164d9a91b417f1224005797c8b02633beb76 -EBUILD bullet-2.69.ebuild 1101 RMD160 bb40e78206ad8d3d29a02100bdd9fd5639cf95c6 SHA1 2b44a0875ab170ecc202d6e97f4b111d54e81e5e SHA256 9a1b42675bd1e687f76746ae84cdc26cf6f47e482ef4074931846200f9a5cdae -EBUILD bullet-2.73.ebuild 1025 RMD160 c4e59936e40ea00f6e43b35046c695e1507d69e6 SHA1 4291c7d8db71abb1f94f40cc0f3dda4dc856d30e SHA256 bdbee971bd11c219baa3d35d36d8ffc80f9701c869f931f8436d15b79ed0f2c5 -MISC ChangeLog 852 RMD160 014209191d280ab4ee1006623d660fd322ae1d0e SHA1 5948373c92fa7bef2db18d5e619afda929160a46 SHA256 48ed9e5ff21e30654902a03cbbf4112f504686fde48233d5d88e804736055ddd +EBUILD bullet-2.73-r1.ebuild 1028 RMD160 afc2782665e5e31723b162e1d83a4b5df7e2d976 SHA1 401330567f74834c888600d6f839ec0ddadf686a SHA256 4675022b14092b9dfb0f6202f38521db59743d7d9376776d5a33f4fafdb57882 +MISC ChangeLog 1139 RMD160 02ec7d242641bb1b15b28fe888fc6e5b69285274 SHA1 ab3c96c1684a2f517be8fd730b57c36b1b7eaae2 SHA256 c6e6932370178779b8e330ec68b189d8600babd8f8a6382120ea111975d2afc6 MISC metadata.xml 350 RMD160 58e5a06b4029ee0ee2f2de5b1008fbb233beae23 SHA1 7a5d337c1364ca38a28378b7df86ac801b354ca7 SHA256 c2651cf06a3d9498dfb05e05b7899292a7a7fd0a45fd28e4f8eaa7bd2b88b726 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkk8algACgkQ1ycZbhPLE2CHDQCfRiBFvnEZRAZ6Kr1TGsH/yXvU -AzIAnRklsB0xicl3PkWYyzVKezITRhSl -=HJT7 +iEYEARECAAYFAkljQgQACgkQ1ycZbhPLE2CVZwCgjndHbibcrv4sll90zM8YUZVm +RcoAoKG7p8xCEDbsW83DApwnxb5LVXaX +=stdK -----END PGP SIGNATURE----- diff --git a/sci-physics/bullet/bullet-2.69.ebuild b/sci-physics/bullet/bullet-2.69.ebuild deleted file mode 100644 index bdc00c0238d3..000000000000 --- a/sci-physics/bullet/bullet-2.69.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/bullet/bullet-2.69.ebuild,v 1.1 2008/07/08 14:23:22 bicatali Exp $ - -inherit eutils toolchain-funcs - -DESCRIPTION="Continuous Collision Detection and Physics Library" -HOMEPAGE="http://www.continuousphysics.com/Bullet/" -SRC_URI="http://bullet.googlecode.com/files/${P}.tgz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="~x86" -IUSE="doc examples" - -RDEPEND="examples? ( virtual/opengl virtual/glut )" -DEPEND="${DEPEND} - dev-util/ftjam" - -src_unpack() { - unpack ${A} - cd "${S}" - sed -i \ - -e 's:-O3 -fomit-frame-pointer -ffast-math::' \ - Jamrules || die "sed Jamrules failed" -} - -src_compile() { - econf \ - $(use_with examples x) \ - $(use_with examples mesa) \ - || die "econf failed" - jam -qa || die "jam failed" -} - -src_test() { - jam check || die "jam check failed" -} - -src_install() { - jam -sDESTDIR="${D}" install || die "jam install failed" - dodoc README ChangeLog.txt AUTHORS || die - if use doc; then - insinto /usr/share/doc/${PF} - doins *.pdf || die - fi -} diff --git a/sci-physics/bullet/bullet-2.73-r1.ebuild b/sci-physics/bullet/bullet-2.73-r1.ebuild new file mode 100644 index 000000000000..dc2ae078ac9a --- /dev/null +++ b/sci-physics/bullet/bullet-2.73-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-physics/bullet/bullet-2.73-r1.ebuild,v 1.1 2009/01/06 11:35:21 bicatali Exp $ + +inherit eutils autotools + +MYP="${P}-sp1" + +DESCRIPTION="Continuous Collision Detection and Physics Library" +HOMEPAGE="http://www.continuousphysics.com/Bullet/" +SRC_URI="http://bullet.googlecode.com/files/${MYP}.tgz" + +LICENSE="ZLIB" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc examples" + +RDEPEND="" +DEPEND="${RDEPEND}" + +src_unpack() { + unpack ${A} + cd "${S}" + # clean up + rm -rf Extras/LibXML + rm -f Extras/CDTestFramework/AntTweakBar/lib/libAntTweakBar.so + + epatch "${FILESDIR}"/${P}-autotools.patch + eautoreconf +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc README ChangeLog AUTHORS || die + + if use doc; then + insinto /usr/share/doc/${PF} + doins *.pdf || die + fi + if use examples; then + insinto /usr/share/doc/${PF}/examples + doins -r Extras Demos || die + fi +} diff --git a/sci-physics/bullet/bullet-2.73.ebuild b/sci-physics/bullet/bullet-2.73.ebuild deleted file mode 100644 index 7d33cbad0dec..000000000000 --- a/sci-physics/bullet/bullet-2.73.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/bullet/bullet-2.73.ebuild,v 1.1 2008/12/08 00:29:02 bicatali Exp $ - -inherit eutils autotools - -MYP="${P}-sp1" - -DESCRIPTION="Continuous Collision Detection and Physics Library" -HOMEPAGE="http://www.continuousphysics.com/Bullet/" -SRC_URI="http://bullet.googlecode.com/files/${MYP}.tgz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc examples" - -RDEPEND="" -DEPEND="${RDEPEND}" - -src_unpack() { - unpack ${A} - cd "${S}" - # clean up - rm -rf Extras/LibXML - rm -f Extras/CDTestFramework/AntTweakBar/lib/libAntTweakBar.so - - epatch "${FILESDIR}"/${P}-autotools.patch - eautoreconf -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc README ChangeLog AUTHORS || die - - if use doc; then - insinto /usr/share/doc/${PF} - doins *.pdf || die - fi - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins -r Extras Demos || die - fi -} diff --git a/sci-physics/bullet/files/bullet-2.73-autotools.patch b/sci-physics/bullet/files/bullet-2.73-autotools.patch index a55d92d5700a..54070b3bb76c 100644 --- a/sci-physics/bullet/files/bullet-2.73-autotools.patch +++ b/sci-physics/bullet/files/bullet-2.73-autotools.patch @@ -20,20 +20,20 @@ diff -Nur bullet-2.73.orig/Makefile.am bullet-2.73/Makefile.am -SUBDIRS=src Extras Demos/OpenGL Demos/BasicDemo Demos/TerrainDemo Demos/VehicleDemo Demos/CcdPhysicsDemo Demos/ColladaDemo Demos/SoftDemo Demos/AllBulletDemos -endif +SUBDIRS=src -+pkgconfigdir = $(libdir) ++pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = bullet.pc diff -Nur bullet-2.73.orig/src/Makefile.am bullet-2.73/src/Makefile.am --- bullet-2.73.orig/src/Makefile.am 2008-12-07 23:23:55.000000000 +0000 +++ bullet-2.73/src/Makefile.am 2008-12-07 23:24:05.000000000 +0000 @@ -1,9 +1,56 @@ -+pkgincludedir = $(includedir)/@PACKAGE@ -+nobase_include_HEADERS = \ ++bullet_includedir = $(includedir)/bullet ++nobase_bullet_include_HEADERS = \ + btBulletDynamicsCommon.h \ + Bullet-C-Api.h \ + btBulletCollisionCommon.h + if CONDITIONAL_BUILD_MULTITHREADED -+nobase_include_HEADERS = \ ++nobase_bullet_include_HEADERS += \ + BulletMultiThreaded/PosixThreadSupport.h \ + BulletMultiThreaded/SpuRaycastTaskProcess.h \ + BulletMultiThreaded/vectormath/scalar/cpp/mat_aos.h \ @@ -130,7 +130,7 @@ diff -Nur bullet-2.73.orig/src/Makefile.am bullet-2.73/src/Makefile.am -+nobase_include_HEADERS += \ ++nobase_bullet_include_HEADERS += \ + BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h \ + BulletSoftBody/btSoftBodyInternals.h \ + BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h \ -- cgit v1.2.3-65-gdbad