xml2 use flag changed to xml

Package-Manager: portage-2.1.1_pre2-r2

18 files changed, 200 insertions, 190 deletions

diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index 8c3aae526195..2e821bcde776 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-db/postgresql
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.279 2006/06/05 02:02:51 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.280 2006/07/05 07:45:33 mr_bones_ Exp $
+
+  05 Jul 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  postgresql-7.4.7-r1.ebuild, postgresql-7.4.7-r2.ebuild,
+  postgresql-7.4.8.ebuild, postgresql-7.4.9.ebuild,
+  postgresql-7.4.11.ebuild, postgresql-7.4.12.ebuild,
+  postgresql-7.4.13.ebuild, postgresql-8.0.3.ebuild,
+  postgresql-8.0.4.ebuild, postgresql-8.0.6.ebuild, postgresql-8.0.7.ebuild,
+  postgresql-8.0.8.ebuild, postgresql-8.1.2.ebuild, postgresql-8.1.3.ebuild,
+  postgresql-8.1.3-r1.ebuild, postgresql-8.1.4.ebuild:
+  xml2 use flag changed to xml
 
   04 Jun 2006; Thomas Cort <tcort@gentoo.org> postgresql-8.0.8.ebuild:
   Stable on amd64 wrt security Bug #134168.
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 58ea7bac59e3..1112bac4c8e5 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -415,74 +415,74 @@ EBUILD postgresql-7.3.9-r1.ebuild 8028 RMD160 a5e1979cdba685ca13614478b689600293
 MD5 2265cba6143f2d8471e41be421367c5b postgresql-7.3.9-r1.ebuild 8028
 RMD160 a5e1979cdba685ca13614478b6896002938095de postgresql-7.3.9-r1.ebuild 8028
 SHA256 d543f41b27f0e710de2ddc9908e1397dadde9c71a47bdf92d2ff1c2d23858d1e postgresql-7.3.9-r1.ebuild 8028
