Remove redundant NEED_EMACS assignment. Remove old.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

9 files changed, 30 insertions, 148 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/Manifest b/app-emacs/org-mode/Manifest
index ff58921fbfd9..b1b35c63e344 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -1,31 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 50org-mode-gentoo-8.el 95 SHA256 0f5ef92d56f86b533daad54db85bad93899d08c4b0319a5949cdfbffedd6f354 SHA512 aa2e47c060d441ef1f631f2a44f3b7adc7cf5306155b9cc3f3f808aa053b411980671a89933c77fe02aac79bb6f25f2fe98c676e13e097dd885f23bc9d8cb000 WHIRLPOOL 69ac6f0fd66f3920bb9df820767915a5080ec5b76be0a4b3b50454b3e9a01e642cc91b603d31b6236e3d89face451caae93de3446e68512c7c853a5c0f9dfd76
-AUX 50org-mode-gentoo.el 118 SHA256 6a01ea37515cf87a7d7b6e3085d9867e57b11664a8b3099eecd8c13a0269ecec SHA512 85d3533b5f8f7ee3f6ceb083b94b31e4c90279418de05b471ee5efb20c921b6d52197ff6ca8c30e5b094de064555f9a2603851fa7c86b0e36cb20b99aeb96140 WHIRLPOOL fd6a875f2f07857bb05ff7be22471bd544d372062b831121482b90de251f365b46eb4b6fe8208fdd06ad3fff967562a2a5a078f5dd7d6e7c3a4296dbe09b609f
-DIST org-7.9.2.tar.gz 4141885 SHA256 14c91bf456c271ac17f2f083f86227d4e5f09483fdb69adbf314de4392e25469 SHA512 9b0f90ec47660dcc9faf7ad742b62c816a031119a2a89864f6fd183e343bd08027f5cf8439314b1593b9f5d76ff08f57b0b30aa188e1a94a426b3573c33c434c WHIRLPOOL 3ac9a49157375cd3628c4fb1248af071d8ed725307effbcce81961bd1d35117ae7f5a371baffa6159e0c57fd4f896cdf4a7b0d3ac67942ea177d8717a19ce47f
-DIST org-8.0.2.tar.gz 4171893 SHA256 e129bdb654c7e1cf7404cc55e65ff479712b1d9549ecdbb4f3904b4bff8c7034 SHA512 d1de4ac6a86449446e438a0f2edc98672144ab25721d4eb482ff1bc60122fded9775274d0ca7085d7ed6e98d972734bbd041970f65d8ed73db99f388dc41b2db WHIRLPOOL c51da4cd3b5697585d1f0ee08f8d782240d63395316ccc0570deefaec6944c384bb16963e3bfd3e495bbb8d5c003bfc7d388aa29d487d16da6a6eadb83858033
+AUX 50org-mode-gentoo.el 95 SHA256 0f5ef92d56f86b533daad54db85bad93899d08c4b0319a5949cdfbffedd6f354 SHA512 aa2e47c060d441ef1f631f2a44f3b7adc7cf5306155b9cc3f3f808aa053b411980671a89933c77fe02aac79bb6f25f2fe98c676e13e097dd885f23bc9d8cb000 WHIRLPOOL 69ac6f0fd66f3920bb9df820767915a5080ec5b76be0a4b3b50454b3e9a01e642cc91b603d31b6236e3d89face451caae93de3446e68512c7c853a5c0f9dfd76
 DIST org-8.2.1.tar.gz 4215666 SHA256 625e2b6786158bcf6c43194075f7638ab8048c68a60025289a051c407e467823 SHA512 366504c8bc4637c96d6255603e949951fed1d89b9b58aa938072c982cca14d5eedfa2a45aabbae55d4862aa9dcc984b379f969cf5b6da50f73d2e0044cd687fb WHIRLPOOL 024166ee4eb6bb994f44249ea819ac3b4aad9c133bfcbc438d57a4dce54b3c8a108519eabf9318e769768be36d1733066bbec58cfaf03fc600de72fd55e3c29d
 DIST org-8.2.5h.tar.gz 4220242 SHA256 f0f4924c9d57557b12f535c032f5f8584cc27ab6af2afc9939f9acf1af2c5d80 SHA512 e486a6f831de935fbe9cbcff18042a5a5ff9ecb60ffd755455c70488f95c6c103f7870d7d69f9808043b2b87fe64441adfd5c9ddb417b33fd8f9469d1943db49 WHIRLPOOL 72290244aaabd09660fd290a100d8ae2ed05b64d3b842464f247c20c634a75e2738c07e85d414b852685f2fade0b2aea92a1a2835d178d90b7eab5650710066b
 DIST org-8.2.6.tar.gz 4221803 SHA256 a14a20f3d11855758ad8859e8ccdc50922c31bd64b493d44b856d46441362938 SHA512 a64e975738f26b5315584b51332dbcd29eb6e5b03cb505d638d611455beb921c5e0b728b23fb63f380d46d2e33092865b02de01259cff8985693febebcc1a8a3 WHIRLPOOL b834203c48948a84d6458b7f455451cfd3f40fccd0ae55f150cf105ef937f46fb52492642990cf33c90a2464b93d184d85d922680adf4e66a2af5308d3ac631c
