merge of '91bdb4f03e9136ce38f7fb48886cef202c6e144a'

     and 'b2c9193cbf484ae2d06df4ec7e483cad3c57741d'

92 files changed, 3 insertions, 1692 deletions

diff --git a/conf/distro/include/preferred-x-versions-pre-X11R7.inc b/conf/distro/include/preferred-x-versions-pre-X11R7.inc
deleted file mode 100644
index 240f2cddcd..0000000000
--- a/conf/distro/include/preferred-x-versions-pre-X11R7.inc
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Specify to build old/old CVS versions of X libraries and apps
-#
-
-PREFERRED_VERSION_xproto         = "0.0+cvs${SRCDATE}"
-
-PREFERRED_VERSION_diet-x11       = "6.2.1+cvs${SRCDATE}"
-PREFERRED_VERSION_libice         = "6.3.3"
-PREFERRED_VERSION_libsm          = "6.0.3"
-PREFERRED_VERSION_libx11         = "6.2.1+cvs${SRCDATE}"
-PREFERRED_VERSION_libxau         = "0.1.1"
-PREFERRED_VERSION_libxaw         = "7.0.2"
-PREFERRED_VERSION_libxcomposite  = "1.0.1"
-PREFERRED_VERSION_libxcursor     = "1.1.2"
-PREFERRED_VERSION_libxdamage     = "1.0.1"
-PREFERRED_VERSION_libxdmcp       = "0.1.3"
-PREFERRED_VERSION_libxext        = "0.0+cvs${SRCDATE}"
-PREFERRED_VERSION_libxfixes      = "2.0.1"
-PREFERRED_VERSION_libxfont       = "1.4.2"
-PREFERRED_VERSION_libxft         = "2.1.6"
-PREFERRED_VERSION_libxi          = "6.0.1"
-PREFERRED_VERSION_libxinerama    = "1.0.2+cvs20050505"
-PREFERRED_VERSION_libxkbfile     = "0.0+cvs${SRCDATE}"
-PREFERRED_VERSION_libxmu         = "0.0+cvs${SRCDATE}"
-PREFERRED_VERSION_libxp          = "0.0+cvs${SRCDATE}"
-PREFERRED_VERSION_libxpm         = "3.5.1"
-PREFERRED_VERSION_libxrandr      = "1.0.2"
-PREFERRED_VERSION_libxrender     = "0.8.4"
-PREFERRED_VERSION_libxres        = "1.0.1"
-PREFERRED_VERSION_libxss         = "0.0+cvs${SRCDATE}"
-PREFERRED_VERSION_libxt          = "0.1.5"
-PREFERRED_VERSION_libxtst        = "0.0+cvs${SRCDATE}"
-PREFERRED_VERSION_libxv          = "2.2.2+cvs20040918"
-PREFERRED_VERSION_libxxf86dga    = "0.0+cvs${SRCDATE}"
-PREFERRED_VERSION_libxxf86vm     = "0.0+cvs${SRCDATE}"
-
-PREFERRED_VERSION_xcalibrate     = "0.0+cvs20060312"
-PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20050207"
-
-PREFERRED_VERSION_xdpyinfo       = "0.0+cvs${SRCDATE}"
-PREFERRED_VERSION_xev            = "0.0+cvs${SRCDATE}"
-PREFERRED_VERSION_xhost          = "0.0+cvs20040413"
-PREFERRED_VERSION_xmodmap        = "0.0+cvs${SRCDATE}"
-PREFERRED_VERSION_xrandr         = "0.0+cvs${SRCDATE}"
diff --git a/packages/xev/.mtn2git_empty b/packages/xev/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xev/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xextensions/.mtn2git_empty b/packages/xextensions/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xextensions/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xextensions/xextensions-native_1.0.1.bb b/packages/xextensions/xextensions-native_1.0.1.bb
deleted file mode 100644
index 732ced4584..0000000000
--- a/packages/xextensions/xextensions-native_1.0.1.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-SECTION = "unknown"
-require xextensions_${PV}.bb
-inherit native
-PROVIDES = ""
diff --git a/packages/xextensions/xextensions-native_cvs.bb b/packages/xextensions/xextensions-native_cvs.bb
deleted file mode 100644
index 8ccf2ce84f..0000000000
--- a/packages/xextensions/xextensions-native_cvs.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-SECTION = "unknown"
-require xextensions_cvs.bb
-inherit native
-PROVIDES = ""
diff --git a/packages/xextensions/xextensions_1.0.1+cvs20050418.bb b/packages/xextensions/xextensions_1.0.1+cvs20050418.bb
deleted file mode 100644
index 4c6bc4facc..0000000000
--- a/packages/xextensions/xextensions_1.0.1+cvs20050418.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-DESCRIPTION = "various extension headers."
-
-SRC_URI = "${XLIBS_CVS};module=XExtensions;date=20050418"
-S = "${WORKDIR}/XExtensions"
-
-inherit xlibs
diff --git a/packages/xextensions/xextensions_1.0.1.bb b/packages/xextensions/xextensions_1.0.1.bb
deleted file mode 100644
index d776bfd54d..0000000000
--- a/packages/xextensions/xextensions_1.0.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-SECTION = "x11/libs"
-LICENSE= "BSD-X"
-DESCRIPTION = "various extension headers."
-
-SRC_URI = "${XLIBS_MIRROR}/xextensions-${PV}.tar.bz2"
-S = "${WORKDIR}/xextensions-${PV}"
-
-inherit autotools pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/xextensions/xextensions_20050610.bb b/packages/xextensions/xextensions_20050610.bb
deleted file mode 100644
index 728a6a0c92..0000000000
--- a/packages/xextensions/xextensions_20050610.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-PV = "1.0.3+cvs${FIXEDSRCDATE}"
-FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
-
-LICENSE= "BSD-X"
-SECTION = "x11/libs"
-DESCRIPTION = "various extension headers."
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XExtensions;date=${FIXEDSRCDATE}"
-S = "${WORKDIR}/XExtensions"
-
-inherit autotools pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/xextensions/xextensions_cvs.bb b/packages/xextensions/xextensions_cvs.bb
deleted file mode 100644
index 36ced680af..0000000000
--- a/packages/xextensions/xextensions_cvs.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE= "BSD-X"
-SECTION = "x11/libs"
-DESCRIPTION = "various extension headers."
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XExtensions"
-S = "${WORKDIR}/XExtensions"
-
-inherit autotools pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/xorg-app/xauth_cvs.bb b/packages/xorg-app/xauth_cvs.bb
deleted file mode 100644
index 169de7a797..0000000000
--- a/packages/xorg-app/xauth_cvs.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "MIT"
-DEPENDS = "virtual/libx11 libxau libxmu libxext"
-DESCRIPTION = "X authority file utility"
-SECTION = "x11/base"
-PR = "r2"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xauth \
-           file://autofoo.patch;patch=1"
-S = "${WORKDIR}/xauth"
-
-inherit autotools pkgconfig 
diff --git a/packages/xorg-app/xdpyinfo_cvs.bb b/packages/xorg-app/xdpyinfo_cvs.bb
deleted file mode 100644
index 9a05f066ce..0000000000
--- a/packages/xorg-app/xdpyinfo_cvs.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "MIT"
-DEPENDS = "virtual/libx11 libxext libxtst"
-DESCRIPTION = "X display information utility"
-SECTION = "x11/base"
-PR = "r1"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xdpyinfo"
-S = "${WORKDIR}/xdpyinfo"
-
-inherit autotools pkgconfig 
diff --git a/packages/xorg-app/xev_cvs.bb b/packages/xorg-app/xev_cvs.bb
deleted file mode 100644
index 95520f0e7a..0000000000
--- a/packages/xorg-app/xev_cvs.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-DESCRIPTION = "X Event Viewer"
-HOMEPAGE = "http://freedesktop.org/wiki/Software_2fxapps"
-LICENSE = "MIT"
-SECTION = "x11/base"
-DEPENDS = "virtual/libx11 libxau"
-PR = "r1"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xev \
-	   file://diet-x11.patch;patch=1"
-S = "${WORKDIR}/xev"
-
-do_compile() {
-	${CC} -o xev xev.c -lX11 -lXau -I${STAGING_INCDIR} -L${STAGING_LIBDIR}
-}
-
-do_install() {
-	install -d ${D}${bindir}
-	install -m 755 ${PN} ${D}${bindir}
-}
diff --git a/packages/xorg-app/xhost_20040413.bb b/packages/xorg-app/xhost_20040413.bb
deleted file mode 100644
index 59e8f32964..0000000000
--- a/packages/xorg-app/xhost_20040413.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
-LICENSE = "MIT"
-PV = "0.0+cvs${FIXEDSRCDATE}"
-DEPENDS = "virtual/libx11 libxext libxmu"
-DESCRIPTION = "server access control program for X"
-SECTION = "x11/base"
-PR = "r2"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xhost;date=${FIXEDSRCDATE} \
-           file://autofoo.patch;patch=1"
-S = "${WORKDIR}/xhost"
-
-inherit autotools pkgconfig 
diff --git a/packages/xorg-app/xmodmap_cvs.bb b/packages/xorg-app/xmodmap_cvs.bb
deleted file mode 100644
index e2b3847e6b..0000000000
--- a/packages/xorg-app/xmodmap_cvs.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "MIT"
-DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
-SECTION = "x11/base"
-PR = "r1"
-
-DEPENDS = "virtual/libx11"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xmodmap \
-           file://autofoo.patch;patch=1"
-S = "${WORKDIR}/xmodmap"
-
-inherit autotools pkgconfig 
diff --git a/packages/xorg-app/xprop_cvs.bb b/packages/xorg-app/xprop_cvs.bb
deleted file mode 100644
index 1e36987358..0000000000
--- a/packages/xorg-app/xprop_cvs.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "MIT"
-DEPENDS = "virtual/libx11 libxmu libxext"
-DESCRIPTION = "property displayer for X"
-SECTION = "x11/base"
-PR = "r2"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xprop;tag=XORG-MAIN \
-           file://autofoo.patch;patch=1"
-S = "${WORKDIR}/xprop"
-
-inherit autotools pkgconfig 
diff --git a/packages/xorg-app/xrandr_cvs.bb b/packages/xorg-app/xrandr_cvs.bb
deleted file mode 100644
index 30a31e1569..0000000000
--- a/packages/xorg-app/xrandr_cvs.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE= "BSD-X"
-DEPENDS = "libxrandr virtual/libx11 libxext"
-DESCRIPTION = "X Resize and Rotate extension command."
-SECTION = "x11/base"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xrandr"
-S = "${WORKDIR}/xrandr"
-
-inherit autotools pkgconfig 
diff --git a/packages/xorg-app/xrdb_cvs.bb b/packages/xorg-app/xrdb_cvs.bb
deleted file mode 100644
index 1289a8cfce..0000000000
--- a/packages/xorg-app/xrdb_cvs.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-P