8 files changed, 1 insertions, 104 deletions
diff --git a/packages/cairo/cairo_0.5.0.bb b/packages/cairo/cairo_0.5.0.bb
deleted file mode 100644
index 8ec642f38d..0000000000
--- a/packages/cairo/cairo_0.5.0.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SECTION = "libs"
-PRIORITY = "optional"
-# DEPENDS = "virtual/libx11 libpixman libpng fontconfig libxrender xcb glitz"
-DEPENDS = "virtual/libx11 libpixman libpng fontconfig libxrender"
-DESCRIPTION = "Cairo graphics library"
-LICENSE = "MPL LGPL"
-PR = "r0"
-
-SRC_URI = "http://cairographics.org/snapshots/cairo-${PV}.tar.gz"
-
-inherit autotools pkgconfig 
-
-do_stage () {
-	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
-}
diff --git a/packages/cairo/cairo_0.5.2.bb b/packages/cairo/cairo_0.5.2.bb
deleted file mode 100644
index 8ec642f38d..0000000000
--- a/packages/cairo/cairo_0.5.2.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SECTION = "libs"
-PRIORITY = "optional"
-# DEPENDS = "virtual/libx11 libpixman libpng fontconfig libxrender xcb glitz"
-DEPENDS = "virtual/libx11 libpixman libpng fontconfig libxrender"
-DESCRIPTION = "Cairo graphics library"
-LICENSE = "MPL LGPL"
-PR = "r0"
-
-SRC_URI = "http://cairographics.org/snapshots/cairo-${PV}.tar.gz"
-
-inherit autotools pkgconfig 
-
-do_stage () {
-	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
-}
diff --git a/packages/cairo/cairo_0.9.2.bb b/packages/cairo/cairo_0.9.2.bb
deleted file mode 100644
index cfbb18ed0e..0000000000
--- a/packages/cairo/cairo_0.9.2.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "virtual/libx11 libpng fontconfig libxrender"
-DESCRIPTION = "Cairo graphics library"
-LICENSE = "MPL LGPL"
-PR = "r1"
-
-SRC_URI = "http://cairographics.org/snapshots/cairo-${PV}.tar.gz"
-
-inherit autotools pkgconfig 
-
-do_stage () {
-	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
-}
diff --git a/packages/cairo/cairo_1.0.0.bb b/packages/cairo/cairo_1.0.0.bb
deleted file mode 100644
index 0260c267dd..0000000000
--- a/packages/cairo/cairo_1.0.0.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "virtual/libx11 libpng fontconfig libxrender"
-DESCRIPTION = "Cairo graphics library"
-LICENSE = "MPL LGPL"
-PR = "r1"
-
-SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
-
-inherit autotools pkgconfig 
-
-do_stage () {
-	autotools_stage_all
-}
diff --git a/packages/cairo/cairo_1.0.2.bb b/packages/cairo/cairo_1.0.2.bb
deleted file mode 100644
index cef51d2212..0000000000
--- a/packages/cairo/cairo_1.0.2.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "virtual/libx11 libpng fontconfig libxrender"
-DESCRIPTION = "Cairo graphics library"
-LICENSE = "MPL LGPL"
-PR = "r0"
-
-SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
-	   file://gcc4-fix.patch;patch=1"
-
-inherit autotools pkgconfig 
-
-do_stage () {
-autotools_stage_all
-}
diff --git a/packages/cairo/cairo_1.0.4.bb b/packages/cairo/cairo_1.0.4.bb
deleted file mode 100644
index 700f425113..0000000000
--- a/packages/cairo/cairo_1.0.4.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "virtual/libx11 libpng fontconfig libxrender"
-DESCRIPTION = "Cairo graphics library"
-LICENSE = "MPL LGPL"
-
-SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
-
-inherit autotools pkgconfig 
-
-do_stage () {
-autotools_stage_all
-}
diff --git a/packages/cairo/cairo_cvs.bb b/packages/cairo/cairo_cvs.bb
deleted file mode 100644
index ea20009e34..0000000000
--- a/packages/cairo/cairo_cvs.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-SECTION = "libs"
-PRIORITY = "optional"
-# DEPENDS = "virtual/libx11 libpixman libpng fontconfig libxrender xcb glitz"
-DEPENDS = "virtual/libx11 libpixman libpng fontconfig libxrender"
-DESCRIPTION = "Cairo graphics library"
-LICENSE = "MPL LGPL"
-PR = "r2"
-DEFAULT_PREFERENCE = "-1"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=cairo"
-S = "${WORKDIR}/cairo"
-
-inherit autotools pkgconfig 
-
-do_stage () {
-	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
-}
diff --git a/packages/cairo/cairo_git.bb b/packages/cairo/cairo_git.bb
index beb900b40d..9d11c2685f 100644
--- a/packages/cairo/cairo_git.bb
+++ b/packages/cairo/cairo_git.bb
@@ -7,7 +7,7 @@ DEPENDS = "virtual/libx11 libsm libpng fontconfig libxrender"
 DESCRIPTION = "Cairo graphics library"
 LICENSE = "MPL LGPL"
 
-PV = "1.3.9+git${SRCDATE}"
+PV = "1.3.11+git${SRCDATE}"
 
 SRC_URI = "git://git.cairographics.org/git/cairo;protocol=git \
 	  "