Version bump, bug 256752. Patches and swank.asd moved to mirrors.

(Portage version: 2.1.9.24/cvs/Linux x86_64)

1 files changed, 29 insertions, 36 deletions

diff --git a/app-emacs/slime/slime-2.0_p20080731-r1.ebuild b/app-emacs/slime/slime-2.0_p20080731-r1.ebuild
index 7421ce5202eb..b45b37352a26 100644
--- a/app-emacs/slime/slime-2.0_p20080731-r1.ebuild
+++ b/app-emacs/slime/slime-2.0_p20080731-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/slime-2.0_p20080731-r1.ebuild,v 1.2 2010/02/03 19:27:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/slime/slime-2.0_p20080731-r1.ebuild,v 1.3 2010/11/21 11:13:48 ulm Exp $
 
 EAPI=3
 
@@ -8,14 +8,16 @@ inherit common-lisp elisp eutils
 
 DESCRIPTION="SLIME, the Superior Lisp Interaction Mode (Extended)"
 HOMEPAGE="http://common-lisp.net/project/slime/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	mirror://gentoo/${P}-patches.tar.bz2"
 
 LICENSE="GPL-2 xref? ( xref.lisp )"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc xref"
 
-RDEPEND="virtual/commonlisp dev-lisp/cl-asdf"
+RDEPEND="virtual/commonlisp
+	dev-lisp/cl-asdf"
 DEPEND="${RDEPEND}
 	doc? ( virtual/texi2dvi )"
 
@@ -23,64 +25,55 @@ CLPACKAGE=swank
 SITEFILE="70${PN}-gentoo.el"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PV}/module-load-gentoo.patch
-	epatch "${FILESDIR}"/${PV}/dont-call-init.patch
-	epatch "${FILESDIR}"/${PV}/inspect-presentations.patch
-	epatch "${FILESDIR}"/${PV}/fix-ecl.patch
-	epatch "${FILESDIR}"/${PV}/fix-swank-listener-hooks-contrib.patch
-	epatch "${FILESDIR}"/${PV}/fix-slime-indentation.patch
-	epatch "${FILESDIR}"/${PV}/changelog-date.patch
+	EPATCH_SUFFIX=patch epatch
+	mv "${WORKDIR}/swank.asd" "${S}" || die
 
 	# extract date of last update from ChangeLog, bug 233270
 	SLIME_CHANGELOG_DATE=$(awk '/^[-0-9]+ / { print $1; exit; }' ChangeLog)
 	[ -n "${SLIME_CHANGELOG_DATE}" ] || die "cannot determine ChangeLog date"
 
-	sed -i "/(defvar \*swank-wire-protocol-version\*/s:nil:\"${SLIME_CHANGELOG_DATE}\":" swank.lisp \
-		|| die "sed swank.lisp failed"
-	sed -i "s:@SLIME-CHANGELOG-DATE@:${SLIME_CHANGELOG_DATE}:" slime.el \
-		|| die "sed slime.el failed"
+	sed -i "/(defvar \*swank-wire-protocol-version\*/s:nil:\"${SLIME_CHANGELOG_DATE}\":" swank.lisp || die
+	sed -i "s:@SLIME-CHANGELOG-DATE@:${SLIME_CHANGELOG_DATE}:" slime.el || die
 
 	# Remove xref.lisp (which is non-free) unless USE flag is set
 	use xref || rm -f xref.lisp
 }
 
 src_compile() {
-	elisp-compile *.el || die "Cannot compile core Elisp files"
+	elisp-compile *.el || die
 	BYTECOMPFLAGS="${BYTECOMPFLAGS} -L contrib -l slime" \
-		elisp-compile contrib/*.el || die "Cannot compile contrib Elisp files"
-	emake -j1 -C doc slime.info || die "Cannot build info docs"
+		elisp-compile contrib/*.el || die
+	emake -j1 -C doc slime.info || die
+
 	if use doc; then
-		VARTEXFONTS="${T}"/fonts \
-			emake -j1 -C doc slime.{ps,pdf} || die "emake doc failed"
+		VARTEXFONTS="${T}/fonts" emake -j1 -C doc slime.{ps,pdf} || die
 	fi
 }
 
 src_install() {
 	## install core
-	elisp-install ${PN} *.el{,c} "${FILESDIR}"/swank-loader.lisp \
-		|| die "Cannot install SLIME core"
-	sed "s:/usr/:${EPREFIX}&:g" "${FILESDIR}"/${PV}/${SITEFILE} \
-		>"${T}"/${SITEFILE} || die "sed failed"
-	elisp-site-file-install "${T}"/${SITEFILE} || die
-	cp "${FILESDIR}"/${PV}/swank.asd "${S}"
+	elisp-install ${PN} *.{el,elc} "${FILESDIR}/swank-loader.lisp" || die
+	sed "s:/usr/:${EPREFIX}&:g" "${FILESDIR}/${SITEFILE}" >"${T}/${SITEFILE}" \
+		|| die
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
 	# remove upstream swank-loader, since it won't be used
-	rm "${S}"/swank-loader.lisp
-	insinto "${CLSOURCEROOT%/}"/swank
-	doins *.lisp "${FILESDIR}"/${PV}/swank.asd
-	dodir "${CLSYSTEMROOT}"
-	dosym "${CLSOURCEROOT%/}"/swank/swank.asd "${CLSYSTEMROOT}"
-	dosym "${SITELISP}"/${PN}/swank-version.el "${CLSOURCEROOT%/}"/swank
+	rm "${S}/swank-loader.lisp"
+
+	insinto "${CLSOURCEROOT%/}/swank"
+	doins *.lisp swank.asd || die
+	dodir "${CLSYSTEMROOT}" || die
+	dosym "${CLSOURCEROOT%/}/swank/swank.asd" "${CLSYSTEMROOT}" || die
 
 	## install contribs
-	elisp-install ${PN}/contrib/ contrib/*.{el,elc,scm,goo} \
-		|| die "Cannot install contribs"
-	insinto "${CLSOURCEROOT%/}"/swank/contrib
-	doins contrib/*.lisp
+	elisp-install ${PN}/contrib/ contrib/*.{el,elc,scm,goo} || die
+	insinto "${CLSOURCEROOT%/}/swank/contrib"
+	doins contrib/*.lisp || die
 
 	## install docs
+	doinfo doc/slime.info || die
 	dodoc README* ChangeLog HACKING NEWS PROBLEMS
 	newdoc contrib/README README.contrib
 	newdoc contrib/ChangeLog ChangeLog.contrib
-	doinfo doc/slime.info
 	use doc && dodoc doc/slime.{ps,pdf}
 }