-EBUILD postgresql-7.4.11.ebuild 10687 RMD160 752b62efa4ac88e2e2d9d8b971a9d733c42b1aa5 SHA1 ac9ceefb54cbeea1882931e64d74f92b8702b7f0 SHA256 1bc6c7a8400e867327fecae79f2bdb86e79ae57920d5dfc57671b1d68ab0f73c
-MD5 174099f06ce2e3f4ce99fc7bbb7f3784 postgresql-7.4.11.ebuild 10687
-RMD160 752b62efa4ac88e2e2d9d8b971a9d733c42b1aa5 postgresql-7.4.11.ebuild 10687
-SHA256 1bc6c7a8400e867327fecae79f2bdb86e79ae57920d5dfc57671b1d68ab0f73c postgresql-7.4.11.ebuild 10687
-EBUILD postgresql-7.4.12.ebuild 10685 RMD160 1b6890026b3123eb6dfe2d8a84141782bccdfc9b SHA1 6005fb75c736bfc33579bee508486fab214319f3 SHA256 fc34fe5f638f8434664519bfa791b44beee8b43622f2c038852451e4bdaca662
-MD5 1b78fbc0b3760f106b9243884c02a9d7 postgresql-7.4.12.ebuild 10685
-RMD160 1b6890026b3123eb6dfe2d8a84141782bccdfc9b postgresql-7.4.12.ebuild 10685
-SHA256 fc34fe5f638f8434664519bfa791b44beee8b43622f2c038852451e4bdaca662 postgresql-7.4.12.ebuild 10685
-EBUILD postgresql-7.4.13.ebuild 10795 RMD160 8bdd9c0f5de2ac6a863b610d073ccd3105a0db4e SHA1 b1a25e54782ed737a8d398a3800baba68bdd8e90 SHA256 8524d992d21f25864c6827749188e4b58ba760330a0d78e32ec4c5dfc205982d
-MD5 4022cf1249030683c3ef43ce5b7fe04e postgresql-7.4.13.ebuild 10795
-RMD160 8bdd9c0f5de2ac6a863b610d073ccd3105a0db4e postgresql-7.4.13.ebuild 10795
-SHA256 8524d992d21f25864c6827749188e4b58ba760330a0d78e32ec4c5dfc205982d postgresql-7.4.13.ebuild 10795
-EBUILD postgresql-7.4.7-r1.ebuild 10701 RMD160 8c4784e465c03370b438cfdd672ec62f5559cec4 SHA1 c688e18adce067eba248d32444b0ada751adc006 SHA256 0c7f69322a86dd7bb9061d8fa48966dadce3efba33841d57cdb453a0906b6b09
-MD5 993f8413e91946fb334582c36b39afcb postgresql-7.4.7-r1.ebuild 10701
-RMD160 8c4784e465c03370b438cfdd672ec62f5559cec4 postgresql-7.4.7-r1.ebuild 10701
-SHA256 0c7f69322a86dd7bb9061d8fa48966dadce3efba33841d57cdb453a0906b6b09 postgresql-7.4.7-r1.ebuild 10701
-EBUILD postgresql-7.4.7-r2.ebuild 10855 RMD160 79a84d68e5b252ff6cd20857f62f5f1eb75250e4 SHA1 df685b84c981b3c186d529e0daa47c5faf71a7d1 SHA256 e778b10eeda9bfa6ac4e653ddbba75020e83bf7eb1376efd699e71fbd3de09a4
-MD5 481cefe9ed2cc621fe58174c1a7514f9 postgresql-7.4.7-r2.ebuild 10855
-RMD160 79a84d68e5b252ff6cd20857f62f5f1eb75250e4 postgresql-7.4.7-r2.ebuild 10855
-SHA256 e778b10eeda9bfa6ac4e653ddbba75020e83bf7eb1376efd699e71fbd3de09a4 postgresql-7.4.7-r2.ebuild 10855
-EBUILD postgresql-7.4.8.ebuild 10572 RMD160 cfba95b77edf37f5253a0080aefc0a4e4751119c SHA1 529bc24735e89152a24e8ccf75cef5137f8ffc09 SHA256 50dc09757503960df1c8bb83b60a9c4d07c896f4b3aca4a3f37f25ea057cd834
-MD5 0fb1a242fabdc15f2e68fa013c5c1292 postgresql-7.4.8.ebuild 10572
-RMD160 cfba95b77edf37f5253a0080aefc0a4e4751119c postgresql-7.4.8.ebuild 10572
-SHA256 50dc09757503960df1c8bb83b60a9c4d07c896f4b3aca4a3f37f25ea057cd834 postgresql-7.4.8.ebuild 10572
-EBUILD postgresql-7.4.9.ebuild 10737 RMD160 57f45783f266d63adc3d5a3bb60b4ca20b4b3f2a SHA1 b61b8adeea37694ed23b5369bf3dd8f676e28792 SHA256 96c36f753f1a89a767895524428acacb4c1b1d16532053395a4afb2664460090
-MD5 43b0a35534f69c6cd0148b09ee16cc66 postgresql-7.4.9.ebuild 10737
-RMD160 57f45783f266d63adc3d5a3bb60b4ca20b4b3f2a postgresql-7.4.9.ebuild 10737
-SHA256 96c36f753f1a89a767895524428acacb4c1b1d16532053395a4afb2664460090 postgresql-7.4.9.ebuild 10737
-EBUILD postgresql-8.0.3.ebuild 7510 RMD160 07ed32d47feaae645dc3e7de800984871781ac96 SHA1 46f7ad3d91d7263ca8decb44d70d151d2fefe9f6 SHA256 9255efa00c6ab0d1e9e47276bab3b3c8475218a3bef2f87bec83cde61219ea15
-MD5 0ab1b6f2bce8c619c7824a648f44667b postgresql-8.0.3.ebuild 7510
-RMD160 07ed32d47feaae645dc3e7de800984871781ac96 postgresql-8.0.3.ebuild 7510
-SHA256 9255efa00c6ab0d1e9e47276bab3b3c8475218a3bef2f87bec83cde61219ea15 postgresql-8.0.3.ebuild 7510
-EBUILD postgresql-8.0.4.ebuild 7681 RMD160 12dd56cf8ad6f5f0eec0e56f0ea46edfa7b8070c SHA1 5fb7ed5214497398bce30f2019aeb3ef206d5910 SHA256 30ba21d0734e72be9ddd43467f9640f18393e19a768e9c49fd47e8bc2c2d415b
-MD5 d358a0783c2e02f6cbb3ca0095500feb postgresql-8.0.4.ebuild 7681
-RMD160 12dd56cf8ad6f5f0eec0e56f0ea46edfa7b8070c postgresql-8.0.4.ebuild 7681
-SHA256 30ba21d0734e72be9ddd43467f9640f18393e19a768e9c49fd47e8bc2c2d415b postgresql-8.0.4.ebuild 7681
-EBUILD postgresql-8.0.6.ebuild 7633 RMD160 d06557907abad6054b72d848722b3dc3863e3595 SHA1 cfe6c95288606625018cf1ffaca9f818fe66d8b8 SHA256 10c025959b1cb777a1ac15f9749ad6976f1e0010579d4ad4385c8ce9a64d8316
-MD5 1d94143a495b0a564206f995b4c58030 postgresql-8.0.6.ebuild 7633
-RMD160 d06557907abad6054b72d848722b3dc3863e3595 postgresql-8.0.6.ebuild 7633
-SHA256 10c025959b1cb777a1ac15f9749ad6976f1e0010579d4ad4385c8ce9a64d8316 postgresql-8.0.6.ebuild 7633
-EBUILD postgresql-8.0.7.ebuild 7633 RMD160 a16394b52a616c7761fe21050a900439d5530cd7 SHA1 64e6501971d797de82e3d392e861826ad39ddb9c SHA256 bfffba9660012202be02087a3b19eb3d931fbdc7037a898c335f0e33c00876b0
-MD5 a77e870d2428e0af09ade20806123374 postgresql-8.0.7.ebuild 7633
-RMD160 a16394b52a616c7761fe21050a900439d5530cd7 postgresql-8.0.7.ebuild 7633
-SHA256 bfffba9660012202be02087a3b19eb3d931fbdc7037a898c335f0e33c00876b0 postgresql-8.0.7.ebuild 7633
-EBUILD postgresql-8.0.8.ebuild 7710 RMD160 0821f65492dc02cacb8e1baa41157d3bf5d78a23 SHA1 0dd5a0f0a453ca420f64bd8cdff774ae22dbb854 SHA256 34ecf00f46dfdb6c27f61814baa85aa6561209dd9cf9402e7d50ef3740b54e50
-MD5 e33906d17d222fcac10739f76b8f7ae3 postgresql-8.0.8.ebuild 7710
-RMD160 0821f65492dc02cacb8e1baa41157d3bf5d78a23 postgresql-8.0.8.ebuild 7710
-SHA256 34ecf00f46dfdb6c27f61814baa85aa6561209dd9cf9402e7d50ef3740b54e50 postgresql-8.0.8.ebuild 7710
-EBUILD postgresql-8.1.2.ebuild 7570 RMD160 ab17d698f35014c86b826f869ebb51a5054a220a SHA1 4eb0626e643e16b185bbcf38faeb289e3eaa1565 SHA256 93e9655115ab5d87b9f3f99574bd8fba900510be7bdc6af15bd941c5654a53dc
-MD5 80a1a1d30549701a852fab63217c0c4f postgresql-8.1.2.ebuild 7570
-RMD160 ab17d698f35014c86b826f869ebb51a5054a220a postgresql-8.1.2.ebuild 7570
-SHA256 93e9655115ab5d87b9f3f99574bd8fba900510be7bdc6af15bd941c5654a53dc postgresql-8.1.2.ebuild 7570
-EBUILD postgresql-8.1.3-r1.ebuild 7778 RMD160 bf2cdde5b4237b986feb0b97705807de3bcf6349 SHA1 a812d2d3e3caae665158681dbcff539476bdea1a SHA256 3146a1ccd7ac7e7d6cb7719ab8773b79bee390f88e1b808307560243f664462f
-MD5 7fec90afadae7dce9a7bb789e5643e39 postgresql-8.1.3-r1.ebuild 7778
-RMD160 bf2cdde5b4237b986feb0b97705807de3bcf6349 postgresql-8.1.3-r1.ebuild 7778
-SHA256 3146a1ccd7ac7e7d6cb7719ab8773b79bee390f88e1b808307560243f664462f postgresql-8.1.3-r1.ebuild 7778
-EBUILD postgresql-8.1.3.ebuild 7569 RMD160 2b7dc463fa94c08983449563589582c44e0db5df SHA1 31ee1652f9406d987b72fddc92bfe033d3acf9b2 SHA256 6cd7d1f69ece18814cd38965f98f9d9ecc7b07e5287702e0aeb9082aa229011e
-MD5 adbf7d75f449d28959ef3fe8d09870ff postgresql-8.1.3.ebuild 7569
-RMD160 2b7dc463fa94c08983449563589582c44e0db5df postgresql-8.1.3.ebuild 7569
-SHA256 6cd7d1f69ece18814cd38965f98f9d9ecc7b07e5287702e0aeb9082aa229011e postgresql-8.1.3.ebuild 7569
-EBUILD postgresql-8.1.4.ebuild 7846 RMD160 b4f9f1877abfdda8c833622880abad66751ae4fd SHA1 80ed7edba4d4d1be150ddaa81eeb59ce204f7a47 SHA256 4beeec8e8946c90577a2bf7b3f2afaac34e95003e88c430d3db1268fd29b99a3
-MD5 2c4304f4de3d5427e9c8c553e6a00d55 postgresql-8.1.4.ebuild 7846
-RMD160 b4f9f1877abfdda8c833622880abad66751ae4fd postgresql-8.1.4.ebuild 7846
-SHA256 4beeec8e8946c90577a2bf7b3f2afaac34e95003e88c430d3db1268fd29b99a3 postgresql-8.1.4.ebuild 7846
-MISC ChangeLog 55971 RMD160 2b101635a141bda424d18a1afcdc72814f8d26d7 SHA1 88d0619cae2d6d38d9d9b2cee697500ffe62d18b SHA256 bb3765fbc2b4b0e13399acbdf28d0ba90e03ae6ee3663ae1bf5141092e95e9bc
-MD5 8db72060dcb133fc8fc92a9ac6f59ddf ChangeLog 55971
-RMD160 2b101635a141bda424d18a1afcdc72814f8d26d7 ChangeLog 55971
-SHA256 bb3765fbc2b4b0e13399acbdf28d0ba90e03ae6ee3663ae1bf5141092e95e9bc ChangeLog 55971
+EBUILD postgresql-7.4.11.ebuild 10683 RMD160 d675e90638ed978041e0ff34dcfce8493393bd16 SHA1 701c11a3bb8bb4a5438a50304550cdb7578a69ea SHA256 3a6d5f836b4bdabb137783a5cccd6fe33e2cbadc7b135be1f5f363b649731cf2
+MD5 e84e567c42464928f9a2e13a1a3a2fc5 postgresql-7.4.11.ebuild 10683
+RMD160 d675e90638ed978041e0ff34dcfce8493393bd16 postgresql-7.4.11.ebuild 10683
+SHA256 3a6d5f836b4bdabb137783a5cccd6fe33e2cbadc7b135be1f5f363b649731cf2 postgresql-7.4.11.ebuild 10683
+EBUILD postgresql-7.4.12.ebuild 10682 RMD160 ee62134021f1bec0b10c39bf90b6a48756e966f1 SHA1 0a3dbf66fc6ad9f27a89073a7cbb207fbc9991b3 SHA256 a05a8929ff90f8de16cbe61a5bc1f6697e0ae5ef20dd6890d8d1fa358feff91a
+MD5 ae5cbc648eeedd7d1619505850f951ef postgresql-7.4.12.ebuild 10682
+RMD160 ee62134021f1bec0b10c39bf90b6a48756e966f1 postgresql-7.4.12.ebuild 10682
+SHA256 a05a8929ff90f8de16cbe61a5bc1f6697e0ae5ef20dd6890d8d1fa358feff91a postgresql-7.4.12.ebuild 10682
+EBUILD postgresql-7.4.13.ebuild 10792 RMD160 e2090f7c27e0aa888e888f7dfab624727b30bf86 SHA1 f93727377e0a2f2b7226bdde0e24777b9ed06ca3 SHA256 5259ffb9509749979c840f59f43015b65dddfb0886a30d06668cde492ddc04ca
+MD5 02c8ab93310e56a8989b3e8f07307706 postgresql-7.4.13.ebuild 10792
+RMD160 e2090f7c27e0aa888e888f7dfab624727b30bf86 postgresql-7.4.13.ebuild 10792
+SHA256 5259ffb9509749979c840f59f43015b65dddfb0886a30d06668cde492ddc04ca postgresql-7.4.13.ebuild 10792
+EBUILD postgresql-7.4.7-r1.ebuild 10697 RMD160 5024c13654f438461bd821f7b619110af86faf3f SHA1 36af06a952acc75e4348db4efd82d7197b7f63cd SHA256 290ff1a0a6979911056baf60f3ddf8968a3ac003d17084dff8650334fb45c889
+MD5 50900a8ff785c9f6ca5d8ebc64ca937d postgresql-7.4.7-r1.ebuild 10697
+RMD160 5024c13654f438461bd821f7b619110af86faf3f postgresql-7.4.7-r1.ebuild 10697
+SHA256 290ff1a0a6979911056baf60f3ddf8968a3ac003d17084dff8650334fb45c889 postgresql-7.4.7-r1.ebuild 10697
+EBUILD postgresql-7.4.7-r2.ebuild 10851 RMD160 c5ca1d1bee0d2aa82da189c7a3df6db6d94ed579 SHA1 2effafd8b46e1229fbf0039cb79d980cd914ddaf SHA256 7e77044e4fedd1f3a9de07e1a6517c60e653bc1f550ee80fd24004e9d0a580a3
+MD5 678d215966541a09ed0bf4b5b3584d68 postgresql-7.4.7-r2.ebuild 10851
+RMD160 c5ca1d1bee0d2aa82da189c7a3df6db6d94ed579 postgresql-7.4.7-r2.ebuild 10851
+SHA256 7e77044e4fedd1f3a9de07e1a6517c60e653bc1f550ee80fd24004e9d0a580a3 postgresql-7.4.7-r2.ebuild 10851
+EBUILD postgresql-7.4.8.ebuild 10568 RMD160 50c66d796687ae3163917e2275172fae4fee7415 SHA1 3ea49ff9a3679dfd2118a832337d36bab9c91cb8 SHA256 62ba8a3fc6aed26d0627a862e4cf31ec6e95ab30fbdbc52cdbf2a09b83e8ef40
+MD5 75101fe4aa5308313ce99f4d73b5f0f4 postgresql-7.4.8.ebuild 10568
+RMD160 50c66d796687ae3163917e2275172fae4fee7415 postgresql-7.4.8.ebuild 10568
+SHA256 62ba8a3fc6aed26d0627a862e4cf31ec6e95ab30fbdbc52cdbf2a09b83e8ef40 postgresql-7.4.8.ebuild 10568
+EBUILD postgresql-7.4.9.ebuild 10733 RMD160 b0d57e544f8db1686c6c949c4bc4ec7c6b23fc50 SHA1 1d681af92478263568391b05ca627366bfd7c525 SHA256 55a7aa8033e9b1b41af9830d09a59bee1a9cd3bcb3d584a5ee81784848b1157a
+MD5 b8097ee8dc839a20d353212cef694cc5 postgresql-7.4.9.ebuild 10733
+RMD160 b0d57e544f8db1686c6c949c4bc4ec7c6b23fc50 postgresql-7.4.9.ebuild 10733
+SHA256 55a7aa8033e9b1b41af9830d09a59bee1a9cd3bcb3d584a5ee81784848b1157a postgresql-7.4.9.ebuild 10733
+EBUILD postgresql-8.0.3.ebuild 7508 RMD160 0ef4474f15a3a58a529dc2c660212c38740fe662 SHA1 8a951450beb7873ef782663388998d57bc234676 SHA256 68f07a090fc574fa61297abd4db414ec97859e55661cd3d21d6a722b427a8704
+MD5 30b245b68080012e1a20475195ca8245 postgresql-8.0.3.ebuild 7508
+RMD160 0ef4474f15a3a58a529dc2c660212c38740fe662 postgresql-8.0.3.ebuild 7508
+SHA256 68f07a090fc574fa61297abd4db414ec97859e55661cd3d21d6a722b427a8704 postgresql-8.0.3.ebuild 7508
+EBUILD postgresql-8.0.4.ebuild 7677 RMD160 315c25257fcfeb3c94047f2880931422b7f2be7d SHA1 b57d09b9b89d0ad557992e62fadb627616d82b31 SHA256 9cd72dcfd723eca5fcb0ad81e319c58909e81c40a7afe982f8477649e9ea384d
+MD5 963ede2bcdf44faac02ae373cb9a7881 postgresql-8.0.4.ebuild 7677
+RMD160 315c25257fcfeb3c94047f2880931422b7f2be7d postgresql-8.0.4.ebuild 7677
+SHA256 9cd72dcfd723eca5fcb0ad81e319c58909e81c40a7afe982f8477649e9ea384d postgresql-8.0.4.ebuild 7677
+EBUILD postgresql-8.0.6.ebuild 7631 RMD160 5a726c673036f4ee5bb79e55018f9d46f1ade37d SHA1 162668606555655686ccd0b317c8554057e3880d SHA256 7103b7aa98d5374cad269ad10beb7906cb4c23c381b8b7e91808510709ef4e0e
+MD5 cc7f6f3e18440012c6ef5ac16cd31817 postgresql-8.0.6.ebuild 7631
+RMD160 5a726c673036f4ee5bb79e55018f9d46f1ade37d postgresql-8.0.6.ebuild 7631
+SHA256 7103b7aa98d5374cad269ad10beb7906cb4c23c381b8b7e91808510709ef4e0e postgresql-8.0.6.ebuild 7631
+EBUILD postgresql-8.0.7.ebuild 7629 RMD160 11dcd812530f1460643b6c122db543ca0706af63 SHA1 810d5f35b15988c56f66de57d45f418d6ca62ab2 SHA256 79bdc3229bb2d7a29b4185c689d1a27e958454fa69d81c787db696bf33687c84
+MD5 cc8e82fb13094e91c6ce4b7d9a562f04 postgresql-8.0.7.ebuild 7629
+RMD160 11dcd812530f1460643b6c122db543ca0706af63 postgresql-8.0.7.ebuild 7629
+SHA256 79bdc3229bb2d7a29b4185c689d1a27e958454fa69d81c787db696bf33687c84 postgresql-8.0.7.ebuild 7629
+EBUILD postgresql-8.0.8.ebuild 7709 RMD160 f360a007b4b478e8511e46ec409e0a7d104a4bb7 SHA1 08a180907bc978fc0833e4ee7d3e89ded488def4 SHA256 b8509e0675490a021f5042fd38f7cfaaecfc06756b18bd04cccced36b6d2247d
+MD5 55fa41779b50236f31ec7bfd990d6600 postgresql-8.0.8.ebuild 7709
+RMD160 f360a007b4b478e8511e46ec409e0a7d104a4bb7 postgresql-8.0.8.ebuild 7709
+SHA256 b8509e0675490a021f5042fd38f7cfaaecfc06756b18bd04cccced36b6d2247d postgresql-8.0.8.ebuild 7709
+EBUILD postgresql-8.1.2.ebuild 7567 RMD160 7b29f9159a0a625ea36694127523334adf46541e SHA1 8042d93301d5e145263e036d61230c09aa867864 SHA256 b52e6580c94a1866295184671f2e982055b837e10452a3cca31a3b2fb752581e
+MD5 f473e46935f69ee45f0808603b621cd7 postgresql-8.1.2.ebuild 7567
+RMD160 7b29f9159a0a625ea36694127523334adf46541e postgresql-8.1.2.ebuild 7567
+SHA256 b52e6580c94a1866295184671f2e982055b837e10452a3cca31a3b2fb752581e postgresql-8.1.2.ebuild 7567
+EBUILD postgresql-8.1.3-r1.ebuild 7772 RMD160 dee1026cdaf7ff4b49fa24fd1a074108dc645e47 SHA1 5ac2170d3f4688483669b36a9eea948e3601a864 SHA256 c39b5498b437599e1cb27e8537781fe9186f5d2af0a9deea169c4bf78df0bf1a
+MD5 5b4ab27bf08f553416da8022233104e9 postgresql-8.1.3-r1.ebuild 7772
+RMD160 dee1026cdaf7ff4b49fa24fd1a074108dc645e47 postgresql-8.1.3-r1.ebuild 7772
+SHA256 c39b5498b437599e1cb27e8537781fe9186f5d2af0a9deea169c4bf78df0bf1a postgresql-8.1.3-r1.ebuild 7772
+EBUILD postgresql-8.1.3.ebuild 7567 RMD160 d688d8ab81862ce46d303b4d6a94ec4eca6fd69a SHA1 50e89dc0b0d3ad732b2ed55647efa33796e93f49 SHA256 e6df12d9aaf541a42e88d218c1d802cfc17124b9870cc74df634ddeed4d7c8c4
+MD5 c7ff3a5f2738c179f26d3dbee8daa187 postgresql-8.1.3.ebuild 7567
+RMD160 d688d8ab81862ce46d303b4d6a94ec4eca6fd69a postgresql-8.1.3.ebuild 7567
+SHA256 e6df12d9aaf541a42e88d218c1d802cfc17124b9870cc74df634ddeed4d7c8c4 postgresql-8.1.3.ebuild 7567
+EBUILD postgresql-8.1.4.ebuild 7844 RMD160 3b8cac5394a12fcbd0ba01826b7e9ad93be35962 SHA1 8d1abf5069effa18274417f8cf06e2d401467d7f SHA256 6961dade790d4bb46152714e8c4ef92576e9c4ac293bbb67f0d28635adfa9182
+MD5 b2314b8f7bd05b9008ff225816319e2b postgresql-8.1.4.ebuild 7844
+RMD160 3b8cac5394a12fcbd0ba01826b7e9ad93be35962 postgresql-8.1.4.ebuild 7844
+SHA256 6961dade790d4bb46152714e8c4ef92576e9c4ac293bbb67f0d28635adfa9182 postgresql-8.1.4.ebuild 7844
+MISC ChangeLog 56488 RMD160 57fd6f2f2a853b3c26bc47547932683974909d78 SHA1 5f422ca4801f302249445f9e7d48472be696e97d SHA256 93036782f6426bb5e22baa96b256040d7fc2b4c2fe7aac8c49184efb7fcf9d77
+MD5 f7ef61348f8d4b43677d55b826076bde ChangeLog 56488
+RMD160 57fd6f2f2a853b3c26bc47547932683974909d78 ChangeLog 56488
+SHA256 93036782f6426bb5e22baa96b256040d7fc2b4c2fe7aac8c49184efb7fcf9d77 ChangeLog 56488
 MISC metadata.xml 163 RMD160 70bbda1c1e8316a09d467334131898ae833a3205 SHA1 f43b9a4a2a82140936f9b04e4e63b3c9a495141f SHA256 f0699a4c3ad24cc38836c2d4a1ba03e4e403a9a5364b51df405db02014005891
 MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
 RMD160 70bbda1c1e8316a09d467334131898ae833a3205 metadata.xml 163
