Inherit xorg-2 rather than the legacy inherits.

Signed-off-by: James Cloos <cloos@jhcloos.com>

113 files changed, 113 insertions, 113 deletions

diff --git a/x11-apps/appres/appres-9999.ebuild b/x11-apps/appres/appres-9999.ebuild
index 7fd0563..615bb74 100644
--- a/x11-apps/appres/appres-9999.ebuild
+++ b/x11-apps/appres/appres-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="list X application resource database"
 
diff --git a/x11-apps/bdftopcf/bdftopcf-9999.ebuild b/x11-apps/bdftopcf/bdftopcf-9999.ebuild
index 608deee..bd45e9f 100644
--- a/x11-apps/bdftopcf/bdftopcf-9999.ebuild
+++ b/x11-apps/bdftopcf/bdftopcf-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="X.Org bdftopcf application"
 
diff --git a/x11-apps/beforelight/beforelight-9999.ebuild b/x11-apps/beforelight/beforelight-9999.ebuild
index 073ead8..c7512b8 100644
--- a/x11-apps/beforelight/beforelight-9999.ebuild
+++ b/x11-apps/beforelight/beforelight-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="screen saver"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/bitmap/bitmap-9999.ebuild b/x11-apps/bitmap/bitmap-9999.ebuild
index 0456ead..0d579a0 100644
--- a/x11-apps/bitmap/bitmap-9999.ebuild
+++ b/x11-apps/bitmap/bitmap-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="X.Org bitmap application"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/editres/editres-9999.ebuild b/x11-apps/editres/editres-9999.ebuild
index 0624235..3cee27f 100644
--- a/x11-apps/editres/editres-9999.ebuild
+++ b/x11-apps/editres/editres-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="a dynamic resource editor for X Toolkit applications"
 
diff --git a/x11-apps/fonttosfnt/fonttosfnt-9999.ebuild b/x11-apps/fonttosfnt/fonttosfnt-9999.ebuild
index cc4be92..33ed42e 100644
--- a/x11-apps/fonttosfnt/fonttosfnt-9999.ebuild
+++ b/x11-apps/fonttosfnt/fonttosfnt-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="X.Org fonttosfnt application"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/fslsfonts/fslsfonts-9999.ebuild b/x11-apps/fslsfonts/fslsfonts-9999.ebuild
index 0a7a285..ad12a16 100644
--- a/x11-apps/fslsfonts/fslsfonts-9999.ebuild
+++ b/x11-apps/fslsfonts/fslsfonts-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="list fonts served by X font server"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/fstobdf/fstobdf-9999.ebuild b/x11-apps/fstobdf/fstobdf-9999.ebuild
index 46f9d72..199019c 100644
--- a/x11-apps/fstobdf/fstobdf-9999.ebuild
+++ b/x11-apps/fstobdf/fstobdf-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="generate BDF font from X font server"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/grandr/grandr-9999.ebuild b/x11-apps/grandr/grandr-9999.ebuild
index 41b05ae..ce17b4c 100644
--- a/x11-apps/grandr/grandr-9999.ebuild
+++ b/x11-apps/grandr/grandr-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="GTK+-based tool to configure the X output using the RandR 1.2 extension"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/iceauth/iceauth-9999.ebuild b/x11-apps/iceauth/iceauth-9999.ebuild
index 78f3447..325c6d1 100644
--- a/x11-apps/iceauth/iceauth-9999.ebuild
+++ b/x11-apps/iceauth/iceauth-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="ICE authority file utility"
 
diff --git a/x11-apps/ico/ico-9999.ebuild b/x11-apps/ico/ico-9999.ebuild
index 3eff663..5244ce1 100644
--- a/x11-apps/ico/ico-9999.ebuild
+++ b/x11-apps/ico/ico-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="animate an icosahedron or other polyhedron"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/lbxproxy/lbxproxy-9999.ebuild b/x11-apps/lbxproxy/lbxproxy-9999.ebuild
index f2240eb..f0effb7 100644
--- a/x11-apps/lbxproxy/lbxproxy-9999.ebuild
+++ b/x11-apps/lbxproxy/lbxproxy-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="Low BandWidth X proxy"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/listres/listres-9999.ebuild b/x11-apps/listres/listres-9999.ebuild
index de39cef..4573e75 100644
--- a/x11-apps/listres/listres-9999.ebuild
+++ b/x11-apps/listres/listres-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="list resources in widgets"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/luit/luit-9999.ebuild b/x11-apps/luit/luit-9999.ebuild
index be9ea3d..b3a80e6 100644
--- a/x11-apps/luit/luit-9999.ebuild
+++ b/x11-apps/luit/luit-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="Locale and ISO 2022 support for Unicode terminals"
 
diff --git a/x11-apps/mkfontdir/mkfontdir-9999.ebuild b/x11-apps/mkfontdir/mkfontdir-9999.ebuild
index f9b8e3a..24483c1 100644
--- a/x11-apps/mkfontdir/mkfontdir-9999.ebuild
+++ b/x11-apps/mkfontdir/mkfontdir-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="create an index of X font files in a directory"
 
diff --git a/x11-apps/mkfontscale/mkfontscale-9999.ebuild b/x11-apps/mkfontscale/mkfontscale-9999.ebuild
index 5cddd02..05bf162 100644
--- a/x11-apps/mkfontscale/mkfontscale-9999.ebuild
+++ b/x11-apps/mkfontscale/mkfontscale-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="create an index of scalable font files for X"
 
diff --git a/x11-apps/oclock/oclock-9999.ebuild b/x11-apps/oclock/oclock-9999.ebuild
index ceca265..8eeef14 100644
--- a/x11-apps/oclock/oclock-9999.ebuild
+++ b/x11-apps/oclock/oclock-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="round X clock"
 
