merge of 5de14a26c9fe526edc43ef8c1b0610c5ce6b2080

     and 6d86cc1120eb58d3d78c4eeb331067a977f09459

22 files changed, 117 insertions, 225 deletions

diff --git a/packages/centericq/centericq.inc b/packages/centericq/centericq.inc
new file mode 100644
index 0000000000..2773ac61fd
--- /dev/null
+++ b/packages/centericq/centericq.inc
@@ -0,0 +1,14 @@
+DESCRIPTION = "An ncurses-based IM client for ICQ2000, Yahoo!, \
+AIM, IRC, Jabber and LiveJournal"
+SECTION = "console/network"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "openssl ncurses"
+
+inherit autotools
+
+SRC_URI = "http://centericq.de/archive/source/releases/centericq-${PV}.tar.bz2 \
+           file://configure.patch;patch=1 \
+           file://m4.patch;patch=1"
+
+EXTRA_OECONF = "--with-ssl --with-openssl=${STAGING_LIBDIR}/.."
diff --git a/packages/centericq/centericq_4.11.0.bb b/packages/centericq/centericq_4.11.0.bb
index fa6633883b..dc227c4a93 100644
--- a/packages/centericq/centericq_4.11.0.bb
+++ b/packages/centericq/centericq_4.11.0.bb
@@ -1,15 +1,5 @@
-DEPENDS = "openssl ncurses"
-DESCRIPTION = "An ncurses-based IM client for ICQ2000, Yahoo!, \
-AIM, IRC, Jabber and LiveJournal"
-SECTION = "console/network"
-SRC_URI = "http://centericq.de/archive/source/releases/centericq-${PV}.tar.bz2 \
-	   file://configure.patch;patch=1 \
-	   file://m4.patch;patch=1"
-LICENSE = "GPL"
+require centericq.inc
 
-inherit autotools
-
-EXTRA_OECONF = "--with-ssl --with-openssl=${STAGING_LIBDIR}/.."
 acpaths = "-I ${S}/m4"
 
 # FIXME: ugly compile failures
diff --git a/packages/centericq/centericq_4.9.10.bb b/packages/centericq/centericq_4.9.10.bb
index 93e85b6c8b..6d02f2c787 100644
--- a/packages/centericq/centericq_4.9.10.bb
+++ b/packages/centericq/centericq_4.9.10.bb
@@ -1,12 +1,3 @@
-DEPENDS = "openssl ncurses"
-DESCRIPTION = "An ncurses-based IM client for ICQ2000, Yahoo!, \
-AIM, IRC, Jabber and LiveJournal"
-SECTION = "console/network"
-SRC_URI = "http://centericq.de/archive/source/releases/centericq-${PV}.tar.bz2 \
-	   file://configure.patch;patch=1 \
-	   file://m4.patch;patch=1"
-LICENSE = "GPL" 
-inherit autotools
+require centericq.inc
 
-EXTRA_OECONF = "--with-ssl --with-openssl=${STAGING_LIBDIR}/.."
 acpaths = "-I ${S}/m4"
diff --git a/packages/centericq/centericq_4.9.7.bb b/packages/centericq/centericq_4.9.7.bb
index 331d69c8d3..c4af2f4437 100644
--- a/packages/centericq/centericq_4.9.7.bb
+++ b/packages/centericq/centericq_4.9.7.bb
@@ -1,13 +1 @@
-DEPENDS = "openssl ncurses"
-DESCRIPTION = "An ncurses-based IM client for ICQ2000, Yahoo!, \
-AIM, IRC, Jabber and LiveJournal"
-SECTION = "console/network"
-LICENSE = "GPL" 
-
-SRC_URI = "http://centericq.de/archive/source/releases/centericq-${PV}.tar.bz2 \
-	   file://configure.patch;patch=1 \
-	   file://m4.patch;patch=1"
-
-inherit autotools
-
-EXTRA_OECONF = "--with-ssl --with-openssl=${STAGING_LIBDIR}/.."
+require centericq.inc
diff --git a/packages/coreutils/coreutils.inc b/packages/coreutils/coreutils.inc
new file mode 100644
index 0000000000..481c32bb3d
--- /dev/null
+++ b/packages/coreutils/coreutils.inc
@@ -0,0 +1,7 @@
+DESCRIPTION = "A collection of core GNU utilities."
+LICENSE = "GPL"
+SECTION = "base"
+RREPLACES = "textutils shellutils fileutils"
+RPROVIDES = "textutils shellutils fileutils"
+
+inherit autotools
diff --git a/packages/coreutils/coreutils_5.0.bb b/packages/coreutils/coreutils_5.0.bb
index c0e94329f2..84fa38cef2 100644
--- a/packages/coreutils/coreutils_5.0.bb
+++ b/packages/coreutils/coreutils_5.0.bb
@@ -1,14 +1,9 @@
-LICENSE = "GPL"
-SECTION = "base"
-DESCRIPTION = "A collection of core GNU utilities."
-RREPLACES = "textutils shellutils fileutils"
-RPROVIDES = "textutils shellutils fileutils"
+require coreutils.inc 
+
 PR = "r1"
 
 SRC_URI = "${GNU_MIRROR}/coreutils/coreutils-${PV}.tar.gz \
 	   file://malloc.patch;patch=1 \
 	   file://configure.patch;patch=1"
 
