Generate autoload file for package initialisation. Remove old versions.

(Portage version: 2.1.3.9)

7 files changed, 21 insertions, 46 deletions

diff --git a/app-emacs/erc/ChangeLog b/app-emacs/erc/ChangeLog
index 91e5fc1f6438..509b28950409 100644
--- a/app-emacs/erc/ChangeLog
+++ b/app-emacs/erc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/erc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/erc/ChangeLog,v 1.27 2007/04/10 20:57:42 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/erc/ChangeLog,v 1.28 2007/09/16 19:51:07 ulm Exp $
+
+*erc-5.2-r1 (16 Sep 2007)
+
+  16 Sep 2007; Ulrich Mueller <ulm@gentoo.org> +files/51erc-gentoo.el,
+  -erc-5.1.ebuild, -erc-5.1.1.ebuild, +erc-5.2-r1.ebuild:
+  Generate autoload file for package initialisation. Remove old versions.
 
 *erc-5.2 (10 Apr 2007)
 
diff --git a/app-emacs/erc/erc-5.1.ebuild b/app-emacs/erc/erc-5.1.ebuild
deleted file mode 100644
index 4cbb8d362081..000000000000
--- a/app-emacs/erc/erc-5.1.ebuild
+++ /dev/null
@@ -1,31 +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/erc/erc-5.1.ebuild,v 1.3 2007/04/10 19:53:20 opfer Exp $
-
-inherit elisp
-
-DESCRIPTION="The Emacs IRC Client"
-HOMEPAGE="http://emacswiki.org/cgi-bin/wiki.pl?EmacsIRCClient"
-SRC_URI="mirror://sourceforge/erc/${P}.tar.gz"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="0"
-KEYWORDS="~ppc ~sparc ~x86 ~amd64"
-IUSE=""
-SITEFILE=50erc-gentoo.el
-
-DEPEND="virtual/emacs
-	sys-apps/texinfo"
-
-S="${WORKDIR}/${P/_*/}"
-
-src_compile() {
-	make || die
-}
-
-src_install() {
-	elisp-install ${PN} *.el *.elc
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	dodoc AUTHORS ChangeLog* CREDITS HISTORY servers.pl README
-	doinfo *.info*
-}
diff --git a/app-emacs/erc/erc-5.1.1.ebuild b/app-emacs/erc/erc-5.2-r1.ebuild
index 80b5fe0a5673..6ff58ee3a8f4 100644
--- a/app-emacs/erc/erc-5.1.1.ebuild
+++ b/app-emacs/erc/erc-5.2-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/erc/erc-5.1.1.ebuild,v 1.3 2007/04/10 19:53:20 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/erc/erc-5.2-r1.ebuild,v 1.1 2007/09/16 19:51:07 ulm Exp $
 
 inherit elisp
 
 DESCRIPTION="The Emacs IRC Client"
 HOMEPAGE="http://emacswiki.org/cgi-bin/wiki.pl?EmacsIRCClient"
-SRC_URI="mirror://sourceforge/erc/${P}.tar.gz"
+SRC_URI="mirror://gnu/erc/${P}.tar.gz"
 
 LICENSE="GPL-2 FDL-1.2"
 SLOT="0"
 KEYWORDS="~ppc ~sparc ~x86 ~amd64"
 IUSE=""
-SITEFILE=50erc-gentoo.el
 
-DEPEND="virtual/emacs
-	sys-apps/texinfo"
-
-S="${WORKDIR}/${P/_*/}"
+SITEFILE=51${PN}-gentoo.el
 
 src_compile() {
-	make || die
+	# force regeneration of autoload file by the proper Emacs version
+	rm -f erc-auto.el
+	emake || die "emake failed"
 }
 
 src_install() {
diff --git a/app-emacs/erc/files/51erc-gentoo.el b/app-emacs/erc/files/51erc-gentoo.el
new file mode 100644
index 000000000000..c09af6bf69a1
--- /dev/null
+++ b/app-emacs/erc/files/51erc-gentoo.el
@@ -0,0 +1,5 @@
+
+;;; erc site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(require 'erc-auto)
diff --git a/app-emacs/erc/files/digest-erc-5.1 b/app-emacs/erc/files/digest-erc-5.1
deleted file mode 100644
index 9dfe6bfc8609..000000000000
--- a/app-emacs/erc/files/digest-erc-5.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 71b19e1b0d480f0b91ebf627c83e37eb erc-5.1.tar.gz 313929
-RMD160 4fe8e431fea345a25789013ad39b5f3036f5e979 erc-5.1.tar.gz 313929
-SHA256 74f026b75d9b9375322cd11b9f99257e0af722a672a0dfdd871fada5ab69574e erc-5.1.tar.gz 313929
diff --git a/app-emacs/erc/files/digest-erc-5.1.1 b/app-emacs/erc/files/digest-erc-5.1.1
deleted file mode 100644
index 8caadb1bd926..000000000000
--- a/app-emacs/erc/files/digest-erc-5.1.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0cac7bdab910f995224eb8cf3a500cb2 erc-5.1.1.tar.gz 316442
-RMD160 96f18c8091188f384e81364b11cee6c1941db6f1 erc-5.1.1.tar.gz 316442
-SHA256 e8d5d220c9dfcbe8a23ba4a1bc0d635e15cb6922fccf5e4850383db889f72ffc erc-5.1.1.tar.gz 316442
diff --git a/app-emacs/erc/files/digest-erc-5.2-r1 b/app-emacs/erc/files/digest-erc-5.2-r1
new file mode 100644
index 000000000000..631eb7f06cd2
--- /dev/null
+++ b/app-emacs/erc/files/digest-erc-5.2-r1
@@ -0,0 +1,3 @@
+MD5 8ac1cf2c710757c9f89f6b13fd124fd7 erc-5.2.tar.gz 357678
+RMD160 dbbf33477dac09f71ad8bd1763dd0a371dd54621 erc-5.2.tar.gz 357678
+SHA256 b3fc2d1eb5e4957d25839bcdb3b62360b7b49947c102fffd8c701e68459cafb5 erc-5.2.tar.gz 357678