Version bump.

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

diff --git a/app-emacs/org-mode/ChangeLog b/app-emacs/org-mode/ChangeLog
index 61e91a2c3bf6be6110c6e506a32f4c18b0f0a8bb..0cbfe17faa600b14f371d96ee769739995d6d46c 100644 (file)
--- a/app-emacs/org-mode/ChangeLog
+++ b/app-emacs/org-mode/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/org-mode
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/ChangeLog,v 1.137 2012/01/01 19:16:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/ChangeLog,v 1.138 2012/01/04 12:59:36 ulm Exp $
+
+*org-mode-7.8.03 (04 Jan 2012)
+
+  04 Jan 2012; Ulrich Mueller <ulm@gentoo.org> +org-mode-7.8.03.ebuild,
+  +files/org-mode-7.8.03-Makefile.patch, +files/50org-mode-gentoo-7.8.03.el:
+  Version bump.
 
 *org-mode-7.8.02-r1 (01 Jan 2012)
 

diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index 0317f708b0e04400c41b8b7deacbcfc86590dd5d..b4f54214423b9b07d7c5b47450ba00168d468216 100644 (file)
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -2,23 +2,37 @@
 Hash: SHA1
 
 AUX 50org-mode-gentoo-7.8.02.el 163 RMD160 697c2d2e4371feb6648c1f8ce5f3df7b67b85541 SHA1 1313858b766a23f8161380bfc57a21de36a49407 SHA256 db1c5eb65f447c634e6725b310a8604326328e87809e4e17be2d84ca05bdff30
+AUX 50org-mode-gentoo-7.8.03.el 155 RMD160 ef1d42a456f266fbdc535cf313a0db43987390b3 SHA1 23e95b2e680edff7c84c1034547437525ef08abb SHA256 89cd40b1a38707a5bed1c959bb3e2cf844ae805eac6ef7035029e0b7c2ac311a
 AUX 50org-mode-gentoo.el 118 RMD160 e6fe8858715fcffcd1964ace6c64fd10975e319b SHA1 088bb94d531790f1dac8b0b08ad32cb33494c17d SHA256 6a01ea37515cf87a7d7b6e3085d9867e57b11664a8b3099eecd8c13a0269ecec
 AUX org-mode-7.8.02-odt-styles.patch 1749 RMD160 9b2e822350ad2f99f5a05d75df0d98d18b6b1b7c SHA1 f7a24c0f78c0d00fa95d6fab4bb18b64b0498bd7 SHA256 2e892288ede385b65e4ba4210570461ba19f639666740b3d79e7e2fe387a7307
+AUX org-mode-7.8.03-Makefile.patch 816 RMD160 a2d84726cd82ab6ea203ad7e73d6190eded9c013 SHA1 828ec33786706ade16b9140d1ed9dade90a3d9a7 SHA256 b99e85301a31551177e5f80964057dea2fac031881789b86f3182d1db37f7679
 DIST org-6.36c.tar.gz 2706358 RMD160 bc745e506712619a03f0b296ac606a5cc7ad81c9 SHA1 56d55f8c751248100aabbc3109495af31ccf277f SHA256 26db6b9c319a2dd54f3a8da78f761594b7c8e7edeb9106f14a1c3a6ff94786a0
 DIST org-7.5.tar.gz 2897817 RMD160 8fa7de0454cddf690e71ac00e8f6a4bcb3ab0606 SHA1 935392f885a6a6cbb3912aaffe55f3eaeaea2472 SHA256 978822bc4c5f9f67450fbaa8572f1d4217406b7e28551278c9f23f7e9515cd4b
 DIST org-7.7.tar.gz 3248717 RMD160 7d87fc763c942d25dd65f8a0851bab3b7011c008 SHA1 214b4b66f573686d72dd1f829d1f639dd7d1ff7d SHA256 6df7633ec40231f466b436c5e63b03a62c585d3fe0e53838a2cd7c18c68e7f26
 DIST org-7.8.02.tar.gz 3272089 RMD160 a5e071324b7ffec1e8d72e16713dfbc038a7cb74 SHA1 08caeabdc4514187193f93d42f656e7fa6f24013 SHA256 c97c7e50d80424e3c3ffdd1cdd6c597be815b7450bb02da0e661a3d3cafb3f19