-inherit autotools
-
 export EXTRA_OEMAKE="'SUBDIRS=lib src doc m4 po tests' MAKEFLAGS="
diff --git a/packages/coreutils/coreutils_5.1.1.bb b/packages/coreutils/coreutils_5.1.1.bb
index f517fc8067..40b9fe4744 100644
--- a/packages/coreutils/coreutils_5.1.1.bb
+++ b/packages/coreutils/coreutils_5.1.1.bb
@@ -1,10 +1,5 @@
-LICENSE = "GPL"
-SECTION = "base"
-DESCRIPTION = "A collection of core GNU utilities."
-RREPLACES = "textutils shellutils fileutils"
-RPROVIDES = "textutils shellutils fileutils"
+require coreutils.inc 
+
 PR = "r1"
 
 SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2"
-
-inherit autotools
diff --git a/packages/coreutils/coreutils_5.1.3.bb b/packages/coreutils/coreutils_5.1.3.bb
index 2f7476c2dd..2277ae6bc7 100644
--- a/packages/coreutils/coreutils_5.1.3.bb
+++ b/packages/coreutils/coreutils_5.1.3.bb
@@ -1,8 +1,5 @@
-LICENSE = "GPL"
-SECTION = "base"
-DESCRIPTION = "A collection of core GNU utilities."
-RREPLACES = "textutils shellutils fileutils"
-RPROVIDES = "textutils shellutils fileutils"
+require coreutils.inc 
+
 PR = "r8"
 
 SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \
@@ -10,8 +7,6 @@ SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \
            file://man.patch;patch=1 \
 	   file://rename-eaccess.patch;patch=1"
 
-inherit autotools
-
 # [ gets a special treatment and is not included in this
 bindir_progs = "basename cksum comm csplit cut dir dircolors dirname du \
 		env expand expr factor fmt fold groups head hostid id install \
diff --git a/packages/coreutils/coreutils_5.3.0.bb b/packages/coreutils/coreutils_5.3.0.bb
index fa05a83781..6c2289b8f7 100644
--- a/packages/coreutils/coreutils_5.3.0.bb
+++ b/packages/coreutils/coreutils_5.3.0.bb
@@ -1,18 +1,12 @@
-DESCRIPTION = "A collection of core GNU utilities."
-LICENSE = "GPL"
-SECTION = "base"
-RREPLACES = "textutils shellutils fileutils"
-RPROVIDES = "textutils shellutils fileutils"
+require coreutils.inc 
+
 PR = "r1"
 
 SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \
            file://install-cross.patch;patch=1;pnum=0 \
            file://man.patch;patch=1 \
-           file://rename-tee-for-glibc2.5.patch;patch=1"
-
-SRC_URI += "file://uptime-pow-lib.patch;patch=1"
-
-inherit autotools
+           file://rename-tee-for-glibc2.5.patch;patch=1 \
+           file://uptime-pow-lib.patch;patch=1"
 
 # [ gets a special treatment and is not included in this
 bindir_progs = "basename cksum comm csplit cut dir dircolors dirname du \
diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs.inc b/packages/e2fsprogs-libs/e2fsprogs-libs.inc
new file mode 100644
index 0000000000..03f9c8dc22
--- /dev/null
+++ b/packages/e2fsprogs-libs/e2fsprogs-libs.inc
@@ -0,0 +1,31 @@
+DESCRIPTION = "EXT2 Filesystem Utilities"
+LICENSE = "GPL"
+SECTION = "base"
+PRIORITY = "optional"
+
+inherit autotools
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \
+           file://configure.patch;patch=1 \
+           file://compile-subst.patch;patch=1 \
+           file://m4.patch;patch=1"
+
+S = "${WORKDIR}/e2fsprogs-libs-${PV}"
+FILES_e2fsprogs-libs-dev_append = " ${datadir}/et ${datadir}/ss"
+
+do_stage () {
+        for i in libcom_err libss libuuid libblkid; do
+                oe_libinstall -a -C lib $i ${STAGING_LIBDIR}
+        done
+        install -d ${STAGING_INCDIR}/et \
+                   ${STAGING_INCDIR}/ss \
+                   ${STAGING_INCDIR}/uuid \
+                   ${STAGING_INCDIR}/blkid
+        install -m 0644 lib/et/com_err.h ${STAGING_INCDIR}/et/
+        install -m 0644 lib/ss/ss.h ${STAGING_INCDIR}/ss/
+        install -m 0644 lib/ss/ss_err.h ${STAGING_INCDIR}/ss/
+        install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/
+        install -m 0644 lib/uuid/uuid_types.h ${STAGING_INCDIR}/uuid/
+        install -m 0644 lib/blkid/blkid.h ${STAGING_INCDIR}/blkid/
+        install -m 0644 lib/blkid/blkid_types.h ${STAGING_INCDIR}/blkid/
+}
diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs_1.33.bb b/packages/e2fsprogs-libs/e2fsprogs-libs_1.33.bb
index 90ed15e3f0..38449667fe 100644
--- a/packages/e2fsprogs-libs/e2fsprogs-libs_1.33.bb
+++ b/packages/e2fsprogs-libs/e2fsprogs-libs_1.33.bb
@@ -1,31 +1 @@
-DESCRIPTION = "EXT2 Filesystem Utilities"
-LICENSE = "GPL"
-SECTION = "base"
-PRIORITY = "optional"
-DEPENDS = ""
-FILES_e2fsprogs-libs-dev_append = " ${datadir}/et ${datadir}/ss"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \
-	   file://configure.patch;patch=1 \
-	   file://compile-subst.patch;patch=1 \
-	   file://m4.patch;patch=1"
-S = "${WORKDIR}/e2fsprogs-libs-${PV}"
-
-inherit autotools
-
-do_stage () {
-	for i in libcom_err libss libuuid libblkid; do
-		oe_libinstall -a -C lib $i ${STAGING_LIBDIR}
-	done
-	install -d ${STAGING_INCDIR}/et \
-		   ${STAGING_INCDIR}/ss \
-		   ${STAGING_INCDIR}/uuid \
-		   ${STAGING_INCDIR}/blkid
-	install -m 0644 lib/et/com_err.h ${STAGING_INCDIR}/et/
-	install -m 0644 lib/ss/ss.h ${STAGING_INCDIR}/ss/
-	install -m 0644 lib/ss/ss_err.h ${STAGING_INCDIR}/ss/
-	install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/
-	install -m 0644 lib/uuid/uuid_types.h ${STAGING_INCDIR}/uuid/
-	install -m 0644 lib/blkid/blkid.h ${STAGING_INCDIR}/blkid/
-	install -m 0644 lib/blkid/blkid_types.h ${STAGING_INCDIR}/blkid/
-}
+require e2fsprogs-libs.inc
diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs_1.34.bb b/packages/e2fsprogs-libs/e2fsprogs-libs_1.34.bb
index 4d4a432b22..738d1ee206 100644
--- a/packages/e2fsprogs-libs/e2fsprogs-libs_1.34.bb
+++ b/packages/e2fsprogs-libs/e2fsprogs-libs_1.34.bb
@@ -1,37 +1,8 @@
-DESCRIPTION = "EXT2 Filesystem Utilities"
-LICENSE = "GPL"
-SECTION = "base"
-PRIORITY = "optional"
-DEPENDS = ""
-FILES_e2fsprogs-libs-dev_append = " ${datadir}/et ${datadir}/ss"
+require e2fsprogs-libs.inc
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \
-	   file://configure.patch;patch=1 \
-	   file://compile-subst.patch;patch=1 \
-	   file://m4.patch;patch=1 \
-	   file://ldflags.patch;patch=1"
-S = "${WORKDIR}/e2fsprogs-libs-${PV}"
-
-inherit autotools
+SRC_URI += "file://ldflags.patch;patch=1"
 
 do_compile_prepend () {
 	find ./ -print|xargs chmod u=rwX
 	( cd util; ${BUILD_CC} subst.c -o subst )
 }
