Don't call prepalldocs, fixes bug 262925.

(Portage version: 2.1.9.35/cvs/Linux x86_64)

2 files changed, 58 insertions, 1 deletions

diff --git a/app-emacs/org-mode/ChangeLog b/app-emacs/org-mode/ChangeLog
index 4e0e396e362f..6d291ac07879 100644
--- a/app-emacs/org-mode/ChangeLog
+++ b/app-emacs/org-mode/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emacs/org-mode
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/ChangeLog,v 1.123 2011/01/08 02:16:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/ChangeLog,v 1.124 2011/01/30 12:15:59 ulm Exp $
+
+*org-mode-7.4-r1 (30 Jan 2011)
+
+  30 Jan 2011; Ulrich Mueller <ulm@gentoo.org> +org-mode-7.4-r1.ebuild:
+  Don't call prepalldocs, it is no longer needed with EAPI 4. Bug 262925.
 
   08 Jan 2011; Ulrich Mueller <ulm@gentoo.org> -org-mode-7.01h-r1.ebuild,
   -org-mode-7.02.ebuild:
diff --git a/app-emacs/org-mode/org-mode-7.4-r1.ebuild b/app-emacs/org-mode/org-mode-7.4-r1.ebuild
new file mode 100644
index 000000000000..b0e9cd5e7a91
--- /dev/null
+++ b/app-emacs/org-mode/org-mode-7.4-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-7.4-r1.ebuild,v 1.1 2011/01/30 12:15:59 ulm Exp $
+
+EAPI=4
+NEED_EMACS=22
+
+inherit elisp
+
+DESCRIPTION="An Emacs mode for notes and project planning"
+HOMEPAGE="http://www.orgmode.org/"
+SRC_URI="http://orgmode.org/org-${PV}.tar.gz"
+
+LICENSE="GPL-3 FDL-1.3 contrib? ( GPL-2 MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="contrib"
+
+S="${WORKDIR}/org-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	# Remove autoload file to make sure that it is regenerated with
+	# the right Emacs version.
+	rm -f lisp/org-install.el
+}
+
+# This is NOT redundant, elisp.eclass redefines src_compile.
+src_compile() {
+	emake
+}
+
+src_install() {
+	emake \
+		prefix="${D}/usr" \
+		lispdir="${D}${SITELISP}/${PN}" \
+		infodir="${D}/usr/share/info" \
+		install
+
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+
+	doinfo doc/org
+	dodoc README Changes.org doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
+
+	if use contrib; then
+		elisp-install ${PN}/contrib contrib/lisp/*org*.el || die
+		insinto /usr/share/doc/${PF}/contrib
+		doins -r contrib/README contrib/babel contrib/scripts
+		find "${D}/usr/share/doc/${PF}/contrib" -type f -name '.*' \
+			-exec rm -f '{}' '+'
+	fi
+}