5 files changed, 22 insertions, 24 deletions
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index 6409263830..1d80cad05b 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -107,3 +107,6 @@ SRCDATE_xsvg ?= "20060814"
 SRCDATE_yamonenv ?= "20060814"
 SRCDATE_zroadmap ?= "20060814"
 
+# Freedesktop.org
+SRCDATE_poppler = "20070708"
+
diff --git a/packages/poppler/poppler.inc b/packages/poppler/poppler.inc
index c33d6f0ea1..e01057cb4e 100644
--- a/packages/poppler/poppler.inc
+++ b/packages/poppler/poppler.inc
@@ -1,23 +1,23 @@
 DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base."
 DEPENDS = "fontconfig jpeg zlib gtk+ cairo"
 LICENSE = "GPL"
-PR = "r1"
 
 SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz"
 
 inherit autotools pkgconfig
 
-EXTRA_OECONF = " --enable-xpdf-headers \
-		 --disable-gtk-test \
-		 --disable-poppler-qt --disable-poppler-qt4 \
-		 --enable-zlib \
-	       "
+EXTRA_OECONF = "\
+  --enable-xpdf-headers \
+  --disable-gtk-test \
+  --disable-poppler-qt \
+  --disable-poppler-qt4 \
+  --enable-zlib \
+"
 
-#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
+# check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
 require poppler-fpu.inc
 EXTRA_OECONF += "${@get_poppler_fpu_setting(bb, d)}"
 
-
 do_stage() {
 	autotools_stage_all
 }
diff --git a/packages/poppler/poppler_0.5.9.bb b/packages/poppler/poppler_0.5.9.bb
new file mode 100644
index 0000000000..347d9ae303
--- /dev/null
+++ b/packages/poppler/poppler_0.5.9.bb
@@ -0,0 +1,5 @@
+require poppler.inc
+
+# does not build, use cvs for now and eventually try to bump to 0.6.0 (or 1.0)
+DEFAULT_PREFERENCE = "-1"
+
diff --git a/packages/poppler/poppler_20060418.bb b/packages/poppler/poppler_20060418.bb
deleted file mode 100644
index 842536eda3..0000000000
--- a/packages/poppler/poppler_20060418.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base."
-DEPENDS = "fontconfig jpeg gtk+ cairo"
-LICENSE = "GPL"
-PV = "0.5.1+cvs20060418"
-PR = "r0"
-
-SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/poppler;module=poppler;date=${PV}"
-S = "${WORKDIR}/poppler"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--enable-xpdf-headers  --disable-gtk-test --disable-poppler-qt"
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/poppler/poppler_cvs.bb b/packages/poppler/poppler_cvs.bb
new file mode 100644
index 0000000000..ca4b8d6a03
--- /dev/null
+++ b/packages/poppler/poppler_cvs.bb
@@ -0,0 +1,6 @@
+require poppler.inc
+PV = "0.5.9+cvs${SRCDATE}"
+PR = "r0"
+
+SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/poppler;module=poppler"
+S = "${WORKDIR}/poppler"