From 15a1b28cef63ffa9086496a30d127eb4b9f7eb27 Mon Sep 17 00:00:00 2001
From: Aaron Mavrinac <mavrinac@gmail.com>
Date: Sat, 11 Aug 2012 16:30:19 -0400
Subject: Fix libdir issues with media-libs/panda3d ebuild.

---
 media-libs/panda3d/Manifest             |  2 +-
 media-libs/panda3d/panda3d-1.8.0.ebuild | 40 ++++++++++++++++++++-------------
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/media-libs/panda3d/Manifest b/media-libs/panda3d/Manifest
index 9575b2b..6160669 100644
--- a/media-libs/panda3d/Manifest
+++ b/media-libs/panda3d/Manifest
@@ -1,5 +1,5 @@
 AUX 50panda3d 78 RMD160 b624dff504d17114562e424892dce05f73764ad8 SHA1 2fb352c72017e7c189fd51b1faec67ef4801c460 SHA256 cc996df97f1c434472971614956c49e553068fd49c4086f4612fc8b7126d1b84
 AUX panda3d-1.8.0-pkgconfig.patch 2281 RMD160 86268fd4f15be8bbd4df21fd9973295f0dcd5062 SHA1 c16a9c2d90d9160235e1b2459573ede8af155c15 SHA256 d72eda1da6126abf35f4f9874c7bc5651c9dbcec1b075cb2bb93c1c29e13f73c
 DIST panda3d-1.8.0.tar.gz 36374979 RMD160 564766ed4adef6bf167d7c650a0da262177ffe94 SHA1 dad3462b331610c983e2797a80203041dd7645cb SHA256 bb453b0836a98a0c0f6c57db341f06567989eeefae2ef7361c2281e671c21d88
-EBUILD panda3d-1.8.0.ebuild 2818 RMD160 22de26cf5df693f41ea0c41b2e9223d87de19ed3 SHA1 5501be1672e762aef5f46cb8a5d83be7859d1d7e SHA256 d6a89509488c4528d29c272eb28d7c037e90a35c4f1c9740711f884b59c15b62
+EBUILD panda3d-1.8.0.ebuild 3165 RMD160 3b3f261764b9c17339d0deb124084c2c7d9b9ad2 SHA1 5d2c612bcd0b72d6c7e7126020540f3b6919f1db SHA256 9c18823998583b947ea86d1ca94c67f551f514a6da0c335ab0b6f9d4f9932839
 MISC metadata.xml 463 RMD160 bb2e01fb4921bcd54b2cd75c8bb7f944bc32e573 SHA1 1a5ee2f3b94f59e8c898bd2c5ee0c8f5bca15c21 SHA256 ac455d3a8c979623ea49c5ba1cc2b8c092e382ccd473ba5c1b0503987286bb08
diff --git a/media-libs/panda3d/panda3d-1.8.0.ebuild b/media-libs/panda3d/panda3d-1.8.0.ebuild
index 5bb6e7d..476d012 100644
--- a/media-libs/panda3d/panda3d-1.8.0.ebuild
+++ b/media-libs/panda3d/panda3d-1.8.0.ebuild
@@ -81,17 +81,23 @@ src_compile() {
 }
 
 src_install() {
-	dodir /opt/panda3d
+	local DEST=/opt/${PN}
 
-	doenvd "${FILESDIR}"/50panda3d
-	sed -i -e "s:lib:$(get_libdir):g" \
-		"${D}"/etc/env.d/50panda3d \
-		|| die "libdir patching failed"
+	into ${DEST}
+	dobin "${S}"/built/bin/*
+	dolib.a "${S}"/built/lib/*.a
+	dolib.so "${S}"/built/lib/*.so
+	cp "${S}"/built/lib/*.so.* "${D}"/"${DEST}"/$(get_libdir)
+	cp -R "${S}"/built/include "${D}"/"${DEST}"/include
+	cp -R "${S}"/built/etc "${D}"/"${DEST}"/etc
+	cp -R "${S}"/built/models "${D}"/"${DEST}"/models
+	cp -R "${S}"/built/pandac "${D}"/"${DEST}"/pandac
+	cp -R "${S}"/built/plugins "${D}"/"${DEST}"/plugins
+	cp -R "${S}"/direct/src "${D}"/"${DEST}"/direct
 
 	if use doc; then
-		cp -R "${S}"/samples "${S}"/built
-		cp -R "${S}"/direct/src "${S}"/built/direct/src
-		cd "${S}"/built
+		cp -R "${S}"/samples "${D}"/"${DEST}"/samples
+		cp -R "${S}"/direct/src "${D}"/"${DEST}"/direct/src
 	fi
 
 	if use python ; then
@@ -100,17 +106,19 @@ src_install() {
 		cat <<- EOF > "${D}"$(python_get_sitedir)/panda3d.pth
 		# This document sets up paths for python to access the
 		# panda3d modules
-		/opt/panda3d
-		/opt/panda3d/lib
-		/opt/panda3d/direct
-		/opt/panda3d/pandac
-		/opt/panda3d/built
-		/opt/panda3d/built/$(get_libdir)
+		${DEST}
+		${DEST}/lib
+		${DEST}/direct
+		${DEST}/pandac
+		${DEST}/built
+		${DEST}/built/$(get_libdir)
 		EOF
 	fi
 
-	cp -R "${S}"/direct/src "${S}"/built/direct/
-	cp -R "${S}"/built/* "${D}"/opt/panda3d
+	doenvd "${FILESDIR}"/50panda3d
+	sed -i -e "s:lib:$(get_libdir):g" \
+		"${D}"/etc/env.d/50panda3d \
+		|| die "libdir patching failed"
 }
 
 pkg_postinst()
-- 
cgit v1.2.3-65-gdbad