Update owner and permissions in /var only if necessary.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

3 files changed, 30 insertions, 23 deletions

diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog
index 0f7a1b7a3b62..42ec26dc4c8a 100644
--- a/app-emacs/emacs-common-gentoo/ChangeLog
+++ b/app-emacs/emacs-common-gentoo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emacs/emacs-common-gentoo
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.111 2015/02/21 08:46:47 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.112 2015/02/22 15:07:48 ulm Exp $
+
+  22 Feb 2015; Ulrich Müller <ulm@gentoo.org>
+  emacs-common-gentoo-1.4-r2.ebuild:
+  Update owner and permissions in /var only if necessary.
 
 *emacs-common-gentoo-1.4-r2 (21 Feb 2015)
 
diff --git a/app-emacs/emacs-common-gentoo/Manifest b/app-emacs/emacs-common-gentoo/Manifest
index 22daf56ae215..43fb2177f26b 100644
--- a/app-emacs/emacs-common-gentoo/Manifest
+++ b/app-emacs/emacs-common-gentoo/Manifest
@@ -3,20 +3,20 @@ Hash: SHA256
 
 DIST emacs-common-gentoo-1.4.tar.xz 40848 SHA256 c36081d809c47f4414d623726eeff54d6512eca7f178f864e1f0c71e58a5b78f SHA512 f993ef83bdfe1e622688d93b81f1317663f2918f1dace8785474db759f411c0dc883e9946872e05cc406a1191bf29abe193af5212d652d2e64d5f64576a28cbe WHIRLPOOL 9861d4fadad9a420ebc2ac7f61dec2441ce934903cded6efeeb91600d2ef98fdf1af9f78ebb3518b7810034a2fc8cbb1f7e34ca2467c679083a1de193f181bb5
 EBUILD emacs-common-gentoo-1.4-r1.ebuild 4510 SHA256 09937ea87ba9559d9502896904f9490689f11c33c42ce491cad4e8b2f65d0706 SHA512 31f07d00dec75f9a0b956c5f6a951cdfb3240a2018d03ba45b5985af282d9a85bd70d057a314122b4b4146ab0f30e5606aba3717f7edfcef410f7d236c89e5c1 WHIRLPOOL a67ff6c6e0e88fd6f961e0af945be91734eef04dbbc47e9119149a660e80b40c23c0564722c5f997b761a51bf3c6b6f9fde8f24d07083b37db8229c6776c1868
