Remove intermediate version.

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

3 files changed, 25 insertions, 55 deletions

diff --git a/app-emacs/org-mode/ChangeLog b/app-emacs/org-mode/ChangeLog
index 6bf0c59a89b8..e6ea6f0faa00 100644
--- a/app-emacs/org-mode/ChangeLog
+++ b/app-emacs/org-mode/ChangeLog
@@ -1,6 +1,9 @@
 # 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.141 2012/01/06 16:44:49 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/ChangeLog,v 1.142 2012/01/06 21:19:49 ulm Exp $
+
+  06 Jan 2012; Ulrich Mueller <ulm@gentoo.org> -org-mode-7.5.ebuild:
+  Remove intermediate version.
 
   06 Jan 2012; Brent Baude <ranger@gentoo.org> org-mode-7.7.ebuild:
   Marking org-mode-7.7 ppc for bug 396001
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index 4dc992bf5d49..d2e4b64232b7 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -1,17 +1,35 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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 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
 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.7.tar.gz 3248717 RMD160 7d87fc763c942d25dd65f8a0851bab3b7011c008 SHA1 214b4b66f573686d72dd1f829d1f639dd7d1ff7d SHA256 6df7633ec40231f466b436c5e63b03a62c585d3fe0e53838a2cd7c18c68e7f26
 DIST org-7.8.02.tar.gz 3272089 RMD160 a5e071324b7ffec1e8d72e16713dfbc038a7cb74 SHA1 08caeabdc4514187193f93d42f656e7fa6f24013 SHA256 c97c7e50d80424e3c3ffdd1cdd6c597be815b7450bb02da0e661a3d3cafb3f19
 DIST org-7.8.03.tar.gz 3288565 RMD160 f1ad226d2ec2d99ddf6f793f45bb140042b014be SHA1 731809e4b6732e50a2b5a4b0ecba61123ffe3420 SHA256 49357cca7d892e70cd2dfcc0b5d96d9fd164ef5a1f251ace3865ecb27dc1e958
 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.7.ebuild 1419 RMD160 10e66e17cd6705534e9cd39c5d4279886a2d6776 SHA1 144a46a38711018a7b93169548e3d8cc3dd6e282 SHA256 3e9c1f84b69372876c39db378fe5c8821f4750979f7af110a793146d528010fc
 EBUILD org-mode-7.8.02-r1.ebuild 1550 RMD160 0055d4f44008c7ae14a4a5f77a0354697645fa1a SHA1 c82d35c5d5b7827691a1ddfc7864f327301bd996 SHA256 ffc5fd7ff3ced448c9580c946c489678063c8ce6a40e63571b1fc2661dc4fd1f
 EBUILD org-mode-7.8.03-r1.ebuild 1574 RMD160 23fed086a57c25bdcb58f2f1d39d25ae287768fc SHA1 3911497e9e0efe29e6778b3eb415ec82356830e3 SHA256 b9297d246b6fd1ab42cd96f4a2010e1b381cbc0c9b99244494a6126b50de162c
-MISC ChangeLog 20385 RMD160 5fca21efb0cce3e4f97705fbaa2ec7b375578ccd SHA1 c3594564643829786b66c9d1330f31f021a5c7cc SHA256 397e00c8c67473fcb958253fe181f0e6cafc9d02abe972e59e572c4627ed5ad0
+MISC ChangeLog 20483 RMD160 1fd6a28285dcc6cec862bbdbe783793f54bef20f SHA1 80f54b0bee6612a0dd6dee6dfc4833b82370d079 SHA256 f1a4e7b6d2415689c0e82dcdfac2dc833e02683a4f8bc087d9dc12303dcfb706
 MISC metadata.xml 1146 RMD160 cd7f3b1f135d9a4483ee2fc6b039370504b8f894 SHA1 adb78dce5a2849ff934805fcc881e82cb2f8574c SHA256 bd68dc6ea0c238afb569ed5108af4b3e53c5e7fab7e7cfcc1f3c6fff0f4ac447
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPB2V6AAoJEDxpGckxwJCBHWIQAK/Mf0l0jXcJg3gtsyl8FY0k
+MON9l3ZYNTofhvbGDmEy5uIlZUZFHANYmwt9hWiOJ4AsdFNOhr4NStreNreqlV8s
+yXKtva/ws7VFTZT1DYh6olPKTI+SMhpn1Rih9oSVrBhi/ODEMPFuVy3fQxnJ6+zA
+bqwOeFF1v2iiRUCxJuON9vKjgmnvizVmmz7GPcjf4M6ee25pni2h+apUhKC7x3pp
+FgM04hVGR24in1S48K7JV4mct+PR42s4/mnjyOZvOydXDKgr+YYMt2p0RxdQwruk
+LY9vkivbXVvGbQAfe6ccZGe2NN1vGGjlUie4KmtW3C6C9PFkOVQeZZPNF9lQ/IPh
+W/FfZkcvs0opyQG7en60K4u3h//LGFJI2gzL9Abb2N23SxSQjZ9IG4Qf7WWAxDv2
+gKuko5iOJfOlY1AD0arwapGuHtyJ3G7tXVWyqgnXEFUFg57Zbe5o0XO+b7RNAHbf
+2nTvXvfQ7K+StrfYDEf6S4qVb7buwkBnVdJtRFaM4j0GfVYZAHbe3eqkNQ3gci6n
+cGZJSqyxzI5vE6IV4u83HlmSk/Z1DNp7DCuRdHxafqdeq2ahockM6Pz6wMpbjRvM
+XCCIox1jmaiXFYEd0EzC7lnfm5lnUzUWNkzy6F+x5eFQRcIunJhaugCcnB6lGIaX
+vmHafKasATFi8widmYHy
+=YjEQ
+-----END PGP SIGNATURE-----
diff --git a/app-emacs/org-mode/org-mode-7.5.ebuild b/app-emacs/org-mode/org-mode-7.5.ebuild
deleted file mode 100644
index 7069225e55f9..000000000000
--- a/app-emacs/org-mode/org-mode-7.5.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.5.ebuild,v 1.7 2011/06/19 16:03:41 armin76 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 )"
-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/scripts
-		find "${ED}/usr/share/doc/${PF}/contrib" -type f -name '.*' \
-			-exec rm -f '{}' '+'
-	fi
-}