Backport FORCE_UPGRADE to old 2.3 major series.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index 1fbc8a4e18a74d0df93808801308f792007171ee..12fd78c417204031643949dbb640fa4d12934a4a 100644 (file)
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-nds/openldap
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.385 2011/08/11 07:56:54 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.386 2011/08/22 23:22:47 robbat2 Exp $
+
+  22 Aug 2011; Robin H. Johnson <robbat2@gentoo.org> openldap-2.3.43-r1.ebuild:
+  Backport FORCE_UPGRADE to old 2.3 major series.
 
 *openldap-2.4.25-r1 (11 Aug 2011)
 

diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 3f25dd15ecde027cd615d68ad9d9a04c40f85e32..088aa54db1354886a7fcfda4ad3ece70dffe46e8 100644 (file)
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX DB_CONFIG.fast.example 746 RMD160 03d179d1c58d695c442eb5e3e69c245f3c2f2358 SHA1 c76a2a9f346a733ed6617d42229b434ce723c59e SHA256 69fc9aa6e4f0b888bc02d3f75642fe1ebf9345c685257a5c1236b2e79ed56e0b
 AUX openldap-2.2.14-perlthreadsfix.patch 614 RMD160 6e868aa5a5cc4e80c0340af25d18d010b342ed15 SHA1 3bb05c7ed511e8464331619ce23064d236a5fe82 SHA256 bb719cc1fed47ff0f111c960f3295781ae6f0d9e98b4266a87751044b4bb3175
 AUX openldap-2.2.6-ntlm.patch 5011 RMD160 317f4b6dc9589826739a14a8ad7200ed287c87be SHA1 29b8e9c4835235c976f026cd5883228b77581083 SHA256 1f7e766bcafb412ec336aad7e07295d6d62d2e2a62b6804b07b06a5056102243
@@ -25,29 +22,12 @@ DIST openldap-2.4.21.tgz 5477877 RMD160 94f662e8fe1b009f5836cb9c19b095f1b159b1bd
 DIST openldap-2.4.23.tgz 5182440 RMD160 d2268e8fb894680d1d9926fedca736f195e0a0be SHA1 26027e7020256c5f47e17787f17ee8b31af42378 SHA256 5a5ede91d5e8ab3c7f637620aa29a3b96eb34318a8b26c8eef2d2c789fc055e3
 DIST openldap-2.4.24.tgz 5240643 RMD160 b9df6a5a562b83fe4ad92f8779909b36fab65c52 SHA1 a4baad3d45ae5810ba5fee48603210697c70d52f SHA256 fdcecb64082a0d8e124f13b31fccf4765901e29decaf4224b28d4cff90a14614
 DIST openldap-2.4.25.tgz 5250595 RMD160 31217119f9a82712240bee10c2a350c8f35e0b8e SHA1 56efaf3656cc68d3b5be66422c0c89f0104d7183 SHA256 615acc9970ae2f612bae7e8012d63f3194ef02a2a638bc1fd9ca7f31d85c1075
-EBUILD openldap-2.3.43-r1.ebuild 17911 RMD160 c36485dc0349902062afd53b35a06c6637b4192e SHA1 62d3c8181ce3b6807d7a3c89ade18eda58e621af SHA256 11d75698b1b61f6ded3160ddc471fa3f89335fea09ebfdb9e450246b47e22fdd
+EBUILD openldap-2.3.43-r1.ebuild 18079 RMD160 b5536752b15894eb51cb985e8054194ad48eaa16 SHA1 39d346646c9313050c4b9ef901bf859cccf9b9ed SHA256 6a9dc1ad644e54eb907a71c3d7fef94af3fd98c7d28d9f5aa8926e1ff822e86e
 EBUILD openldap-2.4.19-r1.ebuild 19705 RMD160 afc82305c7cbdb644a35951c0e094fbae55d4a92 SHA1 43d8720820112a43b645461a1401e18b9ca10819 SHA256 c58a0ada7480805a5310af39a4d11ef8d537d67fe5bf8c3fd9d489380cb70a88
 EBUILD openldap-2.4.21.ebuild 19906 RMD160 5b033cc028cc13ba7119a61f0611762f0d4eb5b3 SHA1 d0581cbc4aac9250610a027fa5837986aee8a18c SHA256 77125c3b9753018f83492254de9e8623dd19ae850a5844105b6f56edc3e7c927
 EBUILD openldap-2.4.23.ebuild 19896 RMD160 ced767caaed47313dbfdff1ec85257aebe9da855 SHA1 de2e700b8c965eb99fd939fbb580d38e6202ca61 SHA256 33551f4857e9635468463258e9feb0ab6d698cb69cfcc1dfb6b6eae71bcfc8d7
 EBUILD openldap-2.4.24.ebuild 19897 RMD160 f12f9746e4913946f60e1cdeb066bbdb39cf5360 SHA1 cf0345b733e9bb6e9f65919c647d613c5f40c458 SHA256 f06ebf979acf3c94f333827d74fec61f36b64a15afbc50b1442e5cdacce100e5
 EBUILD openldap-2.4.25-r1.ebuild 20600 RMD160 7ee5f74157678283d5c37cf73fb5b5bf1c6cf04e SHA1 01c366a92280b62d0c8b5b7ba1f44d8490e7a2ad SHA256 a88f233b96e68ec0fe2d11436f8f0641ac893314f17040cf227b8d37af3455e9
 EBUILD openldap-2.4.25.ebuild 19908 RMD160 3115268268eed103e05151c8d2a63d5599216b85 SHA1 8a3c40758b70eff87cf6bf014655682c2c9e53f8 SHA256 2d7c01928c417c27fb649dbd446ebae988f31dcf7163abc8f930ef7b3dd57184
