Remove redundant NEED_EMACS assignment. Remove old.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

8 files changed, 14 insertions, 127 deletions

diff --git a/app-emacs/org-mode/ChangeLog b/app-emacs/org-mode/ChangeLog
index 82b41f05b083..afb9f4115c18 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/ChangeLog,v 1.167 2014/04/26 13:51:06 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/ChangeLog,v 1.168 2014/06/07 11:33:14 ulm Exp $
+
+  07 Jun 2014; Ulrich Müller <ulm@gentoo.org> -org-mode-7.9.2.ebuild,
+  -org-mode-8.0.2.ebuild, org-mode-8.2.1.ebuild, org-mode-8.2.5h.ebuild,
+  org-mode-8.2.6.ebuild, -files/50org-mode-gentoo-8.el,
+  files/50org-mode-gentoo.el:
+  Remove redundant NEED_EMACS assignment. Remove old.
 
 *org-mode-8.2.6 (26 Apr 2014)
 
diff --git a/app-emacs/org-mode/files/50org-mode-gentoo-8.el b/app-emacs/org-mode/files/50org-mode-gentoo-8.el
deleted file mode 100644
index 431f52ce467a..000000000000
--- a/app-emacs/org-mode/files/50org-mode-gentoo-8.el
+++ /dev/null
@@ -1,2 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-(add-to-list 'auto-mode-alist '("\\.org\\'" . org-mode))
diff --git a/app-emacs/org-mode/files/50org-mode-gentoo.el b/app-emacs/org-mode/files/50org-mode-gentoo.el
index 447ecbbafbf2..431f52ce467a 100644
--- a/app-emacs/org-mode/files/50org-mode-gentoo.el
+++ b/app-emacs/org-mode/files/50org-mode-gentoo.el
@@ -1,3 +1,2 @@
 (add-to-list 'load-path "@SITELISP@")
 (add-to-list 'auto-mode-alist '("\\.org\\'" . org-mode))
-(require 'org-install)
diff --git a/app-emacs/org-mode/org-mode-7.9.2.ebuild b/app-emacs/org-mode/org-mode-7.9.2.ebuild
deleted file mode 100644
index 784d5bccfe61..000000000000
--- a/app-emacs/org-mode/org-mode-7.9.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2013 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.9.2.ebuild,v 1.9 2013/05/06 05:07:34 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 ) odt-schema? ( OASIS-Open )"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd ~x86-macos"
-IUSE="contrib doc odt-schema"
-RESTRICT="test"
-
-DEPEND="doc? ( virtual/texi2dvi )"
-
-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() {
-	emake datadir="${EPREFIX}${SITEETC}/${PN}"
-	use doc && emake pdf card
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		ETCDIRS="styles $(use odt-schema && echo schema)" \
-		lispdir="${EPREFIX}${SITELISP}/${PN}" \
-		datadir="${EPREFIX}${SITEETC}/${PN}" \
-		infodir="${EPREFIX}/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/scripts
-		find "${ED}/usr/share/doc/${PF}/contrib" -type f -name '.*' \
-			-exec rm -f '{}' '+'
-		# add the contrib subdirectory to load-path
-		sed -i -e 's:\(.*@SITELISP@\)\(.*\):&\n\1/contrib\2:' \
-			"${T}/${SITEFILE}" || die
-	fi
-
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-	dodoc README doc/orgcard.txt etc/ORG-NEWS
-	use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
-}
diff --git a/app-emacs/org-mode/org-mode-8.0.2.ebuild b/app-emacs/org-mode/org-mode-8.0.2.ebuild
deleted file mode 100644
index f585e19c1c0c..000000000000
--- a/app-emacs/org-mode/org-mode-8.0.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-8.0.2.ebuild,v 1.3 2013/05/06 05:07:34 ulm Exp $
-
-EAPI=5
-NEED_EMACS=23
-
-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 ) odt-schema? ( OASIS-Open )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos"
-IUSE="contrib doc odt-schema"
-RESTRICT="test"
-
-DEPEND="doc? ( virtual/texi2dvi )"
-
-S="${WORKDIR}/org-${PV}"
-SITEFILE="50${PN}-gentoo-8.el"
-
-src_compile() {
-	emake datadir="${EPREFIX}${SITEETC}/${PN}"
-	use doc && emake pdf card
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		ETCDIRS="styles $(use odt-schema && echo schema)" \
-		lispdir="${EPREFIX}${SITELISP}/${PN}" \
-		datadir="${EPREFIX}${SITEETC}/${PN}" \
-		infodir="${EPREFIX}/usr/share/info" \
-		install
-
-	cp "${FILESDIR}/${SITEFILE}" "${T}/${SITEFILE}"
-
-	if use contrib; then
-		elisp-install ${PN}/contrib contrib/lisp/{org,ob,ox}*.el
-		insinto /usr/share/doc/${PF}/contrib
-		doins -r contrib/README contrib/scripts
-		find "${ED}/usr/share/doc/${PF}/contrib" -type f -name '.*' \
-			-exec rm -f '{}' '+'
-		# add the contrib subdirectory to load-path
-		sed -i -e 's:\(.*@SITELISP@\)\(.*\):&\n\1/contrib\2:' \
-			"${T}/${SITEFILE}" || die
-	fi
-
-	elisp-site-file-install "${T}/${SITEFILE}"
-	dodoc README doc/library-of-babel.org doc/orgcard.txt etc/ORG-NEWS
-	use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
-}
diff --git a/app-emacs/org-mode/org-mode-8.2.1.ebuild b/app-emacs/org-mode/org-mode-8.2.1.ebuild
index 1280170fed32..8490fd5825f5 100644
--- a/app-emacs/org-mode/org-mode-8.2.1.ebuild
+++ b/app-emacs/org-mode/org-mode-8.2.1.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-8.2.1.ebuild,v 1.4 2014/02/24 01:25:37 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-8.2.1.ebuild,v 1.5 2014/06/07 11:33:14 ulm Exp $
 
 EAPI=5