diff --git a/x11-apps/proxymngr/proxymngr-9999.ebuild b/x11-apps/proxymngr/proxymngr-9999.ebuild
index 78a27a7..a2a7102 100644
--- a/x11-apps/proxymngr/proxymngr-9999.ebuild
+++ b/x11-apps/proxymngr/proxymngr-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="proxy manager service"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/rgb/rgb-9999.ebuild b/x11-apps/rgb/rgb-9999.ebuild
index c61e7ea..bbcbf2f 100644
--- a/x11-apps/rgb/rgb-9999.ebuild
+++ b/x11-apps/rgb/rgb-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="uncompile an rgb color-name database"
 
diff --git a/x11-apps/rstart/rstart-9999.ebuild b/x11-apps/rstart/rstart-9999.ebuild
index 1b7eb72..d959713 100644
--- a/x11-apps/rstart/rstart-9999.ebuild
+++ b/x11-apps/rstart/rstart-9999.ebuild
@@ -3,7 +3,7 @@
 
 # Hack to make autoreconf run for our patch
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="X.Org rstart application"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/scripts/scripts-9999.ebuild b/x11-apps/scripts/scripts-9999.ebuild
index 9751cfa..f86f7e1 100644
--- a/x11-apps/scripts/scripts-9999.ebuild
+++ b/x11-apps/scripts/scripts-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="start an X program on a remote machine"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/sessreg/sessreg-9999.ebuild b/x11-apps/sessreg/sessreg-9999.ebuild
index 1d11d6e..5cde5a7 100644
--- a/x11-apps/sessreg/sessreg-9999.ebuild
+++ b/x11-apps/sessreg/sessreg-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="manage utmp/wtmp entries for non-init clients"
 
diff --git a/x11-apps/setxkbmap/setxkbmap-9999.ebuild b/x11-apps/setxkbmap/setxkbmap-9999.ebuild
index ff37ab3..54247ce 100644
--- a/x11-apps/setxkbmap/setxkbmap-9999.ebuild
+++ b/x11-apps/setxkbmap/setxkbmap-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 PATCHES=""
 
diff --git a/x11-apps/showfont/showfont-9999.ebuild b/x11-apps/showfont/showfont-9999.ebuild
index 8753c60..7b44884 100644
--- a/x11-apps/showfont/showfont-9999.ebuild
+++ b/x11-apps/showfont/showfont-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="font dumper for X font server"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/smproxy/smproxy-9999.ebuild b/x11-apps/smproxy/smproxy-9999.ebuild
index ff0895f..29213a9 100644
--- a/x11-apps/smproxy/smproxy-9999.ebuild
+++ b/x11-apps/smproxy/smproxy-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="Session Manager Proxy"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/viewres/viewres-9999.ebuild b/x11-apps/viewres/viewres-9999.ebuild
index 45947bc..7f54b7d 100644
--- a/x11-apps/viewres/viewres-9999.ebuild
+++ b/x11-apps/viewres/viewres-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="graphical class browser for Xt"
 
diff --git a/x11-apps/x11perf/x11perf-9999.ebuild b/x11-apps/x11perf/x11perf-9999.ebuild
index 29b09c7..ceb9f46 100644
--- a/x11-apps/x11perf/x11perf-9999.ebuild
+++ b/x11-apps/x11perf/x11perf-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="summarize x11perf results"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/xauth/xauth-9999.ebuild b/x11-apps/xauth/xauth-9999.ebuild
index 275f885..2b16172 100644
--- a/x11-apps/xauth/xauth-9999.ebuild
+++ b/x11-apps/xauth/xauth-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="X authority file utility"
 
diff --git a/x11-apps/xbacklight/xbacklight-9999.ebuild b/x11-apps/xbacklight/xbacklight-9999.ebuild
index c3a3d28..3d54ae9 100644
--- a/x11-apps/xbacklight/xbacklight-9999.ebuild
+++ b/x11-apps/xbacklight/xbacklight-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="Sets backlight level using the RandR 1.2 BACKLIGHT output property"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/xbiff/xbiff-9999.ebuild b/x11-apps/xbiff/xbiff-9999.ebuild
index 3bff84d..f9499b1 100644
--- a/x11-apps/xbiff/xbiff-9999.ebuild
+++ b/x11-apps/xbiff/xbiff-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="mailbox flag for X"
 
diff --git a/x11-apps/xcalc/xcalc-9999.ebuild b/x11-apps/xcalc/xcalc-9999.ebuild
index 26e15a8..64af703 100644
--- a/x11-apps/xcalc/xcalc-9999.ebuild
+++ b/x11-apps/xcalc/xcalc-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="scientific calculator for X"
 
diff --git a/x11-apps/xclipboard/xclipboard-9999.ebuild b/x11-apps/xclipboard/xclipboard-9999.ebuild
index 27692be..9b98d7c 100644
--- a/x11-apps/xclipboard/xclipboard-9999.ebuild
+++ b/x11-apps/xclipboard/xclipboard-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="interchange between cut buffer and selection"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/xclock/xclock-9999.ebuild b/x11-apps/xclock/xclock-9999.ebuild
index 9fd1df3..1877ce9 100644
--- a/x11-apps/xclock/xclock-9999.ebuild
+++ b/x11-apps/xclock/xclock-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="analog / digital clock for X"
 
diff --git a/x11-apps/xcmsdb/xcmsdb-9999.ebuild b/x11-apps/xcmsdb/xcmsdb-9999.ebuild
index f39e37a..f64ecd4 100644
--- a/x11-apps/xcmsdb/xcmsdb-9999.ebuild
+++ b/x11-apps/xcmsdb/xcmsdb-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="Device Color Characterization utility for X Color Management System"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/xconsole/xconsole-9999.ebuild b/x11-apps/xconsole/xconsole-9999.ebuild
index 7cfedf0..9d564df 100644
--- a/x11-apps/xconsole/xconsole-9999.ebuild
+++ b/x11-apps/xconsole/xconsole-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="monitor system console messages with X"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/xcursorgen/xcursorgen-9999.ebuild b/x11-apps/xcursorgen/xcursorgen-9999.ebuild
index 8ec0878..a8f5efa 100644
--- a/x11-apps/xcursorgen/xcursorgen-9999.ebuild
+++ b/x11-apps/xcursorgen/xcursorgen-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="create an X cursor file from a collection of PNG images"
 