-
-do_stage () {
-	for i in libcom_err libss libuuid libblkid; do
-		oe_libinstall -a -C lib $i ${STAGING_LIBDIR}
-	done
-	install -d ${STAGING_INCDIR}/et \
-		   ${STAGING_INCDIR}/ss \
-		   ${STAGING_INCDIR}/uuid \
-		   ${STAGING_INCDIR}/blkid
-	install -m 0644 lib/et/com_err.h ${STAGING_INCDIR}/et/
-	install -m 0644 lib/ss/ss.h ${STAGING_INCDIR}/ss/
-	install -m 0644 lib/ss/ss_err.h ${STAGING_INCDIR}/ss/
-	install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/
-	install -m 0644 lib/uuid/uuid_types.h ${STAGING_INCDIR}/uuid/
-	install -m 0644 lib/blkid/blkid.h ${STAGING_INCDIR}/blkid/
-	install -m 0644 lib/blkid/blkid_types.h ${STAGING_INCDIR}/blkid/
-}
diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs_1.35.bb b/packages/e2fsprogs-libs/e2fsprogs-libs_1.35.bb
index 9809ac5a6e..0d7d25e2cc 100644
--- a/packages/e2fsprogs-libs/e2fsprogs-libs_1.35.bb
+++ b/packages/e2fsprogs-libs/e2fsprogs-libs_1.35.bb
@@ -1,17 +1,6 @@
-DESCRIPTION = "EXT2 Filesystem Utilities"
-LICENSE = "GPL"
-SECTION = "base"
-PRIORITY = "optional"
-FILES_e2fsprogs-libs-dev_append = " ${datadir}/et ${datadir}/ss"
+require e2fsprogs-libs.inc
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \
-	   file://configure.patch;patch=1 \
-	   file://compile-subst.patch;patch=1 \
-	   file://m4.patch;patch=1 \
-	   file://ldflags.patch;patch=1"
-S = "${WORKDIR}/e2fsprogs-libs-${PV}"
-
-inherit autotools
+SRC_URI += "file://ldflags.patch;patch=1"
 
 EXTRA_OECONF=" --enable-elf-shlibs "
 
@@ -19,20 +8,3 @@ do_compile_prepend () {
 	find ./ -print|xargs chmod u=rwX
 	( cd util; ${BUILD_CC} subst.c -o subst )
 }
-
-do_stage () {
-	for i in libcom_err libss libuuid libblkid; do
-		oe_libinstall -a -C lib $i ${STAGING_LIBDIR}
-	done
-	install -d ${STAGING_INCDIR}/et \
-		   ${STAGING_INCDIR}/ss \
-		   ${STAGING_INCDIR}/uuid \
-		   ${STAGING_INCDIR}/blkid
-	install -m 0644 lib/et/com_err.h ${STAGING_INCDIR}/et/
-	install -m 0644 lib/ss/ss.h ${STAGING_INCDIR}/ss/
-	install -m 0644 lib/ss/ss_err.h ${STAGING_INCDIR}/ss/
-	install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/
-	install -m 0644 lib/uuid/uuid_types.h ${STAGING_INCDIR}/uuid/
-	install -m 0644 lib/blkid/blkid.h ${STAGING_INCDIR}/blkid/
-	install -m 0644 lib/blkid/blkid_types.h ${STAGING_INCDIR}/blkid/
-}
diff --git a/packages/e2fsprogs/e2fsprogs.inc b/packages/e2fsprogs/e2fsprogs.inc
new file mode 100644
index 0000000000..6c3b287a39
--- /dev/null
+++ b/packages/e2fsprogs/e2fsprogs.inc
@@ -0,0 +1,12 @@
+DESCRIPTION = "EXT2 Filesystem Utilities"
+HOMEPAGE = "http://e2fsprogs.sf.net"
+LICENSE = "GPL"
+SECTION = "base"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz"
+
+inherit autotools
+
+EXTRA_OECONF = " --enable-dynamic-e2fsck"
+
+
diff --git a/packages/e2fsprogs/e2fsprogs_1.33.bb b/packages/e2fsprogs/e2fsprogs_1.33.bb
index 63732aac4b..80572a0d41 100644
--- a/packages/e2fsprogs/e2fsprogs_1.33.bb
+++ b/packages/e2fsprogs/e2fsprogs_1.33.bb
@@ -1,20 +1,12 @@
-DESCRIPTION = "EXT2 Filesystem Utilities"
-SECTION = "base"
-LICENSE = "GPL"
-PRIORITY = "optional"
-DEPENDS = ""
+require e2fsprogs.inc
+
 PR = "r1"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
-	   file://ln.patch;patch=1 \
+SRC_URI += "file://ln.patch;patch=1 \
 	   file://configure.patch;patch=1 \
 	   file://compile-subst.patch;patch=1 \
 	   file://m4.patch;patch=1"
 
-inherit autotools
-
-EXTRA_OECONF = "--enable-dynamic-e2fsck"
-
 sbindir = "/sbin"
 
 PACKAGES_prepend = "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck "
diff --git a/packages/e2fsprogs/e2fsprogs_1.34.bb b/packages/e2fsprogs/e2fsprogs_1.34.bb
index 9171d39c6b..837cf962a0 100644
--- a/packages/e2fsprogs/e2fsprogs_1.34.bb
+++ b/packages/e2fsprogs/e2fsprogs_1.34.bb
@@ -1,20 +1,13 @@
-DESCRIPTION = "EXT2 Filesystem Utilities"
-LICENSE = "GPL"
-SECTION = "base"
-PRIORITY = "optional"
+require e2fsprogs.inc
+
 PR = "r1"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
-	   file://ln.patch;patch=1 \
+SRC_URI += "file://ln.patch;patch=1 \
 	   file://configure.patch;patch=1 \
 	   file://compile-subst.patch;patch=1 \
 	   file://m4.patch;patch=1 \
 	   file://ldflags.patch;patch=1"
 
-inherit autotools
-
-EXTRA_OECONF = "--enable-dynamic-e2fsck"
-
 sbindir = "/sbin"
 
 PACKAGES_prepend = "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck "
diff --git a/packages/e2fsprogs/e2fsprogs_1.35.bb b/packages/e2fsprogs/e2fsprogs_1.35.bb
index 9171d39c6b..837cf962a0 100644
--- a/packages/e2fsprogs/e2fsprogs_1.35.bb
+++ b/packages/e2fsprogs/e2fsprogs_1.35.bb
@@ -1,20 +1,13 @@
-DESCRIPTION = "EXT2 Filesystem Utilities"
-LICENSE = "GPL"
-SECTION = "base"
-PRIORITY = "optional"
+require e2fsprogs.inc
+
 PR = "r1"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
-	   file://ln.patch;patch=1 \
+SRC_URI += "file://ln.patch;patch=1 \
 	   file://configure.patch;patch=1 \
 	   file://compile-subst.patch;patch=1 \
 	   file://m4.patch;patch=1 \
 	   file://ldflags.patch;patch=1"
 
-inherit autotools
-
-EXTRA_OECONF = "--enable-dynamic-e2fsck"
-
 sbindir = "/sbin"
 
 PACKAGES_prepend = "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck "
diff --git a/packages/e2fsprogs/e2fsprogs_1.38.bb b/packages/e2fsprogs/e2fsprogs_1.38.bb
index ec28bff31a..a909419437 100644
--- a/packages/e2fsprogs/e2fsprogs_1.38.bb
+++ b/packages/e2fsprogs/e2fsprogs_1.38.bb
@@ -1,18 +1,13 @@
-DESCRIPTION = "EXT2 Filesystem Utilities"
-HOMEPAGE = "http://e2fsprogs.sourceforge.net"
-LICENSE = "GPL"
-SECTION = "base"
+require e2fsprogs.inc
+
 PR = "r6"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
