From: Christian Faulhammer <fauli@gentoo.org>
Date: Fri, 26 Jan 2007 08:23:42 +0000 (+0000)
Subject: adjusted DESCRIPTION
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=797b7f437a33e9aa10559917896184b837dd5346;p=gentoo.git

adjusted DESCRIPTION
changed SRC_URI to mirror:// syntax for version 5.1.4
changed handling of SITEFILEs
added some quotes
Package-Manager: portage-2.1.1-r2
---

diff --git a/app-emacs/erc/ChangeLog b/app-emacs/erc/ChangeLog
index dffac32bc309..752ea88cfa35 100644
--- a/app-emacs/erc/ChangeLog
+++ b/app-emacs/erc/ChangeLog
@@ -1,6 +1,16 @@
 # 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.23 2007/01/26 08:03:59 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/erc/ChangeLog,v 1.24 2007/01/26 08:23:41 opfer Exp $
+
+  26 Jan 2007; Christian Faulhammer <opfer@gentoo.org>
+  -files/5.0.2/50erc-gentoo.el, -files/5.0.3/50erc-gentoo.el,
+  -files/5.0.4/50erc-gentoo.el, -files/5.1/50erc-gentoo.el,
+  -files/5.1.1/50erc-gentoo.el, +files/50erc-gentoo.el, erc-5.0.4.ebuild,
+  erc-5.1.ebuild, erc-5.1.1.ebuild, erc-5.1.4.ebuild:
+  adjusted DESCRIPTION
+  changed SRC_URI to mirror:// syntax for version 5.1.4
+  changed handling of SITEFILEs
+  added some quotes
 
   26 Jan 2007; Christian Faulhammer <opfer@gentoo.org> -erc-5.0.2.ebuild,
   -erc-5.0.3.ebuild:
diff --git a/app-emacs/erc/erc-5.0.4.ebuild b/app-emacs/erc/erc-5.0.4.ebuild
index 85ce510e7bf5..c93caa3c56ac 100644
--- a/app-emacs/erc/erc-5.0.4.ebuild
+++ b/app-emacs/erc/erc-5.0.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.0.4.ebuild,v 1.1 2005/10/19 17:05:16 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/erc/erc-5.0.4.ebuild,v 1.2 2007/01/26 08:23:41 opfer Exp $
 
 inherit elisp
 
-DESCRIPTION="ERC - The Emacs IRC Client"
+DESCRIPTION="The Emacs IRC Client"
 HOMEPAGE="http://emacswiki.org/cgi-bin/wiki.pl?EmacsIRCClient"
 SRC_URI="mirror://sourceforge/erc/${P}.tar.gz"
 
@@ -12,10 +12,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="ppc sparc x86 ~amd64"
 IUSE=""
+SITEFILE=50erc-gentoo.el
 
 DEPEND="virtual/emacs"
 
