QA: Remove an old versions and fix variable quoting in the rest. I feel an autumn cleaning coming in these ancient versions..

Package-Manager: portage-2.1.3.19

11 files changed, 85 insertions, 150 deletions

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index f7a03cbc91da..68fecc19f2e4 100644
--- a/x11-libs/pango/ChangeLog
+++ b/x11-libs/pango/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/pango
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.194 2007/11/12 22:17:35 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.195 2007/11/13 02:59:02 leio Exp $
+
+  13 Nov 2007; Mart Raudsepp <leio@gentoo.org> pango-1.8.1-r1.ebuild,
+  pango-1.10.3.ebuild, pango-1.10.4.ebuild, pango-1.12.3.ebuild,
+  pango-1.14.10.ebuild, pango-1.16.4.ebuild, pango-1.16.5.ebuild,
+  -pango-1.18.2.ebuild:
+  QA: Remove an old versions and fix variable quoting in the rest
 
   12 Nov 2007; Samuli Suominen <drac@gentoo.org> pango-1.18.3.ebuild:
   amd64 stable wrt #198845
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 53fd631cd136..82337b10e689 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX pango-1.0.99.020606-xfonts.patch 4560 RMD160 31e9407bce8f29055bf4ddb2631bf8bff1f87073 SHA1 7a4a599afafef07743a59df982ce9fb8eac10ad1 SHA256 b7590b71869223d7c0ac3952fa4c406601bef7b5927d073bef26a38916938bb8
 MD5 54a56a572951b08340d08e10e4d93414 files/pango-1.0.99.020606-xfonts.patch 4560
 RMD160 31e9407bce8f29055bf4ddb2631bf8bff1f87073 files/pango-1.0.99.020606-xfonts.patch 4560
@@ -28,49 +31,44 @@ DIST pango-1.12.3.tar.bz2 1226579 RMD160 7692828276e9b5a54b0b8c32fa07d7db6ac45be
 DIST pango-1.14.10.tar.bz2 1294138 RMD160 0cddfd439415965ba39ce2915ac2adf3aa563498 SHA1 49093dcbbb2399ac6e4731930d4be4edd64f25f7 SHA256 1c53eb4a430c2311b75d6bedef87e452fa3cfea3c51a23a2e898f95e868bc503
 DIST pango-1.16.4.tar.bz2 1355938 RMD160 377bc9f6e253db899d3eb31d31a9e0d0ba586ba7 SHA1 6a21126632ed99950818c64d8598b6e92fa7da58 SHA256 1bdef802f138fabdaea10b97a4a86060a4aac63db970ea3aa1df697b33954ffc
 DIST pango-1.16.5.tar.bz2 1345977 RMD160 98f38b2f8062e8f11e95a22824fa8c89664ffbb3 SHA1 a23899b16a95294dfa739825c81f3858787127e8 SHA256 78ffda1dd67b16c6f558c918d2473de284091bfab075777a4f81e33752bc444d
-DIST pango-1.18.2.tar.bz2 1392725 RMD160 59a097cdb7d90cfc9ed458de3ac2c9fbcf10bded SHA1 f7ba4ff89e05c5659c17dc4225c1a67772a788da SHA256 78a0fd6e4b63aa7c3bb26f1045d8f36ee3b3f840d3b3f2d006483863c7369e32
 DIST pango-1.18.3.tar.bz2 1394980 RMD160 f57f92e81ba279bb1bb456e0d6075d3b4bf0e3d3 SHA1 b7b9e8dee0111dc877ceec33b8a47e17d3466ce7 SHA256 a1547a88ba9330956ce9f2f9e2ab74491e7344cc25fee4310b7f72c7e5f38db3
 DIST pango-1.8.1.tar.bz2 996389 RMD160 a65832954fa495fdb1f72076f15d61116ebd91ed SHA1 46d6992cd5782a3ca7623f0d91f31b6bdffb0346 SHA256 5ec72e325964a29346cd71ecc4d69d42dce33d5ddbd8f74d2c8b35e39234a085