@@ -556,7 +556,7 @@ SHA256 997e9446f28bbd1e923e1d57e774db013094dfd4e547f3044902f6a154143695 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEofMMamhnQswr0vIRAidzAJ9MkeoDx9LDYe52yFjXPHnWhtk0jACglNxx
-H1edhEpi6op0IhykQ2Y8gss=
-=948r
+iD8DBQFEq24s9AbAhSK0CiwRAodqAJ9xrREUBQenOIdLKVWWZBxl3wC0FwCfV2Pf
+ao+L4aUQBsg4IZPzW/cqnPM=
+=CZRE
 -----END PGP SIGNATURE-----
diff --git a/dev-db/postgresql/postgresql-7.4.11.ebuild b/dev-db/postgresql/postgresql-7.4.11.ebuild
index 0956fa270d05..ca03a16bee79 100644
--- a/dev-db/postgresql/postgresql-7.4.11.ebuild
+++ b/dev-db/postgresql/postgresql-7.4.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.11.ebuild,v 1.1 2006/01/28 21:24:39 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.11.ebuild,v 1.2 2006/07/05 07:45:33 mr_bones_ Exp $
 
 inherit eutils gnuconfig flag-o-matic java-pkg multilib toolchain-funcs
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml2 selinux"
+IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml selinux"
 
 DEPEND="virtual/libc
 	=dev-db/libpq-7.4.11*
