From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QN5y6-0008Ku-UH for garchives@archives.gentoo.org; Thu, 19 May 2011 16:20:59 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 405B11C001; Thu, 19 May 2011 16:20:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id F0E6A1C001 for ; Thu, 19 May 2011 16:20:47 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6B2C81B402B for ; Thu, 19 May 2011 16:20:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id B7FAC80504 for ; Thu, 19 May 2011 16:20:46 +0000 (UTC) From: "Jonathan Callen" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jonathan Callen" Message-ID: Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdm/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/kdm/kdm-4.6.9999.ebuild kde-base/kdm/kdm-9999.ebuild X-VCS-Directories: kde-base/kdm/ X-VCS-Committer: abcd X-VCS-Committer-Name: Jonathan Callen X-VCS-Revision: b741de87c2ae6e27eabbaf7f8b53ae860f96aa30 Date: Thu, 19 May 2011 16:20:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 43c89d21bc084fd5e18a393019608015 commit: b741de87c2ae6e27eabbaf7f8b53ae860f96aa30 Author: Jonathan Callen gentoo org> AuthorDate: Thu May 19 16:19:24 2011 +0000 Commit: Jonathan Callen gentoo org> CommitDate: Thu May 19 16:20:39 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3Db741de87 [kde-base/kdm] Attempt to migrate some settings from older locations (Portage version: 2.2.0_alpha34/git/Linux x86_64, signed Manifest commit = with key 229E5838) --- kde-base/kdm/kdm-4.6.9999.ebuild | 53 ++++++++++++++++++++++++++++++--= ----- kde-base/kdm/kdm-9999.ebuild | 53 ++++++++++++++++++++++++++++++--= ----- 2 files changed, 86 insertions(+), 20 deletions(-) diff --git a/kde-base/kdm/kdm-4.6.9999.ebuild b/kde-base/kdm/kdm-4.6.9999= .ebuild index adee0f2..0a99097 100644 --- a/kde-base/kdm/kdm-4.6.9999.ebuild +++ b/kde-base/kdm/kdm-4.6.9999.ebuild @@ -102,18 +102,51 @@ src_install() { pkg_postinst() { kde4-meta_pkg_postinst =20 + local file src dest dir old_dirs=3D( + /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 a= dmin # because this is user-overrideable in that way, it's not in src_instal= l - 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=3D${file#*:} + dest=3D${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} !=3D /usr/* && -d ${EROOT}${dir} ]]; then + echo + elog "The directory ${EROOT%/}${dir} still exists from an older insta= llation of KDE." + elog "You may wish to copy relevant settings into ${EROOT%/}${KDM_HOM= E}." + 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}" =20 if use consolekit; then echo diff --git a/kde-base/kdm/kdm-9999.ebuild b/kde-base/kdm/kdm-9999.ebuild index adee0f2..0a99097 100644 --- a/kde-base/kdm/kdm-9999.ebuild +++ b/kde-base/kdm/kdm-9999.ebuild @@ -102,18 +102,51 @@ src_install() { pkg_postinst() { kde4-meta_pkg_postinst =20 + local file src dest dir old_dirs=3D( + /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 a= dmin # because this is user-overrideable in that way, it's not in src_instal= l - 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=3D${file#*:} + dest=3D${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} !=3D /usr/* && -d ${EROOT}${dir} ]]; then + echo + elog "The directory ${EROOT%/}${dir} still exists from an older insta= llation of KDE." + elog "You may wish to copy relevant settings into ${EROOT%/}${KDM_HOM= E}." + 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}" =20 if use consolekit; then echo