diff --git a/x11-apps/xdbedizzy/xdbedizzy-9999.ebuild b/x11-apps/xdbedizzy/xdbedizzy-9999.ebuild
index 1b835a3..eb27a72 100644
--- a/x11-apps/xdbedizzy/xdbedizzy-9999.ebuild
+++ b/x11-apps/xdbedizzy/xdbedizzy-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="X.Org xdbedizzy application"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/xditview/xditview-9999.ebuild b/x11-apps/xditview/xditview-9999.ebuild
index 7a5f2bb..0d38876 100644
--- a/x11-apps/xditview/xditview-9999.ebuild
+++ b/x11-apps/xditview/xditview-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="display ditroff output"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/xdm/xdm-9999.ebuild b/x11-apps/xdm/xdm-9999.ebuild
index f8236a3..4d48e83 100644
--- a/x11-apps/xdm/xdm-9999.ebuild
+++ b/x11-apps/xdm/xdm-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit multilib x-modular pam
+inherit multilib xorg-2 pam
 
 DEFAULTVT="vt7"
 
diff --git a/x11-apps/xdpyinfo/xdpyinfo-9999.ebuild b/x11-apps/xdpyinfo/xdpyinfo-9999.ebuild
index 29edb1f..e60ee3b 100644
--- a/x11-apps/xdpyinfo/xdpyinfo-9999.ebuild
+++ b/x11-apps/xdpyinfo/xdpyinfo-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="display information utility for X"
 
diff --git a/x11-apps/xdriinfo/xdriinfo-9999.ebuild b/x11-apps/xdriinfo/xdriinfo-9999.ebuild
index 13cacb0..1d4ef06 100644
--- a/x11-apps/xdriinfo/xdriinfo-9999.ebuild
+++ b/x11-apps/xdriinfo/xdriinfo-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="query configuration information of DRI drivers"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/xedit/xedit-9999.ebuild b/x11-apps/xedit/xedit-9999.ebuild
index 2552550..8582b8f 100644
--- a/x11-apps/xedit/xedit-9999.ebuild
+++ b/x11-apps/xedit/xedit-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="simple text editor for X"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/xev/xev-9999.ebuild b/x11-apps/xev/xev-9999.ebuild
index ed20556..122bdc7 100644
--- a/x11-apps/xev/xev-9999.ebuild
+++ b/x11-apps/xev/xev-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="print contents of X events"
 
diff --git a/x11-apps/xeyes/xeyes-9999.ebuild b/x11-apps/xeyes/xeyes-9999.ebuild
index d7423e9..186b04a 100644
--- a/x11-apps/xeyes/xeyes-9999.ebuild
+++ b/x11-apps/xeyes/xeyes-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="X.Org xeyes application"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/xf86dga/xf86dga-9999.ebuild b/x11-apps/xf86dga/xf86dga-9999.ebuild
index 8555f09..f04c882 100644
--- a/x11-apps/xf86dga/xf86dga-9999.ebuild
+++ b/x11-apps/xf86dga/xf86dga-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="test program for the XFree86-DGA extension"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/xfd/xfd-9999.ebuild b/x11-apps/xfd/xfd-9999.ebuild
index 962945a..15d1d97 100644
--- a/x11-apps/xfd/xfd-9999.ebuild
+++ b/x11-apps/xfd/xfd-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="X.Org xfd application"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/xfindproxy/xfindproxy-9999.ebuild b/x11-apps/xfindproxy/xfindproxy-9999.ebuild
index dd1553d..27e9717 100644
--- a/x11-apps/xfindproxy/xfindproxy-9999.ebuild
+++ b/x11-apps/xfindproxy/xfindproxy-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="X.Org xfindproxy application"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/xfontsel/xfontsel-9999.ebuild b/x11-apps/xfontsel/xfontsel-9999.ebuild
index 2edfe09..8480671 100644
--- a/x11-apps/xfontsel/xfontsel-9999.ebuild
+++ b/x11-apps/xfontsel/xfontsel-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="point and click selection of X11 font names"
 
diff --git a/x11-apps/xfs/xfs-9999.ebuild b/x11-apps/xfs/xfs-9999.ebuild
index 75740be..2f5ae4a 100644
--- a/x11-apps/xfs/xfs-9999.ebuild
+++ b/x11-apps/xfs/xfs-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="X font server"
 
diff --git a/x11-apps/xfsinfo/xfsinfo-9999.ebuild b/x11-apps/xfsinfo/xfsinfo-9999.ebuild
index 4ca6d0f..4c48ba4 100644
--- a/x11-apps/xfsinfo/xfsinfo-9999.ebuild
+++ b/x11-apps/xfsinfo/xfsinfo-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="X font server information utility"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/xfwp/xfwp-9999.ebuild b/x11-apps/xfwp/xfwp-9999.ebuild
index aea56e4..acfee12 100644
--- a/x11-apps/xfwp/xfwp-9999.ebuild
+++ b/x11-apps/xfwp/xfwp-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="X.Org xfwp application"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/xgamma/xgamma-9999.ebuild b/x11-apps/xgamma/xgamma-9999.ebuild
index 39cefd1..7f6c42e 100644
--- a/x11-apps/xgamma/xgamma-9999.ebuild
+++ b/x11-apps/xgamma/xgamma-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="Alter a monitor's gamma correction through the X server"
 
diff --git a/x11-apps/xgc/xgc-9999.ebuild b/x11-apps/xgc/xgc-9999.ebuild
index 8dec500..38f76e5 100644
--- a/x11-apps/xgc/xgc-9999.ebuild
+++ b/x11-apps/xgc/xgc-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="X graphics demo"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/xhost/xhost-9999.ebuild b/x11-apps/xhost/xhost-9999.ebuild
index 50b5ff4..f7f55fd 100644
--- a/x11-apps/xhost/xhost-9999.ebuild
+++ b/x11-apps/xhost/xhost-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="Controls host and/or user access to a running X server."
 