@@ -31,7 +31,7 @@ DEPEND="virtual/libc
 		dev-java/java-config )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
 	nls? ( sys-devel/gettext )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )"
+	xml? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )"
 # java dep workaround for portage bug
 # x86? ( java? ( =dev-java/sun-jdk-1.3* >=dev-java/ant-1.3 ) )
 RDEPEND="virtual/libc
@@ -43,7 +43,7 @@ RDEPEND="virtual/libc
 	java? ( >=virtual/jdk-1.3 )
 	selinux? ( sec-policy/selinux-postgresql )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )"
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )"
 
 PG_DIR="/var/lib/postgresql"
 MAX_CONNECTIONS=1024
@@ -122,8 +122,8 @@ src_compile() {
 	# down, anything more aggressive fails (i.e. -mcpu or -Ox)
 	# Gerk - Nov 26, 2002
 	use ppc && CFLAGS="-pipe -fsigned-char"
-	use xml2 && CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)"
-	use xml2 && LIBS="${LIBS} $(pkg-config --libs libxml-2.0)"
+	use xml && CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)"
+	use xml && LIBS="${LIBS} $(pkg-config --libs libxml-2.0)"
 
 	# Detect mips systems properly
 	gnuconfig_update
@@ -141,7 +141,7 @@ src_compile() {
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	cd contrib
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	if use xml2; then
+	if use xml; then
 		make -C xml LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	fi
 }