-EBUILD pango-1.10.3.ebuild 2004 RMD160 7d05b9dde65e81629c465dbae7f2b0f6485372fe SHA1 c10c268124de4dd5f099bd64acbbeea85f4edc95 SHA256 8162d5cb4cd6afb6778b67e369095ffed9d7c2ea41dedcead1ce7b853055c420
-MD5 77ebb89013e82c1c466c2f06dcf965a1 pango-1.10.3.ebuild 2004
-RMD160 7d05b9dde65e81629c465dbae7f2b0f6485372fe pango-1.10.3.ebuild 2004
-SHA256 8162d5cb4cd6afb6778b67e369095ffed9d7c2ea41dedcead1ce7b853055c420 pango-1.10.3.ebuild 2004
-EBUILD pango-1.10.4.ebuild 2011 RMD160 49b56a151b3f4a1c061033e48352bb1ad0d20cc0 SHA1 23621cdb657d01ada57aa3d80c583e496b51c604 SHA256 f03e9aafa041da58874d2875bdcb7c9e9b94d5120b353bbaa86cb2211ee61b64
-MD5 add9388bffc06ca4fc9947cf22c94f8e pango-1.10.4.ebuild 2011
-RMD160 49b56a151b3f4a1c061033e48352bb1ad0d20cc0 pango-1.10.4.ebuild 2011
-SHA256 f03e9aafa041da58874d2875bdcb7c9e9b94d5120b353bbaa86cb2211ee61b64 pango-1.10.4.ebuild 2011
-EBUILD pango-1.12.3.ebuild 1841 RMD160 f608b95b4ce0770bd21c035763b323c262cc8b9c SHA1 f560ab8e6faff2df69d5079aa3c348a5b7be5003 SHA256 b23e17fda2937dc18b332590886567255ea0885b989e4912f00ce7c46678939b
-MD5 834843908c31a2fc69c1649f769fe495 pango-1.12.3.ebuild 1841
-RMD160 f608b95b4ce0770bd21c035763b323c262cc8b9c pango-1.12.3.ebuild 1841
-SHA256 b23e17fda2937dc18b332590886567255ea0885b989e4912f00ce7c46678939b pango-1.12.3.ebuild 1841
-EBUILD pango-1.14.10.ebuild 1450 RMD160 5dcd7291c8ef6f6a09a1af7378db8f64d13f9bf9 SHA1 650929bea47c3898c73958b06ce720d532db9128 SHA256 7b74f421cf9a576273f01364683e5597d0b06793d3c2097458bcff3394065df1
-MD5 5e7ec32271f22efeef64f53c11b4860b pango-1.14.10.ebuild 1450
-RMD160 5dcd7291c8ef6f6a09a1af7378db8f64d13f9bf9 pango-1.14.10.ebuild 1450
-SHA256 7b74f421cf9a576273f01364683e5597d0b06793d3c2097458bcff3394065df1 pango-1.14.10.ebuild 1450
-EBUILD pango-1.16.4.ebuild 1586 RMD160 f88082e38f4a7bdf5e1208868489392ea7b4319a SHA1 63d75d224e89d41741d36361d455d33997679dae SHA256 0de57989cf4f8f0d0eb4a0131db01633acb4d715f23aad479ab4d75dc9a58f1c
-MD5 63dfb78713eb0d00c9b16e97f574a2b2 pango-1.16.4.ebuild 1586
-RMD160 f88082e38f4a7bdf5e1208868489392ea7b4319a pango-1.16.4.ebuild 1586
-SHA256 0de57989cf4f8f0d0eb4a0131db01633acb4d715f23aad479ab4d75dc9a58f1c pango-1.16.4.ebuild 1586
-EBUILD pango-1.16.5.ebuild 1587 RMD160 b9c188eea94484a1fb5cbe20ad3cf421bd0b344f SHA1 f213717cf87a0738c868e47a9285e2546cf853a9 SHA256 ffce97f494a0fddccb1460d9740a94cca43c8f32d7d270059273fd78b1775964
-MD5 50e16a3acec6aff3c298397a5d06c97f pango-1.16.5.ebuild 1587
-RMD160 b9c188eea94484a1fb5cbe20ad3cf421bd0b344f pango-1.16.5.ebuild 1587
-SHA256 ffce97f494a0fddccb1460d9740a94cca43c8f32d7d270059273fd78b1775964 pango-1.16.5.ebuild 1587
-EBUILD pango-1.18.2.ebuild 1595 RMD160 c1a11111156d2aa9962ee2de7d69821c9a7bf1e1 SHA1 2c96ba043ccb64bc3ff1b7edeb26fd7775e11ee9 SHA256 b074800da3645b293d2803d51216657ecd219e7a1b18211dbdac09b4c3c6fdbe
-MD5 86140e6eee77b33c5a3ddd6228a2e825 pango-1.18.2.ebuild 1595
-RMD160 c1a11111156d2aa9962ee2de7d69821c9a7bf1e1 pango-1.18.2.ebuild 1595
-SHA256 b074800da3645b293d2803d51216657ecd219e7a1b18211dbdac09b4c3c6fdbe pango-1.18.2.ebuild 1595
+EBUILD pango-1.10.3.ebuild 2009 RMD160 30bbef0e39218cce6ffc25e5b86c87d0eceb518b SHA1 550a86fd88940e90a94937ddae523141218dc6be SHA256 6a55316f6a5808b8f2b9915f6b716310a57f165a767c2dd80dcd2a6731f0444f
+MD5 2fd498e28b687491e1f7652e7c2cf542 pango-1.10.3.ebuild 2009
+RMD160 30bbef0e39218cce6ffc25e5b86c87d0eceb518b pango-1.10.3.ebuild 2009
+SHA256 6a55316f6a5808b8f2b9915f6b716310a57f165a767c2dd80dcd2a6731f0444f pango-1.10.3.ebuild 2009
+EBUILD pango-1.10.4.ebuild 2016 RMD160 9e3f59503f956cf4bc511065809747195cba1b50 SHA1 28cfad9bd195a48dcc54c5f28cf69b9096b836a5 SHA256 1d67a2803f4a9db0b2c436612d82a0f497c98514501db9aa774feebafbca6376
+MD5 d1ba2b485531e8860bf914a2d365c1da pango-1.10.4.ebuild 2016
+RMD160 9e3f59503f956cf4bc511065809747195cba1b50 pango-1.10.4.ebuild 2016
+SHA256 1d67a2803f4a9db0b2c436612d82a0f497c98514501db9aa774feebafbca6376 pango-1.10.4.ebuild 2016
+EBUILD pango-1.12.3.ebuild 1846 RMD160 00bbc34a939f66f0c15ea9200c0ed80c67911f05 SHA1 61e86206b940fd4ddb6f0051180c9dbd9fb4c245 SHA256 4ad77c80535ba78a940f3bc8bfd481449a443901eb64030534adbb198ed43898
+MD5 1084c250e4576676de74059907777250 pango-1.12.3.ebuild 1846
+RMD160 00bbc34a939f66f0c15ea9200c0ed80c67911f05 pango-1.12.3.ebuild 1846
+SHA256 4ad77c80535ba78a940f3bc8bfd481449a443901eb64030534adbb198ed43898 pango-1.12.3.ebuild 1846
+EBUILD pango-1.14.10.ebuild 1454 RMD160 24e6ce6ac488d1f6ec716baa92d72023c99521c1 SHA1 95cf1141da319e1f4e05303149ee038daafa3e1b SHA256 5d19e2c261e23cc9073551ccad94b145bcfb83c7116e630b046186b4a8658a78
+MD5 af4b788026529f731465971bc0f06d83 pango-1.14.10.ebuild 1454
+RMD160 24e6ce6ac488d1f6ec716baa92d72023c99521c1 pango-1.14.10.ebuild 1454
+SHA256 5d19e2c261e23cc9073551ccad94b145bcfb83c7116e630b046186b4a8658a78 pango-1.14.10.ebuild 1454
+EBUILD pango-1.16.4.ebuild 1589 RMD160 2aba934dffcb03b441047660cc173dc53916dc45 SHA1 e8018aad1dc174cdacc76ad23932f5ef541a5ee1 SHA256 581d9bede6790080b59fa18570d64a1c009cc655653872818adbc35b0cf6461f
+MD5 e43790feb7592971c68f4c1d692c7ce2 pango-1.16.4.ebuild 1589
+RMD160 2aba934dffcb03b441047660cc173dc53916dc45 pango-1.16.4.ebuild 1589
+SHA256 581d9bede6790080b59fa18570d64a1c009cc655653872818adbc35b0cf6461f pango-1.16.4.ebuild 1589
+EBUILD pango-1.16.5.ebuild 1589 RMD160 c95c901c5c23a43de8a60e779c80be31f092aecb SHA1 6656cd4d3e7a7ac319d7c8ba70ed107f753fd84d SHA256 f9b7c3926e449352d5ff1d402dcf024e15754a8c9634c68c4da3229f2a184729
+MD5 f9243182159541983719a3fc12892272 pango-1.16.5.ebuild 1589
+RMD160 c95c901c5c23a43de8a60e779c80be31f092aecb pango-1.16.5.ebuild 1589
+SHA256 f9b7c3926e449352d5ff1d402dcf024e15754a8c9634c68c4da3229f2a184729 pango-1.16.5.ebuild 1589
 EBUILD pango-1.18.3.ebuild 1598 RMD160 98f71d645bef145385f4191f6aecec0d3d4e1623 SHA1 ba83e8d9a0d120c76d60170157a32bc1afcd6ebd SHA256 2f46269fdc3b8c5a6f68c55dcc8e929643e333f16a92ff81301af094e9ad65e2
 MD5 4942243e9b130f0c3a0b0141e41a0b08 pango-1.18.3.ebuild 1598
 RMD160 98f71d645bef145385f4191f6aecec0d3d4e1623 pango-1.18.3.ebuild 1598
 SHA256 2f46269fdc3b8c5a6f68c55dcc8e929643e333f16a92ff81301af094e9ad65e2 pango-1.18.3.ebuild 1598
