From 4dbd3d8a577690c387c6db5cdc4c6433be9a6921 Mon Sep 17 00:00:00 2001
From: Ulrich Müller <ulm@gentoo.org>
Date: Sat, 25 Oct 2008 14:38:23 +0000
Subject: Version bump. Remove intermediate versions. (Portage version:
 2.2_rc12/cvs/Linux 2.6.26-gentoo-r1 i686)

---
 app-emacs/org-mode/ChangeLog             |  8 ++++++-
 app-emacs/org-mode/org-mode-5.23a.ebuild | 30 -----------------------
 app-emacs/org-mode/org-mode-6.06b.ebuild | 41 --------------------------------
 app-emacs/org-mode/org-mode-6.10c.ebuild | 40 +++++++++++++++++++++++++++++++
 4 files changed, 47 insertions(+), 72 deletions(-)
 delete mode 100644 app-emacs/org-mode/org-mode-5.23a.ebuild
 delete mode 100644 app-emacs/org-mode/org-mode-6.06b.ebuild
 create mode 100644 app-emacs/org-mode/org-mode-6.10c.ebuild

(limited to 'app-emacs/org-mode')

diff --git a/app-emacs/org-mode/ChangeLog b/app-emacs/org-mode/ChangeLog
index 8b73769b2dff..1f38b5e7e80a 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/ChangeLog,v 1.38 2008/10/13 12:51:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/ChangeLog,v 1.39 2008/10/25 14:38:23 ulm Exp $
+
+*org-mode-6.10c (25 Oct 2008)
+
+  25 Oct 2008; Ulrich Mueller <ulm@gentoo.org> -org-mode-5.23a.ebuild,
+  -org-mode-6.06b.ebuild, +org-mode-6.10c.ebuild:
+  Version bump. Remove intermediate versions.
 
 *org-mode-6.09a (13 Oct 2008)
 
diff --git a/app-emacs/org-mode/org-mode-5.23a.ebuild b/app-emacs/org-mode/org-mode-5.23a.ebuild
deleted file mode 100644
index b1a2a1f2f7d5..000000000000
--- a/app-emacs/org-mode/org-mode-5.23a.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-5.23a.ebuild,v 1.1 2008/03/19 10:27:53 ulm Exp $
-
-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.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE=""
-
-SITEFILE="51${PN}-gentoo.el"
-DOCS="README ChangeLog org.pdf orgcard.pdf"
-
-S="${WORKDIR}/org-${PV}"
-
-src_compile() {
-	elisp_src_compile
-	emake info || die "emake info failed"
-	mv org org.info || die "Infofile could not be renamed"
-}
-
-src_install() {
-	elisp_src_install
-	doinfo *.info
-}
diff --git a/app-emacs/org-mode/org-mode-6.06b.ebuild b/app-emacs/org-mode/org-mode-6.06b.ebuild
deleted file mode 100644
index d5066efd8f7e..000000000000
--- a/app-emacs/org-mode/org-mode-6.06b.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-6.06b.ebuild,v 1.2 2008/10/13 12:51:45 ulm Exp $
-
-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.2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE=""
-
-SITEFILE=51${PN}-gentoo.el
-
-S="${WORKDIR}/org-${PV}"
-
-src_compile() {
-	# remove autoload file to make sure that it is regenerated with
-	# the right Emacs version
-	rm -f lisp/org-install.el
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake \
-		prefix="${D}/usr" \
-		lispdir="${D}${SITELISP}/${PN}" \
-		infodir="${D}/usr/share/info" \
-		install || die "emake install failed"
-
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-		|| die "elisp-site-file-install failed"
-
-	mv doc/org doc/org.info
-	doinfo doc/org.info || die "doinfo failed"
-	dodoc README ChangeLog Changes.org doc/org.pdf doc/orgcard.pdf \
-		|| die "dodoc failed"
-}
diff --git a/app-emacs/org-mode/org-mode-6.10c.ebuild b/app-emacs/org-mode/org-mode-6.10c.ebuild
new file mode 100644
index 000000000000..d2675c301185
--- /dev/null
+++ b/app-emacs/org-mode/org-mode-6.10c.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-6.10c.ebuild,v 1.1 2008/10/25 14:38:23 ulm Exp $
+
+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.2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE=""
+
+SITEFILE="51${PN}-gentoo.el"
+
+S="${WORKDIR}/org-${PV}"
+
+src_compile() {
+	# remove autoload file to make sure that it is regenerated with
+	# the right Emacs version
+	rm -f lisp/org-install.el
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake \
+		prefix="${D}/usr" \
+		lispdir="${D}${SITELISP}/${PN}" \
+		infodir="${D}/usr/share/info" \
+		install || die "emake install failed"
+
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+
+	mv doc/org doc/org.info
+	doinfo doc/org.info || die "doinfo failed"
+	dodoc README ChangeLog Changes.org doc/org.pdf doc/orgcard.pdf \
+		|| die "dodoc failed"
+}
-- 
cgit v1.2.3-65-gdbad