@@ -160,7 +160,7 @@ src_install() {
 	make DESTDIR=${D} includedir_server=/usr/include/postgresql/server includedir_internal=/usr/include/postgresql/internal install-all-headers || die
 	cd ${S}/contrib
 	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	if use xml2; then
+	if use xml; then
 		make -C xml DESTDIR=${D} IBDIR=${D}/usr/lib install || die
 	fi
 	cd ${S}
diff --git a/dev-db/postgresql/postgresql-7.4.12.ebuild b/dev-db/postgresql/postgresql-7.4.12.ebuild
index f3d4e44602b3..a1b0f78012f0 100644
--- a/dev-db/postgresql/postgresql-7.4.12.ebuild
+++ b/dev-db/postgresql/postgresql-7.4.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.12.ebuild,v 1.2 2006/02/20 06:23:13 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.12.ebuild,v 1.3 2006/07/05 07:45:33 mr_bones_ Exp $
 
 inherit eutils gnuconfig flag-o-matic java-pkg multilib toolchain-funcs
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml2 selinux"
+IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml selinux"
 
 DEPEND="virtual/libc
 	=dev-db/libpq-7.4.12*
@@ -31,7 +31,7 @@ DEPEND="virtual/libc
 		dev-java/java-config )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
 	nls? ( sys-devel/gettext )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )"
+	xml? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )"
 # java dep workaround for portage bug
 # x86? ( java? ( =dev-java/sun-jdk-1.3* >=dev-java/ant-1.3 ) )
 RDEPEND="virtual/libc
@@ -43,7 +43,7 @@ RDEPEND="virtual/libc
 	java? ( >=virtual/jdk-1.3 )
 	selinux? ( sec-policy/selinux-postgresql )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )"
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )"
 
 PG_DIR="/var/lib/postgresql"
 MAX_CONNECTIONS=1024
@@ -122,8 +122,8 @@ src_compile() {
 	# down, anything more aggressive fails (i.e. -mcpu or -Ox)
 	# Gerk - Nov 26, 2002
 	use ppc && CFLAGS="-pipe -fsigned-char"
-	use xml2 && CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)"
-	use xml2 && LIBS="${LIBS} $(pkg-config --libs libxml-2.0)"
+	use xml && CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)"
+	use xml && LIBS="${LIBS} $(pkg-config --libs libxml-2.0)"
 
 	# Detect mips systems properly
 	gnuconfig_update
@@ -141,7 +141,7 @@ src_compile() {
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	cd contrib
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	if use xml2; then
+	if use xml; then
 		make -C xml LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	fi
 }
@@ -160,7 +160,7 @@ src_install() {
 	make DESTDIR=${D} includedir_server=/usr/include/postgresql/server includedir_internal=/usr/include/postgresql/internal install-all-headers || die
 	cd ${S}/contrib
 	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	if use xml2; then
+	if use xml; then
 		make -C xml DESTDIR=${D} IBDIR=${D}/usr/lib install || die
 	fi
 	cd ${S}
diff --git a/dev-db/postgresql/postgresql-7.4.13.ebuild b/dev-db/postgresql/postgresql-7.4.13.ebuild
index 89c00e73a437..6ca3f5a356bd 100644
--- a/dev-db/postgresql/postgresql-7.4.13.ebuild
+++ b/dev-db/postgresql/postgresql-7.4.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.13.ebuild,v 1.9 2006/06/28 03:04:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.13.ebuild,v 1.10 2006/07/05 07:45:33 mr_bones_ Exp $
 
 inherit eutils gnuconfig flag-o-matic java-pkg multilib toolchain-funcs
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml2 selinux"
+IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml selinux"
 
 DEPEND="virtual/libc
 	=dev-db/libpq-7.4.13*
@@ -31,7 +31,7 @@ DEPEND="virtual/libc
 		dev-java/java-config )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
 	nls? ( sys-devel/gettext )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )"
+	xml? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )"
 # java dep workaround for portage bug
 # x86? ( java? ( =dev-java/sun-jdk-1.3* >=dev-java/ant-1.3 ) )
 RDEPEND="virtual/libc
@@ -43,7 +43,7 @@ RDEPEND="virtual/libc
 	java? ( >=virtual/jdk-1.3 )
 	selinux? ( sec-policy/selinux-postgresql )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )"
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )"
 
 PG_DIR="/var/lib/postgresql"
 MAX_CONNECTIONS=1024
@@ -127,8 +127,8 @@ src_compile() {
 	# down, anything more aggressive fails (i.e. -mcpu or -Ox)
 	# Gerk - Nov 26, 2002
 	use ppc && CFLAGS="-pipe -fsigned-char"
-	use xml2 && CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)"
-	use xml2 && LIBS="${LIBS} $(pkg-config --libs libxml-2.0)"
+	use xml && CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)"
+	use xml && LIBS="${LIBS} $(pkg-config --libs libxml-2.0)"
 
 	# Detect mips systems properly
 	gnuconfig_update
@@ -146,7 +146,7 @@ src_compile() {
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	cd contrib
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	if use xml2; then
+	if use xml; then
 		make -C xml LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	fi
 }
@@ -165,7 +165,7 @@ src_install() {
 	make DESTDIR=${D} includedir_server=/usr/include/postgresql/server includedir_internal=/usr/include/postgresql/internal install-all-headers || die
 	cd ${S}/contrib
 	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	if use xml2; then
+	if use xml; then
 		make -C xml DESTDIR=${D} IBDIR=${D}/usr/lib install || die
 	fi
 	cd ${S}
diff --git a/dev-db/postgresql/postgresql-7.4.7-r1.ebuild b/dev-db/postgresql/postgresql-7.4.7-r1.ebuild
index eb51796b8699..b8f9ea33fdf6 100644
--- a/dev-db/postgresql/postgresql-7.4.7-r1.ebuild
+++ b/dev-db/postgresql/postgresql-7.4.7-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.7-r1.ebuild,v 1.15 2005/11/12 22:48:12 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.7-r1.ebuild,v 1.16 2006/07/05 07:45:33 mr_bones_ Exp $
 
 inherit eutils gnuconfig flag-o-matic java-pkg multilib toolchain-funcs
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 s390 ppc64"
-IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml2 selinux"
+IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml selinux"
 
 DEPEND="virtual/libc
 	sys-devel/autoconf
@@ -30,7 +30,7 @@ DEPEND="virtual/libc
 		dev-java/java-config )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
 	nls? ( sys-devel/gettext )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )"
+	xml? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )"
 # java dep workaround for portage bug
 # x86? ( java? ( =dev-java/sun-jdk-1.3* >=dev-java/ant-1.3 ) )
 RDEPEND="virtual/libc
@@ -41,7 +41,7 @@ RDEPEND="virtual/libc
 	java? ( >=virtual/jdk-1.3 )
 	selinux? ( sec-policy/selinux-postgresql )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )"
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )"
 
 PG_DIR="/var/lib/postgresql"
 MAX_CONNECTIONS=1024
@@ -118,8 +118,8 @@ src_compile() {
 	# down, anything more aggressive fails (i.e. -mcpu or -Ox)
 	# Gerk - Nov 26, 2002
 	use ppc && CFLAGS="-pipe -fsigned-char"
-	use xml2 && CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)"
-	use xml2 && LIBS="${LIBS} $(pkg-config --libs libxml-2.0)"
+	use xml && CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)"
+	use xml && LIBS="${LIBS} $(pkg-config --libs libxml-2.0)"
 
 	# Detect mips systems properly
 	gnuconfig_update
@@ -137,7 +137,7 @@ src_compile() {
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	cd contrib
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	if use xml2; then
+	if use xml; then
 		make -C xml LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	fi
 }
@@ -156,7 +156,7 @@ src_install() {
 	make DESTDIR=${D} includedir_server=/usr/include/postgresql/server includedir_internal=/usr/include/postgresql/internal install-all-headers || die
 	cd ${S}/contrib
 	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	if use xml2; then
+	if use xml; then
 		make -C xml DESTDIR=${D} IBDIR=${D}/usr/lib install || die
 	fi
 	cd ${S}
diff --git a/dev-db/postgresql/postgresql-7.4.7-r2.ebuild b/dev-db/postgresql/postgresql-7.4.7-r2.ebuild
index 4e6b3660d2e6..8895eeeb77cc 100644
--- a/dev-db/postgresql/postgresql-7.4.7-r2.ebuild
+++ b/dev-db/postgresql/postgresql-7.4.7-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.7-r2.ebuild,v 1.11 2005/12/27 06:36:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.7-r2.ebuild,v 1.12 2006/07/05 07:45:33 mr_bones_ Exp $
 
 inherit eutils gnuconfig flag-o-matic java-pkg multilib toolchain-funcs
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh ~sparc x86"
-IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml2 selinux"
+IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml selinux"
 
 DEPEND="virtual/libc
 	sys-devel/autoconf
@@ -30,7 +30,7 @@ DEPEND="virtual/libc
 		dev-java/java-config )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
 	nls? ( sys-devel/gettext )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )"
