Version bump. Add odt-schema USE flag to control installation of non-free Relax-NG schemas. Clarify LICENSE. Remove old.

(Portage version: 2.1.11.20/cvs/Linux x86_64)

7 files changed, 34 insertions, 78 deletions

diff --git a/app-emacs/org-mode/ChangeLog b/app-emacs/org-mode/ChangeLog
index 2aa6fb735951..91fe17e0a2f4 100644
--- a/app-emacs/org-mode/ChangeLog
+++ b/app-emacs/org-mode/ChangeLog
@@ -1,6 +1,14 @@
 # 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.146 2012/09/23 08:33:25 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/ChangeLog,v 1.147 2012/09/26 18:19:45 ulm Exp $
+
+*org-mode-7.9.1 (26 Sep 2012)
+
+  26 Sep 2012; Ulrich Müller <ulm@gentoo.org> org-mode-6.36c.ebuild,
+  org-mode-7.7.ebuild, -org-mode-7.8.03-r1.ebuild, -org-mode-7.8.09.ebuild,
+  org-mode-7.8.11.ebuild, +org-mode-7.9.1.ebuild, metadata.xml:
+  Version bump. Add odt-schema USE flag to control installation of non-free
+  Relax-NG schemas. Clarify LICENSE. Remove old.
 
   23 Sep 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> org-mode-7.8.11.ebuild:
   x86 stable wrt bug #428866
diff --git a/app-emacs/org-mode/metadata.xml b/app-emacs/org-mode/metadata.xml
index 9c6bc2923b49..191bd8718bc9 100644
--- a/app-emacs/org-mode/metadata.xml
+++ b/app-emacs/org-mode/metadata.xml
@@ -19,5 +19,7 @@
 </longdescription>
 <use>
   <flag name='contrib'>Install user-contributed files</flag>
+  <flag name='odt-schema'>Install non-free schema files
+    for OpenDocument Text exporter</flag>
 </use>
 </pkgmetadata>
diff --git a/app-emacs/org-mode/org-mode-6.36c.ebuild b/app-emacs/org-mode/org-mode-6.36c.ebuild
index 518e2a58f1c3..fba4cfbeeaad 100644
--- a/app-emacs/org-mode/org-mode-6.36c.ebuild
+++ b/app-emacs/org-mode/org-mode-6.36c.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.36c.ebuild,v 1.8 2011/06/19 16:03:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-6.36c.ebuild,v 1.9 2012/09/26 18:19:45 ulm Exp $
 
 inherit elisp
 
@@ -8,9 +8,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"
+LICENSE="GPL-3+ FDL-1.3+"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
 IUSE=""
 
 S="${WORKDIR}/org-${PV}"
diff --git a/app-emacs/org-mode/org-mode-7.7.ebuild b/app-emacs/org-mode/org-mode-7.7.ebuild
index 82f45de46ff9..26aa22683286 100644
--- a/app-emacs/org-mode/org-mode-7.7.ebuild
+++ b/app-emacs/org-mode/org-mode-7.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.7.ebuild,v 1.6 2012/01/06 16:44:49 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-7.7.ebuild,v 1.7 2012/09/26 18:19:45 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 as-is )"
+LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT OASIS-Open )"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~sparc-fbsd ~x86-fbsd ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd ~x86-macos"
 IUSE="contrib"
 
 S="${WORKDIR}/org-${PV}"
