[gentoo-commits] proj/java:master commit in: dev-java/icedtea/

[James Le Cuirot]

commit:     914b5f4ae35bdb604a802a8cc4a81364200618b5
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  9 21:03:20 2018 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Jun  9 21:03:20 2018 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=914b5f4a

dev-java/icedtea: x11-proto packages have been replaced by xorg-proto

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-java/icedtea/icedtea-3.8.0.ebuild         | 7 ++-----
 dev-java/icedtea/icedtea-3.9.0_pre00.ebuild   | 7 ++-----
 dev-java/icedtea/icedtea-7.2.6.14.ebuild      | 7 ++-----
 dev-java/icedtea/icedtea-7.2.7.0_pre15.ebuild | 7 ++-----
 4 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/dev-java/icedtea/icedtea-3.8.0.ebuild 
b/dev-java/icedtea/icedtea-3.8.0.ebuild
index a7a064ae..b351adf4 100644
--- a/dev-java/icedtea/icedtea-3.8.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.8.0.ebuild
@@ -89,13 +89,10 @@ X_COMMON_DEP="
        >=x11-libs/libXtst-1.0.3
        x11-libs/libXcomposite"
 X_DEPEND="
+       x11-base/xorg-proto
        >=x11-libs/libXau-1.0.3
        >=x11-libs/libXdmcp-1.0.2
-       >=x11-libs/libXinerama-1.0.2
-       x11-proto/inputproto
-       >=x11-proto/xextproto-7.1.1
-       x11-proto/xineramaproto
-       x11-proto/xproto"
+       >=x11-libs/libXinerama-1.0.2"
 
 # The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn
 COMMON_DEP="

diff --git a/dev-java/icedtea/icedtea-3.9.0_pre00.ebuild 
b/dev-java/icedtea/icedtea-3.9.0_pre00.ebuild
index 09abde9f..839c3d48 100644
--- a/dev-java/icedtea/icedtea-3.9.0_pre00.ebuild
+++ b/dev-java/icedtea/icedtea-3.9.0_pre00.ebuild
@@ -89,13 +89,10 @@ X_COMMON_DEP="
        >=x11-libs/libXtst-1.0.3
        x11-libs/libXcomposite"
 X_DEPEND="
+       x11-base/xorg-proto
        >=x11-libs/libXau-1.0.3
        >=x11-libs/libXdmcp-1.0.2
-       >=x11-libs/libXinerama-1.0.2
-       x11-proto/inputproto
-       >=x11-proto/xextproto-7.1.1
-       x11-proto/xineramaproto
-       x11-proto/xproto"
+       >=x11-libs/libXinerama-1.0.2"
 
 # The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn
 COMMON_DEP="

diff --git a/dev-java/icedtea/icedtea-7.2.6.14.ebuild 
b/dev-java/icedtea/icedtea-7.2.6.14.ebuild
index 52737b9d..dd819992 100644
--- a/dev-java/icedtea/icedtea-7.2.6.14.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.6.14.ebuild
@@ -81,13 +81,10 @@ X_COMMON_DEP="
        x11-libs/libXt
        x11-libs/libXcomposite"
 X_DEPEND="
+       x11-base/xorg-proto
        >=x11-libs/libXau-1.0.3
        >=x11-libs/libXdmcp-1.0.2
-       >=x11-libs/libXinerama-1.0.2
-       x11-proto/inputproto
-       >=x11-proto/xextproto-7.1.1
-       x11-proto/xineramaproto
-       x11-proto/xproto"
+       >=x11-libs/libXinerama-1.0.2"
 
 COMMON_DEP="
        app-misc/mime-types

diff --git a/dev-java/icedtea/icedtea-7.2.7.0_pre15.ebuild 
b/dev-java/icedtea/icedtea-7.2.7.0_pre15.ebuild
index 5dd7dc5c..24c39bbb 100644
--- a/dev-java/icedtea/icedtea-7.2.7.0_pre15.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.7.0_pre15.ebuild
@@ -80,13 +80,10 @@ X_COMMON_DEP="
        x11-libs/libXt
        x11-libs/libXcomposite"
 X_DEPEND="
+       x11-base/xorg-proto
        >=x11-libs/libXau-1.0.3
        >=x11-libs/libXdmcp-1.0.2
-       >=x11-libs/libXinerama-1.0.2
-       x11-proto/inputproto
-       >=x11-proto/xextproto-7.1.1
-       x11-proto/xineramaproto
-       x11-proto/xproto"
+       >=x11-libs/libXinerama-1.0.2"
 
 COMMON_DEP="
        app-misc/mime-types