+	xml? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )"
 # java dep workaround for portage bug
 # x86? ( java? ( =dev-java/sun-jdk-1.3* >=dev-java/ant-1.3 ) )
 RDEPEND="virtual/libc
@@ -41,7 +41,7 @@ RDEPEND="virtual/libc
 	java? ( >=virtual/jdk-1.3 )
 	selinux? ( sec-policy/selinux-postgresql )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )"
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )"
 
 PG_DIR="/var/lib/postgresql"
 MAX_CONNECTIONS=1024
@@ -123,8 +123,8 @@ src_compile() {
 	# down, anything more aggressive fails (i.e. -mcpu or -Ox)
 	# Gerk - Nov 26, 2002
 	use ppc && CFLAGS="-pipe -fsigned-char"
-	use xml2 && CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)"
-	use xml2 && LIBS="${LIBS} $(pkg-config --libs libxml-2.0)"
+	use xml && CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)"
+	use xml && LIBS="${LIBS} $(pkg-config --libs libxml-2.0)"
 
 	# Detect mips systems properly
 	gnuconfig_update
@@ -142,7 +142,7 @@ src_compile() {
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	cd contrib
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	if use xml2; then
+	if use xml; then
 		make -C xml LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	fi
 }
@@ -161,7 +161,7 @@ src_install() {
 	make DESTDIR=${D} includedir_server=/usr/include/postgresql/server includedir_internal=/usr/include/postgresql/internal install-all-headers || die
 	cd ${S}/contrib
 	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	if use xml2; then
+	if use xml; then
 		make -C xml DESTDIR=${D} IBDIR=${D}/usr/lib install || die
 	fi
 	cd ${S}
diff --git a/dev-db/postgresql/postgresql-7.4.8.ebuild b/dev-db/postgresql/postgresql-7.4.8.ebuild
index 0469e90ad0ef..bc30e0f44dc2 100644
--- a/dev-db/postgresql/postgresql-7.4.8.ebuild
+++ b/dev-db/postgresql/postgresql-7.4.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.8.ebuild,v 1.7 2005/12/27 06:36:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.8.ebuild,v 1.8 2006/07/05 07:45:33 mr_bones_ Exp $
 
 inherit eutils gnuconfig flag-o-matic java-pkg multilib toolchain-funcs
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh ~sparc x86"
-IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml2 selinux"
+IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml selinux"
 
 DEPEND="virtual/libc
 	=dev-db/libpq-7.4.8*
@@ -31,7 +31,7 @@ DEPEND="virtual/libc
 		dev-java/java-config )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
 	nls? ( sys-devel/gettext )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )"
+	xml? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )"
 # java dep workaround for portage bug
 # x86? ( java? ( =dev-java/sun-jdk-1.3* >=dev-java/ant-1.3 ) )
 RDEPEND="virtual/libc
@@ -43,7 +43,7 @@ RDEPEND="virtual/libc
 	java? ( >=virtual/jdk-1.3 )
 	selinux? ( sec-policy/selinux-postgresql )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )"
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )"
 
 PG_DIR="/var/lib/postgresql"
 MAX_CONNECTIONS=1024
@@ -118,8 +118,8 @@ src_compile() {
 	# down, anything more aggressive fails (i.e. -mcpu or -Ox)
 	# Gerk - Nov 26, 2002
 	use ppc && CFLAGS="-pipe -fsigned-char"
-	use xml2 && CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)"
-	use xml2 && LIBS="${LIBS} $(pkg-config --libs libxml-2.0)"
+	use xml && CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)"
+	use xml && LIBS="${LIBS} $(pkg-config --libs libxml-2.0)"
 
 	# Detect mips systems properly
 	gnuconfig_update
@@ -137,7 +137,7 @@ src_compile() {
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	cd contrib
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	if use xml2; then
+	if use xml; then
 		make -C xml LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	fi
 }
@@ -156,7 +156,7 @@ src_install() {
 	make DESTDIR=${D} includedir_server=/usr/include/postgresql/server includedir_internal=/usr/include/postgresql/internal install-all-headers || die
 	cd ${S}/contrib
 	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	if use xml2; then
+	if use xml; then
 		make -C xml DESTDIR=${D} IBDIR=${D}/usr/lib install || die
 	fi
 	cd ${S}
diff --git a/dev-db/postgresql/postgresql-7.4.9.ebuild b/dev-db/postgresql/postgresql-7.4.9.ebuild
index 93182e24fb70..c1250d7e91d2 100644
--- a/dev-db/postgresql/postgresql-7.4.9.ebuild
+++ b/dev-db/postgresql/postgresql-7.4.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.9.ebuild,v 1.11 2006/02/19 20:57:42 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.9.ebuild,v 1.12 2006/07/05 07:45:33 mr_bones_ Exp $
 
 inherit eutils gnuconfig flag-o-matic java-pkg multilib toolchain-funcs
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml2 selinux"
+IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml selinux"
 
 DEPEND="virtual/libc
 	=dev-db/libpq-7.4.9*
@@ -31,7 +31,7 @@ DEPEND="virtual/libc
 		dev-java/java-config )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
 	nls? ( sys-devel/gettext )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )"
+	xml? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )"
 # java dep workaround for portage bug
 # x86? ( java? ( =dev-java/sun-jdk-1.3* >=dev-java/ant-1.3 ) )
 RDEPEND="virtual/libc
@@ -43,7 +43,7 @@ RDEPEND="virtual/libc
 	java? ( >=virtual/jdk-1.3 )
 	selinux? ( sec-policy/selinux-postgresql )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )"
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )"
 
 PG_DIR="/var/lib/postgresql"
 MAX_CONNECTIONS=1024
@@ -122,8 +122,8 @@ src_compile() {
 	# down, anything more aggressive fails (i.e. -mcpu or -Ox)
 	# Gerk - Nov 26, 2002
 	use ppc && CFLAGS="-pipe -fsigned-char"
-	use xml2 && CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)"
-	use xml2 && LIBS="${LIBS} $(pkg-config --libs libxml-2.0)"
+	use xml && CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)"
+	use xml && LIBS="${LIBS} $(pkg-config --libs libxml-2.0)"
 
 	# Detect mips systems properly
 	gnuconfig_update
@@ -141,7 +141,7 @@ src_compile() {
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	cd contrib
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	if use xml2; then
+	if use xml; then
 		make -C xml LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	fi
 }