diff --git a/x11-apps/xinit/xinit-9999.ebuild b/x11-apps/xinit/xinit-9999.ebuild
index 7ca7b0d..0247e92 100644
--- a/x11-apps/xinit/xinit-9999.ebuild
+++ b/x11-apps/xinit/xinit-9999.ebuild
@@ -3,7 +3,7 @@
 
 # This is enabled due to modified Makefile.am from the patches
 
-inherit x-modular pam
+inherit xorg-2 pam
 
 DESCRIPTION="X Window System initializer"
 
diff --git a/x11-apps/xkbcomp/xkbcomp-9999.ebuild b/x11-apps/xkbcomp/xkbcomp-9999.ebuild
index cd0c140..eef13b3 100644
--- a/x11-apps/xkbcomp/xkbcomp-9999.ebuild
+++ b/x11-apps/xkbcomp/xkbcomp-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular multilib
+inherit xorg-2 multilib
 
 DESCRIPTION="compile XKB keyboard description"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/xkbevd/xkbevd-9999.ebuild b/x11-apps/xkbevd/xkbevd-9999.ebuild
index f698f15..61b71c7 100644
--- a/x11-apps/xkbevd/xkbevd-9999.ebuild
+++ b/x11-apps/xkbevd/xkbevd-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="XKB event daemon"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/xkbprint/xkbprint-9999.ebuild b/x11-apps/xkbprint/xkbprint-9999.ebuild
index a0f16ba..3487844 100644
--- a/x11-apps/xkbprint/xkbprint-9999.ebuild
+++ b/x11-apps/xkbprint/xkbprint-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="print an XKB keyboard description"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/xkill/xkill-9999.ebuild b/x11-apps/xkill/xkill-9999.ebuild
index 2692a47..49fb5d1 100644
--- a/x11-apps/xkill/xkill-9999.ebuild
+++ b/x11-apps/xkill/xkill-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="kill a client by its X resource"
 
diff --git a/x11-apps/xload/xload-9999.ebuild b/x11-apps/xload/xload-9999.ebuild
index 834134e..691702e 100644
--- a/x11-apps/xload/xload-9999.ebuild
+++ b/x11-apps/xload/xload-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="system load average display for X"
 
diff --git a/x11-apps/xlogo/xlogo-9999.ebuild b/x11-apps/xlogo/xlogo-9999.ebuild
index 0e89397..f5b57ff 100644
--- a/x11-apps/xlogo/xlogo-9999.ebuild
+++ b/x11-apps/xlogo/xlogo-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="X Window System logo"
 
diff --git a/x11-apps/xlsatoms/xlsatoms-9999.ebuild b/x11-apps/xlsatoms/xlsatoms-9999.ebuild
index 7ccdf1e..691db66 100644
--- a/x11-apps/xlsatoms/xlsatoms-9999.ebuild
+++ b/x11-apps/xlsatoms/xlsatoms-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="list interned atoms defined on server"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/xlsclients/xlsclients-9999.ebuild b/x11-apps/xlsclients/xlsclients-9999.ebuild
index c8bb649..568795f 100644
--- a/x11-apps/xlsclients/xlsclients-9999.ebuild
+++ b/x11-apps/xlsclients/xlsclients-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="X.Org xlsclients application"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/xlsfonts/xlsfonts-9999.ebuild b/x11-apps/xlsfonts/xlsfonts-9999.ebuild
index 629f91d..89afa2b 100644
--- a/x11-apps/xlsfonts/xlsfonts-9999.ebuild
+++ b/x11-apps/xlsfonts/xlsfonts-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="X.Org xlsfonts application"
 
diff --git a/x11-apps/xmag/xmag-9999.ebuild b/x11-apps/xmag/xmag-9999.ebuild
index 0d3eec9..903db8f 100644
--- a/x11-apps/xmag/xmag-9999.ebuild
+++ b/x11-apps/xmag/xmag-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="X.Org xmag application"
 
diff --git a/x11-apps/xman/xman-9999.ebuild b/x11-apps/xman/xman-9999.ebuild
index 96ee7ab..315c8ce 100644
--- a/x11-apps/xman/xman-9999.ebuild
+++ b/x11-apps/xman/xman-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="Manual page display program for the X Window System"
 
diff --git a/x11-apps/xmessage/xmessage-9999.ebuild b/x11-apps/xmessage/xmessage-9999.ebuild
index 272b0b9..7624392 100644
--- a/x11-apps/xmessage/xmessage-9999.ebuild
+++ b/x11-apps/xmessage/xmessage-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="display a message or query in a window (X-based /bin/echo)"
 
diff --git a/x11-apps/xmh/xmh-9999.ebuild b/x11-apps/xmh/xmh-9999.ebuild
index 5da38e9..f70f920 100644
--- a/x11-apps/xmh/xmh-9999.ebuild
+++ b/x11-apps/xmh/xmh-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="send and read mail with an X interface to MH"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/xmodmap/xmodmap-9999.ebuild b/x11-apps/xmodmap/xmodmap-9999.ebuild
index 0c94290..6ea046d 100644
--- a/x11-apps/xmodmap/xmodmap-9999.ebuild
+++ b/x11-apps/xmodmap/xmodmap-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="utility for modifying keymaps and pointer button mappings in X"
 