-S=${WORKDIR}/${P/_*/}
+S="${WORKDIR}/${P/_*/}"
 
 src_compile() {
 	make || die
@@ -23,6 +24,6 @@ src_compile() {
 
 src_install() {
 	elisp-install ${PN} *.el *.elc
-	elisp-site-file-install ${FILESDIR}/${PV}/50erc-gentoo.el
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	dodoc AUTHORS CREDITS HISTORY ChangeLog servers.pl README
 }
diff --git a/app-emacs/erc/erc-5.1.1.ebuild b/app-emacs/erc/erc-5.1.1.ebuild
index 3f78b632b0d6..154646905afb 100644
--- a/app-emacs/erc/erc-5.1.1.ebuild
+++ b/app-emacs/erc/erc-5.1.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.1 2006/02/05 21:13:14 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/erc/erc-5.1.1.ebuild,v 1.2 2007/01/26 08:23:41 opfer Exp $
 
 inherit elisp
 
-DESCRIPTION="ERC - The Emacs IRC Client"
+DESCRIPTION="The Emacs IRC Client"
 HOMEPAGE="http://emacswiki.org/cgi-bin/wiki.pl?EmacsIRCClient"
 SRC_URI="mirror://sourceforge/erc/${P}.tar.gz"
 
@@ -12,11 +12,12 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc ~sparc ~x86 ~amd64"
 IUSE=""
+SITEFILE=50erc-gentoo.el
 
 DEPEND="virtual/emacs
 	sys-apps/texinfo"
 
-S=${WORKDIR}/${P/_*/}
+S="${WORKDIR}/${P/_*/}"
 
 src_compile() {
 	make || die
@@ -24,7 +25,7 @@ src_compile() {
 
 src_install() {
 	elisp-install ${PN} *.el *.elc
-	elisp-site-file-install ${FILESDIR}/${PV}/50erc-gentoo.el
+	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.4.ebuild b/app-emacs/erc/erc-5.1.4.ebuild
index d7b584ffe301..644b9d612e37 100644
--- a/app-emacs/erc/erc-5.1.4.ebuild
+++ b/app-emacs/erc/erc-5.1.4.ebuild
@@ -1,22 +1,23 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.4.ebuild,v 1.1 2006/12/09 21:59:47 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/erc/erc-5.1.4.ebuild,v 1.2 2007/01/26 08:23:41 opfer Exp $
 
 inherit elisp
 
-DESCRIPTION="ERC - The Emacs IRC Client"
+DESCRIPTION="The Emacs IRC Client"
 HOMEPAGE="http://emacswiki.org/cgi-bin/wiki.pl?EmacsIRCClient"
-SRC_URI="http://ftp.gnu.org/gnu/erc/erc-${PV}.tar.gz"
+SRC_URI="mirror://gnu/erc/erc-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc ~sparc ~x86 ~amd64"
 IUSE=""
+SITEFILE=50erc-gentoo.el
 
 DEPEND="virtual/emacs
 	sys-apps/texinfo"
 
-S=${WORKDIR}/${P/_*/}
+S="${WORKDIR}/${P/_*/}"
 
 src_compile() {
 	make || die
@@ -24,7 +25,7 @@ src_compile() {
 
 src_install() {
 	elisp-install ${PN} *.el *.elc
-	elisp-site-file-install ${FILESDIR}/${PV}/50erc-gentoo.el
+	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.ebuild b/app-emacs/erc/erc-5.1.ebuild
index ab52d80d9ecc..050c1a41c2ca 100644
--- a/app-emacs/erc/erc-5.1.ebuild
+++ b/app-emacs/erc/erc-5.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.1 2006/01/29 20:56:36 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/erc/erc-5.1.ebuild,v 1.2 2007/01/26 08:23:41 opfer Exp $
 
 inherit elisp
 
-DESCRIPTION="ERC - The Emacs IRC Client"
+DESCRIPTION="The Emacs IRC Client"
 HOMEPAGE="http://emacswiki.org/cgi-bin/wiki.pl?EmacsIRCClient"
 SRC_URI="mirror://sourceforge/erc/${P}.tar.gz"
 
@@ -12,11 +12,12 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc ~sparc ~x86 ~amd64"
 IUSE=""
+SITEFILE=50erc-gentoo.el
 
 DEPEND="virtual/emacs
 	sys-apps/texinfo"
 
-S=${WORKDIR}/${P/_*/}
+S="${WORKDIR}/${P/_*/}"
 
 src_compile() {
 	make || die
@@ -24,7 +25,7 @@ src_compile() {
 
 src_install() {
 	elisp-install ${PN} *.el *.elc
-	elisp-site-file-install ${FILESDIR}/${PV}/50erc-gentoo.el
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	dodoc AUTHORS ChangeLog* CREDITS HISTORY servers.pl README
 	doinfo *.info*
 }
diff --git a/app-emacs/erc/files/50erc-gentoo.el b/app-emacs/erc/files/50erc-gentoo.el
new file mode 100644
index 000000000000..b8ae6028464a
--- /dev/null
+++ b/app-emacs/erc/files/50erc-gentoo.el
@@ -0,0 +1,5 @@
+
+;;; erc site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(require 'erc)