Add RESTRICT="test": The "testing" subdirectory needed for tests is only present in the upstream git repository, but not distributed with the package's tarball, bug 441072 comment #4. Remove old.

(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key E7BE08CA7DC6EA25)

3 files changed, 9 insertions, 56 deletions

diff --git a/app-emacs/org-mode/ChangeLog b/app-emacs/org-mode/ChangeLog
index 9a395411b3a5..1567321c02c4 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/ChangeLog,v 1.151 2012/11/21 20:46:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/ChangeLog,v 1.152 2012/11/22 00:18:04 ulm Exp $
+
+  22 Nov 2012; Ulrich Müller <ulm@gentoo.org> -org-mode-7.9.1.ebuild,
+  org-mode-7.9.2.ebuild:
+  Add RESTRICT="test": The "testing" subdirectory needed for tests is only
+  present in the upstream git repository, but not distributed with the
+  package's tarball, bug 441072 comment #4. Remove old.
 
   21 Nov 2012; Agostino Sarubbo <ago@gentoo.org> org-mode-7.9.2.ebuild:
   Stable for ppc, tested by Vincent Olivert Riera <peratu@carrosses.com>, wrt
diff --git a/app-emacs/org-mode/org-mode-7.9.1.ebuild b/app-emacs/org-mode/org-mode-7.9.1.ebuild
deleted file mode 100644
index 63508969bf62..000000000000
--- a/app-emacs/org-mode/org-mode-7.9.1.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.9.1.ebuild,v 1.1 2012/09/26 18:19:45 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 ) odt-schema? ( OASIS-Open )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos"
-IUSE="contrib doc odt-schema"
-
-DEPEND="doc? ( virtual/texi2dvi )"
-
-S="${WORKDIR}/org-${PV}"
-# 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.el"
-
-src_compile() {
-	emake
-	use doc && emake pdf card
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		ETCDIRS="styles $(use odt-schema && echo schema)" \
-		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/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
-	dodoc README doc/orgcard.txt etc/ORG-NEWS
-	use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
-}
diff --git a/app-emacs/org-mode/org-mode-7.9.2.ebuild b/app-emacs/org-mode/org-mode-7.9.2.ebuild
index 5efacdfe2f50..070eb039a639 100644
--- a/app-emacs/org-mode/org-mode-7.9.2.ebuild
+++ b/app-emacs/org-mode/org-mode-7.9.2.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.9.2.ebuild,v 1.4 2012/11/21 20:46:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-7.9.2.ebuild,v 1.5 2012/11/22 00:18:04 ulm Exp $
 
 EAPI=4
 NEED_EMACS=22
@@ -15,6 +15,7 @@ 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 )"