[Lunar-commits] <moonbase> xorg7: remove all the COFLICTS file referring XOrg and XOrg6 stuff.
Florin Braescu
florin at lunar-linux.org
Sun Feb 7 17:26:55 CET 2010
commit 0a278f42c72bd1293d91d60d2b1e3272b69a94d2
Author: Florin Braescu <florin at lunar-linux.org>
Date: Sun Feb 7 18:26:55 2010 +0200
xorg7: remove all the COFLICTS file referring XOrg and XOrg6 stuff.
---
xorg7/app/appres/CONFLICTS | 6 ------
xorg7/app/bdftopcf/CONFLICTS | 6 ------
xorg7/app/beforelight/CONFLICTS | 6 ------
xorg7/app/bitmap/CONFLICTS | 6 ------
xorg7/app/editres/CONFLICTS | 6 ------
xorg7/app/fonttosfnt/CONFLICTS | 6 ------
xorg7/app/fslsfonts/CONFLICTS | 6 ------
xorg7/app/fstobdf/CONFLICTS | 6 ------
xorg7/app/iceauth/CONFLICTS | 6 ------
xorg7/app/ico/CONFLICTS | 6 ------
xorg7/app/listres/CONFLICTS | 6 ------
xorg7/app/luit/CONFLICTS | 6 ------
xorg7/app/mkfontdir/CONFLICTS | 6 ------
xorg7/app/mkfontscale/CONFLICTS | 6 ------
xorg7/app/rendercheck/CONFLICTS | 6 ------
xorg7/app/rgb/CONFLICTS | 6 ------
xorg7/app/rstart/CONFLICTS | 6 ------
xorg7/app/sessreg/CONFLICTS | 6 ------
xorg7/app/setxkbmap/CONFLICTS | 6 ------
xorg7/app/showfont/CONFLICTS | 6 ------
xorg7/app/smproxy/CONFLICTS | 6 ------
xorg7/app/twm/CONFLICTS | 6 ------
xorg7/app/x11perf/CONFLICTS | 6 ------
xorg7/app/xauth/CONFLICTS | 6 ------
xorg7/app/xbacklight/CONFLICTS | 6 ------
xorg7/app/xcalc/CONFLICTS | 6 ------
xorg7/app/xclock/CONFLICTS | 6 ------
xorg7/app/xcmsdb/CONFLICTS | 6 ------
xorg7/app/xcompmgr/CONFLICTS | 6 ------
xorg7/app/xconsole/CONFLICTS | 6 ------
xorg7/app/xcursorgen/CONFLICTS | 6 ------
xorg7/app/xdbedizzy/CONFLICTS | 6 ------
xorg7/app/xdm/CONFLICTS | 6 ------
xorg7/app/xdpyinfo/CONFLICTS | 6 ------
xorg7/app/xdriinfo/CONFLICTS | 6 ------
xorg7/app/xedit/CONFLICTS | 6 ------
xorg7/app/xev/CONFLICTS | 6 ------
xorg7/app/xeyes/CONFLICTS | 6 ------
xorg7/app/xfs/CONFLICTS | 6 ------
xorg7/app/xfsinfo/CONFLICTS | 6 ------
xorg7/app/xgamma/CONFLICTS | 6 ------
xorg7/app/xhost/CONFLICTS | 6 ------
xorg7/app/xinit/CONFLICTS | 6 ------
xorg7/app/xinput/CONFLICTS | 6 ------
xorg7/app/xkbcomp/CONFLICTS | 6 ------
xorg7/app/xkbevd/CONFLICTS | 6 ------
xorg7/app/xkbutils/CONFLICTS | 6 ------
xorg7/app/xkill/CONFLICTS | 6 ------
xorg7/app/xload/CONFLICTS | 6 ------
xorg7/app/xlsatoms/CONFLICTS | 6 ------
xorg7/app/xlsclients/CONFLICTS | 6 ------
xorg7/app/xlsfonts/CONFLICTS | 6 ------
xorg7/app/xmag/CONFLICTS | 6 ------
xorg7/app/xman/CONFLICTS | 6 ------
xorg7/app/xmessage/CONFLICTS | 6 ------
xorg7/app/xmh/CONFLICTS | 6 ------
xorg7/app/xmodmap/CONFLICTS | 6 ------
xorg7/app/xmore/CONFLICTS | 6 ------
xorg7/app/xplsprinters/CONFLICTS | 6 ------
xorg7/app/xpr/CONFLICTS | 6 ------
xorg7/app/xprop/CONFLICTS | 6 ------
xorg7/app/xrandr/CONFLICTS | 6 ------
xorg7/app/xrdb/CONFLICTS | 6 ------
xorg7/app/xrefresh/CONFLICTS | 6 ------
xorg7/app/xset/CONFLICTS | 6 ------
xorg7/app/xsetroot/CONFLICTS | 6 ------
xorg7/app/xvidtune/CONFLICTS | 6 ------
xorg7/app/xvinfo/CONFLICTS | 6 ------
xorg7/app/xwd/CONFLICTS | 6 ------
xorg7/app/xwininfo/CONFLICTS | 6 ------
xorg7/app/xwud/CONFLICTS | 6 ------
xorg7/data/xbitmaps/CONFLICTS | 6 ------
xorg7/data/xcursor-themes/CONFLICTS | 6 ------
xorg7/data/xkeyboard-config/CONFLICTS | 7 -------
xorg7/doc/xorg-docs/CONFLICTS | 6 ------
xorg7/doc/xorg-sgml-doctools/CONFLICTS | 6 ------
xorg7/driver/xf86-input-acecad/CONFLICTS | 6 ------
xorg7/driver/xf86-input-aiptek/CONFLICTS | 6 ------
xorg7/driver/xf86-input-calcomp/CONFLICTS | 6 ------
xorg7/driver/xf86-input-citron/CONFLICTS | 6 ------
xorg7/driver/xf86-input-digitaledge/CONFLICTS | 6 ------
xorg7/driver/xf86-input-dmc/CONFLICTS | 6 ------
xorg7/driver/xf86-input-dynapro/CONFLICTS | 6 ------
xorg7/driver/xf86-input-elo2300/CONFLICTS | 6 ------
xorg7/driver/xf86-input-elographics/CONFLICTS | 6 ------
xorg7/driver/xf86-input-evdev/CONFLICTS | 6 ------
xorg7/driver/xf86-input-fpit/CONFLICTS | 6 ------
xorg7/driver/xf86-input-hyperpen/CONFLICTS | 6 ------
xorg7/driver/xf86-input-jamstudio/CONFLICTS | 6 ------
xorg7/driver/xf86-input-joystick/CONFLICTS | 6 ------
xorg7/driver/xf86-input-keyboard/CONFLICTS | 6 ------
xorg7/driver/xf86-input-magellan/CONFLICTS | 6 ------
xorg7/driver/xf86-input-magictouch/CONFLICTS | 6 ------
xorg7/driver/xf86-input-microtouch/CONFLICTS | 6 ------
xorg7/driver/xf86-input-mouse/CONFLICTS | 6 ------
xorg7/driver/xf86-input-mutouch/CONFLICTS | 6 ------
xorg7/driver/xf86-input-palmax/CONFLICTS | 6 ------
xorg7/driver/xf86-input-penmount/CONFLICTS | 6 ------
xorg7/driver/xf86-input-spaceorb/CONFLICTS | 6 ------
xorg7/driver/xf86-input-summa/CONFLICTS | 6 ------
xorg7/driver/xf86-input-synaptics/CONFLICTS | 6 ------
xorg7/driver/xf86-input-tek4957/CONFLICTS | 6 ------
xorg7/driver/xf86-input-ur98/CONFLICTS | 6 ------
xorg7/driver/xf86-input-vmmouse/CONFLICTS | 6 ------
xorg7/driver/xf86-input-void/CONFLICTS | 6 ------
xorg7/driver/xf86-video-apm/CONFLICTS | 6 ------
xorg7/driver/xf86-video-ark/CONFLICTS | 6 ------
xorg7/driver/xf86-video-ast/CONFLICTS | 6 ------
xorg7/driver/xf86-video-ati/CONFLICTS | 6 ------
xorg7/driver/xf86-video-chips/CONFLICTS | 6 ------
xorg7/driver/xf86-video-cirrus/CONFLICTS | 6 ------
xorg7/driver/xf86-video-cyrix/CONFLICTS | 6 ------
xorg7/driver/xf86-video-dummy/CONFLICTS | 6 ------
xorg7/driver/xf86-video-fbdev/CONFLICTS | 6 ------
xorg7/driver/xf86-video-glint/CONFLICTS | 6 ------
xorg7/driver/xf86-video-i128/CONFLICTS | 6 ------
xorg7/driver/xf86-video-i740/CONFLICTS | 6 ------
xorg7/driver/xf86-video-i810/CONFLICTS | 6 ------
xorg7/driver/xf86-video-imstt/CONFLICTS | 6 ------
xorg7/driver/xf86-video-intel-git/CONFLICTS | 7 +------
xorg7/driver/xf86-video-intel/CONFLICTS | 7 +------
xorg7/driver/xf86-video-mach64/CONFLICTS | 6 ------
xorg7/driver/xf86-video-mga/CONFLICTS | 6 ------
xorg7/driver/xf86-video-neomagic/CONFLICTS | 6 ------
xorg7/driver/xf86-video-newport/CONFLICTS | 6 ------
xorg7/driver/xf86-video-nsc/CONFLICTS | 6 ------
xorg7/driver/xf86-video-nv/CONFLICTS | 6 ------
xorg7/driver/xf86-video-r128/CONFLICTS | 6 ------
xorg7/driver/xf86-video-radeonhd/CONFLICTS | 6 ------
xorg7/driver/xf86-video-rendition/CONFLICTS | 6 ------
xorg7/driver/xf86-video-s3/CONFLICTS | 6 ------
xorg7/driver/xf86-video-s3virge/CONFLICTS | 6 ------
xorg7/driver/xf86-video-savage/CONFLICTS | 6 ------
xorg7/driver/xf86-video-siliconmotion/CONFLICTS | 6 ------
xorg7/driver/xf86-video-sis/CONFLICTS | 6 ------
xorg7/driver/xf86-video-sisusb/CONFLICTS | 6 ------
xorg7/driver/xf86-video-trident/CONFLICTS | 6 ------
xorg7/driver/xf86-video-v4l/CONFLICTS | 6 ------
xorg7/driver/xf86-video-vesa/CONFLICTS | 6 ------
xorg7/driver/xf86-video-vga/CONFLICTS | 6 ------
xorg7/driver/xf86-video-via/CONFLICTS | 6 ------
xorg7/driver/xf86-video-vmware/CONFLICTS | 6 ------
xorg7/driver/xf86-video-voodoo/CONFLICTS | 6 ------
xorg7/extra/libdrm/CONFLICTS | 6 ------
xorg7/extra/libxcb/CONFLICTS | 6 ------
xorg7/extra/xcb-proto/CONFLICTS | 6 ------
xorg7/extra/xcb-util/CONFLICTS | 6 ------
xorg7/extra/xf86dga/CONFLICTS | 6 ------
xorg7/extra/xpyb/CONFLICTS | 6 ------
xorg7/extra/xterm/CONFLICTS | 6 ------
xorg7/font/encodings/CONFLICTS | 6 ------
xorg7/font/font-adobe-100dpi/CONFLICTS | 6 ------
xorg7/font/font-adobe-75dpi/CONFLICTS | 6 ------
xorg7/font/font-adobe-utopia-100dpi/CONFLICTS | 6 ------
xorg7/font/font-adobe-utopia-75dpi/CONFLICTS | 6 ------
xorg7/font/font-adobe-utopia-type1/CONFLICTS | 6 ------
xorg7/font/font-alias/CONFLICTS | 6 ------
xorg7/font/font-arabic-misc/CONFLICTS | 6 ------
xorg7/font/font-bh-100dpi/CONFLICTS | 6 ------
xorg7/font/font-bh-75dpi/CONFLICTS | 6 ------
.../font/font-bh-lucidatypewriter-100dpi/CONFLICTS | 6 ------
.../font/font-bh-lucidatypewriter-75dpi/CONFLICTS | 6 ------
xorg7/font/font-bh-ttf/CONFLICTS | 6 ------
xorg7/font/font-bh-type1/CONFLICTS | 6 ------
xorg7/font/font-bitstream-100dpi/CONFLICTS | 6 ------
xorg7/font/font-bitstream-75dpi/CONFLICTS | 6 ------
xorg7/font/font-bitstream-speedo/CONFLICTS | 6 ------
xorg7/font/font-bitstream-type1/CONFLICTS | 6 ------
xorg7/font/font-cronyx-cyrillic/CONFLICTS | 6 ------
xorg7/font/font-cursor-misc/CONFLICTS | 6 ------
xorg7/font/font-daewoo-misc/CONFLICTS | 6 ------
xorg7/font/font-dec-misc/CONFLICTS | 6 ------
xorg7/font/font-ibm-type1/CONFLICTS | 6 ------
xorg7/font/font-isas-misc/CONFLICTS | 6 ------
xorg7/font/font-jis-misc/CONFLICTS | 6 ------
xorg7/font/font-micro-misc/CONFLICTS | 6 ------
xorg7/font/font-misc-cyrillic/CONFLICTS | 6 ------
xorg7/font/font-misc-ethiopic/CONFLICTS | 6 ------
xorg7/font/font-misc-meltho/CONFLICTS | 6 ------
xorg7/font/font-misc-misc/CONFLICTS | 6 ------
xorg7/font/font-mutt-misc/CONFLICTS | 6 ------
xorg7/font/font-schumacher-misc/CONFLICTS | 6 ------
xorg7/font/font-screen-cyrillic/CONFLICTS | 6 ------
xorg7/font/font-sony-misc/CONFLICTS | 6 ------
xorg7/font/font-sun-misc/CONFLICTS | 6 ------
xorg7/font/font-util/CONFLICTS | 6 ------
xorg7/font/font-winitzki-cyrillic/CONFLICTS | 6 ------
xorg7/font/font-xfree86-type1/CONFLICTS | 6 ------
xorg7/lib/libFS/CONFLICTS | 6 ------
xorg7/lib/libICE/CONFLICTS | 6 ------
xorg7/lib/libSM/CONFLICTS | 6 ------
xorg7/lib/libX11/CONFLICTS | 6 ------
xorg7/lib/libXScrnSaver/CONFLICTS | 6 ------
xorg7/lib/libXTrap/CONFLICTS | 6 ------
xorg7/lib/libXau/CONFLICTS | 6 ------
xorg7/lib/libXaw/CONFLICTS | 6 ------
xorg7/lib/libXcomposite/CONFLICTS | 6 ------
xorg7/lib/libXcursor/CONFLICTS | 6 ------
xorg7/lib/libXdamage/CONFLICTS | 6 ------
xorg7/lib/libXdmcp/CONFLICTS | 6 ------
xorg7/lib/libXevie/CONFLICTS | 6 ------
xorg7/lib/libXext/CONFLICTS | 6 ------
xorg7/lib/libXfixes/CONFLICTS | 6 ------
xorg7/lib/libXfont/CONFLICTS | 6 ------
xorg7/lib/libXfontcache/CONFLICTS | 6 ------
xorg7/lib/libXft/CONFLICTS | 6 ------
xorg7/lib/libXi/CONFLICTS | 6 ------
xorg7/lib/libXinerama/CONFLICTS | 6 ------
xorg7/lib/libXmu/CONFLICTS | 6 ------
xorg7/lib/libXp/CONFLICTS | 6 ------
xorg7/lib/libXpm/CONFLICTS | 6 ------
xorg7/lib/libXprintAppUtil/CONFLICTS | 6 ------
xorg7/lib/libXprintUtil/CONFLICTS | 6 ------
xorg7/lib/libXrandr/CONFLICTS | 6 ------
xorg7/lib/libXrender/CONFLICTS | 6 ------
xorg7/lib/libXres/CONFLICTS | 6 ------
xorg7/lib/libXt/CONFLICTS | 6 ------
xorg7/lib/libXtst/CONFLICTS | 6 ------
xorg7/lib/libXv/CONFLICTS | 6 ------
xorg7/lib/libXvMC/CONFLICTS | 6 ------
xorg7/lib/libXxf86dga/CONFLICTS | 6 ------
xorg7/lib/libXxf86misc/CONFLICTS | 6 ------
xorg7/lib/libXxf86vm/CONFLICTS | 6 ------
xorg7/lib/libdmx/CONFLICTS | 6 ------
xorg7/lib/libfontenc/CONFLICTS | 6 ------
xorg7/lib/liblbxutil/CONFLICTS | 6 ------
xorg7/lib/liboldX/CONFLICTS | 6 ------
xorg7/lib/libpciaccess/CONFLICTS | 6 ------
xorg7/lib/libxkbfile/CONFLICTS | 6 ------
xorg7/lib/libxkbui/CONFLICTS | 6 ------
xorg7/lib/pixman/CONFLICTS | 4 ----
xorg7/lib/xtrans/CONFLICTS | 6 ------
xorg7/mesa-lib/CONFLICTS | 2 --
xorg7/proto/applewmproto/CONFLICTS | 6 ------
xorg7/proto/bigreqsproto/CONFLICTS | 6 ------
xorg7/proto/compositeproto/CONFLICTS | 6 ------
xorg7/proto/damageproto/CONFLICTS | 6 ------
xorg7/proto/dmxproto/CONFLICTS | 6 ------
xorg7/proto/dri2proto/CONFLICTS | 6 ------
xorg7/proto/evieext/CONFLICTS | 6 ------
xorg7/proto/fixesproto/CONFLICTS | 6 ------
xorg7/proto/fontcacheproto/CONFLICTS | 6 ------
xorg7/proto/fontsproto/CONFLICTS | 6 ------
xorg7/proto/glproto/CONFLICTS | 6 ------
xorg7/proto/inputproto/CONFLICTS | 6 ------
xorg7/proto/kbproto/CONFLICTS | 6 ------
xorg7/proto/printproto/CONFLICTS | 6 ------
xorg7/proto/randrproto/CONFLICTS | 6 ------
xorg7/proto/recordproto/CONFLICTS | 6 ------
xorg7/proto/renderproto/CONFLICTS | 6 ------
xorg7/proto/resourceproto/CONFLICTS | 6 ------
xorg7/proto/scrnsaverproto/CONFLICTS | 6 ------
xorg7/proto/trapproto/CONFLICTS | 6 ------
xorg7/proto/videoproto/CONFLICTS | 6 ------
xorg7/proto/xcmiscproto/CONFLICTS | 6 ------
xorg7/proto/xextproto/CONFLICTS | 6 ------
xorg7/proto/xf86bigfontproto/CONFLICTS | 6 ------
xorg7/proto/xf86dgaproto/CONFLICTS | 6 ------
xorg7/proto/xf86driproto/CONFLICTS | 6 ------
xorg7/proto/xf86miscproto/CONFLICTS | 6 ------
xorg7/proto/xf86rushproto/CONFLICTS | 6 ------
xorg7/proto/xf86vidmodeproto/CONFLICTS | 6 ------
xorg7/proto/xineramaproto/CONFLICTS | 6 ------
xorg7/proto/xproto/CONFLICTS | 6 ------
xorg7/proto/xproxymanagementprotocol/CONFLICTS | 6 ------
xorg7/util/gccmakedep/CONFLICTS | 6 ------
xorg7/util/imake/CONFLICTS | 6 ------
xorg7/util/makedepend/CONFLICTS | 6 ------
xorg7/util/rman/CONFLICTS | 6 ------
xorg7/util/util-macros/CONFLICTS | 6 ------
xorg7/util/xorg-cf-files/CONFLICTS | 6 ------
xorg7/x11-profiles/XOrg7/CONFLICTS | 6 ------
272 files changed, 2 insertions(+), 1627 deletions(-)
diff --git a/xorg7/app/appres/CONFLICTS b/xorg7/app/appres/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/appres/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/bdftopcf/CONFLICTS b/xorg7/app/bdftopcf/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/bdftopcf/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/beforelight/CONFLICTS b/xorg7/app/beforelight/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/app/beforelight/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/bitmap/CONFLICTS b/xorg7/app/bitmap/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/bitmap/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/editres/CONFLICTS b/xorg7/app/editres/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/editres/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/fonttosfnt/CONFLICTS b/xorg7/app/fonttosfnt/CONFLICTS
deleted file mode 100644
index f775670..0000000
--- a/xorg7/app/fonttosfnt/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/fslsfonts/CONFLICTS b/xorg7/app/fslsfonts/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/app/fslsfonts/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/fstobdf/CONFLICTS b/xorg7/app/fstobdf/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/app/fstobdf/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/iceauth/CONFLICTS b/xorg7/app/iceauth/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/iceauth/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/ico/CONFLICTS b/xorg7/app/ico/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/app/ico/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/listres/CONFLICTS b/xorg7/app/listres/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/listres/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/luit/CONFLICTS b/xorg7/app/luit/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/app/luit/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/mkfontdir/CONFLICTS b/xorg7/app/mkfontdir/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/mkfontdir/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/mkfontscale/CONFLICTS b/xorg7/app/mkfontscale/CONFLICTS
deleted file mode 100644
index f1b331a..0000000
--- a/xorg7/app/mkfontscale/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/rendercheck/CONFLICTS b/xorg7/app/rendercheck/CONFLICTS
deleted file mode 100644
index 8713d0e..0000000
--- a/xorg7/app/rendercheck/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/rgb/CONFLICTS b/xorg7/app/rgb/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/rgb/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/rstart/CONFLICTS b/xorg7/app/rstart/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/rstart/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/sessreg/CONFLICTS b/xorg7/app/sessreg/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/sessreg/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/setxkbmap/CONFLICTS b/xorg7/app/setxkbmap/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/setxkbmap/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/showfont/CONFLICTS b/xorg7/app/showfont/CONFLICTS
deleted file mode 100644
index f1b331a..0000000
--- a/xorg7/app/showfont/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/smproxy/CONFLICTS b/xorg7/app/smproxy/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/smproxy/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/twm/CONFLICTS b/xorg7/app/twm/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/app/twm/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/x11perf/CONFLICTS b/xorg7/app/x11perf/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/app/x11perf/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xauth/CONFLICTS b/xorg7/app/xauth/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/xauth/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xbacklight/CONFLICTS b/xorg7/app/xbacklight/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/xbacklight/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xcalc/CONFLICTS b/xorg7/app/xcalc/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/xcalc/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xclock/CONFLICTS b/xorg7/app/xclock/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/xclock/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xcmsdb/CONFLICTS b/xorg7/app/xcmsdb/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/xcmsdb/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xcompmgr/CONFLICTS b/xorg7/app/xcompmgr/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/xcompmgr/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xconsole/CONFLICTS b/xorg7/app/xconsole/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/app/xconsole/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xcursorgen/CONFLICTS b/xorg7/app/xcursorgen/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/xcursorgen/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xdbedizzy/CONFLICTS b/xorg7/app/xdbedizzy/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/app/xdbedizzy/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xdm/CONFLICTS b/xorg7/app/xdm/CONFLICTS
deleted file mode 100644
index dbe9a03..0000000
--- a/xorg7/app/xdm/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xdpyinfo/CONFLICTS b/xorg7/app/xdpyinfo/CONFLICTS
deleted file mode 100644
index 49ebba3..0000000
--- a/xorg7/app/xdpyinfo/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xdriinfo/CONFLICTS b/xorg7/app/xdriinfo/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/xdriinfo/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xedit/CONFLICTS b/xorg7/app/xedit/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/xedit/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xev/CONFLICTS b/xorg7/app/xev/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/xev/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xeyes/CONFLICTS b/xorg7/app/xeyes/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/xeyes/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xfs/CONFLICTS b/xorg7/app/xfs/CONFLICTS
deleted file mode 100644
index 51e05a4..0000000
--- a/xorg7/app/xfs/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xfsinfo/CONFLICTS b/xorg7/app/xfsinfo/CONFLICTS
deleted file mode 100644
index 51e05a4..0000000
--- a/xorg7/app/xfsinfo/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xgamma/CONFLICTS b/xorg7/app/xgamma/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/xgamma/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xhost/CONFLICTS b/xorg7/app/xhost/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/xhost/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xinit/CONFLICTS b/xorg7/app/xinit/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/xinit/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xinput/CONFLICTS b/xorg7/app/xinput/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/xinput/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xkbcomp/CONFLICTS b/xorg7/app/xkbcomp/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/xkbcomp/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xkbevd/CONFLICTS b/xorg7/app/xkbevd/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/xkbevd/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xkbutils/CONFLICTS b/xorg7/app/xkbutils/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/app/xkbutils/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xkill/CONFLICTS b/xorg7/app/xkill/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/xkill/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xload/CONFLICTS b/xorg7/app/xload/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/app/xload/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xlsatoms/CONFLICTS b/xorg7/app/xlsatoms/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/xlsatoms/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xlsclients/CONFLICTS b/xorg7/app/xlsclients/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/xlsclients/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xlsfonts/CONFLICTS b/xorg7/app/xlsfonts/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/app/xlsfonts/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xmag/CONFLICTS b/xorg7/app/xmag/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/xmag/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xman/CONFLICTS b/xorg7/app/xman/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/xman/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xmessage/CONFLICTS b/xorg7/app/xmessage/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/app/xmessage/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xmh/CONFLICTS b/xorg7/app/xmh/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/app/xmh/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xmodmap/CONFLICTS b/xorg7/app/xmodmap/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/xmodmap/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xmore/CONFLICTS b/xorg7/app/xmore/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/app/xmore/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xplsprinters/CONFLICTS b/xorg7/app/xplsprinters/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/app/xplsprinters/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xpr/CONFLICTS b/xorg7/app/xpr/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/xpr/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xprop/CONFLICTS b/xorg7/app/xprop/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/xprop/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xrandr/CONFLICTS b/xorg7/app/xrandr/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/app/xrandr/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xrdb/CONFLICTS b/xorg7/app/xrdb/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/xrdb/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xrefresh/CONFLICTS b/xorg7/app/xrefresh/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/xrefresh/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xset/CONFLICTS b/xorg7/app/xset/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/xset/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xsetroot/CONFLICTS b/xorg7/app/xsetroot/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/xsetroot/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xvidtune/CONFLICTS b/xorg7/app/xvidtune/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/xvidtune/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xvinfo/CONFLICTS b/xorg7/app/xvinfo/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/xvinfo/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xwd/CONFLICTS b/xorg7/app/xwd/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/xwd/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xwininfo/CONFLICTS b/xorg7/app/xwininfo/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/xwininfo/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/app/xwud/CONFLICTS b/xorg7/app/xwud/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/app/xwud/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/data/xbitmaps/CONFLICTS b/xorg7/data/xbitmaps/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/data/xbitmaps/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/data/xcursor-themes/CONFLICTS b/xorg7/data/xcursor-themes/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/data/xcursor-themes/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/data/xkeyboard-config/CONFLICTS b/xorg7/data/xkeyboard-config/CONFLICTS
deleted file mode 100644
index fdf5f3e..0000000
--- a/xorg7/data/xkeyboard-config/CONFLICTS
+++ /dev/null
@@ -1,7 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
-conflicts xkbdata
diff --git a/xorg7/doc/xorg-docs/CONFLICTS b/xorg7/doc/xorg-docs/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/doc/xorg-docs/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/doc/xorg-sgml-doctools/CONFLICTS b/xorg7/doc/xorg-sgml-doctools/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/doc/xorg-sgml-doctools/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-input-acecad/CONFLICTS b/xorg7/driver/xf86-input-acecad/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/driver/xf86-input-acecad/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-input-aiptek/CONFLICTS b/xorg7/driver/xf86-input-aiptek/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/driver/xf86-input-aiptek/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-input-calcomp/CONFLICTS b/xorg7/driver/xf86-input-calcomp/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/driver/xf86-input-calcomp/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-input-citron/CONFLICTS b/xorg7/driver/xf86-input-citron/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/driver/xf86-input-citron/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-input-digitaledge/CONFLICTS b/xorg7/driver/xf86-input-digitaledge/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/driver/xf86-input-digitaledge/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-input-dmc/CONFLICTS b/xorg7/driver/xf86-input-dmc/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/driver/xf86-input-dmc/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-input-dynapro/CONFLICTS b/xorg7/driver/xf86-input-dynapro/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/driver/xf86-input-dynapro/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-input-elo2300/CONFLICTS b/xorg7/driver/xf86-input-elo2300/CONFLICTS
deleted file mode 100644
index ee115a8..0000000
--- a/xorg7/driver/xf86-input-elo2300/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-input-elographics/CONFLICTS b/xorg7/driver/xf86-input-elographics/CONFLICTS
deleted file mode 100644
index 51e05a4..0000000
--- a/xorg7/driver/xf86-input-elographics/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-input-evdev/CONFLICTS b/xorg7/driver/xf86-input-evdev/CONFLICTS
deleted file mode 100644
index 9d40c84..0000000
--- a/xorg7/driver/xf86-input-evdev/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-input-fpit/CONFLICTS b/xorg7/driver/xf86-input-fpit/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/driver/xf86-input-fpit/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-input-hyperpen/CONFLICTS b/xorg7/driver/xf86-input-hyperpen/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/driver/xf86-input-hyperpen/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-input-jamstudio/CONFLICTS b/xorg7/driver/xf86-input-jamstudio/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/driver/xf86-input-jamstudio/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-input-joystick/CONFLICTS b/xorg7/driver/xf86-input-joystick/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/driver/xf86-input-joystick/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-input-keyboard/CONFLICTS b/xorg7/driver/xf86-input-keyboard/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/driver/xf86-input-keyboard/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-input-magellan/CONFLICTS b/xorg7/driver/xf86-input-magellan/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/driver/xf86-input-magellan/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-input-magictouch/CONFLICTS b/xorg7/driver/xf86-input-magictouch/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/driver/xf86-input-magictouch/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-input-microtouch/CONFLICTS b/xorg7/driver/xf86-input-microtouch/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/driver/xf86-input-microtouch/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-input-mouse/CONFLICTS b/xorg7/driver/xf86-input-mouse/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/driver/xf86-input-mouse/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-input-mutouch/CONFLICTS b/xorg7/driver/xf86-input-mutouch/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/driver/xf86-input-mutouch/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-input-palmax/CONFLICTS b/xorg7/driver/xf86-input-palmax/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/driver/xf86-input-palmax/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-input-penmount/CONFLICTS b/xorg7/driver/xf86-input-penmount/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/driver/xf86-input-penmount/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-input-spaceorb/CONFLICTS b/xorg7/driver/xf86-input-spaceorb/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/driver/xf86-input-spaceorb/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-input-summa/CONFLICTS b/xorg7/driver/xf86-input-summa/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/driver/xf86-input-summa/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-input-synaptics/CONFLICTS b/xorg7/driver/xf86-input-synaptics/CONFLICTS
deleted file mode 100644
index 9d40c84..0000000
--- a/xorg7/driver/xf86-input-synaptics/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-input-tek4957/CONFLICTS b/xorg7/driver/xf86-input-tek4957/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/driver/xf86-input-tek4957/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-input-ur98/CONFLICTS b/xorg7/driver/xf86-input-ur98/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/driver/xf86-input-ur98/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-input-vmmouse/CONFLICTS b/xorg7/driver/xf86-input-vmmouse/CONFLICTS
deleted file mode 100644
index 3c5a551..0000000
--- a/xorg7/driver/xf86-input-vmmouse/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-input-void/CONFLICTS b/xorg7/driver/xf86-input-void/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/driver/xf86-input-void/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-video-apm/CONFLICTS b/xorg7/driver/xf86-video-apm/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/driver/xf86-video-apm/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-video-ark/CONFLICTS b/xorg7/driver/xf86-video-ark/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/driver/xf86-video-ark/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-video-ast/CONFLICTS b/xorg7/driver/xf86-video-ast/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/driver/xf86-video-ast/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-video-ati/CONFLICTS b/xorg7/driver/xf86-video-ati/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/driver/xf86-video-ati/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-video-chips/CONFLICTS b/xorg7/driver/xf86-video-chips/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/driver/xf86-video-chips/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-video-cirrus/CONFLICTS b/xorg7/driver/xf86-video-cirrus/CONFLICTS
deleted file mode 100644
index ee115a8..0000000
--- a/xorg7/driver/xf86-video-cirrus/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-video-cyrix/CONFLICTS b/xorg7/driver/xf86-video-cyrix/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/driver/xf86-video-cyrix/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-video-dummy/CONFLICTS b/xorg7/driver/xf86-video-dummy/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/driver/xf86-video-dummy/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-video-fbdev/CONFLICTS b/xorg7/driver/xf86-video-fbdev/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/driver/xf86-video-fbdev/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-video-glint/CONFLICTS b/xorg7/driver/xf86-video-glint/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/driver/xf86-video-glint/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-video-i128/CONFLICTS b/xorg7/driver/xf86-video-i128/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/driver/xf86-video-i128/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-video-i740/CONFLICTS b/xorg7/driver/xf86-video-i740/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/driver/xf86-video-i740/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-video-i810/CONFLICTS b/xorg7/driver/xf86-video-i810/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/driver/xf86-video-i810/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-video-imstt/CONFLICTS b/xorg7/driver/xf86-video-imstt/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/driver/xf86-video-imstt/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-video-intel-git/CONFLICTS b/xorg7/driver/xf86-video-intel-git/CONFLICTS
index b90fe45..d518f03 100644
--- a/xorg7/driver/xf86-video-intel-git/CONFLICTS
+++ b/xorg7/driver/xf86-video-intel-git/CONFLICTS
@@ -1,7 +1,2 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs &&
conflicts xf86-video-i810
+conflicts xf86-video-intel
\ No newline at end of file
diff --git a/xorg7/driver/xf86-video-intel/CONFLICTS b/xorg7/driver/xf86-video-intel/CONFLICTS
index e49752e..c94002a 100644
--- a/xorg7/driver/xf86-video-intel/CONFLICTS
+++ b/xorg7/driver/xf86-video-intel/CONFLICTS
@@ -1,7 +1,2 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
conflicts xf86-video-intel-git
+conflicts xf86-video-i810
diff --git a/xorg7/driver/xf86-video-mach64/CONFLICTS b/xorg7/driver/xf86-video-mach64/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/driver/xf86-video-mach64/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-video-mga/CONFLICTS b/xorg7/driver/xf86-video-mga/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/driver/xf86-video-mga/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-video-neomagic/CONFLICTS b/xorg7/driver/xf86-video-neomagic/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/driver/xf86-video-neomagic/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-video-newport/CONFLICTS b/xorg7/driver/xf86-video-newport/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/driver/xf86-video-newport/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-video-nsc/CONFLICTS b/xorg7/driver/xf86-video-nsc/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/driver/xf86-video-nsc/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-video-nv/CONFLICTS b/xorg7/driver/xf86-video-nv/CONFLICTS
deleted file mode 100644
index d2248a0..0000000
--- a/xorg7/driver/xf86-video-nv/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-video-r128/CONFLICTS b/xorg7/driver/xf86-video-r128/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/driver/xf86-video-r128/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-video-radeonhd/CONFLICTS b/xorg7/driver/xf86-video-radeonhd/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/driver/xf86-video-radeonhd/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-video-rendition/CONFLICTS b/xorg7/driver/xf86-video-rendition/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/driver/xf86-video-rendition/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-video-s3/CONFLICTS b/xorg7/driver/xf86-video-s3/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/driver/xf86-video-s3/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-video-s3virge/CONFLICTS b/xorg7/driver/xf86-video-s3virge/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/driver/xf86-video-s3virge/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-video-savage/CONFLICTS b/xorg7/driver/xf86-video-savage/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/driver/xf86-video-savage/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-video-siliconmotion/CONFLICTS b/xorg7/driver/xf86-video-siliconmotion/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/driver/xf86-video-siliconmotion/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-video-sis/CONFLICTS b/xorg7/driver/xf86-video-sis/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/driver/xf86-video-sis/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-video-sisusb/CONFLICTS b/xorg7/driver/xf86-video-sisusb/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/driver/xf86-video-sisusb/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-video-trident/CONFLICTS b/xorg7/driver/xf86-video-trident/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/driver/xf86-video-trident/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-video-v4l/CONFLICTS b/xorg7/driver/xf86-video-v4l/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/driver/xf86-video-v4l/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-video-vesa/CONFLICTS b/xorg7/driver/xf86-video-vesa/CONFLICTS
deleted file mode 100644
index f1b331a..0000000
--- a/xorg7/driver/xf86-video-vesa/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-video-vga/CONFLICTS b/xorg7/driver/xf86-video-vga/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/driver/xf86-video-vga/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-video-via/CONFLICTS b/xorg7/driver/xf86-video-via/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/driver/xf86-video-via/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-video-vmware/CONFLICTS b/xorg7/driver/xf86-video-vmware/CONFLICTS
deleted file mode 100644
index d4883ea..0000000
--- a/xorg7/driver/xf86-video-vmware/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-video-voodoo/CONFLICTS b/xorg7/driver/xf86-video-voodoo/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/driver/xf86-video-voodoo/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/extra/libdrm/CONFLICTS b/xorg7/extra/libdrm/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/extra/libdrm/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/extra/libxcb/CONFLICTS b/xorg7/extra/libxcb/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/extra/libxcb/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/extra/xcb-proto/CONFLICTS b/xorg7/extra/xcb-proto/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/extra/xcb-proto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/extra/xcb-util/CONFLICTS b/xorg7/extra/xcb-util/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/extra/xcb-util/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/extra/xf86dga/CONFLICTS b/xorg7/extra/xf86dga/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/extra/xf86dga/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/extra/xpyb/CONFLICTS b/xorg7/extra/xpyb/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/extra/xpyb/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/extra/xterm/CONFLICTS b/xorg7/extra/xterm/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/extra/xterm/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/encodings/CONFLICTS b/xorg7/font/encodings/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/encodings/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/font-adobe-100dpi/CONFLICTS b/xorg7/font/font-adobe-100dpi/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/font-adobe-100dpi/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/font-adobe-75dpi/CONFLICTS b/xorg7/font/font-adobe-75dpi/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/font-adobe-75dpi/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/font-adobe-utopia-100dpi/CONFLICTS b/xorg7/font/font-adobe-utopia-100dpi/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/font-adobe-utopia-100dpi/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/font-adobe-utopia-75dpi/CONFLICTS b/xorg7/font/font-adobe-utopia-75dpi/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/font-adobe-utopia-75dpi/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/font-adobe-utopia-type1/CONFLICTS b/xorg7/font/font-adobe-utopia-type1/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/font-adobe-utopia-type1/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/font-alias/CONFLICTS b/xorg7/font/font-alias/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/font-alias/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/font-arabic-misc/CONFLICTS b/xorg7/font/font-arabic-misc/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/font-arabic-misc/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/font-bh-100dpi/CONFLICTS b/xorg7/font/font-bh-100dpi/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/font-bh-100dpi/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/font-bh-75dpi/CONFLICTS b/xorg7/font/font-bh-75dpi/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/font-bh-75dpi/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/font-bh-lucidatypewriter-100dpi/CONFLICTS b/xorg7/font/font-bh-lucidatypewriter-100dpi/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/font-bh-lucidatypewriter-100dpi/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/font-bh-lucidatypewriter-75dpi/CONFLICTS b/xorg7/font/font-bh-lucidatypewriter-75dpi/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/font-bh-lucidatypewriter-75dpi/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/font-bh-ttf/CONFLICTS b/xorg7/font/font-bh-ttf/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/font-bh-ttf/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/font-bh-type1/CONFLICTS b/xorg7/font/font-bh-type1/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/font-bh-type1/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/font-bitstream-100dpi/CONFLICTS b/xorg7/font/font-bitstream-100dpi/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/font-bitstream-100dpi/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/font-bitstream-75dpi/CONFLICTS b/xorg7/font/font-bitstream-75dpi/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/font-bitstream-75dpi/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/font-bitstream-speedo/CONFLICTS b/xorg7/font/font-bitstream-speedo/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/font-bitstream-speedo/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/font-bitstream-type1/CONFLICTS b/xorg7/font/font-bitstream-type1/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/font-bitstream-type1/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/font-cronyx-cyrillic/CONFLICTS b/xorg7/font/font-cronyx-cyrillic/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/font-cronyx-cyrillic/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/font-cursor-misc/CONFLICTS b/xorg7/font/font-cursor-misc/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/font-cursor-misc/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/font-daewoo-misc/CONFLICTS b/xorg7/font/font-daewoo-misc/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/font-daewoo-misc/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/font-dec-misc/CONFLICTS b/xorg7/font/font-dec-misc/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/font-dec-misc/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/font-ibm-type1/CONFLICTS b/xorg7/font/font-ibm-type1/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/font-ibm-type1/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/font-isas-misc/CONFLICTS b/xorg7/font/font-isas-misc/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/font-isas-misc/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/font-jis-misc/CONFLICTS b/xorg7/font/font-jis-misc/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/font-jis-misc/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/font-micro-misc/CONFLICTS b/xorg7/font/font-micro-misc/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/font-micro-misc/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/font-misc-cyrillic/CONFLICTS b/xorg7/font/font-misc-cyrillic/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/font-misc-cyrillic/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/font-misc-ethiopic/CONFLICTS b/xorg7/font/font-misc-ethiopic/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/font-misc-ethiopic/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/font-misc-meltho/CONFLICTS b/xorg7/font/font-misc-meltho/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/font-misc-meltho/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/font-misc-misc/CONFLICTS b/xorg7/font/font-misc-misc/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/font-misc-misc/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/font-mutt-misc/CONFLICTS b/xorg7/font/font-mutt-misc/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/font-mutt-misc/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/font-schumacher-misc/CONFLICTS b/xorg7/font/font-schumacher-misc/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/font-schumacher-misc/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/font-screen-cyrillic/CONFLICTS b/xorg7/font/font-screen-cyrillic/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/font-screen-cyrillic/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/font-sony-misc/CONFLICTS b/xorg7/font/font-sony-misc/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/font-sony-misc/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/font-sun-misc/CONFLICTS b/xorg7/font/font-sun-misc/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/font-sun-misc/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/font-util/CONFLICTS b/xorg7/font/font-util/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/font-util/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/font-winitzki-cyrillic/CONFLICTS b/xorg7/font/font-winitzki-cyrillic/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/font-winitzki-cyrillic/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/font/font-xfree86-type1/CONFLICTS b/xorg7/font/font-xfree86-type1/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/font/font-xfree86-type1/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libFS/CONFLICTS b/xorg7/lib/libFS/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/lib/libFS/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libICE/CONFLICTS b/xorg7/lib/libICE/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/lib/libICE/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libSM/CONFLICTS b/xorg7/lib/libSM/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/lib/libSM/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libX11/CONFLICTS b/xorg7/lib/libX11/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/lib/libX11/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libXScrnSaver/CONFLICTS b/xorg7/lib/libXScrnSaver/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/lib/libXScrnSaver/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libXTrap/CONFLICTS b/xorg7/lib/libXTrap/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/lib/libXTrap/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libXau/CONFLICTS b/xorg7/lib/libXau/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/lib/libXau/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libXaw/CONFLICTS b/xorg7/lib/libXaw/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/lib/libXaw/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libXcomposite/CONFLICTS b/xorg7/lib/libXcomposite/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/lib/libXcomposite/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libXcursor/CONFLICTS b/xorg7/lib/libXcursor/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/lib/libXcursor/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libXdamage/CONFLICTS b/xorg7/lib/libXdamage/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/lib/libXdamage/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libXdmcp/CONFLICTS b/xorg7/lib/libXdmcp/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/lib/libXdmcp/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libXevie/CONFLICTS b/xorg7/lib/libXevie/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/lib/libXevie/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libXext/CONFLICTS b/xorg7/lib/libXext/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/lib/libXext/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libXfixes/CONFLICTS b/xorg7/lib/libXfixes/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/lib/libXfixes/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libXfont/CONFLICTS b/xorg7/lib/libXfont/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/lib/libXfont/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libXfontcache/CONFLICTS b/xorg7/lib/libXfontcache/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/lib/libXfontcache/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libXft/CONFLICTS b/xorg7/lib/libXft/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/lib/libXft/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libXi/CONFLICTS b/xorg7/lib/libXi/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/lib/libXi/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libXinerama/CONFLICTS b/xorg7/lib/libXinerama/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/lib/libXinerama/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libXmu/CONFLICTS b/xorg7/lib/libXmu/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/lib/libXmu/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libXp/CONFLICTS b/xorg7/lib/libXp/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/lib/libXp/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libXpm/CONFLICTS b/xorg7/lib/libXpm/CONFLICTS
index 6b7132b..1f4c273 100644
--- a/xorg7/lib/libXpm/CONFLICTS
+++ b/xorg7/lib/libXpm/CONFLICTS
@@ -1,7 +1 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs &&
conflicts xpm
diff --git a/xorg7/lib/libXprintAppUtil/CONFLICTS b/xorg7/lib/libXprintAppUtil/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/lib/libXprintAppUtil/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libXprintUtil/CONFLICTS b/xorg7/lib/libXprintUtil/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/lib/libXprintUtil/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libXrandr/CONFLICTS b/xorg7/lib/libXrandr/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/lib/libXrandr/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libXrender/CONFLICTS b/xorg7/lib/libXrender/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/lib/libXrender/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libXres/CONFLICTS b/xorg7/lib/libXres/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/lib/libXres/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libXt/CONFLICTS b/xorg7/lib/libXt/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/lib/libXt/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libXtst/CONFLICTS b/xorg7/lib/libXtst/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/lib/libXtst/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libXv/CONFLICTS b/xorg7/lib/libXv/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/lib/libXv/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libXvMC/CONFLICTS b/xorg7/lib/libXvMC/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/lib/libXvMC/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libXxf86dga/CONFLICTS b/xorg7/lib/libXxf86dga/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/lib/libXxf86dga/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libXxf86misc/CONFLICTS b/xorg7/lib/libXxf86misc/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/lib/libXxf86misc/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libXxf86vm/CONFLICTS b/xorg7/lib/libXxf86vm/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/lib/libXxf86vm/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libdmx/CONFLICTS b/xorg7/lib/libdmx/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/lib/libdmx/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libfontenc/CONFLICTS b/xorg7/lib/libfontenc/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/lib/libfontenc/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/liblbxutil/CONFLICTS b/xorg7/lib/liblbxutil/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/lib/liblbxutil/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/liboldX/CONFLICTS b/xorg7/lib/liboldX/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/lib/liboldX/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libpciaccess/CONFLICTS b/xorg7/lib/libpciaccess/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/lib/libpciaccess/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libxkbfile/CONFLICTS b/xorg7/lib/libxkbfile/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/lib/libxkbfile/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/libxkbui/CONFLICTS b/xorg7/lib/libxkbui/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/lib/libxkbui/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/pixman/CONFLICTS b/xorg7/lib/pixman/CONFLICTS
deleted file mode 100644
index dd68bc9..0000000
--- a/xorg7/lib/pixman/CONFLICTS
+++ /dev/null
@@ -1,4 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/lib/xtrans/CONFLICTS b/xorg7/lib/xtrans/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/lib/xtrans/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/mesa-lib/CONFLICTS b/xorg7/mesa-lib/CONFLICTS
deleted file mode 100644
index e53e630..0000000
--- a/xorg7/mesa-lib/CONFLICTS
+++ /dev/null
@@ -1,2 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
diff --git a/xorg7/proto/applewmproto/CONFLICTS b/xorg7/proto/applewmproto/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/proto/applewmproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/proto/bigreqsproto/CONFLICTS b/xorg7/proto/bigreqsproto/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/proto/bigreqsproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/proto/compositeproto/CONFLICTS b/xorg7/proto/compositeproto/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/proto/compositeproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/proto/damageproto/CONFLICTS b/xorg7/proto/damageproto/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/proto/damageproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/proto/dmxproto/CONFLICTS b/xorg7/proto/dmxproto/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/proto/dmxproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/proto/dri2proto/CONFLICTS b/xorg7/proto/dri2proto/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/proto/dri2proto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/proto/evieext/CONFLICTS b/xorg7/proto/evieext/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/proto/evieext/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/proto/fixesproto/CONFLICTS b/xorg7/proto/fixesproto/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/proto/fixesproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/proto/fontcacheproto/CONFLICTS b/xorg7/proto/fontcacheproto/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/proto/fontcacheproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/proto/fontsproto/CONFLICTS b/xorg7/proto/fontsproto/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/proto/fontsproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/proto/glproto/CONFLICTS b/xorg7/proto/glproto/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/proto/glproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/proto/inputproto/CONFLICTS b/xorg7/proto/inputproto/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/proto/inputproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/proto/kbproto/CONFLICTS b/xorg7/proto/kbproto/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/proto/kbproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/proto/printproto/CONFLICTS b/xorg7/proto/printproto/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/proto/printproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/proto/randrproto/CONFLICTS b/xorg7/proto/randrproto/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/proto/randrproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/proto/recordproto/CONFLICTS b/xorg7/proto/recordproto/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/proto/recordproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/proto/renderproto/CONFLICTS b/xorg7/proto/renderproto/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/proto/renderproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/proto/resourceproto/CONFLICTS b/xorg7/proto/resourceproto/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/proto/resourceproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/proto/scrnsaverproto/CONFLICTS b/xorg7/proto/scrnsaverproto/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/proto/scrnsaverproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/proto/trapproto/CONFLICTS b/xorg7/proto/trapproto/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/proto/trapproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/proto/videoproto/CONFLICTS b/xorg7/proto/videoproto/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/proto/videoproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/proto/xcmiscproto/CONFLICTS b/xorg7/proto/xcmiscproto/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/proto/xcmiscproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/proto/xextproto/CONFLICTS b/xorg7/proto/xextproto/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/proto/xextproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/proto/xf86bigfontproto/CONFLICTS b/xorg7/proto/xf86bigfontproto/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/proto/xf86bigfontproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/proto/xf86dgaproto/CONFLICTS b/xorg7/proto/xf86dgaproto/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/proto/xf86dgaproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/proto/xf86driproto/CONFLICTS b/xorg7/proto/xf86driproto/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/proto/xf86driproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/proto/xf86miscproto/CONFLICTS b/xorg7/proto/xf86miscproto/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/proto/xf86miscproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/proto/xf86rushproto/CONFLICTS b/xorg7/proto/xf86rushproto/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/proto/xf86rushproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/proto/xf86vidmodeproto/CONFLICTS b/xorg7/proto/xf86vidmodeproto/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/proto/xf86vidmodeproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/proto/xineramaproto/CONFLICTS b/xorg7/proto/xineramaproto/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/proto/xineramaproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/proto/xproto/CONFLICTS b/xorg7/proto/xproto/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/proto/xproto/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/proto/xproxymanagementprotocol/CONFLICTS b/xorg7/proto/xproxymanagementprotocol/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/proto/xproxymanagementprotocol/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/util/gccmakedep/CONFLICTS b/xorg7/util/gccmakedep/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/util/gccmakedep/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/util/imake/CONFLICTS b/xorg7/util/imake/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/util/imake/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/util/makedepend/CONFLICTS b/xorg7/util/makedepend/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/util/makedepend/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/util/rman/CONFLICTS b/xorg7/util/rman/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/util/rman/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/util/util-macros/CONFLICTS b/xorg7/util/util-macros/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/util/util-macros/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/util/xorg-cf-files/CONFLICTS b/xorg7/util/xorg-cf-files/CONFLICTS
deleted file mode 100644
index fa885b1..0000000
--- a/xorg7/util/xorg-cf-files/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6
-conflicts XOrg-test
-conflicts XOrg-fonts-base
-conflicts XOrg-fonts-extra
-conflicts XOrg-drm
-conflicts XOrg-drm-cvs
diff --git a/xorg7/x11-profiles/XOrg7/CONFLICTS b/xorg7/x11-profiles/XOrg7/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/x11-profiles/XOrg7/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6 &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
More information about the Lunar-commits
mailing list