From 5babe77405686be33c39a4430f2b187610899fcd Mon Sep 17 00:00:00 2001 From: Ulrich Müller Date: Thu, 10 Jan 2008 17:26:15 +0000 Subject: Remove desktop and icon files to avoid collisions. (Portage version: 2.1.4_rc14) --- app-editors/emacs-cvs/ChangeLog | 7 ++++++- app-editors/emacs-cvs/emacs-cvs-23.0.50-r1.ebuild | 3 ++- app-editors/emacs-cvs/emacs-cvs-23.0.60-r1.ebuild | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) (limited to 'app-editors/emacs-cvs') diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog index 987918cf3b03..ea786e257151 100644 --- a/app-editors/emacs-cvs/ChangeLog +++ b/app-editors/emacs-cvs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-editors/emacs-cvs # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.181 2008/01/02 18:54:59 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.182 2008/01/10 17:26:15 ulm Exp $ + + 10 Jan 2008; Ulrich Mueller emacs-cvs-23.0.50-r1.ebuild, + emacs-cvs-23.0.60-r1.ebuild: + Remove desktop and icon files to avoid collisions between SLOTs and with + x11-misc/emacs-desktop. Thanks to Stelian Ionescu for pointing this out. 02 Jan 2008; Ulrich Mueller emacs-cvs-22.1.50-r2.ebuild, emacs-cvs-22.1.50_p20070829-r2.ebuild, diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.50-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.50-r1.ebuild index e8fdb6e41f16..a34cb5769fc6 100644 --- a/app-editors/emacs-cvs/emacs-cvs-23.0.50-r1.ebuild +++ b/app-editors/emacs-cvs/emacs-cvs-23.0.50-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.50-r1.ebuild,v 1.7 2008/01/10 14:47:41 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.50-r1.ebuild,v 1.8 2008/01/10 17:26:15 ulm Exp $ ECVS_AUTH="pserver" ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs" @@ -184,6 +184,7 @@ src_install () { # avoid collision between slots, see bug #169033 e.g. rm "${D}"/usr/share/emacs/site-lisp/subdirs.el + rm -rf "${D}"/usr/share/{applications,icons} rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores keepdir /var/lib/games/emacs/ diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.60-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.60-r1.ebuild index 0085d701afff..5f7ea6effe73 100644 --- a/app-editors/emacs-cvs/emacs-cvs-23.0.60-r1.ebuild +++ b/app-editors/emacs-cvs/emacs-cvs-23.0.60-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60-r1.ebuild,v 1.7 2008/01/10 14:47:41 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60-r1.ebuild,v 1.8 2008/01/10 17:26:15 ulm Exp $ ECVS_AUTH="pserver" ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs" @@ -187,6 +187,7 @@ src_install () { # avoid collision between slots, see bug #169033 e.g. rm "${D}"/usr/share/emacs/site-lisp/subdirs.el + rm -rf "${D}"/usr/share/{applications,icons} rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores keepdir /var/lib/games/emacs/ -- cgit v1.2.3-65-gdbad