app-emacs/org-mode: Update to readme.gentoo-r1.eclass.

Package-Manager: portage-2.3.2

diff --git a/app-emacs/org-mode/org-mode-8.3.2-r1.ebuild b/app-emacs/org-mode/org-mode-8.3.2-r1.ebuild
index 71afd50ccd8798d423e45b07fb7e63dbb6219f3b..a6c5c3a1384e37f30f3b2f9eb54c7116eff6e2b1 100644 (file)
--- a/app-emacs/org-mode/org-mode-8.3.2-r1.ebuild
+++ b/app-emacs/org-mode/org-mode-8.3.2-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-inherit readme.gentoo elisp
+inherit elisp readme.gentoo-r1
 
 DESCRIPTION="An Emacs mode for notes and project planning"
 HOMEPAGE="http://www.orgmode.org/"
@@ -21,12 +21,6 @@ DEPEND="doc? ( virtual/texi2dvi )"
 S="${WORKDIR}/org-${PV}"
 SITEFILE="50${PN}-gentoo.el"
 
-DOC_CONTENTS="
-Org mode has a large variety of run-time dependencies, so you may have to
-install one or more additional packages.  A non-exhaustive list of these
-dependencies may be found at <http://orgmode.org/worg/org-dependencies.html>.
-"
-
 src_compile() {
        emake datadir="${EPREFIX}${SITEETC}/${PN}"
        use doc && emake pdf card
@@ -55,7 +49,12 @@ src_install() {
        fi
 
        elisp-site-file-install "${T}/${SITEFILE}"
-       readme.gentoo_create_doc
        dodoc README doc/library-of-babel.org doc/orgcard.txt etc/ORG-NEWS
        use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
+
+       DOC_CONTENTS="Org mode has a large variety of run-time dependencies,
+               so you may have to install one or more additional packages.
+               A non-exhaustive list of these dependencies may be found at
+               <http://orgmode.org/worg/org-dependencies.html>."
+       readme.gentoo_create_doc
 }