summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-fonts/encodings/Manifest2
-rw-r--r--media-fonts/encodings/encodings-1.0.3.ebuild2
-rw-r--r--media-fonts/font-adobe-100dpi/Manifest2
-rw-r--r--media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.1.ebuild2
-rw-r--r--media-fonts/font-adobe-75dpi/Manifest2
-rw-r--r--media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.1.ebuild2
-rw-r--r--media-fonts/font-adobe-utopia-100dpi/Manifest2
-rw-r--r--media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.2.ebuild2
-rw-r--r--media-fonts/font-adobe-utopia-75dpi/Manifest2
-rw-r--r--media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.2.ebuild2
-rw-r--r--media-fonts/font-adobe-utopia-type1/Manifest2
-rw-r--r--media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.2.ebuild2
-rw-r--r--media-fonts/font-alias/Manifest2
-rw-r--r--media-fonts/font-alias/font-alias-1.0.2.ebuild2
-rw-r--r--media-fonts/font-arabic-misc/Manifest2
-rw-r--r--media-fonts/font-arabic-misc/font-arabic-misc-1.0.1.ebuild2
-rw-r--r--media-fonts/font-bh-100dpi/Manifest2
-rw-r--r--media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.1.ebuild2
-rw-r--r--media-fonts/font-bh-75dpi/Manifest2
-rw-r--r--media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.1.ebuild2
-rw-r--r--media-fonts/font-bh-lucidatypewriter-100dpi/Manifest2
-rw-r--r--media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.1.ebuild2
-rw-r--r--media-fonts/font-bh-lucidatypewriter-75dpi/Manifest2
-rw-r--r--media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.1.ebuild2
-rw-r--r--media-fonts/font-bh-ttf/Manifest2
-rw-r--r--media-fonts/font-bh-ttf/font-bh-ttf-1.0.1.ebuild2
-rw-r--r--media-fonts/font-bh-type1/Manifest2
-rw-r--r--media-fonts/font-bh-type1/font-bh-type1-1.0.1.ebuild2
-rw-r--r--media-fonts/font-bitstream-100dpi/Manifest2
-rw-r--r--media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.1.ebuild2
-rw-r--r--media-fonts/font-bitstream-75dpi/Manifest2
-rw-r--r--media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.1.ebuild2
-rw-r--r--media-fonts/font-bitstream-speedo/Manifest2
-rw-r--r--media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.1.ebuild2
-rw-r--r--media-fonts/font-bitstream-type1/Manifest2
-rw-r--r--media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.1.ebuild2
-rw-r--r--media-fonts/font-cronyx-cyrillic/Manifest2
-rw-r--r--media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.1.ebuild2
-rw-r--r--media-fonts/font-cursor-misc/Manifest2
-rw-r--r--media-fonts/font-cursor-misc/font-cursor-misc-1.0.1.ebuild2
-rw-r--r--media-fonts/font-daewoo-misc/Manifest2
-rw-r--r--media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.1.ebuild2
-rw-r--r--media-fonts/font-dec-misc/Manifest2
-rw-r--r--media-fonts/font-dec-misc/font-dec-misc-1.0.1.ebuild2
-rw-r--r--media-fonts/font-ibm-type1/Manifest2
-rw-r--r--media-fonts/font-ibm-type1/font-ibm-type1-1.0.1.ebuild2
-rw-r--r--media-fonts/font-isas-misc/Manifest2
-rw-r--r--media-fonts/font-isas-misc/font-isas-misc-1.0.1.ebuild2
-rw-r--r--media-fonts/font-jis-misc/Manifest2
-rw-r--r--media-fonts/font-jis-misc/font-jis-misc-1.0.1.ebuild2
-rw-r--r--media-fonts/font-micro-misc/Manifest2
-rw-r--r--media-fonts/font-micro-misc/font-micro-misc-1.0.1.ebuild2
-rw-r--r--media-fonts/font-misc-cyrillic/Manifest2
-rw-r--r--media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.1.ebuild2
-rw-r--r--media-fonts/font-misc-ethiopic/Manifest2
-rw-r--r--media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.1.ebuild2
-rw-r--r--media-fonts/font-misc-meltho/Manifest2
-rw-r--r--media-fonts/font-misc-meltho/font-misc-meltho-1.0.1.ebuild2
-rw-r--r--media-fonts/font-misc-misc/Manifest2
-rw-r--r--media-fonts/font-misc-misc/font-misc-misc-1.1.0.ebuild2
-rw-r--r--media-fonts/font-mutt-misc/Manifest2
-rw-r--r--media-fonts/font-mutt-misc/font-mutt-misc-1.0.1.ebuild2
-rw-r--r--media-fonts/font-schumacher-misc/Manifest2
-rw-r--r--media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.0.ebuild2
-rw-r--r--media-fonts/font-screen-cyrillic/Manifest2
-rw-r--r--media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.2.ebuild2
-rw-r--r--media-fonts/font-sony-misc/Manifest2
-rw-r--r--media-fonts/font-sony-misc/font-sony-misc-1.0.1.ebuild2
-rw-r--r--media-fonts/font-sun-misc/Manifest2
-rw-r--r--media-fonts/font-sun-misc/font-sun-misc-1.0.1.ebuild2
-rw-r--r--media-fonts/font-util/Manifest4
-rw-r--r--media-fonts/font-util/font-util-1.1.1-r1.ebuild2
-rw-r--r--media-fonts/font-util/font-util-9999.ebuild2
-rw-r--r--media-fonts/font-winitzki-cyrillic/Manifest2
-rw-r--r--media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.1.ebuild2
-rw-r--r--media-fonts/font-xfree86-type1/Manifest2
-rw-r--r--media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.2.ebuild2
-rw-r--r--x11-apps/mkfontdir/Manifest2
-rw-r--r--x11-apps/mkfontdir/mkfontdir-9999.ebuild2
-rw-r--r--x11-apps/mkfontscale/Manifest2
-rw-r--r--x11-apps/mkfontscale/mkfontscale-9999.ebuild2
-rw-r--r--x11-apps/smproxy/Manifest2
-rw-r--r--x11-apps/smproxy/smproxy-9999.ebuild2
-rw-r--r--x11-apps/x11perf/Manifest2
-rw-r--r--x11-apps/x11perf/x11perf-9999.ebuild2
-rw-r--r--x11-apps/xcursorgen/Manifest2
-rw-r--r--x11-apps/xcursorgen/xcursorgen-9999.ebuild2
-rw-r--r--x11-apps/xdriinfo/Manifest2
-rw-r--r--x11-apps/xdriinfo/xdriinfo-9999.ebuild6
-rw-r--r--x11-apps/xev/Manifest2
-rw-r--r--x11-apps/xev/xev-9999.ebuild2
-rw-r--r--x11-apps/xinit/Manifest2
-rw-r--r--x11-apps/xinit/xinit-9999.ebuild8
-rw-r--r--x11-apps/xinput/Manifest2
-rw-r--r--x11-apps/xinput/xinput-9999.ebuild2
-rw-r--r--x11-apps/xkbevd/Manifest2
-rw-r--r--x11-apps/xkbevd/xkbevd-9999.ebuild2
-rw-r--r--x11-apps/xkbutils/Manifest2
-rw-r--r--x11-apps/xkbutils/xkbutils-9999.ebuild2
-rw-r--r--x11-apps/xman/Manifest2
-rw-r--r--x11-apps/xman/xman-9999.ebuild2
-rw-r--r--x11-apps/xrandr/Manifest2
-rw-r--r--x11-apps/xrandr/xrandr-9999.ebuild4
-rw-r--r--x11-apps/xvinfo/Manifest2
-rw-r--r--x11-apps/xvinfo/xvinfo-9999.ebuild2
-rw-r--r--x11-apps/xwininfo/Manifest2
-rw-r--r--x11-apps/xwininfo/xwininfo-9999.ebuild2
-rw-r--r--x11-base/xorg-server/Manifest2
-rw-r--r--x11-base/xorg-server/xorg-server-9999.ebuild8
-rw-r--r--x11-drivers/xf86-input-evdev/Manifest2
-rw-r--r--x11-drivers/xf86-input-evdev/xf86-input-evdev-9999.ebuild2
-rw-r--r--x11-drivers/xf86-input-joystick/Manifest2
-rw-r--r--x11-drivers/xf86-input-joystick/xf86-input-joystick-9999.ebuild2
-rw-r--r--x11-drivers/xf86-input-keyboard/Manifest2
-rw-r--r--x11-drivers/xf86-input-keyboard/xf86-input-keyboard-9999.ebuild2
-rw-r--r--x11-drivers/xf86-input-mouse/Manifest2
-rw-r--r--x11-drivers/xf86-input-mouse/xf86-input-mouse-9999.ebuild2
-rw-r--r--x11-drivers/xf86-input-synaptics/Manifest2
-rw-r--r--x11-drivers/xf86-input-synaptics/xf86-input-synaptics-9999.ebuild6
-rw-r--r--x11-drivers/xf86-input-wacom/Manifest2
-rw-r--r--x11-drivers/xf86-input-wacom/xf86-input-wacom-9999.ebuild8
-rw-r--r--x11-drivers/xf86-video-ati/Manifest2
-rw-r--r--x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild4
-rw-r--r--x11-drivers/xf86-video-displaylink/Manifest2
-rw-r--r--x11-drivers/xf86-video-displaylink/xf86-video-displaylink-0.3.ebuild2
-rw-r--r--x11-drivers/xf86-video-intel/Manifest2
-rw-r--r--x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild4
-rw-r--r--x11-drivers/xf86-video-nouveau/Manifest2
-rw-r--r--x11-drivers/xf86-video-nouveau/xf86-video-nouveau-9999.ebuild4
-rw-r--r--x11-libs/libFS/Manifest2
-rw-r--r--x11-libs/libFS/libFS-9999.ebuild2
-rw-r--r--x11-libs/libICE/Manifest2
-rw-r--r--x11-libs/libICE/libICE-9999.ebuild4
-rw-r--r--x11-libs/libSM/Manifest2
-rw-r--r--x11-libs/libSM/libSM-9999.ebuild2
-rw-r--r--x11-libs/libX11/Manifest2
-rw-r--r--x11-libs/libX11/libX11-9999.ebuild6
-rw-r--r--x11-libs/libXScrnSaver/Manifest2
-rw-r--r--x11-libs/libXScrnSaver/libXScrnSaver-9999.ebuild2
-rw-r--r--x11-libs/libXTrap/Manifest2
-rw-r--r--x11-libs/libXTrap/libXTrap-9999.ebuild2
-rw-r--r--x11-libs/libXamine/Manifest2
-rw-r--r--x11-libs/libXamine/libXamine-9999.ebuild2
-rw-r--r--x11-libs/libXau/Manifest2
-rw-r--r--x11-libs/libXau/libXau-9999.ebuild2
-rw-r--r--x11-libs/libXaw/Manifest2
-rw-r--r--x11-libs/libXaw/libXaw-9999.ebuild4
-rw-r--r--x11-libs/libXcomposite/Manifest2
-rw-r--r--x11-libs/libXcomposite/libXcomposite-9999.ebuild2
-rw-r--r--x11-libs/libXcursor/Manifest2
-rw-r--r--x11-libs/libXcursor/libXcursor-9999.ebuild2
-rw-r--r--x11-libs/libXdamage/Manifest2
-rw-r--r--x11-libs/libXdamage/libXdamage-9999.ebuild2
-rw-r--r--x11-libs/libXdmcp/Manifest2
-rw-r--r--x11-libs/libXdmcp/libXdmcp-9999.ebuild2
-rw-r--r--x11-libs/libXevie/Manifest2
-rw-r--r--x11-libs/libXevie/libXevie-9999.ebuild2
-rw-r--r--x11-libs/libXext/Manifest2
-rw-r--r--x11-libs/libXext/libXext-9999.ebuild2
-rw-r--r--x11-libs/libXfixes/Manifest2
-rw-r--r--x11-libs/libXfixes/libXfixes-9999.ebuild2
-rw-r--r--x11-libs/libXfont/Manifest2
-rw-r--r--x11-libs/libXfont/libXfont-9999.ebuild4
-rw-r--r--x11-libs/libXfontcache/Manifest2
-rw-r--r--x11-libs/libXfontcache/libXfontcache-9999.ebuild2
-rw-r--r--x11-libs/libXft/Manifest2
-rw-r--r--x11-libs/libXft/libXft-9999.ebuild4
-rw-r--r--x11-libs/libXi/Manifest2
-rw-r--r--x11-libs/libXi/libXi-9999.ebuild4
-rw-r--r--x11-libs/libXinerama/Manifest2
-rw-r--r--x11-libs/libXinerama/libXinerama-9999.ebuild2
-rw-r--r--x11-libs/libXmu/Manifest2
-rw-r--r--x11-libs/libXmu/libXmu-9999.ebuild2
-rw-r--r--x11-libs/libXp/Manifest2
-rw-r--r--x11-libs/libXp/libXp-9999.ebuild2
-rw-r--r--x11-libs/libXpm/Manifest2
-rw-r--r--x11-libs/libXpm/libXpm-9999.ebuild2
-rw-r--r--x11-libs/libXrandr/Manifest2
-rw-r--r--x11-libs/libXrandr/libXrandr-9999.ebuild2
-rw-r--r--x11-libs/libXrender/Manifest2
-rw-r--r--x11-libs/libXrender/libXrender-9999.ebuild2
-rw-r--r--x11-libs/libXres/Manifest2
-rw-r--r--x11-libs/libXres/libXres-9999.ebuild2
-rw-r--r--x11-libs/libXt/Manifest2
-rw-r--r--x11-libs/libXt/libXt-9999.ebuild4
-rw-r--r--x11-libs/libXtst/Manifest2
-rw-r--r--x11-libs/libXtst/libXtst-9999.ebuild2
-rw-r--r--x11-libs/libXv/Manifest2
-rw-r--r--x11-libs/libXv/libXv-9999.ebuild2
-rw-r--r--x11-libs/libXvMC/Manifest2
-rw-r--r--x11-libs/libXvMC/libXvMC-9999.ebuild2
-rw-r--r--x11-libs/libXxf86dga/Manifest2
-rw-r--r--x11-libs/libXxf86dga/libXxf86dga-9999.ebuild2
-rw-r--r--x11-libs/libXxf86misc/Manifest2
-rw-r--r--x11-libs/libXxf86misc/libXxf86misc-9999.ebuild2
-rw-r--r--x11-libs/libXxf86vm/Manifest2
-rw-r--r--x11-libs/libXxf86vm/libXxf86vm-9999.ebuild2
-rw-r--r--x11-libs/libdmx/Manifest2
-rw-r--r--x11-libs/libdmx/libdmx-9999.ebuild2
-rw-r--r--x11-libs/libdrm/Manifest2
-rw-r--r--x11-libs/libdrm/libdrm-9999.ebuild6
-rw-r--r--x11-libs/libfontenc/Manifest2
-rw-r--r--x11-libs/libfontenc/libfontenc-9999.ebuild2
-rw-r--r--x11-libs/libpciaccess/Manifest2
-rw-r--r--x11-libs/libpciaccess/libpciaccess-9999.ebuild4
-rw-r--r--x11-libs/libxcb/Manifest2
-rw-r--r--x11-libs/libxcb/libxcb-9999.ebuild4
-rw-r--r--x11-libs/libxkbfile/Manifest2
-rw-r--r--x11-libs/libxkbfile/libxkbfile-9999.ebuild2
-rw-r--r--x11-libs/libxkbui/Manifest2
-rw-r--r--x11-libs/libxkbui/libxkbui-9999.ebuild2
-rw-r--r--x11-libs/pixman/Manifest2
-rw-r--r--x11-libs/pixman/pixman-9999.ebuild4
-rw-r--r--x11-libs/xcb-util/Manifest2
-rw-r--r--x11-libs/xcb-util/xcb-util-9999.ebuild4
-rw-r--r--x11-libs/xpyb/Manifest2
-rw-r--r--x11-libs/xpyb/xpyb-9999.ebuild4
-rw-r--r--x11-libs/xtrans/Manifest2
-rw-r--r--x11-libs/xtrans/xtrans-9999.ebuild2
-rw-r--r--x11-misc/util-macros/Manifest2
-rw-r--r--x11-misc/util-macros/util-macros-9999.ebuild2
-rw-r--r--x11-misc/xcb-demo/Manifest4
-rw-r--r--x11-misc/xcb-demo/xcb-demo-0.1.ebuild2
-rw-r--r--x11-misc/xcb-demo/xcb-demo-9999.ebuild2
-rw-r--r--x11-proto/bigreqsproto/Manifest2
-rw-r--r--x11-proto/bigreqsproto/bigreqsproto-9999.ebuild2
-rw-r--r--x11-proto/calibrateproto/Manifest2
-rw-r--r--x11-proto/calibrateproto/calibrateproto-9999.ebuild2
-rw-r--r--x11-proto/compositeproto/Manifest2
-rw-r--r--x11-proto/compositeproto/compositeproto-9999.ebuild2
-rw-r--r--x11-proto/damageproto/Manifest2
-rw-r--r--x11-proto/damageproto/damageproto-9999.ebuild2
-rw-r--r--x11-proto/dmxproto/Manifest2
-rw-r--r--x11-proto/dmxproto/dmxproto-9999.ebuild2
-rw-r--r--x11-proto/dri2proto/Manifest2
-rw-r--r--x11-proto/dri2proto/dri2proto-9999.ebuild2
-rw-r--r--x11-proto/evieext/Manifest2
-rw-r--r--x11-proto/evieext/evieext-9999.ebuild2
-rw-r--r--x11-proto/fixesproto/Manifest2
-rw-r--r--x11-proto/fixesproto/fixesproto-9999.ebuild2
-rw-r--r--x11-proto/fontcacheproto/Manifest2
-rw-r--r--x11-proto/fontcacheproto/fontcacheproto-9999.ebuild2
-rw-r--r--x11-proto/fontsproto/Manifest2
-rw-r--r--x11-proto/fontsproto/fontsproto-9999.ebuild2
-rw-r--r--x11-proto/glproto/Manifest2
-rw-r--r--x11-proto/glproto/glproto-9999.ebuild6
-rw-r--r--x11-proto/inputproto/Manifest2
-rw-r--r--x11-proto/inputproto/inputproto-9999.ebuild2
-rw-r--r--x11-proto/kbproto/Manifest2
-rw-r--r--x11-proto/kbproto/kbproto-9999.ebuild2
-rw-r--r--x11-proto/lg3dproto/Manifest2
-rw-r--r--x11-proto/lg3dproto/lg3dproto-9999.ebuild2
-rw-r--r--x11-proto/printproto/Manifest2
-rw-r--r--x11-proto/printproto/printproto-9999.ebuild2
-rw-r--r--x11-proto/randrproto/Manifest2
-rw-r--r--x11-proto/randrproto/randrproto-9999.ebuild2
-rw-r--r--x11-proto/recordproto/Manifest2
-rw-r--r--x11-proto/recordproto/recordproto-9999.ebuild2
-rw-r--r--x11-proto/renderproto/Manifest2
-rw-r--r--x11-proto/renderproto/renderproto-9999.ebuild2
-rw-r--r--x11-proto/resourceproto/Manifest2
-rw-r--r--x11-proto/resourceproto/resourceproto-9999.ebuild2
-rw-r--r--x11-proto/scrnsaverproto/Manifest2
-rw-r--r--x11-proto/scrnsaverproto/scrnsaverproto-9999.ebuild2
-rw-r--r--x11-proto/trapproto/Manifest2
-rw-r--r--x11-proto/trapproto/trapproto-9999.ebuild2
-rw-r--r--x11-proto/videoproto/Manifest2
-rw-r--r--x11-proto/videoproto/videoproto-9999.ebuild2
-rw-r--r--x11-proto/xcb-proto/Manifest2
-rw-r--r--x11-proto/xcb-proto/xcb-proto-9999.ebuild2
-rw-r--r--x11-proto/xcmiscproto/Manifest2
-rw-r--r--x11-proto/xcmiscproto/xcmiscproto-9999.ebuild2
-rw-r--r--x11-proto/xextproto/Manifest2
-rw-r--r--x11-proto/xextproto/xextproto-9999.ebuild2
-rw-r--r--x11-proto/xf86bigfontproto/Manifest2
-rw-r--r--x11-proto/xf86bigfontproto/xf86bigfontproto-9999.ebuild2
-rw-r--r--x11-proto/xf86dgaproto/Manifest2
-rw-r--r--x11-proto/xf86dgaproto/xf86dgaproto-9999.ebuild2
-rw-r--r--x11-proto/xf86driproto/Manifest2
-rw-r--r--x11-proto/xf86driproto/xf86driproto-9999.ebuild2
-rw-r--r--x11-proto/xf86miscproto/Manifest2
-rw-r--r--x11-proto/xf86miscproto/xf86miscproto-9999.ebuild2
-rw-r--r--x11-proto/xf86rushproto/Manifest2
-rw-r--r--x11-proto/xf86rushproto/xf86rushproto-9999.ebuild2
-rw-r--r--x11-proto/xf86vidmodeproto/Manifest2
-rw-r--r--x11-proto/xf86vidmodeproto/xf86vidmodeproto-9999.ebuild2
-rw-r--r--x11-proto/xineramaproto/Manifest2
-rw-r--r--x11-proto/xineramaproto/xineramaproto-9999.ebuild2
-rw-r--r--x11-proto/xproto/Manifest2
-rw-r--r--x11-proto/xproto/xproto-9999.ebuild2
290 files changed, 326 insertions, 326 deletions
diff --git a/media-fonts/encodings/Manifest b/media-fonts/encodings/Manifest
index 0688782e..5f8875df 100644
--- a/media-fonts/encodings/Manifest
+++ b/media-fonts/encodings/Manifest
@@ -1,2 +1,2 @@
DIST encodings-1.0.3.tar.bz2 678895 RMD160 15ac1362cc1969d7e0101767820537d2db348d9a SHA1 615b8367ee20fc50688e4876aa250419927d64cc SHA256 07d9766d4aebe05ac572599f8f903a4fe06ab667a8182f2b6cc03e5fb3b80f53
-EBUILD encodings-1.0.3.ebuild 598 RMD160 10c11427db78d2b5e520b83a66000ada66e36065 SHA1 b1b9bba79aa05e149c60628b5ff106032f219069 SHA256 7b8d9e68b3e85d1b894ae79a9198f3334e3e4efc149914a6b0aee97f0e96787b
+EBUILD encodings-1.0.3.ebuild 604 RMD160 7949f4417001a38fd1db3d442848aafe3f617950 SHA1 44d6334167ce5b031498138097323750281c38e6 SHA256 503d39f240907d653a5b87a91fb5eed3e250e4953cb20bdf960e166081f2166a
diff --git a/media-fonts/encodings/encodings-1.0.3.ebuild b/media-fonts/encodings/encodings-1.0.3.ebuild
index d55d70c4..2085d3bd 100644
--- a/media-fonts/encodings/encodings-1.0.3.ebuild
+++ b/media-fonts/encodings/encodings-1.0.3.ebuild
@@ -6,7 +6,7 @@
#SNAPSHOT="yes"
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org font encodings"
diff --git a/media-fonts/font-adobe-100dpi/Manifest b/media-fonts/font-adobe-100dpi/Manifest
index 63432591..2989e774 100644
--- a/media-fonts/font-adobe-100dpi/Manifest
+++ b/media-fonts/font-adobe-100dpi/Manifest
@@ -1,2 +1,2 @@
DIST font-adobe-100dpi-1.0.1.tar.bz2 1119575 RMD160 b6819bb299937d8aadd5fc0e245323bdff6f1e82 SHA1 814baccf5cf6c6545b7e8f3bbbad377be369042d SHA256 a742bca8d6f8fb76b511f11c2ad2a1d326687fe9f0490a9cf64524c3782cb52c
-EBUILD font-adobe-100dpi-1.0.1.ebuild 335 RMD160 a11595fd7d738f50351da1a15cb0263caefc6eb3 SHA1 bac733736cd26791450c7ff3fe528824548b6365 SHA256 ef20d0006240e3a8fd4dad0db9f0d24a529ba8d187d02965347eb627ecadea2b
+EBUILD font-adobe-100dpi-1.0.1.ebuild 341 RMD160 132b702863511adced34d3791681e3e86f73cb59 SHA1 45aacc51dac0e1ef6574e1a342791cfd06bdb503 SHA256 5973eefd40a7ab44acdec121037a86a7906be37e2e64b7268db8e6b782607933
diff --git a/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.1.ebuild b/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.1.ebuild
index 2a1ad549..c08ab3ad 100644
--- a/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.1.ebuild
+++ b/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.1.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Adobe bitmap fonts"
diff --git a/media-fonts/font-adobe-75dpi/Manifest b/media-fonts/font-adobe-75dpi/Manifest
index c821e677..4fb8b633 100644
--- a/media-fonts/font-adobe-75dpi/Manifest
+++ b/media-fonts/font-adobe-75dpi/Manifest
@@ -1,2 +1,2 @@
DIST font-adobe-75dpi-1.0.1.tar.bz2 907258 RMD160 2e2fa02f0bc99321853a299b2a041bfe0ae1fd43 SHA1 3cbed8a4a3a6bbe6ccd3d6e07a238f8c9ab7a26c SHA256 4de51765d26b70728a8b6573be89d731be0384466290dbbb216cb05becdf9f71
-EBUILD font-adobe-75dpi-1.0.1.ebuild 335 RMD160 a11595fd7d738f50351da1a15cb0263caefc6eb3 SHA1 bac733736cd26791450c7ff3fe528824548b6365 SHA256 ef20d0006240e3a8fd4dad0db9f0d24a529ba8d187d02965347eb627ecadea2b
+EBUILD font-adobe-75dpi-1.0.1.ebuild 341 RMD160 132b702863511adced34d3791681e3e86f73cb59 SHA1 45aacc51dac0e1ef6574e1a342791cfd06bdb503 SHA256 5973eefd40a7ab44acdec121037a86a7906be37e2e64b7268db8e6b782607933
diff --git a/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.1.ebuild b/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.1.ebuild
index 2a1ad549..c08ab3ad 100644
--- a/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.1.ebuild
+++ b/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.1.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Adobe bitmap fonts"
diff --git a/media-fonts/font-adobe-utopia-100dpi/Manifest b/media-fonts/font-adobe-utopia-100dpi/Manifest
index 2160317b..04e67312 100644
--- a/media-fonts/font-adobe-utopia-100dpi/Manifest
+++ b/media-fonts/font-adobe-utopia-100dpi/Manifest
@@ -1,2 +1,2 @@
DIST font-adobe-utopia-100dpi-1.0.2.tar.bz2 349250 RMD160 9ef7c8832c821bf331124bc9651b7c87244d0b16 SHA1 e692c3d3933c47c69656be0fd0f06218c2db138d SHA256 dd8c3f5509589f9232b26273fecde2694bd2bb069c6aaa8f504ad3d24775955e
-EBUILD font-adobe-utopia-100dpi-1.0.2.ebuild 342 RMD160 0b5380d7bfeaaf127f9433bca614aa803ad47e8a SHA1 2b5708e69fa29ba87c08556341afd4e543f804ad SHA256 174f42515418bc73fdf4534d40bd1f67e736f817a6f32ce3efafa47ed24e8c45
+EBUILD font-adobe-utopia-100dpi-1.0.2.ebuild 348 RMD160 fd3b88f22571f639d6854bb9ae6399997d1876e6 SHA1 71894be042f1f190a578bc497123925a95eaca85 SHA256 2fff7e994cf73c82960065f2ad31b36b04e369aff2415278c3d4366b87688660
diff --git a/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.2.ebuild b/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.2.ebuild
index 662a9ad9..0d946cb8 100644
--- a/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.2.ebuild
+++ b/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.2.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Adobe Utopia bitmap fonts"
diff --git a/media-fonts/font-adobe-utopia-75dpi/Manifest b/media-fonts/font-adobe-utopia-75dpi/Manifest
index f5678b5e..32be419f 100644
--- a/media-fonts/font-adobe-utopia-75dpi/Manifest
+++ b/media-fonts/font-adobe-utopia-75dpi/Manifest
@@ -1,2 +1,2 @@
DIST font-adobe-utopia-75dpi-1.0.2.tar.bz2 272028 RMD160 89717b385a4eb29a345d66312906d840b88c71ba SHA1 2db08c2e0186831e4d68f7a2ffb2f9fe598a7280 SHA256 3b3ca4ba5b5b73e13b3662b5be16ea92a244adb3303a3625437ff7d385ba6557
-EBUILD font-adobe-utopia-75dpi-1.0.2.ebuild 342 RMD160 0b5380d7bfeaaf127f9433bca614aa803ad47e8a SHA1 2b5708e69fa29ba87c08556341afd4e543f804ad SHA256 174f42515418bc73fdf4534d40bd1f67e736f817a6f32ce3efafa47ed24e8c45
+EBUILD font-adobe-utopia-75dpi-1.0.2.ebuild 348 RMD160 fd3b88f22571f639d6854bb9ae6399997d1876e6 SHA1 71894be042f1f190a578bc497123925a95eaca85 SHA256 2fff7e994cf73c82960065f2ad31b36b04e369aff2415278c3d4366b87688660
diff --git a/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.2.ebuild b/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.2.ebuild
index 662a9ad9..0d946cb8 100644
--- a/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.2.ebuild
+++ b/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.2.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Adobe Utopia bitmap fonts"
diff --git a/media-fonts/font-adobe-utopia-type1/Manifest b/media-fonts/font-adobe-utopia-type1/Manifest
index 299596e0..383bb38f 100644
--- a/media-fonts/font-adobe-utopia-type1/Manifest
+++ b/media-fonts/font-adobe-utopia-type1/Manifest
@@ -1,2 +1,2 @@
DIST font-adobe-utopia-type1-1.0.2.tar.bz2 261373 RMD160 78115dc03b8308aaf131c41dc0cfc4b8d42f2eda SHA1 565cb66523f59f02da02aa9e74604634a2113643 SHA256 8c5f2752e44af6219c1b4cfc178f9721f6dd573039e973f61029136c2756e233
-EBUILD font-adobe-utopia-type1-1.0.2.ebuild 323 RMD160 2e141aff110096e606acc199b9eae478963e5a2e SHA1 fc0cd43cc69b6bf47dc66d4881aef5ff3458b3fe SHA256 43fee025b5ea3a7e8b67649289752b1a339064377af06c4974e2505b98771ed2
+EBUILD font-adobe-utopia-type1-1.0.2.ebuild 329 RMD160 55d60c43c9453ad0bbf991b58c8ae0fbbb41098c SHA1 2e5a999a5fed7c15fe7a0a24a1df82b55f40cabb SHA256 95b5acd43e20706d167c859a9f6c92b7cc19bd81202f9c5e53de86dc65a08cbb
diff --git a/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.2.ebuild b/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.2.ebuild
index 757fce98..384f8187 100644
--- a/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.2.ebuild
+++ b/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.2.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Adobe Utopia Type 1 fonts"
diff --git a/media-fonts/font-alias/Manifest b/media-fonts/font-alias/Manifest
index 725f2bb0..7c5a481b 100644
--- a/media-fonts/font-alias/Manifest
+++ b/media-fonts/font-alias/Manifest
@@ -1,2 +1,2 @@
DIST font-alias-1.0.2.tar.bz2 93678 RMD160 dd812f1ca374abf1b5e1741b1b89b174972060bb SHA1 9a0e97d974349e3a943b0ab77015f115f15d34c3 SHA256 438bd6f3f9305edb6ea9905dc92c135d6067bbd7e01df913cb3ef27162b38270
-EBUILD font-alias-1.0.2.ebuild 544 RMD160 7863a01bbe1494e0070917bd327277926a47cc95 SHA1 b80bb8833c075bd06b27c4289454434038daa603 SHA256 c351e22b5a936112cd3de0da09550e847925e091dad737e82535cb0222509b14
+EBUILD font-alias-1.0.2.ebuild 550 RMD160 1fda579f1ac8680b5819125643b297c07ab798ea SHA1 05a392ea5a5148485b4951d7fddad1c49771d598 SHA256 784ff4f4ff7ee2ba3f55c943e08118a0de8dcffc6cf58c5f5fdb1cba47ee161c
diff --git a/media-fonts/font-alias/font-alias-1.0.2.ebuild b/media-fonts/font-alias/font-alias-1.0.2.ebuild
index 9d960596..762b4156 100644
--- a/media-fonts/font-alias/font-alias-1.0.2.ebuild
+++ b/media-fonts/font-alias/font-alias-1.0.2.ebuild
@@ -6,7 +6,7 @@
#SNAPSHOT="yes"
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org font aliases"
diff --git a/media-fonts/font-arabic-misc/Manifest b/media-fonts/font-arabic-misc/Manifest
index 8cd3688c..3b04584e 100644
--- a/media-fonts/font-arabic-misc/Manifest
+++ b/media-fonts/font-arabic-misc/Manifest
@@ -1,2 +1,2 @@
DIST font-arabic-misc-1.0.1.tar.bz2 102626 RMD160 9f01329d88188b9de7a33b1d027c607d17a6db96 SHA1 d11a7bdce7500c3ccc2fe59505f2bc89e4c7aa2a SHA256 f4b0305afd47844d337a87d03aab4359b576dc36464317f86541324ee6ea6f60
-EBUILD font-arabic-misc-1.0.1.ebuild 336 RMD160 a91cf0312f3e80b015844b68270f1c5f02522a40 SHA1 a87e67cd36da589af2b2f4783e59bc5efc8dbab0 SHA256 00d0f9f2f04f61b77656d4de766d886d0cb467be6590c6d88644fcdbfe15d206
+EBUILD font-arabic-misc-1.0.1.ebuild 342 RMD160 d137dc8bafe30556c4b548b98dea5a576b23967c SHA1 e57b63842e1ba88739af15394db8b9fd5bd3aac6 SHA256 0308b77871fcdd57db1b099a85c3194e3c7d8b08fd9a4b4778db6eea94a3a4ab
diff --git a/media-fonts/font-arabic-misc/font-arabic-misc-1.0.1.ebuild b/media-fonts/font-arabic-misc/font-arabic-misc-1.0.1.ebuild
index d7779321..b2449b49 100644
--- a/media-fonts/font-arabic-misc/font-arabic-misc-1.0.1.ebuild
+++ b/media-fonts/font-arabic-misc/font-arabic-misc-1.0.1.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org arabic bitmap fonts"
diff --git a/media-fonts/font-bh-100dpi/Manifest b/media-fonts/font-bh-100dpi/Manifest
index b4ffb083..35747915 100644
--- a/media-fonts/font-bh-100dpi/Manifest
+++ b/media-fonts/font-bh-100dpi/Manifest
@@ -1,2 +1,2 @@
DIST font-bh-100dpi-1.0.1.tar.bz2 724728 RMD160 8d50039d83948c9a5bd5899c0aa6af22aca89f4a SHA1 4f3edda5dd35145cbd1ce8759e0a999b3a04f9c0 SHA256 c46d68487b09993266f34ac87a47e035af8a3f42c38f33d26ff18ac0c31c3397
-EBUILD font-bh-100dpi-1.0.1.ebuild 346 RMD160 b36098ab558a9e3308373deff6ef7a62b67968c0 SHA1 faf165cc92cd5a17803cc9d7b409b1356dead135 SHA256 32eb80cdce2bc23f01e2e3f142ba3cf58bba26fef6c846f68d217d738b3a4cd3
+EBUILD font-bh-100dpi-1.0.1.ebuild 352 RMD160 aa653a93bb1fc2bf16338ac8740960eef1080a1f SHA1 dd31a781486807cf681f1973090dd8dbed3810c6 SHA256 841383b39e66869a83ec7bcac8b69a12f0b17e1c5f6026c0cf59d265ebecda08
diff --git a/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.1.ebuild b/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.1.ebuild
index 63af520f..56f94227 100644
--- a/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.1.ebuild
+++ b/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.1.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Bigelow & Holmes bitmap fonts"
diff --git a/media-fonts/font-bh-75dpi/Manifest b/media-fonts/font-bh-75dpi/Manifest
index 8c92d0ca..8cafe65b 100644
--- a/media-fonts/font-bh-75dpi/Manifest
+++ b/media-fonts/font-bh-75dpi/Manifest
@@ -1,2 +1,2 @@
DIST font-bh-75dpi-1.0.1.tar.bz2 556208 RMD160 a7d2657be2432eedaece5a957e20ffb2ebafc70f SHA1 7b891d5bfd966c405c19574bca8f87b8803146d1 SHA256 8a3175a977f169f0882054ac5bf86c97bfee1dc031415092f75b2cfb57b69d40
-EBUILD font-bh-75dpi-1.0.1.ebuild 346 RMD160 b36098ab558a9e3308373deff6ef7a62b67968c0 SHA1 faf165cc92cd5a17803cc9d7b409b1356dead135 SHA256 32eb80cdce2bc23f01e2e3f142ba3cf58bba26fef6c846f68d217d738b3a4cd3
+EBUILD font-bh-75dpi-1.0.1.ebuild 352 RMD160 aa653a93bb1fc2bf16338ac8740960eef1080a1f SHA1 dd31a781486807cf681f1973090dd8dbed3810c6 SHA256 841383b39e66869a83ec7bcac8b69a12f0b17e1c5f6026c0cf59d265ebecda08
diff --git a/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.1.ebuild b/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.1.ebuild
index 63af520f..56f94227 100644
--- a/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.1.ebuild
+++ b/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.1.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Bigelow & Holmes bitmap fonts"
diff --git a/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest b/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest
index 5e5a40ea..aaab42b5 100644
--- a/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest
+++ b/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest
@@ -1,2 +1,2 @@
DIST font-bh-lucidatypewriter-100dpi-1.0.1.tar.bz2 243386 RMD160 9264aaf3c555b4df8aa2d5e179b5145f8a4dd823 SHA1 a1c9d28a619358092f7196473ff3e0f0dc5304d0 SHA256 8156f7c4e5a3fbd478c287154c7e3c55c6631c148a7b185f604753d118018da9
-EBUILD font-bh-lucidatypewriter-100dpi-1.0.1.ebuild 353 RMD160 897c031a75d974aba8d62457bb70f6874832c54c SHA1 20ca3f4b6becae953ed6737bf080a0a67b1110c0 SHA256 5a9862690194845f5da7d7ecca06819697a31a2bd728c1cd50e9d0f3e2533558
+EBUILD font-bh-lucidatypewriter-100dpi-1.0.1.ebuild 359 RMD160 f79fa2d6ae71b9fe6261deb970e53dee30ad487b SHA1 bb54afd45774b529fff479c86688f940a9f84d66 SHA256 d38b026eb56d7b3a00bf7b8a5ce514fcb4be7870aa223e201e444fdf2ea94cf0
diff --git a/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.1.ebuild b/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.1.ebuild
index b759c8c8..10040cd7 100644
--- a/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.1.ebuild
+++ b/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.1.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Bigelow & Holmes Lucida bitmap fonts"
diff --git a/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest b/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest
index 2f5d2ea4..dc82f0e2 100644
--- a/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest
+++ b/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest
@@ -1,2 +1,2 @@
DIST font-bh-lucidatypewriter-75dpi-1.0.1.tar.bz2 212451 RMD160 0230cbdafe6823afe414b3aba01ba486962fa7e8 SHA1 26efd25d2802c8406a96ccc3240b2c14e511d49f SHA256 20ff9c5914c6916c96647eeb3ba700468952fdf01925e62516219a7dd6eb3841
-EBUILD font-bh-lucidatypewriter-75dpi-1.0.1.ebuild 353 RMD160 897c031a75d974aba8d62457bb70f6874832c54c SHA1 20ca3f4b6becae953ed6737bf080a0a67b1110c0 SHA256 5a9862690194845f5da7d7ecca06819697a31a2bd728c1cd50e9d0f3e2533558
+EBUILD font-bh-lucidatypewriter-75dpi-1.0.1.ebuild 359 RMD160 f79fa2d6ae71b9fe6261deb970e53dee30ad487b SHA1 bb54afd45774b529fff479c86688f940a9f84d66 SHA256 d38b026eb56d7b3a00bf7b8a5ce514fcb4be7870aa223e201e444fdf2ea94cf0
diff --git a/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.1.ebuild b/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.1.ebuild
index b759c8c8..10040cd7 100644
--- a/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.1.ebuild
+++ b/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.1.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Bigelow & Holmes Lucida bitmap fonts"
diff --git a/media-fonts/font-bh-ttf/Manifest b/media-fonts/font-bh-ttf/Manifest
index 496b45ec..8ebab285 100644
--- a/media-fonts/font-bh-ttf/Manifest
+++ b/media-fonts/font-bh-ttf/Manifest
@@ -1,2 +1,2 @@
DIST font-bh-ttf-1.0.1.tar.bz2 453024 RMD160 92e640640521066cbe2108f60ed84d87ade8f438 SHA1 0e9ffbc738072ca832cdf5f82bff071c67b71825 SHA256 1ce72f84a6c4df7f0e949f915346026ebfeaa5b2e47f7bbc29117ebbf3a7a7c8
-EBUILD font-bh-ttf-1.0.1.ebuild 335 RMD160 752d157af7b691e09734ee9ff068ca69bdcfaa29 SHA1 d7cf065c6bedaa766e8eff4ce14e8a8d1230cd29 SHA256 c67492ef7840b67a623c70d49956ca427aab84001fe919f2a3ae1ea0e82f864a
+EBUILD font-bh-ttf-1.0.1.ebuild 341 RMD160 4a3d4ee36d8e3f5cd6ec48558b33ae9c39aaff4a SHA1 396267dec4600ec000b57c0b5117966d2074b12a SHA256 57f46a00ce0cabb23f89004dcd0225a517ec9ff44c6b843d220517b5fd5f1042
diff --git a/media-fonts/font-bh-ttf/font-bh-ttf-1.0.1.ebuild b/media-fonts/font-bh-ttf/font-bh-ttf-1.0.1.ebuild
index 42c5b21a..1dd7e833 100644
--- a/media-fonts/font-bh-ttf/font-bh-ttf-1.0.1.ebuild
+++ b/media-fonts/font-bh-ttf/font-bh-ttf-1.0.1.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Bigelow & Holmes TrueType fonts"
diff --git a/media-fonts/font-bh-type1/Manifest b/media-fonts/font-bh-type1/Manifest
index e8c2bdd0..7f496762 100644
--- a/media-fonts/font-bh-type1/Manifest
+++ b/media-fonts/font-bh-type1/Manifest
@@ -1,2 +1,2 @@
DIST font-bh-type1-1.0.1.tar.bz2 634075 RMD160 1cfd0ed361bd8a4ac360d8922e0f8fa115c2b9e2 SHA1 b960d8523b02d4401dc6e1257f68dc120761ee4b SHA256 da3b5f26c6cde0baf3831f50c79a7a107806f885e0205073855bfbc5a357bb45
-EBUILD font-bh-type1-1.0.1.ebuild 327 RMD160 6471f6b7ffec83e4878d6c3225b5813e0a21db41 SHA1 4701cef0abd5027d2b2575a91af83c76516822e7 SHA256 38c10dfca643242267291ad86c09758fcb0c8c5d3bd0e7d3ce051578878e5563
+EBUILD font-bh-type1-1.0.1.ebuild 333 RMD160 8c74e3be9be26c43a3a7ea502a647d934dd5b319 SHA1 436856fc30e6ed6c7abbba00f1df1d17e44ffd86 SHA256 f3e134343b92462e36bf512e1efd65174142b038e7bca1356ac9e2250987a35f
diff --git a/media-fonts/font-bh-type1/font-bh-type1-1.0.1.ebuild b/media-fonts/font-bh-type1/font-bh-type1-1.0.1.ebuild
index 2e9e7369..c7be757d 100644
--- a/media-fonts/font-bh-type1/font-bh-type1-1.0.1.ebuild
+++ b/media-fonts/font-bh-type1/font-bh-type1-1.0.1.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Bigelow & Holmes Type 1 fonts"
diff --git a/media-fonts/font-bitstream-100dpi/Manifest b/media-fonts/font-bitstream-100dpi/Manifest
index 5d0e1dc5..d0281e6b 100644
--- a/media-fonts/font-bitstream-100dpi/Manifest
+++ b/media-fonts/font-bitstream-100dpi/Manifest
@@ -1,2 +1,2 @@
DIST font-bitstream-100dpi-1.0.1.tar.bz2 191682 RMD160 46d19355f5ce392f70ab623929cf8f874a3f4d1b SHA1 ba163df365a591de5eb9e45fa302059d572dd171 SHA256 3e05c9b74d0dc00e6e46ec758888e66514ab24fc75930877d4ba6db7d49f0347
-EBUILD font-bitstream-100dpi-1.0.1.ebuild 339 RMD160 da69b0a568cfc5061842025bf82261e45e1fe537 SHA1 a86dd4e14970bb5af2c4525d787bb14ec53e0800 SHA256 09d0125fccb88c8861ab6fd4484254c45ee294ef322e270d935afe2909d8b119
+EBUILD font-bitstream-100dpi-1.0.1.ebuild 345 RMD160 2a4814f4993ec446839f4f453b2b863903362baf SHA1 87f5ebc7d691032ce8c5e5a9cde847ad70707386 SHA256 b0e058dfe2cfc9f85b5de7b94ad00a952502948c5b2baebc49a930de3cd8cf43
diff --git a/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.1.ebuild b/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.1.ebuild
index 9cea1b40..e98f8faa 100644
--- a/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.1.ebuild
+++ b/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.1.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Bitstream bitmap fonts"
diff --git a/media-fonts/font-bitstream-75dpi/Manifest b/media-fonts/font-bitstream-75dpi/Manifest
index db2bf20e..71aa56bb 100644
--- a/media-fonts/font-bitstream-75dpi/Manifest
+++ b/media-fonts/font-bitstream-75dpi/Manifest
@@ -1,2 +1,2 @@
DIST font-bitstream-75dpi-1.0.1.tar.bz2 165702 RMD160 4de10dbcf141e491978a742e0d456b41c04c8799 SHA1 43344b8ff3b2c2fda8d4cdbcc12c0688b2e04789 SHA256 cf9e1cb1c21517a566e5678791778d40c7c915d792bd29d319928f4e4234662b
-EBUILD font-bitstream-75dpi-1.0.1.ebuild 339 RMD160 da69b0a568cfc5061842025bf82261e45e1fe537 SHA1 a86dd4e14970bb5af2c4525d787bb14ec53e0800 SHA256 09d0125fccb88c8861ab6fd4484254c45ee294ef322e270d935afe2909d8b119
+EBUILD font-bitstream-75dpi-1.0.1.ebuild 345 RMD160 2a4814f4993ec446839f4f453b2b863903362baf SHA1 87f5ebc7d691032ce8c5e5a9cde847ad70707386 SHA256 b0e058dfe2cfc9f85b5de7b94ad00a952502948c5b2baebc49a930de3cd8cf43
diff --git a/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.1.ebuild b/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.1.ebuild
index 9cea1b40..e98f8faa 100644
--- a/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.1.ebuild
+++ b/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.1.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Bitstream bitmap fonts"
diff --git a/media-fonts/font-bitstream-speedo/Manifest b/media-fonts/font-bitstream-speedo/Manifest
index e92c43bb..238ca919 100644
--- a/media-fonts/font-bitstream-speedo/Manifest
+++ b/media-fonts/font-bitstream-speedo/Manifest
@@ -1,2 +1,2 @@
DIST font-bitstream-speedo-1.0.1.tar.bz2 391739 RMD160 bcb192dc19d6f7e26a4e39c0efd6974fb3f1b01e SHA1 067fb092241b4bd8978190a01959012c8f176638 SHA256 3d231566856c754f48f568f41c15376730d45d9c3ffd37e1d2476097519f22b8
-EBUILD font-bitstream-speedo-1.0.1.ebuild 314 RMD160 bca4492d1cda42506fc68fcb6a3cbcd69ae2fb8d SHA1 8f4d3a9ddaf53d60b4557eb65694bd3d0c32b6e9 SHA256 6e2579b99af0bb473dfb9c3e92591a6f5691d278ab57aca3d991bf859d5a8306
+EBUILD font-bitstream-speedo-1.0.1.ebuild 320 RMD160 3bff76490fb5475456f4ebd1c30b48b87ddb298f SHA1 da98dee8b7a4e0d944de4600c06140bc0133d50c SHA256 f5456cbf1859b9d66ef624d5cfcbffa8b9836810bcaab72895924e43ea0d6398
diff --git a/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.1.ebuild b/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.1.ebuild
index ee1a3c51..9868e5e6 100644
--- a/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.1.ebuild
+++ b/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.1.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="Bitstream Speedo fonts"
diff --git a/media-fonts/font-bitstream-type1/Manifest b/media-fonts/font-bitstream-type1/Manifest
index c18e6310..2cd4bc43 100644
--- a/media-fonts/font-bitstream-type1/Manifest
+++ b/media-fonts/font-bitstream-type1/Manifest
@@ -1,2 +1,2 @@
DIST font-bitstream-type1-1.0.1.tar.bz2 407819 RMD160 421e1fc0fcdc519b0599fbe7d683d1640893560a SHA1 53800b904fc3ead6b577a34fb7c1f96c1af4423f SHA256 51027cc1d49140153620c1a2b653f1773fe92cb694b221396d68265343e113ab
-EBUILD font-bitstream-type1-1.0.1.ebuild 326 RMD160 165c03c7845a091a4bbbd3cba840fd8ba219242e SHA1 31fc6f46e56e0ea9858f93f0eedae934441233d0 SHA256 a41bac40c3600583fa38cdb027dbf9598429434b5bc4a411198ee79bce1d6a8b
+EBUILD font-bitstream-type1-1.0.1.ebuild 332 RMD160 f6973b5a1a97cd9081d2337c5bc3ae1c274cda72 SHA1 9bb208449b4b4512e3b355f3e7f46ee6e7a2fa73 SHA256 b110506a51b912861aab9419de0fe4dca40b37e3799591076eb16dda54a044e7
diff --git a/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.1.ebuild b/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.1.ebuild
index b1d466d0..92c22893 100644
--- a/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.1.ebuild
+++ b/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.1.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Bitstream Type 1 fonts"
diff --git a/media-fonts/font-cronyx-cyrillic/Manifest b/media-fonts/font-cronyx-cyrillic/Manifest
index 2725bdca..143d3de5 100644
--- a/media-fonts/font-cronyx-cyrillic/Manifest
+++ b/media-fonts/font-cronyx-cyrillic/Manifest
@@ -1,2 +1,2 @@
DIST font-cronyx-cyrillic-1.0.1.tar.bz2 257247 RMD160 4f8a544690f46f2aaba6871011897e72b571e317 SHA1 dfff5974629dab97677a70fa20e21c2cf48071a0 SHA256 f7b43a428afe3111513e8ff0ebccc00fbddf2b57cec261ad9017d582fc9a3422
-EBUILD font-cronyx-cyrillic-1.0.1.ebuild 338 RMD160 3ec7fa5e7b1094b4896a78ff9e9555460fd3a4b2 SHA1 ed7403c1bef76ce990ee7f8dbc0cd5cc889a76e6 SHA256 969e5de50077907bf97aa0ef6ee03d07c5dc8df4a649c2282b983932cd8e5dff
+EBUILD font-cronyx-cyrillic-1.0.1.ebuild 344 RMD160 18a492a28f765daf534cdc063af3c08544dcbaa5 SHA1 028fd012a57f0fe7f6f1842dfd1bb3c6431706ce SHA256 d345875e4d606944f72fc45179344cb039e4c0c162cd9a625c1206e11a4d2c95
diff --git a/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.1.ebuild b/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.1.ebuild
index 3d69ab55..03e1437a 100644
--- a/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.1.ebuild
+++ b/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.1.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Cronyx cyrillic fonts"
diff --git a/media-fonts/font-cursor-misc/Manifest b/media-fonts/font-cursor-misc/Manifest
index adc39585..49e38053 100644
--- a/media-fonts/font-cursor-misc/Manifest
+++ b/media-fonts/font-cursor-misc/Manifest
@@ -1,2 +1,2 @@
DIST font-cursor-misc-1.0.1.tar.bz2 92547 RMD160 c8c4d9a319eb97aa4b43290d739660947900dac8 SHA1 5087a94e74f8157cb6989f71fb3b4815b236065a SHA256 deee02861beaa335448e9aba4320c88c30a174bc3dcfb05a434b4ddb137dc1b3
-EBUILD font-cursor-misc-1.0.1.ebuild 328 RMD160 2201cb1bdfbd86f35266f08634d05996280d98e9 SHA1 b4dbed3329e58ca0538f9c298685d3b1767acdd3 SHA256 d32a12d4dd0e723fcfeab99f50ee537fbe1c5a8dab7d6b48d952816b053e64b0
+EBUILD font-cursor-misc-1.0.1.ebuild 334 RMD160 dcccdb61a237e43653893b955635d8a0f1f9b0ac SHA1 2747aa837cdaae5e018f364a0c0c2814b92bad33 SHA256 e26e4783195bdf9dbe84d75356042c9e1ce9e44d58efe3a625a87370793827eb
diff --git a/media-fonts/font-cursor-misc/font-cursor-misc-1.0.1.ebuild b/media-fonts/font-cursor-misc/font-cursor-misc-1.0.1.ebuild
index 55232f0a..dc34a99f 100644
--- a/media-fonts/font-cursor-misc/font-cursor-misc-1.0.1.ebuild
+++ b/media-fonts/font-cursor-misc/font-cursor-misc-1.0.1.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org cursor font"
diff --git a/media-fonts/font-daewoo-misc/Manifest b/media-fonts/font-daewoo-misc/Manifest
index 74fbf9e6..c857bbab 100644
--- a/media-fonts/font-daewoo-misc/Manifest
+++ b/media-fonts/font-daewoo-misc/Manifest
@@ -1,2 +1,2 @@
DIST font-daewoo-misc-1.0.1.tar.bz2 735182 RMD160 eb5ba38f04605c33e1b9085febbcdb6afe5fb14a SHA1 d169cec4e92fe1e99f3ff6766d4c6edcbb808860 SHA256 e2283e4280c66fec7c986f0b4a476811f3419b9517280cd8b59a01563de6e491
-EBUILD font-daewoo-misc-1.0.1.ebuild 329 RMD160 705be04dbbde5de33a7c7e80ae4e5714a2f1a321 SHA1 ac9a6fbfaa6ccdd0ee7f2ab109f6e2f1d97ae7ed SHA256 d09dcf084de7e34ab38a8f0e2179c6cbc5f75a40b65baf76a6ddb9427f51a4ff
+EBUILD font-daewoo-misc-1.0.1.ebuild 335 RMD160 f498346a3cee07f39341b2090b579a41e594eb03 SHA1 3a766d9aa3d4f2f4a39b2c40d8d3190888dd911f SHA256 517ab0ebf6c2fe7efdc5540f81f72e1597e891e1a7c40c3dc1eb90c7c89325c7
diff --git a/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.1.ebuild b/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.1.ebuild
index ddb63cf1..1065ffac 100644
--- a/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.1.ebuild
+++ b/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.1.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Daewoo fonts"
diff --git a/media-fonts/font-dec-misc/Manifest b/media-fonts/font-dec-misc/Manifest
index 20dfe920..755752ec 100644
--- a/media-fonts/font-dec-misc/Manifest
+++ b/media-fonts/font-dec-misc/Manifest
@@ -1,2 +1,2 @@
DIST font-dec-misc-1.0.1.tar.bz2 90258 RMD160 2b1eed83b7a96a12c756ac74a753c2691b3f5a0b SHA1 2489d19650f2a787b476dab2fa2412d20b95f38e SHA256 fb20da4afddc07e236e830939de0fdfc9a93c5c1c7048fafe669fac19b496552
-EBUILD font-dec-misc-1.0.1.ebuild 326 RMD160 8c9c3c8691ac95291e7075397e841572e83f6000 SHA1 a224f70d4d7e60d76555e1e7ea6fb84d985f0cc0 SHA256 0012bfbb2fe48131375f9b8da66d7cd58b11352cd20e91b92366b5e4bfbdb303
+EBUILD font-dec-misc-1.0.1.ebuild 332 RMD160 753b41783be1c0b96f4e23cf8aa950d4e1a06938 SHA1 179b1ae43dc01cdfe7ab717be341fa05108f9acc SHA256 1779692a2005e4ec69737d145f16e7ec5493966b05389b711dbdf65dcea3f7bd
diff --git a/media-fonts/font-dec-misc/font-dec-misc-1.0.1.ebuild b/media-fonts/font-dec-misc/font-dec-misc-1.0.1.ebuild
index 35f95e3d..9466c330 100644
--- a/media-fonts/font-dec-misc/font-dec-misc-1.0.1.ebuild
+++ b/media-fonts/font-dec-misc/font-dec-misc-1.0.1.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org DEC fonts"
diff --git a/media-fonts/font-ibm-type1/Manifest b/media-fonts/font-ibm-type1/Manifest
index 4344192e..07d782b2 100644
--- a/media-fonts/font-ibm-type1/Manifest
+++ b/media-fonts/font-ibm-type1/Manifest
@@ -1,2 +1,2 @@
DIST font-ibm-type1-1.0.1.tar.bz2 375779 RMD160 258a37bb63376785ce46f72d7ad4f9930ea672df SHA1 9bcf72bcabfcbe218ad3a96ba2a45e92ef9efbc3 SHA256 887ea895cc0fdd5c50d4960aee7cb6ed813cf90f53b53ce0e0e068dd606cc919
-EBUILD font-ibm-type1-1.0.1.ebuild 314 RMD160 79e1d45074a017afe36afb3dfb38aa9516af14bc SHA1 cf81b5776bdb615000ef51faae0c0a881b6e8890 SHA256 b69b52746cb99acce2ce3e25eb9eaf0cd12ceff9ff53a9ccd14926bb21beb292
+EBUILD font-ibm-type1-1.0.1.ebuild 320 RMD160 df03ac60b0fd8af506d78988c3880e87244c3b05 SHA1 bcab089e2d572c02828805799ec2ffd90ae50b20 SHA256 bad76a606e3a04c8dd949b2770c2f8f654a7b6a3971af3ee44ccd1e3a0dc737b
diff --git a/media-fonts/font-ibm-type1/font-ibm-type1-1.0.1.ebuild b/media-fonts/font-ibm-type1/font-ibm-type1-1.0.1.ebuild
index 0f090c37..4b4405c8 100644
--- a/media-fonts/font-ibm-type1/font-ibm-type1-1.0.1.ebuild
+++ b/media-fonts/font-ibm-type1/font-ibm-type1-1.0.1.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org IBM Courier font"
diff --git a/media-fonts/font-isas-misc/Manifest b/media-fonts/font-isas-misc/Manifest
index fa607a8f..fd563e18 100644
--- a/media-fonts/font-isas-misc/Manifest
+++ b/media-fonts/font-isas-misc/Manifest
@@ -1,2 +1,2 @@
DIST font-isas-misc-1.0.1.tar.bz2 842788 RMD160 6411592ad4a1dc69fed307f0c8f9e8840dd03bc3 SHA1 13fe07a669dd93dfdb08717a03efe47936ab9cea SHA256 52fe0469eb91e94dc7a0e8164e947fee439f398b0eb63c210f682524f12cea7b
-EBUILD font-isas-misc-1.0.1.ebuild 375 RMD160 13cdf905b98655777bcbf9764d8673ed5127e078 SHA1 1726dc211fe46066e7410877f8b27dd2cb18c25c SHA256 9182b3b529b22f9a44ed30a62747d1d538237c97d8f3ae9107f0aea073c72ae1
+EBUILD font-isas-misc-1.0.1.ebuild 381 RMD160 85bb6896e366fcc43895f3c69c295e8d416ed12b SHA1 d9e8ab57032ad98432b00102b80601daa8fdf44a SHA256 fda6816b3c4d9c53b11b956fa75514913d951efbe68276df434ff4fc652ec03a
diff --git a/media-fonts/font-isas-misc/font-isas-misc-1.0.1.ebuild b/media-fonts/font-isas-misc/font-isas-misc-1.0.1.ebuild
index aa5bc68f..237e3a5f 100644
--- a/media-fonts/font-isas-misc/font-isas-misc-1.0.1.ebuild
+++ b/media-fonts/font-isas-misc/font-isas-misc-1.0.1.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org the Institute of Software, Academia Sinica (chinese) fonts"
diff --git a/media-fonts/font-jis-misc/Manifest b/media-fonts/font-jis-misc/Manifest
index 6fa39420..358162ad 100644
--- a/media-fonts/font-jis-misc/Manifest
+++ b/media-fonts/font-jis-misc/Manifest
@@ -1,2 +1,2 @@
DIST font-jis-misc-1.0.1.tar.bz2 625454 RMD160 087be1cb7c266a08435fa17fa5b26c81fc55886c SHA1 adb3275d19e71e9553aa8a5fdc3b2c647277d8d4 SHA256 a63b98c204395b61949214db199c38094489336731d4a4179eb053a5bb54e8cf
-EBUILD font-jis-misc-1.0.1.ebuild 575 RMD160 b41deaf5ecc4dd8b37bc41115561c45dbc4f161c SHA1 a9d929ea50415ba2d50164ca832571febf1df51e SHA256 df5bc5edea50ff0f90467adcdd9f0a7b4f19f92539c33100cae396f30e4e12d4
+EBUILD font-jis-misc-1.0.1.ebuild 581 RMD160 c84ede7e67e4e0b127883b859a3d5d628d90ff53 SHA1 37b7ddc216271f29d91272c51750c4d3cfae9ed9 SHA256 2e16744388b5ba69dcf53ed57a3c9f6d517ce818202e024362c5eba491115396
diff --git a/media-fonts/font-jis-misc/font-jis-misc-1.0.1.ebuild b/media-fonts/font-jis-misc/font-jis-misc-1.0.1.ebuild
index d6ac3129..cc66c1c0 100644
--- a/media-fonts/font-jis-misc/font-jis-misc-1.0.1.ebuild
+++ b/media-fonts/font-jis-misc/font-jis-misc-1.0.1.ebuild
@@ -6,7 +6,7 @@
#SNAPSHOT="yes"
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org JIS (japanese) fonts"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/media-fonts/font-micro-misc/Manifest b/media-fonts/font-micro-misc/Manifest
index 086b6606..f8621454 100644
--- a/media-fonts/font-micro-misc/Manifest
+++ b/media-fonts/font-micro-misc/Manifest
@@ -1,2 +1,2 @@
DIST font-micro-misc-1.0.1.tar.bz2 88847 RMD160 2158bde602bba1572e0c09e7424db301f947e196 SHA1 74a8be2b0b6ace97d8841356e88570f5fa3faad6 SHA256 a5b987ea38bf53f63968a6cad1c052ca6d0fc678d9409c1953701f0159e4972b
-EBUILD font-micro-misc-1.0.1.ebuild 356 RMD160 6833de9d6004c944886da07a787253f8aef670aa SHA1 92d7722319094381c700c6554a80e66a8f1fa1ed SHA256 074a8d94fdd8559dd3e970f8680fe014b14dd6922259275f272267cb86864b20
+EBUILD font-micro-misc-1.0.1.ebuild 362 RMD160 5900b7338b89280c530247126e457b8229b5e0d9 SHA1 ee7b57805b304f8d2df9d94d01687cb63e920214 SHA256 44731a9c597e92e86cf83aa0cd092dfdafad953676432bfbb82da3e76a5ca2df
diff --git a/media-fonts/font-micro-misc/font-micro-misc-1.0.1.ebuild b/media-fonts/font-micro-misc/font-micro-misc-1.0.1.ebuild
index 86fbf7b6..300ab53f 100644
--- a/media-fonts/font-micro-misc/font-micro-misc-1.0.1.ebuild
+++ b/media-fonts/font-micro-misc/font-micro-misc-1.0.1.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org micro-misc font"
LICENSE="public-domain"
diff --git a/media-fonts/font-misc-cyrillic/Manifest b/media-fonts/font-misc-cyrillic/Manifest
index 93c9cd60..b8855488 100644
--- a/media-fonts/font-misc-cyrillic/Manifest
+++ b/media-fonts/font-misc-cyrillic/Manifest
@@ -1,2 +1,2 @@
DIST font-misc-cyrillic-1.0.1.tar.bz2 116626 RMD160 9f2666dd2673386fc902fff3f9b5ef7e204d5a1b SHA1 c178f8a8b6897a8382a0f4315a5b577760ba703c SHA256 dafafbfd93d95820449972fd86ec312266eb73e5297966ee6e0163d294d8af75
-EBUILD font-misc-cyrillic-1.0.1.ebuild 336 RMD160 2bdd6c136423809b8d01552c3ce9877e796a8aab SHA1 d9d5b5eb2db6aa51e1108fef92b70a1ec7c92684 SHA256 ebefae6c168ad129322096010a1655dd2045554133a78dae9af45c10f94d4a37
+EBUILD font-misc-cyrillic-1.0.1.ebuild 342 RMD160 fd1b6ac499bd6e95d29893973edb264840370c4a SHA1 49c9b1bae03de1eea5570583a6378038990a1884 SHA256 a5701e7d47fa093e2d34a5461ddff91ecadf4f96dabb704243c31f2a929cd2fe
diff --git a/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.1.ebuild b/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.1.ebuild
index 4b18d988..42ef0d7f 100644
--- a/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.1.ebuild
+++ b/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.1.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org misc-cyrillic fonts"
diff --git a/media-fonts/font-misc-ethiopic/Manifest b/media-fonts/font-misc-ethiopic/Manifest
index ab8aa449..031ec5f8 100644
--- a/media-fonts/font-misc-ethiopic/Manifest
+++ b/media-fonts/font-misc-ethiopic/Manifest
@@ -1,2 +1,2 @@
DIST font-misc-ethiopic-1.0.1.tar.bz2 235856 RMD160 af4cf0787335ac2ad75f03717391ec8a70d3002b SHA1 2677191fd8b515c53bde6402513249fc0f48d53a SHA256 bf3b3a994b6c4047b2d79f590e7113ed429b8b7a83992cb753a83e6e8bd3d948
-EBUILD font-misc-ethiopic-1.0.1.ebuild 461 RMD160 af30ee827fc3c2d0f02a11afd164d29ddc1f9f7c SHA1 dd7c111d3358ee1b63f60de84addbb46bb06d87b SHA256 a34d20fe43122bdc5052f3a31fc4cc20c136a7e913dfc80df964fafe505237fe
+EBUILD font-misc-ethiopic-1.0.1.ebuild 467 RMD160 f5905f0efe949a285c38ec32da78ed01cec490a0 SHA1 7570de6ab9935b73f0ff3e95b4f8dcd45623872d SHA256 6d02f9090e2d76ee5b82781c7838b39b10ed21540fa1d25a4dcb2b39933ff268
diff --git a/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.1.ebuild b/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.1.ebuild
index e9b5e818..2bd942b4 100644
--- a/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.1.ebuild
+++ b/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.1.ebuild
@@ -5,7 +5,7 @@
FONT_DIR="TTF OTF"
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="Miscellaneous Ethiopic fonts"
diff --git a/media-fonts/font-misc-meltho/Manifest b/media-fonts/font-misc-meltho/Manifest
index b9c9e5e2..9687e0a3 100644
--- a/media-fonts/font-misc-meltho/Manifest
+++ b/media-fonts/font-misc-meltho/Manifest
@@ -1,2 +1,2 @@
DIST font-misc-meltho-1.0.1.tar.bz2 1547638 RMD160 5f354563d43de112fc90e1f1c0052a748f08787c SHA1 d20d9f8ffdeb88b62842b021d5d3d2a8cc31ea2c SHA256 5366d7a0f38a189e504676a9cddd8430113f9957919f0a3dc181bcaaaed92618
-EBUILD font-misc-meltho-1.0.1.ebuild 351 RMD160 160df469b969f1f4362f9600c3607f04364eacc2 SHA1 aa9824546ee941fd9e6eaa53a592dd85764bd797 SHA256 019d418befed92491f22b299797544019a3439681269b059423a8f32224dd9ce
+EBUILD font-misc-meltho-1.0.1.ebuild 357 RMD160 c4ef6f5c705c542259dafa7169246b4a76f54d9e SHA1 0a68303199ed826ae026774933408e6b3cef7975 SHA256 91268d442cbff3ddab9b220672a33bb6502229cf34804138fd63b4084b7105a9
diff --git a/media-fonts/font-misc-meltho/font-misc-meltho-1.0.1.ebuild b/media-fonts/font-misc-meltho/font-misc-meltho-1.0.1.ebuild
index 98bf0289..c632ab6f 100644
--- a/media-fonts/font-misc-meltho/font-misc-meltho-1.0.1.ebuild
+++ b/media-fonts/font-misc-meltho/font-misc-meltho-1.0.1.ebuild
@@ -5,7 +5,7 @@
FONT_DIR="OTF"
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Syriac fonts"
diff --git a/media-fonts/font-misc-misc/Manifest b/media-fonts/font-misc-misc/Manifest
index 48e6df4f..d8b54464 100644
--- a/media-fonts/font-misc-misc/Manifest
+++ b/media-fonts/font-misc-misc/Manifest
@@ -1,2 +1,2 @@
DIST font-misc-misc-1.1.0.tar.bz2 1929783 RMD160 bb8c17dac00265a40221323c0b1a67f04cab315b SHA1 83c44111b5727c26e52eb915b66dc6c9eba4c458 SHA256 50f7528ab94f319a11efcd555dd5a7120191a42cf892c87cd6bdea8b908d497b
-EBUILD font-misc-misc-1.1.0.ebuild 336 RMD160 e91010e8aa032b1fdbd5af6539a0969f2ebb0f37 SHA1 ad59740323bd038e6645d5bb7e856f333147c22f SHA256 11e932d5e625d24c7ee9bd00e22259f8724b12d07379ad6ffa9ea0abba5c46dc
+EBUILD font-misc-misc-1.1.0.ebuild 342 RMD160 8f724bb0d5f7d52c5225efc9ecda523a6bdfae9c SHA1 b64e8cd0ad0605236e2db013c3cb845d186f42e5 SHA256 9263edc4c18c76c3499a3ecb1e3a0416e6eff10545e2bef395dc7dab0d3831c6
diff --git a/media-fonts/font-misc-misc/font-misc-misc-1.1.0.ebuild b/media-fonts/font-misc-misc/font-misc-misc-1.1.0.ebuild
index b7cba966..15ae6556 100644
--- a/media-fonts/font-misc-misc/font-misc-misc-1.1.0.ebuild
+++ b/media-fonts/font-misc-misc/font-misc-misc-1.1.0.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org miscellaneous fonts"
diff --git a/media-fonts/font-mutt-misc/Manifest b/media-fonts/font-mutt-misc/Manifest
index 6de37b9f..358011b0 100644
--- a/media-fonts/font-mutt-misc/Manifest
+++ b/media-fonts/font-mutt-misc/Manifest
@@ -1,2 +1,2 @@
DIST font-mutt-misc-1.0.1.tar.bz2 256990 RMD160 1b3adad4ecf324d34adb6c6851f8848c7763c239 SHA1 b677831b477027f56ad3f35c95ef3cd6711f87ac SHA256 77bf33cbf5d1849bef4e516698eb45b7d16263a84dcc2299fd61383501906e25
-EBUILD font-mutt-misc-1.0.1.ebuild 331 RMD160 57fcb238d1c50bfa073f7dfd790e7f960d5c9192 SHA1 ab73e77fdc7f2299d2eca7a41475e1ecb6fd7739 SHA256 4e13e73a38f26b21960448ae1e3992363162c4c959ddd52b5996b53ea1a46f88
+EBUILD font-mutt-misc-1.0.1.ebuild 337 RMD160 f0e473936111c18c95eeab1b0577f41c1be7e0eb SHA1 040589317f18efe0d241362c273f810bbb1c65d7 SHA256 ec4905b5b544f2250cf6e5768ccad28d61f7a4ad793ef7955c36462dc76da998
diff --git a/media-fonts/font-mutt-misc/font-mutt-misc-1.0.1.ebuild b/media-fonts/font-mutt-misc/font-mutt-misc-1.0.1.ebuild
index fd19a017..b4994edd 100644
--- a/media-fonts/font-mutt-misc/font-mutt-misc-1.0.1.ebuild
+++ b/media-fonts/font-mutt-misc/font-mutt-misc-1.0.1.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org ClearlyU fonts"
diff --git a/media-fonts/font-schumacher-misc/Manifest b/media-fonts/font-schumacher-misc/Manifest
index 0df53677..a9c096ef 100644
--- a/media-fonts/font-schumacher-misc/Manifest
+++ b/media-fonts/font-schumacher-misc/Manifest
@@ -1,2 +1,2 @@
DIST font-schumacher-misc-1.1.0.tar.bz2 136883 RMD160 e346d08210f3d2bb03b7ce7d5549d7f286d1ba60 SHA1 ea7e009e222379fa31a16bdbd4ca5b1e9d412944 SHA256 3003915fb53930fee5e6086ee7546ea0857ef0fc2311aaf84ed937b1b4de1b4d
-EBUILD font-schumacher-misc-1.1.0.ebuild 333 RMD160 48f314ce1e9b2bd05abe6fcef0ff47c6abe1031b SHA1 2a70f06ff58fc26926a72f9a81eb006504ae92e2 SHA256 0540a80c99e7246c7880b64eab6d804cbcdec885c29f8e8947183f978e2d308c
+EBUILD font-schumacher-misc-1.1.0.ebuild 339 RMD160 6ab9b12d757dbde23377fd753ffe4ab3c5abea15 SHA1 6fffc15b4629badd7a72702941c0d29b7dee03dd SHA256 612839f21f8d0bf2c9e8daf4c7ad482890aea1889ac878b4f410983b042a1342
diff --git a/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.0.ebuild b/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.0.ebuild
index a1feaa10..3c64e269 100644
--- a/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.0.ebuild
+++ b/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.0.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Schumacher fonts"
diff --git a/media-fonts/font-screen-cyrillic/Manifest b/media-fonts/font-screen-cyrillic/Manifest
index 895185a5..e6031eb0 100644
--- a/media-fonts/font-screen-cyrillic/Manifest
+++ b/media-fonts/font-screen-cyrillic/Manifest
@@ -1,2 +1,2 @@
DIST font-screen-cyrillic-1.0.2.tar.bz2 93560 RMD160 708695ac40740bbeb7bd2266448a35043486b213 SHA1 4795ea77e14246122d21bc0fa68a3c0d5261e39d SHA256 c5dd881fb13ff16d358acb27f99f6c281415d3824beb342f3a02603f0efebe11
-EBUILD font-screen-cyrillic-1.0.2.ebuild 338 RMD160 d8e503372b93cfc454a499c50309753b278494d2 SHA1 e3e021d3589e92a3eebda2b6231428d2b08b6709 SHA256 8760a07fd67f36680daed7b877c1fee88184b91ebb9fed5d50d986dd000fca6c
+EBUILD font-screen-cyrillic-1.0.2.ebuild 344 RMD160 c943feec33d1dd80ca1ed3cc193a70c100b27b4d SHA1 2a80202536f7c11c7ed24aceabfdd838df08f361 SHA256 738ce03594afe780eadd4ff2cf67fae6756e89b41b82bc3544699225b44b58e0
diff --git a/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.2.ebuild b/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.2.ebuild
index b7d8dd0f..d4e6c890 100644
--- a/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.2.ebuild
+++ b/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.2.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Screen cyrillic fonts"
diff --git a/media-fonts/font-sony-misc/Manifest b/media-fonts/font-sony-misc/Manifest
index 6f1b891f..e7d6360f 100644
--- a/media-fonts/font-sony-misc/Manifest
+++ b/media-fonts/font-sony-misc/Manifest
@@ -1,2 +1,2 @@
DIST font-sony-misc-1.0.1.tar.bz2 98394 RMD160 4c87d664847fb735e095e5c0f37cdf1d2d21b76d SHA1 e9717546682382ebf3e6e7039766fe52bdb8846c SHA256 da9526844c74ce395d3912d3d8f538cd57102d6bcd9f73fd0a5dccf53bfc56ca
-EBUILD font-sony-misc-1.0.1.ebuild 327 RMD160 963345582b1e1665525bd06dccfe0cdba53c20d0 SHA1 a7ca381561d308f5d79baa7c9aced32f58ce9c5a SHA256 39135c023c15c6920b0ace8ffb2146780e1aeb625249619d6d70472032f9d6d4
+EBUILD font-sony-misc-1.0.1.ebuild 333 RMD160 00f17d127a1de11b80eb977a0e0691f07e0a6667 SHA1 d9f5cfb51d73478847b4dda47bc2ceb23bafca0b SHA256 c2010b783619e7c6e99781105fe5491187082cf8785eadc0c64bf40b7738da31
diff --git a/media-fonts/font-sony-misc/font-sony-misc-1.0.1.ebuild b/media-fonts/font-sony-misc/font-sony-misc-1.0.1.ebuild
index e01e8e3c..89b2d711 100644
--- a/media-fonts/font-sony-misc/font-sony-misc-1.0.1.ebuild
+++ b/media-fonts/font-sony-misc/font-sony-misc-1.0.1.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Sony fonts"
diff --git a/media-fonts/font-sun-misc/Manifest b/media-fonts/font-sun-misc/Manifest
index eb34bbc7..e8faa5f7 100644
--- a/media-fonts/font-sun-misc/Manifest
+++ b/media-fonts/font-sun-misc/Manifest
@@ -1,2 +1,2 @@
DIST font-sun-misc-1.0.1.tar.bz2 106838 RMD160 bfe726b06a8877f4cfc89ce446173cec4fdebd5c SHA1 fc91999e66fe479d07ea74e5dd2d950ff02ccb80 SHA256 411522f5ea8f951a7432ab946a92f524493e3a1a6e1ca3c48f09c46cb5ae9d09
-EBUILD font-sun-misc-1.0.1.ebuild 326 RMD160 387b2d6627c9b9690b7b629b805ac4ab92fa3a70 SHA1 7c0545df4c76bdf753c998a008e32e3238e32e67 SHA256 91c859b591064f76bbc33028b97a3885d4dab4cc575f062bffb11c2cde7e4298
+EBUILD font-sun-misc-1.0.1.ebuild 332 RMD160 45aa9a593bd616070dbedcabddb0c69a92778293 SHA1 b92a051834ed62192ff5f58d072923894ffa4ab2 SHA256 cd08f84c2cb253a0ed40cd47a56f6d22b13c19d0b213589ffc3752270e9803f7
diff --git a/media-fonts/font-sun-misc/font-sun-misc-1.0.1.ebuild b/media-fonts/font-sun-misc/font-sun-misc-1.0.1.ebuild
index c846cac7..5c25efae 100644
--- a/media-fonts/font-sun-misc/font-sun-misc-1.0.1.ebuild
+++ b/media-fonts/font-sun-misc/font-sun-misc-1.0.1.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Sun fonts"
diff --git a/media-fonts/font-util/Manifest b/media-fonts/font-util/Manifest
index b8051a57..da66e62d 100644
--- a/media-fonts/font-util/Manifest
+++ b/media-fonts/font-util/Manifest
@@ -1,3 +1,3 @@
DIST font-util-1.1.1.tar.bz2 121336 RMD160 5519e5f093d9055248e51d6ccef7a190e76e218d SHA1 6ee3af5466de84d61411e173e578a256aeb1074d SHA256 a33f1e3b0d7c3fd7c3505ce68888fec3cf897353084187d96e1e821fe3c02f88
-EBUILD font-util-1.1.1-r1.ebuild 600 RMD160 d14ba69a5ac8e9aa2b51ea4a053b220dc3317134 SHA1 7f6dfab78b50140a5b60644d58dd3fe7246a75b9 SHA256 cbff1dc2826ccb4a9d99803d5417f04204470d0a10a95b2084514e2df12a4cd1
-EBUILD font-util-9999.ebuild 430 RMD160 5ef7d5eeccbad2cfe205ca4201f3e7a09887642c SHA1 6388a42a0023f594f2a7e745a90b1d527d7946d6 SHA256 3bb5b4d98ccc5dbbb38c6d004bd13d1e311e21001760e1f0c4f61ea87d72df1e
+EBUILD font-util-1.1.1-r1.ebuild 606 RMD160 35e921d07bae0843b62201da04a01715415df91b SHA1 b0bac8136e66c159572b15ade83653d26167008a SHA256 57be241ea49ab2ba42069340894f3222e22c64345df9ea5341fbd405795130f2
+EBUILD font-util-9999.ebuild 436 RMD160 b35e32143fcd068e296ceadf2d83f64cf4d10a20 SHA1 78105c71401d08d2904b1e04c858edd82e766367 SHA256 a7cbd82f5ff6bf3bc5fe8972288c8b597771f1ce2d655b47287924298359c711
diff --git a/media-fonts/font-util/font-util-1.1.1-r1.ebuild b/media-fonts/font-util/font-util-1.1.1-r1.ebuild
index 30305dc0..d80acbca 100644
--- a/media-fonts/font-util/font-util-1.1.1-r1.ebuild
+++ b/media-fonts/font-util/font-util-1.1.1-r1.ebuild
@@ -3,7 +3,7 @@
# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-util/font-util-1.1.1.ebuild,v 1.1 2009/10/12 17:18:59 remi Exp $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
EGIT_REPO_URI="git://anongit.freedesktop.org/xorg/font/util"
DESCRIPTION="X.Org font utilities"
diff --git a/media-fonts/font-util/font-util-9999.ebuild b/media-fonts/font-util/font-util-9999.ebuild
index 8fc61681..604c6595 100644
--- a/media-fonts/font-util/font-util-9999.ebuild
+++ b/media-fonts/font-util/font-util-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
EGIT_REPO_URI="git://anongit.freedesktop.org/xorg/font/util"
DESCRIPTION="X.Org font utilities"
diff --git a/media-fonts/font-winitzki-cyrillic/Manifest b/media-fonts/font-winitzki-cyrillic/Manifest
index 1ecec192..d3b70b6b 100644
--- a/media-fonts/font-winitzki-cyrillic/Manifest
+++ b/media-fonts/font-winitzki-cyrillic/Manifest
@@ -1,2 +1,2 @@
DIST font-winitzki-cyrillic-1.0.1.tar.bz2 91022 RMD160 cd25afbabe4588dedcb42cc2091fb22a54818e64 SHA1 d19f476710783d784dfdbcb6a1f34ef7746d3439 SHA256 7c57c29f70db18e543a3eb8f785b6b5d1372b78eee27707dbb10359d8ddb1446
-EBUILD font-winitzki-cyrillic-1.0.1.ebuild 339 RMD160 10004c8c6731a6f761872139d17a1ee56eaff55c SHA1 034d1b4d0d059bbaa6962c30493183a6782dac36 SHA256 3001647ff3060f425dfc258502f5847a3e16fe47e3f854dfdd5f30ea50f2addd
+EBUILD font-winitzki-cyrillic-1.0.1.ebuild 345 RMD160 367078f08e9f6bea8960952d14ae43dc08a71f99 SHA1 57d40faecf725359dac0772d6d72231f9c964bc0 SHA256 84d007b5c119d8f73f720e884df1d136c54a074abbc4a40b713bda46390dc0aa
diff --git a/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.1.ebuild b/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.1.ebuild
index 319851f6..0950bc6d 100644
--- a/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.1.ebuild
+++ b/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.1.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Winitzki cyrillic font"
diff --git a/media-fonts/font-xfree86-type1/Manifest b/media-fonts/font-xfree86-type1/Manifest
index 3e3ad04e..b7b56eb4 100644
--- a/media-fonts/font-xfree86-type1/Manifest
+++ b/media-fonts/font-xfree86-type1/Manifest
@@ -1,2 +1,2 @@
DIST font-xfree86-type1-1.0.2.tar.bz2 117361 RMD160 4b61d8416d0508cd0cd6400eec6bda30d2017e76 SHA1 09a4c9b8455f3f4954bfe9dd991d7fd1d0f5595a SHA256 7a026aeaafe5a619b2c1b35cd361125b169b2212eaf0f2f5ce796038b1cf06cd
-EBUILD font-xfree86-type1-1.0.2.ebuild 317 RMD160 837af6bac65dad6d09cf9191f9781ed9de63bb43 SHA1 9ec67b8d75fdcc9304ec8999e248a840991a445f SHA256 f8f29f96baf02efb7cadb7ac9240c106e6c3446316a53f30994d66e3fcb9a460
+EBUILD font-xfree86-type1-1.0.2.ebuild 323 RMD160 271134701bb82c5e1fc4ebad4b52b2fe8c3a0e34 SHA1 54b5dc8ef78998bf2639c585ebfa4208a8053e26 SHA256 74177cfe6fa4deb754456f9019d83dee4f56579c8e152616180cea30e2475c82
diff --git a/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.2.ebuild b/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.2.ebuild
index 87fc77a6..cb4c4093 100644
--- a/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.2.ebuild
+++ b/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.2.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org XFree86 Type 1 font"
diff --git a/x11-apps/mkfontdir/Manifest b/x11-apps/mkfontdir/Manifest
index 04a9f0a2..d239b5df 100644
--- a/x11-apps/mkfontdir/Manifest
+++ b/x11-apps/mkfontdir/Manifest
@@ -1 +1 @@
-EBUILD mkfontdir-9999.ebuild 358 RMD160 027959f653d07cc3fe00e63eb632358587feb97a SHA1 fee8c7700f020b079ffd8e24a15f5b2dd3e686c3 SHA256 f3e90dab4e7f2c1d15c28a47cb76d3dfe9b3e07fa292b02514f00b8688dc7b20
+EBUILD mkfontdir-9999.ebuild 364 RMD160 761a5854d312748a070fd00fce306283e34b104d SHA1 13a7fbe98f9fece3aa518da9dcefcdcb31691ad9 SHA256 adc1317449c6223f9b76cd3f9bab8dd62195c250be87e77308f56abb1af24d77
diff --git a/x11-apps/mkfontdir/mkfontdir-9999.ebuild b/x11-apps/mkfontdir/mkfontdir-9999.ebuild
index a3b8fa3a..790bf9d8 100644
--- a/x11-apps/mkfontdir/mkfontdir-9999.ebuild
+++ b/x11-apps/mkfontdir/mkfontdir-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="create an index of X font files in a directory"
diff --git a/x11-apps/mkfontscale/Manifest b/x11-apps/mkfontscale/Manifest
index 80163f8e..4276352a 100644
--- a/x11-apps/mkfontscale/Manifest
+++ b/x11-apps/mkfontscale/Manifest
@@ -1 +1 @@
-EBUILD mkfontscale-9999.ebuild 432 RMD160 be172a6ab9a321e2de1bcae4ab00c87b4e3af8fb SHA1 d38443f44184cd5a7567f98982fd5ef9c669580d SHA256 b540c015ed76e8165f4d8981a081b3d06475bc7acf8400236bef6fd95e008ea2
+EBUILD mkfontscale-9999.ebuild 438 RMD160 f23d63adb83fb0484efab7ef8e4a58bb4d0702f4 SHA1 1163818699da73d24213ea7827e51ba6d174739c SHA256 d97d9f25463addbeb989a6112a444917ae9be6124d32b6da226a2184a2fa3d1d
diff --git a/x11-apps/mkfontscale/mkfontscale-9999.ebuild b/x11-apps/mkfontscale/mkfontscale-9999.ebuild
index 9840e12c..ada8cc31 100644
--- a/x11-apps/mkfontscale/mkfontscale-9999.ebuild
+++ b/x11-apps/mkfontscale/mkfontscale-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="create an index of scalable font files for X"
diff --git a/x11-apps/smproxy/Manifest b/x11-apps/smproxy/Manifest
index 3564e12b..90f7e884 100644
--- a/x11-apps/smproxy/Manifest
+++ b/x11-apps/smproxy/Manifest
@@ -1 +1 @@
-EBUILD smproxy-9999.ebuild 344 RMD160 2b264ddc53d43d55767696ba30e941b92403a5d7 SHA1 c3f63fa00180670ac3edabbaa9101e40b6243248 SHA256 48f209d673f47cec4570713f183eed9513de23b318eae1d4c80dd8d46dd75663
+EBUILD smproxy-9999.ebuild 350 RMD160 0ae9c2ed5672e95a900c6d602e61a6e3ffdf5686 SHA1 7c25e187a944d2678eab8165c425dfac449204d2 SHA256 b39eef6461da41070d0974cc893f8f8a67943abdc7d99df8a080676bf9ea8e1e
diff --git a/x11-apps/smproxy/smproxy-9999.ebuild b/x11-apps/smproxy/smproxy-9999.ebuild
index aa4ed861..dd8d9083 100644
--- a/x11-apps/smproxy/smproxy-9999.ebuild
+++ b/x11-apps/smproxy/smproxy-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="Session Manager Proxy"
diff --git a/x11-apps/x11perf/Manifest b/x11-apps/x11perf/Manifest
index 9c2008bf..e14ed186 100644
--- a/x11-apps/x11perf/Manifest
+++ b/x11-apps/x11perf/Manifest
@@ -1 +1 @@
-EBUILD x11perf-9999.ebuild 421 RMD160 56ed35b9e27ccfa9e33ee4fc4abd74625ab9616f SHA1 86af53a4a77ad65ecddb3a37ef7c4b9592641772 SHA256 c6ef42f2a47f8902401e33b9c4e093bcfcee76be85be57f3d9ce5d0da6354d07
+EBUILD x11perf-9999.ebuild 427 RMD160 05701be34aa3c352b7ce9b1c3c9b760877064c59 SHA1 242a227cc99bc4ca6e1ec3dbb3faeb56dc3ab25f SHA256 688ff92d8d388ca169a9162f0c178fc3ee8ef60fea0857562f337cb6c77b76fa
diff --git a/x11-apps/x11perf/x11perf-9999.ebuild b/x11-apps/x11perf/x11perf-9999.ebuild
index 90850ddc..5941cd4b 100644
--- a/x11-apps/x11perf/x11perf-9999.ebuild
+++ b/x11-apps/x11perf/x11perf-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X rendering operation stress test utility"
diff --git a/x11-apps/xcursorgen/Manifest b/x11-apps/xcursorgen/Manifest
index 4efd741d..43d6a625 100644
--- a/x11-apps/xcursorgen/Manifest
+++ b/x11-apps/xcursorgen/Manifest
@@ -1 +1 @@
-EBUILD xcursorgen-9999.ebuild 408 RMD160 cbcc3932d79f759ac5c35d2372fc977107e053ff SHA1 46285be387874ace5ebe0d45a8dabca9759f4152 SHA256 748357e193d945d67358cc148105301b97def5a8a5a92b86957184e24846d474
+EBUILD xcursorgen-9999.ebuild 414 RMD160 d37b88bf3937f22a35f98818ca9ead1620db68d7 SHA1 6f0d48d80288fee2bc5a082310764fdacd61741c SHA256 1ea2af6240bd3fe8e46f48388565fff5c413ca514f8b97c157b9d7f3431a4ebe
diff --git a/x11-apps/xcursorgen/xcursorgen-9999.ebuild b/x11-apps/xcursorgen/xcursorgen-9999.ebuild
index 2885e0a0..c6ed89ca 100644
--- a/x11-apps/xcursorgen/xcursorgen-9999.ebuild
+++ b/x11-apps/xcursorgen/xcursorgen-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="create an X cursor file from a collection of PNG images"
diff --git a/x11-apps/xdriinfo/Manifest b/x11-apps/xdriinfo/Manifest
index 2fca421a..8a44b346 100644
--- a/x11-apps/xdriinfo/Manifest
+++ b/x11-apps/xdriinfo/Manifest
@@ -1 +1 @@
-EBUILD xdriinfo-9999.ebuild 657 RMD160 5af34c1bb888415529bd2c893ce72020a9912492 SHA1 00592367aef7d19e641a7b3a32e4b763e435c8e9 SHA256 6f032d59cf7d79326448db2e7bfa983c608534e109335ca980f5796b4b75a1a0
+EBUILD xdriinfo-9999.ebuild 675 RMD160 d501164f16fd7117971f7d48725e5445d964ba9c SHA1 8dd51261852b226be80467595f93c39e62eee842 SHA256 cc534c81a208c3bec73b383a8372fc7167c95a31fe7a45db7b84c0a37aceaf50
diff --git a/x11-apps/xdriinfo/xdriinfo-9999.ebuild b/x11-apps/xdriinfo/xdriinfo-9999.ebuild
index 1949db61..4ed1096e 100644
--- a/x11-apps/xdriinfo/xdriinfo-9999.ebuild
+++ b/x11-apps/xdriinfo/xdriinfo-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="query configuration information of DRI drivers"
@@ -17,7 +17,7 @@ DEPEND="${RDEPEND}
x11-proto/glproto"
pkg_setup() {
- xorg-2_pkg_setup
+ x-modular-r2_pkg_setup
# Bug #138920
ewarn "Forcing on xorg-x11 for header sanity..."
@@ -26,7 +26,7 @@ pkg_setup() {
}
pkg_postinst() {
- xorg-2_pkg_postinst
+ x-modular-r2_pkg_postinst
echo
eselect opengl set ${OLD_IMPLEM}
diff --git a/x11-apps/xev/Manifest b/x11-apps/xev/Manifest
index 4d102390..e93c4d77 100644
--- a/x11-apps/xev/Manifest
+++ b/x11-apps/xev/Manifest
@@ -1 +1 @@
-EBUILD xev-9999.ebuild 333 RMD160 ff0b12437b16f35b1ab4309d49946c751bf3f9e2 SHA1 3cb4e0b05a58584e26ce9d72c0ebeb6f03c2d4fd SHA256 cb4601aea2d36eaaf87ed0d878d2384721516475ecec5868f96a9ff506c27cd0
+EBUILD xev-9999.ebuild 339 RMD160 92961b1d834a61371a504626e88e22c8c2b84aab SHA1 730ff3858edd9108a4118a033b9dee4b1d7dd51c SHA256 8b6be401aee7c93fe4eddb924b89777428d7648c1b945726646ba9fee5c8ec43
diff --git a/x11-apps/xev/xev-9999.ebuild b/x11-apps/xev/xev-9999.ebuild
index d50003db..e7464208 100644
--- a/x11-apps/xev/xev-9999.ebuild
+++ b/x11-apps/xev/xev-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="print contents of X events"
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index b14946bc..0359d5d0 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -8,4 +8,4 @@ AUX xdm.confd-2 1262 RMD160 188ec46199168d90cb09cfe6b946bbf69f426c0c SHA1 4931a8
AUX xdm.initd-4 6515 RMD160 d42bd4fe05d64c1e432aac26141f052d093fc563 SHA1 b2a997a564441d2f543d80d19201897bbe6f363a SHA256 341a3a2fab2618e20784394adc2a2af5e60234cca7d6c3f9cc863308a836d158
AUX xserver.pamd 125 RMD160 4b75f8bf5e68ac7181a22beaccc153ac250eb8e9 SHA1 e35845021328044659036b9f82a95c17f21beb25 SHA256 f179c3417b94295fe12776f9da4a08898a3ee4199e26abff6457717caeb29bb2
AUX xserverrc 30 RMD160 7575b72f2f5ec4afba3e3700c213a7fbe40a0f8d SHA1 febf89ebfcc056c16bf70a4e651f4074af71b224 SHA256 18c040add4d137aaa58f76b134088acb1269dd291a14bcc283765c6c897d49fe
-EBUILD xinit-9999.ebuild 1808 RMD160 8d98d62c023c3ea1a9ca77aed04cd7090ce7a5fe SHA1 69f35075e5002a55d984f28191bdd8a8035bc0e7 SHA256 29d9dc4e66fa6835c08909cb51bd086ed414cc8c575d710c286d42f21f0aff37
+EBUILD xinit-9999.ebuild 1832 RMD160 6e1201d42d2bd4363bd1505884b051e10eba6eb2 SHA1 0eb6d8b76fcc81591868355a376a2548eebb62ca SHA256 4c54e93a2337210da2e5ed0e8c94666e8ca96d27552e0a7577b2e8a5eb439312
diff --git a/x11-apps/xinit/xinit-9999.ebuild b/x11-apps/xinit/xinit-9999.ebuild
index 42d62352..f8ad4d17 100644
--- a/x11-apps/xinit/xinit-9999.ebuild
+++ b/x11-apps/xinit/xinit-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2 pam
+inherit x-modular-r2 pam
DESCRIPTION="X Window System initializer"
@@ -30,12 +30,12 @@ PATCHES=(
)
pkg_setup() {
- xorg-2_pkg_setup
+ x-modular-r2_pkg_setup
CONFIGURE_OPTIONS="--with-xinitdir=/etc/X11/xinit"
}
src_install() {
- xorg-2_src_install
+ x-modular-r2_src_install
exeinto /etc/X11
doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh || die
exeinto /etc/X11/Sessions
@@ -52,7 +52,7 @@ src_install() {
}
pkg_postinst() {
- xorg-2_pkg_postinst
+ x-modular-r2_pkg_postinst
ewarn "If you use startx to start X instead of a login manager like gdm/kdm,"
ewarn "you can set the XSESSION variable to anything in /etc/X11/Sessions/ or"
ewarn "any executable. When you run startx, it will run this as the login session."
diff --git a/x11-apps/xinput/Manifest b/x11-apps/xinput/Manifest
index bed517b7..fd1e9b35 100644
--- a/x11-apps/xinput/Manifest
+++ b/x11-apps/xinput/Manifest
@@ -1,2 +1,2 @@
-EBUILD xinput-9999.ebuild 414 RMD160 41a0aa2fa3c3dbfa65908bfd24b385edacd02ffc SHA1 33b6718344fbe1bbafab0f2a5987f6dc66f1142e SHA256 71f304d106721f80ceb8559813bb75519133dd858407856854a3a0b1000548cb
+EBUILD xinput-9999.ebuild 420 RMD160 a507314d5f4c0327c5481d89f139fef431a2579c SHA1 0a58e861c33900d8fdeddb5ba6b5a92af8cd97c2 SHA256 dffd35742cf7a0857c54bf709d17af0de3ddda6ab7e3c530eef8cb31a2115fa3
MISC metadata.xml 157 RMD160 bfca46b367901674b4ec5419c063ae27fb446b0a SHA1 4fe7fb7398abd34822cec8be77f8aaf86e28a1a3 SHA256 bc6a4a3d5e32f9329039b242036828256c9f2c33862bc1d606d4ac8427032fdc
diff --git a/x11-apps/xinput/xinput-9999.ebuild b/x11-apps/xinput/xinput-9999.ebuild
index 3b959c79..8430f3e7 100644
--- a/x11-apps/xinput/xinput-9999.ebuild
+++ b/x11-apps/xinput/xinput-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="Utility to set XInput device parameters"
diff --git a/x11-apps/xkbevd/Manifest b/x11-apps/xkbevd/Manifest
index 8942fac9..ff9b1c0b 100644
--- a/x11-apps/xkbevd/Manifest
+++ b/x11-apps/xkbevd/Manifest
@@ -1 +1 @@
-EBUILD xkbevd-9999.ebuild 327 RMD160 2077253ecffc1975ec096ffeef98a81be726a42d SHA1 b427561034039e7a025bd96f5257dacdf9e417cb SHA256 6336c3a551ff28185d60510b74786ab994339cb2b636433ccfb51ab6d4ff6d8c
+EBUILD xkbevd-9999.ebuild 333 RMD160 1fb5eb6412ba2be9a0050d177b7e35608ffb3e62 SHA1 8ad776793133d3a8a56fa8e44c8dd4f2b5c20704 SHA256 ebcc2092455385261adc02e9ca36a491660f8e3154ddf7343f6f3141f429511b
diff --git a/x11-apps/xkbevd/xkbevd-9999.ebuild b/x11-apps/xkbevd/xkbevd-9999.ebuild
index 1706bd36..2dd323fd 100644
--- a/x11-apps/xkbevd/xkbevd-9999.ebuild
+++ b/x11-apps/xkbevd/xkbevd-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="XKB event daemon"
diff --git a/x11-apps/xkbutils/Manifest b/x11-apps/xkbutils/Manifest
index 18993c30..65cc6165 100644
--- a/x11-apps/xkbutils/Manifest
+++ b/x11-apps/xkbutils/Manifest
@@ -1 +1 @@
-EBUILD xkbutils-9999.ebuild 376 RMD160 b4573259bee1f2274d661347fc672e7f4e024aad SHA1 4c93ca90569b405df62dcaf43b84e5df3c9ccdc4 SHA256 b2235262173d101dcacd540861b52c1a7195a96e2de26254eda772d49d9e2a15
+EBUILD xkbutils-9999.ebuild 382 RMD160 f300d9b5fb988dbae9ccbf385fd92e9b7483a5af SHA1 cfb3a179df6e4422c2566b1a63d791cec82f9b4e SHA256 2a9c7d246ed9a33d108d5e184223e16a919b4f5e1927dee6d5c1f4b9710715ce
diff --git a/x11-apps/xkbutils/xkbutils-9999.ebuild b/x11-apps/xkbutils/xkbutils-9999.ebuild
index b923c891..6201401a 100644
--- a/x11-apps/xkbutils/xkbutils-9999.ebuild
+++ b/x11-apps/xkbutils/xkbutils-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org xkbutils application"
diff --git a/x11-apps/xman/Manifest b/x11-apps/xman/Manifest
index eac22c99..2f68454d 100644
--- a/x11-apps/xman/Manifest
+++ b/x11-apps/xman/Manifest
@@ -1 +1 @@
-EBUILD xman-9999.ebuild 335 RMD160 0aaa18ab5edea0bb7c6f87d4207ae1094b25edd9 SHA1 9ed46af8744a5a9f9bdc9b989f01f69fa897cfec SHA256 a15a598393fc2ea5fa11c42c1ebab10070bee85e05cf797acc765202611cd666
+EBUILD xman-9999.ebuild 341 RMD160 d47509eff0c5c890efe133b1ac8d4452794826e6 SHA1 6379f68b4079a0d3fc64d6ecb224ab5465bde88e SHA256 dec0352c115eec60746a100c3ae469515fd84f968cbfcf8139ee8cfc0901a906
diff --git a/x11-apps/xman/xman-9999.ebuild b/x11-apps/xman/xman-9999.ebuild
index 88cb6b0a..710127ae 100644
--- a/x11-apps/xman/xman-9999.ebuild
+++ b/x11-apps/xman/xman-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="Manual page display program for the X Window System"
diff --git a/x11-apps/xrandr/Manifest b/x11-apps/xrandr/Manifest
index c8cf8af4..c7a4d76d 100644
--- a/x11-apps/xrandr/Manifest
+++ b/x11-apps/xrandr/Manifest
@@ -1,2 +1,2 @@
-EBUILD xrandr-9999.ebuild 476 RMD160 18de1a32b97b1b0672a46d854284d00fb0cdbee2 SHA1 85aa32e01c1b2f9208a642597e0f8db3ba3ad795 SHA256 218898bd8c5eb038afd11bd71fb8cf192edb6009169c285978eec0e03f2a8731
+EBUILD xrandr-9999.ebuild 488 RMD160 ca2187ea85f3d01835d2edd1ad9aa7b1b10db5f7 SHA1 a1c0d21130abffabf318749da0214c99a556c217 SHA256 30d14928121b1e8fed78ef9f96bb390bdf8887414edd6782bc7727449b4a1b71
MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-apps/xrandr/xrandr-9999.ebuild b/x11-apps/xrandr/xrandr-9999.ebuild
index 0306db0e..dcaa1843 100644
--- a/x11-apps/xrandr/xrandr-9999.ebuild
+++ b/x11-apps/xrandr/xrandr-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="primitive command line interface to RandR extension"
@@ -16,6 +16,6 @@ RDEPEND=">=x11-libs/libXrandr-1.3
DEPEND="${RDEPEND}"
src_install() {
- xorg-2_src_install
+ x-modular-r2_src_install
rm -f "${D}"/usr/bin/xkeystone
}
diff --git a/x11-apps/xvinfo/Manifest b/x11-apps/xvinfo/Manifest
index 3c4c1fcd..d1cf2148 100644
--- a/x11-apps/xvinfo/Manifest
+++ b/x11-apps/xvinfo/Manifest
@@ -1 +1 @@
-EBUILD xvinfo-9999.ebuild 370 RMD160 45b6dfde817c4194f5f6da668c11afbd1658aae2 SHA1 88a7a762eae65349c48b08df3c8e00dd8a5babe0 SHA256 6bea38021e943277bc41b3424bd18a6295aa4d1a7ddd20605536be7011a8c4e3
+EBUILD xvinfo-9999.ebuild 376 RMD160 f47bd99e18ce5482eee50eb5f7908bc7cd137a84 SHA1 1d184fcfebc51f1726049c2d67e29d06b7a75c9a SHA256 0a1143fea8b015ac823f70d202d420392960c50aa1b4f31f211c54907c693e29
diff --git a/x11-apps/xvinfo/xvinfo-9999.ebuild b/x11-apps/xvinfo/xvinfo-9999.ebuild
index b0d7f05d..e9e0eac1 100644
--- a/x11-apps/xvinfo/xvinfo-9999.ebuild
+++ b/x11-apps/xvinfo/xvinfo-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="Print out X-Video extension adaptor information"
diff --git a/x11-apps/xwininfo/Manifest b/x11-apps/xwininfo/Manifest
index c95be6e8..f4cf5817 100644
--- a/x11-apps/xwininfo/Manifest
+++ b/x11-apps/xwininfo/Manifest
@@ -1 +1 @@
-EBUILD xwininfo-9999.ebuild 356 RMD160 94e3c47c691b3f957c4c0de743d37ad7f82635de SHA1 efd0a92f49c2688115c27e2c84b47ad61ff410f2 SHA256 19e94667d7345828b32162b25673f703e21a29c9afa11c1c7a1d2c9d1338f189
+EBUILD xwininfo-9999.ebuild 362 RMD160 94dd4560d4ce80f87e7544a86e4ea28b75b2dca7 SHA1 1f7deb5af3634cc952a72cc872dfead1624124ff SHA256 d6bf47c3f8586922969e3f343d198673536366167fcb3c782035379b7084e025
diff --git a/x11-apps/xwininfo/xwininfo-9999.ebuild b/x11-apps/xwininfo/xwininfo-9999.ebuild
index 62b72b3e..b852b47e 100644
--- a/x11-apps/xwininfo/xwininfo-9999.ebuild
+++ b/x11-apps/xwininfo/xwininfo-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="window information utility for X"
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 5cbcb8a6..21d44e12 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1 +1 @@
-EBUILD xorg-server-9999.ebuild 7141 RMD160 75fd9c69c545ac15fa670c2c14dff728c423376b SHA1 00e54b7ee844271db74cbbac772e079795aa1d44 SHA256 19705e825d9c8330d4172823c6233fbbae95beef5059d884a515ee8fd131fd14
+EBUILD xorg-server-9999.ebuild 7165 RMD160 59c10163f9df3ad0cbeb1f7f2259452f91c89b70 SHA1 925da21859e48e1bd1286957f7311a9611907c74 SHA256 9d2bcacc8ff0061bcb1e08c0a0ab3e340fcb8b376caed055846280f5355cd527
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 5acaa77d..fa49c50b 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2 multilib versionator
+inherit x-modular-r2 multilib versionator
EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
@@ -125,7 +125,7 @@ PATCHES=(
)
pkg_setup() {
- xorg-2_pkg_setup
+ x-modular-r2_pkg_setup
use minimal || ensure_a_server_is_building
@@ -187,7 +187,7 @@ src_configure() {
# this is required only for configure and build time
OLD_IMPLEM="$(eselect opengl show)"
[[ ${OLD_IMPLEM} != ${OPENGL_DIR} ]] && eselect opengl set ${OPENGL_DIR}
- xorg-2_src_configure
+ x-modular-r2_src_configure
}
src_compile() {
@@ -200,7 +200,7 @@ src_compile() {
}
src_install() {
- xorg-2_src_install
+ x-modular-r2_src_install
dynamic_libgl_install
diff --git a/x11-drivers/xf86-input-evdev/Manifest b/x11-drivers/xf86-input-evdev/Manifest
index 79fc02ea..d59ba0a0 100644
--- a/x11-drivers/xf86-input-evdev/Manifest
+++ b/x11-drivers/xf86-input-evdev/Manifest
@@ -1,2 +1,2 @@
-EBUILD xf86-input-evdev-9999.ebuild 438 RMD160 9b17f5ff2e1c3985e99138e293c96bd7a33868ec SHA1 4c634104d6447322ecced9fda5c9a7c755dfddc6 SHA256 0f3b8ee14e3eb2465d0332583a86684b447ac1cf8932e6da30641eaca12e8cd4
+EBUILD xf86-input-evdev-9999.ebuild 444 RMD160 175e1d0421c230e1a8c84a13e126663738803c30 SHA1 194248d4ac2cba17e6207b2c1f301fc6eb87f2c5 SHA256 a578a0bb35561d37caf1cdc4aacfed0ebb1cf6b052687568f51fc226a50d7f13
MISC metadata.xml 254 RMD160 c1c6e70dd9088c05d91c8188791534dae7ffa665 SHA1 2dcdc428213d896d7b0d00f46edfa49799a0f0a8 SHA256 326a5b3b205fe4d2e8822e5a595c500d19bf3d6c527ab1305a24ef476bd1c08b
diff --git a/x11-drivers/xf86-input-evdev/xf86-input-evdev-9999.ebuild b/x11-drivers/xf86-input-evdev/xf86-input-evdev-9999.ebuild
index ed39d15c..ec927b39 100644
--- a/x11-drivers/xf86-input-evdev/xf86-input-evdev-9999.ebuild
+++ b/x11-drivers/xf86-input-evdev/xf86-input-evdev-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="Generic Linux input driver"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
diff --git a/x11-drivers/xf86-input-joystick/Manifest b/x11-drivers/xf86-input-joystick/Manifest
index 2b0a0cdd..5936eeba 100644
--- a/x11-drivers/xf86-input-joystick/Manifest
+++ b/x11-drivers/xf86-input-joystick/Manifest
@@ -1,2 +1,2 @@
-EBUILD xf86-input-joystick-9999.ebuild 386 RMD160 2f9039ae5a8ff64f68d37213c16da16969553b05 SHA1 c8933c4800aabfd823aaae863df1f4f484b8d7cb SHA256 f9bec029925c1c489074ddb7a91e07a280f7c787cca5d7431e879d40d6e77339
+EBUILD xf86-input-joystick-9999.ebuild 392 RMD160 96ef14902d51dd27302dd929add9ac390db2256b SHA1 b6c5f0eb818ba897c4df642093a44864800d2a52 SHA256 ce4cb6144ae696e89b993316a912b28d1fd4d060033aff0b908096ffa0c9e423
MISC metadata.xml 254 RMD160 c1c6e70dd9088c05d91c8188791534dae7ffa665 SHA1 2dcdc428213d896d7b0d00f46edfa49799a0f0a8 SHA256 326a5b3b205fe4d2e8822e5a595c500d19bf3d6c527ab1305a24ef476bd1c08b
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 6162272d..025a41e2 100644
--- a/x11-drivers/xf86-input-joystick/xf86-input-joystick-9999.ebuild
+++ b/x11-drivers/xf86-input-joystick/xf86-input-joystick-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org driver for joystick input devices"
diff --git a/x11-drivers/xf86-input-keyboard/Manifest b/x11-drivers/xf86-input-keyboard/Manifest
index 31c99e61..e3a37a83 100644
--- a/x11-drivers/xf86-input-keyboard/Manifest
+++ b/x11-drivers/xf86-input-keyboard/Manifest
@@ -1,2 +1,2 @@
-EBUILD xf86-input-keyboard-9999.ebuild 416 RMD160 f36c2bc153ab7592474c26dd59835fc7b7019733 SHA1 e2decc5b7c47d517ed1582e3fae515bd7f439a59 SHA256 be14b8fb276cae76ca62f038de84d60bfcba629794676dcb63971ae215dd6c24
+EBUILD xf86-input-keyboard-9999.ebuild 422 RMD160 7f1996e27d90b0b35ca7a23dd4effd8c0061dfa0 SHA1 327ebe8860eb89553826d1beeedd8501cce71247 SHA256 0f1a9fda4e2cc7cd01b4b99fb3c5d5c92a6772e31c8a9073e6d976329dd8b284
MISC metadata.xml 254 RMD160 c1c6e70dd9088c05d91c8188791534dae7ffa665 SHA1 2dcdc428213d896d7b0d00f46edfa49799a0f0a8 SHA256 326a5b3b205fe4d2e8822e5a595c500d19bf3d6c527ab1305a24ef476bd1c08b
diff --git a/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-9999.ebuild b/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-9999.ebuild
index ce719c52..694a34c7 100644
--- a/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-9999.ebuild
+++ b/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="Keyboard input driver"
diff --git a/x11-drivers/xf86-input-mouse/Manifest b/x11-drivers/xf86-input-mouse/Manifest
index 64aea544..0eadadb3 100644
--- a/x11-drivers/xf86-input-mouse/Manifest
+++ b/x11-drivers/xf86-input-mouse/Manifest
@@ -1,2 +1,2 @@
-EBUILD xf86-input-mouse-9999.ebuild 417 RMD160 6e3699fc71f707dda1d5c5efd0417fdfa716c61a SHA1 bd7ac0bf20dde1d7f49c67da325cf5ea1a881487 SHA256 b9eeec945597486c64101fb39a349d91f5df612425cc89054c89b3f4ffc3da97
+EBUILD xf86-input-mouse-9999.ebuild 423 RMD160 b6af5867174d173ca8b0c49c4490f6c243b87ba8 SHA1 088a6e901f7a23e24a94edbe1c16565e9242edd2 SHA256 b9248128c45c185289b48eb7be260fba3094b12221ee06ff0de58a26e46e3727
MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-drivers/xf86-input-mouse/xf86-input-mouse-9999.ebuild b/x11-drivers/xf86-input-mouse/xf86-input-mouse-9999.ebuild
index e80b0898..76780bc6 100644
--- a/x11-drivers/xf86-input-mouse/xf86-input-mouse-9999.ebuild
+++ b/x11-drivers/xf86-input-mouse/xf86-input-mouse-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org driver for mouse input devices"
diff --git a/x11-drivers/xf86-input-synaptics/Manifest b/x11-drivers/xf86-input-synaptics/Manifest
index 77506b72..a34399e2 100644
--- a/x11-drivers/xf86-input-synaptics/Manifest
+++ b/x11-drivers/xf86-input-synaptics/Manifest
@@ -1,2 +1,2 @@
-EBUILD xf86-input-synaptics-9999.ebuild 1341 RMD160 a9f8925eda4f0d046a17cbee97187c48b35d8b2f SHA1 502512f56edaf61792421852c5ebec892de44f32 SHA256 a7230101ac2c84a91906611648860df5023bfda2c285d3cc709a8c777ddc3583
+EBUILD xf86-input-synaptics-9999.ebuild 1359 RMD160 9159a1425e8778c966d22466cba5137ee5821ec8 SHA1 e81cd79d7f9e91e1ea1cacc8df1e71a65401c9b0 SHA256 5dcfbd630ec17cc7d70c9156bc71f4c6f315e0be5624ce00652080e04aeb07f8
MISC metadata.xml 254 RMD160 c1c6e70dd9088c05d91c8188791534dae7ffa665 SHA1 2dcdc428213d896d7b0d00f46edfa49799a0f0a8 SHA256 326a5b3b205fe4d2e8822e5a595c500d19bf3d6c527ab1305a24ef476bd1c08b
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-9999.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-9999.ebuild
index 1931009d..0406fde9 100644
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-9999.ebuild
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit linux-info xorg-2
+inherit linux-info x-modular-r2
DESCRIPTION="Driver for Synaptics touchpads"
HOMEPAGE="http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/"
@@ -22,7 +22,7 @@ DEPEND="${RDEPEND}
src_install() {
DOCS="TODO README"
- xorg-2_src_install
+ x-modular-r2_src_install
if use hal ; then
insinto /usr/share/hal/fdi/policy/10osvendor
@@ -31,7 +31,7 @@ src_install() {
}
pkg_postinst() {
- xorg-2_pkg_postinst
+ x-modular-r2_pkg_postinst
# Just a friendly warning
if linux_config_exists; then
if ! linux_chkconfig_present INPUT_EVDEV; then
diff --git a/x11-drivers/xf86-input-wacom/Manifest b/x11-drivers/xf86-input-wacom/Manifest
index 6afcb2cb..c0e9230f 100644
--- a/x11-drivers/xf86-input-wacom/Manifest
+++ b/x11-drivers/xf86-input-wacom/Manifest
@@ -1 +1 @@
-EBUILD xf86-input-wacom-9999.ebuild 1404 RMD160 d1c729ae5deb81fee362bcddf308ca29e70f9711 SHA1 d890fe69bd825323c9989418f471ab8682bf281c SHA256 0a76063ddd965a34082a69f637049fe885220316a4e045914414478a157a235c
+EBUILD xf86-input-wacom-9999.ebuild 1428 RMD160 4bf3cc020063172a0790ce75b88c5b6e8027aaa1 SHA1 102857c74d61f1844ad24f5646b404cd47267ca0 SHA256 bd6bb7c6f87151bc4e0138f185b548e965ef0e03dea17f9e6016abefe82dce2a
diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-9999.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-9999.ebuild
index 1089727d..ff03bbe8 100644
--- a/x11-drivers/xf86-input-wacom/xf86-input-wacom-9999.ebuild
+++ b/x11-drivers/xf86-input-wacom/xf86-input-wacom-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit linux-info xorg-2
+inherit linux-info x-modular-r2
DESCRIPTION="Driver for Wacom tablets and drawing devices"
LICENSE="GPL-2"
@@ -24,13 +24,13 @@ DEPEND="${COMMON_DEPEND}
pkg_setup() {
linux-info_pkg_setup
- xorg-2_pkg_setup
+ x-modular-r2_pkg_setup
CONFIGURE_OPTIONS="$(use_enable debug)"
}
src_install() {
- xorg-2_src_install
+ x-modular-r2_src_install
rm -r "${D}/usr/share/hal"
if use hal; then
@@ -40,7 +40,7 @@ src_install() {
}
pkg_postinst() {
- xorg-2_pkg_postinst
+ x-modular-r2_pkg_postinst
if ! linux_config_exists \
|| ! linux_chkconfig_present TABLET_USB_WACOM \
diff --git a/x11-drivers/xf86-video-ati/Manifest b/x11-drivers/xf86-video-ati/Manifest
index 70987b32..c1dfa772 100644
--- a/x11-drivers/xf86-video-ati/Manifest
+++ b/x11-drivers/xf86-video-ati/Manifest
@@ -1 +1 @@
-EBUILD xf86-video-ati-9999.ebuild 641 RMD160 a78f447cdcf05544ff6e28d2db77183cb05b1639 SHA1 5bd7e2b3cc84088e451850ab83a878139559cffd SHA256 1dbc5f8f01e30ff17c6b906b507e19749a6837fa2a651e9d710c28030ca155dd
+EBUILD xf86-video-ati-9999.ebuild 653 RMD160 453fa99b73b1f5c71c084dfa1583678ac64d27d1 SHA1 15da4fbe85d2373a800a3dd4aaf11bbd1564a165 SHA256 7b04c32fd22d85865037f9dfed9264ad3216faea19140b04778a9a653741e821
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild
index afbf879a..329db562 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="ATI video driver"
@@ -24,7 +24,7 @@ DEPEND="${RDEPEND}
x11-proto/xproto"
pkg_setup() {
- xorg-2_pkg_setup
+ x-modular-r2_pkg_setup
CONFIGURE_OPTIONS="
--enable-dri
--enable-kms
diff --git a/x11-drivers/xf86-video-displaylink/Manifest b/x11-drivers/xf86-video-displaylink/Manifest
index e71df7f1..55ca502c 100644
--- a/x11-drivers/xf86-video-displaylink/Manifest
+++ b/x11-drivers/xf86-video-displaylink/Manifest
@@ -1,3 +1,3 @@
AUX xf86-video-displaylink-0.3-xorg-abi-fix.patch 741 RMD160 27a6e1b0b55b3175efe40222a04e97a75739081b SHA1 84d18e14d322c077c6658739375b443760c68968 SHA256 88f4fe9612e3617638a7b32e16da576cf753d4ef1814b1a04bfc82b21f5a0606
DIST udlfb-0.2.3_and_xf86-video-displaylink-0.3.tar.gz 520478 RMD160 213ac2c3fcc14df673677fad8eb772b44a4ac98b SHA1 56b00990eaf237326229d0cf844bc422419eaaa8 SHA256 487a1d7bf4b896d9a4b9e7dd1bd293adcadde5684fe9fe32aa209761c3191b3e
-EBUILD xf86-video-displaylink-0.3.ebuild 613 RMD160 83d224cb6bd3581d96226cc0b962793fb5955685 SHA1 fd7b3d7f68f9568724a1ee619addc78646287e9b SHA256 7d827a0f7b620d85d08f963e1da17080fa021c0e554b1a1fec40468ba8949d44
+EBUILD xf86-video-displaylink-0.3.ebuild 619 RMD160 ede840969b615d9f26ed2d9fdc7b896912d2ae5a SHA1 56b078bea2d4c7f4d19221febb397920be29c63d SHA256 57097b01a3d75372297583f3ac018883347abb7eeaddf4ddee95e23fc5d0187f
diff --git a/x11-drivers/xf86-video-displaylink/xf86-video-displaylink-0.3.ebuild b/x11-drivers/xf86-video-displaylink/xf86-video-displaylink-0.3.ebuild
index 542faa9f..2ab32a19 100644
--- a/x11-drivers/xf86-video-displaylink/xf86-video-displaylink-0.3.ebuild
+++ b/x11-drivers/xf86-video-displaylink/xf86-video-displaylink-0.3.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="xf86 displaylink driver"
HOMEPAGE="http://libdlo.freedesktop.org/wiki/xf86-driver-displaylink"
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index b1b016bb..5c688f7b 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -1,3 +1,3 @@
DIST xf86-video-intel-2.10.0.tar.bz2 885299 RMD160 e37d47758231d61d99fa65873884727b44623c33 SHA1 1683eddf89ed88f109cb2fe46284e3f8f304a0d9 SHA256 e46dd691dc93db7cd6f5f22b84fea7e9f4bfd34f28026cfd680993b3ccfc48ab
EBUILD xf86-video-intel-2.10.0.ebuild 680 RMD160 7cc837ce0b5cf6436f4165cb811c52aacb937ffc SHA1 fbce51daef3a2c81f263a27eeda0062e513741b8 SHA256 7981c9e61b7c8cd02eb0d7ac6a6e1bec9616f0d4b0b1b430434789632e4b67c5
-EBUILD xf86-video-intel-9999.ebuild 695 RMD160 cf05706828d0acc1cc9c77875d19371c4cb02fac SHA1 4c19f1a968888bfc12261b0ed7dfd252b1f57919 SHA256 e5e2a0b9543fb4445590ab03fcd227f11f9dcdb38ac73191562848394852821b
+EBUILD xf86-video-intel-9999.ebuild 707 RMD160 1c2027b0a2134b4aa34bd693351bf200c8186576 SHA1 21c759b334fabec9acd7d4dc507a16d5a6b934a0 SHA256 8385254abd80aa1b190f3eda81482d410a8812d5a176ed273c487501ccb241f7
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild
index d8dc580f..e57d76b0 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org driver for Intel cards"
@@ -28,6 +28,6 @@ DEPEND="${RDEPEND}
x11-proto/glproto )"
pkg_setup() {
- xorg-2_pkg_setup
+ x-modular-r2_pkg_setup
CONFIGURE_OPTIONS="$(use_enable dri)"
}
diff --git a/x11-drivers/xf86-video-nouveau/Manifest b/x11-drivers/xf86-video-nouveau/Manifest
index 545c3512..7d3c89b4 100644
--- a/x11-drivers/xf86-video-nouveau/Manifest
+++ b/x11-drivers/xf86-video-nouveau/Manifest
@@ -1,2 +1,2 @@
-EBUILD xf86-video-nouveau-9999.ebuild 1132 RMD160 5124c77c49501d563d35bc26422c7b0456b8904e SHA1 9603c4d2000aa839069df1f7811b53eab9e6a569 SHA256 f36b10adc944d54fcefca8d7c0adf7710b655d0e48f020cd146b338f5142fe11
+EBUILD xf86-video-nouveau-9999.ebuild 1144 RMD160 aba9f285362350352fcc3e6a7fef55223b8f3d54 SHA1 09cd5606ffe3d8f8cfe5d2da99074e865ddfa806 SHA256 cd1b9de68e0ad75a9d6a34ef58822d1dd84077f84bf5add97e46b9bfecbdb6f3
MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-9999.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-9999.ebuild
index 0e17fc58..d9361320 100644
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-9999.ebuild
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit linux-info xorg-2
+inherit linux-info x-modular-r2
EGIT_REPO_URI="git://anongit.freedesktop.org/git/nouveau/${PN}"
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
x11-proto/xproto"
pkg_postinst() {
- xorg-2_pkg_postinst
+ x-modular-r2_pkg_postinst
if ! has_version x11-base/nouveau-drm; then
if ! linux_config_exists || ! linux_chkconfig_present DRM_NOUVEAU; then
ewarn "Nouveau DRM not detected. If you want any kind of"
diff --git a/x11-libs/libFS/Manifest b/x11-libs/libFS/Manifest
index bea6c388..1e9f7127 100644
--- a/x11-libs/libFS/Manifest
+++ b/x11-libs/libFS/Manifest
@@ -1 +1 @@
-EBUILD libFS-9999.ebuild 407 RMD160 22449807408a2afdf094def19f863b6506de0dad SHA1 de9c41e4a9e041db77fb95c506d344ef5303d27a SHA256 37643ed308a5347b75354c29f29e16c42adfcd7c1c4e260295dbf9c82340ddb7
+EBUILD libFS-9999.ebuild 413 RMD160 146300cb828bc0c73058092b64cb8958fe81e4d2 SHA1 db2241aeea0b9e05075effd70deaa0df5fe7e181 SHA256 8849a6119ef04f37ef4163135036c3f54ffa676557f91307d5f07a97e86a5ca4
diff --git a/x11-libs/libFS/libFS-9999.ebuild b/x11-libs/libFS/libFS-9999.ebuild
index d416e749..696c3f51 100644
--- a/x11-libs/libFS/libFS-9999.ebuild
+++ b/x11-libs/libFS/libFS-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org FS library"
diff --git a/x11-libs/libICE/Manifest b/x11-libs/libICE/Manifest
index 31add89c..82810e30 100644
--- a/x11-libs/libICE/Manifest
+++ b/x11-libs/libICE/Manifest
@@ -1 +1 @@
-EBUILD libICE-9999.ebuild 421 RMD160 23cb3b179b6fbc07efb87284485052f47eeefa1d SHA1 73cdea52122d975ca5a5df5db153342c38133b58 SHA256 402a44274f82e18d0f01cd9c567d1027fcb289ab004429bd2456a2b07629dfbe
+EBUILD libICE-9999.ebuild 433 RMD160 714f4ac831a036b576ab999fa41668f720bf0531 SHA1 646ecf2499c24057dbcd9ea08cd47186c86ae22c SHA256 9a52e096c01ea97bcf5170c156cb36f086f3b37f19ba409c5ef7eef23e6c9249
diff --git a/x11-libs/libICE/libICE-9999.ebuild b/x11-libs/libICE/libICE-9999.ebuild
index 55d56d2e..7ab72a38 100644
--- a/x11-libs/libICE/libICE-9999.ebuild
+++ b/x11-libs/libICE/libICE-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org ICE library"
@@ -15,6 +15,6 @@ RDEPEND="x11-libs/xtrans
DEPEND="${RDEPEND}"
pkg_setup() {
- xorg-2_pkg_setup
+ x-modular-r2_pkg_setup
CONFIGURE_OPTIONS="$(use_enable ipv6)"
}
diff --git a/x11-libs/libSM/Manifest b/x11-libs/libSM/Manifest
index bce7eda3..cee88489 100644
--- a/x11-libs/libSM/Manifest
+++ b/x11-libs/libSM/Manifest
@@ -1 +1 @@
-EBUILD libSM-9999.ebuild 402 RMD160 49335a7c2108c65f9ec91a77c4688c095066f7af SHA1 12d7c3e4cc8b7edd87638874bd3131be53f4a662 SHA256 b936a891c95eea25396794c6ceb3ac6225c459bef8f205bc7f11266923ecf724
+EBUILD libSM-9999.ebuild 408 RMD160 985b10dab14bf48f333a313a55a0a3c4a3c5fd95 SHA1 829c7a7e781610886dad7991d42ad32312234af5 SHA256 332783f38a7f2015118ec6b46c005d1fc8e190b273924bb2480739c1a206be8a
diff --git a/x11-libs/libSM/libSM-9999.ebuild b/x11-libs/libSM/libSM-9999.ebuild
index 2081c602..a594b74b 100644
--- a/x11-libs/libSM/libSM-9999.ebuild
+++ b/x11-libs/libSM/libSM-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org SM library"
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index f8cfee2b..5fc6748d 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1 +1 @@
-EBUILD libX11-9999.ebuild 1155 RMD160 32c324a967b2c5c5d74639fbf542b2a03d968bb3 SHA1 2078d79697519564fed7fe07a61d0377fd18784a SHA256 076184b8c2f1172160913332145528d3dbd0561284782a299ab3e1b73fe0cb45
+EBUILD libX11-9999.ebuild 1173 RMD160 9a3a8b4cd713d92fef2146d088b5eeee3a4a5c18 SHA1 e2335023d505505d2bfc1ff438245408417d6606 SHA256 1efe6a10604e0348df90d772164e04c9fe6095ae942a51908d9e84186a5ffc31
diff --git a/x11-libs/libX11/libX11-9999.ebuild b/x11-libs/libX11/libX11-9999.ebuild
index e87d8fbc..ddbf5ce4 100644
--- a/x11-libs/libX11/libX11-9999.ebuild
+++ b/x11-libs/libX11/libX11-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2 toolchain-funcs flag-o-matic
+inherit x-modular-r2 toolchain-funcs flag-o-matic
DESCRIPTION="X.Org X11 library"
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
x11-proto/xextproto"
pkg_setup() {
- xorg-2_pkg_setup
+ x-modular-r2_pkg_setup
CONFIGURE_OPTIONS="$(use_enable doc specs) $(use_enable ipv6)
$(use_with xcb) $(use_with test perl)"
# xorg really doesn't like xlocale disabled.
@@ -43,5 +43,5 @@ pkg_setup() {
src_compile() {
# [Cross-Compile Love] Disable {C,LD}FLAGS and redefine CC= for 'makekeys'
( filter-flags -m* ; cd src/util && make CC=$(tc-getBUILD_CC) CFLAGS="${CFLAGS}" LDFLAGS="" clean all)
- xorg-2_src_compile
+ x-modular-r2_src_compile
}
diff --git a/x11-libs/libXScrnSaver/Manifest b/x11-libs/libXScrnSaver/Manifest
index 7fdff907..9a5353ca 100644
--- a/x11-libs/libXScrnSaver/Manifest
+++ b/x11-libs/libXScrnSaver/Manifest
@@ -1 +1 @@
-EBUILD libXScrnSaver-9999.ebuild 408 RMD160 b6a0c983ef7a9dcf924e6b021b4c6b7567343ec9 SHA1 8ddb43e0a10599ba204b23296d0b49ae12cc38c1 SHA256 a79403135ba4e6531fd23305eaf452599488b128869965537a0d625ef6511b95
+EBUILD libXScrnSaver-9999.ebuild 414 RMD160 e2fa46c696ffac8c5f7fd3bd3cbe46b8e1c48665 SHA1 776d83638243b22f39134dea3a4fae2333b7a8d0 SHA256 ab3d278ce7dfe63c70c675dd560b7ab347114aeca7973538003414174c3359e3
diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-9999.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-9999.ebuild
index 0acb3118..50fb3abf 100644
--- a/x11-libs/libXScrnSaver/libXScrnSaver-9999.ebuild
+++ b/x11-libs/libXScrnSaver/libXScrnSaver-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org XScrnSaver library"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-libs/libXTrap/Manifest b/x11-libs/libXTrap/Manifest
index 7e19d2ba..56bba8b9 100644
--- a/x11-libs/libXTrap/Manifest
+++ b/x11-libs/libXTrap/Manifest
@@ -1 +1 @@
-EBUILD libXTrap-9999.ebuild 381 RMD160 fb410ce7039a754ec1a232586586b58d6bd44ba2 SHA1 0a23801950d0e0da6480806ab78aede0e24c71e4 SHA256 786517727d1f3e71631562181f52497899d27fb9a39ad30eac6cc72b9a822773
+EBUILD libXTrap-9999.ebuild 387 RMD160 4db3d8823422be7249b959252613c7884eca6c54 SHA1 20fdb783964cf508ef229232be99a18f5c9b9071 SHA256 97907368b9db4477e118a99bd5dd38035bc37bf4e7f8205632a31579e8dce0e3
diff --git a/x11-libs/libXTrap/libXTrap-9999.ebuild b/x11-libs/libXTrap/libXTrap-9999.ebuild
index a54d99bc..83be3761 100644
--- a/x11-libs/libXTrap/libXTrap-9999.ebuild
+++ b/x11-libs/libXTrap/libXTrap-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org XTrap library"
diff --git a/x11-libs/libXamine/Manifest b/x11-libs/libXamine/Manifest
index 4690ea54..03e116a1 100644
--- a/x11-libs/libXamine/Manifest
+++ b/x11-libs/libXamine/Manifest
@@ -1 +1 @@
-EBUILD libXamine-9999.ebuild 516 RMD160 4c4374870670246beb57d91afadec8c42be3afaf SHA1 abef0d3ea0a96d0cf8d26f92341c6364ba3b2d8e SHA256 3c30618cc4a599a92d7979fb8b6f41582eb9b67403173a8a4c80381b751492e7
+EBUILD libXamine-9999.ebuild 522 RMD160 9f1bad05cfceadd3fda532f7f3b510fc61b132fb SHA1 98e7c1cad7873d6d4d03b7778bed443328b36b6c SHA256 e7926673409e16ae189de07268d2602a12025effeb895156788dc7c1c1cf7ce9
diff --git a/x11-libs/libXamine/libXamine-9999.ebuild b/x11-libs/libXamine/libXamine-9999.ebuild
index 3675c163..1d0578a7 100644
--- a/x11-libs/libXamine/libXamine-9999.ebuild
+++ b/x11-libs/libXamine/libXamine-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libXamine"
DESCRIPTION="Protocol analysis library for the X Window System protocol"
diff --git a/x11-libs/libXau/Manifest b/x11-libs/libXau/Manifest
index 47dbce30..78c4cf7e 100644
--- a/x11-libs/libXau/Manifest
+++ b/x11-libs/libXau/Manifest
@@ -1 +1 @@
-EBUILD libXau-9999.ebuild 353 RMD160 032f17c8f8fc0c2a74bf2b9f15de5c7d76f1f652 SHA1 c970192accf30afe9537628e8db4182feb7905a4 SHA256 a00c676c7fe9533a10325c2e65a86616d199e56ddb38183aeec8a1aee51ef1c7
+EBUILD libXau-9999.ebuild 359 RMD160 7c0136562e2c20033a0b6efdbbe9250c15ee1d0f SHA1 57aa7bbf59898af2d3ce6e193bebbda1025cb60f SHA256 6e3aba83437da508204b751ef3d16e82412f5348a7983a80a55d0197571ff111
diff --git a/x11-libs/libXau/libXau-9999.ebuild b/x11-libs/libXau/libXau-9999.ebuild
index ba872823..152a69a8 100644
--- a/x11-libs/libXau/libXau-9999.ebuild
+++ b/x11-libs/libXau/libXau-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Xau library"
diff --git a/x11-libs/libXaw/Manifest b/x11-libs/libXaw/Manifest
index e1650691..2b38be0b 100644
--- a/x11-libs/libXaw/Manifest
+++ b/x11-libs/libXaw/Manifest
@@ -1 +1 @@
-EBUILD libXaw-9999.ebuild 622 RMD160 155842721bfaeb823ecdacd0f8e518c8ab4f1a1f SHA1 7e046e2e4da23ed85ef394056095ad17e39d6d29 SHA256 e4e00d00a34d2efc61d4dbe65239e382bd9b11689bcc8a6ccd79db4fd0586b4f
+EBUILD libXaw-9999.ebuild 634 RMD160 b7564ce506237a4ed004c406fe314572d831d090 SHA1 ad11b1bf1c07712650ab0a25e38f2a834616f70c SHA256 46cb16e95c3ef435175489fed0a8710db3df74f2b45763f7401d965e291856dd
diff --git a/x11-libs/libXaw/libXaw-9999.ebuild b/x11-libs/libXaw/libXaw-9999.ebuild
index 8de5ad08..3d1a2ac0 100644
--- a/x11-libs/libXaw/libXaw-9999.ebuild
+++ b/x11-libs/libXaw/libXaw-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Xaw library"
@@ -19,7 +19,7 @@ DEPEND="${RDEPEND}
doc? ( sys-apps/groff )"
pkg_setup() {
- xorg-2_pkg_setup
+ x-modular-r2_pkg_setup
# (#125465) Broken with Bdirect support
filter-flags -Wl,-Bdirect
filter-ldflags -Bdirect
diff --git a/x11-libs/libXcomposite/Manifest b/x11-libs/libXcomposite/Manifest
index 1c4a9eda..56221a1e 100644
--- a/x11-libs/libXcomposite/Manifest
+++ b/x11-libs/libXcomposite/Manifest
@@ -1 +1 @@
-EBUILD libXcomposite-9999.ebuild 447 RMD160 40aae2d7913c96d85ca0f21e7f015e32ea1b51d1 SHA1 b8832a6c3ac26b9ac8747efc31f421b135c22f49 SHA256 8c3c13763cc1e3427d6333a4988981b3f2f56f108b87dda0f81c0f727071a43b
+EBUILD libXcomposite-9999.ebuild 453 RMD160 34b60a5ab2eddd33ef35705ba2af79673dc24fd5 SHA1 7b0abdff06192d542278c886dfaae11455230fa3 SHA256 cd689981a996394934b68b47bdf631fb72b52100adba3e24c1c13fd09d680454
diff --git a/x11-libs/libXcomposite/libXcomposite-9999.ebuild b/x11-libs/libXcomposite/libXcomposite-9999.ebuild
index c6d7c093..71801e9e 100644
--- a/x11-libs/libXcomposite/libXcomposite-9999.ebuild
+++ b/x11-libs/libXcomposite/libXcomposite-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Xcomposite library"
diff --git a/x11-libs/libXcursor/Manifest b/x11-libs/libXcursor/Manifest
index f85b5351..6430cd18 100644
--- a/x11-libs/libXcursor/Manifest
+++ b/x11-libs/libXcursor/Manifest
@@ -1 +1 @@
-EBUILD libXcursor-9999.ebuild 712 RMD160 e11a6756f625120db0b7883f4388b1f47ad1081b SHA1 6ef98df9ace12ae405d169cbabd991ba7e979a77 SHA256 305464cf1b5c52b566535fe6ff215000a81c4a7c14925c2fa44f6a6b1760d199
+EBUILD libXcursor-9999.ebuild 718 RMD160 662be32585b772abcb924f2ccc482dd1a6f6bb90 SHA1 b3353f341194e7ab5a694d46610fbdbbe277a712 SHA256 f99704a8ff65b1974aad2e64dd930cd2d3b41a98af90b1bd3b62aff6864af442
diff --git a/x11-libs/libXcursor/libXcursor-9999.ebuild b/x11-libs/libXcursor/libXcursor-9999.ebuild
index d9e4e876..2693f06b 100644
--- a/x11-libs/libXcursor/libXcursor-9999.ebuild
+++ b/x11-libs/libXcursor/libXcursor-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Xcursor library"
diff --git a/x11-libs/libXdamage/Manifest b/x11-libs/libXdamage/Manifest
index 3078a736..136232fc 100644
--- a/x11-libs/libXdamage/Manifest
+++ b/x11-libs/libXdamage/Manifest
@@ -1 +1 @@
-EBUILD libXdamage-9999.ebuild 395 RMD160 c3bbc315539f27ba2b8aea9c5399a642a4226508 SHA1 9f13f18f324c12d1a4447427bd87abccc6f82abf SHA256 b343a429a111e548766dbcd275f1498aa69a5aa6b5d37cf11c6cc43adf317b1d
+EBUILD libXdamage-9999.ebuild 401 RMD160 0f930469ac190209828cc523516e85accc1276fb SHA1 5c5d75741eb09761018268af93f36d1f33084985 SHA256 83b83acae316b17bc4ebd4f13370c3609d8e6c0dd9481147c54b954f315912b4
diff --git a/x11-libs/libXdamage/libXdamage-9999.ebuild b/x11-libs/libXdamage/libXdamage-9999.ebuild
index b308f054..a182eba9 100644
--- a/x11-libs/libXdamage/libXdamage-9999.ebuild
+++ b/x11-libs/libXdamage/libXdamage-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Xdamage library"
diff --git a/x11-libs/libXdmcp/Manifest b/x11-libs/libXdmcp/Manifest
index bdde8254..7c751bf1 100644
--- a/x11-libs/libXdmcp/Manifest
+++ b/x11-libs/libXdmcp/Manifest
@@ -1 +1 @@
-EBUILD libXdmcp-9999.ebuild 355 RMD160 e5ddb95ffe5de3ae7c58630c329a5bd6e8680835 SHA1 24ecd0cdf1d2db69bad93938f25097b79a631e25 SHA256 c91986c3f88cd62c584d19881942384752f798b9bd99d179d534d9bca1860745
+EBUILD libXdmcp-9999.ebuild 361 RMD160 7113f4320278509caa087c42cf386843563dda81 SHA1 228845d9a8ec530d3953d84df6a71aa4e707263b SHA256 d9e285c84ef377f43db8d3cc760ca4dd1c8207057f3cbe9313ddf109921e7e26
diff --git a/x11-libs/libXdmcp/libXdmcp-9999.ebuild b/x11-libs/libXdmcp/libXdmcp-9999.ebuild
index d2d251b3..9f1f9ae3 100644
--- a/x11-libs/libXdmcp/libXdmcp-9999.ebuild
+++ b/x11-libs/libXdmcp/libXdmcp-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Xdmcp library"
diff --git a/x11-libs/libXevie/Manifest b/x11-libs/libXevie/Manifest
index a8b094d4..8f014e5a 100644
--- a/x11-libs/libXevie/Manifest
+++ b/x11-libs/libXevie/Manifest
@@ -1 +1 @@
-EBUILD libXevie-9999.ebuild 381 RMD160 c4e0014720fce9b63bf12e179360a199812ca39b SHA1 e1372f2e1d2f5589d33eaac950d2de14eea69a87 SHA256 3b857bf0930745ea6891dbd1d0000d425ce224eb2c47752c8201a907fa8ff96e
+EBUILD libXevie-9999.ebuild 387 RMD160 29c583ec56d3fb8ff743819c000362b3edab3205 SHA1 32f3b9fef013259993cdcdb8b148f705a942da9d SHA256 73b98f9800bc35d5651c00d5c8a4479bed5f56e4afa566b5ceda14054c35adbe
diff --git a/x11-libs/libXevie/libXevie-9999.ebuild b/x11-libs/libXevie/libXevie-9999.ebuild
index 6118b17b..bf83ae12 100644
--- a/x11-libs/libXevie/libXevie-9999.ebuild
+++ b/x11-libs/libXevie/libXevie-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Xevie library"
diff --git a/x11-libs/libXext/Manifest b/x11-libs/libXext/Manifest
index 3d03c1cb..ac1d4e47 100644
--- a/x11-libs/libXext/Manifest
+++ b/x11-libs/libXext/Manifest
@@ -1 +1 @@
-EBUILD libXext-9999.ebuild 395 RMD160 0f53cceb975b7fbcbb447b5cc93af7b7b481125c SHA1 5e63b4c42b23d0ecda6a04eed6de1a0c40a39f3a SHA256 b3373f645750f1155189007853face0fcbd930cea9f7e4c993ee50f56dce3a7f
+EBUILD libXext-9999.ebuild 401 RMD160 2ed21720b8c146dcf5407b50390323313a814149 SHA1 1a9f8d77c79a6b11205e90d1f62c50dfc9852b70 SHA256 bb9f7b75e7f44411c2a16ea057dffb4f608dd0ae27a4c3c712a74e3581171dd8
diff --git a/x11-libs/libXext/libXext-9999.ebuild b/x11-libs/libXext/libXext-9999.ebuild
index 3b32a66d..d383d6ee 100644
--- a/x11-libs/libXext/libXext-9999.ebuild
+++ b/x11-libs/libXext/libXext-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Xext library"
diff --git a/x11-libs/libXfixes/Manifest b/x11-libs/libXfixes/Manifest
index cb1e10ad..7987451c 100644
--- a/x11-libs/libXfixes/Manifest
+++ b/x11-libs/libXfixes/Manifest
@@ -1 +1 @@
-EBUILD libXfixes-9999.ebuild 392 RMD160 4ce3efa5f0d818174cc80a4eebebf5dfdf8df83d SHA1 1032171136c481e69f01f954a98a6965eac80def SHA256 d799da0813223341dd60ed74506dfbee967fb20278ea7ba4c0c2aa2b7c8396d6
+EBUILD libXfixes-9999.ebuild 398 RMD160 4c9d6e90eb9922d1561876eb9155d6d904781fa1 SHA1 44bde9c3534de0a4d95f6a5b69849b6d410e4d27 SHA256 c68736eede5bebf706f88c2f67188b097d7fc89e505a73a9b0ddba1196815c9b
diff --git a/x11-libs/libXfixes/libXfixes-9999.ebuild b/x11-libs/libXfixes/libXfixes-9999.ebuild
index 5a86970e..234ec833 100644
--- a/x11-libs/libXfixes/libXfixes-9999.ebuild
+++ b/x11-libs/libXfixes/libXfixes-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Xfixes library"
diff --git a/x11-libs/libXfont/Manifest b/x11-libs/libXfont/Manifest
index 36639338..003efe79 100644
--- a/x11-libs/libXfont/Manifest
+++ b/x11-libs/libXfont/Manifest
@@ -1 +1 @@
-EBUILD libXfont-9999.ebuild 681 RMD160 34fd3964affc18b4f7d7197af40ae77fab0e6f0e SHA1 63743aa128012944d80a495c7447d1a89b7ff2f0 SHA256 9539dcb7ef4d5bbefc87b0cffa656858e9752cf756647fec0865f65b0d25e90e
+EBUILD libXfont-9999.ebuild 693 RMD160 e33bce1440bdd7069b1d99b33ba4d2ee0cd4bfad SHA1 2c2cc2450a92ac408b4a0c445993e57baeed89aa SHA256 f25ad29df434c7b77f19fed8637583e799c74921353b291d19d13067fbf737e6
diff --git a/x11-libs/libXfont/libXfont-9999.ebuild b/x11-libs/libXfont/libXfont-9999.ebuild
index 136706c6..c4431470 100644
--- a/x11-libs/libXfont/libXfont-9999.ebuild
+++ b/x11-libs/libXfont/libXfont-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2 flag-o-matic
+inherit x-modular-r2 flag-o-matic
DESCRIPTION="X.Org Xfont library"
@@ -19,7 +19,7 @@ RDEPEND="x11-libs/xtrans
DEPEND="${RDEPEND}"
pkg_setup() {
- xorg-2_pkg_setup
+ x-modular-r2_pkg_setup
CONFIGURE_OPTIONS="$(use_enable ipv6)
--with-bzip2
--disable-devel-docs"
diff --git a/x11-libs/libXfontcache/Manifest b/x11-libs/libXfontcache/Manifest
index fd61ac54..e14a324c 100644
--- a/x11-libs/libXfontcache/Manifest
+++ b/x11-libs/libXfontcache/Manifest
@@ -1 +1 @@
-EBUILD libXfontcache-9999.ebuild 375 RMD160 7bb6b6a81240dfab9c1cb47203f9caf51f5200d2 SHA1 1d7fb7870fb962760915cefb9062331cdab91775 SHA256 631594143efaf44430b67518ddba8aed0af3b8862c9e5009f2dd1280d47aff62
+EBUILD libXfontcache-9999.ebuild 381 RMD160 2f60924788f61052c64f7c21df52d82783f4209d SHA1 9565863a8fc2294abe0945a1b541301794738f58 SHA256 5f4a382533bb32ea2a97e3759b8d105909a2b20c4d0a0f5ad51e442cbd195ba1
diff --git a/x11-libs/libXfontcache/libXfontcache-9999.ebuild b/x11-libs/libXfontcache/libXfontcache-9999.ebuild
index 9d3d0fd7..bc2dcd2a 100644
--- a/x11-libs/libXfontcache/libXfontcache-9999.ebuild
+++ b/x11-libs/libXfontcache/libXfontcache-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Xfontcache library"
diff --git a/x11-libs/libXft/Manifest b/x11-libs/libXft/Manifest
index 0acd0a6d..181e7384 100644
--- a/x11-libs/libXft/Manifest
+++ b/x11-libs/libXft/Manifest
@@ -1 +1 @@
-EBUILD libXft-9999.ebuild 595 RMD160 dc968566044b02228d4166911883abad92cba62f SHA1 95dccd936dd62aa36daecc067e0fc6c07433273c SHA256 9d51f65f727e22e6a5d4185aaddcbbc2bc67e1da88e4af667598c2f7de19c927
+EBUILD libXft-9999.ebuild 607 RMD160 b6c3d2ddf8e4fae6cf726a9bd362a81fce7f9146 SHA1 e82acda132946af3e3e1c5b34c58f344dccc301a SHA256 ecb811fe82285ba30850888930127504e38535fdca41930c5fe8e8100d753ca6
diff --git a/x11-libs/libXft/libXft-9999.ebuild b/x11-libs/libXft/libXft-9999.ebuild
index e6daaea1..151a5696 100644
--- a/x11-libs/libXft/libXft-9999.ebuild
+++ b/x11-libs/libXft/libXft-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2 flag-o-matic
+inherit x-modular-r2 flag-o-matic
DESCRIPTION="X.Org Xft library"
@@ -19,7 +19,7 @@ RDEPEND="x11-libs/libXrender
DEPEND="${RDEPEND}"
pkg_setup() {
- xorg-2_pkg_setup
+ x-modular-r2_pkg_setup
# (#125465) Broken with Bdirect support
filter-flags -Wl,-Bdirect
filter-ldflags -Bdirect
diff --git a/x11-libs/libXi/Manifest b/x11-libs/libXi/Manifest
index 5166e8b0..4a894f31 100644
--- a/x11-libs/libXi/Manifest
+++ b/x11-libs/libXi/Manifest
@@ -1,2 +1,2 @@
-EBUILD libXi-9999.ebuild 565 RMD160 3b79a205cb533b712ba167f0e816f3eedbe042e2 SHA1 0a3ecbea65e4cc506218a79da5c036cc51b62925 SHA256 11d7aae08277500809f1ab02152278c28fea7418baca994c264f02d22ad3ce36
+EBUILD libXi-9999.ebuild 577 RMD160 d86d094a25eed2e8cac534b24304f252a762ebff SHA1 913d4f61c4352b84804c38738192ab2db2886696 SHA256 eb8f5ad05e7c3a1faee9d0db2f7ab71f447df71a79769206aa2b95803cbf077a
MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-libs/libXi/libXi-9999.ebuild b/x11-libs/libXi/libXi-9999.ebuild
index b4838422..aaf0f426 100644
--- a/x11-libs/libXi/libXi-9999.ebuild
+++ b/x11-libs/libXi/libXi-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Xi library"
@@ -20,7 +20,7 @@ DEPEND="${RDEPEND}
"
pkg_postinst() {
- xorg-2_pkg_postinst
+ x-modular-r2_pkg_postinst
ewarn "Some special keys and keyboard layouts may stop working."
ewarn "To fix them, recompile xorg-server."
diff --git a/x11-libs/libXinerama/Manifest b/x11-libs/libXinerama/Manifest
index e3958b98..83910746 100644
--- a/x11-libs/libXinerama/Manifest
+++ b/x11-libs/libXinerama/Manifest
@@ -1 +1 @@
-EBUILD libXinerama-9999.ebuild 399 RMD160 f23a4a2e0d2fdb02da2b4886faae17fb5b83a97e SHA1 ad5ee121965185b453821919a33ec5c368e1a969 SHA256 b7699b635368a2c07d855f25d3163a914532d57f577ce19252eeeccf274281f4
+EBUILD libXinerama-9999.ebuild 405 RMD160 d141b1dc16f19248e615cb8c4cc256487bebfc4e SHA1 c45f358d799ca178203db7a9dd4887ea04ed67a9 SHA256 d7885f5a3809ea248235b4f010201d53317e6e611368f6d64284f7b4a917ce2c
diff --git a/x11-libs/libXinerama/libXinerama-9999.ebuild b/x11-libs/libXinerama/libXinerama-9999.ebuild
index e9fad093..a7e61c1f 100644
--- a/x11-libs/libXinerama/libXinerama-9999.ebuild
+++ b/x11-libs/libXinerama/libXinerama-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Xinerama library"
diff --git a/x11-libs/libXmu/Manifest b/x11-libs/libXmu/Manifest
index c45c7f7f..6fd01413 100644
--- a/x11-libs/libXmu/Manifest
+++ b/x11-libs/libXmu/Manifest
@@ -1 +1 @@
-EBUILD libXmu-9999.ebuild 423 RMD160 a3475ee6497e13869ac380c2da4bf7cc49802462 SHA1 fba0bb45b56e9753b8cf6a43ac26a5a4a9f525d9 SHA256 5d7eb4f8084b44a30f154d1db3c895be450dd520418e7e08af03f3aec1cbd688
+EBUILD libXmu-9999.ebuild 429 RMD160 fc3837f033c309c85c86eb12f33ae8eecf408330 SHA1 322332cf4e41f77155107e771630e8d06ae6bf99 SHA256 0b88ac6fc1567de66b4a7e8ede88c92bf7e9ce9853f3f7aeed3acc9ce88059b5
diff --git a/x11-libs/libXmu/libXmu-9999.ebuild b/x11-libs/libXmu/libXmu-9999.ebuild
index 58ea54ad..48a9e82d 100644
--- a/x11-libs/libXmu/libXmu-9999.ebuild
+++ b/x11-libs/libXmu/libXmu-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Xmu library"
diff --git a/x11-libs/libXp/Manifest b/x11-libs/libXp/Manifest
index 5905a7fb..453856c0 100644
--- a/x11-libs/libXp/Manifest
+++ b/x11-libs/libXp/Manifest
@@ -1 +1 @@
-EBUILD libXp-9999.ebuild 380 RMD160 76ccea3269fb9c0a1dd53b087638b956b675bd3f SHA1 46a356ca1fedefc9c03ae745eee552a8a6cad41d SHA256 5037a46f296ed744485b124391c32a918fdeb9cfbc91378758de2591e41c0891
+EBUILD libXp-9999.ebuild 386 RMD160 a69505f47ab228569029874a3b3d5169c6231fb0 SHA1 538785738058de391213f36dae69fbc084e8c2d7 SHA256 4c2707b16815a0271afcf8bf6048d11cfaba197aca73e06d0d244539b77f642d
diff --git a/x11-libs/libXp/libXp-9999.ebuild b/x11-libs/libXp/libXp-9999.ebuild
index 97f57350..b503c98b 100644
--- a/x11-libs/libXp/libXp-9999.ebuild
+++ b/x11-libs/libXp/libXp-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Xp library"
diff --git a/x11-libs/libXpm/Manifest b/x11-libs/libXpm/Manifest
index 7f363218..8ee575a9 100644
--- a/x11-libs/libXpm/Manifest
+++ b/x11-libs/libXpm/Manifest
@@ -1 +1 @@
-EBUILD libXpm-9999.ebuild 395 RMD160 620873074eb25caafd85ea6441ca046dc8207f52 SHA1 e7e7772ef0e85af091bcc49e32c645ae54c56164 SHA256 a133c65c5d9145b263febb79451b5c6968c5e6853a9ad7d6aa8fa5f3c5da62cf
+EBUILD libXpm-9999.ebuild 401 RMD160 e70986c03981b4224e879e3fcb883bda196e9789 SHA1 7cfb30c3b4eb24b40b697945535e87acd3256f38 SHA256 154c7081b99752a4fef2af449dd3ff36c64d30efcf21ad56a113ef9169cdc620
diff --git a/x11-libs/libXpm/libXpm-9999.ebuild b/x11-libs/libXpm/libXpm-9999.ebuild
index 6475ea0e..203ec453 100644
--- a/x11-libs/libXpm/libXpm-9999.ebuild
+++ b/x11-libs/libXpm/libXpm-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Xpm library"
diff --git a/x11-libs/libXrandr/Manifest b/x11-libs/libXrandr/Manifest
index 88e00134..4799941a 100644
--- a/x11-libs/libXrandr/Manifest
+++ b/x11-libs/libXrandr/Manifest
@@ -1 +1 @@
-EBUILD libXrandr-9999.ebuild 456 RMD160 49f523a108dcae274f6f19457702a8212c7f2911 SHA1 401a69137b04b686788e79a5672ecafed581bfac SHA256 560b20fcc60498f0b9edfa3a63a427ede4ebec32ff810d13fdd869e0a3ef3858
+EBUILD libXrandr-9999.ebuild 462 RMD160 6063edec7c43d1e411ded4970fb335f7468c8409 SHA1 6a67dd7401511c542ab6021f58efd5c8032fd135 SHA256 a7b2c989d03ed5d00ea9010b5156ec10a1f40faa4862caee8accadb3234618cc
diff --git a/x11-libs/libXrandr/libXrandr-9999.ebuild b/x11-libs/libXrandr/libXrandr-9999.ebuild
index aee023ab..c75377ee 100644
--- a/x11-libs/libXrandr/libXrandr-9999.ebuild
+++ b/x11-libs/libXrandr/libXrandr-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Xrandr library"
diff --git a/x11-libs/libXrender/Manifest b/x11-libs/libXrender/Manifest
index 47a5eb0e..467bfec0 100644
--- a/x11-libs/libXrender/Manifest
+++ b/x11-libs/libXrender/Manifest
@@ -1 +1 @@
-EBUILD libXrender-9999.ebuild 377 RMD160 410471da0e5d00bbfb6db4c5a6b9dfecedb31d8d SHA1 0849bed22ba2108ff78c297fd4dfcaf5f2e93c30 SHA256 2a9eb6b730d5aa2c4e0fd934983b8a3bfbd768542ccb7b148f008936fd0543a0
+EBUILD libXrender-9999.ebuild 383 RMD160 2db394b28ad5017a3cb5132daa1da51fc27f34ab SHA1 e3f175be04cd3108695b78ea49625b64549649bc SHA256 d91c0aedc391278b715f4b4e309b3dc36f41b1c63c940e45196582e526dc50a0
diff --git a/x11-libs/libXrender/libXrender-9999.ebuild b/x11-libs/libXrender/libXrender-9999.ebuild
index f1a1a4a3..cb740de5 100644
--- a/x11-libs/libXrender/libXrender-9999.ebuild
+++ b/x11-libs/libXrender/libXrender-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Xrender library"
diff --git a/x11-libs/libXres/Manifest b/x11-libs/libXres/Manifest
index 54ee0a29..2e5c2e4a 100644
--- a/x11-libs/libXres/Manifest
+++ b/x11-libs/libXres/Manifest
@@ -1 +1 @@
-EBUILD libXres-9999.ebuild 453 RMD160 7945a5910a9299f8e0478eed1710eb7aa1f5e645 SHA1 e622336d62b49f1655ad2ef70f3f39abdacd7529 SHA256 d60054beb90dad56d9fc732c3afcd8a8a8fee0f5a2eb38911a85451bd49b7b1d
+EBUILD libXres-9999.ebuild 459 RMD160 9223330ffca4665a1fbd120d5964b6fc6cb1dc34 SHA1 2c4bf989ca70e427f8cb50e9b388de8e9af150d1 SHA256 6eecc59914db4160e0dcd166befaa11ceaf779a1aa6bb00d0fb1c55f6ae809e1
diff --git a/x11-libs/libXres/libXres-9999.ebuild b/x11-libs/libXres/libXres-9999.ebuild
index 059c812f..d59ec3fc 100644
--- a/x11-libs/libXres/libXres-9999.ebuild
+++ b/x11-libs/libXres/libXres-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/lib/libXRes"
DESCRIPTION="X.Org XRes library"
diff --git a/x11-libs/libXt/Manifest b/x11-libs/libXt/Manifest
index 53717d62..1f625263 100644
--- a/x11-libs/libXt/Manifest
+++ b/x11-libs/libXt/Manifest
@@ -1 +1 @@
-EBUILD libXt-9999.ebuild 642 RMD160 f6c5dfda9a68048fb2eb4591e00f5938df74075d SHA1 868b1af8f2935c2e9acb7e2a95c7bb519105eaa2 SHA256 80b8bcf7535d54120d3eb80d4b4d9b055fd6f52d9f23d507e08a78170dc122e2
+EBUILD libXt-9999.ebuild 654 RMD160 d132b0c31b379743366088b9a7caabf4411fd4d7 SHA1 153dbe18d45a71f89c5cee87c34170a6961cba4a SHA256 40e5eee2f3e046f1150ed665082a9f31f51af09dd478913213bfe7efbcb0393f
diff --git a/x11-libs/libXt/libXt-9999.ebuild b/x11-libs/libXt/libXt-9999.ebuild
index d55336ba..6599fbe3 100644
--- a/x11-libs/libXt/libXt-9999.ebuild
+++ b/x11-libs/libXt/libXt-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2 flag-o-matic toolchain-funcs
+inherit x-modular-r2 flag-o-matic toolchain-funcs
DESCRIPTION="X.Org Xt library"
@@ -17,7 +17,7 @@ RDEPEND="x11-libs/libX11
DEPEND="${RDEPEND}"
pkg_setup() {
- xorg-2_pkg_setup
+ x-modular-r2_pkg_setup
# (#125465) Broken with Bdirect support
filter-flags -Wl,-Bdirect
filter-ldflags -Bdirect
diff --git a/x11-libs/libXtst/Manifest b/x11-libs/libXtst/Manifest
index 1ec7180c..d2e97284 100644
--- a/x11-libs/libXtst/Manifest
+++ b/x11-libs/libXtst/Manifest
@@ -1,2 +1,2 @@
-EBUILD libXtst-9999.ebuild 461 RMD160 e7fca5783cc8f919382222864141340ecbcfe007 SHA1 dceb6245905baeadfc54308d748a1e48718beca2 SHA256 8e5bc993d1f4946ca7492eaef5f84bf7d020b0c6299b96e7fb987314af7083b5
+EBUILD libXtst-9999.ebuild 467 RMD160 ab10132a2c1ab6bf879c48b21abf34e360a21ee5 SHA1 52f7e3fdf6ac1c5e2c0081c7f847b9c4647ab70c SHA256 aae9885420cf871971d65242b5766ba7c832ff87d20b40bc77123248b6940189
MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-libs/libXtst/libXtst-9999.ebuild b/x11-libs/libXtst/libXtst-9999.ebuild
index 3f4929d0..d0502831 100644
--- a/x11-libs/libXtst/libXtst-9999.ebuild
+++ b/x11-libs/libXtst/libXtst-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Xtst library"
diff --git a/x11-libs/libXv/Manifest b/x11-libs/libXv/Manifest
index d26e92bd..ff1fe180 100644
--- a/x11-libs/libXv/Manifest
+++ b/x11-libs/libXv/Manifest
@@ -1 +1 @@
-EBUILD libXv-9999.ebuild 381 RMD160 b7d9313ccd2f54a3f539de8e84b071be5fff21ef SHA1 af085cd3fbfb1b05e9f0e39e818f266b88964df9 SHA256 9da85f88b14eef8794d4d458933e37db62f1141c9a9b02b63b1d8f637cfcc236
+EBUILD libXv-9999.ebuild 387 RMD160 7cbfc7ef49cae54ea4e17717f0e3fa6d52d7b100 SHA1 83043e86bff329fa60bd6b7f18d2c76c03860d20 SHA256 2d80cbbfb958e0caea75c6ecdb97f467a1e9f5ab1c4c39d88647386be9ea0491
diff --git a/x11-libs/libXv/libXv-9999.ebuild b/x11-libs/libXv/libXv-9999.ebuild
index f9d5ea00..41ed9dc9 100644
--- a/x11-libs/libXv/libXv-9999.ebuild
+++ b/x11-libs/libXv/libXv-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Xv library"
diff --git a/x11-libs/libXvMC/Manifest b/x11-libs/libXvMC/Manifest
index 250b6e17..a58cab48 100644
--- a/x11-libs/libXvMC/Manifest
+++ b/x11-libs/libXvMC/Manifest
@@ -1 +1 @@
-EBUILD libXvMC-9999.ebuild 399 RMD160 2f457fa2399b20653b9dec0bc087edf18df1b68e SHA1 23708c8488791f1d3dc5091409b013970e2b8913 SHA256 5912ff50ac5c62cba189c35d6c38feccbe9e3d7129053ca2c3f3956854cd4286
+EBUILD libXvMC-9999.ebuild 405 RMD160 af2beecc2b039bbf7c7af5b478fb0a331e4321ea SHA1 32b9af19fe620023d74680ac2227b99807640c02 SHA256 b6c95c6d1de12b5e7f59abb2c2a9109907544860296072dc0b0b147214ab741e
diff --git a/x11-libs/libXvMC/libXvMC-9999.ebuild b/x11-libs/libXvMC/libXvMC-9999.ebuild
index 47f2962a..eab4049e 100644
--- a/x11-libs/libXvMC/libXvMC-9999.ebuild
+++ b/x11-libs/libXvMC/libXvMC-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org XvMC library"
diff --git a/x11-libs/libXxf86dga/Manifest b/x11-libs/libXxf86dga/Manifest
index eb13be2c..2690788a 100644
--- a/x11-libs/libXxf86dga/Manifest
+++ b/x11-libs/libXxf86dga/Manifest
@@ -1 +1 @@
-EBUILD libXxf86dga-9999.ebuild 400 RMD160 3b9a4517f39e43a2bb72eb24546fb68aee222bb7 SHA1 5835422b7fba69b450f5edadcd6abe761e50d8c9 SHA256 320f2bf188f01157062f6edd861ed04cc18fb2959a7f497f6e038d9ff7284fd2
+EBUILD libXxf86dga-9999.ebuild 406 RMD160 c76a11c3b4c59931df22c22a18ae6ba6ffa8f576 SHA1 7533216181f623a1bc979e54c0388c10fb502ab6 SHA256 9f03cc270a3c489d94219ef1a2fe98c78b6db7933dc6d78838207ca1e9260437
diff --git a/x11-libs/libXxf86dga/libXxf86dga-9999.ebuild b/x11-libs/libXxf86dga/libXxf86dga-9999.ebuild
index 056a4453..8ff6989e 100644
--- a/x11-libs/libXxf86dga/libXxf86dga-9999.ebuild
+++ b/x11-libs/libXxf86dga/libXxf86dga-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Xxf86dga library"
diff --git a/x11-libs/libXxf86misc/Manifest b/x11-libs/libXxf86misc/Manifest
index 5295ca09..a550ff2b 100644
--- a/x11-libs/libXxf86misc/Manifest
+++ b/x11-libs/libXxf86misc/Manifest
@@ -1 +1 @@
-EBUILD libXxf86misc-9999.ebuild 391 RMD160 d1b29fdea2c40ffef1303891c4d1a1b24a2bf9b6 SHA1 e594b25f5b328885a5bbeca2e10a15c6768ba0d4 SHA256 b70265970f578187c191cb43aa1b9a02318398662142a85744b746d99a8ef81e
+EBUILD libXxf86misc-9999.ebuild 397 RMD160 bcf0431d4e122f9175d4ec89fbdecb12204180a0 SHA1 7ae79cf40568fb6c1f1a26ce58e86909c9d0842b SHA256 3f3024f75cc091d486d06569c7b7dc1fc294505c8ae9a929fbe1c0b602f51043
diff --git a/x11-libs/libXxf86misc/libXxf86misc-9999.ebuild b/x11-libs/libXxf86misc/libXxf86misc-9999.ebuild
index 7589607d..e0445835 100644
--- a/x11-libs/libXxf86misc/libXxf86misc-9999.ebuild
+++ b/x11-libs/libXxf86misc/libXxf86misc-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Xxf86misc library"
diff --git a/x11-libs/libXxf86vm/Manifest b/x11-libs/libXxf86vm/Manifest
index 881f741e..2bc3b02b 100644
--- a/x11-libs/libXxf86vm/Manifest
+++ b/x11-libs/libXxf86vm/Manifest
@@ -1 +1 @@
-EBUILD libXxf86vm-9999.ebuild 413 RMD160 44db599af9df6b85f2e4bc34ed48c1760b53a002 SHA1 22a8e3c450b699fc97f47ae5bcaeb6f4ee21030a SHA256 34d6727a03e180eca9c6724d5da79c3e74d3f5ac36f793fbb3510355ad95549a
+EBUILD libXxf86vm-9999.ebuild 419 RMD160 bf9b8e0e37f6758d4ba5401447ba77ad14509308 SHA1 c6c8eb3789bf508ffd00d2858d39997993971b9e SHA256 a402945a38acc527002031de9b417be2b74eff81087c7fe0530ec97529675549
diff --git a/x11-libs/libXxf86vm/libXxf86vm-9999.ebuild b/x11-libs/libXxf86vm/libXxf86vm-9999.ebuild
index cd6336e9..cedfc687 100644
--- a/x11-libs/libXxf86vm/libXxf86vm-9999.ebuild
+++ b/x11-libs/libXxf86vm/libXxf86vm-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Xxf86vm library"
diff --git a/x11-libs/libdmx/Manifest b/x11-libs/libdmx/Manifest
index 1119138d..059621ab 100644
--- a/x11-libs/libdmx/Manifest
+++ b/x11-libs/libdmx/Manifest
@@ -1 +1 @@
-EBUILD libdmx-9999.ebuild 379 RMD160 e2feb75d90c954699d95cddfaeface988fb55b2f SHA1 c795aeb1a5b8a189e0ffecf717946f66665de9b9 SHA256 01d7f0334074516ec3780dabb7b160d6551175eb69bffda8e8ef4bba6e9db13c
+EBUILD libdmx-9999.ebuild 385 RMD160 8190ce1280e64c57e5d534797dc3c99465c34d04 SHA1 1d0327e2140b04b5065d4977af357ab74ea8d07a SHA256 4762caaccb9745843a7cf40f086ba6f5a6cc6f157b9e372773bd873d73cc0176
diff --git a/x11-libs/libdmx/libdmx-9999.ebuild b/x11-libs/libdmx/libdmx-9999.ebuild
index 1ddcfcbd..57bc5493 100644
--- a/x11-libs/libdmx/libdmx-9999.ebuild
+++ b/x11-libs/libdmx/libdmx-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org dmx library"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index a21af733..05644720 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1 +1 @@
-EBUILD libdrm-9999.ebuild 1032 RMD160 1df4be1661b5a90451589e8f3bd96d0b9632ba43 SHA1 9d8bfd016f5c90c3ae93179b131e2542d1ddc046 SHA256 adc047dbd620b70d4b948dea25d4c8f958135e8df1f0228d3e35eef57bb0ebb3
+EBUILD libdrm-9999.ebuild 1050 RMD160 dbad1c3309423e5b12dd48b34c922e8b273fe7e2 SHA1 1f825ca419411974806f85c770b0aab424270e2e SHA256 d98056f7a01a95e27c635b2dc8d04a7af3c1a0f59c2b6b72bb42f8f0071b89de
diff --git a/x11-libs/libdrm/libdrm-9999.ebuild b/x11-libs/libdrm/libdrm-9999.ebuild
index 501f792e..e2bea302 100644
--- a/x11-libs/libdrm/libdrm-9999.ebuild
+++ b/x11-libs/libdrm/libdrm-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
@@ -26,11 +26,11 @@ pkg_setup() {
# Fails to build on ARM if dev-libs/libatomic_ops is installed, bug 297630
CONFIGURE_OPTIONS="--enable-udev --enable-nouveau-experimental-api $(use_enable !arm intel) $(use_enable !arm radeon)"
- xorg-2_pkg_setup
+ x-modular-r2_pkg_setup
}
pkg_postinst() {
- xorg-2_pkg_postinst
+ x-modular-r2_pkg_postinst
ewarn "libdrm's ABI may have changed without change in library name"
ewarn "Please rebuild media-libs/mesa, x11-base/xorg-server and"
diff --git a/x11-libs/libfontenc/Manifest b/x11-libs/libfontenc/Manifest
index e867f2e7..1e07b432 100644
--- a/x11-libs/libfontenc/Manifest
+++ b/x11-libs/libfontenc/Manifest
@@ -1 +1 @@
-EBUILD libfontenc-9999.ebuild 399 RMD160 1f584546c815162a4a0a30e861344204031ea142 SHA1 d2960e631184400239a86731734fb9ad24d53158 SHA256 5b82010247dcff368db1d6e573f9ec046dcb1009931a8f29efd210c0dc6d4d71
+EBUILD libfontenc-9999.ebuild 405 RMD160 eae32d2bda9f6fc4c2cdfd4522d628bf163e5187 SHA1 be5f20039bca8b83372261a3ae0ab6c043a1d94e SHA256 ff2388e3450ae62230cdbf78d3e7046de749977c7431984eb1f670ce829d5730
diff --git a/x11-libs/libfontenc/libfontenc-9999.ebuild b/x11-libs/libfontenc/libfontenc-9999.ebuild
index 7b61e7f7..80963a51 100644
--- a/x11-libs/libfontenc/libfontenc-9999.ebuild
+++ b/x11-libs/libfontenc/libfontenc-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org fontenc library"
diff --git a/x11-libs/libpciaccess/Manifest b/x11-libs/libpciaccess/Manifest
index 95a2b34e..e20e8d98 100644
--- a/x11-libs/libpciaccess/Manifest
+++ b/x11-libs/libpciaccess/Manifest
@@ -1 +1 @@
-EBUILD libpciaccess-9999.ebuild 533 RMD160 79815379f46ee0eb92327dbc82fe0290731548db SHA1 e870f389b968b49c3056e4723740871d1d973fef SHA256 4984560d9a62001712c46028e72cd9ee66c44c4421ed5fa81e0556fcdd4d6a1b
+EBUILD libpciaccess-9999.ebuild 545 RMD160 6f7fe4a6d8412c16b1a2d9b7939be3b253395116 SHA1 74f666c937248dadfd19f2ab4de4d91dafd784ea SHA256 665378c678f22d3ca9d6261a1756e7079197844c6cdda1f37964c83c0aefb187
diff --git a/x11-libs/libpciaccess/libpciaccess-9999.ebuild b/x11-libs/libpciaccess/libpciaccess-9999.ebuild
index 8452a63e..f0718900 100644
--- a/x11-libs/libpciaccess/libpciaccess-9999.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="Library providing generic access to the PCI bus and devices"
@@ -16,7 +16,7 @@ RDEPEND="${DEPEND}"
CONFIGURE_OPTIONS="--with-pciids-path=/usr/share/misc"
src_install() {
- xorg-2_src_install
+ x-modular-r2_src_install
if ! use minimal; then
dobin src/.libs/scanpci || die
fi
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index 91ffebbc..8018086d 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1 +1 @@
-EBUILD libxcb-9999.ebuild 801 RMD160 4ca904678abe8b7da72b03835a5ca9f5ef7c7d23 SHA1 86aebc0e026ced35d0816ded521ce3c4e3129eac SHA256 01caa8c493525560d3bcb5e87800405778619dd2d695b2036e00004370b7051c
+EBUILD libxcb-9999.ebuild 813 RMD160 ed1bb3c4812fefc89624ddf74ca28bf218ca5c40 SHA1 284d4fd095c849cf35cbaf6d468ac2c44f453e0a SHA256 b8fa912087e869616b0506a3ecdce5991945a6019af074b7484e15b313b37648
diff --git a/x11-libs/libxcb/libxcb-9999.ebuild b/x11-libs/libxcb/libxcb-9999.ebuild
index e00369ce..b0b1e413 100644
--- a/x11-libs/libxcb/libxcb-9999.ebuild
+++ b/x11-libs/libxcb/libxcb-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X C-language Bindings library"
HOMEPAGE="http://xcb.freedesktop.org/"
@@ -24,7 +24,7 @@ DEPEND="${RDEPEND}
>=dev-lang/python-2.5[xml]"
pkg_setup() {
- xorg-2_pkg_setup
+ x-modular-r2_pkg_setup
CONFIGURE_OPTIONS="$(use_enable doc build-docs)
$(use_enable selinux)
--enable-xinput"
diff --git a/x11-libs/libxkbfile/Manifest b/x11-libs/libxkbfile/Manifest
index a084cb6e..bc852a04 100644
--- a/x11-libs/libxkbfile/Manifest
+++ b/x11-libs/libxkbfile/Manifest
@@ -1 +1 @@
-EBUILD libxkbfile-9999.ebuild 347 RMD160 6bccf523a61456d769946893abe6b90cc87e65a7 SHA1 3d62a6280d9859dc3665e83bc35e08f00c163d40 SHA256 c9282567854bfbad3b7f877ed63e7db0c864a2601a99950aa50d1e04f5ff6841
+EBUILD libxkbfile-9999.ebuild 353 RMD160 f98b2e9ef6f8661bc5852f48c98b67a005c20de5 SHA1 ca92b8a9dfe4ea8bebd298cb684fbd62dfb9affc SHA256 1b7a27b25ab3359ff6a44cd3ccb4ab8868e738d4883c4f44ddba47b228c2bd64
diff --git a/x11-libs/libxkbfile/libxkbfile-9999.ebuild b/x11-libs/libxkbfile/libxkbfile-9999.ebuild
index 4c879ab3..54d3f18b 100644
--- a/x11-libs/libxkbfile/libxkbfile-9999.ebuild
+++ b/x11-libs/libxkbfile/libxkbfile-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org xkbfile library"
diff --git a/x11-libs/libxkbui/Manifest b/x11-libs/libxkbui/Manifest
index 8c9449e4..8c974cae 100644
--- a/x11-libs/libxkbui/Manifest
+++ b/x11-libs/libxkbui/Manifest
@@ -1 +1 @@
-EBUILD libxkbui-9999.ebuild 373 RMD160 dfb725a1ea42935852a41548e2c602917ea9ceee SHA1 4f30df65d3421b44f496888c55743feffb668a00 SHA256 92197f2556a6ba0f9fc0c1101d4450c30bc3722b30aacc4e9c4a448055471636
+EBUILD libxkbui-9999.ebuild 379 RMD160 b419d4d436907b08b752a86dcf5ff30b473e3344 SHA1 fc6349955bd72b923f73f779399f72cc36c89189 SHA256 bdb0c0830a705f25bbf05c68edc558a32385362124278f95b85c98ae91e2e80c
diff --git a/x11-libs/libxkbui/libxkbui-9999.ebuild b/x11-libs/libxkbui/libxkbui-9999.ebuild
index 9f305719..4c53ee3f 100644
--- a/x11-libs/libxkbui/libxkbui-9999.ebuild
+++ b/x11-libs/libxkbui/libxkbui-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org xkbui library"
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index 2576eaa2..4e95faba 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,2 +1,2 @@
AUX pixman-0.12.0-sse.patch 536 RMD160 2eac636c530c1911765111766bb121b075d6b3dc SHA1 5a51a7f339faf1fd33b803442f27cca09e9eceb0 SHA256 2708f2fb856c706af9ae89570508afc1e72c05348d989ed813a3e2cc85582cf1
-EBUILD pixman-9999.ebuild 1398 RMD160 d3f991a4e6c8031ce1ae41841b8205a49e0cbd8c SHA1 b2e154e5497792fef0fdce161d696e411e133dbf SHA256 5e9575b9e4c1b979fda9fb07e2e6a449945d3272718c1c3fcd26771eaf32be38
+EBUILD pixman-9999.ebuild 1410 RMD160 f8da0e9368df75fdc25a10834c4eb0c47d05efd1 SHA1 b287d39ff8b3f8019863e0d9278744d2a336dee9 SHA256 3db46a892d619aa80e22bc3b039eacc6e644602c9115504d8c305e39b9e27a4e
diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild
index 88491587..48465a5e 100644
--- a/x11-libs/pixman/pixman-9999.ebuild
+++ b/x11-libs/pixman/pixman-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2 toolchain-funcs versionator
+inherit x-modular-r2 toolchain-funcs versionator
EGIT_REPO_URI="git://anongit.freedesktop.org/git/pixman"
DESCRIPTION="Low-level pixel manipulation routines"
@@ -12,7 +12,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
IUSE="altivec mmx sse2"
pkg_setup() {
- xorg-2_pkg_setup
+ x-modular-r2_pkg_setup
CONFIGURE_OPTIONS="
$(use_enable altivec vmx)
--disable-gtk"
diff --git a/x11-libs/xcb-util/Manifest b/x11-libs/xcb-util/Manifest
index 43f0a8b0..c7bd245e 100644
--- a/x11-libs/xcb-util/Manifest
+++ b/x11-libs/xcb-util/Manifest
@@ -1,2 +1,2 @@
-EBUILD xcb-util-9999.ebuild 846 RMD160 7f2728dbfa63353f8792e0315c6bdb150e199931 SHA1 5f6e2771036f85c0dd738bd0c455f48748ed7ff8 SHA256 5cf167419c6925e657ad6ae3edf9f64e0e6d6b148cb4115e839cfa66e156a7bb
+EBUILD xcb-util-9999.ebuild 858 RMD160 06b872dab26ad6ae74b4303fa9120734cb5b9c96 SHA1 5c27a4db464187c66c32b92aed10e32c8cf12a74 SHA256 cb33f89d07c104689ef92f5d229a8e84e37ee2b130eb2e5499251501a4af8542
MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-libs/xcb-util/xcb-util-9999.ebuild b/x11-libs/xcb-util/xcb-util-9999.ebuild
index a4ca12c0..4b9cb8d4 100644
--- a/x11-libs/xcb-util/xcb-util-9999.ebuild
+++ b/x11-libs/xcb-util/xcb-util-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X C-language Bindings sample implementations"
HOMEPAGE="http://xcb.freedesktop.org/"
@@ -20,7 +20,7 @@ DEPEND="${RDEPEND}
test? ( >=dev-libs/check-0.9.4 )"
pkg_postinst() {
- xorg-2_pkg_postinst
+ x-modular-r2_pkg_postinst
echo
ewarn "Library names have changed since earlier versions of xcb-util;"
diff --git a/x11-libs/xpyb/Manifest b/x11-libs/xpyb/Manifest
index 6f0f9b9d..1399afce 100644
--- a/x11-libs/xpyb/Manifest
+++ b/x11-libs/xpyb/Manifest
@@ -1 +1 @@
-EBUILD xpyb-9999.ebuild 611 RMD160 fdb79bd9733961a153445b0a147549cf3155b676 SHA1 91a198a7380858e4361f6f3f70616385e3eaf9ad SHA256 edadbf273b2aa7f8734a8754b82fc59ab5c88782b63a81c1d1c928469140ef26
+EBUILD xpyb-9999.ebuild 623 RMD160 3fa0837048f3b3198f073fb861f550d96e904de0 SHA1 9a2a242d6833879ac52ba3d78a35edb6008f2ec7 SHA256 ec1ca91da9db1a5c7191be720bb0ae5a0470db1d1aa481cc29032c52066ae4dc
diff --git a/x11-libs/xpyb/xpyb-9999.ebuild b/x11-libs/xpyb/xpyb-9999.ebuild
index b355eeaa..10af39e9 100644
--- a/x11-libs/xpyb/xpyb-9999.ebuild
+++ b/x11-libs/xpyb/xpyb-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/xpyb"
#SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
@@ -21,6 +21,6 @@ DEPEND="${RDEPEND}
DOCS="NEWS README"
pkg_setup() {
- xorg-2_pkg_setup
+ x-modular-r2_pkg_setup
CONFIGURE_OPTIONS="$(use_enable selinux xselinux)"
}
diff --git a/x11-libs/xtrans/Manifest b/x11-libs/xtrans/Manifest
index b5d78401..5d7fbe62 100644
--- a/x11-libs/xtrans/Manifest
+++ b/x11-libs/xtrans/Manifest
@@ -1,2 +1,2 @@
-EBUILD xtrans-9999.ebuild 380 RMD160 cf3e19bd925b4c009ac654a37dc9794d17a762fb SHA1 a45f1e5030a09acc53640077e7b795668e4f86d6 SHA256 72896ec1ae53f2124f26e032976c83190aced2dfb221e1a7bcf4fcdd42c52bb6
+EBUILD xtrans-9999.ebuild 386 RMD160 fa5867fb74e681915b7b14ee49d321350aa9cc47 SHA1 47991889a519459d20997480992657fcb7274e55 SHA256 6b95c15656165beb9ba3473ee2d20c98e4ca70d5cb1a3d5f6644ca0628d10b86
MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-libs/xtrans/xtrans-9999.ebuild b/x11-libs/xtrans/xtrans-9999.ebuild
index df1e58ec..d0b4097e 100644
--- a/x11-libs/xtrans/xtrans-9999.ebuild
+++ b/x11-libs/xtrans/xtrans-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org xtrans library"
EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/lib/lib${PN}"
diff --git a/x11-misc/util-macros/Manifest b/x11-misc/util-macros/Manifest
index d6b48377..4e54ee0c 100644
--- a/x11-misc/util-macros/Manifest
+++ b/x11-misc/util-macros/Manifest
@@ -1,2 +1,2 @@
-EBUILD util-macros-9999.ebuild 389 RMD160 90ac54f6d73f3d04cd2a1a5f32a065c7ba4e8037 SHA1 cc11c8e1d4644452a34f15d0ce615ff4abb3806b SHA256 9ed0ebf64061174f3c1f763abed68dce64a4904903c5efdb5f93bdca2eb87fe0
+EBUILD util-macros-9999.ebuild 395 RMD160 24b5be77ec415c9b30e7a46a8a5bebef1c014d8a SHA1 1d7900f7b7d01c66ce77ad3a4dcae31365c614ff SHA256 e5f127d70b42a438f3d2a3405f7371b2f0583221be7976a8d4b4bf68dccd3d40
MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-misc/util-macros/util-macros-9999.ebuild b/x11-misc/util-macros/util-macros-9999.ebuild
index 2ad2024e..62bacd61 100644
--- a/x11-misc/util-macros/util-macros-9999.ebuild
+++ b/x11-misc/util-macros/util-macros-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/util/macros"
DESCRIPTION="X.Org autotools utility macros"
diff --git a/x11-misc/xcb-demo/Manifest b/x11-misc/xcb-demo/Manifest
index 6db87301..ea13c5ca 100644
--- a/x11-misc/xcb-demo/Manifest
+++ b/x11-misc/xcb-demo/Manifest
@@ -1,3 +1,3 @@
DIST xcb-demo-0.1.tar.bz2 80289 RMD160 2f76ad4b6d7d9b40d7142cc27ab314cc584794e4 SHA1 b580e9940cb9a2393cdc1d01ea2077c2d93845a4 SHA256 20753bb59558dc00311a5a296fc6c4b3fcff04b86b2579fcb459c89b17d733a4
-EBUILD xcb-demo-0.1.ebuild 567 RMD160 ac0e685ecc899af1979ced5b408588ebaed98d50 SHA1 b066125ac6491c4f06d277c9bfb9e7f5f66d4b4f SHA256 f23f305d0f524c38a71bb851cfc5b8252645f32b95d5f333689df0dcddb2cf72
-EBUILD xcb-demo-9999.ebuild 450 RMD160 2cd5415d6cca37f774e2866a07412f7382e021cd SHA1 bfb946035ea91ccb88efebabaea46c1c86af6daf SHA256 d31f9862c77dc10f07756e4f43ae6d4069dc907f7c1643dce04e4f671aae0eb6
+EBUILD xcb-demo-0.1.ebuild 573 RMD160 a627f559764b2d29d34ac4b663a942e687a07dd7 SHA1 bcf6e9263ed59abdf16ef28f5e3f6bf9b2b52eab SHA256 734c846ce0f9bc2fb58e14be1d583b2d7fb45f3ac049281d3dbc83b04f17ae27
+EBUILD xcb-demo-9999.ebuild 456 RMD160 6ac9ec6ffa7d0dead7015e0fae48ba5ef431264e SHA1 a32aea93f1da7f64c5710f38ad1297a96e4c2811 SHA256 ab0788b933bb52604485731fcbc47610a6e4cc8d92ed20ae6ecaac0260bff698
diff --git a/x11-misc/xcb-demo/xcb-demo-0.1.ebuild b/x11-misc/xcb-demo/xcb-demo-0.1.ebuild
index e41fcf22..b6ced78c 100644
--- a/x11-misc/xcb-demo/xcb-demo-0.1.ebuild
+++ b/x11-misc/xcb-demo/xcb-demo-0.1.ebuild
@@ -6,7 +6,7 @@
#SNAPSHOT="yes"
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X C-language Bindings demos"
SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
diff --git a/x11-misc/xcb-demo/xcb-demo-9999.ebuild b/x11-misc/xcb-demo/xcb-demo-9999.ebuild
index 435bd01d..46d2e5d5 100644
--- a/x11-misc/xcb-demo/xcb-demo-9999.ebuild
+++ b/x11-misc/xcb-demo/xcb-demo-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/demo"
DESCRIPTION="X C-language Bindings demos"
diff --git a/x11-proto/bigreqsproto/Manifest b/x11-proto/bigreqsproto/Manifest
index c83575e1..9177bf4e 100644
--- a/x11-proto/bigreqsproto/Manifest
+++ b/x11-proto/bigreqsproto/Manifest
@@ -1 +1 @@
-EBUILD bigreqsproto-9999.ebuild 328 RMD160 3ae67c849a513507320cf4c5cc5d5f637d86c28f SHA1 86bfe66adc8a8864758839ca3e34281366aed721 SHA256 b35ed58dd5fc520a933a1569a799e51dabfaad216edc55f7a3f6b825396e5269
+EBUILD bigreqsproto-9999.ebuild 334 RMD160 e816fc485f09b6c2be3c0799219b999026836fc7 SHA1 e44cc520e9ad2a7dfef051c9ab704085a1c6231a SHA256 0abe4d3a7e0b7fc369bc2bf93eec37d2f1170602b41a550779a1a38640ed3459
diff --git a/x11-proto/bigreqsproto/bigreqsproto-9999.ebuild b/x11-proto/bigreqsproto/bigreqsproto-9999.ebuild
index 6bdffb8f..ebaf99e3 100644
--- a/x11-proto/bigreqsproto/bigreqsproto-9999.ebuild
+++ b/x11-proto/bigreqsproto/bigreqsproto-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org BigReqs protocol headers"
diff --git a/x11-proto/calibrateproto/Manifest b/x11-proto/calibrateproto/Manifest
index 77d511b1..088f7ddf 100644
--- a/x11-proto/calibrateproto/Manifest
+++ b/x11-proto/calibrateproto/Manifest
@@ -1 +1 @@
-EBUILD calibrateproto-9999.ebuild 292 RMD160 dc2094c127ed16f23dced8a4a5aaf503d882dd0e SHA1 d840427d61c87c384a711f3b9be3156d8e39986c SHA256 2f37a207b22baef5ea447ec9c655dd833d6d141ad40d3d4441df737eb7cbb30b
+EBUILD calibrateproto-9999.ebuild 298 RMD160 aa0922649caa652b57d20f454e33f853171abc37 SHA1 10ae108e7bc6ed6024d238e8d08afd7cc7285a3b SHA256 a24dd11b3c0582cebff1b8da16e8f665caacbd4db1b84bcb87b713b7552220c0
diff --git a/x11-proto/calibrateproto/calibrateproto-9999.ebuild b/x11-proto/calibrateproto/calibrateproto-9999.ebuild
index 4d933ae2..3704b03d 100644
--- a/x11-proto/calibrateproto/calibrateproto-9999.ebuild
+++ b/x11-proto/calibrateproto/calibrateproto-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION=""
diff --git a/x11-proto/compositeproto/Manifest b/x11-proto/compositeproto/Manifest
index 6695346d..85e83c8d 100644
--- a/x11-proto/compositeproto/Manifest
+++ b/x11-proto/compositeproto/Manifest
@@ -1 +1 @@
-EBUILD compositeproto-9999.ebuild 324 RMD160 fc849336696a76a147188b5b4e40c4615cd757cf SHA1 d511b66e87e460f21131a3813256c14760183e04 SHA256 4b008edda2ee934d140351a4654ec45e6c94a7ea3cae747d05fc14299f20c559
+EBUILD compositeproto-9999.ebuild 330 RMD160 3dc08051a66cc93af75fdb50e9972e259f0aede6 SHA1 e7a1f629dc1f4ad44754bb6ef51ee54b0ec62f6f SHA256 716318b75445d08f820624cdbafccb17a0fcfeecb2c791530ef0f3df743c5ca9
diff --git a/x11-proto/compositeproto/compositeproto-9999.ebuild b/x11-proto/compositeproto/compositeproto-9999.ebuild
index 44f0646a..cbcf44e1 100644
--- a/x11-proto/compositeproto/compositeproto-9999.ebuild
+++ b/x11-proto/compositeproto/compositeproto-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Composite protocol headers"
diff --git a/x11-proto/damageproto/Manifest b/x11-proto/damageproto/Manifest
index f76221f8..45d21e9c 100644
--- a/x11-proto/damageproto/Manifest
+++ b/x11-proto/damageproto/Manifest
@@ -1 +1 @@
-EBUILD damageproto-9999.ebuild 321 RMD160 d048b6eff180ecc8fb863b9331672d60777bbe81 SHA1 31df5f15a08edb4055314e623785c68a4a97def5 SHA256 7cbc677ca70b065c71487d965888b8563a89c8a99791216596134faa42d6f32d
+EBUILD damageproto-9999.ebuild 327 RMD160 6f12a32bc76d518e6b78d3cbf3e750d055ad13a5 SHA1 8fa5d3832bd8b4f06dfd6336034033e11ff2c27b SHA256 ed2a3bb509811cc357643b49a0c3e0fdbc73c22facf611a070169b91833ac25f
diff --git a/x11-proto/damageproto/damageproto-9999.ebuild b/x11-proto/damageproto/damageproto-9999.ebuild
index 0920352d..209e0ea1 100644
--- a/x11-proto/damageproto/damageproto-9999.ebuild
+++ b/x11-proto/damageproto/damageproto-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Damage protocol headers"
diff --git a/x11-proto/dmxproto/Manifest b/x11-proto/dmxproto/Manifest
index 833747b5..ded0f482 100644
--- a/x11-proto/dmxproto/Manifest
+++ b/x11-proto/dmxproto/Manifest
@@ -1 +1 @@
-EBUILD dmxproto-9999.ebuild 344 RMD160 abd01555f8e785a73373f72cfe3518c5ff07c7f2 SHA1 12d304070128d04471c9a6233ad72e173df6ee93 SHA256 fe45f8b817f39bfd31ba584c6d38e1324b3235bc27ae8df2787b0c0f5795720f
+EBUILD dmxproto-9999.ebuild 350 RMD160 c5bb8ae0c3f794f19b27ca7560efca7e3194a1c6 SHA1 3a4f2d09395a4f385684ed487fc856ad64ff3074 SHA256 ea100ce7f3379a14c17677e63b6b146efc5d05c61ac5c1fb3b2e3f1369f5f9a2
diff --git a/x11-proto/dmxproto/dmxproto-9999.ebuild b/x11-proto/dmxproto/dmxproto-9999.ebuild
index f4c84ad6..528bff59 100644
--- a/x11-proto/dmxproto/dmxproto-9999.ebuild
+++ b/x11-proto/dmxproto/dmxproto-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org DMX protocol headers"
diff --git a/x11-proto/dri2proto/Manifest b/x11-proto/dri2proto/Manifest
index ad1fa9a2..ccb67a12 100644
--- a/x11-proto/dri2proto/Manifest
+++ b/x11-proto/dri2proto/Manifest
@@ -1 +1 @@
-EBUILD dri2proto-9999.ebuild 319 RMD160 0e8018f98062d033539c2dd356b4c00790f5b5b1 SHA1 bd3540f1fd922a2ef55f9902fb35189083de2873 SHA256 8de888d52ab808550cfa2ef2fcb919d606f27da656d9b0db32edc9a1fff283c7
+EBUILD dri2proto-9999.ebuild 325 RMD160 4479ce9e13d90a6efb10706a19f072813e0f330e SHA1 a5831bcbd62546e415a92b3daf2f7d5a2bd33b52 SHA256 44b924427a2d11cc75a5bfd1a551acc2f07762400f4c29e764f025d7835e1e8d
diff --git a/x11-proto/dri2proto/dri2proto-9999.ebuild b/x11-proto/dri2proto/dri2proto-9999.ebuild
index 8ff46379..1f3e9a35 100644
--- a/x11-proto/dri2proto/dri2proto-9999.ebuild
+++ b/x11-proto/dri2proto/dri2proto-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org DRI2 protocol headers"
diff --git a/x11-proto/evieext/Manifest b/x11-proto/evieext/Manifest
index 59bd6eb0..0aa15a6b 100644
--- a/x11-proto/evieext/Manifest
+++ b/x11-proto/evieext/Manifest
@@ -1 +1 @@
-EBUILD evieext-9999.ebuild 390 RMD160 e9fb2f3ecf9dd09c9f9858d8cf4bada7cdb416dc SHA1 2fa9f6587874f5bf95ce81cbde4a0da8e1c06637 SHA256 ef31a9fbe025df4089756e07e1764a88ee0fc59fdd9ae4fbf840cd8471c2ce2e
+EBUILD evieext-9999.ebuild 396 RMD160 7bf8d89e676cfab4ca8e6137a2bbf4604b143502 SHA1 2250e411cf0295c8fc7c5226333457190ea48383 SHA256 59b2cc25ef286115085c64f6af066241a859b43289ed15916e6a1e242f2137eb
diff --git a/x11-proto/evieext/evieext-9999.ebuild b/x11-proto/evieext/evieext-9999.ebuild
index 71ac00e6..04e6c84d 100644
--- a/x11-proto/evieext/evieext-9999.ebuild
+++ b/x11-proto/evieext/evieext-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/proto/evieproto"
DESCRIPTION="X.Org EvIE protocol headers"
diff --git a/x11-proto/fixesproto/Manifest b/x11-proto/fixesproto/Manifest
index 659dc3b6..f7bb6422 100644
--- a/x11-proto/fixesproto/Manifest
+++ b/x11-proto/fixesproto/Manifest
@@ -1 +1 @@
-EBUILD fixesproto-9999.ebuild 350 RMD160 1ea5888e64e315ff0e8b20266e267c44222f8899 SHA1 6e0760b06c6d500b072277e822bdc4cd02b7b610 SHA256 8991c2c661b9a96511e9feb2bbabed6361961744b5a561565339d442ddf0884b
+EBUILD fixesproto-9999.ebuild 356 RMD160 18acafef0285cc6011730bfcdd7131853d5c9645 SHA1 085baeeeeb0e902408d409937a1778fc8754bb61 SHA256 1c9a43cb75a2317ccffafb95847d1d081067a88c1f8f3d0f344eecbce0973e55
diff --git a/x11-proto/fixesproto/fixesproto-9999.ebuild b/x11-proto/fixesproto/fixesproto-9999.ebuild
index 7520a7da..353b5f98 100644
--- a/x11-proto/fixesproto/fixesproto-9999.ebuild
+++ b/x11-proto/fixesproto/fixesproto-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Fixes protocol headers"
diff --git a/x11-proto/fontcacheproto/Manifest b/x11-proto/fontcacheproto/Manifest
index 2b6e5c10..6e1f4947 100644
--- a/x11-proto/fontcacheproto/Manifest
+++ b/x11-proto/fontcacheproto/Manifest
@@ -1 +1 @@
-EBUILD fontcacheproto-9999.ebuild 324 RMD160 49a6fee60671d0fa96903462810e3bd4ed87e4ea SHA1 4fbcaf2f1b45c24970505b5419397d9c246b33a0 SHA256 827b8e3e34b212295ac6b6cce719d6ec4ee52071be4077ec6d49c56cae23181b
+EBUILD fontcacheproto-9999.ebuild 330 RMD160 52dcd77dc462de6557ea71a728d5aa5140adabc2 SHA1 5d15608bdc5d6d7fe8b9e7e9adec92f09f59d86c SHA256 2547073b90e25cfb5c9a87a7ace3d4edaf81932f3c8c84b65f2a8e9698395e22
diff --git a/x11-proto/fontcacheproto/fontcacheproto-9999.ebuild b/x11-proto/fontcacheproto/fontcacheproto-9999.ebuild
index 2ee6b4d2..b9634c5e 100644
--- a/x11-proto/fontcacheproto/fontcacheproto-9999.ebuild
+++ b/x11-proto/fontcacheproto/fontcacheproto-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Fontcache protocol headers"
diff --git a/x11-proto/fontsproto/Manifest b/x11-proto/fontsproto/Manifest
index 82d76f19..a383e4f3 100644
--- a/x11-proto/fontsproto/Manifest
+++ b/x11-proto/fontsproto/Manifest
@@ -1 +1 @@
-EBUILD fontsproto-9999.ebuild 320 RMD160 5739f786823a521bc9ed63afac98d2d8b3ee85f4 SHA1 e418b44c896045f0603a187fa572269c8bcf68f9 SHA256 1bca70dc767f6bd6df75d6465df60100fea8a9c583ebda2faa8e72f2b354d3ba
+EBUILD fontsproto-9999.ebuild 326 RMD160 98918574fae888999833605f2ee6b7daf2ccfd44 SHA1 851aa3e34515d00fe8577d2df72e5f33db26c1f8 SHA256 9c3e8f490ff82ab82b219cac76dff5b2a9f0f93dee4f96f1e9d64e62523a4125
diff --git a/x11-proto/fontsproto/fontsproto-9999.ebuild b/x11-proto/fontsproto/fontsproto-9999.ebuild
index 14e6fe32..959690ae 100644
--- a/x11-proto/fontsproto/fontsproto-9999.ebuild
+++ b/x11-proto/fontsproto/fontsproto-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Fonts protocol headers"
diff --git a/x11-proto/glproto/Manifest b/x11-proto/glproto/Manifest
index d4a927bf..6a138816 100644
--- a/x11-proto/glproto/Manifest
+++ b/x11-proto/glproto/Manifest
@@ -1 +1 @@
-EBUILD glproto-9999.ebuild 1104 RMD160 e7bff49ed6834cb4141fe4baa7a51e53227be5fd SHA1 7dbacf78b5013a80fd0a07eca9ae61d7f743663c SHA256 25054ff1378411ce146c13ab143ee25e0e41cb5ffe72e8517c33dbb60cd97ff1
+EBUILD glproto-9999.ebuild 1122 RMD160 dc0e6a66bcdd4ed5002c965fe58c4e0fe5c7d638 SHA1 3bab7d20d36ddc83d9a4e3b92501ceb980a8e345 SHA256 acf7e19cc53e547095f81e8090ce13fb52931737c1338702516f5a9b28d881ce
diff --git a/x11-proto/glproto/glproto-9999.ebuild b/x11-proto/glproto/glproto-9999.ebuild
index c273dc52..23a3bee9 100644
--- a/x11-proto/glproto/glproto-9999.ebuild
+++ b/x11-proto/glproto/glproto-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
OPENGL_DIR="xorg-x11"
@@ -16,12 +16,12 @@ RDEPEND="app-admin/eselect-opengl"
DEPEND=""
src_install() {
- xorg-2_src_install
+ x-modular-r2_src_install
dynamic_libgl_install
}
pkg_postinst() {
- xorg-2_pkg_postinst
+ x-modular-r2_pkg_postinst
switch_opengl_implem
}
diff --git a/x11-proto/inputproto/Manifest b/x11-proto/inputproto/Manifest
index 00239da8..42b2836f 100644
--- a/x11-proto/inputproto/Manifest
+++ b/x11-proto/inputproto/Manifest
@@ -1 +1 @@
-EBUILD inputproto-9999.ebuild 344 RMD160 ec6a24ccd535c8fd64050fbc6fcb3e4f22c843d6 SHA1 6c1e748997d46bd40e4a161212c3a68797a60d29 SHA256 d93a8a43660e7b86bc71b056dbfc2839ac7785091fbf6e9af6a5ed2603482596
+EBUILD inputproto-9999.ebuild 350 RMD160 a7e0a1818ae385d77de93ca16cb5985177d29ec6 SHA1 28e0a738a08eea4ea55b33f992ea3a252703fe7f SHA256 958d4ea471f17fb728b1235e1b63834b62ce167c469b8db32bd4713710a66786
diff --git a/x11-proto/inputproto/inputproto-9999.ebuild b/x11-proto/inputproto/inputproto-9999.ebuild
index 699bc4ba..ff2cf161 100644
--- a/x11-proto/inputproto/inputproto-9999.ebuild
+++ b/x11-proto/inputproto/inputproto-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Input protocol headers"
diff --git a/x11-proto/kbproto/Manifest b/x11-proto/kbproto/Manifest
index 2b23ca13..4336d0b3 100644
--- a/x11-proto/kbproto/Manifest
+++ b/x11-proto/kbproto/Manifest
@@ -1 +1 @@
-EBUILD kbproto-9999.ebuild 317 RMD160 fa4b8319bff0526c2045f5677b8a3c4385fd4e9d SHA1 2bc1313014491f0505bad89044f1d718b4dd025e SHA256 d0886f92cfcd990f5bb4baabd31a3fe80bab9501704d798e0343d38c04a7ae9a
+EBUILD kbproto-9999.ebuild 323 RMD160 a614649573c5df3d1f543db44b0bd2fe3bc35ee5 SHA1 915ba078b65112f490139643abb6c5e3a44fe471 SHA256 441abc3f88833127eb45cf3442ae411e7a484218e9c47a66364cd8b563588d0c
diff --git a/x11-proto/kbproto/kbproto-9999.ebuild b/x11-proto/kbproto/kbproto-9999.ebuild
index d38f864f..77308f9b 100644
--- a/x11-proto/kbproto/kbproto-9999.ebuild
+++ b/x11-proto/kbproto/kbproto-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org KB protocol headers"
diff --git a/x11-proto/lg3dproto/Manifest b/x11-proto/lg3dproto/Manifest
index b4108af4..65e82fb7 100644
--- a/x11-proto/lg3dproto/Manifest
+++ b/x11-proto/lg3dproto/Manifest
@@ -1 +1 @@
-EBUILD lg3dproto-9999.ebuild 292 RMD160 dc2094c127ed16f23dced8a4a5aaf503d882dd0e SHA1 d840427d61c87c384a711f3b9be3156d8e39986c SHA256 2f37a207b22baef5ea447ec9c655dd833d6d141ad40d3d4441df737eb7cbb30b
+EBUILD lg3dproto-9999.ebuild 298 RMD160 aa0922649caa652b57d20f454e33f853171abc37 SHA1 10ae108e7bc6ed6024d238e8d08afd7cc7285a3b SHA256 a24dd11b3c0582cebff1b8da16e8f665caacbd4db1b84bcb87b713b7552220c0
diff --git a/x11-proto/lg3dproto/lg3dproto-9999.ebuild b/x11-proto/lg3dproto/lg3dproto-9999.ebuild
index 4d933ae2..3704b03d 100644
--- a/x11-proto/lg3dproto/lg3dproto-9999.ebuild
+++ b/x11-proto/lg3dproto/lg3dproto-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION=""
diff --git a/x11-proto/printproto/Manifest b/x11-proto/printproto/Manifest
index 531296ac..c03ec071 100644
--- a/x11-proto/printproto/Manifest
+++ b/x11-proto/printproto/Manifest
@@ -1 +1 @@
-EBUILD printproto-9999.ebuild 320 RMD160 edf4d42f6e21ce23bc1015b1b2f78f4799eb8721 SHA1 e850e1db155e8a25786a5dd8ee258945e0a0f998 SHA256 445bb3cc5fdc6a8bf22e1d9668ede92c8b0700841b629fd3c418f02254ddac12
+EBUILD printproto-9999.ebuild 326 RMD160 6f6ee9136e140db5d84a1dc4d5e93c51779e5acd SHA1 5625e0bc9a4b332e2c308d6ec4adc75a5a788507 SHA256 142fc2ec19716de37b49636433ff86139837bb67e41f79173f2656bd5a8862cc
diff --git a/x11-proto/printproto/printproto-9999.ebuild b/x11-proto/printproto/printproto-9999.ebuild
index 8702ca64..ea7d4c59 100644
--- a/x11-proto/printproto/printproto-9999.ebuild
+++ b/x11-proto/printproto/printproto-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Print protocol headers"
diff --git a/x11-proto/randrproto/Manifest b/x11-proto/randrproto/Manifest
index 84bad7ce..34ac8237 100644
--- a/x11-proto/randrproto/Manifest
+++ b/x11-proto/randrproto/Manifest
@@ -1 +1 @@
-EBUILD randrproto-9999.ebuild 320 RMD160 1e7b3034e3bbe39a16d5809251bca02454b429e8 SHA1 e6610471a12366ae86f451d95484c7cb749cddf1 SHA256 21eb38a46e5dae02c1fbb39428ca44522c878097c0e8a643db2a09554a611c86
+EBUILD randrproto-9999.ebuild 326 RMD160 f1d552d8b5b266628ce618ec3e28d2a9c003d55f SHA1 e4c75e0ffa1f660ab8157bde247693374765dfee SHA256 b36beebaa4d88a8fc429171ec0e5c1ee9edadce8bbd730264e0b0effd4f77b2c
diff --git a/x11-proto/randrproto/randrproto-9999.ebuild b/x11-proto/randrproto/randrproto-9999.ebuild
index 5c30713a..5fadb06d 100644
--- a/x11-proto/randrproto/randrproto-9999.ebuild
+++ b/x11-proto/randrproto/randrproto-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Randr protocol headers"
diff --git a/x11-proto/recordproto/Manifest b/x11-proto/recordproto/Manifest
index 2d5f4454..56bd11bb 100644
--- a/x11-proto/recordproto/Manifest
+++ b/x11-proto/recordproto/Manifest
@@ -1 +1 @@
-EBUILD recordproto-9999.ebuild 348 RMD160 0ab2de135899f2b5fb53b681215947cefc12581d SHA1 7a0ce072ae850ac30804744156510be1406035b8 SHA256 52fd47e6443b5c6dd5956647832258ef9eedafc61d6b3bd83f17937357acad54
+EBUILD recordproto-9999.ebuild 354 RMD160 fc63044cd4cb9da687e48428a160b70fc0a096ba SHA1 de2ea89bda493dfdb1891986bb79e3a780bdac3c SHA256 a3e3836cef421acfef937db0b4d29e34284edee112fab93ca44c33ad8191999c
diff --git a/x11-proto/recordproto/recordproto-9999.ebuild b/x11-proto/recordproto/recordproto-9999.ebuild
index 582f1db3..03ae1273 100644
--- a/x11-proto/recordproto/recordproto-9999.ebuild
+++ b/x11-proto/recordproto/recordproto-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Record protocol headers"
diff --git a/x11-proto/renderproto/Manifest b/x11-proto/renderproto/Manifest
index e3304604..f19618b4 100644
--- a/x11-proto/renderproto/Manifest
+++ b/x11-proto/renderproto/Manifest
@@ -1 +1 @@
-EBUILD renderproto-9999.ebuild 321 RMD160 c2b485e429d9ca19efdeac3ffcf323c0184502d6 SHA1 7e68eef27b61baac01030556ca31e5ebf068e2fb SHA256 053e6d361640a4582763b5dc54c22f290da1757f9e23158ab23ea15843eda74e
+EBUILD renderproto-9999.ebuild 327 RMD160 5b53a8dd786e6d20faae905436ab72c6fb8f046f SHA1 1cf7580e2da367c979752fba870fee364c11c3e7 SHA256 6367589610e01a68f422b6b071860c36e669598b12a8e2d3a564f92ba4834366
diff --git a/x11-proto/renderproto/renderproto-9999.ebuild b/x11-proto/renderproto/renderproto-9999.ebuild
index b23d0025..beef4647 100644
--- a/x11-proto/renderproto/renderproto-9999.ebuild
+++ b/x11-proto/renderproto/renderproto-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Render protocol headers"
diff --git a/x11-proto/resourceproto/Manifest b/x11-proto/resourceproto/Manifest
index 31dc3fd7..7712991f 100644
--- a/x11-proto/resourceproto/Manifest
+++ b/x11-proto/resourceproto/Manifest
@@ -1 +1 @@
-EBUILD resourceproto-9999.ebuild 323 RMD160 2dbfe88ffe1fc5bae887e1c444b9f913099bbd7d SHA1 4deb7843f2b78de3f8e873cc82d9f99b4767790d SHA256 8e1009e1becdb5a636a873f3c5b4321b6a48201de7b7c21321426ed34a8c219f
+EBUILD resourceproto-9999.ebuild 329 RMD160 f12c2f98fbe5e2f920748933280490e8a00c3031 SHA1 750c9717a2a01ead38a81fab42e19b51ceef62b3 SHA256 120d129579c76749768908118a1a339b8dcdcab1c72e85459818968bdf9092f2
diff --git a/x11-proto/resourceproto/resourceproto-9999.ebuild b/x11-proto/resourceproto/resourceproto-9999.ebuild
index d773b286..2bae7159 100644
--- a/x11-proto/resourceproto/resourceproto-9999.ebuild
+++ b/x11-proto/resourceproto/resourceproto-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Resource protocol headers"
diff --git a/x11-proto/scrnsaverproto/Manifest b/x11-proto/scrnsaverproto/Manifest
index a3ca6a16..7a7242bf 100644
--- a/x11-proto/scrnsaverproto/Manifest
+++ b/x11-proto/scrnsaverproto/Manifest
@@ -1 +1 @@
-EBUILD scrnsaverproto-9999.ebuild 352 RMD160 0e8987ed8c9dc5ed0431dd56bbb6e467bfd1b735 SHA1 0738a0794f113ca56847b4b443b484b0a89e4bc5 SHA256 890214fe6c640e86e7d26389f5a38df13410695b20a1990c79aee68a0cd0cbf1
+EBUILD scrnsaverproto-9999.ebuild 358 RMD160 cb436f358cfae31cbaa9ed1e54fcab52f667b6cd SHA1 94649c78f13c3c98725d7346cfa16a27a8973fb7 SHA256 64550e5475cf53ade8ca8c2fbfeb4baa02c43ce627f7299d7fd848513bc992ff
diff --git a/x11-proto/scrnsaverproto/scrnsaverproto-9999.ebuild b/x11-proto/scrnsaverproto/scrnsaverproto-9999.ebuild
index d7a12aba..7145be90 100644
--- a/x11-proto/scrnsaverproto/scrnsaverproto-9999.ebuild
+++ b/x11-proto/scrnsaverproto/scrnsaverproto-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org ScrnSaver protocol headers"
diff --git a/x11-proto/trapproto/Manifest b/x11-proto/trapproto/Manifest
index 40b22f9f..1550db4b 100644
--- a/x11-proto/trapproto/Manifest
+++ b/x11-proto/trapproto/Manifest
@@ -1 +1 @@
-EBUILD trapproto-9999.ebuild 319 RMD160 296843e25124e76bff2f219b7d9fa2e7fff53d28 SHA1 de456a3632f3ca66d98675e35defdd3e35f72d13 SHA256 27dc56c555b0e81c43dc53e7be85d8d8fe402915ba4590f7852318301cd8d49a
+EBUILD trapproto-9999.ebuild 325 RMD160 b59164158ca2e91e0f9eb1b984e9bf61a2299191 SHA1 dcc719711d18536fdb068635deb675f6209c2bb0 SHA256 ea95b8a4acdb49c8e64da9d604cb14339b661463c0c0db1056c7953503766504
diff --git a/x11-proto/trapproto/trapproto-9999.ebuild b/x11-proto/trapproto/trapproto-9999.ebuild
index 65197c7f..1651a478 100644
--- a/x11-proto/trapproto/trapproto-9999.ebuild
+++ b/x11-proto/trapproto/trapproto-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Trap protocol headers"
diff --git a/x11-proto/videoproto/Manifest b/x11-proto/videoproto/Manifest
index 6e8d0cc7..5e8b79aa 100644
--- a/x11-proto/videoproto/Manifest
+++ b/x11-proto/videoproto/Manifest
@@ -1 +1 @@
-EBUILD videoproto-9999.ebuild 320 RMD160 41d3a94dd7300ef507a606dbe637578df42eb22e SHA1 699e88110b59b7f574288abedcf53eb9ef74d912 SHA256 7e76b157f05089e05d4cf23915c0d5a8d6f68ca704ff324bc7ce70f692ef5400
+EBUILD videoproto-9999.ebuild 326 RMD160 aee82b133ac10f16786c09b0f2890050c5110b48 SHA1 b318c3d3d1a620a9054d5c2c672ab69b9aaa9266 SHA256 b59f494e17b43d25ad7dae8488874a608e889bc0918e983057f2b0d9b98d8260
diff --git a/x11-proto/videoproto/videoproto-9999.ebuild b/x11-proto/videoproto/videoproto-9999.ebuild
index d50d4534..15e5d9c7 100644
--- a/x11-proto/videoproto/videoproto-9999.ebuild
+++ b/x11-proto/videoproto/videoproto-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Video protocol headers"
diff --git a/x11-proto/xcb-proto/Manifest b/x11-proto/xcb-proto/Manifest
index a06eefc2..a80235d4 100644
--- a/x11-proto/xcb-proto/Manifest
+++ b/x11-proto/xcb-proto/Manifest
@@ -1 +1 @@
-EBUILD xcb-proto-9999.ebuild 552 RMD160 4ecacfc4e37bbf1a035de83f9618cbcad9ee8123 SHA1 0f3948829adb330b98ac7524e40b51394bd5fdf7 SHA256 18bb65e36c3ab04d5ecb73fcfcec87fd62d943aa091f10a824dd68dfbc001716
+EBUILD xcb-proto-9999.ebuild 558 RMD160 524ab8cd07d278bc48e9be563fe23bb3016cba23 SHA1 2c5bb810c626f08fb0819f47a57c56dbb467dd4e SHA256 a26309c6bdd2f5682ed59e57270fc8f8b26224d9c1f147b147c6e172cb81f4be
diff --git a/x11-proto/xcb-proto/xcb-proto-9999.ebuild b/x11-proto/xcb-proto/xcb-proto-9999.ebuild
index 3f4a0d1e..16af5c55 100644
--- a/x11-proto/xcb-proto/xcb-proto-9999.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X C-language Bindings protocol headers"
HOMEPAGE="http://xcb.freedesktop.org/"
diff --git a/x11-proto/xcmiscproto/Manifest b/x11-proto/xcmiscproto/Manifest
index 0c192221..a08f85f6 100644
--- a/x11-proto/xcmiscproto/Manifest
+++ b/x11-proto/xcmiscproto/Manifest
@@ -1 +1 @@
-EBUILD xcmiscproto-9999.ebuild 321 RMD160 82d962fece220a3b19a1158623108d7857b4f2c9 SHA1 481c2a92caa0b4c8d4e905ae7bd5eb6adf8785dd SHA256 02884571e5290ea6c0bc1f8a987dbd2b696fb24b520d7e0e0658b0652c11fe11
+EBUILD xcmiscproto-9999.ebuild 327 RMD160 5ebe4db1c34a16fbe172adbff4910491c8a0042c SHA1 d2c6957ca3c23f06b99a30ac7d07c858d90176c8 SHA256 c78bb6bcd044abeddc732274390ad313500f30a71702ef399828bef0bd843f53
diff --git a/x11-proto/xcmiscproto/xcmiscproto-9999.ebuild b/x11-proto/xcmiscproto/xcmiscproto-9999.ebuild
index 3f94ee2f..09a3cdfd 100644
--- a/x11-proto/xcmiscproto/xcmiscproto-9999.ebuild
+++ b/x11-proto/xcmiscproto/xcmiscproto-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org XCMisc protocol headers"
diff --git a/x11-proto/xextproto/Manifest b/x11-proto/xextproto/Manifest
index 178fb7bb..3cbd45ad 100644
--- a/x11-proto/xextproto/Manifest
+++ b/x11-proto/xextproto/Manifest
@@ -1 +1 @@
-EBUILD xextproto-9999.ebuild 344 RMD160 09b3701be605447e0fc7b67de91d967b0e60c400 SHA1 4f5d285d6336c14da1eee9a8636f557d21c03a5d SHA256 ab069302aa02be6e1a4c70110d5075f2ec73045ab4f324bcfe209a16b6a81952
+EBUILD xextproto-9999.ebuild 350 RMD160 e9817046682116ab60ccb27597968fecba60ff2c SHA1 2148534668f2571ab0f24a006b554d27b959114c SHA256 07dddcb9ea3c1dbdb3edb64d93787e0b65f2e7c2a9b6c1a764b61ee2f1ad3576
diff --git a/x11-proto/xextproto/xextproto-9999.ebuild b/x11-proto/xextproto/xextproto-9999.ebuild
index fa547efd..5667b2a3 100644
--- a/x11-proto/xextproto/xextproto-9999.ebuild
+++ b/x11-proto/xextproto/xextproto-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org XExt protocol headers"
diff --git a/x11-proto/xf86bigfontproto/Manifest b/x11-proto/xf86bigfontproto/Manifest
index a24e51ed..28fbbef9 100644
--- a/x11-proto/xf86bigfontproto/Manifest
+++ b/x11-proto/xf86bigfontproto/Manifest
@@ -1 +1 @@
-EBUILD xf86bigfontproto-9999.ebuild 326 RMD160 fbb89dc5bf98f0bd8cc338517d210be7fdf08441 SHA1 60409c66612d88a5baac2f2a7b0cbfab96979f55 SHA256 af9aa12adfe2574d206a4dc5837865f9ac1c08b508dab560a9457dcd5b4835ce
+EBUILD xf86bigfontproto-9999.ebuild 332 RMD160 2288c7d47bf11c4ab4020a9274b9de30bbc8839f SHA1 79473ad0933ecc73cd09758efc083e4adc1a26d0 SHA256 b4573c6cbb70c56c902b26900b0f86c39e45c07c06e417f3953f29a6aa4d2275
diff --git a/x11-proto/xf86bigfontproto/xf86bigfontproto-9999.ebuild b/x11-proto/xf86bigfontproto/xf86bigfontproto-9999.ebuild
index b08ba411..f0d816a4 100644
--- a/x11-proto/xf86bigfontproto/xf86bigfontproto-9999.ebuild
+++ b/x11-proto/xf86bigfontproto/xf86bigfontproto-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org XF86BigFont protocol headers"
diff --git a/x11-proto/xf86dgaproto/Manifest b/x11-proto/xf86dgaproto/Manifest
index aaf83ed5..9588c5d2 100644
--- a/x11-proto/xf86dgaproto/Manifest
+++ b/x11-proto/xf86dgaproto/Manifest
@@ -1 +1 @@
-EBUILD xf86dgaproto-9999.ebuild 353 RMD160 98c46e79951cd80f8dea1796732acb8f8962ed56 SHA1 612bf6a26b0e61a6da382f0ece9fe6ee00f9668f SHA256 139ac5f6b54e512340b4214f7c87c56b3da89b83e523d57d9c4086b34b2ecf0b
+EBUILD xf86dgaproto-9999.ebuild 359 RMD160 279b16f584732a7ce7f721c349c3b3e4259ccb88 SHA1 d873718c8dd27682ec71a18721e915b753b5c0e2 SHA256 a306dc4aaef45153728e344ddad7b580f4b2b9e59531f44496dda26c066ae21d
diff --git a/x11-proto/xf86dgaproto/xf86dgaproto-9999.ebuild b/x11-proto/xf86dgaproto/xf86dgaproto-9999.ebuild
index be340752..420a6dd3 100644
--- a/x11-proto/xf86dgaproto/xf86dgaproto-9999.ebuild
+++ b/x11-proto/xf86dgaproto/xf86dgaproto-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org XF86DGA protocol headers"
diff --git a/x11-proto/xf86driproto/Manifest b/x11-proto/xf86driproto/Manifest
index 0062eb7d..d2d63446 100644
--- a/x11-proto/xf86driproto/Manifest
+++ b/x11-proto/xf86driproto/Manifest
@@ -1 +1 @@
-EBUILD xf86driproto-9999.ebuild 322 RMD160 489010671e2aef164dd944ad7a0eda39c318b2a1 SHA1 06c8b71c97862c63bae8ee81ce19cf2b55ee65d0 SHA256 077b12c5350d2cc3fe41dc70175e81c79bfa697cb02c35626a5fda27e1d23499
+EBUILD xf86driproto-9999.ebuild 328 RMD160 95725b4ffdf9aef25ac7f61c6d049b70e734db0a SHA1 301337bffaf578200e937e5e2bce464b604194c6 SHA256 38b93575d69b45697fb72c70bf9287d158a9bda4f8e14545f95e7117183d1173
diff --git a/x11-proto/xf86driproto/xf86driproto-9999.ebuild b/x11-proto/xf86driproto/xf86driproto-9999.ebuild
index 5eb6ca89..2560f2b9 100644
--- a/x11-proto/xf86driproto/xf86driproto-9999.ebuild
+++ b/x11-proto/xf86driproto/xf86driproto-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org XF86DRI protocol headers"
diff --git a/x11-proto/xf86miscproto/Manifest b/x11-proto/xf86miscproto/Manifest
index 4d08e079..c690b8ab 100644
--- a/x11-proto/xf86miscproto/Manifest
+++ b/x11-proto/xf86miscproto/Manifest
@@ -1 +1 @@
-EBUILD xf86miscproto-9999.ebuild 323 RMD160 b66491cfbc3f69c66fc434e83eef371254733f63 SHA1 f3fa88f6c688218c899269e7997ae0bd4aea645d SHA256 5cb94b56d17972853d286dbe61d3ff3b59557da1ab659c64db9dd2a9c1517376
+EBUILD xf86miscproto-9999.ebuild 329 RMD160 c10761f909a46e570abeed954a4247bd3bf14a63 SHA1 e7f4ee428c3b65d4af6b133c00c826952efe92af SHA256 9d8210e1d86388974522ac2955af53a4dd8eb47bf2d621bc2261a46abf2f509c
diff --git a/x11-proto/xf86miscproto/xf86miscproto-9999.ebuild b/x11-proto/xf86miscproto/xf86miscproto-9999.ebuild
index 241c532b..e10e0d52 100644
--- a/x11-proto/xf86miscproto/xf86miscproto-9999.ebuild
+++ b/x11-proto/xf86miscproto/xf86miscproto-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org XF86Misc protocol headers"
diff --git a/x11-proto/xf86rushproto/Manifest b/x11-proto/xf86rushproto/Manifest
index fc2eb41b..b2a14cbf 100644
--- a/x11-proto/xf86rushproto/Manifest
+++ b/x11-proto/xf86rushproto/Manifest
@@ -1 +1 @@
-EBUILD xf86rushproto-9999.ebuild 323 RMD160 e34efc2c09b2950bcdc1d988fa84c51adc691d00 SHA1 356e71dd88b28c721b53d6b5069138677b016188 SHA256 9586061ab052c0ed7113e66cfe48b0d67ddc9aca49ff8364f0e6cd9ffd391a72
+EBUILD xf86rushproto-9999.ebuild 329 RMD160 d94938981ac24d4088790e00fb43234413e00f9e SHA1 4c04b095af21a8cfdf9107423b2184cac4099096 SHA256 319ae62a44239fecd3b64126cb9f34b3882d5a68e8860fc72132c25aa37c37fd
diff --git a/x11-proto/xf86rushproto/xf86rushproto-9999.ebuild b/x11-proto/xf86rushproto/xf86rushproto-9999.ebuild
index 66a91e9e..c9996029 100644
--- a/x11-proto/xf86rushproto/xf86rushproto-9999.ebuild
+++ b/x11-proto/xf86rushproto/xf86rushproto-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org XF86Rush protocol headers"
diff --git a/x11-proto/xf86vidmodeproto/Manifest b/x11-proto/xf86vidmodeproto/Manifest
index f9b8f217..07d01f36 100644
--- a/x11-proto/xf86vidmodeproto/Manifest
+++ b/x11-proto/xf86vidmodeproto/Manifest
@@ -1 +1 @@
-EBUILD xf86vidmodeproto-9999.ebuild 356 RMD160 0b65aec0fdde9eb286332664bab14e22c171ad57 SHA1 b2487ecbf913e1a720642e305f9e15ecfd53418b SHA256 63b701ecc4c506e908d6daa68249f5ef1d8424dbe4d5ec8a150d173faffca384
+EBUILD xf86vidmodeproto-9999.ebuild 362 RMD160 8fbd4ce9d2cf5f47ab085a13a0b0e8e877aa2a2d SHA1 14b6951424da76c329d022770e678e84b859a599 SHA256 8e068e29047b5482a2e08eb5cca0e1ea760bc3b4bc461ae6368580535c254804
diff --git a/x11-proto/xf86vidmodeproto/xf86vidmodeproto-9999.ebuild b/x11-proto/xf86vidmodeproto/xf86vidmodeproto-9999.ebuild
index 421ba57a..f0b6cb3e 100644
--- a/x11-proto/xf86vidmodeproto/xf86vidmodeproto-9999.ebuild
+++ b/x11-proto/xf86vidmodeproto/xf86vidmodeproto-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org XF86VidMode protocol headers"
diff --git a/x11-proto/xineramaproto/Manifest b/x11-proto/xineramaproto/Manifest
index 858452a0..b7e7539d 100644
--- a/x11-proto/xineramaproto/Manifest
+++ b/x11-proto/xineramaproto/Manifest
@@ -1 +1 @@
-EBUILD xineramaproto-9999.ebuild 354 RMD160 7f63141e2c2e9128d0aee8fb2707c8c6aeb865f1 SHA1 03422b995c368122833224082e9427192e5bafcd SHA256 45f6855b8dac99b64a04a78bd564ccad9fd16c6bf96b104c6747800eef1f20f0
+EBUILD xineramaproto-9999.ebuild 360 RMD160 4e4f114f5000d0126c0400212e6dd1d687c6fb97 SHA1 d11e162fedbae9a3aa49f118a07805844589647a SHA256 3db35e91911fbe76b7152a20d4a1667dce0986adfd8dedf2ea75de1b766a883c
diff --git a/x11-proto/xineramaproto/xineramaproto-9999.ebuild b/x11-proto/xineramaproto/xineramaproto-9999.ebuild
index be0291b6..06dab0fa 100644
--- a/x11-proto/xineramaproto/xineramaproto-9999.ebuild
+++ b/x11-proto/xineramaproto/xineramaproto-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org Xinerama protocol headers"
diff --git a/x11-proto/xproto/Manifest b/x11-proto/xproto/Manifest
index 8ba2bb5a..269571a6 100644
--- a/x11-proto/xproto/Manifest
+++ b/x11-proto/xproto/Manifest
@@ -1 +1 @@
-EBUILD xproto-9999.ebuild 391 RMD160 847de0fcbf430319a9809e8f83c408f6f6d9fddf SHA1 1af33412902a156bd1a9ebaff4bbf9a938a0bf73 SHA256 b8f42c29c38e37151b88ae71b64804a5f5585cc0a0bdad422ce554e40039b7b8
+EBUILD xproto-9999.ebuild 397 RMD160 6fc8eef4b9a6cb58e16cdca0c3064e0bc61a6865 SHA1 8f1c96e39e8200bec957723b872c6207230cfe1a SHA256 f979291c0c80819e4cd90d0586cfb086cddbefb687b2d700e84f4b4b4587614a
diff --git a/x11-proto/xproto/xproto-9999.ebuild b/x11-proto/xproto/xproto-9999.ebuild
index 13fe830f..60eec351 100644
--- a/x11-proto/xproto/xproto-9999.ebuild
+++ b/x11-proto/xproto/xproto-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=3
-inherit xorg-2
+inherit x-modular-r2
DESCRIPTION="X.Org xproto protocol headers"
EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/proto/x11proto"