+DIST org-7.8.03.tar.gz 3288565 RMD160 f1ad226d2ec2d99ddf6f793f45bb140042b014be SHA1 731809e4b6732e50a2b5a4b0ecba61123ffe3420 SHA256 49357cca7d892e70cd2dfcc0b5d96d9fd164ef5a1f251ace3865ecb27dc1e958
 EBUILD org-mode-6.36c.ebuild 1069 RMD160 8c536e2a0b7934abe9c7d5577e17cd0fc33df914 SHA1 b1c16dfd04930e61c418b2508bde3df4021a8c1d SHA256 55f78e66ea711913eaaff6fbb99f083a1f8e60b0ddc48eb7c04994b08d3984a5
 EBUILD org-mode-7.5.ebuild 1288 RMD160 78519358479920281ad29b516d82f1c3fd90b565 SHA1 199a45309a1dc85b0961711ecdf7e72bd5655395 SHA256 ad834908a748a7a3a3f6c523d074b2ad8497a1c0af5935301229105428e82547
 EBUILD org-mode-7.7.ebuild 1418 RMD160 16c664a58643334cad70d017ae3a71a1da61f24b SHA1 ce05b3ed84136a8386a419c2c093bc8dfaa97c08 SHA256 ed3e91d8241e072a5731b76af445f2b3cf95035fd82610a05b7bec061a4773b5
 EBUILD org-mode-7.8.02-r1.ebuild 1550 RMD160 0055d4f44008c7ae14a4a5f77a0354697645fa1a SHA1 c82d35c5d5b7827691a1ddfc7864f327301bd996 SHA256 ffc5fd7ff3ced448c9580c946c489678063c8ce6a40e63571b1fc2661dc4fd1f
 EBUILD org-mode-7.8.02.ebuild 1422 RMD160 276517dd596d324033aaf69aff0a365c071fcf0b SHA1 a4fa666ed772b9a85eb7d11fc58920ca0209b911 SHA256 12c066d09570d31c5c6f680598acab6602d615609fbd13e62fdd654e5bd19aea
-MISC ChangeLog 19713 RMD160 5af8d140b4b4a384addf5516ce0f7ac78a4cc2d1 SHA1 51c681bea8f514952ea6472c8553494c6276eac2 SHA256 dedb750c02b9e3a369c81dc2a42eeb06dc81e10c75ac32db1dfb76e86354e2d4
+EBUILD org-mode-7.8.03.ebuild 1571 RMD160 f2f28b0f6f5882e27f865921f4687752d6117ddb SHA1 e0eb9af2efe88e4b174c169d4e878ad9d2b63a1e SHA256 6153262012ad2b7e0f0a6b0dc65e84556852586fc6f8df27e81e25dcc7a99ff6
+MISC ChangeLog 19911 RMD160 71d27bf8fc2955e0b62fc795a2ea099ab2a2a78b SHA1 560caa0b18715d09bbc5f08b3664ecfb07683cb6 SHA256 bb091c8740d2cea20afc8ae2231596828ac848ba79a8b3c043dc6685d91f8213
 MISC metadata.xml 1146 RMD160 cd7f3b1f135d9a4483ee2fc6b039370504b8f894 SHA1 adb78dce5a2849ff934805fcc881e82cb2f8574c SHA256 bd68dc6ea0c238afb569ed5108af4b3e53c5e7fab7e7cfcc1f3c6fff0f4ac447
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8As44ACgkQOeoy/oIi7uwf5gCeMex1/+I/UMiJHQOlTFaQAKdG
-pg8AnixpgjCRuyRNsV7gPhVa9Yp2IZVc
-=t5wr
+iQIcBAEBAgAGBQJPBE+/AAoJEDxpGckxwJCBLKgP/06YpInA6wElQw9wzP+k0Jmg
+gca0PS+mwUP7lknBXzARLVjT320dqosDPj/tRhI/XmED+omXZ3iyC2xKJXPat0Ny
+sePVqeK4uQNF6xFgVPPIxRYiCJFR+eSK0Twm/7WEPMHcJI0R9np1L6aGAaEph5le
+K5VILmaAaxwCY2TYcczjiQf3PU+TUjA8wxdfsmHuqzyqSmMsIRxgcuEAhbjX/QSC
+9T33SFNpBgiz5ZqzF3QvMdD5LiRz3gvuM9TxwugYGMZ7aqgKg7Mxsn9aLnFOym2s
+u9qYn847nMDSf90ype7pGF9NvGrZSZiTquZFW1/lcL32EhWji4cD1bgxj9vicARa
+3fguJZbUApGCuWbdFHHpITkI9UtD8zIf7pSE53E5ZMZUqiBXBamEe2J5OVTIZUZU
+QZ2twqIZxywawoB9D+ifHhw9IS38rN5lTYWSFsJrB1NbG+QE9XhOHhW30l3PClUH
+pXmFmRiMF8fFZ23G0iXDqHr5xwl7Vy6ZIFowUa7nCKn6wdntOXPRz51upzQ4gD6x
+EbsBoipnGnJ+MdbYttZ+RcUDIpwVKiP++nngQNDByW0Us5E3iDdYG8x2w7JO1g8Y
+6FjykSneMC40f+W+r6vW7TFWamH3UKWl9La+MCmiUD3gFuVUIPTIbu+SGOyw3vnf
+lJd6PWnm1As8/gC9/s7T
+=m2yK
 -----END PGP SIGNATURE-----