-MISC ChangeLog 65869 RMD160 26bf7bf76be73fef13dbdace5b3101d80b0236c3 SHA1 ac9bf7ea23b9830b0a03b8afee2156e49d925e42 SHA256 fd1aee80ca494cdd77c8693ba425784edc117eb866cf77553c2acf56338deee1
+MISC ChangeLog 66003 RMD160 d8e1fae8ab728fef9a79275a6ee4f077363db884 SHA1 12ab4664c4967afa7d9ceff1866960dd0f6d4bfa SHA256 7b72f5fee13012031aa4475d7d8257a7498c2d5c4586579b37e75c85836c363a
 MISC metadata.xml 556 RMD160 14eae07812da4eecd05e467d1dccf841e6e16be6 SHA1 fa4c8d1aa03dd6bb9c27a7758fbaba5355cfe590 SHA256 405d4cd6f15d8495d0c7365f7b7d6bda9b82775d7e157339f3a6e92d46eed2c8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJOQ4tVAAoJELHSF2kinlg4BBcP/jfl4y2g0gpfOmLTnzM/qnlh
-s2s/224DHquf1Ku3hdggjfqDj5VC38ijb3Q+vsx8LxxBpA3lInZSdPoKgFvgIped
-qBOTgjzw3oGKopFKlSyetU3EBgPKmVlUCfDE99pvx0ydhcA7swpBBkLhlYsjzIa2
-+xQs0bQqDoEIkbkXSm89gZ/SCXB+/PycJz9eZpXhhfuRKVXlzbPY63Vg/WgqjsEe
-uz2agpuKvmaGsOAV8pTZ0qJuTNnZwL8j4CCKriqj2oxWOi8Dgo9tuSubMtHr/5zU
-BOBLTL/9v0W/xwsnPrr45pXtDK/JmU9f9oB0rh78K2zrvjl9Edzs3Q3U/7TW9BmE
-qt0Wv3kWQQ4816W1/4hibk0svTgWq2DWZMLjsOwxzLhZXUEcyZ6DLkJhkVEfy1vv
-8nAE/bsAViZACZv7HL5k4yLMUMvf5M/MysD/j1bf2CFkSo0nvO1o6KE6CrI6G9Aj
-ACpywyCXu9s9cv5yyY0OGr6gRTPDUK6iMjluS+EJHzEz5mSY8UhOidyDcR96ac8M
-HdQ4Pzl9ADrPcVa4bzUUhZu2TL/ygy844z03IAw3TiM8ZjMoXFK1mtO7/CYb5Avw
-UZOUGekgneBHyNSEbLGD1kYlTy8hs6XdWksUM+g1H5jLKwlRTVb/ds1iHrvWF5ey
-B1uR/U3hMHTavwf3PN1C
-=oRL1
------END PGP SIGNATURE-----

diff --git a/net-nds/openldap/openldap-2.3.43-r1.ebuild b/net-nds/openldap/openldap-2.3.43-r1.ebuild
index a7cc6192a6a7a3241891c9f07adb9c6ca6f5c88d..7344b67394954e5dffe61f521404785434423946 100644 (file)
--- a/net-nds/openldap/openldap-2.3.43-r1.ebuild
+++ b/net-nds/openldap/openldap-2.3.43-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43-r1.ebuild,v 1.8 2010/04/11 15:24:10 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43-r1.ebuild,v 1.9 2011/08/22 23:22:47 robbat2 Exp $
 
 EAPI="2"
 
@@ -85,7 +85,12 @@ openldap_upgrade_howto() {
        eerror "10. check that your data is intact."
        eerror "11. set up the new replication system."
        eerror
-       die "You need to upgrade your database first"
+       if [ "${FORCE_UPGRADE}" != "1" ]; then
+               die "You need to upgrade your database first"
+       else
+               eerror "You have the magical FORCE_UPGRADE=1 in place."
+               eerror "Don't say you weren't warned about data loss."
+       fi
 }
 
 openldap_find_versiontags() {