Fix previous commit, EPREFIX was missing from paths, bug 468574.

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

4 files changed, 26 insertions, 22 deletions

diff --git a/app-emacs/org-mode/ChangeLog b/app-emacs/org-mode/ChangeLog
index d738dfd9cb4d..b1f80296ba37 100644
--- a/app-emacs/org-mode/ChangeLog
+++ b/app-emacs/org-mode/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emacs/org-mode
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/ChangeLog,v 1.156 2013/05/02 19:28:24 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/ChangeLog,v 1.157 2013/05/05 16:51:24 ulm Exp $
+
+  05 May 2013; Ulrich Müller <ulm@gentoo.org> org-mode-7.9.2.ebuild,
+  org-mode-8.0.2.ebuild:
+  Fix previous commit, EPREFIX was missing from paths, bug 468574.
 
 *org-mode-8.0.2 (02 May 2013)
 
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index 7a3b021faf2a..1aa08fbeeac3 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -7,21 +7,21 @@ DIST org-6.36c.tar.gz 2706358 SHA256 26db6b9c319a2dd54f3a8da78f761594b7c8e7edeb9
 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
 EBUILD org-mode-6.36c.ebuild 1055 SHA256 69bb31775b40b494f84ed61c57583c9f9567e7cdb04723165205f95bb7cde283 SHA512 47fdc5c198409e9ad82b4f77b6edb6f98fab93fc8441c263912a38ac8d4db5a8ab9d3b0b7a6d61f394e6c16ee3e25f07d19bfc81b7be01d0bfb3a09bc7db7fec WHIRLPOOL da243297d2d87efc1e5f3241c9fd8f60e84d65f3e3169ff32d259c3170f4f4454f87739f2959af1b1cb74cf146b17ada25e088c37998dbed786f313c74918e0e