-EBUILD org-mode-7.9.2.ebuild 1727 SHA256 0421e7a6a65e3029ab6baab9566b148d3f04529c872729c126b3aeb36a1f8d45 SHA512 9f4301e8e653dee61cd0f823bab74814e85512ea04b305b1dc40d3ff3ba38298c69bdc744b60cff9ab12affbb7f55e05d09286b4ec1b6ec91eb73fbc52c4dd7d WHIRLPOOL cf8da853b0226577716c2be3c69478bba85fea9d8936d846c8e4b6b682b1e40ad86aa368889d52a69edfbefa6ff61a6d0d605fe90fb1bc2794e1c4037724df28
-EBUILD org-mode-8.0.2.ebuild 1610 SHA256 d65c60e19011676bd49a4ebccc017ef59b4bfced44688bd607e31eb121800137 SHA512 48975e44c1803f33af43ab809e2137ed6c73e84c73cdb34d6e989dc6af7edb2497d311302f8de3af93eaf0f3fd4b0319783862c7b8533ac5b3208d82ab39b76c WHIRLPOOL fe56bf52cfc9298ba7df334271e35eff0fec9db8736bce18ab78689658f0452e5f0f633aee0471efa6f1222b52c6aa9f4e8301c65f3bea1642017000843caec8
-EBUILD org-mode-8.2.1.ebuild 1614 SHA256 da0bd690718f29c88ffe2acf51fec8ac057cc2cb6f82148238291d20f22e350a SHA512 63aa2a8faa9ac621cdd3e98d65a8a69b2ed2464c4552aa9b011a1d174bd984bc8d7657ae28b318e4af24e3a820e8ee1333743c31492e5c2d97638c65365e6d7f WHIRLPOOL 5d90f77de33a73b408ddd8f27a099f35ad93db8546a918d58edab4ad861ca44c0e540944f6a3cb6219d5707eb7b9c7f9a275d7aebb113c933aaedf2fbac62a06
-EBUILD org-mode-8.2.5h.ebuild 1617 SHA256 0fcdd58dab57be98c1c36d48a4cf6e04fa0788f0f237c0ea662f0f534c26aeae SHA512 82da98d2e6cefbde93debfee89fc7ccfdaac9e2eb0dbb1e317dc1078f58d4d33d778347b416b70d91e6d6d74ca94d1ec6eaa9793cde1faf457e5f85107aaa6aa WHIRLPOOL 2209b4fa57b9a3af61b52fced9812ffd873d3e48a3c5ee05dd34d8b1f95483a4a4e9aee8b93e75600a5d8dc2a18627f744334d27da51654e3ce15fd105d18520
-EBUILD org-mode-8.2.6.ebuild 1617 SHA256 f9d04407ec589a4a55438f3fd98c5ec197bf458b288b60c4084bfca79c9a7a3d SHA512 29a604b474247386340046acd01e06840e516483f9c9a50640c0d0f1b96cf577e50ba993aa8ad98a0ee31af4276d85d62c2d68d5fea9718762e7d9fac7d0aec7 WHIRLPOOL 4dc03ce61db1cd98b593b0bd44c977c91156c16e207003e6dcd43525d3230a9dad8266b8c61a6e7a5e0237329976b0d6baefc0a074c99de7febdb53dd73c4d83
-MISC ChangeLog 24269 SHA256 3e95a5aadaba28538a6e59bbc0b75d977326eb7de24f1d2f773fc9cb870a4064 SHA512 d9ae929a962ce203e2970c3f24761774250d22a287602f852e8150c740d5c6cb9b66c345d22979a564fc593cfe7a332a51a18d4acd9582a226b8f6d67c3a05fb WHIRLPOOL 4ec0618de709aed92bbbe659fea7647528461413fe862bcade14781d38c272fd5cef223b206a0343d610c01d05f2c1db04361262a4ad6bdef3ce19a88150141d
+EBUILD org-mode-8.2.1.ebuild 1598 SHA256 6002374e3e579e7cf873e47e3a8a0a2394cae5bc4084bec74e91d09b26a1ba45 SHA512 87adcf47c37c94de32e71d34f11ad8b2f06a5dea1b41330aa454648f3322d9b8f3bccc6e3413a82241a4b15fd97623e3053fc4c34963dacc4aae6da99054aac7 WHIRLPOOL c62724f392bf7352d1d8104bd604457a286c28eff6d083ae58adaa430cc1141820badbb89d5ffeeb8e269295af3c9226552b540ce9a947c4a5377bd8a042fcc7
+EBUILD org-mode-8.2.5h.ebuild 1601 SHA256 dc84fe88bc43cc25778eab4a1d58b3b0650af0b0f336031c2e208293673b9fc7 SHA512 c5807089e56048359feec9506d9979eae61d052ee589c8fffceb5b52c4cf5a1b6423a109c92c544b40a65aa68bcb906a1f5d95d698a5ae4f402739a10f55ce0c WHIRLPOOL 940d79ec2976bc0c5d6c7654c3a7c099b2c7fdbae6c7fbbf16dd8da08b8541be35647a1990c6fc2e18734d27c36ee43beeeccfae227e079742cae35b5c0bc36c
+EBUILD org-mode-8.2.6.ebuild 1601 SHA256 f4d59126ff61e8da8a6f2fc7b4905ac9980cf9efed8f260c4d15030097d2efb7 SHA512 68e16286d160aa93ced92eb37c0ff64def025ef2ab40aece18f32ec355cf6fabfe8754add1d7e2f8501dad07cfa2f2bef43e483f22d8e65a01fd4205b681a819 WHIRLPOOL 6dd20fe18c6d5647ad433fa69a7fc4e67b2fe265a304875e7082bf25b54f03aa755015b8b308f085060f89d9eb26601d3ac274b602252965b6228a45a107160a
+MISC ChangeLog 24554 SHA256 8d10076dc1f35f048a97cd21ef18002131dbf0ebda1a0dbeac2972b8345fdbb5 SHA512 07fd79fd72a9d4f578c875d8af5d54193c1cf5dcc343f9edff25c65f43e0162e66298f6eba04ae6faee9a11daf2c71e87f84b278645679599a729a8bfb251575 WHIRLPOOL e83feaeac0bf4942c4cdd6256337f52da4810d80a73c7923c46106365e3dc70a54586163b7366b62709996bbe4c0c2cc0a0e46e1854638d6a4e8068b0b8fecca
 MISC metadata.xml 1244 SHA256 11da2d6f729e004b19eafd7ccd15fc3b50a41656ab0ebdfb825dee300f569bbf SHA512 8ca51e3e3b8aa4a982fefcaea22b0d19d5c60a35227f97acf097b998ec64ad0a2cb7deaddbdc0004c37eaffe7574dd9fde8fe03f21abdffe1599d1c69cc50aff WHIRLPOOL 993654e26f11dc38cc284008364b71d10a46ae42ebb4f308a6a64e6cdfd22dbb44f597d199fabf6c8303ef21c6529c50652274e939358da1131c19f198a470d8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQGcBAEBCAAGBQJTW7nrAAoJEJQzkH1pP7W47ngL/1oPt/xOufEv9/yHZ1UuhyoJ
