From 4cd4e559334f4ee9a154a948328d3eb0394d97e3 Mon Sep 17 00:00:00 2001
From: Tom Rini <tom_rini@mentor.com>
Date: Fri, 11 Mar 2011 12:36:59 -0700
Subject: [PATCH] libiconv: Clean up

- Since we have a big comment about not being able to use gettext.bbclass
  drop it.
- Use $GNU_MIRROR
- Switch to INC_PR, move bits from the two that used the inc file to
  the incfile itself.

Signed-off-by: Tom Rini <tom_rini@mentor.com>
---
 recipes/libiconv/libiconv.inc       | 13 ++++++++-----
 recipes/libiconv/libiconv_1.12.bb   |  8 +-------
 recipes/libiconv/libiconv_1.13.1.bb |  9 +--------
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/recipes/libiconv/libiconv.inc b/recipes/libiconv/libiconv.inc
index 11dfaf2f4b..9ed35ee50d 100644
--- a/recipes/libiconv/libiconv.inc
+++ b/recipes/libiconv/libiconv.inc
@@ -3,13 +3,16 @@ multiple character encodings, but that support lacks from your system."
 HOMEPAGE = "http://www.gnu.org/software/libiconv"
 SECTION = "libs"
 PRIORITY = "optional"
+PROVIDES = "virtual/libiconv"
 NOTES = "Needs to be stripped down to: ascii iso8859-1 eucjp iso-2022jp gb utf8"
+INC_PR = "r3"
 
-SRC_URI = "ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-${PV}.tar.gz \
-          "
+SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
 
-S = "${WORKDIR}/libiconv-${PV}"
+#gettext.class cant be inherit here so use this hack
+DEPENDS = "${@['','gettext-native'][bb.data.getVar('USE_NLS', d, 1) == 'yes']}"
 
-inherit autotools gettext
+inherit autotools
 
-EXTRA_OECONF += "--enable-shared --enable-static --enable-relocatable"
+EXTRA_OECONF += "--enable-shared --enable-static --enable-relocatable \
+		 ${@['--disable-nls','--enable-nls'][bb.data.getVar('USE_NLS', d, 1) == 'yes']}"
diff --git a/recipes/libiconv/libiconv_1.12.bb b/recipes/libiconv/libiconv_1.12.bb
index 83774d651f..8dd0a77b1d 100644
--- a/recipes/libiconv/libiconv_1.12.bb
+++ b/recipes/libiconv/libiconv_1.12.bb
@@ -1,13 +1,7 @@
 require libiconv.inc
 LICENSE = "GPLv3 LGPLv2"
 
-PROVIDES = "virtual/libiconv"
-PR = "r2"
-
-#gettext.class cant be inherit here so use this hack
-DEPENDS = "${@['','gettext-native'][bb.data.getVar('USE_NLS', d, 1) == 'yes']}"
-
-EXTRA_OECONF +=  "${@['--disable-nls','--enable-nls'][bb.data.getVar('USE_NLS', d, 1) == 'yes']}"
+PR = "${INC_PR}.0"
 
 LEAD_SONAME = "libiconv.so"
 
diff --git a/recipes/libiconv/libiconv_1.13.1.bb b/recipes/libiconv/libiconv_1.13.1.bb
index a956b74b79..6645cc562a 100644
--- a/recipes/libiconv/libiconv_1.13.1.bb
+++ b/recipes/libiconv/libiconv_1.13.1.bb
@@ -1,13 +1,7 @@
 require libiconv.inc
 LICENSE = "GPLv3 LGPLv2"
 
-PROVIDES = "virtual/libiconv"
-PR = "r1"
-
-#gettext.class cant be inherit here so use this hack
-DEPENDS = "${@['','gettext-native'][bb.data.getVar('USE_NLS', d, 1) == 'yes']}"
-
-EXTRA_OECONF +=  "${@['--disable-nls','--enable-nls'][bb.data.getVar('USE_NLS', d, 1) == 'yes']}"
+PR = "${INC_PR}.0"
 
 SRC_URI += "file://autoconf.patch"
 
@@ -21,4 +15,3 @@ do_configure_append () {
 LEAD_SONAME = "libiconv.so"
 SRC_URI[md5sum] = "7ab33ebd26687c744a37264a330bbe9a"
 SRC_URI[sha256sum] = "55a36168306089009d054ccdd9d013041bfc3ab26be7033d107821f1c4949a49"
-
-- 
2.39.5