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

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

4 files changed, 71 insertions, 6 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/Manifest b/app-emacs/org-mode/Manifest
index e5188de2ab95..c2fc301575e1 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -5,15 +5,17 @@ AUX 50org-mode-gentoo.el 118 RMD160 e6fe8858715fcffcd1964ace6c64fd10975e319b SHA
 DIST org-6.36c.tar.gz 2706358 RMD160 bc745e506712619a03f0b296ac606a5cc7ad81c9 SHA1 56d55f8c751248100aabbc3109495af31ccf277f SHA256 26db6b9c319a2dd54f3a8da78f761594b7c8e7edeb9106f14a1c3a6ff94786a0
 DIST org-7.01h.tar.gz 2839938 RMD160 23a529d6844746f2373021ee6324946f4fb4cbf4 SHA1 0fc8b62e1a2582b9af6238c847ff1fd50522904f SHA256 38e048e683584fca7c92e7187e0dd131445998a07b9fbf20e3de6b206110191e
 DIST org-7.02.tar.gz 2926556 RMD160 baf2c796fe19567c9555337b3a2799f8dcaec6bd SHA1 7ea497538ab8c5b2516d0620c865ceb38bc868eb SHA256 500adb83aaae3f66f0c88bcad6e98eac8d8b6f0721fcbba55b3637aaa5c014f2
+DIST org-7.3.tar.gz 2926747 RMD160 c919a5348175d9c60221e3eb01a10e7781b84a0a SHA1 c4b87790f308b99b47a503d9a6ceb51889cc48c4 SHA256 f27643815966c79d931d7dcb9777447ea99a34c3137929a0678c00e34f5cb144
 EBUILD org-mode-6.36c.ebuild 1074 RMD160 6c8b887b19e7607bc50bb7333ec00f07a578918b SHA1 b5933d76e001b6fb445258cf387b485be69df750 SHA256 0a21645daa444e553b5726c5c3e7216e3afcb0734736e4742d28608a7f624575
 EBUILD org-mode-7.01h-r1.ebuild 1062 RMD160 392e5748649291cd763c4d18db76f9dbca533052 SHA1 d6f0d56e59fc2ca6090893f7714524720516fe66 SHA256 7ea4aeadfaaf3b173c216c1b9b717afb06fdb3945abcf5cbf7f0072dbccf63e4
 EBUILD org-mode-7.02.ebuild 1058 RMD160 4562f2d3dad226867c8d1c1097a50dcbfbfc5ef9 SHA1 7ec5a064360ca17922d79606936d22911469db4f SHA256 3194e530572e092465af13eda839770c8eebf04d42d0870269c5e722de40f5a1
-MISC ChangeLog 16775 RMD160 24d4c4f79f84502cf5c8b365d3d0cb9c6cb762e2 SHA1 fd25762a6bafc06c5f8725e0dc2045cbbdd92b18 SHA256 ad69413485ccf2ba1af16abdef6dff5fbe9906e954d3b6a0dfc5e95653aa48d8
-MISC metadata.xml 1072 RMD160 32ec82f4bbf0e45707ba11c3da11d5edc0b0b4dd SHA1 617b871a3e1f6743abc31798c065283386822e34 SHA256 9530293521d00b2f672c420c0f673d82600c0bfacdfbb6b77ffa55408f0866f8
+EBUILD org-mode-7.3.ebuild 1425 RMD160 d5db5b21bb62beb13fc7cc8602c551ae59fbd08b SHA1 dd8adb96b9a363fbde4111926899e6617d60057e SHA256 799127205747b4f19b549b9405f66f45dee685c02dc7d209edd87128b5c9cb3a
+MISC ChangeLog 16962 RMD160 e3f518c41d08e1624a97cd37984dc8e02f947a7b SHA1 2f2a89a769c03394342c00c18717cd16ff59bfdb SHA256 f90d77dd653bf1097c81ed5364a924e3fc507fa4b794dfeb22125b012853afd1
+MISC metadata.xml 1146 RMD160 cd7f3b1f135d9a4483ee2fc6b039370504b8f894 SHA1 adb78dce5a2849ff934805fcc881e82cb2f8574c SHA256 bd68dc6ea0c238afb569ed5108af4b3e53c5e7fab7e7cfcc1f3c6fff0f4ac447
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzKySwACgkQOeoy/oIi7uwA/ACfR1ictpmtStEq1F+bcNVErZ10
-lqAAoIPEVnz0JcKSQwsQ05wiMVLfWzXo
-=+x64
+iEYEARECAAYFAkzPwAsACgkQOeoy/oIi7uxL7QCeOFTuwhPsdI0y3fH39RPuFQWp
+6DsAn1OjxPPRuF7f0t+GUtQ8k0KgFZY1
+=+qsw
 -----END PGP SIGNATURE-----
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
+}