Version bump, bug 413069. Remove intermediate version.

(Portage version: 2.1.10.56/cvs/Linux x86_64)

4 files changed, 13 insertions, 70 deletions

diff --git a/app-emacs/org-mode/ChangeLog b/app-emacs/org-mode/ChangeLog
index e6ea6f0faa00..05f91915cdd6 100644
--- a/app-emacs/org-mode/ChangeLog
+++ b/app-emacs/org-mode/ChangeLog
@@ -1,6 +1,13 @@
 # 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.142 2012/01/06 21:19:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/ChangeLog,v 1.143 2012/04/22 19:51:51 ulm Exp $
+
+*org-mode-7.8.09 (22 Apr 2012)
+
+  22 Apr 2012; Ulrich Müller <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,
+  +org-mode-7.8.09.ebuild:
+  Version bump, bug 413069. Remove intermediate version.
 
   06 Jan 2012; Ulrich Mueller <ulm@gentoo.org> -org-mode-7.5.ebuild:
   Remove intermediate version.
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
deleted file mode 100644
index 0400fc728e8a..000000000000
--- a/app-emacs/org-mode/files/50org-mode-gentoo-7.8.02.el
+++ /dev/null
@@ -1,4 +0,0 @@
-(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
deleted file mode 100644
index 09b4fc48d9c6..000000000000
--- a/app-emacs/org-mode/files/org-mode-7.8.02-odt-styles.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-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.09.ebuild
index a3c7c0c91a6b..5beb02b7ff15 100644
--- a/app-emacs/org-mode/org-mode-7.8.02-r1.ebuild
+++ b/app-emacs/org-mode/org-mode-7.8.09.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-7.8.09.ebuild,v 1.1 2012/04/22 19:51:51 ulm Exp $
 
 EAPI=4
 NEED_EMACS=22
@@ -17,21 +17,21 @@ KEYWORDS="~amd64 ~ppc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-macos"
 IUSE="contrib"
 
 S="${WORKDIR}/org-${PV}"
-ELISP_PATCHES="${P}-odt-styles.patch"
+ELISP_PATCHES="${PN}-7.8.03-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"
+SITEFILE="50${PN}-gentoo-7.8.03.el"
 
 src_compile() {
-	default
+	emake datadir="${SITEETC}/${PN}"
 }
 
 src_install() {
 	emake \
 		prefix="${ED}/usr" \
 		lispdir="${ED}${SITELISP}/${PN}" \
-		etcdir="${ED}${SITEETC}/${PN}" \
+		datadir="${ED}${SITEETC}/${PN}" \
 		infodir="${ED}/usr/share/info" \
 		install