-NEED_EMACS=23
 
 inherit elisp
 
@@ -20,7 +19,7 @@ RESTRICT="test"
 DEPEND="doc? ( virtual/texi2dvi )"
 
 S="${WORKDIR}/org-${PV}"
-SITEFILE="50${PN}-gentoo-8.el"
+SITEFILE="50${PN}-gentoo.el"
 
 src_compile() {
 	emake datadir="${EPREFIX}${SITEETC}/${PN}"
@@ -36,7 +35,7 @@ src_install() {
 		infodir="${EPREFIX}/usr/share/info" \
 		install
 
-	cp "${FILESDIR}/${SITEFILE}" "${T}/${SITEFILE}"
+	cp "${FILESDIR}/${SITEFILE}" "${T}/${SITEFILE}" || die
 
 	if use contrib; then
 		elisp-install ${PN}/contrib contrib/lisp/{org,ob,ox}*.el
diff --git a/app-emacs/org-mode/org-mode-8.2.5h.ebuild b/app-emacs/org-mode/org-mode-8.2.5h.ebuild
index b7f45650cd2f..0fd8b1b2d26e 100644
--- a/app-emacs/org-mode/org-mode-8.2.5h.ebuild
+++ b/app-emacs/org-mode/org-mode-8.2.5h.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-8.2.5h.ebuild,v 1.3 2014/03/26 11:37:51 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-8.2.5h.ebuild,v 1.4 2014/06/07 11:33:14 ulm Exp $
 
 EAPI=5
-NEED_EMACS=23
 
 inherit elisp
 
@@ -20,7 +19,7 @@ RESTRICT="test"
 DEPEND="doc? ( virtual/texi2dvi )"
 
 S="${WORKDIR}/org-${PV}"
-SITEFILE="50${PN}-gentoo-8.el"
+SITEFILE="50${PN}-gentoo.el"
 
 src_compile() {
 	emake datadir="${EPREFIX}${SITEETC}/${PN}"
diff --git a/app-emacs/org-mode/org-mode-8.2.6.ebuild b/app-emacs/org-mode/org-mode-8.2.6.ebuild
index 52b02dcc71bb..f45cc866d592 100644
--- a/app-emacs/org-mode/org-mode-8.2.6.ebuild
+++ b/app-emacs/org-mode/org-mode-8.2.6.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-8.2.6.ebuild,v 1.1 2014/04/26 13:51:06 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-8.2.6.ebuild,v 1.2 2014/06/07 11:33:14 ulm Exp $
 
 EAPI=5
-NEED_EMACS=23
 
 inherit elisp
 
@@ -20,7 +19,7 @@ RESTRICT="test"
 DEPEND="doc? ( virtual/texi2dvi )"
 
 S="${WORKDIR}/org-${PV}"
-SITEFILE="50${PN}-gentoo-8.el"
+SITEFILE="50${PN}-gentoo.el"
 
 src_compile() {
 	emake datadir="${EPREFIX}${SITEETC}/${PN}"