Version bump, bug #205156.

(Portage version: 2.1.4_rc14)

5 files changed, 68 insertions, 57 deletions

diff --git a/app-emacs/ess/ChangeLog b/app-emacs/ess/ChangeLog
index 0c22831638d2..f657b490ff59 100644
--- a/app-emacs/ess/ChangeLog
+++ b/app-emacs/ess/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-emacs/ess
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ess/ChangeLog,v 1.25 2007/09/29 13:05:20 ulm Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ess/ChangeLog,v 1.26 2008/01/10 15:49:39 ulm Exp $
+
+*ess-5.3.6 (10 Jan 2008)
+
+  10 Jan 2008; Ulrich Mueller <ulm@gentoo.org> -ess-5.3.3.ebuild,
+  +ess-5.3.6.ebuild:
+  Version bump, fixes bug #205156, thanks to Neil <nshephard@gmail.com>.
+  Ebuild cleaned up: DEPEND on virtual/latex-base instead of virtual/tetex;
+  dysfunctional sed command removed; do "emake install" instead of "einstall";
+  install ANNOUNCE and ChangeLog files; use SITELISP and SITEETC variables
+  from elisp-common.eclass. Remove old version.
 
   29 Sep 2007; Ulrich Mueller <ulm@gentoo.org> -ess-5.2.2-r1.ebuild,
   -ess-5.2.3.ebuild, -ess-5.2.8.ebuild:
diff --git a/app-emacs/ess/ess-5.3.3.ebuild b/app-emacs/ess/ess-5.3.3.ebuild
deleted file mode 100644
index 203e5bef7e79..000000000000
--- a/app-emacs/ess/ess-5.3.3.ebuild
+++ /dev/null
@@ -1,52 +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/ess/ess-5.3.3.ebuild,v 1.3 2007/09/21 16:05:09 opfer Exp $
-
-inherit elisp
-
-IUSE=""
-
-DESCRIPTION="Emacs Speaks Statistics"
-HOMEPAGE="http://stat.ethz.ch/ESS/"
-SRC_URI="http://stat.ethz.ch/ESS/downloads/ess/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~alpha ~sparc ~amd64 ~ppc"
-
-DEPEND="app-text/texi2html
-	virtual/tetex"
-RDEPEND=""
-
-SITEFILE=50ess-gentoo.el
-
-src_compile() {
-	# The -glossary option doesn't work with Gentoo texi2html.
-	sed "s:-glossary::g" "${S}/doc/Makefile" > "${T}"/Makefile;
-	emake PREFIX=/usr \
-		INFODIR=/usr/share/info \
-		LISPDIR=/usr/share/emacs/site-lisp/ess \
-		|| die "emake failed"
-}
-
-src_install() {
-	einstall PREFIX="${D}/usr" \
-		INFODIR="${D}/usr/share/info" \
-		LISPDIR="${D}/usr/share/emacs/site-lisp/ess" \
-		|| die "einstall failed"
-
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}";
-	elisp-install ${PN} lisp/*.el
-	dodir /usr/share/emacs/etc/ess
-	cp -pPR etc/* "${D}/usr/share/emacs/etc/ess"
-	dohtml "${S}"/doc/html/*.html
-	dodoc "${S}"/doc/{NEWS,README,TODO}
-	insinto /usr/share/doc/${P}
-	doins "${S}/doc/ess-intro.pdf"
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	elog "Please see /usr/share/doc/${P} for the complete documentation."
-	elog "Usage hints are in /usr/share/emacs/site-lisp/${PN}/ess-site.el."
-}
diff --git a/app-emacs/ess/ess-5.3.6.ebuild b/app-emacs/ess/ess-5.3.6.ebuild
new file mode 100644
index 000000000000..b4e5115973ce
--- /dev/null
+++ b/app-emacs/ess/ess-5.3.6.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ess/ess-5.3.6.ebuild,v 1.1 2008/01/10 15:49:39 ulm Exp $
+
+inherit elisp
+
+DESCRIPTION="Emacs Speaks Statistics"
+HOMEPAGE="http://stat.ethz.ch/ESS/"
+SRC_URI="http://stat.ethz.ch/ESS/downloads/ess/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="app-text/texi2html
+	virtual/latex-base"
+RDEPEND=""
+
+SITEFILE=50${PN}-gentoo.el
+
+src_compile() {
+	emake PREFIX=/usr \
+		INFODIR=/usr/share/info \
+		LISPDIR=${SITELISP}/ess \
+		|| die "emake failed"
+}
+
+src_install() {
+	emake PREFIX="${D}/usr" \
+		INFODIR="${D}/usr/share/info" \
+		LISPDIR="${D}${SITELISP}/ess" \
+		install || die "emake install failed"
+
+	# install all elisp sources; the Makefile installs only part of them
+	elisp-install ${PN} lisp/*.el || die "elisp-install failed"
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
+		|| die "elisp-site-file-install failed"
+	#insinto "${SITEETC}/ess"
+	#doins -r etc/*
+
+	dohtml doc/html/*.html
+	dodoc ANNOUNCE ChangeLog doc/{NEWS,README,TODO} || die "dodoc failed"
+	newdoc lisp/ChangeLog ChangeLog-lisp || die "newdoc failed"
+	insinto /usr/share/doc/${PF}
+	doins doc/ess-intro.pdf
+}
+
+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/files/digest-ess-5.3.3 b/app-emacs/ess/files/digest-ess-5.3.3
deleted file mode 100644
index 49c3d51e20ae..000000000000
--- a/app-emacs/ess/files/digest-ess-5.3.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 87e1539752035b461c5995b336f2fdaa ess-5.3.3.tgz 2605292
-RMD160 d07420fcda4e98560ec29aaf0bcd56d23a229e8f ess-5.3.3.tgz 2605292
-SHA256 8ee6a85bb7aba335727dcd69b9d2c40513c2bbda1701fde57cdf8a72662e51bf ess-5.3.3.tgz 2605292
diff --git a/app-emacs/ess/files/digest-ess-5.3.6 b/app-emacs/ess/files/digest-ess-5.3.6
new file mode 100644
index 000000000000..e9e01da7dd9a
--- /dev/null
+++ b/app-emacs/ess/files/digest-ess-5.3.6
@@ -0,0 +1,3 @@
+MD5 7c6d38cc359c35c4380997e07c1d4575 ess-5.3.6.tgz 2701886
+RMD160 c82d1409b4db64b307f1f6ffeec4c977fe2d4020 ess-5.3.6.tgz 2701886
+SHA256 9531c53e534550924680862e10c04eadd9c049c66a1fc0b9df940c1f966c7a12 ess-5.3.6.tgz 2701886