mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-24 18:58:08 -07:00
dev-java/*: Update dependencies (x11-proto/* -> x11-base/xorg-proto).
This commit is contained in:
committed by
Matt Turner
parent
8cb3aa13ac
commit
39444ca0b4
@@ -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}"
|
||||
|
||||
@@ -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="
|
||||
|
||||
@@ -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}"
|
||||
|
||||
|
||||
@@ -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}"
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user