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 1Li3Rf-0001ME-Fg for garchives@archives.gentoo.org; Fri, 13 Mar 2009 09:12:47 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D050CE0348; Fri, 13 Mar 2009 09:12:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8C7E1E0348 for ; Fri, 13 Mar 2009 09:12:46 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 32887643CC for ; Fri, 13 Mar 2009 09:12:46 +0000 (UTC) Received: from ulm by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1Li3Rd-0007BR-UM for gentoo-commits@lists.gentoo.org; Fri, 13 Mar 2009 09:12:45 +0000 From: "Ulrich Mueller (ulm)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, ulm@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-emacs/emacs-common-gentoo: ChangeLog emacs-common-gentoo-1.0.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog emacs-common-gentoo-1.0.ebuild X-VCS-Directories: app-emacs/emacs-common-gentoo X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Mueller Content-Type: text/plain; charset=utf8 Message-Id: Sender: Ulrich Mueller Date: Fri, 13 Mar 2009 09:12:45 +0000 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: 0584650b-8ec9-4859-a89e-b1a6b0c35c61 X-Archives-Hash: 1dfbdbcf15f7d4add2eca4ea82f7144b ulm 09/03/13 09:12:45 Modified: ChangeLog emacs-common-gentoo-1.0.ebuild Log: Remove orphan files only if this is not a reinstall. (Portage version: 2.2_rc25/cvs/Linux i686) Revision Changes Path 1.3 app-emacs/emacs-common-gentoo/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emacs/emacs-co= mmon-gentoo/ChangeLog?rev=3D1.3&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emacs/emacs-co= mmon-gentoo/ChangeLog?rev=3D1.3&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emacs/emacs-co= mmon-gentoo/ChangeLog?r1=3D1.2&r2=3D1.3 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog= ,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ChangeLog 12 Mar 2009 09:44:24 -0000 1.2 +++ ChangeLog 13 Mar 2009 09:12:45 -0000 1.3 @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/emacs-desktop # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeL= og,v 1.2 2009/03/12 09:44:24 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeL= og,v 1.3 2009/03/13 09:12:45 ulm Exp $ + + 13 Mar 2009; Ulrich Mueller + emacs-common-gentoo-1.0.ebuild: + Remove orphan files only if this is not a reinstall. =20 *emacs-common-gentoo-1.0 (12 Mar 2009) *emacs-common-gentoo-0.3 (12 Mar 2009) 1.3 app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.= 0.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emacs/emacs-co= mmon-gentoo/emacs-common-gentoo-1.0.ebuild?rev=3D1.3&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emacs/emacs-co= mmon-gentoo/emacs-common-gentoo-1.0.ebuild?rev=3D1.3&content-type=3Dtext/= plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emacs/emacs-co= mmon-gentoo/emacs-common-gentoo-1.0.ebuild?r1=3D1.2&r2=3D1.3 Index: emacs-common-gentoo-1.0.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-com= mon-gentoo-1.0.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- emacs-common-gentoo-1.0.ebuild 12 Mar 2009 14:08:22 -0000 1.2 +++ emacs-common-gentoo-1.0.ebuild 13 Mar 2009 09:12:45 -0000 1.3 @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-c= ommon-gentoo-1.0.ebuild,v 1.2 2009/03/12 14:08:22 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-c= ommon-gentoo-1.0.ebuild,v 1.3 2009/03/13 09:12:45 ulm Exp $ =20 inherit elisp-common eutils fdo-mime gnome2-utils =20 @@ -16,8 +16,12 @@ PDEPEND=3D"virtual/emacs" =20 pkg_setup() { - # clean up orphan file installed by old Emacs ebuilds - rm -f "${ROOT}${SITELISP}/subdirs.el" + if [ -e "${ROOT}${SITELISP}/subdirs.el" ] \ + && ! has_version ">=3D${CATEGORY}/${PN}-1" + then + ewarn "Removing orphan subdirs.el (installed by old Emacs ebuilds)" + rm -f "${ROOT}${SITELISP}/subdirs.el" + fi } =20 src_install() {