Keep etc/COPYING because C-h C-c needs it.

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 27f52974e416ea763d02219b6acf91313ed1a8de..3f962db227c569a3b77034348df67b2b59dc6ae6 100644 (file)
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,9 +1,10 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.447 2011/12/19 19:15:05 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.448 2011/12/19 21:07:55 ulm Exp $
 
   19 Dec 2011; Ulrich Mueller <ulm@gentoo.org> emacs-18.59-r7.ebuild:
   Updated patchset, including a fix for the LDFLAGS issue.
+  Keep etc/COPYING because C-h C-c needs it.
 
 *emacs-18.59-r7 (19 Dec 2011)
 

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index f340f1a3e880a30c4fd036da0648b85033f6043f..751890d753337f104afbf265a747710d4fa12ad0 100644 (file)
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -15,18 +15,18 @@ DIST emacs-23.3-patches-3.tar.bz2 14783 RMD160 5a609bfded363d63f6146c482881d63ea
 DIST emacs-23.3a.tar.bz2 38748283 RMD160 21f201714bca420c3a8fed8c92058cec786e724e SHA1 795bdfa372e42b9589a80f6dcb2ad8fed65b90e4 SHA256 9f4beee3bf4987914d57851c0aac017cb92a1410c2b31ba313265c64a38cc6ba
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
 EBUILD emacs-18.59-r6.ebuild 2736 RMD160 23d2b7c5cbf0deb8d76035a77fe803206581a810 SHA1 997a0271b8b4114867b308843180a59ab03fcf63 SHA256 bcc584e1ee5a50c6a6539458acf0ce229f79981430fe624e4f0301c63ddaf14a
-EBUILD emacs-18.59-r7.ebuild 4202 RMD160 7a7c03679a5bd6f61b961ed9609957cd1f262861 SHA1 c9f8176db1d5e9fae7001b422edcbb3f168b66d6 SHA256 3edc0b3ce6a4e4282c173c70d8971c941872d2a3050d2f2175348b090e0f5efb
+EBUILD emacs-18.59-r7.ebuild 4222 RMD160 fe39301cb54ce5edb27573f2e97fbcefd11ad473 SHA1 2b4b4abd04c7b6c256feb13fb52fdd9940edad61 SHA256 05f7642233f6fb9d0f1be1f9e4912affa42f4661f6f40954ee4fe4cfe254bdfa
 EBUILD emacs-21.4-r23.ebuild 5010 RMD160 2b7019a59d7ba82a320c8464c3c2b6c098410b5a SHA1 04e1932afc02456234eb46ffc0baa35681162a7e SHA256 263a626ed20b87ae8f19b136ce75f90d9f188e4a69d8bcfdbef540b419f9b693
 EBUILD emacs-22.3-r8.ebuild 7832 RMD160 d74e25b91dbe8783930d1647dec3cf8e44b49b17 SHA1 92e6d6b50578faf6f669e6b2389d7599712048e9 SHA256 b9a75b8b6f468f984441ab725779ff581c8ddbfa14ccff404cc11381d0db741b
 EBUILD emacs-23.3-r1.ebuild 10301 RMD160 885b752594822d1425e3afe95e997ea9fb5a2776 SHA1 90bcec933661eb0f5066a6ae679ecdb6b7ac42d0 SHA256 93cf3fe5516ed9b9f0e06ae9de0472e55c47d89d0c7824da5269e71d548e4d0c
 EBUILD emacs-23.3-r2.ebuild 10656 RMD160 015444a016093e78a11dec0ad71857e1fcc7ef61 SHA1 600b0741c75f0bc0ab246380ce1d105c83186cd3 SHA256 821938b07f1303e0b0a2a8751f1d98760c4623bb87817c722c9f8e60a9f6d106
 EBUILD emacs-23.3-r3.ebuild 10418 RMD160 614088e8d707016d832304080cc8a18c767c85c1 SHA1 78086accf5e921d31de5da9cdc848e100776a058 SHA256 dad8aef6845189bdaa6456b046a70824041f3a24ff5d02905a3db042d309ce45
-MISC ChangeLog 64216 RMD160 25c302ff7896334316156b4f869f826fc633fac6 SHA1 ba012a4e8dfc2cce0dfc4abef41622e479adee79 SHA256 feb157dfd0628771c2f5a4ac0e41c7f074f50caafdefe509b4656bf0196d9c78
+MISC ChangeLog 64261 RMD160 5a9bd789b7b52b9fcc6e375a41e5b9e00eadb790 SHA1 bfd7c462b9bf908df918218e6101e19923880428 SHA256 c8113d2d82e6ba8cd3c49c0e2c5fd5f8d7b2489020a4b01c5827f88e13979c41
 MISC metadata.xml 1644 RMD160 911d63b0a921d248984f3c5efeb1922f05aa5111 SHA1 7281388d7c274016274e888d97821fda9e5c958c SHA256 7c703ad3af721dfa1d9737f78cd848b7c69a7b906ead5c5fe8fd1db23a1d3166
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7vj5sACgkQOeoy/oIi7uzTTwCgmcN3pZNioA7jU9ZI21faTS1A
-DDwAnAhQxJvdrjQbUCZvsIRUVrz1qxYm
-=kYLg
+iEYEARECAAYFAk7vqg0ACgkQOeoy/oIi7uzEWgCeKdjobILkpXeClOKoPBKcUODZ
+AkQAn1L0w51wvKauFWl9aR8uOULJOIng
+=XOKG
 -----END PGP SIGNATURE-----

diff --git a/app-editors/emacs/emacs-18.59-r7.ebuild b/app-editors/emacs/emacs-18.59-r7.ebuild
index d9d9dba81c80d5fafe63a704245fc8ec4744135d..732cfe1d80fed3828860f5e56c17bdc55b7009bc 100644 (file)
--- a/app-editors/emacs/emacs-18.59-r7.ebuild
+++ b/app-editors/emacs/emacs-18.59-r7.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/app-editors/emacs/emacs-18.59-r7.ebuild,v 1.2 2011/12/19 19:15:05 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r7.ebuild,v 1.3 2011/12/19 21:07:55 ulm Exp $
 
 EAPI=4
 
@@ -76,9 +76,8 @@ src_install() {
                install
 
        rmdir "${D}"${basedir}/lock || die
-       find "${D}"${basedir} -type f \
-               \( -name ChangeLog -o -name COPYING -o -name "*.c" \) \
-               -exec rm "{}" + || die
+       find "${D}"${basedir} -type f \( -name "*.c" -o -name ChangeLog \
+               -o -name COPYING ! -path "*/etc/COPYING" \) -exec rm "{}" + || die
        fperms -R go-w ${basedir}
 
        # move executables to the correct place