-EBUILD emacs-common-gentoo-1.4-r2.ebuild 4580 SHA256 24e32d2687f6228f25aba420eda074973048568a0bab72900f767d626d465cdd SHA512 4ecc8f6f0875d5b3c999af0b1708b4ee61fa2ea3e1a80862c07c1c48874f1b07cf52010e09d27c08f2c2118a6b025e1f7a11bb17a00ca83f0c39d0963ff26339 WHIRLPOOL 9707ecfd10bd3b5ab40220fced316cfa3edc66908b5f64a7a5115d4c830774e0b7255be592992900942cfb640205c2015441f1ce9f1e9a002a1e0d80d434256b
-MISC ChangeLog 17355 SHA256 87f69095dd2655775e7a54fac7e9823c6918e833ca46d11f8dd081bba47d0703 SHA512 a0c9967a6b4b2cb21d9cb311ef9c6b76893a2144bea136ef280f480856e77be54703aa2ea195133acd1bbbb87dc1816691cb4e6237b2e06d99e1bb0472ff2531 WHIRLPOOL 2e8a29283aa6b8521879a82c1b3b6180d0da03d2e5b09a18d5c5b1351edcd8b088bc59cc9fc06f21fc7e8161e7cb65895b6eb6ee1b87a8da70f0a5cbaa817a0c
+EBUILD emacs-common-gentoo-1.4-r2.ebuild 4822 SHA256 7a49f6c433dd9b38c94a0ebae2ebf08f778b40a322bb736e2b742ccab20d7d4e SHA512 12f330ed89219aa2505d40bdee94313fa1370f6091b5554af5d37e5f09bb103cf71555437d200171bfe0776f77d4be6723314d8f51b5a3afea039172e29dcc3f WHIRLPOOL 7664dca5b48fcfbfbb1f69765775fd4037781ca1229bedb84a72471826fe8c4188ddae1ec3bc3a98c7f9de671c4e0e747a19e5fd5319b4de5b928f1dc60b01c7
+MISC ChangeLog 17498 SHA256 ca03df2a93910abdb06f104f552770cfe014c2cf12fe82dd0f30ff53c723cf0e SHA512 7b97874f0b6a78d7047d232b4118c9687cfbea0ddd1b9f82e0fab3a5e410165408238f0ee68f1774a1da6e9dbea358a1a237012afac7529d5a0e988f8e51b6db WHIRLPOOL b7187a353236cc64c565546f6354459f2a766fb27448f3bb74683433ac6918a94259bd9e543d2e1b75fdd41332c3aa7e038221b0c127055e081a9e0deccf271d
 MISC metadata.xml 236 SHA256 f0b6df93ac83810a22d1519f0b37ee94996d1512c4fe4407df6fbb27f4da6608 SHA512 beb19666e6ea1a04718133d41e61ee7e7604ae0e614f979c66835f10fcd8b8e908a136a67397b212bcbb3e67d9bda458d561da228998cd9b616cd4a8bff6a989 WHIRLPOOL 099d599d015c0835bf2ed4780df6609ed0bf407c8cef5278f35fab89ccc6b9b2d98d48833aac8ef3243633dc33206eb155851cf570c980e96dc259d1e0416759
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGcBAEBCAAGBQJU6EYQAAoJEJQzkH1pP7W4frIL/1XpzIV2E77ZJMj/5Q+SkbXl
-tS9+hXZMrhX0/0cXUVhw5Tj6o2iH6+34ddytTztzm+CawURj31/825svVSJlEsf2
-qmsjNHkctF2usqih4tHyJw88FdoDnr0IuK4sHNSWBFRx98sgZl75Iuy4YMvdsxDa
-9Ublq/pmmjgUVDl3rt5ADrOaGbgJHonwNo5uDSVq5UTbjEJp1lzUOcDRYD/wzPI5
-NAjWnjrnbjb8NerfZ4Qx3GK4edvCFOugg5xB4qUkd59CRhS4w0hFd6/dMdcAxlje
-Tqso5Y9nCYnFatDVhS13M02nGvWLo2HfsKdx5vjCHoukKwzZn65xUcV3AR/C73n8
-P0zjUBPl0eP2E2yZ8Y+44CT2rHYSBcdh8aWx5n9+v5RXG2NL9Jl5sduzsirWKPH3
-asKDdwd3F4tFDFflyBxx0o+Kh7tRshy2BmVQPJVrM/0pXiTvphkDkC2WpCcV/6Wm
-RmE61yBRgzJCUdtYUAr92Ng0OfVkgBeHGNSVOt6dAw==
-=lEGK
+iQGcBAEBCAAGBQJU6fDcAAoJEJQzkH1pP7W4i+8L/1d5wApljXZckT/wAJyVw0K7
+nLS8+uCtrGUX/N//aLs8XNEdDhFRrtQGVotm3IltrMGK0X2P6s7cjaUFUi3uCawH
+qQ6f7Q6tV7NxlHd4XSNlGuS3a/qFbgWJi8qu8PhfvgLOYo16EqboIG6iX0K9JvJn
+iy+ZwYQ1bWSXdU/3Atq20VVi5WSxTFbxmpXt/flvBU/nyzw+gcXtxDIQFN7D/AQH
+QCryOafj8VaAggzc/jAkxRMcb1vNCbKTU9OsloZ6JP6izUAyZqMe6HHmvaFP7jBp
++vcBCiiI5VEzpMzdrLNTzBUyyG6unKH3sehIlYB+xVGwi0dAKnXWdDzEt/nopHyb
+YcauzES7R7ePbkOk4ihTMgqDrAnG5aA6bAnysALPwLxjN1nl/K23gVARSl2RAXol
+ulhIBhko41HMfrx6hYyicWV8rCfpWVARmGdhmKYhXr8r2NBCCiVapHX8TCmUXalG
+VEdeQX2BMZR/G+0u1U78Ne4Mv62eyIXlqS7suhGzTw==
+=CTP0
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.4-r2.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.4-r2.ebuild
index d352e9b66301..06e291160097 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.4-r2.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.4-r2.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-emacs/emacs-common-gentoo/emacs-common-gentoo-1.4-r2.ebuild,v 1.1 2015/02/21 08:46:47 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.4-r2.ebuild,v 1.2 2015/02/22 15:07:48 ulm Exp $
 
 EAPI=5
 
@@ -106,6 +106,18 @@ pkg_preinst() {
 			chgrp gamestat "${ED}${f}" || die
 			chmod g+w "${ED}${f}" || die
 		done
+
+		if [[ -d ${EROOT}/var/games && -z $(find "${EROOT}"/var/games \
+				-maxdepth 0 -uid 0 -gid 0 -perm 755 -print) ]]; then
+			chown 0:0 "${EROOT}"/var/games || die
+			chmod 755 "${EROOT}"/var/games || die
+		fi
+		if has 1.4-r1 ${REPLACING_VERSIONS} \
+				&& [[ -d ${EROOT}/var/games/emacs ]]; then
+			elog "Updating owner and permissions of score file directory."
+			chown 0:gamestat "${EROOT}"/var/games/emacs || die
+			chmod 775 "${EROOT}"/var/games/emacs || die
+		fi
 	fi
 
 	if [[ -e ${EROOT}${SITELISP}/site-start.el ]]; then
@@ -125,19 +137,10 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	if use games; then
-		# update permissions of shared score dir #537580
-		chown 0:0 "${EROOT}"/var/games
-		chmod 755 "${EROOT}"/var/games
-		chown 0:gamestat "${EROOT}"/var/games/emacs
-		chmod 775 "${EROOT}"/var/games/emacs
-	fi
-
 	if use X; then
 		fdo-mime_desktop_database_update
 		gnome2_icon_cache_update
 	fi
-
 	readme.gentoo_print_elog
 }