5 files changed, 12 insertions, 34 deletions
diff --git a/packages/mpfr/mpfr-native_2.3.0.bb b/packages/mpfr/mpfr-native_2.3.0.bb
deleted file mode 100644
index 01ba37c8bf..0000000000
--- a/packages/mpfr/mpfr-native_2.3.0.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require mpfr_${PV}.bb
-inherit native
-DEPENDS = "gmp-native"
-
diff --git a/packages/mpfr/mpfr.inc b/packages/mpfr/mpfr.inc
deleted file mode 100644
index cf898b62b6..0000000000
--- a/packages/mpfr/mpfr.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-DESCRIPTION = "A C library for multiple-precision floating-point computations with exact rounding"
-HOMEPAGE = "http://www.mpfr.org/"
-LICENSE = "LGPL"
-SECTION = "libs"
-
-inherit autotools
diff --git a/packages/mpfr/mpfr_2.1.1.bb b/packages/mpfr/mpfr_2.1.1.bb
index 6127e5dae9..10383b1caa 100644
--- a/packages/mpfr/mpfr_2.1.1.bb
+++ b/packages/mpfr/mpfr_2.1.1.bb
@@ -1,12 +1,14 @@
-require mpfr.inc
-
+DESCRIPTION = "A C library for multiple-precision floating-point computations with exact rounding"
+LICENSE = "LGPL"
+SECTION = "libs"
 DEPENDS = "gmp"
-
-PR = "r3"
+PR = "r2"
 
 SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2"
 S = "${WORKDIR}/mpfr-${PV}"
 
+inherit autotools
+
 do_stage() {
 	oe_runmake install prefix=${STAGING_DIR} \
 	       bindir=${STAGING_BINDIR} \
diff --git a/packages/mpfr/mpfr_2.3.0.bb b/packages/mpfr/mpfr_2.3.0.bb
deleted file mode 100644
index f9d3b44d0b..0000000000
--- a/packages/mpfr/mpfr_2.3.0.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-require mpfr.inc
-
-DEPENDS = "gmp"
-
-PR = "r0"
-
-SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2"
-S = "${WORKDIR}/mpfr-${PV}"
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
-}
diff --git a/packages/mpfr/mpfr_cvs.bb b/packages/mpfr/mpfr_cvs.bb
index 14b762408c..fcea24633a 100644
--- a/packages/mpfr/mpfr_cvs.bb
+++ b/packages/mpfr/mpfr_cvs.bb
@@ -1,13 +1,15 @@
-require mpfr.inc
-
+DESCRIPTION = "A C library for multiple-precision floating-point computations with exact rounding"
+LICENSE = "LGPL"
+SECTION = "libs"
 DEPENDS = "gmp"
-
 PV = "0.0+cvs${SRCDATE}"
-PR = "r2"
+PR = "r1"
 
 SRC_URI = "cvs://cvs:@cvs-sop.inria.fr/CVS/spaces;module=mpfr;method=pserver"
 S = "${WORKDIR}/mpfr"
 
+inherit autotools
+
 do_stage() {
 	oe_runmake install prefix=${STAGING_DIR} \
 	       bindir=${STAGING_BINDIR} \