-	file://no-hardlinks.patch;patch=1"
+SRC_URI += "file://no-hardlinks.patch;patch=1"
 S = "${WORKDIR}/e2fsprogs-${PV}"
 
 PARALLEL_MAKE = ""
 
-inherit autotools
-
-EXTRA_OECONF = "--enable-dynamic-e2fsck --sbindir=${base_sbindir}"
+EXTRA_OECONF += " --sbindir=${base_sbindir}"
 
 do_compile_prepend () {
 	find ./ -print|xargs chmod u=rwX
@@ -49,4 +44,4 @@ FILES_e2fsprogs-fsck = "${base_sbindir}/fsck"
 FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*"
 FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext*"
 FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs"
-FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"
\ No newline at end of file
+FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"
diff --git a/packages/expat/expat.inc b/packages/expat/expat.inc
new file mode 100644
index 0000000000..3318efb6aa
--- /dev/null
+++ b/packages/expat/expat.inc
@@ -0,0 +1,13 @@
+DESCRIPTION = "Jim Clarkes XML parser library."
+HOMEPAGE = "http://expat.sf.net/"
+SECTION = "libs"
+LICENSE = "MIT"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \
+	   file://autotools.patch;patch=1"
+S = "${WORKDIR}/expat-${PV}"
+
+export LTCC = "${CC}"
+
+inherit autotools
+
diff --git a/packages/expat/expat_1.95.6.bb b/packages/expat/expat_1.95.6.bb
index a6ac0f5b00..576ad76a55 100644
--- a/packages/expat/expat_1.95.6.bb
+++ b/packages/expat/expat_1.95.6.bb
@@ -1,13 +1,6 @@
-SECTION = "libs"
-DESCRIPTION = "Jim Clarkes XML parser library."
-LICENSE = "MIT"
-PR = "r1"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz"
-S = "${WORKDIR}/expat-${PV}"
+require expat.inc
 
-inherit autotools 
-export LTCC = "${CC}"
+PR = "r1"
 
 do_stage () {
 	install -m 0644 ${S}/lib/expat.h ${STAGING_INCDIR}/
diff --git a/packages/expat/expat_1.95.7.bb b/packages/expat/expat_1.95.7.bb
index c3bbb8981b..a4dda4dcb6 100644
--- a/packages/expat/expat_1.95.7.bb
+++ b/packages/expat/expat_1.95.7.bb
@@ -1,15 +1,9 @@
-SECTION = "libs"
-DESCRIPTION = "Jim Clarkes XML parser library."
-HOMEPAGE = "http://expat.sourceforge.net/"
-LICENSE = "MIT"
+require expat.inc
 PR = "r1"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \
-	   file://autotools.patch;patch=1"
-S = "${WORKDIR}/expat-${PV}"
+SRC_URI += "file://autotools.patch;patch=1"
 
-inherit autotools lib_package
-export LTCC = "${CC}"
+inherit lib_package
 
 do_configure () {
 	rm -f ${S}/conftools/libtool.m4
diff --git a/packages/expat/expat_2.0.0.bb b/packages/expat/expat_2.0.0.bb
index 4f98d3cde9..48b2b4eb7d 100644
--- a/packages/expat/expat_2.0.0.bb
+++ b/packages/expat/expat_2.0.0.bb
@@ -1,15 +1,9 @@
-DESCRIPTION = "Jim Clarkes XML parser library."
-HOMEPAGE = "http://expat.sourceforge.net/"
-SECTION = "libs"
-LICENSE = "MIT"
+require expat.inc
 PR = "r2"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \
-	   file://autotools.patch;patch=1"
-S = "${WORKDIR}/expat-${PV}"
+SRC_URI = "file://autotools.patch;patch=1"
 
-inherit autotools lib_package
-export LTCC = "${CC}"
+inherit lib_package
 
 do_configure() {
 	rm -f ${S}/conftools/libtool.m4