diff options
| -rw-r--r-- | dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild | 4 | ||||
| -rw-r--r-- | dev-java/icedtea/icedtea-3.7.0.ebuild | 7 | ||||
| -rw-r--r-- | dev-java/swt/swt-3.7.2-r2.ebuild | 2 | ||||
| -rw-r--r-- | dev-java/swt/swt-3.8.2-r2.ebuild | 2 | ||||
| -rw-r--r-- | dev-java/swt/swt-4.2-r3.ebuild | 4 |
5 files changed, 8 insertions, 11 deletions
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild index 465018f8f624..9229206c5f76 100644 --- a/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild +++ b/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -39,9 +39,9 @@ RDEPEND="alsa? ( media-libs/alsa-lib ) DEPEND="app-arch/zip gtk? ( + x11-base/xorg-proto x11-libs/libXrender >=x11-libs/libXtst-1.1.0 - x11-proto/xproto ) >=virtual/jdk-1.5 ${RDEPEND}" diff --git a/dev-java/icedtea/icedtea-3.7.0.ebuild b/dev-java/icedtea/icedtea-3.7.0.ebuild index be3cb438b0bc..8605d13cd9d0 100644 --- a/dev-java/icedtea/icedtea-3.7.0.ebuild +++ b/dev-java/icedtea/icedtea-3.7.0.ebuild @@ -86,13 +86,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/swt/swt-3.7.2-r2.ebuild b/dev-java/swt/swt-3.7.2-r2.ebuild index 63f3c11299f2..aa38b1de0654 100644 --- a/dev-java/swt/swt-3.7.2-r2.ebuild +++ b/dev-java/swt/swt-3.7.2-r2.ebuild @@ -40,11 +40,11 @@ COMMON=">=dev-libs/glib-2.6 DEPEND=">=virtual/jdk-1.4 app-arch/unzip + x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender x11-libs/libXt >=x11-libs/libXtst-1.1.0 - x11-proto/inputproto virtual/pkgconfig ${COMMON}" diff --git a/dev-java/swt/swt-3.8.2-r2.ebuild b/dev-java/swt/swt-3.8.2-r2.ebuild index 72289d111711..64b28cc018f3 100644 --- a/dev-java/swt/swt-3.8.2-r2.ebuild +++ b/dev-java/swt/swt-3.8.2-r2.ebuild @@ -40,11 +40,11 @@ COMMON=">=dev-libs/glib-2.6 DEPEND=">=virtual/jdk-1.4 app-arch/unzip + x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender x11-libs/libXt >=x11-libs/libXtst-1.1.0 - x11-proto/inputproto virtual/pkgconfig ${COMMON}" diff --git a/dev-java/swt/swt-4.2-r3.ebuild b/dev-java/swt/swt-4.2-r3.ebuild index 40625a0c8c8b..fdfce91451a6 100644 --- a/dev-java/swt/swt-4.2-r3.ebuild +++ b/dev-java/swt/swt-4.2-r3.ebuild @@ -42,11 +42,11 @@ DEPEND="${COMMON_DEP} >=virtual/jdk-1.4 app-arch/unzip virtual/pkgconfig + x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender x11-libs/libXt - >=x11-libs/libXtst-1.1.0 - x11-proto/inputproto" + >=x11-libs/libXtst-1.1.0" RDEPEND="${COMMON_DEP} >=virtual/jre-1.4" |