install ChangeLog file with a different name to avoid collisions with app-xemacs/gentoo-syntax (not yet in the tree)

Package-Manager: portage-2.1.2.7

3 files changed, 16 insertions, 21 deletions

diff --git a/app-emacs/gentoo-syntax/ChangeLog b/app-emacs/gentoo-syntax/ChangeLog
index a84c51753277..626f5dac7ec6 100644
--- a/app-emacs/gentoo-syntax/ChangeLog
+++ b/app-emacs/gentoo-syntax/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emacs/gentoo-syntax
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/gentoo-syntax/ChangeLog,v 1.3 2007/06/25 15:10:13 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/gentoo-syntax/ChangeLog,v 1.4 2007/06/25 17:07:53 opfer Exp $
+
+  25 Jun 2007; Christian Faulhammer <opfer@gentoo.org>
+  gentoo-syntax-1.6-r1.ebuild:
+  install ChangeLog file with a different name to avoid collisions with
+  app-xemacs/gentoo-syntax (not yet in the tree)
 
   25 Jun 2007; Ulrich Mueller <ulm@gentoo.org> -gentoo-syntax-1.6.ebuild,
   gentoo-syntax-1.6-r1.ebuild:
diff --git a/app-emacs/gentoo-syntax/Manifest b/app-emacs/gentoo-syntax/Manifest
index 164b0feb4028..76bd25b19544 100644
--- a/app-emacs/gentoo-syntax/Manifest
+++ b/app-emacs/gentoo-syntax/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 50gentoo-syntax-gentoo.el 510 RMD160 bdb8ff682d9864125d0ce2dffd69914b42a217b5 SHA1 ef564348a3ee1ad3c2e01ddd7d16ded6a31938d6 SHA256 55d155bbbf315037bd2b9647e9d7162d08a66dee3d6a77c07c5f88c896c1be3a
 MD5 b78f4b4cb7b7e0377d6146383f908553 files/50gentoo-syntax-gentoo.el 510
 RMD160 bdb8ff682d9864125d0ce2dffd69914b42a217b5 files/50gentoo-syntax-gentoo.el 510
@@ -24,14 +21,14 @@ EBUILD gentoo-syntax-1.5-r3.ebuild 679 RMD160 e475e742a00ee1d7ff2e767a1a9c1b745e
 MD5 585c75df9d0e60919766351c2b41302b gentoo-syntax-1.5-r3.ebuild 679
 RMD160 e475e742a00ee1d7ff2e767a1a9c1b745e8ec4b5 gentoo-syntax-1.5-r3.ebuild 679
 SHA256 945216b76ef5259cfdacf45a8643a6478eb8a26d97977195bdb3c444cfcd651c gentoo-syntax-1.5-r3.ebuild 679
-EBUILD gentoo-syntax-1.6-r1.ebuild 816 RMD160 13b4e8b18622d77732be5dd77b214b4b85de5dc3 SHA1 2ea66c7172d809da86e33ffba4a6fd9f3ac1ced4 SHA256 d302e279d27eb5a2419c544bdd344650e8d531e9af022c879af36670f38d818c
-MD5 aa186e2fa01191a494aba8e171fc2660 gentoo-syntax-1.6-r1.ebuild 816
-RMD160 13b4e8b18622d77732be5dd77b214b4b85de5dc3 gentoo-syntax-1.6-r1.ebuild 816
-SHA256 d302e279d27eb5a2419c544bdd344650e8d531e9af022c879af36670f38d818c gentoo-syntax-1.6-r1.ebuild 816
-MISC ChangeLog 3938 RMD160 1079812c35779ea44df19c4c270e0e9c7e60f219 SHA1 21dae981a98f734793c96ae3780ef0043530c4b0 SHA256 6d7657cae08475aa5408de6d040adc43a0557a1211a868a48d74611e324f4698
-MD5 a4251efe8fd5d8ca4088d9d8e4854487 ChangeLog 3938
-RMD160 1079812c35779ea44df19c4c270e0e9c7e60f219 ChangeLog 3938
-SHA256 6d7657cae08475aa5408de6d040adc43a0557a1211a868a48d74611e324f4698 ChangeLog 3938
+EBUILD gentoo-syntax-1.6-r1.ebuild 835 RMD160 c91253d013f38cd2ec71ab5422ae372c0a7391dc SHA1 eda23cc63c114d959d7f276777e50a9b2e942f6c SHA256 c01dd8c14d16f0e0776e6c192aba93615d4b6856b83ec00ab537ad2067c93232
+MD5 c8d8c40a8ca34d31effe2d59a3c3a614 gentoo-syntax-1.6-r1.ebuild 835
+RMD160 c91253d013f38cd2ec71ab5422ae372c0a7391dc gentoo-syntax-1.6-r1.ebuild 835
+SHA256 c01dd8c14d16f0e0776e6c192aba93615d4b6856b83ec00ab537ad2067c93232 gentoo-syntax-1.6-r1.ebuild 835
+MISC ChangeLog 4148 RMD160 87494e0fe86a55be214900fa9a8cbf83b1ed060f SHA1 36fff05f5b87f72aee60276809c5406701d22ea6 SHA256 358b8f4ba2cd4e0c83503ec00b635637de9f92d12058fdd06cc23eeaf9299cf7
+MD5 ec7e68b3a04ac9829bbc8c5c4f2faf61 ChangeLog 4148
+RMD160 87494e0fe86a55be214900fa9a8cbf83b1ed060f ChangeLog 4148
+SHA256 358b8f4ba2cd4e0c83503ec00b635637de9f92d12058fdd06cc23eeaf9299cf7 ChangeLog 4148
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -45,10 +42,3 @@ SHA256 03c8cbe3962f692e3970a2c0d19edb2fb1d4911b6da0db8670c53487b7bd9a70 files/di
 MD5 286b381554ac58f63c4d667ac452f4a2 files/digest-gentoo-syntax-1.6-r1 250
 RMD160 d6e7bcdf753a0d420a87f19014af89316359e9ee files/digest-gentoo-syntax-1.6-r1 250
 SHA256 1f55eb9c9087c1737ae4943ccced1ac2448b9cee8ce0c988b7c26b4b972c92e3 files/digest-gentoo-syntax-1.6-r1 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFGf9rYOeoy/oIi7uwRAhKsAJ4jaksQHpZHN6Ii+r90bpHaTwVBewCg0Zqe
-WRtSnfE/VOpff3vk3CN5wR8=
-=XJUN
------END PGP SIGNATURE-----
diff --git a/app-emacs/gentoo-syntax/gentoo-syntax-1.6-r1.ebuild b/app-emacs/gentoo-syntax/gentoo-syntax-1.6-r1.ebuild
index 9d95fab9769f..2b50d57965c9 100644
--- a/app-emacs/gentoo-syntax/gentoo-syntax-1.6-r1.ebuild
+++ b/app-emacs/gentoo-syntax/gentoo-syntax-1.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/gentoo-syntax/gentoo-syntax-1.6-r1.ebuild,v 1.2 2007/06/25 15:10:13 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/gentoo-syntax/gentoo-syntax-1.6-r1.ebuild,v 1.3 2007/06/25 17:07:53 opfer Exp $
 
 inherit elisp
 
@@ -18,7 +18,7 @@ SITEFILE=51${PN}-gentoo.el
 src_install() {
 	elisp-install ${PN} *.el *.elc
 	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	dodoc ChangeLog
+	newdoc ChangeLog ChangeLog-Emacs
 
 	# the following is for backwards compatibility
 	dosym gentoo-syntax.el "${SITELISP}/${PN}/ebuild-mode.el"