Remove old.

svn path=/emacs-overlay/; revision=1212

6 files changed, 20 insertions, 75 deletions

diff --git a/app-emacs/quilt-el/ChangeLog b/app-emacs/quilt-el/ChangeLog
index fad639c..5631601 100644
--- a/app-emacs/quilt-el/ChangeLog
+++ b/app-emacs/quilt-el/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for app-emacs/quilt-el
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Nov 2008; Ulrich Mueller <ulm@gentoo.org> -+,
+  -files/51quilt-el-gentoo.el, -quilt-el-0.4.20060425.2.ebuild,
+  quilt-el-0.45.4.ebuild:
+  Remove old. Move site-init file to canonical name.
+
   17 Nov 2007; Ulrich Mueller <ulm@gentoo.org>
   +files/quilt-el-0.45.4-header-window.patch,
   +files/quilt-el-0.45.4-tramp-recursion.patch:
diff --git a/app-emacs/quilt-el/Manifest b/app-emacs/quilt-el/Manifest
index 9ece941..fa2fcb3 100644
--- a/app-emacs/quilt-el/Manifest
+++ b/app-emacs/quilt-el/Manifest
@@ -1,11 +1,7 @@
-AUX 50quilt-el-gentoo.el 53 RMD160 bff803a5483c3c057bf3a0e2c368da17e28daac2 SHA1 a31caf29b9a68a3c556df59e48d9367b13e8f973 SHA256 b1917f4240dd3fb8888358153a49e59f1793a8ff535f81acb930cc98bbb9e3b3
-AUX 51quilt-el-gentoo.el 334 RMD160 3ae11265c57dd08ce441dc90245dcc224a5692f8 SHA1 4233b3803d44187f75eda1126e62065802e710ad SHA256 6f5ca69694d2c553143f3a7a2641ab97891fd1df431b7de6506eb96423e40447
+AUX 50quilt-el-gentoo.el 334 RMD160 3ae11265c57dd08ce441dc90245dcc224a5692f8 SHA1 4233b3803d44187f75eda1126e62065802e710ad SHA256 6f5ca69694d2c553143f3a7a2641ab97891fd1df431b7de6506eb96423e40447
 AUX quilt-el-0.45.4-header-window.patch 389 RMD160 4005650799b170bd21a0d54533406c8096ae45ee SHA1 9915d66e380167dff23963801b57d98e9cca81c8 SHA256 b57c681aef8c25ae70b8a4364edfe9481f51ebce5242632c3a0822bc5c942846
 AUX quilt-el-0.45.4-tramp-recursion.patch 440 RMD160 50e5be2b079581219d9c3ae07d222c1b5a1f0619 SHA1 bf19dd6d9cd3685f69e46ea7ffaf5fa0aa200aef SHA256 e01d7dc8ae831c3578778799cfa95e933806af62024f252369eed735d5589fb1
 DIST quilt-el-0.45.4.tar.gz 11646 RMD160 6ef75e6411f57d8f8b7f3a4bc000bec3eb834869 SHA1 09995df61679e703f8f1f8f412e836711657db41 SHA256 976cdc0e12bade0888c598c4666cc7072950846385eadad0e6f393774034171d
