add x11-proto/inputproto dep (bug #205853) and quotes

(Portage version: 2.1.4)

3 files changed, 62 insertions, 52 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 372fc8986f08..68dd452e7010 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/blender
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.126 2007/12/30 23:40:36 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.127 2008/01/15 01:07:08 maekke Exp $
+
+  15 Jan 2008; Markus Meier <maekke@gentoo.org> blender-2.43.ebuild,
+  blender-2.45.ebuild:
+  add x11-proto/inputproto dep (bug #205853) and quotes
+
+  15 Jan 2008; Markus Meier <maekke@gentoo.org> blender-2.43.ebuild,
+  blender-2.45.ebuild:
+  add x11-proto/inputproto dep, bug #205853
 
   10 Jan 2008; Luca Barbato <lu_zero@gentoo.org> blender-2.43.ebuild,
   blender-2.44-r1.ebuild, blender-2.45.ebuild:
diff --git a/media-gfx/blender/blender-2.43.ebuild b/media-gfx/blender/blender-2.43.ebuild
index f6ae9765ce5c..89bc10909281 100644
--- a/media-gfx/blender/blender-2.43.ebuild
+++ b/media-gfx/blender/blender-2.43.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.43.ebuild,v 1.10 2007/12/30 23:40:36 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.43.ebuild,v 1.11 2008/01/15 01:07:08 maekke Exp $
 
 inherit multilib flag-o-matic eutils python
 
@@ -33,6 +33,7 @@ RDEPEND=">=dev-libs/openssl-0.9.6
 
 DEPEND="dev-util/scons
 	x11-libs/libXt
+	x11-proto/inputproto
 	${RDEPEND}"
 
 blend_with() {
@@ -42,34 +43,34 @@ blend_with() {
 	fi
 	if useq $1; then
 		echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' \
-			>> ${S}/user-config.py
+			>> "${S}"/user-config.py
 	else
 		echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \
-			>> ${S}/user-config.py
+			>> "${S}"/user-config.py
 	fi
 	return 0
 }
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}/release/plugins
+	cd "${S}"/release/plugins
 	chmod 755 bmake
 	rmdir include
-	cp -pPR ${S}/source/blender/blenpluginapi include
+	cp -pPR "${S}"/source/blender/blenpluginapi include
 
-	cd ${S}
-	epatch ${FILESDIR}/blender-2.37-dirs.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/blender-2.37-dirs.patch
 
 	if use ffmpeg ; then
-		cd ${S}/extern
-		mv ffmpeg/Makefile ffmpeg/common.mak ${T}
+		cd "${S}"/extern
+		mv ffmpeg/Makefile ffmpeg/common.mak "${T}"
 		unpack ffmpeg-${FFMPEG_SNAP}.tar.bz2
-		mv ${T}/Makefile ${T}/common.mak ffmpeg
+		mv "${T}"/Makefile "${T}"/common.mak ffmpeg
 	fi
 	# pass compiler flags to the scons build system
-	echo "CFLAGS += '${CFLAGS}'" >> ${S}/user-config.py
+	echo "CFLAGS += '${CFLAGS}'" >> "${S}"/user-config.py
 	echo "CCFLAGS += ['${CXXFLAGS//' '/','}','-DYESIAMSTUPID']" \
-								 >> ${S}/user-config.py
+								 >> "${S}"/user-config.py
 	# disable blender-player and iconv
 	# echo "WITH_BF_PLAYER=0" >> ${S}/user-config.py
 	# echo "WITH_BF_ICONV=0" >> ${S}/user-config.py
@@ -89,43 +90,43 @@ src_compile() {
 	scons ${MAKEOPTS/-l[0-9]} || die \
 	"!!! Please add ${S}/scons.config when filing bugs reports to bugs.gentoo.org"
 
-	cd ${S}/release/plugins
+	cd "${S}"/release/plugins
 	emake || die
 }
 
 src_install() {
 	exeinto /usr/bin/
-	doexe ${WORKDIR}/install/linux2/blender
+	doexe "${WORKDIR}"/install/linux2/blender
 
 	dodir /usr/share/${PN}
 
 	exeinto /usr/$(get_libdir)/${PN}/textures
-	doexe ${S}/release/plugins/texture/*.so
+	doexe "${S}"/release/plugins/texture/*.so
 	exeinto /usr/$(get_libdir)/${PN}/sequences
-	doexe ${S}/release/plugins/sequence/*.so
+	doexe "${S}"/release/plugins/sequence/*.so
 	insinto /usr/include/${PN}
-	doins ${S}/release/plugins/include/*.h
+	doins "${S}"/release/plugins/include/*.h
 
 	if use nls ; then
-		mv ${WORKDIR}/install/linux2/.blender/{.Blanguages,.bfont.ttf} \
-			${D}/usr/share/${PN}
-		mv ${WORKDIR}/install/linux2/.blender/locale \
-			${D}/usr/share/locale
+		mv "${WORKDIR}"/install/linux2/.blender/{.Blanguages,.bfont.ttf} \
+			"${D}"/usr/share/${PN}
+		mv "${WORKDIR}"/install/linux2/.blender/locale \
+			"${D}"/usr/share/locale
 	fi
 
-	mv ${WORKDIR}/install/linux2/.blender/scripts ${D}/usr/share/${PN}
+	mv "${WORKDIR}"/install/linux2/.blender/scripts "${D}"/usr/share/${PN}
 
 	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/${PN}.png
+	doins "${FILESDIR}"/${PN}.png
 	insinto /usr/share/applications
-	doins ${FILESDIR}/${PN}.desktop
+	doins "${FILESDIR}"/${PN}.desktop
 
-	dodoc COPYING INSTALL README
+	dodoc INSTALL README
 }
 
 pkg_preinst(){
 	if [ -h "${ROOT}/usr/$(get_libdir)/blender/plugins/include" ];
 	then
-		rm -f ${ROOT}/usr/$(get_libdir)/blender/plugins/include
+		rm -f "${ROOT}"/usr/$(get_libdir)/blender/plugins/include
 	fi
 }
diff --git a/media-gfx/blender/blender-2.45.ebuild b/media-gfx/blender/blender-2.45.ebuild
index 2056d55d8b5d..6875a2ef52c3 100644
--- a/media-gfx/blender/blender-2.45.ebuild
+++ b/media-gfx/blender/blender-2.45.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.45.ebuild,v 1.3 2007/12/30 23:40:36 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.45.ebuild,v 1.4 2008/01/15 01:07:08 maekke Exp $
 
 inherit multilib flag-o-matic eutils python
 
@@ -32,6 +32,7 @@ RDEPEND=">=dev-libs/openssl-0.9.6
 
 DEPEND="dev-util/scons
 	x11-libs/libXt
+	x11-proto/inputproto
 	${RDEPEND}"
 
 blend_with() {
@@ -41,32 +42,32 @@ blend_with() {
 	fi
 	if useq $1; then
 		echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' \
-			>> ${S}/user-config.py
+			>> "${S}"/user-config.py
 	else
 		echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \
-			>> ${S}/user-config.py
+			>> "${S}"/user-config.py
 	fi
 }
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}/release/plugins
+	cd "${S}"/release/plugins
 	chmod 755 bmake
-	cp -pPR ${S}/source/blender/blenpluginapi include
+	cp -pPR "${S}"/source/blender/blenpluginapi include
 
-	cd ${S}
-	epatch ${FILESDIR}/blender-2.37-dirs.patch
-	epatch ${FILESDIR}/blender-2.44-scriptsdir.patch
-	epatch ${FILESDIR}/blender-2.44-swscale.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/blender-2.37-dirs.patch
+	epatch "${FILESDIR}"/blender-2.44-scriptsdir.patch
+	epatch "${FILESDIR}"/blender-2.44-swscale.patch
 
 	if use ffmpeg ; then
-		cd ${S}/extern
+		cd "${S}"/extern
 		rm -rf ffmpeg
 	fi
 	# pass compiler flags to the scons build system
 	# and set python version to current version in use
 	python_version
-	cat <<- EOF >> ${S}/user-config.py
+	cat <<- EOF >> "${S}"/user-config.py
 		CFLAGS += '${CFLAGS}'
 		BF_PYTHON_VERSION="${PYVER}"
 		BF_PYTHON_INC="/usr/include/python${PYVER}"
@@ -93,43 +94,43 @@ src_compile() {
 	scons ${MAKEOPTS/-l[0-9]} || die \
 	"!!! Please add ${S}/scons.config when filing bugs reports to bugs.gentoo.org"
 
-	cd ${S}/release/plugins
+	cd "${S}"/release/plugins
 	emake || die
 }
 
 src_install() {
 	exeinto /usr/bin/
-	doexe ${WORKDIR}/install/linux2/blender
+	doexe "${WORKDIR}"/install/linux2/blender
 
 	dodir /usr/share/${PN}
 
 	exeinto /usr/$(get_libdir)/${PN}/textures
-	doexe ${S}/release/plugins/texture/*.so
+	doexe "${S}"/release/plugins/texture/*.so
 	exeinto /usr/$(get_libdir)/${PN}/sequences
-	doexe ${S}/release/plugins/sequence/*.so
+	doexe "${S}"/release/plugins/sequence/*.so
 	insinto /usr/include/${PN}
-	doins ${S}/release/plugins/include/*.h
+	doins "${S}"/release/plugins/include/*.h
 
 	if use nls ; then
-		mv ${WORKDIR}/install/linux2/.blender/{.Blanguages,.bfont.ttf} \
-			${D}/usr/share/${PN}
-		mv ${WORKDIR}/install/linux2/.blender/locale \
-			${D}/usr/share/locale
+		mv "${WORKDIR}"/install/linux2/.blender/{.Blanguages,.bfont.ttf} \
+			"${D}"/usr/share/${PN}
+		mv "${WORKDIR}"/install/linux2/.blender/locale \
+			"${D}"/usr/share/locale
 	fi
 
-	mv ${WORKDIR}/install/linux2/.blender/scripts ${D}/usr/share/${PN}
+	mv "${WORKDIR}"/install/linux2/.blender/scripts "${D}"/usr/share/${PN}
 
 	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/${PN}.png
+	doins "${FILESDIR}"/${PN}.png
 	insinto /usr/share/applications
-	doins ${FILESDIR}/${PN}.desktop
+	doins "${FILESDIR}"/${PN}.desktop
 
-	dodoc COPYING INSTALL README
+	dodoc INSTALL README
 }
 
 pkg_preinst(){
 	if [ -h "${ROOT}/usr/$(get_libdir)/blender/plugins/include" ];
 	then
-		rm -f ${ROOT}/usr/$(get_libdir)/blender/plugins/include
+		rm -f "${ROOT}"/usr/$(get_libdir)/blender/plugins/include
 	fi
 }