-EBUILD pango-1.8.1-r1.ebuild 1912 RMD160 6a4b7aa1119649b7f9ca8ad97123bb4b07418023 SHA1 e0ba169483ec91646565328fa268b9e5a57256df SHA256 066782e23569c6e27eadee9e6a6f62e68dfa64591b0458dd004708768f1423c4
-MD5 c368ed4260fee82309fc65fdf0a9eacf pango-1.8.1-r1.ebuild 1912
-RMD160 6a4b7aa1119649b7f9ca8ad97123bb4b07418023 pango-1.8.1-r1.ebuild 1912
-SHA256 066782e23569c6e27eadee9e6a6f62e68dfa64591b0458dd004708768f1423c4 pango-1.8.1-r1.ebuild 1912
-MISC ChangeLog 22744 RMD160 5ee2361cfba9939b7602330c257e61a967752847 SHA1 eb5562f82731de7ec2399db1ae9b37fcfdaa29a7 SHA256 f739db04a9f181ffce2f5fb65503694fd1403e9cd246234e09024ab1fca54f73
-MD5 037edd62151ea5702f5ffbd4dc19785a ChangeLog 22744
-RMD160 5ee2361cfba9939b7602330c257e61a967752847 ChangeLog 22744
-SHA256 f739db04a9f181ffce2f5fb65503694fd1403e9cd246234e09024ab1fca54f73 ChangeLog 22744
+EBUILD pango-1.8.1-r1.ebuild 1921 RMD160 6e9f1ed37400f09d264dea20ddd63fccc7685e9f SHA1 6eb82f113f7dae5ef968dbcbb2e7820e0cbad6a0 SHA256 cff0768bbe8d1309500dafed62946ef91061baffac49d84b075aebf8ed0bf678
+MD5 241109f1e9d22bbc0a0dc25227764c4f pango-1.8.1-r1.ebuild 1921
+RMD160 6e9f1ed37400f09d264dea20ddd63fccc7685e9f pango-1.8.1-r1.ebuild 1921
+SHA256 cff0768bbe8d1309500dafed62946ef91061baffac49d84b075aebf8ed0bf678 pango-1.8.1-r1.ebuild 1921
+MISC ChangeLog 23036 RMD160 3cb7c837b674f38834c1cc88cbcfa9ca3c70010d SHA1 53840ace44e4d94c80c140e89a479540b6d6d2b8 SHA256 de4c983c4d60df8d7bb3efd58e8d451543e378d6eddc128b52c9d37d142e373c
+MD5 460c5ec1e42c4f581c4fb5b10e773fc4 ChangeLog 23036
+RMD160 3cb7c837b674f38834c1cc88cbcfa9ca3c70010d ChangeLog 23036
+SHA256 de4c983c4d60df8d7bb3efd58e8d451543e378d6eddc128b52c9d37d142e373c ChangeLog 23036
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -93,12 +91,16 @@ SHA256 f1d93833fedb6c5149cb4c1fc44e3d505ae295af1e8f96fd81300e746867a3f5 files/di
 MD5 414ebc92c24ef25d468baf2645d0b45c files/digest-pango-1.16.5 244
 RMD160 deff8440622230d38999bccff941f237be0b4191 files/digest-pango-1.16.5 244
 SHA256 c441dfdb05efa7da7e1d19648f93e4a9bcfd413dc17f83282ba262d23ce214ae files/digest-pango-1.16.5 244
