Reset permissions/owners on /var/cache/man if they are broken (like when migrating from sys-apps/man) #447944 by Viacheslav Prisivko.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

3 files changed, 32 insertions, 22 deletions

diff --git a/sys-apps/man-db/ChangeLog b/sys-apps/man-db/ChangeLog
index 8e02a0d40e8f..8dbc729f054a 100644
--- a/sys-apps/man-db/ChangeLog
+++ b/sys-apps/man-db/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/man-db
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-db/ChangeLog,v 1.33 2012/10/28 11:09:21 vapier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-db/ChangeLog,v 1.34 2013/01/13 00:13:48 vapier Exp $
+
+  13 Jan 2013; Mike Frysinger <vapier@gentoo.org> man-db-2.6.3-r1.ebuild:
+  Reset permissions/owners on /var/cache/man if they are broken (like when
+  migrating from sys-apps/man) #447944 by Viacheslav Prisivko.
 
 *man-db-2.6.3-r1 (28 Oct 2012)
 
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index e9524b7498da..363629978d3f 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -11,24 +11,24 @@ DIST man-db-2.6.3.tar.xz 1388944 SHA256 51db85cbbdcb99927865bad4c653a8b18991831e
 EBUILD man-db-2.6.0.2.ebuild 1505 SHA256 e2a928e997ecbb83087ae4d48bcef2e692a132710b89e6d422b20d872d25f6b5 SHA512 43bc78b6b1fce57b0fafe30dc7c5e06c5b92862df8cd7a362b6e896cc680d9b8bc26ad19ff1f7879e9102ec507ae264f7c7f7276100bce9572c966ef8ffe4e55 WHIRLPOOL 50a84ed002d91c9db5b52712ded8c44d4ec6665ee2109b24fd2acf4c566217aaa2432239c06d52a863518acf34914f35840678557f308bff7091fee3da632bed
 EBUILD man-db-2.6.1.ebuild 1402 SHA256 4ab54284e03a511c61933c0560d43a115783da38bc7c2bb1f17f1b4de55df5f1 SHA512 8e8f53b76da38b8dcc762f947b531a65f073d9de11f99d7e737d59a89ff4cc5ffb6a205cf63e15e08ff08dbbbefb6ad5f4e672396282ec05d1c8aca33e3beaae WHIRLPOOL ced116522e102f1063c060497da8341b613538c0d7cf84ba766599e570e16827f7837cffd28f912d4aa3c6537f7ea6a8ab39f186674368789c91e2e151e55d4c
 EBUILD man-db-2.6.2.ebuild 1402 SHA256 1226e09543c9a72026a7b6438a4f6e66b08b0db0f8b5d7460145afc11520a5c1 SHA512 ff960ab8f4d2f3fb39ba03f7b4d1e2c4e0317c22def8e6ffd4c37c48ba4376ab4d9ae06f2289a3027200891c8217fd63eb78d6dd25b1a9b07d85cbef0688ed88 WHIRLPOOL 50fe1562c393ce6657e0fa9628ac766736156d6b862672828d9d7db06b0de1c0a97aa93b3f8c44271e203f11f1322e1c4e2bcf10179ae5d0648e17cbd862342e
-EBUILD man-db-2.6.3-r1.ebuild 1791 SHA256 7af8961a0dccf5d70460196d45b325047c70bd5ea8e1c0677b46f5483d61b17f SHA512 69367dbed1c6584f87c90bd631a255bb6910ab26c99a903b82ad7ea923b117bf11c2ff44ebb2f0a10cf87ac0c844488756a2a2384ceb4b970cf24b78751f2602 WHIRLPOOL 8a37e1469db6eac9fad3f276289ebe24a19f354393d6bce98410c0ca33183e12d9968895217a4b32ac88f591f071036615ddecf4135c7b8837f2d25c6da2c92e
+EBUILD man-db-2.6.3-r1.ebuild 2061 SHA256 f8923202afd48ef28bbb8c51924113d2aace9b9aae4d02e981697bffd748d165 SHA512 7d7a35dcfd77a612477b5ca88a593d852d6524172efbfd95dcd87af49faa913ea145e2c25d0755fdb1637d1b3fb81b7883ec3a5b2ba4be478c631846d146d9d1 WHIRLPOOL 45cca7832f029289a752f8e521c4b42a36be34f7f50072920cf8b4d3b34ab7de4b99bf078805d327ed2c7c2f1f6bafc96e2eadc847e42428588894159a4934d4
 EBUILD man-db-2.6.3.ebuild 1349 SHA256 6a042e07293fd153c9f07f94bbb15fbdeba162c1584de9bd8599454dbd7218d7 SHA512 3bacd2af255ff12e4c7500c27b93e867a9fb639dd26972c326e3cb2963dd416ee5868d010339dc86a8870a6ae07bdbd9d95b484e55ed7e8ec0adee0aa1774700 WHIRLPOOL 1dd8b4f4b5bc2cc094d67be0e67b2eff37ceafa599e7c1244115492710333a51fe85c5f21f6138d09b52c5c92199750e6070af6a4137da30a48e5ca66f32b102
