Attempt to do some migration from old directories, fix permissions on /var/lib/kdm, warn about old directories in /var/lib; remove old

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

3 files changed, 68 insertions, 28 deletions

diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index 0e42a1373e4b..29bfd509460b 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.243 2011/05/09 22:51:26 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.244 2011/05/19 16:28:52 abcd Exp $
+
+*kdm-4.6.3-r1 (19 May 2011)
+
+  19 May 2011; Jonathan Callen <abcd@gentoo.org> -kdm-4.6.3.ebuild,
+  +kdm-4.6.3-r1.ebuild:
+  Attempt to do some migration from old directories, fix permissions on
+  /var/lib/kdm, warn about old directories in /var/lib; remove old
 
   09 May 2011; Markos Chandras <hwoarang@gentoo.org> kdm-4.6.2-r1.ebuild:
   Stable on amd64 wrt bug #354033
diff --git a/kde-base/kdm/Manifest b/kde-base/kdm/Manifest
index 36f06b443e98..529d73c47109 100644
--- a/kde-base/kdm/Manifest
+++ b/kde-base/kdm/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 4.6.2_fix_halt_p1.patch 780 RMD160 227c029c717f1374a9a277f472df093fd8e01bd8 SHA1 6d1111f45f0c02871588e31f73c803821340dea5 SHA256 589bc27aac6c709e8c538d2f46df34128a726c927e7b35d483fb0e11ed3617b6
 AUX 4.6.2_fix_halt_p2.patch 741 RMD160 38c8f7ac2d865a9be91dff37503813719ad68f45 SHA1 9ba01cc7f40aac6098fe8150685ff4ebc319b8fd SHA256 090a9563cacfb847dfbe4842ab72f57c26a7c46fdbf6052cfaab8f4a84013ee0
@@ -12,23 +12,23 @@ DIST kdebase-workspace-4.6.2.tar.bz2 69356153 RMD160 23856ab63e17e3971071f2ccd02
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 EBUILD kdm-4.4.5.ebuild 3159 RMD160 c5ad77d8c2684fc335125f37f046739dad22f509 SHA1 579aad408d7db94b93ae7acab2471ef8f49c3cf5 SHA256 68395306a459bf8d12bd5560febfaeb22fe205bcd67530ec34abfe12d5a7fd3d
 EBUILD kdm-4.6.2-r1.ebuild 3490 RMD160 802508e8996ad6376b4cdb705d45be59d3bb0326 SHA1 05f574a64566e703f5bd3f689f594c98aabcacae SHA256 23c152fa4d48a029ca9c1a2378e6d5d3e025823737333f4cf4dac131d06ad005
-EBUILD kdm-4.6.3.ebuild 3388 RMD160 9d819387baacefc6953f456f50a4e9af60a46359 SHA1 a46948f27cfbf0dba1e2eb15445b90d487e8effb SHA256 702b819a803c048b6bcd0da52e9d08f666c56a389e803dea0fe0b092b41c9ad8
-MISC ChangeLog 32333 RMD160 e68d040d92cab08a873ee7daf761616429fff96e SHA1 dd3e47f19013acbeb976b0652dcb63ad487e5ce9 SHA256 df34508b8723d6c733eced04a850116d32562c0e18102fa0b84c5672864a89a2
+EBUILD kdm-4.6.3-r1.ebuild 4209 RMD160 84ab332d1745b7e216b10b4fea91a0466ac06f31 SHA1 eb59399421bb0168b7ae692104575e1d6e664d27 SHA256 2fca42820affe2cc6a55f56a01e2d44539428c93c957fdb5a0dba3b58fc9ca06
+MISC ChangeLog 32590 RMD160 803a87266cbf83509d23725ef0562bd16a12a096 SHA1 8ddc7a9aeb941be37efe6c0036e37c36a9b40aa9 SHA256 8ef851991afe07edbb55ddac4de11f6cf5d64e49b46b92336f6e5f384030dfe5
 MISC metadata.xml 253 RMD160 dbe3d0cc1778dad287767c5dee6b46b42ccf20ec SHA1 b4723a2baaec997efee2cdc543248a2aad8f1a7e SHA256 955ffc185b3b01315be94542ea43ae1180d5f61ea539a317c45c5746b463eeba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNyHABAAoJEPqDWhW0r/LCKVUQALGjWO8tZZRgL6Txw/o7WR5S
