[gentoo-commits] gentoo-x86 commit in app-misc/elasticsearch: ChangeLog elasticsearch-1.6.0.ebuild

[gentoo-commits] gentoo-x86 commit in app-misc/elasticsearch: ChangeLog elasticsearch-1.6.0.ebuild

[Tony Vroon (chainsaw)]

chainsaw    15/06/29 14:29:38

  Modified:             ChangeLog elasticsearch-1.6.0.ebuild
  Log:
  Also accept version 8 Java Runtime Environment, as per Ferenc Erki in bug #551880.
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xB5058F9A)

Revision  Changes    Path
1.14                 app-misc/elasticsearch/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/elasticsearch/ChangeLog?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/elasticsearch/ChangeLog?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/elasticsearch/ChangeLog?r1=1.13&r2=1.14

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/elasticsearch/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ChangeLog	11 Jun 2015 15:36:30 -0000	1.13
+++ ChangeLog	29 Jun 2015 14:29:38 -0000	1.14
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/elasticsearch
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/elasticsearch/ChangeLog,v 1.13 2015/06/11 15:36:30 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/elasticsearch/ChangeLog,v 1.14 2015/06/29 14:29:38 chainsaw Exp $
+
+  29 Jun 2015; Tony Vroon <chainsaw@gentoo.org> elasticsearch-1.6.0.ebuild:
+  Also accept version 8 Java Runtime Environment, as per Ferenc Erki in bug
+  #551880.
 
 *elasticsearch-1.6.0 (11 Jun 2015)
 



1.2                  app-misc/elasticsearch/elasticsearch-1.6.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/elasticsearch/elasticsearch-1.6.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/elasticsearch/elasticsearch-1.6.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/elasticsearch/elasticsearch-1.6.0.ebuild?r1=1.1&r2=1.2

Index: elasticsearch-1.6.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/elasticsearch/elasticsearch-1.6.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- elasticsearch-1.6.0.ebuild	11 Jun 2015 15:36:30 -0000	1.1
+++ elasticsearch-1.6.0.ebuild	29 Jun 2015 14:29:38 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/elasticsearch/elasticsearch-1.6.0.ebuild,v 1.1 2015/06/11 15:36:30 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/elasticsearch/elasticsearch-1.6.0.ebuild,v 1.2 2015/06/29 14:29:38 chainsaw Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@
 RESTRICT="strip"
 QA_PREBUILT="usr/share/elasticsearch/lib/sigar/libsigar-*.so"
 
-RDEPEND="virtual/jre:1.7"
+RDEPEND="|| ( virtual/jre:1.7 virtual/jre:1.8 )"
 
 pkg_setup() {
 	enewgroup ${MY_PN}