x11-base/xcb-proto: Move from x11-proto/xcb-proto

This commit is contained in:
Matt Turner
2018-04-23 22:57:20 -07:00
parent 7cb3cdc228
commit d420deeb52
19 changed files with 14 additions and 13 deletions

View File

@@ -25,7 +25,7 @@ RDEPEND="
x11-libs/xcb-util-wm
"
DEPEND="${RDEPEND}
x11-proto/xcb-proto
x11-base/xcb-proto
>=virtual/perl-Devel-PPPort-3.190.0
dev-perl/ExtUtils-Depends
>=virtual/perl-ExtUtils-MakeMaker-6.590.0

View File

@@ -33,7 +33,7 @@ RDEPEND="
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}
>=x11-proto/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
>=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
doc? (
dev-libs/libxslt
app-text/docbook-xml-dtd:4.2

View File

@@ -33,7 +33,7 @@ RDEPEND="
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}
>=x11-proto/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
>=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
doc? (
dev-libs/libxslt
app-text/docbook-xml-dtd:4.2

View File

@@ -4,3 +4,4 @@ move gnome-extra/gnome-builder dev-util/gnome-builder
move kde-apps/kstars sci-astronomy/kstars
move media-video/kamoso kde-apps/kamoso
move app-backup/kbackup kde-apps/kbackup
move x11-proto/xcb-proto x11-base/xcb-proto

View File

@@ -31,10 +31,10 @@ DEPEND="${RDEPEND}
dev-libs/libxslt
${PYTHON_DEPS}
$(python_gen_any_dep \
"~x11-proto/xcb-proto-1.12[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")"
"~x11-base/xcb-proto-1.12[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")"
python_check_deps() {
has_version --host-root ">=x11-proto/xcb-proto-1.11[${PYTHON_USEDEP}]"
has_version --host-root ">=x11-base/xcb-proto-1.11[${PYTHON_USEDEP}]"
}
pkg_setup() {

View File

@@ -30,10 +30,10 @@ DEPEND="${RDEPEND}
dev-libs/libxslt
${PYTHON_DEPS}
$(python_gen_any_dep \
">=x11-proto/xcb-proto-1.13[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")"
">=x11-base/xcb-proto-1.13[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")"
python_check_deps() {
has_version --host-root ">=x11-proto/xcb-proto-1.13[${PYTHON_USEDEP}]"
has_version --host-root ">=x11-base/xcb-proto-1.13[${PYTHON_USEDEP}]"
}
pkg_setup() {

View File

@@ -22,7 +22,7 @@ RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
>=x11-libs/xcb-util-image-0.3.9-r1[${MULTILIB_USEDEP}]
>=x11-libs/xcb-util-renderutil-0.3.9[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}
>=x11-proto/xcb-proto-1.8-r3:=[${MULTILIB_USEDEP}]
>=x11-base/xcb-proto-1.8-r3:=[${MULTILIB_USEDEP}]
>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]
>=dev-util/gperf-3.0.1
test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"

View File

@@ -20,7 +20,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND=">=x11-libs/libxcb-1.7
${PYTHON_DEPS}"
DEPEND="${RDEPEND}
>=x11-proto/xcb-proto-1.7.1[${PYTHON_USEDEP}]"
>=x11-base/xcb-proto-1.7.1[${PYTHON_USEDEP}]"
PATCHES=(
"${FILESDIR}"/${PN}-python.patch

View File

@@ -37,7 +37,7 @@ DEPEND="${COMMON_DEPEND}
dev-util/gperf
virtual/pkgconfig
media-gfx/imagemagick[png]
>=x11-proto/xcb-proto-1.5
>=x11-base/xcb-proto-1.5
>=x11-proto/xproto-7.0.15
doc? (
app-doc/doxygen

View File

@@ -44,7 +44,7 @@ DEPEND="${RDEPEND}
dev-util/gperf
virtual/pkgconfig
media-gfx/imagemagick[png]
>=x11-proto/xcb-proto-1.5
>=x11-base/xcb-proto-1.5
>=x11-proto/xproto-7.0.15
doc? ( dev-lua/ldoc )
test? (

View File

@@ -43,7 +43,7 @@ DEPEND="${RDEPEND}
dev-util/gperf
virtual/pkgconfig
media-gfx/imagemagick[png]
>=x11-proto/xcb-proto-1.5
>=x11-base/xcb-proto-1.5
>=x11-proto/xproto-7.0.15
doc? ( dev-lua/ldoc )
test? (

View File

@@ -25,7 +25,7 @@ RDEPEND="
>=dev-libs/glib-2.50.3-r1:2"
DEPEND="${RDEPEND}
>=x11-proto/xcb-proto-1.12-r2
>=x11-base/xcb-proto-1.12-r2
x11-base/xorg-proto"
src_install() {