5 files changed, 8 insertions, 84 deletions
diff --git a/packages/popt/popt-1.13/iconv.patch b/packages/popt/popt-1.13/iconv.patch
deleted file mode 100644
index 4faf4c4a1d..0000000000
--- a/packages/popt/popt-1.13/iconv.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: popt-1.13/Makefile.am
-===================================================================
---- popt-1.13.orig/Makefile.am	2007-11-14 20:42:27.000000000 +0000
-+++ popt-1.13/Makefile.am	2008-03-26 22:14:05.000000000 +0000
-@@ -39,7 +39,7 @@
- usrlib_LTLIBRARIES = libpopt.la
- 
- libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c poptint.c
--libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@
-+libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@
- 
- if HAVE_LD_VERSION_SCRIPT
- libpopt_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libpopt.vers
-Index: popt-1.13/configure.ac
-===================================================================
---- popt-1.13.orig/configure.ac	2007-11-14 20:42:27.000000000 +0000
-+++ popt-1.13/configure.ac	2008-03-26 22:20:16.000000000 +0000
-@@ -95,6 +95,7 @@
- AC_CHECK_FUNCS(getuid geteuid mtrace __secure_getenv setregid strerror iconv)
- 
- AM_GNU_GETTEXT([external])
-+AM_ICONV_LINK
- 
- popt_sysconfdir="${sysconfdir}"
- eval "popt_sysconfdir=\"${popt_sysconfdir}\"" # expand contained ${prefix}
diff --git a/packages/popt/popt-native_1.14.bb b/packages/popt/popt-native_1.14.bb
deleted file mode 100644
index 54712ab812..0000000000
--- a/packages/popt/popt-native_1.14.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-require popt.inc
-
-DEPENDS = "gettext-native"
-
-PR = "r0"
-
-inherit native autotools
-
-SRC_URI = "http://rpm5.org/files/popt/popt-${PV}.tar.gz"
-
-S = "${WORKDIR}/popt-${PV}"
-
-do_install() {
-	oe_libinstall -a -so libpopt ${STAGING_LIBDIR_NATIVE}
-	install -m 0644 popt.h ${STAGING_INCDIR_NATIVE}
-}
diff --git a/packages/popt/popt-native_1.7.bb b/packages/popt/popt-native_1.7.bb
index a83d384eee..320a2112e8 100644
--- a/packages/popt/popt-native_1.7.bb
+++ b/packages/popt/popt-native_1.7.bb
@@ -1,20 +1,7 @@
-require popt.inc
-
+require popt_${PV}.bb
 DEPENDS = "gettext-native"
-
-PR = "r5"
-
-inherit native autotools
-
-SRC_URI = "ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/popt-${PV}.tar.gz \
-	   file://m4.patch;patch=1 \
-	   file://intl.patch;patch=1"
+inherit native
 
 S = "${WORKDIR}/popt-${PV}"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/popt-${PV}"
-
-do_install() {
-	oe_libinstall -a -so libpopt ${STAGING_LIBDIR_NATIVE}
-	install -m 0644 popt.h ${STAGING_INCDIR_NATIVE}
-}
diff --git a/packages/popt/popt_1.14.bb b/packages/popt/popt_1.14.bb
deleted file mode 100644
index 240ac52275..0000000000
--- a/packages/popt/popt_1.14.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-require popt.inc
-
-DEPENDS = "gettext-native virtual/libintl"
-
-PR = "r1"
-
-inherit autotools
-
-SRC_URI = "http://rpm5.org/files/popt/popt-${PV}.tar.gz" 
-	  
-
-do_stage() {
-	oe_libinstall -a -so libpopt ${STAGING_LIBDIR}
-	install -m 0644 popt.h ${STAGING_INCDIR}
-}
-
-
diff --git a/packages/popt/popt_1.7.bb b/packages/popt/popt_1.7.bb
index 7992db56e7..467fac1393 100644
--- a/packages/popt/popt_1.7.bb
+++ b/packages/popt/popt_1.7.bb
@@ -2,15 +2,10 @@ require popt.inc
 
 DEPENDS = "gettext virtual/libintl"
 
-PR = "r5"
+inherit autotools autotools_stage
 
-inherit autotools
-
-SRC_URI = "ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/popt-${PV}.tar.gz \
-	   file://m4.patch;patch=1 \
-	   file://intl.patch;patch=1"
-
-do_stage() {
-	oe_libinstall -a -so libpopt ${STAGING_LIBDIR}
-	install -m 0644 popt.h ${STAGING_INCDIR}
-}
+SRC_URI = "\
+  ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/popt-${PV}.tar.gz \
+  file://m4.patch;patch=1 \
+  file://intl.patch;patch=1 \
+"