Call default function in src_compile. Remove old.

(Portage version: 2.1.9.49/cvs/Linux x86_64)

3 files changed, 7 insertions, 58 deletions

diff --git a/app-emacs/org-mode/ChangeLog b/app-emacs/org-mode/ChangeLog
index 73f7a2b82d5d..d238816a746e 100644
--- a/app-emacs/org-mode/ChangeLog
+++ b/app-emacs/org-mode/ChangeLog
@@ -1,6 +1,10 @@
 # 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.128 2011/05/10 22:13:59 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/ChangeLog,v 1.129 2011/05/22 08:04:16 ulm Exp $
+
+  22 May 2011; Ulrich Mueller <ulm@gentoo.org> -org-mode-7.4.ebuild,
+  org-mode-7.5.ebuild:
+  Call default function in src_compile.
 
   10 May 2011; Markos Chandras <hwoarang@gentoo.org> org-mode-7.5.ebuild:
   Stable on amd64 wrt bug #366329
diff --git a/app-emacs/org-mode/org-mode-7.4.ebuild b/app-emacs/org-mode/org-mode-7.4.ebuild
deleted file mode 100644
index bbfbfa176301..000000000000
--- a/app-emacs/org-mode/org-mode-7.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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.4.ebuild,v 1.1 2010/12/10 16:07:50 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 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 || 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
-}
diff --git a/app-emacs/org-mode/org-mode-7.5.ebuild b/app-emacs/org-mode/org-mode-7.5.ebuild
index 18a869c9489d..24f41a28de15 100644
--- a/app-emacs/org-mode/org-mode-7.5.ebuild
+++ b/app-emacs/org-mode/org-mode-7.5.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.5.ebuild,v 1.4 2011/05/10 22:13:59 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-7.5.ebuild,v 1.5 2011/05/22 08:04:17 ulm Exp $
 
 EAPI=4
 NEED_EMACS=22
@@ -25,9 +25,8 @@ src_prepare() {
 	rm -f lisp/org-install.el
 }
 
-# This is NOT redundant, elisp.eclass redefines src_compile.
 src_compile() {
-	emake
+	default
 }
 
 src_install() {