-z58ho1JOUbtsycUBYVymwGKKgDyK38ddnhK2RSAl4QIgCCeYqqKZtS7/YJmfMzq2
-01Af7XARmTuoOyIbWcAeSfmFDukg1GoIqZkycyDNAzNLA6eGuukCTk/t/t16KNVW
-O9WN6JeITfjxnoq3LSC5YTF3Nu4YHjdD3skSoqCFkgF/TraQEFw1VZUd8LDXYYEZ
-FwKDYDzB8h8EW9AmvZWZ883zn+Gz8TxK8fq+eGOEDJOfbJsgYVw87BLq2fL97G+I
-TPZllYP/zJ54dajobva/jZRs2LTZSpMYaBPHMk/lxu2CkqscN97/XEtoE/G3Nwb5
-cA2N8K1LdOj09+6rD2CKQ2sg3bylm8AqOOWyYBkH4xsK6mQBIrhwMhnB7XYrrCk7
-ccI+shIzdRU9NAi4Wrf3li+67JLHVd5hgHUYEeoft1NoBudG1dZsDbjsJ0HCUihR
-ce1cewo3z8b4+ZrhBMh2F+JMgkipTCFZSbi7RKk89w==
-=ipx7
+iQGcBAEBCAAGBQJTkvi5AAoJEJQzkH1pP7W4FqAMAIQ8ynHgiufA8rJYU0Eejgpx
+8tU5EntihRXusKN1HQsUNpRdaxwbECXNKOwTPyXOSgT07Fz8IguJC2XBafZhssqM
+zgluq++AwyJdcAo1cc3URDDiindLt1g2W8PSA6uaoxCDNvvl+ICn9j1hY1exECZz
+QZG4x+CLg7dgBUzsw3+DXNFvzvE1OWx+CYx/tbI4ilqLlWInveztTkbs/FQ4qfi5
+IYd81IBpvoGg7xJsf7KwLUdHAPSN1MwD8t7BwIUSYHEmVbyOC6WVnDzGzg0LHPGM
+SR8cGiP7m0gP/L6YpZui2+8h5iRLVqS5sYz5/BHI7A8uQhxvvWQLrUcDO9LSirEs
+OGSiDcxQxyF7lBK3flKycfC5+fS+t0qXXrP1xRR/nWnjEvD+SryNNYSZEgYkreZo
+pPKTGzF7c2C7mj5xrQVHw3CuWwebzaPSCWpAd9bSSRH21lIPm7NaDnD0Qky5Xn6R
+2/75dlhd7N2M2Afhj6tIrC++feZn1wASh0I8Xxouag==
+=8Ihj
 -----END PGP SIGNATURE-----
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}"