-EBUILD org-mode-7.9.2.ebuild 1657 SHA256 135ccd8f21f2ce57814cda07b035198e5e092ec121d1455a7c2c0279c30065f9 SHA512 f5602b75e8af8295028c18872f0664fef1a0f1481802cfabaca025a9e72c3baa55d6810327b82db764610067cd5630c3e28d949991bea64281125ed14c9ea4ba WHIRLPOOL 0eb16cee2cfe195d545733c5db75bb9875707b99d86340a6ff75d4eec289dd33c457f271ffd1a9c1073388010b1f66c45c5a178475b46a0420c21beb0c6a4f93
-EBUILD org-mode-8.0.2.ebuild 1540 SHA256 541789fb65336d48bf367f0a3a014c3eb5769135844cb815d937ce9e3abba547 SHA512 a56ec34c072d5782e620b0b1fa4200e5c607268cad5ac14491082e2427923f39dfeb7b4be872d76632fe1a90a04494338d66e78dd61ba5b3207e95edd1c34800 WHIRLPOOL 25438c9e6d78fe9f91f6bc876cb6ea79f391a468e641b612a3863c3fcc55b3c3b139e65b43d28bc622077ac72813471673e3def96044274517c4a634f769a882
-MISC ChangeLog 22894 SHA256 8e8698b8c34df53f18a1722185da7c3fb4378a89e5068a8d08ee77367905554a SHA512 3d430a61851500512ca7c4a7a241699f0832d366e110135f8fa733b5fcfcf9934ea1437869ca20dd5ad8ccd19a30969dee8b0220d25a19d9b3b78a15e79667d3 WHIRLPOOL 8d5b9d827afbfd7793d95d3f87392d6cc1bf68fa76c812f4b0023aba8ef175e96780a31e1b25fa346b614b353391161108642905bf1b8086fe36af0e602a012b
+EBUILD org-mode-7.9.2.ebuild 1687 SHA256 fd47e8e51418bbc46126848a12614b3cbbf21587725a59ada52e459b093d76c7 SHA512 302c5ceeba08240d8483b44ad7e9701ba0c1853dd47d05f8e3d3cd8e84461a651f31e0ea63217ea873a2e1435a9bad95fec8994898d01fa6825b81cb7758406d WHIRLPOOL 3099a7714b2510bb37f21c3956f6f5a6188ed54992c47dda3ad2fdb96fe63af4a9b4f354adbd005e23816743ecb5df2d64b426b5b474cbacd30156f2a3328fdb
+EBUILD org-mode-8.0.2.ebuild 1570 SHA256 1428a17dd1a8f4ea9405eafc703694765a788ed43bc94f32326274085e6c9dde SHA512 fa498c817cbd79de962236b018e8bd92f809d8dff5add2a695b23f1975d774a17beab6a6c2dac7064c6a52c39999750817cfeb437ae4a23d73ec77516cb324e8 WHIRLPOOL d76af061e493bf2bfdfb502a18b9fb2aa7aea67b79506e55629b6486477ccb606191f4455cbab17c327ceea1c3e808d6fbb1d9e61ef41f4210f49cfe6753f692
+MISC ChangeLog 23057 SHA256 3b20150d7a5d114fe8dbe0ba4afcb7ae64d76024a0f84ace7fafd1f16fe9fd5c SHA512 d4cf668c231ad2a4e4f564acae2911577bc9a8ea75749c0f892feba09380cf5f3d6c19fd44e82d15f61c08b4059fbd3cb707553eaaab7b9aaaad48f382169f1e WHIRLPOOL f78e5e791daf3c5caf0ce8cef5c37b21fe643353b4da65302f61284f3a1a6b1732f0fd5ade93c72e37413ba357a419ca2131b79d9f7834cc47047eccc267e9f5
 MISC metadata.xml 1244 SHA256 11da2d6f729e004b19eafd7ccd15fc3b50a41656ab0ebdfb825dee300f569bbf SHA512 8ca51e3e3b8aa4a982fefcaea22b0d19d5c60a35227f97acf097b998ec64ad0a2cb7deaddbdc0004c37eaffe7574dd9fde8fe03f21abdffe1599d1c69cc50aff WHIRLPOOL 993654e26f11dc38cc284008364b71d10a46ae42ebb4f308a6a64e6cdfd22dbb44f597d199fabf6c8303ef21c6529c50652274e939358da1131c19f198a470d8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQGcBAEBCAAGBQJRgr6zAAoJEJQzkH1pP7W4Wo8L/1A/6rOo6i4yGN7WXLlr2zvy
