Fix pkg_postrm() wrt Portage bug #535870.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 40 insertions, 29 deletions

diff --git a/app-admin/systemrescuecd-x86/ChangeLog b/app-admin/systemrescuecd-x86/ChangeLog
index a51608379b79..e5040b81aad8 100644
--- a/app-admin/systemrescuecd-x86/ChangeLog
+++ b/app-admin/systemrescuecd-x86/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/systemrescuecd-x86
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/systemrescuecd-x86/ChangeLog,v 1.1 2015/01/06 23:57:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/systemrescuecd-x86/ChangeLog,v 1.2 2015/01/07 22:53:29 mgorny Exp $
+
+  07 Jan 2015; Michał Górny <mgorny@gentoo.org> systemrescuecd-x86-4.4.1.ebuild:
+  Fix pkg_postrm() wrt Portage bug #535870.
 
 *systemrescuecd-x86-4.4.1 (06 Jan 2015)
 
diff --git a/app-admin/systemrescuecd-x86/Manifest b/app-admin/systemrescuecd-x86/Manifest
index 3fc463187b78..e7925adbcdef 100644
--- a/app-admin/systemrescuecd-x86/Manifest
+++ b/app-admin/systemrescuecd-x86/Manifest
@@ -2,25 +2,25 @@
 Hash: SHA256
 
 DIST systemrescuecd-x86-4.4.1.iso 413272064 SHA256 358253bf8d88b10be49f5485bf00e6cffea4f38ce635fe0d9f798803edf53d9e SHA512 5c5045df219181064201dda195961096da9722d3d5758dcb111c2c74ed083b3464f314340c01a5a27a920c33bd5bc95efee2efa1edc2405a0d11d9bc67e4b2a5 WHIRLPOOL b834a7a985a85909e9f99441407df78a06ee2c508e3d2020c5c4045cf35e3462f0fba58b888d150f22c0d23daf0d866d4fa93ba4bb6252ab7b502c390824e6ef
