use emake instead of plain make; quote a lot of variables

Package-Manager: portage-2.1.3.19

3 files changed, 28 insertions, 24 deletions

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index 41b2728282c4..7fff6ff97a90 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/openmotif
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.146 2008/02/13 08:23:12 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.147 2008/02/13 08:49:02 opfer Exp $
+
+  13 Feb 2008; Christian Faulhammer <opfer@gentoo.org>
+  openmotif-2.3.0.ebuild:
+  use emake instead of plain make; quote a lot of variables
 
   13 Feb 2008; Christian Faulhammer <opfer@gentoo.org>
   openmotif-2.3.0.ebuild:
diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index 1e514c7d99fa..85af373b28a4 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -18,13 +18,13 @@ DIST openmotif-2.2.3-CAN-2004-0914-newer.patch.bz2 11986 RMD160 f04ccc46b82782d5
 DIST openmotif-2.3.0-manual.pdf.tgz 4195259 RMD160 45b1a17a653b01ccf0324e0bc70fd1ef5db5a395 SHA1 1d0f55928ad65ee321564ba962b1608cfd83bb96 SHA256 49692fd4d5441d2dbb5ca36199b209c8503452fda9b36e929d1aa3673bffaecb
 DIST openmotif-2.3.0.tar.gz 5661471 RMD160 317c8d13d59c6fdd4a9f0e3b63000695f6677b6c SHA1 efb5f5fdc4cc43ef6065594f4ebe98953b7af15e SHA256 81d63e4145fab729621cba38bb0e88fccfbcbb5918473319e9b01a6fbe909544
 EBUILD openmotif-2.2.3-r9.ebuild 3665 RMD160 ff360947f706ae39ef3324a839427c9763700621 SHA1 5135beaf45008d74e937dbc133e3cd5a279fcfd3 SHA256 39e9f2336b0a0469108757436a5bd6dcc88cd0f28912009b75831f84c3a14b1a
-EBUILD openmotif-2.3.0.ebuild 3215 RMD160 1a2d388105cefd7538b5a301505990d1ca881645 SHA1 18efcbb1b73c28f4fdb2fa865cc885dfb77b72df SHA256 e3a7979d6a0b6cf9fbb1ccc0fcaf19b3845648d2374fa337551882414f498195
-MISC ChangeLog 22813 RMD160 cc7310c22a52846647473b58c6cd61ff607c5359 SHA1 39567e998fb9a52d6959ce765e3a31a57072027d SHA256 d89509e52385a8e81425cbeb05758b9c5371e313197f44997242f93ebc7b0741
+EBUILD openmotif-2.3.0.ebuild 3247 RMD160 f139bf22eb22eab1e4438330afaa49eaf17d6c6a SHA1 d923882a9da31919dee8ac50d572e09443a7d2d5 SHA256 8834fd155d57539ee38ab26fbfe8329e841e10e09cb10d70823f4779d5be20a7
+MISC ChangeLog 22955 RMD160 55a58fc794717d638509f2f11d0d2e0d81f8a776 SHA1 fa8a6ab36c71563faac90685a25f65f63d334f84 SHA256 c4e1afd569d9dda062d468a13f00830a9dce8d4c829f132d4d3b76fc8e0941d1
 MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHsqlJNQqtfCuFneMRAmrVAJ0X3F6A+ZH+cCethFmwMLbcsvNFegCfT1US
-SfXmTjDqhGp9QRQHyGK4yXI=
-=HPpp
+iD8DBQFHsq9jNQqtfCuFneMRAkm4AJwIs8Uf8FVtfOpdkEY7+EedB6muEwCeIm5F
+C1wUR+97S5U4/jX0MoTFqjM=
+=jwRA
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/openmotif/openmotif-2.3.0.ebuild b/x11-libs/openmotif/openmotif-2.3.0.ebuild
index 34b7c3de4258..962b23684596 100644
--- a/x11-libs/openmotif/openmotif-2.3.0.ebuild
+++ b/x11-libs/openmotif/openmotif-2.3.0.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/x11-libs/openmotif/openmotif-2.3.0.ebuild,v 1.9 2008/02/13 08:23:12 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0.ebuild,v 1.10 2008/02/13 08:49:02 opfer Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="1.6"
@@ -47,7 +47,7 @@ src_compile() {
 	append-flags -fno-strict-aliasing
 
 	econf --with-x \
-	    $(use_enable xft) \
+		$(use_enable xft) \
 		$(use_enable jpeg) \
 		$(use_enable png) || die "configuration failed"
 
@@ -55,12 +55,12 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
+	emake DESTDIR="${D}" install || die "make install failed"
 
 	# cleanups
-	rm -fR ${D}/usr/$(get_libdir)/X11
-	rm -fR ${D}/usr/$(get_libdir)/X11/bindings
-	rm -fR ${D}/usr/include/X11/
+	rm -fR "${D}"/usr/$(get_libdir)/X11
+	rm -fR "${D}"/usr/$(get_libdir)/X11/bindings
+	rm -fR "${D}"/usr/include/X11/
 
 	list="/usr/share/man/man1/mwm.1 /usr/share/man/man4/mwmrc.4"
 	for f in $list; do
@@ -70,47 +70,47 @@ src_install() {
 
 	einfo "Fixing binaries"
 	dodir /usr/$(get_libdir)/openmotif-${SLOT}
-	for file in `ls ${D}/usr/bin`
+	for file in `ls "${D}"/usr/bin`
 	do
-		mv ${D}/usr/bin/${file} ${D}/usr/$(get_libdir)/openmotif-${SLOT}/${file}
+		mv "${D}"/usr/bin/${file} "${D}"/usr/$(get_libdir)/openmotif-${SLOT}/${file}
 	done
 
 	einfo "Fixing libraries"
-	mv ${D}/usr/$(get_libdir)/* ${D}/usr/$(get_libdir)/openmotif-${SLOT}/
+	mv "${D}"/usr/$(get_libdir)/* "${D}"/usr/$(get_libdir)/openmotif-${SLOT}/
 
 	einfo "Fixing includes"
 	dodir /usr/include/openmotif-${SLOT}/
-	mv ${D}/usr/include/* ${D}/usr/include/openmotif-${SLOT}
+	mv "${D}"/usr/include/* "${D}"/usr/include/openmotif-${SLOT}
 
 	einfo "Fixing man pages"
 	mans="1 3 4 5"
 	for man in $mans; do
 		dodir /usr/share/man/man${man}
-		for file in `ls ${D}/usr/share/man/man${man}`
+		for file in `ls "${D}"/usr/share/man/man${man}`
 		do
 			file=${file/.${man}/}
-			mv ${D}/usr/share/man/man$man/${file}.${man} ${D}/usr/share/man/man${man}/${file}-openmotif-${SLOT}.${man}
+			mv "${D}"/usr/share/man/man$man/${file}.${man} "${D}"/usr/share/man/man${man}/${file}-openmotif-${SLOT}.${man}
 		done
 	done
 
 	# install docs
 	dodoc README RELEASE RELNOTES BUGREPORT TODO
 
-	use doc && cp ${WORKDIR}/*.pdf ${D}/usr/share/doc/${PF}
+	use doc && cp "${WORKDIR}"/*.pdf "${D}"/usr/share/doc/${PF}
 
 	if ( use examples )
 	then
-	    dodir /usr/share/doc/${PF}/demos
-	    mv ${D}/usr/share/Xm ${D}/usr/share/doc/${PF}/demos
+		dodir /usr/share/doc/${PF}/demos
+		mv "${D}"/usr/share/Xm "${D}"/usr/share/doc/${PF}/demos
 	else
-	    rm -rf ${D}/usr/share/Xm
+		rm -rf "${D}"/usr/share/Xm
 	fi
 
 	# profile stuff
 	dodir /etc/env.d
-	echo "LDPATH=/usr/$(get_libdir)/openmotif-${SLOT}" > ${D}/etc/env.d/15openmotif-${SLOT}
+	echo "LDPATH=/usr/$(get_libdir)/openmotif-${SLOT}" > "${D}"/etc/env.d/15openmotif-${SLOT}
 	dodir /usr/$(get_libdir)/motif
-	echo "PROFILE=openmotif-${SLOT}" > ${D}/usr/$(get_libdir)/motif/openmotif-${SLOT}
+	echo "PROFILE=openmotif-${SLOT}" > "${D}"/usr/$(get_libdir)/motif/openmotif-${SLOT}
 }
 
 pkg_postinst() {