Distfile is tarball again. Clean up.

Package-Manager: portage-2.1.3_rc5

6 files changed, 26 insertions, 64 deletions

diff --git a/app-emacs/gentoo-syntax/ChangeLog b/app-emacs/gentoo-syntax/ChangeLog
index 146ecd5a454b..a84c51753277 100644
--- a/app-emacs/gentoo-syntax/ChangeLog
+++ b/app-emacs/gentoo-syntax/ChangeLog
@@ -1,6 +1,10 @@
 # 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.2 2007/06/25 10:00:28 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/gentoo-syntax/ChangeLog,v 1.3 2007/06/25 15:10:13 ulm Exp $
+
+  25 Jun 2007; Ulrich Mueller <ulm@gentoo.org> -gentoo-syntax-1.6.ebuild,
+  gentoo-syntax-1.6-r1.ebuild:
+  Distfile is tarball again. Clean up.
 
 *gentoo-syntax-1.6-r1 (25 Jun 2007)
 
diff --git a/app-emacs/gentoo-syntax/Manifest b/app-emacs/gentoo-syntax/Manifest
index f9ad1795ec8d..164b0feb4028 100644
--- a/app-emacs/gentoo-syntax/Manifest
+++ b/app-emacs/gentoo-syntax/Manifest
@@ -15,8 +15,7 @@ RMD160 e434278ccfff914df899d617a90fa5ceae3a67eb files/ebuild-mode-1.5-fix-tabify
 SHA256 831f223a59c89a61473a0286731a44c1fbdd924bdc7fcea735d69e8ebeb1f00c files/ebuild-mode-1.5-fix-tabify.patch 332
 DIST ebuild-mode-1.3.tar.bz2 2260 RMD160 469b6b9755e7d1250ffc3d44cd6f2e1e1dae1033 SHA1 9f219f2fa6b8034b33489a57024e62185eca8e63 SHA256 95cdae9ca223b2ac4ce4fba475459d5bdb8f5d1d59f482030e41ed9fefd1c8b2
 DIST ebuild-mode-1.5.tar.bz2 2510 RMD160 43308f4936225ad83d8cfbb188eda06eb455f98d SHA1 74242ad42c2b7d9d77641c3362aa9b4f9e2a5367 SHA256 e2a13679c0a16898573624bd521b25c5162272e3e073b971246173d8766286cc
-DIST gentoo-syntax-1.6-ChangeLog.bz2 1291 RMD160 e6f833c38b4415f02315a2550696c3890034aab1 SHA1 01ada186e89cc65e69ba40e0998090a560e174a3 SHA256 8c0d91df9c08209aa34cf8f579f03d1248b46d4630cd53efb2ae5bc4eb4aee27
-DIST gentoo-syntax-1.6.el.bz2 3724 RMD160 2ed931013c7801dd4f49b4f0be8a76234d5937ad SHA1 168ba1d46f2e0908e832c7bb49ecfe267f203a7e SHA256 b72f34f7e6dde499220f5e94c117b905183feaa1fdeff599735a4127dad91567
+DIST gentoo-syntax-1.6.tar.bz2 4727 RMD160 6f977fbd63602b0d3a7594914ce850886071693a SHA1 4bf86a5b65a1f2dcdd12dfdd612ac6977bf2b45a SHA256 35f5d634e8c34d4f266e371ddd967aeb07f29548390b1d17fdf02e6e0bc34e50
 EBUILD gentoo-syntax-1.3.ebuild 580 RMD160 316925d013afcd8f4720e517cd97065586c988b1 SHA1 a461635e176a7f482cefea02eceacbd42c4185f7 SHA256 927a577f80ef55d329093c22fcbbba5900f9726f3473780bafe470f8e72f4331
 MD5 21935951b9c49c8e58910b108bd79022 gentoo-syntax-1.3.ebuild 580
 RMD160 316925d013afcd8f4720e517cd97065586c988b1 gentoo-syntax-1.3.ebuild 580
