fix quoting and make 3.2.9 multilib-strict, bug #213747

Package-Manager: portage-2.1.5_rc6

4 files changed, 36 insertions, 17 deletions

diff --git a/dev-python/visual/ChangeLog b/dev-python/visual/ChangeLog
index 6f838d87f80c..968aa4186e24 100644
--- a/dev-python/visual/ChangeLog
+++ b/dev-python/visual/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/visual
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/visual/ChangeLog,v 1.17 2007/12/25 16:12:53 phreak Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/visual/ChangeLog,v 1.18 2008/05/01 14:18:31 maekke Exp $
+
+  01 May 2008; Markus Meier <maekke@gentoo.org> visual-3.2.9.ebuild,
+  visual-4_beta0.ebuild:
+  fix quoting and make 3.2.9 multilib-strict, bug #213747
 
   25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing tercel from metadata.xml as per #88960.
diff --git a/dev-python/visual/Manifest b/dev-python/visual/Manifest
index fd2401ef2795..27c4e2e2642b 100644
--- a/dev-python/visual/Manifest
+++ b/dev-python/visual/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST visual-3.2.9.tar.bz2 419962 RMD160 49cfd441577c2a49dda1cd48b55b5e72e0968c27 SHA1 d64f32ffacc75a59e7703d2c51bd93b842038421 SHA256 613df56208b668f7ebe9fbebc862d5684883ab27658fb8a89c8c05d5e1720f49
 DIST visual-4.beta0.tar.bz2 5387905 RMD160 20b07fd806c6d39a8090e68274f135f2c9fb93c4 SHA1 74786cc572d66ae53d95294af6f7b3f0a4af88d8 SHA256 97010907917651169769f36dc16a09484977047f6c4c69e25e439233e18060c4
-EBUILD visual-3.2.9.ebuild 1788 RMD160 07bdc8533f841fa2653788c3cf24bbfdc37e36e6 SHA1 270e0e4b4a4125d7d4f32d3236d12c8cc6d8dcb5 SHA256 3fc8acec32fa8a3013391debe9d99377a6528bf5976e4f1b61b84fa05688d91b
-EBUILD visual-4_beta0.ebuild 1908 RMD160 2613300c551655076de4b77dd122f742959f827b SHA1 14c338df95bc1d3e8ed228525c9d1168a671bd27 SHA256 ae1c2941b21b7cbde9517850e3b4ae9be90488afe2be4549b67e0fe7587f2279
-MISC ChangeLog 2288 RMD160 e9717088545e243d1b0b927f865394cee8cc2747 SHA1 00641d32ed07aebb2685225ea617797871453e7c SHA256 27022d4237524f86cdc20068f75293eb5e5d0ad1d47378c9d825da46b4755aa4
+EBUILD visual-3.2.9.ebuild 1959 RMD160 96779a489dcd582b4130bbe3e8960458747a1831 SHA1 be9c9ec1d3545e7ba76745a8fa51ff365991bf25 SHA256 64724bf4d335fec1d3c5be106830af69c64fae341b44932af4ea424145cae4ec
+EBUILD visual-4_beta0.ebuild 1914 RMD160 ddc446c396ba24f70ea6b05cfc6ab69e0a907f2f SHA1 0f3cef34cd571702aecf7cb0281116b98339dbcb SHA256 7b744155f4824af309d36dca4d639173c737fc18988d1bebc7c66bc519103cb2
+MISC ChangeLog 2441 RMD160 a2e516cad9ef13b3d5f9b38abcb34df141e26382 SHA1 ab9c3f5469050c3c9b3918bdc8fb1423ef3ccf79 SHA256 254894384eeb1d0e7dbb49db3b9f3b59b917f2cdefb395adf6fa8ac2d4218a35
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgZ0WoACgkQkKaRLQcq0GK29gCgn8tw+Ug+ZyL2HZDJouJ5yEwU
+KpoAn3zHFkuUuGggpgEc9qyH5bYMtYNU
+=8tmd
+-----END PGP SIGNATURE-----
diff --git a/dev-python/visual/visual-3.2.9.ebuild b/dev-python/visual/visual-3.2.9.ebuild
index ccf014f11150..0bdb2a47f151 100644
--- a/dev-python/visual/visual-3.2.9.ebuild
+++ b/dev-python/visual/visual-3.2.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/visual/visual-3.2.9.ebuild,v 1.10 2007/03/05 03:10:14 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/visual/visual-3.2.9.ebuild,v 1.11 2008/05/01 14:18:31 maekke Exp $
 
 inherit distutils multilib
 
@@ -54,13 +54,18 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" install || die "install failed"
 
 	python_version
 
-	mv ${D}/usr/$(get_libdir)/python${PYVER}/site-packages/cvisualmodule* \
-		${D}/usr/$(get_libdir)/python${PYVER}/site-packages/visual
+	mkdir -p "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/visual/
+	mv "${D}"/usr/lib/python${PYVER}/site-packages/ \
+		"${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/visual/
+
+	#the vpython script does not work, and is unnecessary.
+	#Also nuke directories that are empty so we don't have
+	#empty directories hanging around.
+	rm -rf "${D}"/usr/bin/
+	rm -rf "${D}"/usr/lib/
 
-	#the vpython script does not work, and is unnecessary
-	rm ${D}/usr/bin/vpython
 }
diff --git a/dev-python/visual/visual-4_beta0.ebuild b/dev-python/visual/visual-4_beta0.ebuild
index 3c1644304552..a77a639e6913 100644
--- a/dev-python/visual/visual-4_beta0.ebuild
+++ b/dev-python/visual/visual-4_beta0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/visual/visual-4_beta0.ebuild,v 1.3 2007/03/05 03:10:14 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/visual/visual-4_beta0.ebuild,v 1.4 2008/05/01 14:18:31 maekke Exp $
 
 inherit distutils versionator multilib
 
@@ -65,9 +65,9 @@ src_install() {
 
 	python_version
 
-	mv ${D}/usr/$(get_libdir)/python${PYVER}/site-packages/cvisualmodule* \
-		${D}/usr/$(get_libdir)/python${PYVER}/site-packages/visual
+	mv "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/cvisualmodule* \
+		"${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/visual
 
 	#the vpython script does not work, and is unnecessary
-	rm ${D}/usr/bin/vpython
+	rm "${D}"/usr/bin/vpython
 }