diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2013-10-10 18:23:36 +0200 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2013-10-10 18:23:36 +0200 |
| commit | ba9f0132d0500f1f8fea1f0fe6fe0585888828d3 (patch) | |
| tree | ad332ab44900baadc8a8325acfea095beeddc9c0 | |
| parent | Migrate live ebuilds to git-r3.eclass. (diff) | |
| download | emacs-ba9f0132d0500f1f8fea1f0fe6fe0585888828d3.tar.gz emacs-ba9f0132d0500f1f8fea1f0fe6fe0585888828d3.tar.bz2 emacs-ba9f0132d0500f1f8fea1f0fe6fe0585888828d3.zip | |
Merge updates from Portage tree.
Package-Manager: portage-2.2.7
| -rw-r--r-- | app-emacs/org-mode/ChangeLog | 3 | ||||
| -rw-r--r-- | app-emacs/org-mode/files/50org-mode-gentoo.el | 2 | ||||
| -rw-r--r-- | app-emacs/org-mode/org-mode-9999.ebuild | 26 |
3 files changed, 17 insertions, 14 deletions
diff --git a/app-emacs/org-mode/ChangeLog b/app-emacs/org-mode/ChangeLog index 42a9b5a..150bf9f 100644 --- a/app-emacs/org-mode/ChangeLog +++ b/app-emacs/org-mode/ChangeLog @@ -3,6 +3,9 @@ # $Header: $ 10 Oct 2013; Ulrich Müller <ulm@gentoo.org> org-mode-9999.ebuild: + Merge updates from Portage tree. + + 10 Oct 2013; Ulrich Müller <ulm@gentoo.org> org-mode-9999.ebuild: Migrate to git-r3.eclass. 04 Oct 2012; Ulrich Müller <ulm@gentoo.org> org-mode-9999.ebuild, diff --git a/app-emacs/org-mode/files/50org-mode-gentoo.el b/app-emacs/org-mode/files/50org-mode-gentoo.el index adaaf28..431f52c 100644 --- a/app-emacs/org-mode/files/50org-mode-gentoo.el +++ b/app-emacs/org-mode/files/50org-mode-gentoo.el @@ -1,4 +1,2 @@ (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-9999.ebuild b/app-emacs/org-mode/org-mode-9999.ebuild index e1c1bc3..6b3b03d 100644 --- a/app-emacs/org-mode/org-mode-9999.ebuild +++ b/app-emacs/org-mode/org-mode-9999.ebuild @@ -2,8 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=4 -NEED_EMACS=22 +EAPI=5 + +NEED_EMACS=23 inherit elisp @@ -24,21 +25,18 @@ LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos" IUSE="contrib doc odt-schema" +RESTRICT="test" DEPEND="doc? ( virtual/texi2dvi )" if [[ ${PV} = 9999 ]]; then DEPEND="${DEPEND} dev-lang/perl" -else - # Remove autoload file to make sure that it is regenerated with - # the right Emacs version. - ELISP_REMOVE="lisp/org-install.el" fi SITEFILE="50${PN}-gentoo.el" src_compile() { - emake + emake datadir="${EPREFIX}${SITEETC}/${PN}" use doc && emake pdf card } @@ -46,22 +44,26 @@ src_install() { emake \ DESTDIR="${D}" \ ETCDIRS="styles $(use odt-schema && echo schema)" \ + lispdir="${EPREFIX}${SITELISP}/${PN}" \ + datadir="${EPREFIX}${SITEETC}/${PN}" \ + infodir="${EPREFIX}/usr/share/info" \ install cp "${FILESDIR}/${SITEFILE}" "${T}/${SITEFILE}" if use contrib; then - elisp-install ${PN}/contrib contrib/lisp/*org*.el || die + elisp-install ${PN}/contrib contrib/lisp/{org,ob,ox}*.el insinto /usr/share/doc/${PF}/contrib - doins -r contrib/README contrib/babel contrib/scripts + doins -r contrib/README contrib/scripts find "${ED}/usr/share/doc/${PF}/contrib" -type f -name '.*' \ -exec rm -f '{}' '+' # add the contrib subdirectory to load-path - sed -ie 's:\(.*@SITELISP@\)\(.*\):&\n\1/contrib\2:' \ + sed -i -e 's:\(.*@SITELISP@\)\(.*\):&\n\1/contrib\2:' \ "${T}/${SITEFILE}" || die fi - elisp-site-file-install "${T}/${SITEFILE}" || die - dodoc README etc/ORG-NEWS + elisp-site-file-install "${T}/${SITEFILE}" + dodoc README doc/library-of-babel.org etc/ORG-NEWS + [[ ${PV} = 9999 ]] || dodoc doc/orgcard.txt use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf } |