[gentoo-commits] proj/R_overlay:master commit in: config/simple-deprules.d/

[André Erdmann]

commit:     ff166920df39e19771367ff785d35cb120716486
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Mon Jun 23 18:28:41 2014 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Mon Jun 23 19:13:15 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=ff166920

deprules: remove virtual/jdk:1.5 rule (workaround)

SLOT-relative dependency rules do not take the version operator (<, >, ==, !=,
<=, >=) into account, which is a logic/design error because dep strings like
"Java (>= 5.0)" can be interpreted as
(a) any version within the 5.0 release series
(b) any version greater or equal than 5.0, e.g. 7.0

SLOT rules always assume (a), but (b) is equally possible - depending on
the R package in question as well as the respective rule.

This commit is a *workaround* for a single dep rule.
It removes the SLOT rule for virtual/jdk:1.5, which is not available in
the main tree and some packages affected by this rule (RWeka, RWekajars) have
been confirmed to work with more recent java releases.
Effectively, this means that all "Java <somehow> 5.0" dep strings get resolved
as ">=virtual/jdk-1.5" now, which breaks packages that really depend on java
1.5 (should be solvable by installing it manually).

All other SLOT rules (=3) are affected by this issue, too.

Needs to be fixed code-wise.

Reported-By: Randall Wald <rdwald <AT> gmail.com>

---
 config/simple-deprules.d/dev | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/config/simple-deprules.d/dev b/config/simple-deprules.d/dev
index 36f9a93..8430cc1 100644
--- a/config/simple-deprules.d/dev
+++ b/config/simple-deprules.d/dev
@@ -60,17 +60,8 @@ dev-util/cmake {
 }
 
 # FIXME: the jdk rules are not quite correct,
-#         virtual/jdk:1.6 (probably) works for some packages, too
+#         virtual/jdk:1.7 (probably) works for some packages, too
 #
-# resolve "java 5", "java 1.5" ... as 'virtual/jdk:1.5'
-~virtual/jdk:slotparts=i1.5:restrict=1.5,5.0 {
-	java
-	Java 1.4 or later
-	Java 1.5 or higher
-	Java version
-	java runtime
-}
-
 ~virtual/jdk:slotparts=i1.6:restrict=1.6,6.0 {
 	java
 	Java version
@@ -89,6 +80,7 @@ dev-util/cmake {
 ~virtual/jdk {
 	java
 	Java 1.4 or later
+	Java 1.5 or higher
 	Java version
 	java runtime
 }