doc is not removed in pkg_postrm if re-emerging the last version (bug #99375)

Package-Manager: portage-2.0.51.22-r2

5 files changed, 40 insertions, 24 deletions

diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index fd45125ca640..650f02834e25 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,27 +1,27 @@
-MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491
+MD5 def58cafa80db83422102057ccdad3cf samba-3.0.11.ebuild 9076
+MD5 97844aa955e81548824ea448d22da7d0 samba-3.0.14a-r2.ebuild 9168
+MD5 7b05dc99e54f0b8f7ac5e128f2090f87 samba-3.0.10.ebuild 16844
+MD5 d16c09b4e8ef3e2758d13d409823a102 samba-3.0.14a-r1.ebuild 9078
 MD5 ea646590dde34d9b64513d1b4feba49d ChangeLog 33090
-MD5 c0db762241c44be0cdf52c7c4e870d97 samba-3.0.14a-r1.ebuild 8920
-MD5 957a48d442fb56c39630bfb0333fe418 samba-3.0.14a-r2.ebuild 9012
-MD5 640f25d1da6364e934a26b3ccd504d90 samba-3.0.10.ebuild 16686
-MD5 5b9c636d2f1fc770a26082261df91333 samba-3.0.11.ebuild 8918
+MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491
 MD5 fa1dcd2c95a81c22c2ad68de6698a85e files/digest-samba-3.0.10 206
+MD5 498babc5e33f61369f42201f25eb35c0 files/digest-samba-3.0.11 215
+MD5 e89b19f1e62e257cbaa23a44a0362a58 files/swat.xinetd 527
 MD5 def157a63ec14450df82373617c7dc4b files/samba-3.0.11-gcc4.patch 485
-MD5 519576a9448b86f1a7baab18204533a5 files/lmhosts 126
-MD5 12df1953c039c5a93939497b0bc0ffba files/nsswitch.conf-winbind 403
+MD5 e17a1638ad9f30f2e39db4c8981a2fcd files/vscan-0.3.5-libclamav.patch 523
 MD5 7ee5edc70bf80888c776f5808f865996 files/nsswitch.conf-wins 392
-MD5 0c0364e7f0bc4cc48d8f9b103e606a93 files/samba-2.2.8-statfs.patch 239
-MD5 3cff882704d5ba84a75a76fc4262b3d3 files/digest-samba-3.0.14a-r1 216
-MD5 498babc5e33f61369f42201f25eb35c0 files/digest-samba-3.0.11 215
-MD5 d4e9a54f480d846b5b5ba84b4f29c17c files/digest-samba-3.0.14a-r2 216
+MD5 341521b710d02d57a70acd49b1d4c06b files/samba-conf 1291
+MD5 a1bbdaf99b7a3819a219a9450fa3dd0a files/samba-init 1104
 MD5 b836e258befae9d6c66cb3f158769b25 files/samba-3.0.x-libdirsymlink.patch 592
+MD5 12df1953c039c5a93939497b0bc0ffba files/nsswitch.conf-winbind 403
+MD5 519576a9448b86f1a7baab18204533a5 files/lmhosts 126
 MD5 e75c2316eced1d80cb2161848581c6a3 files/samba-3.0.x-python-setup.patch 1094
+MD5 3cff882704d5ba84a75a76fc4262b3d3 files/digest-samba-3.0.14a-r1 216
+MD5 d4e9a54f480d846b5b5ba84b4f29c17c files/digest-samba-3.0.14a-r2 216
+MD5 0c0364e7f0bc4cc48d8f9b103e606a93 files/samba-2.2.8-statfs.patch 239
 MD5 8ea7b443dd580aaaaf7e9e896eba54f2 files/samba-3.0.x-smbumount-uid32.patch 425
-MD5 341521b710d02d57a70acd49b1d4c06b files/samba-conf 1291
-MD5 a1bbdaf99b7a3819a219a9450fa3dd0a files/samba-init 1104
-MD5 9f9da063cb02079a8f205bc365426170 files/samba.pam 513
 MD5 bf268fdddc8ef677b6fa78661a094eac files/samba.schema 16044
 MD5 239ef0e21552896faeef21c685561245 files/smb.conf.example-samba3.gz 7808
 MD5 3685eadb817d185b06476eca6c0c15c4 files/smbusers 204
-MD5 e89b19f1e62e257cbaa23a44a0362a58 files/swat.xinetd 527
 MD5 09195dd8ab25ce77ac51c0c05b4ab93c files/system-auth-winbind 869
-MD5 e17a1638ad9f30f2e39db4c8981a2fcd files/vscan-0.3.5-libclamav.patch 523
+MD5 9f9da063cb02079a8f205bc365426170 files/samba.pam 513
diff --git a/net-fs/samba/samba-3.0.10.ebuild b/net-fs/samba/samba-3.0.10.ebuild
index 179b07764390..fa2c4a1beccb 100644
--- a/net-fs/samba/samba-3.0.10.ebuild
+++ b/net-fs/samba/samba-3.0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.10.ebuild,v 1.19 2005/07/22 09:16:12 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.10.ebuild,v 1.20 2005/08/03 14:02:15 satya Exp $
 
 inherit eutils flag-o-matic
 #---------------------------------------------------------------------------
@@ -404,5 +404,9 @@ pkg_postinst() {
 }
 
 pkg_postrm(){
-	[ -n "${PF}" ] && rm -rf ${ROOT}/usr/share/doc/${PF}
+	# If stale docs, and one isn't re-emerging the latest version, removes
+	# (this is really a portage bug, though)
+	[[ -n "${PF}" && ! -f ${ROOT}/usr/lib/${PN}/en.msg ]] && \
+		rm -rf ${ROOT}/usr/share/doc/${PF}
 }
+
diff --git a/net-fs/samba/samba-3.0.11.ebuild b/net-fs/samba/samba-3.0.11.ebuild
index df1aac89d53c..13c30e9c2dc8 100644
--- a/net-fs/samba/samba-3.0.11.ebuild
+++ b/net-fs/samba/samba-3.0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.11.ebuild,v 1.11 2005/07/22 09:16:12 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.11.ebuild,v 1.12 2005/08/03 14:02:15 satya Exp $
 
 inherit eutils versionator
 
@@ -304,5 +304,9 @@ pkg_postinst() {
 }
 
 pkg_postrm(){
-	[ -n "${PF}" ] && rm -rf ${ROOT}/usr/share/doc/${PF}
+	# If stale docs, and one isn't re-emerging the latest version, removes
+	# (this is really a portage bug, though)
+	[[ -n "${PF}" && ! -f ${ROOT}/usr/lib/${PN}/en.msg ]] && \
+		rm -rf ${ROOT}/usr/share/doc/${PF}
 }
+
diff --git a/net-fs/samba/samba-3.0.14a-r1.ebuild b/net-fs/samba/samba-3.0.14a-r1.ebuild
index 33990dbef890..7d27b4cf39c7 100644
--- a/net-fs/samba/samba-3.0.14a-r1.ebuild
+++ b/net-fs/samba/samba-3.0.14a-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.14a-r1.ebuild,v 1.11 2005/07/22 09:16:12 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.14a-r1.ebuild,v 1.12 2005/08/03 14:02:15 satya Exp $
 
 inherit eutils versionator
 
@@ -304,5 +304,9 @@ pkg_postinst() {
 }
 
 pkg_postrm(){
-	[ -n "${PF}" ] && rm -rf ${ROOT}/usr/share/doc/${PF}
+	# If stale docs, and one isn't re-emerging the latest version, removes
+	# (this is really a portage bug, though)
+	[[ -n "${PF}" && ! -f ${ROOT}/usr/lib/${PN}/en.msg ]] && \
+		rm -rf ${ROOT}/usr/share/doc/${PF}
 }
+
diff --git a/net-fs/samba/samba-3.0.14a-r2.ebuild b/net-fs/samba/samba-3.0.14a-r2.ebuild
index 8dc98a3aeaff..a7368ad791da 100644
--- a/net-fs/samba/samba-3.0.14a-r2.ebuild
+++ b/net-fs/samba/samba-3.0.14a-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.14a-r2.ebuild,v 1.7 2005/08/03 13:30:42 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.14a-r2.ebuild,v 1.8 2005/08/03 14:02:15 satya Exp $
 
 inherit eutils versionator
 
@@ -307,5 +307,9 @@ pkg_postinst() {
 }
 
 pkg_postrm(){
-	[ -n "${PF}" ] && rm -rf ${ROOT}/usr/share/doc/${PF}
+	# If stale docs, and one isn't re-emerging the latest version, removes
+	# (this is really a portage bug, though)
+	[[ -n "${PF}" && ! -f ${ROOT}/usr/lib/${PN}/en.msg ]] && \
+		rm -rf ${ROOT}/usr/share/doc/${PF}
 }
+