Version bump. Install contributed files with USE=contrib, bug 293773.

(Portage version: 2.1.9.23/cvs/Linux x86_64)

3 files changed, 64 insertions, 1 deletions

diff --git a/app-emacs/org-mode/ChangeLog b/app-emacs/org-mode/ChangeLog
index 3316fc2dda38..bb75bf2ee6d8 100644
--- a/app-emacs/org-mode/ChangeLog
+++ b/app-emacs/org-mode/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/org-mode
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/ChangeLog,v 1.116 2010/10/29 13:13:50 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/ChangeLog,v 1.117 2010/11/02 07:36:10 ulm Exp $
+
+*org-mode-7.3 (02 Nov 2010)
+
+  02 Nov 2010; Ulrich Mueller <ulm@gentoo.org> +org-mode-7.3.ebuild,
+  metadata.xml:
+  Version bump. Install contributed files with USE=contrib, bug 293773.
 
 *org-mode-7.02 (29 Oct 2010)
 
diff --git a/app-emacs/org-mode/metadata.xml b/app-emacs/org-mode/metadata.xml
index 0880379c6c70..9c6bc2923b49 100644
--- a/app-emacs/org-mode/metadata.xml
+++ b/app-emacs/org-mode/metadata.xml
@@ -17,4 +17,7 @@
   the projects. For printing and sharing of notes, an Org-mode file can be
   exported as a structured ASCII file, HTML, and LaTeX.
 </longdescription>
+<use>
+  <flag name='contrib'>Install user-contributed files</flag>
+</use>
 </pkgmetadata>
diff --git a/app-emacs/org-mode/org-mode-7.3.ebuild b/app-emacs/org-mode/org-mode-7.3.ebuild
new file mode 100644
index 000000000000..bb12a25090d9
--- /dev/null
+++ b/app-emacs/org-mode/org-mode-7.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2010 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.3.ebuild,v 1.1 2010/11/02 07:36:10 ulm Exp $
+
+EAPI=3
+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"
+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 || die
+}
+
+src_install() {
+	emake \
+		prefix="${D}/usr" \
+		lispdir="${D}${SITELISP}/${PN}" \
+		infodir="${D}/usr/share/info" \
+		install || die
+
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+
+	doinfo doc/org || die "doinfo failed"
+	dodoc README Changes.org doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf \
+		|| die
+
+	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 || die
+		find "${D}/usr/share/doc/${PF}/contrib" -type f -name '.*' \
+			-exec rm -f '{}' '+'
+		prepalldocs				# FIXME: remove in EAPI 4
+	fi
+}