With USE="contrib", add the contrib subdirectory to load-path, bug 386243. Remove...

Package-Manager: portage-2.1.10.24/cvs/Linux x86_64

diff --git a/app-emacs/org-mode/ChangeLog b/app-emacs/org-mode/ChangeLog
index d473d63b31f9b9ae0b680fc25d48094220e62d57..e598e6a7df909ffad7aa7df50055049992f9f1d4 100644 (file)
--- a/app-emacs/org-mode/ChangeLog
+++ b/app-emacs/org-mode/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emacs/org-mode
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/ChangeLog,v 1.133 2011/08/04 07:33:33 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/ChangeLog,v 1.134 2011/10/09 10:26:59 ulm Exp $
+
+  09 Oct 2011; Ulrich Mueller <ulm@gentoo.org> -org-mode-7.6.ebuild,
+  org-mode-7.7.ebuild:
+  With USE="contrib", add the contrib subdirectory to load-path, bug 386243.
+  Remove intermediate version.
 
 *org-mode-7.7 (04 Aug 2011)
 

diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index f133301c920d1e985c20bb8a91a5ba9b2b5d0bc9..f8720fdec9910667790610f81f535eb5b4141301 100644 (file)
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -4,18 +4,16 @@ Hash: SHA1
 AUX 50org-mode-gentoo.el 118 RMD160 e6fe8858715fcffcd1964ace6c64fd10975e319b SHA1 088bb94d531790f1dac8b0b08ad32cb33494c17d SHA256 6a01ea37515cf87a7d7b6e3085d9867e57b11664a8b3099eecd8c13a0269ecec
 DIST org-6.36c.tar.gz 2706358 RMD160 bc745e506712619a03f0b296ac606a5cc7ad81c9 SHA1 56d55f8c751248100aabbc3109495af31ccf277f SHA256 26db6b9c319a2dd54f3a8da78f761594b7c8e7edeb9106f14a1c3a6ff94786a0
 DIST org-7.5.tar.gz 2897817 RMD160 8fa7de0454cddf690e71ac00e8f6a4bcb3ab0606 SHA1 935392f885a6a6cbb3912aaffe55f3eaeaea2472 SHA256 978822bc4c5f9f67450fbaa8572f1d4217406b7e28551278c9f23f7e9515cd4b
-DIST org-7.6.tar.gz 3225724 RMD160 930a1247a0713bbd9df228032b650d26f7fa2244 SHA1 86fd6d51f07dfda64e166bd3e3f09723977d0f4c SHA256 b330a24789084132457e67c4899f83ad0c2b3e827d53c2c5ba6d1f4220e4d178
 DIST org-7.7.tar.gz 3248717 RMD160 7d87fc763c942d25dd65f8a0851bab3b7011c008 SHA1 214b4b66f573686d72dd1f829d1f639dd7d1ff7d SHA256 6df7633ec40231f466b436c5e63b03a62c585d3fe0e53838a2cd7c18c68e7f26
 EBUILD org-mode-6.36c.ebuild 1069 RMD160 8c536e2a0b7934abe9c7d5577e17cd0fc33df914 SHA1 b1c16dfd04930e61c418b2508bde3df4021a8c1d SHA256 55f78e66ea711913eaaff6fbb99f083a1f8e60b0ddc48eb7c04994b08d3984a5
 EBUILD org-mode-7.5.ebuild 1288 RMD160 78519358479920281ad29b516d82f1c3fd90b565 SHA1 199a45309a1dc85b0961711ecdf7e72bd5655395 SHA256 ad834908a748a7a3a3f6c523d074b2ad8497a1c0af5935301229105428e82547