-pJ7RNtBmndjMFcLerQ2pd9Lk0z4MECJwqpTHpvLIeKicxo5vWgPdHPO90bWejxyO
-IqLWeNjXTXJOcJz2m1cvaDlRCTCqEMI2DsHGxvFbA2UO7gZ8turgyiQhLvF2WS2T
-2KAapcGBJsgltrSmus1yBDEqpeVqGq8d6zQ0UdCTvv7KzDsCN1lAWIZ3pBXgPdoF
-ZNLx4Q/XgYPk4p538m3C+lis55OeP7JDIrefOPWwr+8yRFHcg6GXdGJINx9rVuil
-dhsZOF8sLKkXKFssQhVpgwhyIENRvulf8Z0YlNSvZAMuhHbGX8D4Pa8lFsMkfIQ2
-wbCWrayaxSxtlWH+2iS0z9elahcvKv7ml9ucjtHgpt2TYD5RAZPy3CEweki4E6La
-QX722UHdXnIWOUbac9DO82aB5/TD/GMGh+KORiYZ9n4DHXLPPQTvrc6f6we+L/QW
-94b3uc49ZOL71OooyFXloyAHuMv1Ap5WtDe2d2XCiy3phZS930dP6uhqIjCBwWEn
-sg5GdvUQIV5x3EXKQXG10ZXDoS/apa1yWBxSsM2OHznc8IEq5mMgnz+iMRuWfg2v
-MbhlB8XAhg0Kzl8wV85t70G05DBOmKkcOk9yhbhOi7T5JpI5kal1wh+XbmW+txlF
-ABjPgy76TswYoI1cnD67
-=bH7g
+iQIcBAEBCAAGBQJN1UVKAAoJELHSF2kinlg4tT0P/i8M2bhUXNtL7p4Ljg2r0rMw
+vyNRGQXW0Ai8uCrE5G+x5eKYboDCwA3GAyms2TKa1avYhr6V8BdvRzQgTyYy9N9b
+4b+JO2YeZZpfSR/Cs3ITCz1WxUd9Z5pwzgj042IigVSQIXXG0g92eLk3aeJanxbI
+rrmGJz/eJ88H2QOZ5OluJI/TpDyzFzVQTeDo1xJrjXf1GOV+nkyPkfnBILQ1tvka
+d5bG9Cd1qg9TvielpKCcw6QeH+VAhziYdbORHccASmnSLrvIF7LfPWrmXt2Zjwtl
+dYC4ah6eEzH/aJ+d9xeGbfrL6f/VBOVqGgCkN+4y2Q63nt0KNw8yxV1qr6LlFjDu
+1+RQU63m/rY4dPk/Hv58Laa6ML5t3vVumSzWj8JbDeg8Cg1wUrZJLF6MDDkXIBs7
+IX1Cp48xtjaZYtlHdBQK1FMwyyo7LDjzYQOr/BBGnktU/PKNZpOtDq1ONUcWRt8w
+9XfBnMnglg6NIH0F+VPYrCOTn8fZesDP/L62knosV6NQpduG7bC9nj5caFMEOJ0V
+x6kW918tZqsxa1LQFrM8EbFC/nBuEyxBrhyC+7X7uSydeQ8GQq7d3aicqkQ6UjtZ
+xSr2HXqKDspecUFk9qlRzYDADZLVkcLbJzJ21YzD/3GD3xUy/xM6P4gRDN8I8Hp7
+yR9zm/qeWaxX0hEW7h4t
+=qI9D
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdm/kdm-4.6.3.ebuild b/kde-base/kdm/kdm-4.6.3-r1.ebuild
index 6e9e5806c2a5..57b81712319a 100644
--- a/kde-base/kdm/kdm-4.6.3.ebuild
+++ b/kde-base/kdm/kdm-4.6.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.6.3.ebuild,v 1.1 2011/05/07 10:48:06 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.6.3-r1.ebuild,v 1.1 2011/05/19 16:28:52 abcd Exp $
 
 EAPI=4
 
@@ -102,18 +102,51 @@ src_install() {
 pkg_postinst() {
 	kde4-meta_pkg_postinst
 
+	local file src dest dir old_dirs=(
+		/var/lib/kdm-live
+		/var/lib/kdm-4.6
+		/var/lib/kdm-4.5
+		/var/lib/kdm-4.4
+		/usr/share/apps/kdm
+		/usr/kde/4.4/share/apps/kdm
+		/usr/kde/4.3/share/apps/kdm
+		/usr/kde/4.2/share/apps/kdm
+	)
+
+	mkdir -p "${EROOT}${KDM_HOME}/faces"
 	# Set the default kdm face icon if it's not already set by the system admin
 	# because this is user-overrideable in that way, it's not in src_install
-	if [[ ! -e "${EPREFIX}${KDM_HOME}/faces/.default.face.icon" ]]; then
-		mkdir -p "${EPREFIX}${KDM_HOME}/faces"
-		cp "${EROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \
-			"${EPREFIX}${KDM_HOME}/faces/.default.face.icon"
-	fi
-	if [[ ! -e "${EPREFIX}${KDM_HOME}/faces/root.face.icon" ]]; then
-		mkdir -p "${EPREFIX}${KDM_HOME}/faces"
-		cp "${EROOT}${KDEDIR}/share/apps/kdm/pics/users/root1.png" \
-			"${EPREFIX}${KDM_HOME}/faces/root.face.icon"
-	fi
+	for file in faces/.default.face.icon:default1.png faces/root.face.icon:root1.png kdmsts: ; do
+		src=${file#*:}
+		dest=${file%:*}
+		if [[ ! -e ${EROOT}${KDM_HOME}/$dest ]]; then
+			for dir in "${old_dirs[@]}"; do
+				if [[ -e ${EROOT}${dir}/${dest} ]]; then
+					cp "${EROOT}${dir}/${dest}" "${EROOT}${KDM_HOME}/${dest}"
+					break 2
+				fi
+			done
+			if [[ -n ${src} ]]; then
+				cp "${EROOT}${KDEDIR}/share/apps/kdm/pics/users/${src}" \
+					"${EROOT}${KDM_HOME}/${dest}"
+			fi
+		fi
+	done
+	for dir in "${old_dirs[@]}"; do
+		if [[ ${dir} != /usr/* && -d ${EROOT}${dir} ]]; then
+			echo
+			elog "The directory ${EROOT%/}${dir} still exists from an older installation of KDE."
+			elog "You may wish to copy relevant settings into ${EROOT%/}${KDM_HOME}."
+			echo
+			elog "After doing so, you may delete the directory."
+			echo
+		fi
+	done
+
+	# Make sure permissions are correct -- old installations may have
+	# gotten this wrong
+	use prefix || chown root:kdm "${EROOT}${KDM_HOME}"
+	chmod 1770 "${EROOT}${KDM_HOME}"
 
 	if use consolekit; then
 		echo