-MD5 5c5eced13bf1494612c6f3bb6ab31b37 files/digest-pango-1.18.2 244
-RMD160 3215b434e7aad126b0984dd1dc085f3eb96666b0 files/digest-pango-1.18.2 244
-SHA256 0d1bcdcbe2e6e728b1a9c21085c1bc5521d57f663f28938db54f0fac8823cee1 files/digest-pango-1.18.2 244
 MD5 eccdda9bfb701da0094c18fb58df3284 files/digest-pango-1.18.3 244
 RMD160 bd3af437aaf4d720d36ffe515eb5b941384f6549 files/digest-pango-1.18.3 244
 SHA256 544935095eafcb2142d963ae6787d1a035eb160ffb8f8da041676a9551a64548 files/digest-pango-1.18.3 244
 MD5 37c46502c273a766b78fe061986399f2 files/digest-pango-1.8.1-r1 238
 RMD160 e98af1354b37ef4e32924db03d58d55d67bdc9fb files/digest-pango-1.8.1-r1 238
 SHA256 76a89f7604e3097c63f867f839404ce677ede29010d2957e52ee6f9e06a06741 files/digest-pango-1.8.1-r1 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHORL/keYb6olFHJcRApejAJ9TYBace531dQLmY77mjcT3NI4xPwCgiEEF
