| 1 |
ulm 08/01/10 17:26:16 |
| 2 |
|
| 3 |
Modified: ChangeLog emacs-cvs-23.0.60-r1.ebuild |
| 4 |
emacs-cvs-23.0.50-r1.ebuild |
| 5 |
Log: |
| 6 |
Remove desktop and icon files to avoid collisions. |
| 7 |
(Portage version: 2.1.4_rc14) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.182 app-editors/emacs-cvs/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/ChangeLog?rev=1.182&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/ChangeLog?rev=1.182&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/ChangeLog?r1=1.181&r2=1.182 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v |
| 19 |
retrieving revision 1.181 |
| 20 |
retrieving revision 1.182 |
| 21 |
diff -u -r1.181 -r1.182 |
| 22 |
--- ChangeLog 2 Jan 2008 18:54:59 -0000 1.181 |
| 23 |
+++ ChangeLog 10 Jan 2008 17:26:15 -0000 1.182 |
| 24 |
@@ -1,6 +1,11 @@ |
| 25 |
# ChangeLog for app-editors/emacs-cvs |
| 26 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.181 2008/01/02 18:54:59 ulm Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.182 2008/01/10 17:26:15 ulm Exp $ |
| 29 |
+ |
| 30 |
+ 10 Jan 2008; Ulrich Mueller <ulm@g.o> emacs-cvs-23.0.50-r1.ebuild, |
| 31 |
+ emacs-cvs-23.0.60-r1.ebuild: |
| 32 |
+ Remove desktop and icon files to avoid collisions between SLOTs and with |
| 33 |
+ x11-misc/emacs-desktop. Thanks to Stelian Ionescu for pointing this out. |
| 34 |
|
| 35 |
02 Jan 2008; Ulrich Mueller <ulm@g.o> emacs-cvs-22.1.50-r2.ebuild, |
| 36 |
emacs-cvs-22.1.50_p20070829-r2.ebuild, |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.8 app-editors/emacs-cvs/emacs-cvs-23.0.60-r1.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60-r1.ebuild?rev=1.8&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60-r1.ebuild?rev=1.8&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60-r1.ebuild?r1=1.7&r2=1.8 |
| 45 |
|
| 46 |
Index: emacs-cvs-23.0.60-r1.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60-r1.ebuild,v |
| 49 |
retrieving revision 1.7 |
| 50 |
retrieving revision 1.8 |
| 51 |
diff -u -r1.7 -r1.8 |
| 52 |
--- emacs-cvs-23.0.60-r1.ebuild 10 Jan 2008 14:47:41 -0000 1.7 |
| 53 |
+++ emacs-cvs-23.0.60-r1.ebuild 10 Jan 2008 17:26:15 -0000 1.8 |
| 54 |
@@ -1,6 +1,6 @@ |
| 55 |
# Copyright 1999-2008 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $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 $ |
| 58 |
+# $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 $ |
| 59 |
|
| 60 |
ECVS_AUTH="pserver" |
| 61 |
ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs" |
| 62 |
@@ -187,6 +187,7 @@ |
| 63 |
|
| 64 |
# avoid collision between slots, see bug #169033 e.g. |
| 65 |
rm "${D}"/usr/share/emacs/site-lisp/subdirs.el |
| 66 |
+ rm -rf "${D}"/usr/share/{applications,icons} |
| 67 |
rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores |
| 68 |
keepdir /var/lib/games/emacs/ |
| 69 |
|
| 70 |
|
| 71 |
|
| 72 |
|
| 73 |
1.8 app-editors/emacs-cvs/emacs-cvs-23.0.50-r1.ebuild |
| 74 |
|
| 75 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.50-r1.ebuild?rev=1.8&view=markup |
| 76 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.50-r1.ebuild?rev=1.8&content-type=text/plain |
| 77 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.50-r1.ebuild?r1=1.7&r2=1.8 |
| 78 |
|
| 79 |
Index: emacs-cvs-23.0.50-r1.ebuild |
| 80 |
=================================================================== |
| 81 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.50-r1.ebuild,v |
| 82 |
retrieving revision 1.7 |
| 83 |
retrieving revision 1.8 |
| 84 |
diff -u -r1.7 -r1.8 |
| 85 |
--- emacs-cvs-23.0.50-r1.ebuild 10 Jan 2008 14:47:41 -0000 1.7 |
| 86 |
+++ emacs-cvs-23.0.50-r1.ebuild 10 Jan 2008 17:26:15 -0000 1.8 |
| 87 |
@@ -1,6 +1,6 @@ |
| 88 |
# Copyright 1999-2008 Gentoo Foundation |
| 89 |
# Distributed under the terms of the GNU General Public License v2 |
| 90 |
-# $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 $ |
| 91 |
+# $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 $ |
| 92 |
|
| 93 |
ECVS_AUTH="pserver" |
| 94 |
ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs" |
| 95 |
@@ -184,6 +184,7 @@ |
| 96 |
|
| 97 |
# avoid collision between slots, see bug #169033 e.g. |
| 98 |
rm "${D}"/usr/share/emacs/site-lisp/subdirs.el |
| 99 |
+ rm -rf "${D}"/usr/share/{applications,icons} |
| 100 |
rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores |
| 101 |
keepdir /var/lib/games/emacs/ |
| 102 |
|
| 103 |
|
| 104 |
|
| 105 |
|
| 106 |
-- |
| 107 |
gentoo-commits@l.g.o mailing list |
Archives