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

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

5 files changed, 28 insertions, 63 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/Manifest b/app-emacs/org-mode/Manifest
index 26378d608392..5f0320f13fa0 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX 50org-mode-gentoo-7.8.02.el 163 RMD160 697c2d2e4371feb6648c1f8ce5f3df7b67b85541 SHA1 1313858b766a23f8161380bfc57a21de36a49407 SHA256 db1c5eb65f447c634e6725b310a8604326328e87809e4e17be2d84ca05bdff30
-AUX 50org-mode-gentoo-7.8.03.el 155 RMD160 ef1d42a456f266fbdc535cf313a0db43987390b3 SHA1 23e95b2e680edff7c84c1034547437525ef08abb SHA256 89cd40b1a38707a5bed1c959bb3e2cf844ae805eac6ef7035029e0b7c2ac311a
+AUX 50org-mode-gentoo-7.8.03.el 154 RMD160 060ffddc24394dd5770849d7d995ab32cbe56832 SHA1 aaec6e13e75de08321d6fc91e60c8fb399ba68c7 SHA256 70a5fe5c6ae677fd9cbeb8258857867c41e2067b048ef2aeef62976db27a044e
 AUX 50org-mode-gentoo.el 118 RMD160 e6fe8858715fcffcd1964ace6c64fd10975e319b SHA1 088bb94d531790f1dac8b0b08ad32cb33494c17d SHA256 6a01ea37515cf87a7d7b6e3085d9867e57b11664a8b3099eecd8c13a0269ecec
 AUX org-mode-7.8.02-odt-styles.patch 1749 RMD160 9b2e822350ad2f99f5a05d75df0d98d18b6b1b7c SHA1 f7a24c0f78c0d00fa95d6fab4bb18b64b0498bd7 SHA256 2e892288ede385b65e4ba4210570461ba19f639666740b3d79e7e2fe387a7307
 AUX org-mode-7.8.03-Makefile.patch 816 RMD160 a2d84726cd82ab6ea203ad7e73d6190eded9c013 SHA1 828ec33786706ade16b9140d1ed9dade90a3d9a7 SHA256 b99e85301a31551177e5f80964057dea2fac031881789b86f3182d1db37f7679
@@ -15,14 +15,23 @@ EBUILD org-mode-6.36c.ebuild 1069 RMD160 8c536e2a0b7934abe9c7d5577e17cd0fc33df91
 EBUILD org-mode-7.5.ebuild 1288 RMD160 78519358479920281ad29b516d82f1c3fd90b565 SHA1 199a45309a1dc85b0961711ecdf7e72bd5655395 SHA256 ad834908a748a7a3a3f6c523d074b2ad8497a1c0af5935301229105428e82547
 EBUILD org-mode-7.7.ebuild 1424 RMD160 f3d10bc3bd374e3bfb8d0e405cdef91cc398957f SHA1 140a098b0440f7428cce98265cc1ce2aebe27555 SHA256 bbbb958b6ba443653e6a3f2d23825769ed6230937bc91887a6e45e8b32f64b7c
 EBUILD org-mode-7.8.02-r1.ebuild 1550 RMD160 0055d4f44008c7ae14a4a5f77a0354697645fa1a SHA1 c82d35c5d5b7827691a1ddfc7864f327301bd996 SHA256 ffc5fd7ff3ced448c9580c946c489678063c8ce6a40e63571b1fc2661dc4fd1f
-EBUILD org-mode-7.8.02.ebuild 1422 RMD160 276517dd596d324033aaf69aff0a365c071fcf0b SHA1 a4fa666ed772b9a85eb7d11fc58920ca0209b911 SHA256 12c066d09570d31c5c6f680598acab6602d615609fbd13e62fdd654e5bd19aea
-EBUILD org-mode-7.8.03.ebuild 1571 RMD160 f2f28b0f6f5882e27f865921f4687752d6117ddb SHA1 e0eb9af2efe88e4b174c169d4e878ad9d2b63a1e SHA256 6153262012ad2b7e0f0a6b0dc65e84556852586fc6f8df27e81e25dcc7a99ff6
-MISC ChangeLog 20024 RMD160 bec53a25d6b41bba10cf7941c4e06ec103eaa61b SHA1 194c2bb478c8c7fecc17648d69b5b7768692dba0 SHA256 659cbc025f7aaf13ae3573b79413522526b34ee2c42e6b9f410a9747ecbcf0ab
+EBUILD org-mode-7.8.03-r1.ebuild 1574 RMD160 23fed086a57c25bdcb58f2f1d39d25ae287768fc SHA1 3911497e9e0efe29e6778b3eb415ec82356830e3 SHA256 b9297d246b6fd1ab42cd96f4a2010e1b381cbc0c9b99244494a6126b50de162c
+MISC ChangeLog 20271 RMD160 d8d03312b2a29ab4b066873222d1aceac24c8291 SHA1 58ccdc5080faf7197e06c6a4b39388376e3c4040 SHA256 42f8ae5c64554d913a55f813f0dcb4a085a63052e836a8bf4ca02657c3aa9fa4
 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)
 
-iEYEAREKAAYFAk8Ell4ACgkQuUQtlDBCeQK4OACfcDP9aZRVOhEWF0vGmwj9C60P
-lQIAn0Ilk55m0UOr1YssM01bAFzlLE+o
-=yZL0
+iQIcBAEBAgAGBQJPBVRpAAoJEDxpGckxwJCBvTEQAK8bF6JJCeuBeJx8XBg5Usvm
+qvedgDppiuia9MuewvG+9VAaZf/jqFX2wb/5x6aNlZQcNm2+dBkdg/R2pnUFBb8J
+ntoGBARW1Vu1CfZkRVkuSE3TMXSerusAzutsF2+YvNQHBbKrPu7blUcZF7j3/i/m
+j+9QZhbkCa3Y5f8db5vdJankeELcxw3MjmKp77Yy5pea2315+qINMrk2nnsAZgK5
+0fNzsAwvQzD5V7thl31TBR7Ubilf65J/aChy7YZlZ7eQ5LaLZ9x0WXYx0Sfy3xOv
+mPm9gtiQJ6PzclIoi2Q0UrDfKVa1LLDiNVjBFeelr5klTNDU15Nc8VPBvIrHCT9r
+md65g0aXYQO20yCgSXhKKnm2bJev1tqOVkoST+Nmg6bNuWK6mp61RNFAfdSIN9o0
+FjtMWpqDhnrlpP6WIfHJMzpS3kNVYQllmxCWJRU2p25ThjAqo0pbnerwBv2M/LnT
+Y4mtOH5NhZL6tt5WQ/yfoIQKdW3qf2FbZoleWMcDLu37HV8QjOK6z8RXPHdKa+2T
+ORjZFENwDjJqOvbU7HBmlpn/rbUb/i7foZI31io1oCJC+JM38YJ+N4DDyHP5MDDO
+Y79pLcSGW/54vVBQ344wh7dP5KsokFOxBcbGWSfGfYqbXtFjSx+MMUffyHwnpZdm
+GGs6wa6pNKU/QnzRDjdb
+=39TV
 -----END PGP SIGNATURE-----
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