diff --git a/x11-apps/xmore/xmore-9999.ebuild b/x11-apps/xmore/xmore-9999.ebuild
index 026cb5d..e991224 100644
--- a/x11-apps/xmore/xmore-9999.ebuild
+++ b/x11-apps/xmore/xmore-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="plain text display program for the X Window System"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/xpr/xpr-9999.ebuild b/x11-apps/xpr/xpr-9999.ebuild
index 9f1a381..2eee36a 100644
--- a/x11-apps/xpr/xpr-9999.ebuild
+++ b/x11-apps/xpr/xpr-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="X.Org xpr application"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/xprehashprinterlist/xprehashprinterlist-9999.ebuild b/x11-apps/xprehashprinterlist/xprehashprinterlist-9999.ebuild
index 8caec51..e0981b1 100644
--- a/x11-apps/xprehashprinterlist/xprehashprinterlist-9999.ebuild
+++ b/x11-apps/xprehashprinterlist/xprehashprinterlist-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="Recomputes the list of available printers."
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/xprop/xprop-9999.ebuild b/x11-apps/xprop/xprop-9999.ebuild
index 4eaec23..658cd00 100644
--- a/x11-apps/xprop/xprop-9999.ebuild
+++ b/x11-apps/xprop/xprop-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="property displayer for X"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/xrdb/xrdb-9999.ebuild b/x11-apps/xrdb/xrdb-9999.ebuild
index 0e3cbc1..4260b7a 100644
--- a/x11-apps/xrdb/xrdb-9999.ebuild
+++ b/x11-apps/xrdb/xrdb-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="X server resource database utility"
 
diff --git a/x11-apps/xrefresh/xrefresh-9999.ebuild b/x11-apps/xrefresh/xrefresh-9999.ebuild
index eae33b6..70dba6e 100644
--- a/x11-apps/xrefresh/xrefresh-9999.ebuild
+++ b/x11-apps/xrefresh/xrefresh-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="refresh all or part of an X screen"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/xrx/xrx-9999.ebuild b/x11-apps/xrx/xrx-9999.ebuild
index 3c55b1c..3947e5c 100644
--- a/x11-apps/xrx/xrx-9999.ebuild
+++ b/x11-apps/xrx/xrx-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="X.Org xrx application"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/xset/xset-9999.ebuild b/x11-apps/xset/xset-9999.ebuild
index 52c56ed..191512d 100644
--- a/x11-apps/xset/xset-9999.ebuild
+++ b/x11-apps/xset/xset-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="X.Org xset application"
 
diff --git a/x11-apps/xsetmode/xsetmode-9999.ebuild b/x11-apps/xsetmode/xsetmode-9999.ebuild
index 8b6c22e..a889b7f 100644
--- a/x11-apps/xsetmode/xsetmode-9999.ebuild
+++ b/x11-apps/xsetmode/xsetmode-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="set the mode for an X Input device"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/xsetpointer/xsetpointer-9999.ebuild b/x11-apps/xsetpointer/xsetpointer-9999.ebuild
index 1985bc0..fef056e 100644
--- a/x11-apps/xsetpointer/xsetpointer-9999.ebuild
+++ b/x11-apps/xsetpointer/xsetpointer-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="set an X Input device as the main pointer"
 
diff --git a/x11-apps/xsetroot/xsetroot-9999.ebuild b/x11-apps/xsetroot/xsetroot-9999.ebuild
index 3e0a96d..5a7738e 100644
--- a/x11-apps/xsetroot/xsetroot-9999.ebuild
+++ b/x11-apps/xsetroot/xsetroot-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="X.Org xsetroot application"
 
diff --git a/x11-apps/xsm/xsm-9999.ebuild b/x11-apps/xsm/xsm-9999.ebuild
index 3bb93bb..6d4fec3 100644
--- a/x11-apps/xsm/xsm-9999.ebuild
+++ b/x11-apps/xsm/xsm-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="X Session Manager"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/xstdcmap/xstdcmap-9999.ebuild b/x11-apps/xstdcmap/xstdcmap-9999.ebuild
index 8a48317..6ef92e1 100644
--- a/x11-apps/xstdcmap/xstdcmap-9999.ebuild
+++ b/x11-apps/xstdcmap/xstdcmap-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="X standard colormap utility"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/xtrap/xtrap-9999.ebuild b/x11-apps/xtrap/xtrap-9999.ebuild
index be7eeca..4b1ab11 100644
--- a/x11-apps/xtrap/xtrap-9999.ebuild
+++ b/x11-apps/xtrap/xtrap-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="X.Org xtrap application"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-apps/xvidtune/xvidtune-9999.ebuild b/x11-apps/xvidtune/xvidtune-9999.ebuild
index 64ab3b9..732ec6a 100644
--- a/x11-apps/xvidtune/xvidtune-9999.ebuild
+++ b/x11-apps/xvidtune/xvidtune-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="video mode tuner for Xorg"
 
diff --git a/x11-apps/xwd/xwd-9999.ebuild b/x11-apps/xwd/xwd-9999.ebuild
index 624de61..829d98f 100644
--- a/x11-apps/xwd/xwd-9999.ebuild
+++ b/x11-apps/xwd/xwd-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="dump an image of an X window"
 
diff --git a/x11-apps/xwininfo/xwininfo-9999.ebuild b/x11-apps/xwininfo/xwininfo-9999.ebuild
index 0800298..1fadf7f 100644
--- a/x11-apps/xwininfo/xwininfo-9999.ebuild
+++ b/x11-apps/xwininfo/xwininfo-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="window information utility for X"
 
diff --git a/x11-apps/xwud/xwud-9999.ebuild b/x11-apps/xwud/xwud-9999.ebuild
index faefb74..cfd892b 100644
--- a/x11-apps/xwud/xwud-9999.ebuild
+++ b/x11-apps/xwud/xwud-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-inherit x-modular
+inherit xorg-2
 
 DESCRIPTION="image displayer for X"
 
diff --git a/x11-base/xgl/xgl-9999.ebuild b/x11-base/xgl/xgl-9999.ebuild
index d29f275..153c2d0 100644
--- a/x11-base/xgl/xgl-9999.ebuild
+++ b/x11-base/xgl/xgl-9999.ebuild
@@ -9,7 +9,7 @@ SNAPSHOT="yes"
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
 EGIT_BRANCH="xgl-0-0-1"
 
