Install OpenDocument style files. Fixes bug 396269.

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

5 files changed, 135 insertions, 12 deletions

diff --git a/app-emacs/org-mode/ChangeLog b/app-emacs/org-mode/ChangeLog
index a04f7ebfbf88..61e91a2c3bf6 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/ChangeLog,v 1.136 2011/12/25 19:48:12 ago Exp $
+# 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 $
+
+*org-mode-7.8.02-r1 (01 Jan 2012)
+
+  01 Jan 2012; Ulrich Mueller <ulm@gentoo.org> +org-mode-7.8.02-r1.ebuild,
+  +files/org-mode-7.8.02-odt-styles.patch, +files/50org-mode-gentoo-7.8.02.el:
+  Install OpenDocument style files. Fixes bug 396269.
 
   25 Dec 2011; Agostino Sarubbo <ago@gentoo.org> org-mode-7.7.ebuild:
   Stable for AMD64, wrt bug #396001
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index 83778420f4b1..0317f708b0e0 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -1,7 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
+AUX 50org-mode-gentoo-7.8.02.el 163 RMD160 697c2d2e4371feb6648c1f8ce5f3df7b67b85541 SHA1 1313858b766a23f8161380bfc57a21de36a49407 SHA256 db1c5eb65f447c634e6725b310a8604326328e87809e4e17be2d84ca05bdff30
 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
 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
@@ -9,17 +11,14 @@ DIST org-7.8.02.tar.gz 3272089 RMD160 a5e071324b7ffec1e8d72e16713dfbc038a7cb74 S
 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 19469 RMD160 84a2806810874975fc92fce6d8757bbdd6ae696c SHA1 eae9d74e341460504bec986283a7cdce43d681b6 SHA256 649431b248ae111a26f06a0c3cf614a687b389d488315199cffcfd3bc238288b
