From 54db0e65993b0baeb2810b459eb2b853e195115b Mon Sep 17 00:00:00 2001
From: Ulrich Müller <ulm@gentoo.org>
Date: Fri, 15 Jun 2012 18:13:13 +0000
Subject: Version bump, bug 419481. Remove intermediate version.

(Portage version: 2.1.10.65/cvs/Linux x86_64)
---
 app-emacs/ess/ChangeLog          |  8 ++++++-
 app-emacs/ess/ess-12.04.4.ebuild | 49 ++++++++++++++++++++++++++++++++++++++++
 app-emacs/ess/ess-5.13.ebuild    | 48 ---------------------------------------
 3 files changed, 56 insertions(+), 49 deletions(-)
 create mode 100644 app-emacs/ess/ess-12.04.4.ebuild
 delete mode 100644 app-emacs/ess/ess-5.13.ebuild

(limited to 'app-emacs/ess')

diff --git a/app-emacs/ess/ChangeLog b/app-emacs/ess/ChangeLog
index 04579c929173..96c981923727 100644
--- a/app-emacs/ess/ChangeLog
+++ b/app-emacs/ess/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/ess
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ess/ChangeLog,v 1.78 2012/03/03 00:14:13 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ess/ChangeLog,v 1.79 2012/06/15 18:13:13 ulm Exp $
+
+*ess-12.04.4 (15 Jun 2012)
+
+  15 Jun 2012; Ulrich Müller <ulm@gentoo.org> -ess-5.13.ebuild,
+  +ess-12.04.4.ebuild:
+  Version bump, bug 419481. Remove intermediate version.
 
 *ess-5.14 (03 Mar 2012)
 
diff --git a/app-emacs/ess/ess-12.04.4.ebuild b/app-emacs/ess/ess-12.04.4.ebuild
new file mode 100644
index 000000000000..161ca480c767
--- /dev/null
+++ b/app-emacs/ess/ess-12.04.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ess/ess-12.04.4.ebuild,v 1.1 2012/06/15 18:13:13 ulm Exp $
+
+EAPI=4
+
+inherit elisp
+
+MY_P=${PN}-${PV%.*}-${PV##*.}
+DESCRIPTION="Emacs Speaks Statistics"
+HOMEPAGE="http://ess.r-project.org/"
+SRC_URI="http://ess.r-project.org/downloads/ess/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+DEPEND="app-text/texi2html
+	virtual/latex-base"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	default
+}
+
+src_install() {
+	emake PREFIX="${ED}/usr" \
+		INFODIR="${ED}/usr/share/info" \
+		LISPDIR="${ED}${SITELISP}/ess" \
+		DOCDIR="${ED}/usr/share/doc/${PF}" \
+		install
+
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+
+	# Most documentation is installed by the package's build system.
+	rm -f "${ED}${SITELISP}/${PN}/ChangeLog"
+	dodoc ChangeLog *NEWS doc/{TODO,ess-intro.pdf}
+	newdoc lisp/ChangeLog ChangeLog-lisp
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	elog "Please see /usr/share/doc/${PF} for the complete documentation."
+	elog "Usage hints are in ${SITELISP}/${PN}/ess-site.el ."
+}
diff --git a/app-emacs/ess/ess-5.13.ebuild b/app-emacs/ess/ess-5.13.ebuild
deleted file mode 100644
index 5382574213e2..000000000000
--- a/app-emacs/ess/ess-5.13.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ess/ess-5.13.ebuild,v 1.1 2011/02/03 20:27:47 ulm Exp $
-
-EAPI=4
-
-inherit elisp
-
-DESCRIPTION="Emacs Speaks Statistics"
-HOMEPAGE="http://ess.r-project.org/"
-SRC_URI="http://ess.r-project.org/downloads/ess/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-DEPEND="app-text/texi2html
-	virtual/latex-base"
-RDEPEND=""
-
-SITEFILE="50${PN}-gentoo.el"
-
-# This is NOT redundant, elisp.eclass redefines src_compile.
-src_compile() {
-	emake
-}
-
-src_install() {
-	emake PREFIX="${ED}/usr" \
-		INFODIR="${ED}/usr/share/info" \
-		LISPDIR="${ED}${SITELISP}/ess" \
-		DOCDIR="${ED}/usr/share/doc/${PF}" \
-		install
-
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-
-	# Most documentation is installed by the package's build system.
-	rm -f "${ED}${SITELISP}/${PN}/ChangeLog"
-	dodoc ChangeLog *NEWS doc/{TODO,ess-intro.pdf}
-	newdoc lisp/ChangeLog ChangeLog-lisp
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	elog "Please see /usr/share/doc/${PF} for the complete documentation."
-	elog "Usage hints are in ${SITELISP}/${PN}/ess-site.el ."
-}
-- 
cgit v1.2.3-65-gdbad