-inherit flag-o-matic x-modular multilib cvs git
+inherit flag-o-matic xorg-2 multilib
 
 MESA_PN="Mesa"
 unset SRC_URI
diff --git a/x11-drivers/xf86-input-acecad/xf86-input-acecad-9999.ebuild b/x11-drivers/xf86-input-acecad/xf86-input-acecad-9999.ebuild
index 9286742..a4eab9b 100644
--- a/x11-drivers/xf86-input-acecad/xf86-input-acecad-9999.ebuild
+++ b/x11-drivers/xf86-input-acecad/xf86-input-acecad-9999.ebuild
@@ -6,7 +6,7 @@ SNAPSHOT="yes"
 XDPVER=4
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/driver/${PN}"
 
-inherit git x-modular
+inherit xorg-2
 
 DESCRIPTION="Acecad Flair input driver"
 SRC_URI=""
diff --git a/x11-drivers/xf86-input-aiptek/xf86-input-aiptek-9999.ebuild b/x11-drivers/xf86-input-aiptek/xf86-input-aiptek-9999.ebuild
index b7b8c0b..1701ce9 100644
--- a/x11-drivers/xf86-input-aiptek/xf86-input-aiptek-9999.ebuild
+++ b/x11-drivers/xf86-input-aiptek/xf86-input-aiptek-9999.ebuild
@@ -6,7 +6,7 @@ SNAPSHOT="yes"
 XDPVER=4
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/driver/${PN}"
 
-inherit git x-modular
+inherit xorg-2
 
 DESCRIPTION="Aiptek USB Digital Tablet Input Driver for Linux"
 SRC_URI=""
diff --git a/x11-drivers/xf86-input-calcomp/xf86-input-calcomp-9999.ebuild b/x11-drivers/xf86-input-calcomp/xf86-input-calcomp-9999.ebuild
index 093bda4..8f7258c 100644
--- a/x11-drivers/xf86-input-calcomp/xf86-input-calcomp-9999.ebuild
+++ b/x11-drivers/xf86-input-calcomp/xf86-input-calcomp-9999.ebuild
@@ -6,7 +6,7 @@ SNAPSHOT="yes"
 XDPVER=4
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/driver/${PN}"
 
-inherit git x-modular
+inherit xorg-2
 
 DESCRIPTION="Calcomp input driver"
 SRC_URI=""
diff --git a/x11-drivers/xf86-input-citron/xf86-input-citron-9999.ebuild b/x11-drivers/xf86-input-citron/xf86-input-citron-9999.ebuild
index e2e6170..e69fce1 100644
--- a/x11-drivers/xf86-input-citron/xf86-input-citron-9999.ebuild
+++ b/x11-drivers/xf86-input-citron/xf86-input-citron-9999.ebuild
@@ -6,7 +6,7 @@ SNAPSHOT="yes"
 XDPVER=4
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/driver/${PN}"
 
-inherit git x-modular
+inherit xorg-2
 
 DESCRIPTION="X.Org driver for citron input devices"
 SRC_URI=""
diff --git a/x11-drivers/xf86-input-digitaledge/xf86-input-digitaledge-9999.ebuild b/x11-drivers/xf86-input-digitaledge/xf86-input-digitaledge-9999.ebuild
index 23d4527..6a778bf 100644
--- a/x11-drivers/xf86-input-digitaledge/xf86-input-digitaledge-9999.ebuild
+++ b/x11-drivers/xf86-input-digitaledge/xf86-input-digitaledge-9999.ebuild
@@ -6,7 +6,7 @@ SNAPSHOT="yes"
 XDPVER=4
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/driver/${PN}"
 
-inherit git x-modular
+inherit xorg-2
 
 DESCRIPTION="X.Org driver for digitaledge input devices"
 SRC_URI=""
diff --git a/x11-drivers/xf86-input-dmc/xf86-input-dmc-9999.ebuild b/x11-drivers/xf86-input-dmc/xf86-input-dmc-9999.ebuild
index e770eeb..b3d18b9 100644
--- a/x11-drivers/xf86-input-dmc/xf86-input-dmc-9999.ebuild
+++ b/x11-drivers/xf86-input-dmc/xf86-input-dmc-9999.ebuild
@@ -6,7 +6,7 @@ SNAPSHOT="yes"
 XDPVER=4
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/driver/${PN}"
 
-inherit git x-modular
+inherit xorg-2
 
 DESCRIPTION="DMC input driver"
 SRC_URI=""
diff --git a/x11-drivers/xf86-input-dynapro/xf86-input-dynapro-9999.ebuild b/x11-drivers/xf86-input-dynapro/xf86-input-dynapro-9999.ebuild
index 6a7a7df..155f158 100644
--- a/x11-drivers/xf86-input-dynapro/xf86-input-dynapro-9999.ebuild
+++ b/x11-drivers/xf86-input-dynapro/xf86-input-dynapro-9999.ebuild
@@ -6,7 +6,7 @@ SNAPSHOT="yes"
 XDPVER=4
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/driver/${PN}"
 
-inherit git x-modular
+inherit xorg-2
 
 DESCRIPTION="Dynapro input driver"
 SRC_URI=""
diff --git a/x11-drivers/xf86-input-elo2300/xf86-input-elo2300-9999.ebuild b/x11-drivers/xf86-input-elo2300/xf86-input-elo2300-9999.ebuild
index 9261c57..bc898c0 100644
--- a/x11-drivers/xf86-input-elo2300/xf86-input-elo2300-9999.ebuild
+++ b/x11-drivers/xf86-input-elo2300/xf86-input-elo2300-9999.ebuild
@@ -6,7 +6,7 @@ SNAPSHOT="yes"
 XDPVER=4
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/driver/${PN}"
 
-inherit git x-modular
+inherit xorg-2
 
 DESCRIPTION="X.Org driver for elo2300 input devices"
 SRC_URI=""
