With USE="contrib", add the contrib subdirectory to load-path, bug 386243. Remove intermediate version.

(Portage version: 2.1.10.24/cvs/Linux x86_64)

3 files changed, 14 insertions, 57 deletions

diff --git a/app-emacs/org-mode/ChangeLog b/app-emacs/org-mode/ChangeLog
index d473d63b31f9..e598e6a7df90 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.133 2011/08/04 07:33:33 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/ChangeLog,v 1.134 2011/10/09 10:26:59 ulm Exp $
+
+  09 Oct 2011; Ulrich Mueller <ulm@gentoo.org> -org-mode-7.6.ebuild,
+  org-mode-7.7.ebuild:
+  With USE="contrib", add the contrib subdirectory to load-path, bug 386243.
+  Remove intermediate version.
 
 *org-mode-7.7 (04 Aug 2011)
 
diff --git a/app-emacs/org-mode/org-mode-7.6.ebuild b/app-emacs/org-mode/org-mode-7.6.ebuild
deleted file mode 100644
index 482ea338fb3c..000000000000
--- a/app-emacs/org-mode/org-mode-7.6.ebuild
+++ /dev/null
@@ -1,51 +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/org-mode/org-mode-7.6.ebuild,v 1.1 2011/07/06 21:55:35 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 as-is )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-macos"
-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
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	emake \
-		prefix="${ED}/usr" \
-		lispdir="${ED}${SITELISP}/${PN}" \
-		infodir="${ED}/usr/share/info" \
-		install
-
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-
-	doinfo doc/org
-	dodoc README 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/odt contrib/scripts
-		find "${ED}/usr/share/doc/${PF}/contrib" -type f -name '.*' \
-			-exec rm -f '{}' '+'
-	fi
-}
diff --git a/app-emacs/org-mode/org-mode-7.7.ebuild b/app-emacs/org-mode/org-mode-7.7.ebuild
index 4c5b11e8a24b..d0d7cc33932b 100644
--- a/app-emacs/org-mode/org-mode-7.7.ebuild
+++ b/app-emacs/org-mode/org-mode-7.7.ebuild
@@ -1,6 +1,6 @@
 # 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.7.ebuild,v 1.1 2011/08/04 07:33:33 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-7.7.ebuild,v 1.2 2011/10/09 10:26:59 ulm Exp $
 
 EAPI=4
 NEED_EMACS=22
@@ -36,10 +36,7 @@ src_install() {
 		infodir="${ED}/usr/share/info" \
 		install
 
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-
-	doinfo doc/org
-	dodoc README doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
+	cp "${FILESDIR}/${SITEFILE}" "${T}/${SITEFILE}"
 
 	if use contrib; then
 		elisp-install ${PN}/contrib contrib/lisp/*org*.el || die
@@ -47,5 +44,11 @@ src_install() {
 		doins -r contrib/README contrib/babel contrib/odt contrib/scripts
 		find "${ED}/usr/share/doc/${PF}/contrib" -type f -name '.*' \
 			-exec rm -f '{}' '+'
+		sed -ie 's:\(.*@SITELISP@\)\(.*\):&\n\1/contrib\2:' \
+			"${T}/${SITEFILE}" || die
 	fi
+
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+	doinfo doc/org
+	dodoc README doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
 }