@@ -25,18 +24,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 911 RMD160 39994cfd22295c52ec3fec33b5a3007d95710523 SHA1 20cf4898dd8d8992c81574bef2181c303e850865 SHA256 dd2d26edb19805c66560eba90f53e94f7ee081d4c35c2a37f89357dee3445e55
-MD5 3d44f6181c1a08986121f1314d303825 gentoo-syntax-1.6-r1.ebuild 911
-RMD160 39994cfd22295c52ec3fec33b5a3007d95710523 gentoo-syntax-1.6-r1.ebuild 911
-SHA256 dd2d26edb19805c66560eba90f53e94f7ee081d4c35c2a37f89357dee3445e55 gentoo-syntax-1.6-r1.ebuild 911
-EBUILD gentoo-syntax-1.6.ebuild 806 RMD160 efcf6d82c6c70ee8f159bce136f440a31c2fd834 SHA1 65986f8035a542b83c2d398261eedcc7215abba7 SHA256 25173cb51619b64476026bcec800693b63320d6098f07a10cdb1ada1140ca7c3
-MD5 4d89100bcf1deaef175670ddd8007a1c gentoo-syntax-1.6.ebuild 806
-RMD160 efcf6d82c6c70ee8f159bce136f440a31c2fd834 gentoo-syntax-1.6.ebuild 806
-SHA256 25173cb51619b64476026bcec800693b63320d6098f07a10cdb1ada1140ca7c3 gentoo-syntax-1.6.ebuild 806
-MISC ChangeLog 3795 RMD160 5266a0ea2a404617b1e5e4e6d3d26968edcd98d8 SHA1 5a98315580ae2c647216059cabf089bb003358d9 SHA256 7f74fda048bb51fca00d2dc8a85474b5991dab5c5a8b69eb43d586b6956277d5
-MD5 9af8a02021754d784014c98c546e5837 ChangeLog 3795
-RMD160 5266a0ea2a404617b1e5e4e6d3d26968edcd98d8 ChangeLog 3795
-SHA256 7f74fda048bb51fca00d2dc8a85474b5991dab5c5a8b69eb43d586b6956277d5 ChangeLog 3795
+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
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -47,16 +42,13 @@ SHA256 8486cf23fd2890ff5c0e5ece74daf47bf3c4f630257ab8e3b9170954a236f51a files/di
 MD5 361e98d100c52a26d7ab2a34ec82455d files/digest-gentoo-syntax-1.5-r3 244
 RMD160 11d1a2b39abc43431e87a5c574f94f2ed6ce7920 files/digest-gentoo-syntax-1.5-r3 244
 SHA256 03c8cbe3962f692e3970a2c0d19edb2fb1d4911b6da0db8670c53487b7bd9a70 files/digest-gentoo-syntax-1.5-r3 244
-MD5 3e659698f4b7600ad84aa5a57ae56fd2 files/digest-gentoo-syntax-1.6 247
-RMD160 7cd53346ec9c2cc634f762165a87ff038812ef62 files/digest-gentoo-syntax-1.6 247
-SHA256 d1c718e6e1722525dffac9a9d343b40983a590b9f26e548349740625f3b8768a files/digest-gentoo-syntax-1.6 247
-MD5 8506397adc45064cad193e28cc406eec files/digest-gentoo-syntax-1.6-r1 515
-RMD160 0dcf915cf24d60d56bae6df4f01c13898fa28d67 files/digest-gentoo-syntax-1.6-r1 515
-SHA256 2b6aeb4c406bb94fa1264d8ee71dc31970b4e31cf12c99372b6595bb59207aad files/digest-gentoo-syntax-1.6-r1 515
+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)
 
