summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2011-08-04 07:33:33 +0000
committerUlrich Müller <ulm@gentoo.org>2011-08-04 07:33:33 +0000
commit38918178c2006be7868f6f282ac2a25b208f3ade (patch)
tree2b0fa124b317386b458623a6bbd3a026a92045de /app-emacs/org-mode
parentFix SRC_URI failures. Bug #358775 (diff)
downloadgentoo-2-38918178c2006be7868f6f282ac2a25b208f3ade.tar.gz
gentoo-2-38918178c2006be7868f6f282ac2a25b208f3ade.tar.bz2
gentoo-2-38918178c2006be7868f6f282ac2a25b208f3ade.zip
Version bump. Remove old.
(Portage version: 2.1.10.10/cvs/Linux x86_64)
Diffstat (limited to 'app-emacs/org-mode')
-rw-r--r--app-emacs/org-mode/ChangeLog10
-rw-r--r--app-emacs/org-mode/org-mode-7.7.ebuild (renamed from app-emacs/org-mode/org-mode-7.4-r1.ebuild)21
2 files changed, 18 insertions, 13 deletions
diff --git a/app-emacs/org-mode/ChangeLog b/app-emacs/org-mode/ChangeLog
index 276c15604ddc..d473d63b31f9 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/ChangeLog,v 1.132 2011/07/06 21:55:35 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/ChangeLog,v 1.133 2011/08/04 07:33:33 ulm Exp $
+
+*org-mode-7.7 (04 Aug 2011)
+
+ 04 Aug 2011; Ulrich Mueller <ulm@gentoo.org> -org-mode-7.4-r1.ebuild,
+ +org-mode-7.7.ebuild:
+ Version bump. Remove old.
*org-mode-7.6 (06 Jul 2011)
@@ -17,7 +23,7 @@
22 May 2011; Ulrich Mueller <ulm@gentoo.org> -org-mode-7.4.ebuild,
org-mode-7.5.ebuild:
- Call default function in src_compile.
+ Call default function in src_compile. Remove old.
10 May 2011; Markos Chandras <hwoarang@gentoo.org> org-mode-7.5.ebuild:
Stable on amd64 wrt bug #366329
diff --git a/app-emacs/org-mode/org-mode-7.4-r1.ebuild b/app-emacs/org-mode/org-mode-7.7.ebuild
index ebdef5ec7ffc..4c5b11e8a24b 100644
--- a/app-emacs/org-mode/org-mode-7.4-r1.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.4-r1.ebuild,v 1.2 2011/06/19 16:03:41 armin76 Exp $
+# $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 $
EAPI=4
NEED_EMACS=22
@@ -11,9 +11,9 @@ 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 )"
+LICENSE="GPL-3 FDL-1.3 contrib? ( GPL-2 MIT as-is )"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-macos"
IUSE="contrib"
S="${WORKDIR}/org-${PV}"
@@ -25,28 +25,27 @@ src_prepare() {
rm -f lisp/org-install.el
}
-# This is NOT redundant, elisp.eclass redefines src_compile.
src_compile() {
- emake
+ default
}
src_install() {
emake \
- prefix="${D}/usr" \
- lispdir="${D}${SITELISP}/${PN}" \
- infodir="${D}/usr/share/info" \
+ 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 Changes.org doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
+ 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 "${D}/usr/share/doc/${PF}/contrib" -type f -name '.*' \
+ doins -r contrib/README contrib/babel contrib/odt contrib/scripts
+ find "${ED}/usr/share/doc/${PF}/contrib" -type f -name '.*' \
-exec rm -f '{}' '+'
fi
}