diff --git a/x11-drivers/xf86-input-elographics/xf86-input-elographics-9999.ebuild b/x11-drivers/xf86-input-elographics/xf86-input-elographics-9999.ebuild
index 2f3c056..46d1514 100644
--- a/x11-drivers/xf86-input-elographics/xf86-input-elographics-9999.ebuild
+++ b/x11-drivers/xf86-input-elographics/xf86-input-elographics-9999.ebuild
@@ -6,7 +6,7 @@ SNAPSHOT="yes"
 XDPVER=4
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/driver/${PN}"
 
-inherit git x-modular
+inherit xorg-2
 
 DESCRIPTION="Elographics input driver"
 SRC_URI=""
diff --git a/x11-drivers/xf86-input-fpit/xf86-input-fpit-9999.ebuild b/x11-drivers/xf86-input-fpit/xf86-input-fpit-9999.ebuild
index ba6a0ff..3223f41 100644
--- a/x11-drivers/xf86-input-fpit/xf86-input-fpit-9999.ebuild
+++ b/x11-drivers/xf86-input-fpit/xf86-input-fpit-9999.ebuild
@@ -6,7 +6,7 @@ SNAPSHOT="yes"
 XDPVER=4
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/driver/${PN}"
 
-inherit git x-modular
+inherit xorg-2
 
 DESCRIPTION="Fujitsu Stylistic input driver"
 SRC_URI=""
diff --git a/x11-drivers/xf86-input-hyperpen/xf86-input-hyperpen-9999.ebuild b/x11-drivers/xf86-input-hyperpen/xf86-input-hyperpen-9999.ebuild
index 7c68abd..51f92f4 100644
--- a/x11-drivers/xf86-input-hyperpen/xf86-input-hyperpen-9999.ebuild
+++ b/x11-drivers/xf86-input-hyperpen/xf86-input-hyperpen-9999.ebuild
@@ -6,7 +6,7 @@ SNAPSHOT="yes"
 XDPVER=4
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/driver/${PN}"
 
-inherit git x-modular
+inherit xorg-2
 
 DESCRIPTION="X.Org driver for hyperpen input devices"
 SRC_URI=""
diff --git a/x11-drivers/xf86-input-jamstudio/xf86-input-jamstudio-9999.ebuild b/x11-drivers/xf86-input-jamstudio/xf86-input-jamstudio-9999.ebuild
index fe7dc79..73702c6 100644
--- a/x11-drivers/xf86-input-jamstudio/xf86-input-jamstudio-9999.ebuild
+++ b/x11-drivers/xf86-input-jamstudio/xf86-input-jamstudio-9999.ebuild
@@ -6,7 +6,7 @@ SNAPSHOT="yes"
 XDPVER=4
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/driver/${PN}"
 
-inherit git x-modular
+inherit xorg-2
 
 DESCRIPTION="X.Org driver for jamstudio input devices"
 SRC_URI=""
diff --git a/x11-drivers/xf86-input-joystick/xf86-input-joystick-9999.ebuild b/x11-drivers/xf86-input-joystick/xf86-input-joystick-9999.ebuild
index 25f7f7c..0700a73 100644
--- a/x11-drivers/xf86-input-joystick/xf86-input-joystick-9999.ebuild
+++ b/x11-drivers/xf86-input-joystick/xf86-input-joystick-9999.ebuild
@@ -6,7 +6,7 @@ SNAPSHOT="yes"
 XDPVER=4
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/driver/${PN}"
 
-inherit git x-modular
+inherit xorg-2
 
 DESCRIPTION="X.Org driver for joystick input devices"
 SRC_URI=""
diff --git a/x11-drivers/xf86-input-magellan/xf86-input-magellan-9999.ebuild b/x11-drivers/xf86-input-magellan/xf86-input-magellan-9999.ebuild
index bf07c17..6dfc9c9 100644
--- a/x11-drivers/xf86-input-magellan/xf86-input-magellan-9999.ebuild
+++ b/x11-drivers/xf86-input-magellan/xf86-input-magellan-9999.ebuild
@@ -6,7 +6,7 @@ SNAPSHOT="yes"
 XDPVER=4
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/driver/${PN}"
 
-inherit git x-modular
+inherit xorg-2
 
 DESCRIPTION="X.Org driver for magellan input devices"
 SRC_URI=""
diff --git a/x11-drivers/xf86-input-magictouch/xf86-input-magictouch-9999.ebuild b/x11-drivers/xf86-input-magictouch/xf86-input-magictouch-9999.ebuild
index 7b64e8e..c98c865 100644
--- a/x11-drivers/xf86-input-magictouch/xf86-input-magictouch-9999.ebuild
+++ b/x11-drivers/xf86-input-magictouch/xf86-input-magictouch-9999.ebuild
@@ -6,7 +6,7 @@ SNAPSHOT="yes"
 XDPVER=4
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/driver/${PN}"
 
-inherit git x-modular
+inherit xorg-2
 
 DESCRIPTION="MagicTouch input driver"
 SRC_URI=""
diff --git a/x11-drivers/xf86-input-microtouch/xf86-input-microtouch-9999.ebuild b/x11-drivers/xf86-input-microtouch/xf86-input-microtouch-9999.ebuild
index a7d0980..5801372 100644
--- a/x11-drivers/xf86-input-microtouch/xf86-input-microtouch-9999.ebuild
+++ b/x11-drivers/xf86-input-microtouch/xf86-input-microtouch-9999.ebuild
@@ -6,7 +6,7 @@ SNAPSHOT="yes"
 XDPVER=4
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/driver/${PN}"
 
-inherit git x-modular
+inherit xorg-2
 
 DESCRIPTION="MicroTouch input driver"
 SRC_URI=""
diff --git a/x11-drivers/xf86-input-mutouch/xf86-input-mutouch-9999.ebuild b/x11-drivers/xf86-input-mutouch/xf86-input-mutouch-9999.ebuild
index 5d723e3..f3de31e 100644
--- a/x11-drivers/xf86-input-mutouch/xf86-input-mutouch-9999.ebuild
+++ b/x11-drivers/xf86-input-mutouch/xf86-input-mutouch-9999.ebuild
@@ -6,7 +6,7 @@ SNAPSHOT="yes"
 XDPVER=4
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/driver/${PN}"
 