diff --git a/app-emacs/org-mode/org-mode-7.8.09.ebuild b/app-emacs/org-mode/org-mode-7.8.09.ebuild
deleted file mode 100644
index 5beb02b7ff15..000000000000
--- a/app-emacs/org-mode/org-mode-7.8.09.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2012 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.8.09.ebuild,v 1.1 2012/04/22 19:51:51 ulm 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 as-is )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-macos"
-IUSE="contrib"
-
-S="${WORKDIR}/org-${PV}"
-ELISP_PATCHES="${PN}-7.8.03-Makefile.patch"
-# Remove autoload file to make sure that it is regenerated with
-# the right Emacs version.
-ELISP_REMOVE="lisp/org-install.el"
-SITEFILE="50${PN}-gentoo-7.8.03.el"
-
-src_compile() {
-	emake datadir="${SITEETC}/${PN}"
-}
-
-src_install() {
-	emake \
-		prefix="${ED}/usr" \
-		lispdir="${ED}${SITELISP}/${PN}" \
-		datadir="${ED}${SITEETC}/${PN}" \
-		infodir="${ED}/usr/share/info" \
-		install
-
-	cp "${FILESDIR}/${SITEFILE}" "${T}/${SITEFILE}"
-
-	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/odt 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:' \
-			"${T}/${SITEFILE}" || die
-	fi
-
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-	doinfo doc/org
-	dodoc README doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
-}
diff --git a/app-emacs/org-mode/org-mode-7.8.11.ebuild b/app-emacs/org-mode/org-mode-7.8.11.ebuild
index ef2b02d2a201..e1baee0742d4 100644
--- a/app-emacs/org-mode/org-mode-7.8.11.ebuild
+++ b/app-emacs/org-mode/org-mode-7.8.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.8.11.ebuild,v 1.3 2012/09/23 08:33:25 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-7.8.11.ebuild,v 1.4 2012/09/26 18:19:45 ulm Exp $
 
 EAPI=4
 NEED_EMACS=22
@@ -11,7 +11,7 @@ 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 as-is )"
+LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT OASIS-Open )"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~x86-macos"
 IUSE="contrib"
diff --git a/app-emacs/org-mode/org-mode-7.8.03-r1.ebuild b/app-emacs/org-mode/org-mode-7.9.1.ebuild
index e41a3c9c0d7c..63508969bf62 100644
--- a/app-emacs/org-mode/org-mode-7.8.03-r1.ebuild
+++ b/app-emacs/org-mode/org-mode-7.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.8.03-r1.ebuild,v 1.1 2012/01/05 07:31:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-7.9.1.ebuild,v 1.1 2012/09/26 18:19:45 ulm Exp $
 
 EAPI=4
 NEED_EMACS=22
@@ -11,28 +11,28 @@ 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 as-is )"
+LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-macos"
-IUSE="contrib"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos"
+IUSE="contrib doc odt-schema"
+
+DEPEND="doc? ( virtual/texi2dvi )"
 
 S="${WORKDIR}/org-${PV}"
-ELISP_PATCHES="${P}-Makefile.patch"
 # Remove autoload file to make sure that it is regenerated with
 # the right Emacs version.
 ELISP_REMOVE="lisp/org-install.el"
-SITEFILE="50${PN}-gentoo-${PV}.el"
+SITEFILE="50${PN}-gentoo.el"
 
 src_compile() {
-	emake datadir="${SITEETC}/${PN}"
+	emake
+	use doc && emake pdf card
 }
 
 src_install() {
 	emake \
-		prefix="${ED}/usr" \
-		lispdir="${ED}${SITELISP}/${PN}" \
-		datadir="${ED}${SITEETC}/${PN}" \
-		infodir="${ED}/usr/share/info" \
+		DESTDIR="${D}" \
+		ETCDIRS="styles $(use odt-schema && echo schema)" \
 		install
 
 	cp "${FILESDIR}/${SITEFILE}" "${T}/${SITEFILE}"
@@ -40,7 +40,7 @@ src_install() {
 	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/odt contrib/scripts
+		doins -r contrib/README contrib/babel contrib/scripts
 		find "${ED}/usr/share/doc/${PF}/contrib" -type f -name '.*' \
 			-exec rm -f '{}' '+'
 		# add the contrib subdirectory to load-path
@@ -49,6 +49,6 @@ src_install() {
 	fi
 
 	elisp-site-file-install "${T}/${SITEFILE}" || die
-	doinfo doc/org
-	dodoc README doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
+	dodoc README doc/orgcard.txt etc/ORG-NEWS
+	use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
 }