+btHZlCOFXO4uO6EoQ41OJfA=
+=2K8q
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/pango/files/digest-pango-1.18.2 b/x11-libs/pango/files/digest-pango-1.18.2
deleted file mode 100644
index 2dbbb6573f3b..000000000000
--- a/x11-libs/pango/files/digest-pango-1.18.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 81efeac639977ed3f56c82f16ee0be74 pango-1.18.2.tar.bz2 1392725
-RMD160 59a097cdb7d90cfc9ed458de3ac2c9fbcf10bded pango-1.18.2.tar.bz2 1392725
-SHA256 78a0fd6e4b63aa7c3bb26f1045d8f36ee3b3f840d3b3f2d006483863c7369e32 pango-1.18.2.tar.bz2 1392725
diff --git a/x11-libs/pango/pango-1.10.3.ebuild b/x11-libs/pango/pango-1.10.3.ebuild
index 48377956a74d..25d7cdcd98f5 100644
--- a/x11-libs/pango/pango-1.10.3.ebuild
+++ b/x11-libs/pango/pango-1.10.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.10.3.ebuild,v 1.13 2007/07/22 03:01:36 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.10.3.ebuild,v 1.14 2007/11/13 02:59:02 leio Exp $
 
 inherit eutils gnome2
 
@@ -43,15 +43,15 @@ src_unpack() {
 	cd "${S}"
 
 	# Some enhancements from Redhat
-	epatch ${FILESDIR}/pango-1.0.99.020606-xfonts.patch
-	epatch ${FILESDIR}/${PN}-1.10.2-slighthint.patch
+	epatch "${FILESDIR}/pango-1.0.99.020606-xfonts.patch"
+	epatch "${FILESDIR}/${PN}-1.10.2-slighthint.patch"
 
 	# make config file location host specific so that a 32bit and 64bit pango
 	# wont fight with each other on a multilib system
-	use amd64 && epatch ${FILESDIR}/pango-1.2.5-lib64.patch
+	use amd64 && epatch "${FILESDIR}/pango-1.2.5-lib64.patch"
 	# and this line is just here to make building emul-linux-x86-gtklibs a bit
 	# easier, so even this should be amd64 specific.
-	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && epatch ${FILESDIR}/pango-1.2.5-lib64.patch
+	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && epatch "${FILESDIR}/pango-1.2.5-lib64.patch"
 
 	epunt_cxx
 }
@@ -60,7 +60,7 @@ src_install() {
 
 	gnome2_src_install
 
-	rm ${D}/etc/pango/pango.modules
+	rm "${D}/etc/pango/pango.modules"
 }
 
 pkg_postinst() {
diff --git a/x11-libs/pango/pango-1.10.4.ebuild b/x11-libs/pango/pango-1.10.4.ebuild
index 1f8d738a0d5f..8bebd663af37 100644
--- a/x11-libs/pango/pango-1.10.4.ebuild
+++ b/x11-libs/pango/pango-1.10.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.10.4.ebuild,v 1.3 2007/07/22 03:01:36 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.10.4.ebuild,v 1.4 2007/11/13 02:59:02 leio Exp $
 
 inherit eutils gnome2
 
@@ -43,16 +43,16 @@ src_unpack() {
 	cd "${S}"
 
 	# Some enhancements from Redhat
-	epatch ${FILESDIR}/pango-1.0.99.020606-xfonts.patch
-	epatch ${FILESDIR}/${PN}-1.10.2-slighthint.patch
+	epatch "${FILESDIR}/pango-1.0.99.020606-xfonts.patch"
+	epatch "${FILESDIR}/${PN}-1.10.2-slighthint.patch"
 
 	# make config file location host specific so that a 32bit and 64bit pango
 	# wont fight with each other on a multilib system
-	use amd64 && epatch ${FILESDIR}/pango-1.2.5-lib64.patch
+	use amd64 && epatch "${FILESDIR}/pango-1.2.5-lib64.patch"
 
 	# and this line is just here to make building emul-linux-x86-gtklibs a bit
 	# easier, so even this should be amd64 specific.
-	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && epatch ${FILESDIR}/pango-1.2.5-lib64.patch
+	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && epatch "${FILESDIR}/pango-1.2.5-lib64.patch"
 
 	epunt_cxx
 }
@@ -61,7 +61,7 @@ src_install() {
 
 	gnome2_src_install
 
-	rm ${D}/etc/pango/pango.modules
+	rm "${D}/etc/pango/pango.modules"
 }
 
 pkg_postinst() {
diff --git a/x11-libs/pango/pango-1.12.3.ebuild b/x11-libs/pango/pango-1.12.3.ebuild
index 5d724f3c9496..03128e972170 100644
--- a/x11-libs/pango/pango-1.12.3.ebuild
+++ b/x11-libs/pango/pango-1.12.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.12.3.ebuild,v 1.12 2007/07/22 03:02:37 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.12.3.ebuild,v 1.13 2007/11/13 02:59:02 leio Exp $
 
 inherit eutils gnome2
 
@@ -37,15 +37,15 @@ src_unpack() {
 
 	# Some enhancements from Redhat
 	# These NEED to go upstream.
-	epatch ${FILESDIR}/pango-1.11.3-xfonts.patch
-	epatch ${FILESDIR}/${PN}-1.10.2-slighthint.patch
+	epatch "${FILESDIR}/pango-1.11.3-xfonts.patch"
+	epatch "${FILESDIR}/${PN}-1.10.2-slighthint.patch"
 
 	# make config file location host specific so that a 32bit and 64bit pango
 	# wont fight with each other on a multilib system
-	use amd64 && epatch ${FILESDIR}/pango-1.2.5-lib64.patch
+	use amd64 && epatch "${FILESDIR}/pango-1.2.5-lib64.patch"
 	# and this line is just here to make building emul-linux-x86-gtklibs a bit
 	# easier, so even this should be amd64 specific.
-	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && epatch ${FILESDIR}/pango-1.2.5-lib64.patch
+	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && epatch "${FILESDIR}/pango-1.2.5-lib64.patch"
 
 	epunt_cxx
 }
@@ -54,7 +54,7 @@ src_install() {
 
 	gnome2_src_install
 
-	rm ${D}/etc/pango/pango.modules
+	rm "${D}/etc/pango/pango.modules"
 }
 
 pkg_postinst() {
diff --git a/x11-libs/pango/pango-1.14.10.ebuild b/x11-libs/pango/pango-1.14.10.ebuild
index 30119e5763f3..bdd9f3c0e9a5 100644
--- a/x11-libs/pango/pango-1.14.10.ebuild
+++ b/x11-libs/pango/pango-1.14.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.14.10.ebuild,v 1.11 2007/06/24 22:41:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.14.10.ebuild,v 1.12 2007/11/13 02:59:02 leio Exp $
 
 inherit eutils gnome2
 
@@ -34,12 +34,12 @@ src_unpack() {
 
 	# Some enhancements from Redhat
 	# These NEED to go upstream.
-	epatch ${FILESDIR}/pango-1.11.3-xfonts.patch
-	epatch ${FILESDIR}/${PN}-1.10.2-slighthint.patch
+	epatch "${FILESDIR}/pango-1.11.3-xfonts.patch"
+	epatch "${FILESDIR}/${PN}-1.10.2-slighthint.patch"
 
 	# make config file location host specific so that a 32bit and 64bit pango
 	# wont fight with each other on a multilib system
-	use amd64 && epatch ${FILESDIR}/pango-1.2.5-lib64.patch
+	use amd64 && epatch "${FILESDIR}/pango-1.2.5-lib64.patch"
 
 	epunt_cxx
 }
diff --git a/x11-libs/pango/pango-1.16.4.ebuild b/x11-libs/pango/pango-1.16.4.ebuild
index f921be3deca9..4cd19cde5a7c 100644
--- a/x11-libs/pango/pango-1.16.4.ebuild
+++ b/x11-libs/pango/pango-1.16.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.16.4.ebuild,v 1.9 2007/08/25 13:58:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.16.4.ebuild,v 1.10 2007/11/13 02:59:02 leio Exp $
 
 inherit eutils gnome2 multilib
 
@@ -40,7 +40,7 @@ src_unpack() {
 	# wont fight with each other on a multilib system.  Fix building for
 	# emul-linux-x86-gtklibs
 	if multilib_enabled ; then
-		epatch ${FILESDIR}/${PN}-1.2.5-lib64.patch
+		epatch "${FILESDIR}/${PN}-1.2.5-lib64.patch"
 	fi
 
 	epunt_cxx
@@ -48,7 +48,7 @@ src_unpack() {
 
 src_install() {
 	gnome2_src_install
-	rm ${D}/etc/pango/pango.modules
+	rm "${D}/etc/pango/pango.modules"
 }
 
 pkg_postinst() {
diff --git a/x11-libs/pango/pango-1.16.5.ebuild b/x11-libs/pango/pango-1.16.5.ebuild
index 964511d6c223..12e79b0c5b88 100644
--- a/x11-libs/pango/pango-1.16.5.ebuild
+++ b/x11-libs/pango/pango-1.16.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.16.5.ebuild,v 1.8 2007/09/21 01:42:30 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.16.5.ebuild,v 1.9 2007/11/13 02:59:02 leio Exp $
 
 inherit eutils gnome2 multilib
 
@@ -40,7 +40,7 @@ src_unpack() {
 	# wont fight with each other on a multilib system.  Fix building for
 	# emul-linux-x86-gtklibs
 	if multilib_enabled ; then
-		epatch ${FILESDIR}/${PN}-1.2.5-lib64.patch
+		epatch "${FILESDIR}/${PN}-1.2.5-lib64.patch"
 	fi
 
 	epunt_cxx
@@ -48,7 +48,7 @@ src_unpack() {
 
 src_install() {
 	gnome2_src_install
-	rm ${D}/etc/pango/pango.modules
+	rm "${D}/etc/pango/pango.modules"
 }
 
 pkg_postinst() {
diff --git a/x11-libs/pango/pango-1.18.2.ebuild b/x11-libs/pango/pango-1.18.2.ebuild
deleted file mode 100644
index 5a0021ad7473..000000000000
--- a/x11-libs/pango/pango-1.18.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.18.2.ebuild,v 1.3 2007/09/22 10:10:23 leio Exp $
-
-inherit eutils gnome2 multilib
-
-DESCRIPTION="Text rendering and layout library"
-HOMEPAGE="http://www.pango.org/"
-
-LICENSE="LGPL-2 FTL"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND="x11-libs/libXrender
-	x11-libs/libX11
-	x11-libs/libXft
-	>=dev-libs/glib-2.14
-	>=media-libs/fontconfig-1.0.1
-	>=media-libs/freetype-2
-	>=x11-libs/cairo-1.2.6"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	x11-proto/xproto
-	doc? (
-			>=dev-util/gtk-doc-1
-			~app-text/docbook-xml-dtd-4.1.2
-		 )"
-
-DOCS="AUTHORS ChangeLog* NEWS README TODO*"
-
-function multilib_enabled() {
-	has_multilib_profile || ( use x86 && [ "$(get_libdir)" == "lib32" ] )
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# make config file location host specific so that a 32bit and 64bit pango
-	# wont fight with each other on a multilib system.  Fix building for
-	# emul-linux-x86-gtklibs
-	if multilib_enabled ; then
-		epatch ${FILESDIR}/${PN}-1.2.5-lib64.patch
-	fi
-
-	epunt_cxx
-}
-
-src_install() {
-	gnome2_src_install
-	rm ${D}/etc/pango/pango.modules
-}
-
-pkg_postinst() {
-	if [[ "${ROOT}" == "/" ]] ; then
-		einfo "Generating modules listing..."
-
-		local PANGO_CONFDIR=
-
-		if multilib_enabled ; then
-			PANGO_CONFDIR="/etc/pango/${CHOST}"
-		else
-			PANGO_CONFDIR="/etc/pango"
-		fi
-
-		mkdir -p ${PANGO_CONFDIR}
-
-		pango-querymodules > ${PANGO_CONFDIR}/pango.modules
-	fi
-}
diff --git a/x11-libs/pango/pango-1.8.1-r1.ebuild b/x11-libs/pango/pango-1.8.1-r1.ebuild
index 9dfd364eb37c..6d749dd64c0c 100644
--- a/x11-libs/pango/pango-1.8.1-r1.ebuild
+++ b/x11-libs/pango/pango-1.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.8.1-r1.ebuild,v 1.14 2007/07/22 03:01:36 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.8.1-r1.ebuild,v 1.15 2007/11/13 02:59:02 leio Exp $
 
 inherit gnome2 eutils
 
@@ -30,20 +30,20 @@ src_unpack() {
 
 	unpack ${A}
 
-	cd ${S}
+	cd "${S}"
 	# Some enhancements from Redhat
-	epatch ${FILESDIR}/pango-1.0.99.020606-xfonts.patch
-	epatch ${FILESDIR}/${PN}-1.2.2-slighthint.patch
+	epatch "${FILESDIR}/pango-1.0.99.020606-xfonts.patch"
+	epatch "${FILESDIR}/${PN}-1.2.2-slighthint.patch"
 
 	# fix for #84586
-	epatch ${FILESDIR}/pango-1.8.1-fontfix.patch
+	epatch "${FILESDIR}/pango-1.8.1-fontfix.patch"
 
 	# make config file location host specific so that a 32bit and 64bit pango
 	# wont fight with each other on a multilib system
-	use amd64 && epatch ${FILESDIR}/pango-1.2.5-lib64.patch
+	use amd64 && "epatch ${FILESDIR}/pango-1.2.5-lib64.patch"
 	# and this line is just here to make building emul-linux-x86-gtklibs a bit
 	# easier, so even this should be amd64 specific.
-	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && epatch ${FILESDIR}/pango-1.2.5-lib64.patch
+	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && epatch "${FILESDIR}/pango-1.2.5-lib64.patch"
 
 	epunt_cxx
 
@@ -57,7 +57,7 @@ src_install() {
 
 	gnome2_src_install
 
-	rm ${D}/etc/pango/pango.modules
+	rm "${D}/etc/pango/pango.modules"
 }
 
 pkg_postinst() {