Fixing built_with_use checks for non-existant IUSE ( bug #147134 ) and merge failure with minimal useflag on first installation ( bug #143473 )

(Portage version: 2.1.1)
 (Signed Manifest commit)

1 files changed, 47 insertions, 37 deletions

diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index e00fa586f8d0..0f4573b950bd 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.0/slapd 584 RMD160 c271616a92d0646ee55f2a23abd386c14b9b5d76 SHA1 5b9b3418b433c15df1a0cb72d2c7f8f361cf33e1 SHA256 25e592f3e3c163dacab29bfa9e4e0dda03ada5ae9cbda9440e148f5f29f10db4
 MD5 1a7084c17a74e59db33578c0833e4099 files/2.0/slapd 584
 RMD160 c271616a92d0646ee55f2a23abd386c14b9b5d76 files/2.0/slapd 584
@@ -110,11 +113,11 @@ AUX openldap-2.3.24-contrib-smbk5pwd.patch 1631 RMD160 01e394da82c2ca8493d0dc15c
 MD5 c3eaf17d4936f6793f9c6486c51ef677 files/openldap-2.3.24-contrib-smbk5pwd.patch 1631
 RMD160 01e394da82c2ca8493d0dc15c400675545f463bb files/openldap-2.3.24-contrib-smbk5pwd.patch 1631
 SHA256 277990c6bc9e00c29bc5123d5074e1a741a224e884f92651b301375b02edc70e files/openldap-2.3.24-contrib-smbk5pwd.patch 1631
-DIST openldap-2.1.30.tgz 2044673 RMD160 431aa798c6197530c17611b931f0169d7a53e831 SHA1 c036f88abbafc16cb64c4e00ccc1c65563864755 SHA256 7fcefd45dfc82038cf0875e36b86a67d3af44b6a734e0127bae9ff2582ae8b25
-DIST openldap-2.2.23.tgz 2600908 RMD160 fc34d3f874d3976e4f8902820190dceda8d940c5 SHA1 cce3b19dd31a532f64557abf5042775226b24abe SHA256 303ae734d343f54228e6745d7660be2a46ecb7e6cd27199e027535dd35a63b14
-DIST openldap-2.2.28.tgz 2630427 RMD160 ca3f5aff42e6afc6b7c0a62beb8c13d4ff43d44c SHA1 0b3a3b9b61f6f033685218957fb84ba1d58887de SHA256 05c75b719305578dec799f05eaddae6b77eb51857abc6284e47b6abc4317dfba
-DIST openldap-2.3.21.tgz 3750778 RMD160 8fb7bce91452e24a8bd5e23f6dd3d17a3b2711cf SHA1 556975f22a5f32be3e127a2f6b896b03efbaf54a SHA256 12204e82276036742f4595122ca2c4ca173e7144a449f1d6d4950273c94a0ef5
-DIST openldap-2.3.23.tgz 3755995 RMD160 29bfd36b986cdcd56982082d2d6cb630840053df SHA1 30739e29eed78a261232375a9e3f276887ad626f SHA256 69646370351b9f46dbfdd9c029a99a96537305c8197027e81935b6fe35fa19d6
+DIST openldap-2.1.30.tgz 2044673 RMD160 431aa798c6197530c17611b931f0169d7a53e831 SHA256 7fcefd45dfc82038cf0875e36b86a67d3af44b6a734e0127bae9ff2582ae8b25
+DIST openldap-2.2.23.tgz 2600908 RMD160 fc34d3f874d3976e4f8902820190dceda8d940c5 SHA256 303ae734d343f54228e6745d7660be2a46ecb7e6cd27199e027535dd35a63b14
+DIST openldap-2.2.28.tgz 2630427 RMD160 ca3f5aff42e6afc6b7c0a62beb8c13d4ff43d44c SHA256 05c75b719305578dec799f05eaddae6b77eb51857abc6284e47b6abc4317dfba
+DIST openldap-2.3.21.tgz 3750778 RMD160 8fb7bce91452e24a8bd5e23f6dd3d17a3b2711cf SHA256 12204e82276036742f4595122ca2c4ca173e7144a449f1d6d4950273c94a0ef5
+DIST openldap-2.3.23.tgz 3755995 RMD160 29bfd36b986cdcd56982082d2d6cb630840053df SHA256 69646370351b9f46dbfdd9c029a99a96537305c8197027e81935b6fe35fa19d6
 DIST openldap-2.3.24.tgz 3756405 RMD160 8b4be685de2c2a7ace1debe97d5bda2354b57a06 SHA1 e00f7a017d9223708b77b0df3a612d236789b380 SHA256 e5247204dc0a41fa9b14ec1110fd2c179210b2288b27ebdee0a465b9e8e100cf
 EBUILD openldap-2.1.30-r2.ebuild 7481 RMD160 d3cf18053b469d1b482a116e2811ae4b5ddb8a0d SHA1 0219daa09b088949f4f776bed06cd9fc23d13cb4 SHA256 99dbf308566ccbe3c3be588c6e92bbcf6f476c80f95a6093d8667c6e46e09348
 MD5 fd027aaa5f21cf18f10ed713411feda0 openldap-2.1.30-r2.ebuild 7481
@@ -128,10 +131,10 @@ EBUILD openldap-2.1.30-r6.ebuild 8137 RMD160 dfacbe171a40150594b2dd6089b3d21fa38
 MD5 cf3459ef7f70916905138caeed991715 openldap-2.1.30-r6.ebuild 8137
 RMD160 dfacbe171a40150594b2dd6089b3d21fa388b019 openldap-2.1.30-r6.ebuild 8137
 SHA256 6a94fa3ef332a2425b87dbe4b44227d7194eaf2ff50bd688e532afebb34c4f3a openldap-2.1.30-r6.ebuild 8137
-EBUILD openldap-2.1.30-r7.ebuild 8904 RMD160 b317d16176ddc9cfb8c329cd9642275c378a7615 SHA1 b3e6eee160ef78ee0c13b274aceb3acf60fa8ae2 SHA256 e196cb66fc9b0225f7e6b5c74f37386c563c6850daf18582e0c192f95dde5b28
-MD5 41ddaae1efa5f62acef48fd20236b9e0 openldap-2.1.30-r7.ebuild 8904
-RMD160 b317d16176ddc9cfb8c329cd9642275c378a7615 openldap-2.1.30-r7.ebuild 8904
-SHA256 e196cb66fc9b0225f7e6b5c74f37386c563c6850daf18582e0c192f95dde5b28 openldap-2.1.30-r7.ebuild 8904
+EBUILD openldap-2.1.30-r7.ebuild 8932 RMD160 cef414707aea66c2b9161020087e2b1fbca31377 SHA1 e27590bead0190eacdacbe0798bc53ac1d2ddbe6 SHA256 72af57c54696c77c32e6c0b75674feff6bb313035fad8c83d00220aef973d20e
+MD5 7e336278947df5aac46b8bbff0eb29b8 openldap-2.1.30-r7.ebuild 8932
+RMD160 cef414707aea66c2b9161020087e2b1fbca31377 openldap-2.1.30-r7.ebuild 8932
+SHA256 72af57c54696c77c32e6c0b75674feff6bb313035fad8c83d00220aef973d20e openldap-2.1.30-r7.ebuild 8932
 EBUILD openldap-2.2.23-r1.ebuild 8791 RMD160 84f5f420371877d3107eeb25f06af26840e30824 SHA1 7b598285483be8310d5aab87f9648ff735151f7c SHA256 01c44304fb6c82b6bfe8b28f8d59f81433c6bf51fa2ce591446f89bfa9c5693e
 MD5 621f16d84bb0cb752ac3171f9c231eb4 openldap-2.2.23-r1.ebuild 8791
 RMD160 84f5f420371877d3107eeb25f06af26840e30824 openldap-2.2.23-r1.ebuild 8791
@@ -140,34 +143,34 @@ EBUILD openldap-2.2.28-r3.ebuild 13717 RMD160 841dd06f816c4d266a638ef9e056fe48dd
 MD5 d4c182a4f028e7ad79cfc127f3a2632d openldap-2.2.28-r3.ebuild 13717
 RMD160 841dd06f816c4d266a638ef9e056fe48ddacd698 openldap-2.2.28-r3.ebuild 13717
 SHA256 45465cbe50c9815d4bb251c90ce9fcd528774a3b7b7272c7a57e95c77b620a36 openldap-2.2.28-r3.ebuild 13717
-EBUILD openldap-2.2.28-r4.ebuild 15039 RMD160 877596a4decb66f573a27d037e44cccc0e2f16f8 SHA1 689a6f63a98593fd93a3d058aa0985aa795458c3 SHA256 e657a90c473a982dd42ed088c2ccd8ad1c3c7d58f06415f2c7670e907f6e8c62
-MD5 e93204fdc9325e31a07f8c3a435f087b openldap-2.2.28-r4.ebuild 15039
-RMD160 877596a4decb66f573a27d037e44cccc0e2f16f8 openldap-2.2.28-r4.ebuild 15039
-SHA256 e657a90c473a982dd42ed088c2ccd8ad1c3c7d58f06415f2c7670e907f6e8c62 openldap-2.2.28-r4.ebuild 15039
-EBUILD openldap-2.3.21-r1.ebuild 13339 RMD160 c26aa553cbdded6cac522d7c47ab33704a4a7590 SHA1 43ecedc2300a61d621a68616a2b38b98157b3637 SHA256 74c6332477466ab8e1cd46a844c087f68c11aeb181b185f89535b4777e0c08f8
-MD5 b153178085f6f9eedc149fc8f63fedf7 openldap-2.3.21-r1.ebuild 13339
-RMD160 c26aa553cbdded6cac522d7c47ab33704a4a7590 openldap-2.3.21-r1.ebuild 13339
-SHA256 74c6332477466ab8e1cd46a844c087f68c11aeb181b185f89535b4777e0c08f8 openldap-2.3.21-r1.ebuild 13339
-EBUILD openldap-2.3.21.ebuild 12948 RMD160 afa1c92a3512191c0739115194cab97bf8019aef SHA1 3649e82d6b6aa83da4cbae68e466e2bc60f5204b SHA256 ff59e7728f5a2ac0ae8ff873ae0d04bf7941785872b467e598f6763227ec6b85
-MD5 d5546d9d6f63b754dbf3f07a4871d041 openldap-2.3.21.ebuild 12948
-RMD160 afa1c92a3512191c0739115194cab97bf8019aef openldap-2.3.21.ebuild 12948
-SHA256 ff59e7728f5a2ac0ae8ff873ae0d04bf7941785872b467e598f6763227ec6b85 openldap-2.3.21.ebuild 12948
-EBUILD openldap-2.3.23.ebuild 14146 RMD160 a1b0b90e1e31cf849e3e63f4dc6b84b24cc64ec1 SHA1 b207546fc152cdc94753803109e6f836da2acd04 SHA256 ce3425f81a66ba4a5019ffcaeb71a9a51ca9ac0d93d3f30ff71dd88e905d2aa1
-MD5 0d37122fbd8c111bbfd05cb74807e065 openldap-2.3.23.ebuild 14146
-RMD160 a1b0b90e1e31cf849e3e63f4dc6b84b24cc64ec1 openldap-2.3.23.ebuild 14146
-SHA256 ce3425f81a66ba4a5019ffcaeb71a9a51ca9ac0d93d3f30ff71dd88e905d2aa1 openldap-2.3.23.ebuild 14146
-EBUILD openldap-2.3.24-r1.ebuild 14203 RMD160 47ad161003eabe795282e42d54ac2c89040447a8 SHA1 3a693367d420367e217d81c950b3676258d2672d SHA256 a91a7ad3c84124e5035d45a267c4e586e658e9068277983f81d463cd7325e6c0
-MD5 dbd738df66df21be9cfba1cac565f94e openldap-2.3.24-r1.ebuild 14203
-RMD160 47ad161003eabe795282e42d54ac2c89040447a8 openldap-2.3.24-r1.ebuild 14203
-SHA256 a91a7ad3c84124e5035d45a267c4e586e658e9068277983f81d463cd7325e6c0 openldap-2.3.24-r1.ebuild 14203
-EBUILD openldap-2.3.24-r2.ebuild 17299 RMD160 33798d6a11b44ff51b8a0dbe8349ed00437e093c SHA1 2bd7c58e3ae5e4990eeed365749ad635a6bb2d29 SHA256 ca7cab5289eb47ff2ed4f9a95bef7ec6b959a3c91fbc2806776355426094c2fb
-MD5 13941b3aa19088aec994ce41ac5aecf2 openldap-2.3.24-r2.ebuild 17299
-RMD160 33798d6a11b44ff51b8a0dbe8349ed00437e093c openldap-2.3.24-r2.ebuild 17299
-SHA256 ca7cab5289eb47ff2ed4f9a95bef7ec6b959a3c91fbc2806776355426094c2fb openldap-2.3.24-r2.ebuild 17299
-MISC ChangeLog 34540 RMD160 6ad48fdd999996667af6994a4db742db1606b44e SHA1 2ab33df3ceb69f517b06eb336dffd59a484325fb SHA256 8d209e823e7f1e090e6132f6c1554815967a9ea2ddfecaf105a6b4ec181209cc
-MD5 16d4f8fae70aba33c1ad61f0429ad1f4 ChangeLog 34540
-RMD160 6ad48fdd999996667af6994a4db742db1606b44e ChangeLog 34540
-SHA256 8d209e823e7f1e090e6132f6c1554815967a9ea2ddfecaf105a6b4ec181209cc ChangeLog 34540
+EBUILD openldap-2.2.28-r4.ebuild 15070 RMD160 5dd533cbad58ca63cf74e615d3e57e5cb6430ef1 SHA1 e8d13d78741ceeee5ef0d068789b40d4ac992b4b SHA256 3acdadb055a0a3128e347a4026aea869abed1151389f646e55af516dc3d5fdaa
+MD5 b4774b3a30167a67b0b6f69fabfa4c33 openldap-2.2.28-r4.ebuild 15070
+RMD160 5dd533cbad58ca63cf74e615d3e57e5cb6430ef1 openldap-2.2.28-r4.ebuild 15070
+SHA256 3acdadb055a0a3128e347a4026aea869abed1151389f646e55af516dc3d5fdaa openldap-2.2.28-r4.ebuild 15070
+EBUILD openldap-2.3.21-r1.ebuild 13404 RMD160 fd821932a82fc15cffbcb8106c43083593ae1fcc SHA1 55edc25510171b78b5b23fc547fc95ff9bb91c80 SHA256 bf061552d8aff8dd19dffa19af2d20a7c12ad5bc8d31e1769b835a2c08143119
+MD5 f277c4600f4d5e6b54fe70d7e7ff53b8 openldap-2.3.21-r1.ebuild 13404
+RMD160 fd821932a82fc15cffbcb8106c43083593ae1fcc openldap-2.3.21-r1.ebuild 13404
+SHA256 bf061552d8aff8dd19dffa19af2d20a7c12ad5bc8d31e1769b835a2c08143119 openldap-2.3.21-r1.ebuild 13404
+EBUILD openldap-2.3.21.ebuild 12977 RMD160 8f39b658dda045b34ccbb78e212aaec88a04e465 SHA1 f253a6a3341ddf216b4feff2eb000d4e3076c275 SHA256 d07dd1c69cdbeaf7863d297a4a3992751a5d66323efd798db79018348396cca6
+MD5 2a2d91f5f202246de935bf4cb4a11c53 openldap-2.3.21.ebuild 12977
+RMD160 8f39b658dda045b34ccbb78e212aaec88a04e465 openldap-2.3.21.ebuild 12977
+SHA256 d07dd1c69cdbeaf7863d297a4a3992751a5d66323efd798db79018348396cca6 openldap-2.3.21.ebuild 12977
+EBUILD openldap-2.3.23.ebuild 14211 RMD160 9c9da1fe2ee1ceedd3954f47d61b3cb40ac0814b SHA1 0b3f13902afe6e9b828f475b6c9574c39cbf3841 SHA256 788244295835ba12bd8c873be4c3ed4f61125f79fadd4ec157d2692d8ce1939a
+MD5 7cd44bda07dc3f4cad9ab36a1b54969d openldap-2.3.23.ebuild 14211
+RMD160 9c9da1fe2ee1ceedd3954f47d61b3cb40ac0814b openldap-2.3.23.ebuild 14211
+SHA256 788244295835ba12bd8c873be4c3ed4f61125f79fadd4ec157d2692d8ce1939a openldap-2.3.23.ebuild 14211
+EBUILD openldap-2.3.24-r1.ebuild 14268 RMD160 b5f01fb5ffc7eb1232bca4bb717d5de3d9d6cf02 SHA1 159add9ffaea974e73cc15edfde3cd48dd1ea31c SHA256 7568e3e249db5b4045a9326c40bcdf356649e70fe49de3ca15a8dab77b7f0e42
+MD5 de5dd9e1c32a1488d167678c67afbaa4 openldap-2.3.24-r1.ebuild 14268
+RMD160 b5f01fb5ffc7eb1232bca4bb717d5de3d9d6cf02 openldap-2.3.24-r1.ebuild 14268
+SHA256 7568e3e249db5b4045a9326c40bcdf356649e70fe49de3ca15a8dab77b7f0e42 openldap-2.3.24-r1.ebuild 14268
+EBUILD openldap-2.3.24-r2.ebuild 17364 RMD160 b51bd1599e9044a9a4cbdc2baad0f248dc527380 SHA1 471c3004e5c211a02079684ef6253ffe33f220a2 SHA256 4e423aad196a358f522d9cb1c0dc9b0b63192025e0bd868bf060f579b1aa4afa
+MD5 d8d5aae8279192f653f3198521c49a7d openldap-2.3.24-r2.ebuild 17364
+RMD160 b51bd1599e9044a9a4cbdc2baad0f248dc527380 openldap-2.3.24-r2.ebuild 17364
+SHA256 4e423aad196a358f522d9cb1c0dc9b0b63192025e0bd868bf060f579b1aa4afa openldap-2.3.24-r2.ebuild 17364
+MISC ChangeLog 34927 RMD160 cfe9db87a72db46632f0a3e28600b2d2d52a6aae SHA1 fff2f31c36656064667bc972534b911db8f65236 SHA256 5ed6336f6e2f9af5b15bd869ab2285b805c82d381172c52d2f24790fd6bc03da
+MD5 361a162e0db1a7820d7784229cf62fe2 ChangeLog 34927
+RMD160 cfe9db87a72db46632f0a3e28600b2d2d52a6aae ChangeLog 34927
+SHA256 5ed6336f6e2f9af5b15bd869ab2285b805c82d381172c52d2f24790fd6bc03da ChangeLog 34927
 MISC metadata.xml 240 RMD160 3dfef965b1bac3faa4abfec78fb98b0ed5a9ddaf SHA1 21c64f9ef102b6649bccfca61f06d7b328ef1727 SHA256 fecb6db825d33099fa9f18392db0b7a5ab89a4895ac6ca0f8a2313f348dfaaa6
 MD5 9a8efd7efb44b06913bf1d906d493407 metadata.xml 240
 RMD160 3dfef965b1bac3faa4abfec78fb98b0ed5a9ddaf metadata.xml 240
@@ -208,3 +211,10 @@ SHA256 1421251aff6fc052097eddf5d854cd3001eaa984555a64343b705d18325b7ece files/di
 MD5 90715e5ebf5339aaaa881c3ed3b46b3c files/digest-openldap-2.3.24-r2 241
 RMD160 13c05b3ac61d04c0b78a7788823a866477e2eb16 files/digest-openldap-2.3.24-r2 241
 SHA256 1421251aff6fc052097eddf5d854cd3001eaa984555a64343b705d18325b7ece files/digest-openldap-2.3.24-r2 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFBVWnz974XjDVpbkRAuPWAKC4HzH3nK9Lvr3j462G0SyzuRvRPQCghbmk
+nuGRb0lV9WpTpCxXUsdryeg=
+=BPG1
+-----END PGP SIGNATURE-----