Fixed installation directory for include files and pkgconfig location, closing bug #253785

(Portage version: 2.2_rc20/cvs/Linux 2.6.25-gentoo-r7 x86_64)

4 files changed, 17 insertions, 56 deletions

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 <bicatali@gentoo.org>
+  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/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.ebuild b/sci-physics/bullet/bullet-2.73-r1.ebuild
index 7d33cbad0dec..dc2ae078ac9a 100644
--- a/sci-physics/bullet/bullet-2.73.ebuild
+++ b/sci-physics/bullet/bullet-2.73-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.ebuild,v 1.1 2008/12/08 00:29:02 bicatali Exp $
+# $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
 
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 \