-MISC ChangeLog 5073 SHA256 40ae5f455ee16dc557fc58c4af74df174fcd79b2a7023e7a1f0fbb674285659f SHA512 411fac7650b845300278c64b4579562a82e76ca059a1f0f57809137f11fb8873785a9cab72e3dcfb0228959bc015b5d78c8bc6130ee5f67c14e040cdfe1474cb WHIRLPOOL 0c2292b9200668577d7e0f66ab36b1da82cae7f16408d45761aee60d1aa439511866f9c606c34b2b71328a9bf6eca470ad9e2ad6417f2322d9422de996a56a2e
+MISC ChangeLog 5286 SHA256 9081ca32ef652d15357500d468e1d6df1d772fb76e70de7f43b91990a86b22d5 SHA512 d201f04e43f5a3615b6804c8b22e646690026cd10f5519526da1c820340e911c9967cc1ceceb6d687e59dec1c4b610d956edf5553d8a350bfae83eb8da336ef5 WHIRLPOOL 57916c804ef6f055882c18f16f9e396355387d24924bf5c77286d29e941eb0d20474f85f78c4acdef002c5ac8376d74c8604c95c518586bbc26a77212909f723
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQjRJnAAoJELEHsLL7fEFWar4QAKtuuYdw+MvWn8eCUUzquATU
-sBclQANCqvYPmHDWctxjGSdLOjpiZEb+qhuWzt8AJdLzx8yKl6/oAFkOPY70QpEI
-b+7B0f5+0WBgk2NzxRjy+cDk4OdZJgCDKm6h5ZIcWJw+0RA3Phjx/OALbzh5BtTX
-X1REJtpp4wjY2fKee0U3FzCvImc8vb67VEBO32pKgRVLIF7bfs6Au/cIPw+Lj1b4
-bIkTZ8flRrOQL6TPAVHQKuP6wW5qzZ/2izEPO4bh94AlEW9ykM0iCQl1ZynC7tDF
-vBY0w6tfezC+ZkZAANZRdJppUDgdW3shMFQvf5FtB/PuA0FSthdeWrME9zh90oZu
-gQc5ipg80UlSNK5U2kGzygpEOCvD2bCody8ah556sAwvYydT+Xs/YDW7e5Bk89xs
-+3mlMm3S5dFkDMpClZKVnojyjTaEuUfiBHXp5KhSdn/eqnC1F/0c97aUxPoHJebK
-gVcvyiDyKzCgk/1NeWa++lzcwc3HJZGoze6HA38mww+Tk+NCx0vzzUsvgfpeRilc
-jC9xOQRCMPkAALLxarjclrRRo5xxLAe20sHtDzjIECkivyshh2E/V6KSShEPdmnn
-T0DZ+5q2V2kftpR8U0RNWqu2GBNJR4QUv3ZI+2wuGUto4Rt1pfMg9idnyizxBovt
-jsD7KQMdJxWSxZ6TF0IR
-=m605
+iQIcBAEBCAAGBQJQ8fzvAAoJELEHsLL7fEFWQjIQAIWjl38ATweoAkNNQyOCm+Wh
+PE2EjlIdSz8aBH5aUAKyjfrFjTqOPaiYpphr80Gbborw9WU5M9asE/f6LB+V1LzK
+IQOQoFLI8I79hgv3/+9oIiVNd4PWx7U4qOcbkVgUqiDkJo/xuAdl3TAKaB38gQyL
+lnUzE6f6Gdosvpgi2JO3JXBgDgMxpK+NX4zChJ0eXM7iJ20DzmRK3lnoGQZxAqYs
+ggLKLJtlk0q5JXJJKik6Vhdv64Q97BRfRQ8o53qIGK8tN1L73MUoNT/ukeLOs6R3
+lbF1H7omCNV2cBYym/9FSlKknxmUhYd2aCu3SFn9HSX9uROurkmQNX9uBJP/k1Yv
+nqP5geBWzxq8RPWeUz0O5bJv417ooSIWczYzNCPtUkuoGqmMAD5vgdnp9m5nMsPO
+f2/DCHaUEWN1Fm8dEr7BFNTh0v/5QeHOYwYMAYOlnv31wXfGc2FkRUuyHV0u3YkH
+F9BsITPeAK1EJbKkHHRCgrU60bMEk1V/3PKaeAOmnlxxZDAaI9GiB/rvWkx0em1Y
+zXrMD5+Taa+f2JRCCmfmzGvgnJeOBO4A6d9hehHWSBlz/KX7eyxf4z53OKSLs5Vj
+9Ibxb0fGa82ItuKM7T1J71jGkfMGPtxs0Ku74cqbscbuluPstnGA1ThOqgJmRmok
+Jw42crnqy7Hirn+PqLOb
+=d6v5
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/man-db/man-db-2.6.3-r1.ebuild b/sys-apps/man-db/man-db-2.6.3-r1.ebuild
index 6dbdf58b6606..b16ce7cf7f8e 100644
--- a/sys-apps/man-db/man-db-2.6.3-r1.ebuild
+++ b/sys-apps/man-db/man-db-2.6.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-db/man-db-2.6.3-r1.ebuild,v 1.1 2012/10/28 11:09:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-db/man-db-2.6.3-r1.ebuild,v 1.2 2013/01/13 00:13:48 vapier Exp $
 
 EAPI="4"
 
@@ -58,8 +58,14 @@ src_install() {
 }
 
 pkg_preinst() {
-	if [[ -f "${ROOT}"var/cache/man/whatis ]]; then
-		einfo "Cleaning ${ROOT}var/cache/man from sys-apps/man"
-		find "${ROOT}"var/cache/man -type f '!' '(' -name index.bt -o -name index.db ')' -delete
+	if [[ -f ${EROOT}var/cache/man/whatis ]] ; then
+		einfo "Cleaning ${EROOT}var/cache/man from sys-apps/man"
+		find "${EROOT}"var/cache/man -type f '!' '(' -name index.bt -o -name index.db ')' -delete
+	fi
+	if [[ ! -g ${EROOT}var/cache/man ]] ; then
+		einfo "Resetting permissions on ${EROOT}var/cache/man" #447944
+		mkdir -p "${EROOT}var/cache/man"
+		chown -R man:root "${EROOT}"var/cache/man
+		find "${EROOT}"var/cache/man -type d '!' -perm /g=s -exec chmod 2755 {} +
 	fi
 }