-10peIEBbSuDti2XelIdj5an4qJMcz+oNeQeBlBCGkARy+5CwhXwyrgCt2JaXP84M
-rX9x8kcyJsxf2Y2k4EuxYrvXIyAGoGN/Hz637myXKRTAFqPAAVLLyxM5oWqsobIj
-Jm05EpxF2Ys4B1ddBcDxs98kr9PF05tPPZD06Pon1Sg9CWNC8zl0fGnBjQxAG8Fs
-thOIVMsXY607IwVb8d1C5pZffX1vcPQ3KXBhvbpgXgEnQd9+pOpE9upiiBBko/x0
-wHc7iTxfb+vtNTTV0Qqr0oI8SmCLcjgfiyJwQfg5ZFj5GLNBQMj+AatQu49k2ynN
-LtLe5SqQ/Ct71Al6NIAH86dn2uYuDD/UyVJdb1nWaHueAYgERj3P8fgiW0/1QOcC
-4LzgzicRW8+ltKamMjiR8e8ANMDUUJ+Id8nrCfbk+jTEgODgFW+JRPZfuOOIOqdj
-RiRb3QWKtzbtJ/iciIPEiUprJcY3gTbImwh7FtNsvQ==
-=yItu
+iQGcBAEBCAAGBQJRho5sAAoJEJQzkH1pP7W4ZbkL+gNwpj3WP1oaOO7fg01QEC1C
+b9oBNNZ3ad5/FAnk2XVd60kp52+HulwDlow4lr2YK9bEf4caKQSSOprDPch0MK66
+ZIMJfvELnT/5DEEEgIa7oIGCva0tFPvARtzivB1SQC7m3b3Pc//dvEoUhm8bCFEZ
+a7Ik+m8nI691CF+4gKIHJYpB8xPw+qcZGF26I8x2mrmDjJ+KMmeX7YltwV6y9b3R
+6Il2CXI4IcwTPHYsYHJW213b4Kh1KMQHpIb/cIveos9kJsVZrYFgH0crldJw+6Kj
+xlut2wwqn+0+SlrYdGelFsdM7VFQARPm46vnSfANH71EpiK8QQMvynfsiO7YUIHv
+K5RzeIOWjJ8Sp/niC2W5zyBbNlDV2v03ZckVOH4MrdzkxaXkTx+vvBceV6uHt1Zt
+mUi7lMChZJxuRLBovcPiosIPWUs5M4AB07uR3yoFB2tcq3025czAjJRWQKTmLHml
+tRjbQ2dxR0mS3IS46Msm1ZG4mB/1TTY7dAw6LvtVUg==
+=o9a+
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/org-mode/org-mode-7.9.2.ebuild b/app-emacs/org-mode/org-mode-7.9.2.ebuild
index 269fa63c2294..79bf54edc682 100644
--- a/app-emacs/org-mode/org-mode-7.9.2.ebuild
+++ b/app-emacs/org-mode/org-mode-7.9.2.ebuild
@@ -1,6 +1,6 @@
 # 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.7 2013/05/02 19:20:02 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-7.9.2.ebuild,v 1.8 2013/05/05 16:51:24 ulm Exp $
 
 EAPI=4
 NEED_EMACS=22
@@ -26,7 +26,7 @@ ELISP_REMOVE="lisp/org-install.el"
 SITEFILE="50${PN}-gentoo.el"
 
 src_compile() {
-	emake datadir="${SITEETC}/${PN}"
+	emake datadir="${EPREFIX}${SITEETC}/${PN}"
 	use doc && emake pdf card
 }
 
@@ -34,8 +34,8 @@ src_install() {
 	emake \
 		DESTDIR="${D}" \
 		ETCDIRS="styles $(use odt-schema && echo schema)" \
-		lispdir="${SITELISP}/${PN}" \
-		datadir="${SITEETC}/${PN}" \
+		lispdir="${EPREFIX}${SITELISP}/${PN}" \
+		datadir="${EPREFIX}${SITEETC}/${PN}" \
 		install
 
 	cp "${FILESDIR}/${SITEFILE}" "${T}/${SITEFILE}"
diff --git a/app-emacs/org-mode/org-mode-8.0.2.ebuild b/app-emacs/org-mode/org-mode-8.0.2.ebuild
index ac69384284b9..0bac9f4ef6c5 100644
--- a/app-emacs/org-mode/org-mode-8.0.2.ebuild
+++ b/app-emacs/org-mode/org-mode-8.0.2.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2013/05/02 19:28:24 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-8.0.2.ebuild,v 1.2 2013/05/05 16:51:24 ulm Exp $
 
 EAPI=5
 NEED_EMACS=23
@@ -23,7 +23,7 @@ S="${WORKDIR}/org-${PV}"
 SITEFILE="50${PN}-gentoo-8.el"
 
 src_compile() {
-	emake datadir="${SITEETC}/${PN}"
+	emake datadir="${EPREFIX}${SITEETC}/${PN}"
 	use doc && emake pdf card
 }
 
@@ -31,8 +31,8 @@ src_install() {
 	emake \
 		DESTDIR="${D}" \
 		ETCDIRS="styles $(use odt-schema && echo schema)" \
-		lispdir="${SITELISP}/${PN}" \
-		datadir="${SITEETC}/${PN}" \
+		lispdir="${EPREFIX}${SITELISP}/${PN}" \
+		datadir="${EPREFIX}${SITEETC}/${PN}" \
 		install
 
 	cp "${FILESDIR}/${SITEFILE}" "${T}/${SITEFILE}"