+MISC ChangeLog 19713 RMD160 5af8d140b4b4a384addf5516ce0f7ac78a4cc2d1 SHA1 51c681bea8f514952ea6472c8553494c6276eac2 SHA256 dedb750c02b9e3a369c81dc2a42eeb06dc81e10c75ac32db1dfb76e86354e2d4
 MISC metadata.xml 1146 RMD160 cd7f3b1f135d9a4483ee2fc6b039370504b8f894 SHA1 adb78dce5a2849ff934805fcc881e82cb2f8574c SHA256 bd68dc6ea0c238afb569ed5108af4b3e53c5e7fab7e7cfcc1f3c6fff0f4ac447
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJO934HAAoJEOTDgjZ80txdAasIAJ7Eq+V92AxKBM/2mpfIBTi8
-cikpEWWUNYIwDpyMAwYmGbaa+3sD0IVTw+mtjyW1FJgPzAq0g976OUVOpoeWQqf9
-7/aplIrxV4shjwRLImonMIEx3S07JjrYezEKwNum/DkRSxN/4JxY9zEWXG7iQGbL
-C2Mz/m/idx2pussFpht8TSZLg0rjmwftWE1cN/Oem/oUO5xi9QSKkZZ0XibY6ohT
-AOIUv+thjDLzoDmAMd02OG5eL+Uo/jFF0yxPhnX6z+GKFNABtiK5uHc8l8oScOFN
-sUsyrjwtbSYkmncChurznaCmbZf1Y2JCgsa0MhwPK5KAUE0gO2Qz7VAQFz6FX/c=
-=UVdK
+iEYEARECAAYFAk8As44ACgkQOeoy/oIi7uwf5gCeMex1/+I/UMiJHQOlTFaQAKdG
+pg8AnixpgjCRuyRNsV7gPhVa9Yp2IZVc
+=t5wr
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/org-mode/files/50org-mode-gentoo-7.8.02.el b/app-emacs/org-mode/files/50org-mode-gentoo-7.8.02.el
new file mode 100644
index 000000000000..0400fc728e8a
--- /dev/null
+++ b/app-emacs/org-mode/files/50org-mode-gentoo-7.8.02.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(add-to-list 'auto-mode-alist '("\\.org\\'" . org-mode))
+(require 'org-install)
+(setq org-odt-styles-dir "@SITEETC@/styles")
diff --git a/app-emacs/org-mode/files/org-mode-7.8.02-odt-styles.patch b/app-emacs/org-mode/files/org-mode-7.8.02-odt-styles.patch
new file mode 100644
index 000000000000..09b4fc48d9c6
--- /dev/null
+++ b/app-emacs/org-mode/files/org-mode-7.8.02-odt-styles.patch
@@ -0,0 +1,60 @@
+https://bugs.gentoo.org/396269
+Install OpenDocument style files.
+
+Makefile patch from upstream git repo,
+commit e514982ae126c058b965dd00393b4e68e5f8522d by Dave Marquardt.
+
+--- org-7.8.02-orig/Makefile
++++ org-7.8.02/Makefile
+@@ -19,6 +19,12 @@
+ # Where local lisp files go.
+ lispdir   = $(prefix)/share/emacs/site-lisp
+ 
++# Where etc files go
++etcdir    = $(lispdir)/../etc
++
++# Where style files go
++stylesdir = $(etcdir)/styles
++
+ # Where info files go.
+ infodir = $(prefix)/share/info
+ 
+@@ -175,6 +181,7 @@
+ CARDFILES   = doc/orgcard.tex doc/orgcard.pdf doc/orgcard_letter.pdf
+ TEXIFILES   = doc/org.texi
+ INFOFILES   = doc/org
++STYLESFILES = etc/styles/OrgOdtContentTemplate.xml etc/styles/OrgOdtStyles.xml
+ 
+ # Package Manager (ELPA)
+ PKG_TAG = $(shell date +%Y%m%d)
+@@ -211,7 +218,7 @@
+ 
+ compile: $(ELCFILES0) $(ELCBFILES)
+ 
+-install: install-lisp
++install: install-lisp install-etc
+ 
+ doc: doc/org.html doc/org.pdf doc/orgcard.pdf doc/orgcard_letter.pdf doc/orgguide.pdf doc/orgcard.txt
+ 
+@@ -231,6 +238,10 @@
+ 	$(CP) $(INFOFILES) $(infodir)
+ 	$(INSTALL_INFO) --infodir=$(infodir) $(INFOFILES)
+ 
++install-etc: $(STYLESFILES)
++	if [ ! -d $(stylesdir) ]; then $(MKDIR) $(stylesdir); else true; fi ;
++	$(CP) $(STYLESFILES) $(stylesdir)
++
+ autoloads: lisp/org-install.el
+ 
+ lisp/org-install.el: $(LISPFILES0) Makefile
+--- org-7.8.02-orig/lisp/org-odt.el
++++ org-7.8.02/lisp/org-odt.el
+@@ -76,7 +76,7 @@
+   "Regular expressions for special string conversion.")
+ 
+ (defconst org-odt-lib-dir (file-name-directory load-file-name))
+-(defconst org-odt-styles-dir
++(defvar org-odt-styles-dir
+   (let* ((styles-dir1 (expand-file-name "../etc/styles/" org-odt-lib-dir))
+ 	 (styles-dir2 (expand-file-name "./etc/styles/" org-odt-lib-dir))
+ 	 (styles-dir
diff --git a/app-emacs/org-mode/org-mode-7.8.02-r1.ebuild b/app-emacs/org-mode/org-mode-7.8.02-r1.ebuild
new file mode 100644
index 000000000000..a3c7c0c91a6b
--- /dev/null
+++ b/app-emacs/org-mode/org-mode-7.8.02-r1.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.02-r1.ebuild,v 1.1 2012/01/01 19:16:30 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}-odt-styles.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() {
+	default
+}
+
+src_install() {
+	emake \
+		prefix="${ED}/usr" \
+		lispdir="${ED}${SITELISP}/${PN}" \
+		etcdir="${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
+}