-iD8DBQFGf5JCNQqtfCuFneMRAlumAJ0fDKiwvydmvXcNnYYB2LPgg9awGQCfRGoG
-qxvGgGXqESSaabdh4jKDz6g=
-=/gav
+iD8DBQFGf9rYOeoy/oIi7uwRAhKsAJ4jaksQHpZHN6Ii+r90bpHaTwVBewCg0Zqe
+WRtSnfE/VOpff3vk3CN5wR8=
+=XJUN
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/gentoo-syntax/files/digest-gentoo-syntax-1.6 b/app-emacs/gentoo-syntax/files/digest-gentoo-syntax-1.6
deleted file mode 100644
index c88ce8d22e0d..000000000000
--- a/app-emacs/gentoo-syntax/files/digest-gentoo-syntax-1.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c6beb74102dba8ea11663904644fdcee gentoo-syntax-1.6.el.bz2 3724
-RMD160 2ed931013c7801dd4f49b4f0be8a76234d5937ad gentoo-syntax-1.6.el.bz2 3724
-SHA256 b72f34f7e6dde499220f5e94c117b905183feaa1fdeff599735a4127dad91567 gentoo-syntax-1.6.el.bz2 3724
diff --git a/app-emacs/gentoo-syntax/files/digest-gentoo-syntax-1.6-r1 b/app-emacs/gentoo-syntax/files/digest-gentoo-syntax-1.6-r1
index fc44823d27d7..b12bb2f1158b 100644
--- a/app-emacs/gentoo-syntax/files/digest-gentoo-syntax-1.6-r1
+++ b/app-emacs/gentoo-syntax/files/digest-gentoo-syntax-1.6-r1
@@ -1,6 +1,3 @@
-MD5 9ad2d7506c6e1f748a4278d7ccd9d1ae gentoo-syntax-1.6-ChangeLog.bz2 1291
-RMD160 e6f833c38b4415f02315a2550696c3890034aab1 gentoo-syntax-1.6-ChangeLog.bz2 1291
-SHA256 8c0d91df9c08209aa34cf8f579f03d1248b46d4630cd53efb2ae5bc4eb4aee27 gentoo-syntax-1.6-ChangeLog.bz2 1291
-MD5 c6beb74102dba8ea11663904644fdcee gentoo-syntax-1.6.el.bz2 3724
-RMD160 2ed931013c7801dd4f49b4f0be8a76234d5937ad gentoo-syntax-1.6.el.bz2 3724
-SHA256 b72f34f7e6dde499220f5e94c117b905183feaa1fdeff599735a4127dad91567 gentoo-syntax-1.6.el.bz2 3724
+MD5 1e39c53151d3e2a9f1174c89f0f3dc32 gentoo-syntax-1.6.tar.bz2 4727
+RMD160 6f977fbd63602b0d3a7594914ce850886071693a gentoo-syntax-1.6.tar.bz2 4727
+SHA256 35f5d634e8c34d4f266e371ddd967aeb07f29548390b1d17fdf02e6e0bc34e50 gentoo-syntax-1.6.tar.bz2 4727
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 3e4be2c47513..9d95fab9769f 100644
--- a/app-emacs/gentoo-syntax/gentoo-syntax-1.6-r1.ebuild
+++ b/app-emacs/gentoo-syntax/gentoo-syntax-1.6-r1.ebuild
@@ -1,26 +1,24 @@
 # 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.1 2007/06/25 10:00:28 opfer Exp $
+# $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 $
 
 inherit elisp
 
 DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
 HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/"
-SRC_URI="mirror://gentoo/${P}.el.bz2
-	mirror://gentoo/${PN}-${PV}-ChangeLog.bz2"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE=""
 
-SIMPLE_ELISP=t
 SITEFILE=51${PN}-gentoo.el
 
 src_install() {
 	elisp-install ${PN} *.el *.elc
 	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	newdoc "${WORKDIR}/${PN}-${PV}-ChangeLog" ChangeLog
+	dodoc ChangeLog
 
 	# the following is for backwards compatibility
 	dosym gentoo-syntax.el "${SITELISP}/${PN}/ebuild-mode.el"
diff --git a/app-emacs/gentoo-syntax/gentoo-syntax-1.6.ebuild b/app-emacs/gentoo-syntax/gentoo-syntax-1.6.ebuild
deleted file mode 100644
index b59c75559f82..000000000000
--- a/app-emacs/gentoo-syntax/gentoo-syntax-1.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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.ebuild,v 1.1 2007/06/21 18:10:13 ulm Exp $
-
-inherit elisp
-
-DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
-HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/"
-SRC_URI="mirror://gentoo/${P}.el.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE=""
-
-SIMPLE_ELISP=t
-SITEFILE=51${PN}-gentoo.el
-
-src_install() {
-	elisp-install ${PN} *.el *.elc
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-
-	# the following is for backwards compatibility
-	dosym gentoo-syntax.el ${SITELISP}/${PN}/ebuild-mode.el
-	dosym gentoo-syntax.elc ${SITELISP}/${PN}/ebuild-mode.elc
-}