Don't install the aw_flexlm init script. Add support for installing the shader library.

(Portage version: 2.0.51.22-r2)

2 files changed, 26 insertions, 25 deletions

diff --git a/media-gfx/maya/ChangeLog b/media-gfx/maya/ChangeLog
index fa2e2bda2d7d..b2b02c43e174 100644
--- a/media-gfx/maya/ChangeLog
+++ b/media-gfx/maya/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/maya
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/maya/ChangeLog,v 1.19 2005/08/11 08:55:08 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/maya/ChangeLog,v 1.20 2005/08/11 09:23:19 eradicator Exp $
+
+  11 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org> maya-6.5.ebuild:
+  Don't install the aw_flexlm init script. Add support for installing the
+  shader library.
 
   11 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org> maya-6.5.ebuild:
   Create /usr/aw symlink for compatibility and COM/bin/installKey runtime lib
diff --git a/media-gfx/maya/maya-6.5.ebuild b/media-gfx/maya/maya-6.5.ebuild
index 4a5655166e41..4115d4899e27 100644
--- a/media-gfx/maya/maya-6.5.ebuild
+++ b/media-gfx/maya/maya-6.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/maya/maya-6.5.ebuild,v 1.2 2005/08/11 08:55:08 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/maya/maya-6.5.ebuild,v 1.3 2005/08/11 09:23:19 eradicator Exp $
 
 inherit rpm eutils versionator
 
@@ -64,16 +64,16 @@ src_unpack() {
 
 	# rpm_unpack unpacks in ${WORKDIR} no matter what we try... so get it out of the way...
 	cd ${S}
-	rpm_unpack ${CDROM_ROOT}/${AWCOMMON_RPM}
-	rpm_unpack ${CDROM_ROOT}/${AWCOMMON_SERVER_RPM}
-	rpm_unpack ${CDROM_ROOT}/${MAYA_RPM}
+	rpm_unpack ${CDROM_ROOT}/${AWCOMMON_RPM} || die
+	rpm_unpack ${CDROM_ROOT}/${AWCOMMON_SERVER_RPM} || die
+	rpm_unpack ${CDROM_ROOT}/${MAYA_RPM} || die
 
 	if use doc ; then
-		rpm_unpack ${CDROM_ROOT}/${MAYA_DOCS_RPM}
+		rpm_unpack ${CDROM_ROOT}/${MAYA_DOCS_RPM} || die
 
 		if ! use bundled-libs; then
-			rm -rf ${S}/usr/aw/maya6.5/docs/jre
-			sed -i -e 's:JAVACMD=\./jre/bin/java:JAVACMD=java:g' ${S}/usr/aw/maya6.5/docs/startDocServer.sh
+			rm -rf ${S}/usr/aw/maya6.5/docs/jre || die
+			sed -i -e 's:JAVACMD=\./jre/bin/java:JAVACMD=java:g' ${S}/usr/aw/maya6.5/docs/startDocServer.sh || die
 		fi
 	fi
 
@@ -81,34 +81,34 @@ src_unpack() {
 		pushd ${CDROM_ROOT} >& /dev/null
 		[[ -d shaderLibrary ]] || die "Could not locate shaderLibrary on Maya Installation CD."
 
-		tar -c -f - shaderLibrary | (cd ${S}; tar -x -f -) || die "Failed to copy over maya shader library"
+		tar -c -f - shaderLibrary | (cd ${S}/usr/aw/maya${SLOT}; tar -x -f -) || die "Failed to copy over maya shader library"
 
 		popd >& /dev/null
 	fi
 
 	# Use app-admin/flexlm
-	rm -rf ${S}/usr/COM/{bin/lmutil,etc/lmgrd}
+	rm -rf ${S}/usr/COM/{bin/lmutil,etc/lmgrd} || die
 
 	# Don't need RedHat's init script
-	rm -rf ${S}/etc
+	rm -rf ${S}/etc || die
 
-	mkdir ${S}/insroot
-	mv ${S}/usr ${S}/insroot/opt
-	rm -rf ${S}/insroot/opt/sbin
+	mkdir ${S}/insroot || die
+	mv ${S}/usr ${S}/insroot/opt || die
+	rm -rf ${S}/insroot/opt/sbin || die
 
-	cp -a ${CDROM_ROOT}/README.html ${S}
+	cp -a ${CDROM_ROOT}/README.html ${S} || die
 
 	# Remove unneeded libs (provided by RDEPEND).
 	if ! use bundled-libs; then
-		#rm -f ${S}/insroot/${AWDIR}/COM/lib/libXm.so.2.1
-		rm -f ${S}/insroot/${MAYADIR}/lib/libgcc_s.so.1
-		rm -f ${S}/insroot/${MAYADIR}/lib/libstdc++.so.5.0.6
+		#rm -f ${S}/insroot/${AWDIR}/COM/lib/libXm.so.2.1 || die
+		rm -f ${S}/insroot/${MAYADIR}/lib/libgcc_s.so.1 || die
+		rm -f ${S}/insroot/${MAYADIR}/lib/libstdc++.so.5.0.6 || die
 
 		# We keep this one because of possible C++ ABI changes...
 		# Maya 6.5 was compiled with CXXABI_1.2 (libstdc++.so.5)
-		# rm -f ${S}/insroot/${MAYADIR}/lib/libqt.so.3
+		# rm -f ${S}/insroot/${MAYADIR}/lib/libqt.so.3 || die
 
-		rm -f ${S}/insroot/${MAYADIR}/lib/libXm.so.3
+		rm -f ${S}/insroot/${MAYADIR}/lib/libXm.so.3 || die
 	fi
 }
 
@@ -116,7 +116,7 @@ src_install() {
 	dohtml README.html
 
 	cd ${S}/insroot
-	cp -a . ${D}
+	cp -a . ${D} || die
 
 	# We use our own Motif runtime unless USE=bundled-libs
 	#if use bundled-libs; then
@@ -166,11 +166,8 @@ src_install() {
 
 	doenvd ${FILESDIR}/50maya
 
-	doinitd ${FILESDIR}/aw_flexlm
-	newconfd  ${FILESDIR}/aw_flexlm.conf.d aw_flexlm
-
 	if use maya-shaderlibrary ; then
-		die "Add support to install the shaderLibrary here"
+		echo "MAYA_SHADER_LIBRARY_PATH=\"${AWDIR}/maya/shaderLibrary/shaders\"" >> ${D}/etc/env.d/50maya
 	fi
 
 	# Fix permissions