media-gfx/*: Update dependencies (x11-proto/* -> x11-base/xorg-proto).

hanetzer · Apr 30, 2018 · b8a0892 · b8a0892
1 parent a3b9928
commit b8a0892
Show file tree

Hide file tree

Showing 20 changed files with 30 additions and 31 deletions.
diff --git a/media-gfx/cellwriter/cellwriter-1.3.4.ebuild b/media-gfx/cellwriter/cellwriter-1.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=2
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libXtst
  gnome? ( gnome-base/libgnome )"
 DEPEND="${RDEPEND}
  virtual/pkgconfig
- x11-proto/inputproto"
+ x11-base/xorg-proto"
 
 src_configure() {
  econf $(use_with gnome)

diff --git a/media-gfx/cellwriter/cellwriter-1.3.5.ebuild b/media-gfx/cellwriter/cellwriter-1.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/gtk+:2
  x11-libs/libXtst"
 DEPEND="${RDEPEND}
  virtual/pkgconfig
- x11-proto/xproto"
+ x11-base/xorg-proto"
 
 DOCS="AUTHORS ChangeLog README TODO" # NEWS is no-op
 

diff --git a/media-gfx/fbida/fbida-2.12.ebuild b/media-gfx/fbida/fbida-2.12.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
@@ -47,7 +47,7 @@ CDEPEND="
 
 DEPEND="
  ${CDEPEND}
- X? ( x11-proto/xextproto x11-proto/xproto )
+ X? ( x11-base/xorg-proto )
 "
 
 RDEPEND="

diff --git a/media-gfx/fbida/fbida-2.13-r1.ebuild b/media-gfx/fbida/fbida-2.13-r1.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=6
@@ -47,7 +47,7 @@ CDEPEND="
 
 DEPEND="
  ${CDEPEND}
- X? ( x11-proto/xextproto x11-proto/xproto )
+ X? ( x11-base/xorg-proto )
 "
 
 RDEPEND="

diff --git a/media-gfx/fbida/fbida-2.14.ebuild b/media-gfx/fbida/fbida-2.14.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=6
@@ -47,7 +47,7 @@ CDEPEND="
 
 DEPEND="
  ${CDEPEND}
- X? ( x11-proto/xextproto x11-proto/xproto )
+ X? ( x11-base/xorg-proto )
 "
 
 RDEPEND="

diff --git a/media-gfx/fbida/fbida-9999.ebuild b/media-gfx/fbida/fbida-9999.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=6
@@ -49,7 +49,7 @@ CDEPEND="
 
 DEPEND="
  ${CDEPEND}
- X? ( x11-proto/xextproto x11-proto/xproto )
+ X? ( x11-base/xorg-proto )
 "
 
 RDEPEND="

diff --git a/media-gfx/feh/feh-2.18.3.ebuild b/media-gfx/feh/feh-2.18.3.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=6
@@ -22,8 +22,8 @@ COMMON_DEPEND="media-libs/imlib2[X]
 RDEPEND="${COMMON_DEPEND}
  virtual/jpeg:0"
 DEPEND="${COMMON_DEPEND}
+ x11-base/xorg-proto
  x11-libs/libXt
- x11-proto/xproto
  test? (
  >=dev-lang/perl-5.10
  dev-perl/Test-Command

diff --git a/media-gfx/feh/feh-2.24.ebuild b/media-gfx/feh/feh-2.24.ebuild
@@ -22,8 +22,8 @@ COMMON_DEPEND="media-libs/imlib2[X]
 RDEPEND="${COMMON_DEPEND}
  virtual/jpeg:0"
 DEPEND="${COMMON_DEPEND}
+ x11-base/xorg-proto
  x11-libs/libXt
- x11-proto/xproto
  test? (
  >=dev-lang/perl-5.10
  dev-perl/Test-Command

diff --git a/media-gfx/feh/feh-2.25.1.ebuild b/media-gfx/feh/feh-2.25.1.ebuild
@@ -22,8 +22,8 @@ COMMON_DEPEND="media-libs/imlib2[X]
 RDEPEND="${COMMON_DEPEND}
  virtual/jpeg:0"
 DEPEND="${COMMON_DEPEND}
+ x11-base/xorg-proto
  x11-libs/libXt
- x11-proto/xproto
  test? (
  >=dev-lang/perl-5.10
  dev-perl/Test-Command

diff --git a/media-gfx/feh/feh-2.25.ebuild b/media-gfx/feh/feh-2.25.ebuild
@@ -22,8 +22,8 @@ COMMON_DEPEND="media-libs/imlib2[X]
 RDEPEND="${COMMON_DEPEND}
  virtual/jpeg:0"
 DEPEND="${COMMON_DEPEND}
+ x11-base/xorg-proto
  x11-libs/libXt
- x11-proto/xproto
  test? (
  >=dev-lang/perl-5.10
  dev-perl/Test-Command

diff --git a/media-gfx/fontforge/fontforge-20170731-r3.ebuild b/media-gfx/fontforge/fontforge-20170731-r3.ebuild
@@ -51,7 +51,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
  sys-devel/gettext
  virtual/pkgconfig
- X? ( x11-proto/inputproto )
+ X? ( x11-base/xorg-proto )
 "
 
 # Needs keywording on many arches.

diff --git a/media-gfx/gifsicle/gifsicle-1.86.ebuild b/media-gfx/gifsicle/gifsicle-1.86.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ IUSE="X"
 
 RDEPEND="X? ( x11-libs/libX11 x11-libs/libXt )"
 DEPEND="${RDEPEND}
- X? ( x11-proto/xproto )"
+ X? ( x11-base/xorg-proto )"
 
 src_configure() {
  local myconf

diff --git a/media-gfx/gifsicle/gifsicle-1.90.ebuild b/media-gfx/gifsicle/gifsicle-1.90.ebuild
@@ -14,7 +14,7 @@ IUSE="X"
 
 RDEPEND="X? ( x11-libs/libX11 x11-libs/libXt )"
 DEPEND="${RDEPEND}
- X? ( x11-proto/xproto )"
+ X? ( x11-base/xorg-proto )"
 
 src_configure() {
  econf $(usex X "" "--disable-gifview")

diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-3.22.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.22.0.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=6
@@ -28,9 +28,9 @@ RDEPEND="${COMMON_DEPEND}
 "
 # ${PN} was part of gnome-utils before 3.4
 DEPEND="${COMMON_DEPEND}
- x11-proto/xextproto
  >=dev-util/intltool-0.50.2
  virtual/pkgconfig
+ x11-base/xorg-proto
 "
 
 DOC_CONTENTS="${P} saves screenshots in ~/Pictures/ and defaults to

diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild
@@ -59,7 +59,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
  !media-gfx/graphicsmagick[imagemagick]
  virtual/pkgconfig
- X? ( x11-proto/xextproto )"
+ X? ( x11-base/xorg-proto )"
 
 REQUIRED_USE="corefonts? ( truetype )
  test? ( corefonts )"

diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild
@@ -59,7 +59,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
  !media-gfx/graphicsmagick[imagemagick]
  virtual/pkgconfig
- X? ( x11-proto/xextproto )"
+ X? ( x11-base/xorg-proto )"
 
 REQUIRED_USE="corefonts? ( truetype )
  test? ( corefonts )"

diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild
@@ -59,7 +59,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
  !media-gfx/graphicsmagick[imagemagick]
  virtual/pkgconfig
- X? ( x11-proto/xextproto )"
+ X? ( x11-base/xorg-proto )"
 
 REQUIRED_USE="corefonts? ( truetype )
  test? ( corefonts )"

diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild
@@ -59,7 +59,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
  !media-gfx/graphicsmagick[imagemagick]
  virtual/pkgconfig
- X? ( x11-proto/xextproto )"
+ X? ( x11-base/xorg-proto )"
 
 REQUIRED_USE="corefonts? ( truetype )
  test? ( corefonts )"

diff --git a/media-gfx/xfig/xfig-3.2.6a-r1.ebuild b/media-gfx/xfig/xfig-3.2.6a-r1.ebuild
@@ -27,8 +27,7 @@ RDEPEND="
  postscript? ( app-text/ghostscript-gpl )
 "
 DEPEND="${RDEPEND}
- x11-proto/xproto
- x11-proto/inputproto
+ x11-base/xorg-proto
 "
 
 PATCHES=(

diff --git a/media-gfx/xli/xli-1.17.0-r5.ebuild b/media-gfx/xli/xli-1.17.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -22,7 +22,7 @@ RDEPEND="app-arch/bzip2
 
 DEPEND="${RDEPEND}
  app-text/rman
- x11-proto/xextproto
+ x11-base/xorg-proto
  x11-misc/imake
  !media-gfx/xloadimage"