-EBUILD org-mode-7.6.ebuild 1305 RMD160 21319c05f62e2dc761f1e940a6ce87c8e8d3ed12 SHA1 07547ced8a9d90c35d3f6c77d8b9a81ff7c0c74d SHA256 e164cbc255f0023ec226a215cb0a832dd69300f1d03528937285cc0a142ca5cf
-EBUILD org-mode-7.7.ebuild 1305 RMD160 a80ff704ad679e727b9773da0f8d8fb63b83fad7 SHA1 bf3c031762e37a6e656184661e50f8e245422f37 SHA256 c83c60ddc3b8bd8f7386fe3b08c9a4d378dd6936ea7e6f7117d805452d2805ba
-MISC ChangeLog 19017 RMD160 5e270d4fc148fc80ce0ee4fb9685f90d8ab54484 SHA1 1f1ab048d59bdc4c7ad28c83b942f2568fd3655b SHA256 2a9d2ab7d2708ab7c80b97366f5d628a3c212f13d4c722a3a48569ddaaa7c34f
+EBUILD org-mode-7.7.ebuild 1432 RMD160 4e1d67272507c0e466331c9f7a0908d80e0ffb8c SHA1 52bde5aaaed02632c225f18be7c43ec0c0740cc1 SHA256 691d35e8a4a864681d9e47cf43c74fb090d2c913e50788210ea92588b16be8d9
+MISC ChangeLog 19218 RMD160 3b285d89460b216dab24a3176330d5480014a9a3 SHA1 18b21e8a2ed3892eaa0ffd3a2a8e5e746a85b19b SHA256 6f3daa4381592722b62bc01f4b4b6e29a1bc92f6aab77ee6cc4b6a2f2d23999a
 MISC metadata.xml 1146 RMD160 cd7f3b1f135d9a4483ee2fc6b039370504b8f894 SHA1 adb78dce5a2849ff934805fcc881e82cb2f8574c SHA256 bd68dc6ea0c238afb569ed5108af4b3e53c5e7fab7e7cfcc1f3c6fff0f4ac447
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk46TIoACgkQOeoy/oIi7uz9+ACfbhCKHx3mO5qNMaiSVB4SxbKB
-rhcAoNXWq/bhxz+JQU/KVy1OfQoUyc8M
-=lz0n
+iEYEARECAAYFAk6ReLsACgkQOeoy/oIi7uwdrACg4SDoMqE/AK4eG/mPqNZH4TQ8
+S4oAn3eKGhWWFgR52LXKFb+7WwayGQTl
+=JYm/
 -----END PGP SIGNATURE-----

diff --git a/app-emacs/org-mode/org-mode-7.6.ebuild b/app-emacs/org-mode/org-mode-7.6.ebuild
deleted file mode 100644 (file)
index 482ea33..0000000
--- a/app-emacs/org-mode/org-mode-7.6.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.6.ebuild,v 1.1 2011/07/06 21:55:35 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}"
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-       # Remove autoload file to make sure that it is regenerated with
-       # the right Emacs version.
-       rm -f lisp/org-install.el
-}
-
-src_compile() {
-       default
-}
-
-src_install() {
-       emake \
-               prefix="${ED}/usr" \
-               lispdir="${ED}${SITELISP}/${PN}" \
-               infodir="${ED}/usr/share/info" \
-               install
-
-       elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-
-       doinfo doc/org
-       dodoc README doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
-
-       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 '{}' '+'
-       fi
-}

diff --git a/app-emacs/org-mode/org-mode-7.7.ebuild b/app-emacs/org-mode/org-mode-7.7.ebuild
index 4c5b11e8a24b88c25849711b07da92cec510b1c8..d0d7cc33932ba5266b73adf75174de2e3d9c711e 100644 (file)
--- a/app-emacs/org-mode/org-mode-7.7.ebuild
+++ b/app-emacs/org-mode/org-mode-7.7.ebuild
@@ -1,6 +1,6 @@
 # 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.7.ebuild,v 1.1 2011/08/04 07:33:33 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-7.7.ebuild,v 1.2 2011/10/09 10:26:59 ulm Exp $
 
 EAPI=4
 NEED_EMACS=22
@@ -36,10 +36,7 @@ src_install() {
                infodir="${ED}/usr/share/info" \
                install
 
-       elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-
-       doinfo doc/org
-       dodoc README doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
+       cp "${FILESDIR}/${SITEFILE}" "${T}/${SITEFILE}"
 
        if use contrib; then
                elisp-install ${PN}/contrib contrib/lisp/*org*.el || die
@@ -47,5 +44,11 @@ src_install() {
                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
 }