-DIST quilt-el_0.4-hg20060425-2.diff.gz 5470 RMD160 a6b34398cff569dc00b3fb513883dfbe9cf60eb7 SHA1 3cc81d3aa1b860aeda344e2ff3ad1faa9ede7bc0 SHA256 7e09b17517ddf2b7c005a4ae69529936807d847c660f5866dab51d4b6452869d
-DIST quilt-el_0.4-hg20060425.orig.tar.gz 9571 RMD160 a5a8772df4136b2fcfda5417718b8f991ba6a7f1 SHA1 f88cc65185d9f40eaf863316693a60ecaa4fcf43 SHA256 02bd35500a10dde61fc8b7cb67e56f0e99088e9b58eb270f304663de19d4af14
-EBUILD quilt-el-0.4.20060425.2.ebuild 1408 RMD160 4fc8c3c722b69e754625d137540dc28666e31dea SHA1 5a90ed0a3797b8f960973103aef65df001b9d9ec SHA256 dd1c2240d00360b82cc2409d6856aef58400892102bff0285b4833dd40139b22
-EBUILD quilt-el-0.45.4.ebuild 601 RMD160 7ee4a2c04cef9de660acab4fd29e73b908694d35 SHA1 e000d4297e9dcb5134a6f23d406da9aef16e5050 SHA256 9058fd1b35495387601dc26a3ea82e44a49da0380db437ebc1fdd0c745bbdb4a
-MISC ChangeLog 776 RMD160 b37c182d13c23032a754cc99c4010d77e998b293 SHA1 48eb4a8139e926fe3b635a332627a948a1de7dea SHA256 58c7bace88ffb470c85e3c96c13207d25851fa1c3cc55dc1eb4cacb9c5dc79d5
+EBUILD quilt-el-0.45.4.ebuild 601 RMD160 1209c33292104ab23856817e199aea60572444e1 SHA1 ffc1a5a4fa7889d1408f3e4fa07a529249db024e SHA256 b386fb8d7bb46cbc9f9a653d84694db5d2a8de26856da51b4e0e18bef892ca56
+MISC ChangeLog 971 RMD160 422def75a103acc0b2daa1fbdaf20622a47700d7 SHA1 6b23405364cc2f9d7ccd2ab5dd2135cf89067985 SHA256 b9fa6eedf46650eec56c393e780c81412565a05ee912e4c6ce8558bc1cb0a23d
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
diff --git a/app-emacs/quilt-el/files/50quilt-el-gentoo.el b/app-emacs/quilt-el/files/50quilt-el-gentoo.el
index 0575208..fb02530 100644
--- a/app-emacs/quilt-el/files/50quilt-el-gentoo.el
+++ b/app-emacs/quilt-el/files/50quilt-el-gentoo.el
@@ -1,2 +1,10 @@
+
+;;; quilt-el site-lisp configuration
+
 (add-to-list 'load-path "@SITELISP@")
-(load "quilt")
+(autoload 'quilt-mode "quilt"
+  "Toggle quilt-mode. With positive arg, enable quilt-mode." t)
+(autoload 'quilt-hook "quilt"
+  "Enable quilt mode for quilt-controlled files.")
+(add-hook 'find-file-hooks 'quilt-hook)
+(add-hook 'after-revert-hook 'quilt-hook)
diff --git a/app-emacs/quilt-el/files/51quilt-el-gentoo.el b/app-emacs/quilt-el/files/51quilt-el-gentoo.el
deleted file mode 100644
index fb02530..0000000
--- a/app-emacs/quilt-el/files/51quilt-el-gentoo.el
+++ /dev/null
@@ -1,10 +0,0 @@
-
-;;; quilt-el site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
-(autoload 'quilt-mode "quilt"
-  "Toggle quilt-mode. With positive arg, enable quilt-mode." t)
-(autoload 'quilt-hook "quilt"
-  "Enable quilt mode for quilt-controlled files.")
-(add-hook 'find-file-hooks 'quilt-hook)
-(add-hook 'after-revert-hook 'quilt-hook)
diff --git a/app-emacs/quilt-el/quilt-el-0.4.20060425.2.ebuild b/app-emacs/quilt-el/quilt-el-0.4.20060425.2.ebuild
deleted file mode 100644
index d24a9af..0000000
--- a/app-emacs/quilt-el/quilt-el-0.4.20060425.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit elisp versionator eutils
-
-DEBIAN_PV="$(get_version_component_range 1-2)-hg$(get_version_component_range 3)"
-DEBIAN_PR="$(get_version_component_range 4)"
-DEBIAN_P="${PN}_${DEBIAN_PV}"
-DEBIAN_PF="${DEBIAN_P}-${DEBIAN_PR}"
-DEBIAN_BASE="mirror://debian/pool/main/${PN:0:1}/${PN}/"
-
-DESCRIPTION="Quilt mode for Emacs -- With Debian patches"
-HOMEPAGE="http://www.selenic.com/repo/quilt-el"
-
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-util/quilt"
-
-SRC_URI="${DEBIAN_BASE}/${DEBIAN_P}.orig.tar.gz
-	${DEBIAN_BASE}/${DEBIAN_PF}.diff.gz"
-
-S="${WORKDIR}/${DEBIAN_P/_/-}.orig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}"
-	epatch "${WORKDIR}/${DEBIAN_PF}.diff"
-
-	cd "${S}"
-
-	# Name the three patches explicitly because the fix-keybinds patch is not
-	# a really good idea, at least it doesn't work for me.
-	epatch \
-		"${S}/debian/patches/handle-special-case.patch" \
-		"${S}/debian/patches/fix-modeline-update-on-revering-buffers.patch" \
-		"${S}/debian/patches/fix-quilt-edit-series-on-specific-buffer.patch"
-}
-
-src_compile() {
-	elisp-compile quilt.el || die "Failed to compile quilt.el"
-}
-
-src_install() {
-	elisp-install ${PN} *.elc *.el || die "elisp-install failed!"
-
-	elisp-site-file-install "${FILESDIR}/50quilt-el-gentoo.el"
-
-	dodoc debian/README.Debian
-}
diff --git a/app-emacs/quilt-el/quilt-el-0.45.4.ebuild b/app-emacs/quilt-el/quilt-el-0.45.4.ebuild
index edb2198..6694fda 100644
--- a/app-emacs/quilt-el/quilt-el-0.45.4.ebuild
+++ b/app-emacs/quilt-el/quilt-el-0.45.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -16,7 +16,7 @@ IUSE=""
 RDEPEND="dev-util/quilt"
 
 S="${WORKDIR}/${PN}"
-SITEFILE=51${PN}-gentoo.el
+SITEFILE=50${PN}-gentoo.el
 DOCS="README changelog"
 
 src_unpack() {