Call default function in src_compile. Remove old.

Package-Manager: portage-2.1.9.49/cvs/Linux x86_64

4 files changed, 13 insertions, 75 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/Manifest b/app-emacs/org-mode/Manifest
index 18446b904c11..d8e42b85195f 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX 50org-mode-gentoo.el 118 RMD160 e6fe8858715fcffcd1964ace6c64fd10975e319b SHA1 088bb94d531790f1dac8b0b08ad32cb33494c17d SHA256 6a01ea37515cf87a7d7b6e3085d9867e57b11664a8b3099eecd8c13a0269ecec
 DIST org-6.36c.tar.gz 2706358 RMD160 bc745e506712619a03f0b296ac606a5cc7ad81c9 SHA1 56d55f8c751248100aabbc3109495af31ccf277f SHA256 26db6b9c319a2dd54f3a8da78f761594b7c8e7edeb9106f14a1c3a6ff94786a0
@@ -9,24 +9,13 @@ DIST org-7.5.tar.gz 2897817 RMD160 8fa7de0454cddf690e71ac00e8f6a4bcb3ab0606 SHA1
 EBUILD org-mode-6.36c.ebuild 1074 RMD160 6c8b887b19e7607bc50bb7333ec00f07a578918b SHA1 b5933d76e001b6fb445258cf387b485be69df750 SHA256 0a21645daa444e553b5726c5c3e7216e3afcb0734736e4742d28608a7f624575
 EBUILD org-mode-7.3.ebuild 1447 RMD160 8ce017aff6cbcbd34aec5d0af2e2fa29c8b24019 SHA1 de0a8f05eddc9e6d8851224f61c69423b20b6214 SHA256 ce879efcae01b74a8c71d562101b866e0ecf3ac0bf97d475bf5cdb578446c367
 EBUILD org-mode-7.4-r1.ebuild 1353 RMD160 50fb5b6b826ee12a1329663b26a3dcb888a037c2 SHA1 d2544d4dd1217ddb8faedc5383ba114cef7b5927 SHA256 b7907829990ca8d14e1243f53f3f08b6e6c9576b42ad45c9fa9da1b5f8ded3cd
-EBUILD org-mode-7.4.ebuild 1448 RMD160 c71f50d23216f3de5bde2d8e2996c8a1cbffe89c SHA1 6ee1036d52eb602ac62b321fe52fb61db33b3d82 SHA256 f58972ffc18aa9cc586445799a3f91f41050450652285c376422dc95b4e93fb1
-EBUILD org-mode-7.5.ebuild 1356 RMD160 943c4db27424f0d404dfface4dd5805fc5f9cdfb SHA1 d77d2894198ee8f935410cb83207f2a6190a00f9 SHA256 d1ce58010ebd213853f5a7153fa844f85e7c9b2627b85c73f03999f06d618c66
-MISC ChangeLog 18298 RMD160 b3f95b1bb075847be52d2c44405652ab256af8d0 SHA1 26c25d3e58674271e1854323b53ec36b729f19e7 SHA256 a98416dafae96ee5f4f8b622f932b0e91b8466f489378dcd050e4f2d0f332462
+EBUILD org-mode-7.5.ebuild 1292 RMD160 e2ead063fd7284fb0a4143ef22bad4dfdc4e634c SHA1 0900ea73a8c0a25eec525cd2cbc69b0d7dad305c SHA256 f23851a0c816aa2f87ada496ebc36b6aea7558680ca606b3e74341107a9b2eff
+MISC ChangeLog 18426 RMD160 8bfa02c57f51a98eeba3c62e58b36dd363c1089d SHA1 1d9827c1dc0a51b8e5676d8e8de43255000427b0 SHA256 800608a60fa8b63d30f98e4148dbd9d358bfd30bb0b9866796b7f9c8dbda1306
 MISC metadata.xml 1146 RMD160 cd7f3b1f135d9a4483ee2fc6b039370504b8f894 SHA1 adb78dce5a2849ff934805fcc881e82cb2f8574c SHA256 bd68dc6ea0c238afb569ed5108af4b3e53c5e7fab7e7cfcc1f3c6fff0f4ac447
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNybjBAAoJEPqDWhW0r/LCol4P/0bZOBFWS/rSl7KTY1aMJ5ua
-g4/lK3kU8ONPg7Xy+x89gNZQtzmO6i+w/ceM1+OhklVBmb097iovdJvVHonVf+UA
-JXFgR6tKYW9A/SPIQJWxA5L++5kWpCNJlBFkqUKHxvr8shqDqLY/5G4hpVhW6LMA
-VJZ0PxfSNZfJ/Rxv0Jm+dtpwlL7n0bQwNBDkJ/Zt4n3Dn4Xv7l1fjgAvrC+dLAxp
-ZhkMSutUMU0Hjf6TuuTMFzAGKAwpL92IaRLJtbe+LxWy+u6r9gvwcAdZdywo9zML
-FmytH6C6uJpGpEbAELsBTrXWNuvxwAWtOY2h2ntz5j1J67i3TEZNXxZwPC8H8lza
-eB6Zbvxesy2M7+hYjYRWFfWU9SrtGy49FT/g7WVBm9IFfIVEvEW3Rz/FWNh7wJVw
-OZklNHuBW5gt4uvUlSFueJRudL1ZeqlfKVZ/hPydpWdDI0CitY3R+4puSvPN+Bpf
-PC5IZIO8JL2SVJ6lrXNLIRVGZAs/mjimdHb08Q0nFGy1AJI/gMeJJTcqdwfQvWaK
-YlS9yj/2OMoFZwNX+hh4gRd9i24t1A7C0HGz26/hrIX4TBVLYFjeFDWGFsUguBrl
-ORYlPhbBuBRWSP5r6+AhsAUkxBaNgkluUbruQAfmfSOTrbWKbPY4CC/lp8OX3X+s
-dtWoTExJTK67kKV3Q8JJ
-=mZeK
+iEYEARECAAYFAk3YxCkACgkQOeoy/oIi7uxFlQCcDbQNifwpCOHyh2/kIjKGRA2m
+7fUAoKevEJge2+V102ROIlScLRrEVs4X
+=weG+
 -----END PGP SIGNATURE-----
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() {