diff --git a/app-emacs/org-mode/files/50org-mode-gentoo-7.8.03.el b/app-emacs/org-mode/files/50org-mode-gentoo-7.8.03.el
new file mode 100644 (file)
index 0000000..2b96990
--- /dev/null
+++ b/app-emacs/org-mode/files/50org-mode-gentoo-7.8.03.el
@@ -0,0 +1,4 @@
+n(add-to-list 'load-path "@SITELISP@")
+(add-to-list 'auto-mode-alist '("\\.org\\'" . org-mode))
+(require 'org-install)
+(setq org-odt-data-dir "@SITEETC@")

diff --git a/app-emacs/org-mode/files/org-mode-7.8.03-Makefile.patch b/app-emacs/org-mode/files/org-mode-7.8.03-Makefile.patch
new file mode 100644 (file)
index 0000000..918727f
--- /dev/null
+++ b/app-emacs/org-mode/files/org-mode-7.8.03-Makefile.patch
@@ -0,0 +1,22 @@
+Don't re-compile org-odt.el at install time.
+Patch submitted upstream:
+http://lists.gnu.org/archive/html/emacs-orgmode/2012-01/msg00005.html
+
+--- org-7.8.03-orig/Makefile
++++ org-7.8.03/Makefile
+@@ -247,14 +247,10 @@
+ g:
+       ${MAKE} pdf && open doc/orgguide.pdf
+ 
+-# Always force re-compilation of org-odt
+-lisp/org-odt.elc: org-odt-data-dir
+-org-odt-data-dir:
+-
+ # Sleight of hand to "hard code" the value of $(datadir) in
+ # org-odt.el.  See variables `org-odt-styles-dir-list' and
+ # `org-odt-schema-dir-list'.
+-install-lisp: BATCH_EXTRA = -eval "(setq org-odt-data-dir (expand-file-name \"$(datadir)\"))"
++lisp/org-odt.elc: BATCH_EXTRA = -eval "(setq org-odt-data-dir (expand-file-name \"$(datadir)\"))"
+ 
+ install-lisp: $(LISPFILES) $(ELCFILES)
+       if [ ! -d $(lispdir) ]; then $(MKDIR) $(lispdir); else true; fi ;

diff --git a/app-emacs/org-mode/org-mode-7.8.03.ebuild b/app-emacs/org-mode/org-mode-7.8.03.ebuild
new file mode 100644 (file)
index 0000000..a6a7a66
--- /dev/null
+++ b/app-emacs/org-mode/org-mode-7.8.03.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 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.8.03.ebuild,v 1.1 2012/01/04 12:59:36 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}"
+ELISP_PATCHES="${P}-Makefile.patch"
+# Remove autoload file to make sure that it is regenerated with
+# the right Emacs version.
+ELISP_REMOVE="lisp/org-install.el"
+SITEFILE="50${PN}-gentoo-${PV}.el"
+
+src_compile() {
+       emake datadir="${SITEETC}/${PN}"
+}
+
+src_install() {
+       emake \
+               prefix="${ED}/usr" \
+               lispdir="${ED}${SITELISP}/${PN}" \
+               datadir="${ED}${SITEETC}/${PN}" \
+               infodir="${ED}/usr/share/info" \
+               install
+
+       cp "${FILESDIR}/${SITEFILE}" "${T}/${SITEFILE}"
+
+       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 '{}' '+'
+               # add the contrib subdirectory to load-path
+               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
+}