-inherit git x-modular
+inherit xorg-2
 
 DESCRIPTION="Microtouch input driver"
 SRC_URI=""
diff --git a/x11-drivers/xf86-input-palmax/xf86-input-palmax-9999.ebuild b/x11-drivers/xf86-input-palmax/xf86-input-palmax-9999.ebuild
index 19b6e9e..84552c4 100644
--- a/x11-drivers/xf86-input-palmax/xf86-input-palmax-9999.ebuild
+++ b/x11-drivers/xf86-input-palmax/xf86-input-palmax-9999.ebuild
@@ -6,7 +6,7 @@ SNAPSHOT="yes"
 XDPVER=4
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/driver/${PN}"
 
-inherit git x-modular
+inherit xorg-2
 
 DESCRIPTION="Palmax (TR88L803) touchscreen driver"
 SRC_URI=""
diff --git a/x11-drivers/xf86-input-penmount/xf86-input-penmount-9999.ebuild b/x11-drivers/xf86-input-penmount/xf86-input-penmount-9999.ebuild
index ae59627..9a0695e 100644
--- a/x11-drivers/xf86-input-penmount/xf86-input-penmount-9999.ebuild
+++ b/x11-drivers/xf86-input-penmount/xf86-input-penmount-9999.ebuild
@@ -6,7 +6,7 @@ SNAPSHOT="yes"
 XDPVER=4
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/driver/${PN}"
 
-inherit git x-modular
+inherit xorg-2
 
 DESCRIPTION="PenMount input driver"
 SRC_URI=""
diff --git a/x11-drivers/xf86-input-sample/xf86-input-sample-9999.ebuild b/x11-drivers/xf86-input-sample/xf86-input-sample-9999.ebuild
index 06c46e4..8944d18 100644
--- a/x11-drivers/xf86-input-sample/xf86-input-sample-9999.ebuild
+++ b/x11-drivers/xf86-input-sample/xf86-input-sample-9999.ebuild
@@ -6,7 +6,7 @@ SNAPSHOT="yes"
 XDPVER=4
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/driver/${PN}"
 
-inherit git x-modular
+inherit xorg-2
 
 DESCRIPTION="Generic Linux input driver"
 SRC_URI=""
diff --git a/x11-drivers/xf86-input-spaceorb/xf86-input-spaceorb-9999.ebuild b/x11-drivers/xf86-input-spaceorb/xf86-input-spaceorb-9999.ebuild
index df63fcc..44c8cf5 100644
--- a/x11-drivers/xf86-input-spaceorb/xf86-input-spaceorb-9999.ebuild
+++ b/x11-drivers/xf86-input-spaceorb/xf86-input-spaceorb-9999.ebuild
@@ -6,7 +6,7 @@ SNAPSHOT="yes"
 XDPVER=4
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/driver/${PN}"
 
-inherit git x-modular
+inherit xorg-2
 
 DESCRIPTION="X.Org driver for spaceorb input devices"
 SRC_URI=""
diff --git a/x11-drivers/xf86-input-summa/xf86-input-summa-9999.ebuild b/x11-drivers/xf86-input-summa/xf86-input-summa-9999.ebuild
index 577a61b..ff60525 100644
--- a/x11-drivers/xf86-input-summa/xf86-input-summa-9999.ebuild
+++ b/x11-drivers/xf86-input-summa/xf86-input-summa-9999.ebuild
@@ -6,7 +6,7 @@ SNAPSHOT="yes"
 XDPVER=4
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/driver/${PN}"
 
-inherit git x-modular
+inherit xorg-2
 
 DESCRIPTION="X.Org driver for summa input devices"
 SRC_URI=""
diff --git a/x11-drivers/xf86-input-tek4957/xf86-input-tek4957-9999.ebuild b/x11-drivers/xf86-input-tek4957/xf86-input-tek4957-9999.ebuild
index 098c3f9..5ebded1 100644
--- a/x11-drivers/xf86-input-tek4957/xf86-input-tek4957-9999.ebuild
+++ b/x11-drivers/xf86-input-tek4957/xf86-input-tek4957-9999.ebuild
@@ -6,7 +6,7 @@ SNAPSHOT="yes"
 XDPVER=4
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/driver/${PN}"
 
-inherit git x-modular
+inherit xorg-2
 
 DESCRIPTION="Tektronix 4957 input driver"
 SRC_URI=""
diff --git a/x11-drivers/xf86-input-ur98/xf86-input-ur98-9999.ebuild b/x11-drivers/xf86-input-ur98/xf86-input-ur98-9999.ebuild
index b5b6e91..ce5af19 100644
--- a/x11-drivers/xf86-input-ur98/xf86-input-ur98-9999.ebuild
+++ b/x11-drivers/xf86-input-ur98/xf86-input-ur98-9999.ebuild
@@ -6,7 +6,7 @@ SNAPSHOT="yes"
 XDPVER=4
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/driver/${PN}"
 
-inherit git x-modular
+inherit xorg-2
 
 DESCRIPTION="UR98 (TR88L803) head tracker driver"
 SRC_URI=""
diff --git a/x11-drivers/xf86-input-void/xf86-input-void-9999.ebuild b/x11-drivers/xf86-input-void/xf86-input-void-9999.ebuild
index 2851a62..bf03af6 100644
--- a/x11-drivers/xf86-input-void/xf86-input-void-9999.ebuild
+++ b/x11-drivers/xf86-input-void/xf86-input-void-9999.ebuild
@@ -6,7 +6,7 @@ SNAPSHOT="yes"
 XDPVER=4
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/driver/${PN}"
 
-inherit git x-modular
+inherit xorg-2
 
 DESCRIPTION="null input driver"
 SRC_URI=""