-EBUILD systemrescuecd-x86-4.4.1.ebuild 1323 SHA256 f8877b5f0c167994604a00700a6f2b3c770b58294ad1410be6775d906af71556 SHA512 106332a5649bc579d54ba58334bf9d0392d0f54a3e66e5093c133b856168021d6a11b6d0dec5328cf1940054d307fb8d068650c7b6f3b333ab112b719cc7846e WHIRLPOOL 86b0a14c9f872291da066492265ba21a301300b217a35073a3d84332db99706449d364aea9318eb5cd735785bb1bdc3347fd43b9e3930ed068fbbd139061db2f
-MISC ChangeLog 441 SHA256 db3e2e7eb54af92ac6ddd7483657828eff09c32438556df6bb765be40173651e SHA512 3fd3cc28313c4ad290c647ce511e681cf2ae829364e7a611a34af02bf9048ab6b04caae15bd44cc4a31b10acc6a774e7994657447d97b7845679cf8a7b4e1499 WHIRLPOOL 495602d18864ec85bdb83f721633e9037bfdd0aa79023321c2a110229ba112137315e98eab14fd1c7d2d4311f367392428f68f49e30552998a20e903a8a897b4
+EBUILD systemrescuecd-x86-4.4.1.ebuild 1481 SHA256 9500f06bb40b4b4029e3303a9fb45649a1fc342535829e82fd85fa4245b53431 SHA512 9f28cafa4728cf20c12203621334e8447f41054ec3df8b98566c1d9fdd8c5d17775c178dc1246cbe4e7286e7b13e07806d9ddce52f2c5e0797af177148a316b8 WHIRLPOOL 17b7633eb6e0310e154e2120960a46475b1f56b298a4c0612bb58ccab9467da7a2752a8185a38b61792a277e4d1e8c9160a16549b3275b22ad2a02e3fec7d0e2
+MISC ChangeLog 569 SHA256 796d58af0eb1346bf92a2c53d356e088345e8b9bc86a90085ed5ddf795bd6a91 SHA512 0a98cd380e24f8188f1d332aa54ab9a8acfd92ed56f8ca136608e724ca0bc31f18eed428253587b359a4d5e329bf47ff121245fd48093f5531dcea6d544b419c WHIRLPOOL 5d5a59997c46c107e3ce989fb6b285dd2546c35ca2ef1876a11aab2e6e2ec0d5b99c87e1582097388bdbfd5440008efb07a6f67754e3e2243d9f861b9e3c4645
 MISC metadata.xml 233 SHA256 fd88d74157f79eb4a06067443b7138cfb56fe1c66bfa5dfe72bda038ea5a9dda SHA512 6676f74cc1b612ba4f95101b64570f257e4b37cfd803a987e3afd9e12ef9b1480918c5d6e4fa955b8447eba9e319c94aac11abe247187870406986b476b154e8 WHIRLPOOL 3c1f192d1fb5e213e407a70a7be417170b651f3049b32ddf1f6b1c1983dedbcb498fa92eb96a41463c0ff0754044930150f0e5940708a6584923e12b86200349
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUrHZTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUrbjqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOx2oQANq/fMIlLXwIDKU4sJXrHHoL
-7dCCyMdavid7pOljIZ5SDvP8l8cqJ6+JRJYUaDBE59YvbkJetgL4BLoneBPcn6Eg
-nKaqzQph3hv2uEfECNihcHqRqOGsv4fqdLSE1cFLfG9ZNOJ9Di+a4ghr57QmsCJv
-uJJMWdXIkKZnEP8DlFGDZ7OGsCZdjuCfn5nLPdlD3OfprJJ160ybKOPQQ2x2LNoD
-yZ148m68p3kpsZVSaxwTtyVU+H82ySoEGvfzBYl0LM+zMCKtHLFof2qbXMQg17pr
-7J+da9h/+i3b+C1dY5rKi/5HSsNsQ2GooRO/4YAmACycIPU0uK7y9uuWM6/ftS2d
-tKib/fNhC7ZxI1GOrRTAChqUarefYAw4htkvmdhmLll0N7WRbxWBney0ZL/g6WEl
-LSXMviVlaYIVApkrhghhkWbG/qgkPFltZ12ko6/ALTeoIw4aYfADXEw25HJWvJhg
-WBYQ+3a79FY5E8zXKHa2f/dHhKPSlR31R7wVq1nlx265H/g8nFi3xzTDtJRHJCDB
-6qZvzL/RyXj1VcWI+TkjdIijD5swpx5j9j2Lm8nSzVypu3H1fB3WWUYUvRIXsmsw
-dnX8lgmAfi7lecHGRqHTDI5tJbhtxC4r1fnwPiUSyeimZKqX017U1Fmliu0vMKns
-QyJ4NitZYPiozfD+UaiY
-=VAwU
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOD2AQAM3Yar3tZMmY6rs4GCtgmnL6
+AI7zEYtmwYrfyPThnMzfWx5ChsSgBqizMOz0iiPEqLq7pPcxfUQGTm2DS2UYHmiD
+9XGakaf7HtqmOJWNJ68WXFeKJEE2WaITWp1q8NtsP12aBGBORK0CZHP+5zIGHxBt
+4EXfZ3pt2C6xjmrDwUuv8quJPVdT2Z9+7fD1teZlMfyVrFeG/fNKBPBc47zPsPUu
+JMVdav/a7UVrDig/12jHhZXf0NNE+6nak2DV7G+8eH6jZhEySuQne3RdYuJapwI0
+C4YGnE9/ke9zSNs/MgW8X2RGqXdNHYnUqmS5RB9Pli+LyObkGSPyugcu/vpScqoH
+c+rliV6EJd0ZTZH6Uz3MQIzVvXFAITBCTXgYofLbKDUk6xRsP1QJDCpErlYfM+fa
+pOIAVY4Sb6mjj/LydMJF0wmIInDF74SpWtUqXPHai9DDTBQg4Ngarp6tp1JLM2wz
+kghUjoUa1uCY144ORJS5zZtd8wJQy6wAgI581iN5rw3fsWhUxBSaizQDin+kqYIh
+vrNagYqbCexfh+FPDnpXoYMO8JYhN8Wt5J4zLStiDdg0zhO9LU9s0ZeXd+/dDHP7
+J0BrKKJsqh6IscUBAmMChSAOFbRdc4fet60FfGTIe/u+bBb8cxd01Wc2eH0jqmAn
+EhViJjqVkG1X1B4Cijut
+=sXKU
 -----END PGP SIGNATURE-----
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.4.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.4.1.ebuild
index 72117871bd54..c7ea66052813 100644
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.4.1.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.4.1.ebuild,v 1.1 2015/01/06 23:57:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.4.1.ebuild,v 1.2 2015/01/07 22:53:29 mgorny Exp $
 
 EAPI=5
 
@@ -25,23 +25,31 @@ src_install() {
 pkg_postinst() {
 	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
 
-	# no newer version? we're the newest!
+	# no version newer than ours? we're the newest!
 	if ! has_version ">${CATEGORY}/${PF}"; then
 		ln -f -s -v "${P}.iso" "${f}" || die
 	fi
 }
 
 pkg_postrm() {
-	# TODO: best_version is probably broken in portage, figure it out
 	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-	local newest_version=$(best_version "${CATEGORY}/${PN}")
-
-	if [[ ${newest_version} != ${CATEGORY}/${PF} ]]; then
-		# we're not the newest? update the symlink.
-		ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-	elif [[ ! ${newest_version} ]]; then
-		# last version removed? clean up the symlink.
-		rm -v "${f}" || die
-		# TODO: remove the empty directory
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
 	fi
 }