Fix typo in site-init file, bug 397721. Remove old.

(Portage version: 2.1.10.44/cvs/Linux x86_64)

4 files changed, 10 insertions, 54 deletions

diff --git a/app-emacs/org-mode/ChangeLog b/app-emacs/org-mode/ChangeLog
index 81e96c4fe90b..2757f3289710 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.139 2012/01/04 18:11:36 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/ChangeLog,v 1.140 2012/01/05 07:31:45 ulm Exp $
+
+*org-mode-7.8.03-r1 (05 Jan 2012)
+
+  05 Jan 2012; Ulrich Mueller <ulm@gentoo.org> -org-mode-7.8.02.ebuild,
+  -org-mode-7.8.03.ebuild, +org-mode-7.8.03-r1.ebuild,
+  files/50org-mode-gentoo-7.8.03.el:
+  Fix typo in site-init file, bug 397721. Remove old.
 
   04 Jan 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> org-mode-7.7.ebuild:
   x86 stable wrt bug #396001
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
index 2b969904108b..adaaf28f996a 100644
--- 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
@@ -1,4 +1,4 @@
-n(add-to-list 'load-path "@SITELISP@")
+(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/org-mode-7.8.02.ebuild b/app-emacs/org-mode/org-mode-7.8.02.ebuild
deleted file mode 100644
index fe7aac566b72..000000000000
--- a/app-emacs/org-mode/org-mode-7.8.02.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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.8.02.ebuild,v 1.1 2011/12/25 15:41:00 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}"
-# 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.el"
-
-src_compile() {
-	default
-}
-
-src_install() {
-	emake \
-		prefix="${ED}/usr" \
-		lispdir="${ED}${SITELISP}/${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 '{}' '+'
-		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
-}
diff --git a/app-emacs/org-mode/org-mode-7.8.03.ebuild b/app-emacs/org-mode/org-mode-7.8.03-r1.ebuild
index a6a7a6627656..e41a3c9c0d7c 100644
--- a/app-emacs/org-mode/org-mode-7.8.03.ebuild
+++ b/app-emacs/org-mode/org-mode-7.8.03-r1.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.03.ebuild,v 1.1 2012/01/04 12:59:36 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-7.8.03-r1.ebuild,v 1.1 2012/01/05 07:31:45 ulm Exp $
 
 EAPI=4
 NEED_EMACS=22