Fix libdir issues with media-libs/panda3d ebuild.

1 files changed, 24 insertions, 16 deletions

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()