@@ -160,7 +160,7 @@ src_install() {
 	make DESTDIR=${D} includedir_server=/usr/include/postgresql/server includedir_internal=/usr/include/postgresql/internal install-all-headers || die
 	cd ${S}/contrib
 	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	if use xml2; then
+	if use xml; then
 		make -C xml DESTDIR=${D} IBDIR=${D}/usr/lib install || die
 	fi
 	cd ${S}
diff --git a/dev-db/postgresql/postgresql-8.0.3.ebuild b/dev-db/postgresql/postgresql-8.0.3.ebuild
index e5f14f632fba..175333bc08dd 100644
--- a/dev-db/postgresql/postgresql-8.0.3.ebuild
+++ b/dev-db/postgresql/postgresql-8.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.3.ebuild,v 1.14 2005/11/12 22:48:12 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.3.ebuild,v 1.15 2006/07/05 07:45:33 mr_bones_ Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${MY_PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime pg-hier"
+IUSE="ssl nls python tcltk perl libg++ pam readline xml zlib doc selinux kerberos pg-intdatetime pg-hier"
 
 S=${WORKDIR}/${MY_P}
 DEPEND="virtual/libc
@@ -31,7 +31,7 @@ DEPEND="virtual/libc
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
 	python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )
 	nls? ( sys-devel/gettext )
 	kerberos? ( virtual/krb5 )"
 RDEPEND="virtual/libc
@@ -42,7 +42,7 @@ RDEPEND="virtual/libc
 	python? ( >=dev-lang/python-2.2 )
 	selinux? ( sec-policy/selinux-postgresql )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	kerberos? ( virtual/krb5 )"
 
 PG_DIR="/var/lib/postgresql"
@@ -105,7 +105,7 @@ src_compile() {
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	cd contrib
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	if use xml2; then
+	if use xml; then
 		cd xml2
 		make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	fi
@@ -125,7 +125,7 @@ src_install() {
 #	make DESTDIR=${D} install-all-headers || die
 	cd ${S}/contrib
 	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	if use xml2; then
+	if use xml; then
 		cd ${S}/contrib/xml2
 		make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
 	fi
diff --git a/dev-db/postgresql/postgresql-8.0.4.ebuild b/dev-db/postgresql/postgresql-8.0.4.ebuild
index 69f3cfb73718..81176b886af7 100644
--- a/dev-db/postgresql/postgresql-8.0.4.ebuild
+++ b/dev-db/postgresql/postgresql-8.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.4.ebuild,v 1.12 2006/02/04 17:43:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.4.ebuild,v 1.13 2006/07/05 07:45:33 mr_bones_ Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${MY_PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime pg-hier"
+IUSE="ssl nls python tcltk perl libg++ pam readline xml zlib doc selinux kerberos pg-intdatetime pg-hier"
 
 S=${WORKDIR}/${MY_P}
 DEPEND="virtual/libc
@@ -31,7 +31,7 @@ DEPEND="virtual/libc
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
 	python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )
 	nls? ( sys-devel/gettext )
 	kerberos? ( virtual/krb5 )"
 RDEPEND="virtual/libc
@@ -42,7 +42,7 @@ RDEPEND="virtual/libc
 	python? ( >=dev-lang/python-2.2 )
 	selinux? ( sec-policy/selinux-postgresql )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	kerberos? ( virtual/krb5 )"
 
 PG_DIR="/var/lib/postgresql"
@@ -109,7 +109,7 @@ src_compile() {
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	cd contrib
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	if use xml2; then
+	if use xml; then
 		cd xml2
 		make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	fi
@@ -129,7 +129,7 @@ src_install() {
 #	make DESTDIR=${D} install-all-headers || die
 	cd ${S}/contrib
 	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	if use xml2; then
+	if use xml; then
 		cd ${S}/contrib/xml2
 		make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
 	fi
diff --git a/dev-db/postgresql/postgresql-8.0.6.ebuild b/dev-db/postgresql/postgresql-8.0.6.ebuild
index 1925764f2060..8116d0940922 100644
--- a/dev-db/postgresql/postgresql-8.0.6.ebuild
+++ b/dev-db/postgresql/postgresql-8.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.6.ebuild,v 1.1 2006/01/28 21:24:39 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.6.ebuild,v 1.2 2006/07/05 07:45:33 mr_bones_ Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${MY_PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime pg-hier"
+IUSE="ssl nls python tcltk perl libg++ pam readline xml zlib doc selinux kerberos pg-intdatetime pg-hier"
 
 S=${WORKDIR}/${MY_P}
 DEPEND="virtual/libc
@@ -31,7 +31,7 @@ DEPEND="virtual/libc
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
 	python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )
 	nls? ( sys-devel/gettext )
 	kerberos? ( virtual/krb5 )"
 RDEPEND="virtual/libc
@@ -42,7 +42,7 @@ RDEPEND="virtual/libc
 	python? ( >=dev-lang/python-2.2 )
 	selinux? ( sec-policy/selinux-postgresql )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	kerberos? ( virtual/krb5 )"
 
 PG_DIR="/var/lib/postgresql"
@@ -109,7 +109,7 @@ src_compile() {
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	cd contrib
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	if use xml2; then
+	if use xml; then
 		cd xml2
 		make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	fi
@@ -129,7 +129,7 @@ src_install() {
 #	make DESTDIR=${D} install-all-headers || die
 	cd ${S}/contrib
 	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	if use xml2; then
+	if use xml; then
 		cd ${S}/contrib/xml2
 		make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
 	fi
diff --git a/dev-db/postgresql/postgresql-8.0.7.ebuild b/dev-db/postgresql/postgresql-8.0.7.ebuild
index c343e447f124..a73dfe223709 100644
--- a/dev-db/postgresql/postgresql-8.0.7.ebuild
+++ b/dev-db/postgresql/postgresql-8.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.7.ebuild,v 1.3 2006/03/09 22:32:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.7.ebuild,v 1.4 2006/07/05 07:45:33 mr_bones_ Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${MY_PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime pg-hier"
+IUSE="ssl nls python tcltk perl libg++ pam readline xml zlib doc selinux kerberos pg-intdatetime pg-hier"
 
 S=${WORKDIR}/${MY_P}
 DEPEND="virtual/libc
@@ -31,7 +31,7 @@ DEPEND="virtual/libc
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
 	python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )
 	nls? ( sys-devel/gettext )
 	kerberos? ( virtual/krb5 )"
 RDEPEND="virtual/libc
@@ -42,7 +42,7 @@ RDEPEND="virtual/libc
 	python? ( >=dev-lang/python-2.2 )
 	selinux? ( sec-policy/selinux-postgresql )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	kerberos? ( virtual/krb5 )"
 
 PG_DIR="/var/lib/postgresql"
@@ -109,7 +109,7 @@ src_compile() {
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	cd contrib
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	if use xml2; then
+	if use xml; then
 		cd xml2
 		make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	fi
@@ -129,7 +129,7 @@ src_install() {
 #	make DESTDIR=${D} install-all-headers || die
 	cd ${S}/contrib
 	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	if use xml2; then
+	if use xml; then
 		cd ${S}/contrib/xml2
 		make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
 	fi
diff --git a/dev-db/postgresql/postgresql-8.0.8.ebuild b/dev-db/postgresql/postgresql-8.0.8.ebuild
index 4a15f4802107..445ec437397e 100644
--- a/dev-db/postgresql/postgresql-8.0.8.ebuild
+++ b/dev-db/postgresql/postgresql-8.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.8.ebuild,v 1.9 2006/06/28 03:04:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.8.ebuild,v 1.10 2006/07/05 07:45:33 mr_bones_ Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${MY_PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime pg-hier"
+IUSE="ssl nls python tcltk perl libg++ pam readline xml zlib doc selinux kerberos pg-intdatetime pg-hier"
 
 S=${WORKDIR}/${MY_P}
 DEPEND="virtual/libc
@@ -31,7 +31,7 @@ DEPEND="virtual/libc
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
 	python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )
 	nls? ( sys-devel/gettext )
 	kerberos? ( virtual/krb5 )"
 RDEPEND="virtual/libc
@@ -42,7 +42,7 @@ RDEPEND="virtual/libc
 	python? ( >=dev-lang/python-2.2 )
 	selinux? ( sec-policy/selinux-postgresql )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	kerberos? ( virtual/krb5 )"
 
 PG_DIR="/var/lib/postgresql"
@@ -113,7 +113,7 @@ src_compile() {
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	cd contrib
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	if use xml2; then
+	if use xml; then
 		cd xml2
 		make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	fi
@@ -133,7 +133,7 @@ src_install() {
 #	make DESTDIR=${D} install-all-headers || die
 	cd ${S}/contrib
 	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	if use xml2; then
+	if use xml; then
 		cd ${S}/contrib/xml2
 		make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
 	fi
diff --git a/dev-db/postgresql/postgresql-8.1.2.ebuild b/dev-db/postgresql/postgresql-8.1.2.ebuild
index d338fad03f31..e516687d7a67 100644
--- a/dev-db/postgresql/postgresql-8.1.2.ebuild
+++ b/dev-db/postgresql/postgresql-8.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.1.2.ebuild,v 1.1 2006/01/28 21:24:39 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.1.2.ebuild,v 1.2 2006/07/05 07:45:33 mr_bones_ Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
 
@@ -15,8 +15,8 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-#IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime pg-hier"
-IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime"
+#IUSE="ssl nls python tcltk perl libg++ pam readline xml zlib doc selinux kerberos pg-intdatetime pg-hier"
+IUSE="ssl nls python tcltk perl libg++ pam readline xml zlib doc selinux kerberos pg-intdatetime"
 
 DEPEND="virtual/libc
 	=dev-db/libpq-8.1.2*
@@ -29,7 +29,7 @@ DEPEND="virtual/libc
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
 	python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )
 	nls? ( sys-devel/gettext )
 	kerberos? ( virtual/krb5 )"
 RDEPEND="virtual/libc
@@ -40,7 +40,7 @@ RDEPEND="virtual/libc
 	python? ( >=dev-lang/python-2.2 )
 	selinux? ( sec-policy/selinux-postgresql )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	kerberos? ( virtual/krb5 )"
 
 PG_DIR="/var/lib/postgresql"
@@ -107,7 +107,7 @@ src_compile() {
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	cd contrib
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	if use xml2; then
+	if use xml; then
 		cd xml2
 		make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	fi
@@ -127,7 +127,7 @@ src_install() {
 #	make DESTDIR=${D} install-all-headers || die
 	cd ${S}/contrib
 	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	if use xml2; then
+	if use xml; then
 		cd ${S}/contrib/xml2
 		make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
 	fi
diff --git a/dev-db/postgresql/postgresql-8.1.3-r1.ebuild b/dev-db/postgresql/postgresql-8.1.3-r1.ebuild
index f23b6f7acba7..41fd6c2dc461 100644
--- a/dev-db/postgresql/postgresql-8.1.3-r1.ebuild
+++ b/dev-db/postgresql/postgresql-8.1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.1.3-r1.ebuild,v 1.2 2006/04/17 17:48:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.1.3-r1.ebuild,v 1.3 2006/07/05 07:45:33 mr_bones_ Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
 
@@ -15,8 +15,8 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-#IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime pg-hier"
-IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime threads"
+#IUSE="ssl nls python tcltk perl libg++ pam readline xml zlib doc selinux kerberos pg-intdatetime pg-hier"
+IUSE="ssl nls python tcltk perl libg++ pam readline xml zlib doc selinux kerberos pg-intdatetime threads"
 
 DEPEND="virtual/libc
 	=dev-db/libpq-8.1.3*
@@ -29,7 +29,7 @@ DEPEND="virtual/libc
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
 	python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )
 	nls? ( sys-devel/gettext )
 	kerberos? ( virtual/krb5 )"
 RDEPEND="virtual/libc
@@ -40,7 +40,7 @@ RDEPEND="virtual/libc
 	python? ( >=dev-lang/python-2.2 )
 	selinux? ( sec-policy/selinux-postgresql )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	kerberos? ( virtual/krb5 )"
 
 PG_DIR="/var/lib/postgresql"
@@ -108,7 +108,7 @@ src_compile() {
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	cd contrib
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	if use xml2; then
+	if use xml; then
 		cd xml2
 		make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	fi
@@ -128,7 +128,7 @@ src_install() {
 #	make DESTDIR=${D} install-all-headers || die
 	cd ${S}/contrib
 	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	if use xml2; then
+	if use xml; then
 		cd ${S}/contrib/xml2
 		make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
 	fi
diff --git a/dev-db/postgresql/postgresql-8.1.3.ebuild b/dev-db/postgresql/postgresql-8.1.3.ebuild
index 8767c7bfc569..6bc024c7f6d9 100644
--- a/dev-db/postgresql/postgresql-8.1.3.ebuild
+++ b/dev-db/postgresql/postgresql-8.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.1.3.ebuild,v 1.3 2006/02/20 06:36:48 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.1.3.ebuild,v 1.4 2006/07/05 07:45:33 mr_bones_ Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
 
@@ -15,8 +15,8 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-#IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime pg-hier"
-IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime"
+#IUSE="ssl nls python tcltk perl libg++ pam readline xml zlib doc selinux kerberos pg-intdatetime pg-hier"
+IUSE="ssl nls python tcltk perl libg++ pam readline xml zlib doc selinux kerberos pg-intdatetime"
 
 DEPEND="virtual/libc
 	=dev-db/libpq-8.1.3*
@@ -29,7 +29,7 @@ DEPEND="virtual/libc
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
 	python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )
 	nls? ( sys-devel/gettext )
 	kerberos? ( virtual/krb5 )"
 RDEPEND="virtual/libc
@@ -40,7 +40,7 @@ RDEPEND="virtual/libc
 	python? ( >=dev-lang/python-2.2 )
 	selinux? ( sec-policy/selinux-postgresql )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	kerberos? ( virtual/krb5 )"
 
 PG_DIR="/var/lib/postgresql"
@@ -107,7 +107,7 @@ src_compile() {
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	cd contrib
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	if use xml2; then
+	if use xml; then
 		cd xml2
 		make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	fi
@@ -127,7 +127,7 @@ src_install() {
 #	make DESTDIR=${D} install-all-headers || die
 	cd ${S}/contrib
 	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	if use xml2; then
+	if use xml; then
 		cd ${S}/contrib/xml2
 		make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
 	fi
diff --git a/dev-db/postgresql/postgresql-8.1.4.ebuild b/dev-db/postgresql/postgresql-8.1.4.ebuild
index 103eb5aae605..9bf0eb8469ed 100644
--- a/dev-db/postgresql/postgresql-8.1.4.ebuild
+++ b/dev-db/postgresql/postgresql-8.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.1.4.ebuild,v 1.1 2006/05/31 17:41:47 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.1.4.ebuild,v 1.2 2006/07/05 07:45:33 mr_bones_ Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
 
@@ -15,8 +15,8 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-#IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime pg-hier"
-IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime threads"
+#IUSE="ssl nls python tcltk perl libg++ pam readline xml zlib doc selinux kerberos pg-intdatetime pg-hier"
+IUSE="ssl nls python tcltk perl libg++ pam readline xml zlib doc selinux kerberos pg-intdatetime threads"
 
 DEPEND="virtual/libc
 	=dev-db/libpq-8.1.4*
@@ -29,7 +29,7 @@ DEPEND="virtual/libc
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
 	python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )
 	nls? ( sys-devel/gettext )
 	kerberos? ( virtual/krb5 )"
 RDEPEND="virtual/libc
@@ -40,7 +40,7 @@ RDEPEND="virtual/libc
 	python? ( >=dev-lang/python-2.2 )
 	selinux? ( sec-policy/selinux-postgresql )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	kerberos? ( virtual/krb5 )"
 
 PG_DIR="/var/lib/postgresql"
@@ -112,7 +112,7 @@ src_compile() {
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	cd contrib
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	if use xml2; then
+	if use xml; then
 		cd xml2
 		make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	fi
@@ -132,7 +132,7 @@ src_install() {
 #	make DESTDIR=${D} install-all-headers || die
 	cd ${S}/contrib
 	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	if use xml2; then
+	if use xml; then
 		cd ${S}/contrib/xml2
 		make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
 	fi