man: Update to 1.6g

Rebase some patches

(From OE-Core rev: 4cb22ea0beb952a5d70f83aaac415b7f2ecf3fd5)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

31 files changed, 3 insertions, 5 deletions

diff --git a/meta/recipes-extended/man/man-1.6f/man-1.5g-nonrootbuild.patch b/meta/recipes-extended/man/man/man-1.5g-nonrootbuild.patch
index 6f834bd01b..6f834bd01b 100644
--- a/meta/recipes-extended/man/man-1.6f/man-1.5g-nonrootbuild.patch
+++ b/meta/recipes-extended/man/man/man-1.5g-nonrootbuild.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.5h1-gencat.patch b/meta/recipes-extended/man/man/man-1.5h1-gencat.patch
index 044b14c509..044b14c509 100644
--- a/meta/recipes-extended/man/man-1.6f/man-1.5h1-gencat.patch
+++ b/meta/recipes-extended/man/man/man-1.5h1-gencat.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.5h1-make.patch b/meta/recipes-extended/man/man/man-1.5h1-make.patch
index 8631eb2c53..8631eb2c53 100644
--- a/meta/recipes-extended/man/man-1.6f/man-1.5h1-make.patch
+++ b/meta/recipes-extended/man/man/man-1.5h1-make.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.5i2-initial.patch b/meta/recipes-extended/man/man/man-1.5i2-initial.patch
index fe56c0706c..fe56c0706c 100644
--- a/meta/recipes-extended/man/man-1.6f/man-1.5i2-initial.patch
+++ b/meta/recipes-extended/man/man/man-1.5i2-initial.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.5i2-newline.patch b/meta/recipes-extended/man/man/man-1.5i2-newline.patch
index 611df5d259..611df5d259 100644
--- a/meta/recipes-extended/man/man-1.6f/man-1.5i2-newline.patch
+++ b/meta/recipes-extended/man/man/man-1.5i2-newline.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.5i2-overflow.patch b/meta/recipes-extended/man/man/man-1.5i2-overflow.patch
index 52d2881a89..52d2881a89 100644
--- a/meta/recipes-extended/man/man-1.6f/man-1.5i2-overflow.patch
+++ b/meta/recipes-extended/man/man/man-1.5i2-overflow.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.5j-i18n.patch b/meta/recipes-extended/man/man/man-1.5j-i18n.patch
index 2ae09c0ea4..2ae09c0ea4 100644
--- a/meta/recipes-extended/man/man-1.6f/man-1.5j-i18n.patch
+++ b/meta/recipes-extended/man/man/man-1.5j-i18n.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.5j-nocache.patch b/meta/recipes-extended/man/man/man-1.5j-nocache.patch
index 751dddd53b..751dddd53b 100644
--- a/meta/recipes-extended/man/man-1.6f/man-1.5j-nocache.patch
+++ b/meta/recipes-extended/man/man/man-1.5j-nocache.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.5j-utf8.patch b/meta/recipes-extended/man/man/man-1.5j-utf8.patch
index 33d3e4c974..33d3e4c974 100644
--- a/meta/recipes-extended/man/man-1.6f/man-1.5j-utf8.patch
+++ b/meta/recipes-extended/man/man/man-1.5j-utf8.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.5k-confpath.patch b/meta/recipes-extended/man/man/man-1.5k-confpath.patch
index b5746c2df8..b5746c2df8 100644
--- a/meta/recipes-extended/man/man-1.6f/man-1.5k-confpath.patch
+++ b/meta/recipes-extended/man/man/man-1.5k-confpath.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.5k-nonascii.patch b/meta/recipes-extended/man/man/man-1.5k-nonascii.patch
index d662d9b6a7..d662d9b6a7 100644
--- a/meta/recipes-extended/man/man-1.6f/man-1.5k-nonascii.patch
+++ b/meta/recipes-extended/man/man/man-1.5k-nonascii.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.5k-sofix.patch b/meta/recipes-extended/man/man/man-1.5k-sofix.patch
index 50b925288e..50b925288e 100644
--- a/meta/recipes-extended/man/man-1.6f/man-1.5k-sofix.patch
+++ b/meta/recipes-extended/man/man/man-1.5k-sofix.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.5m2-bug11621.patch b/meta/recipes-extended/man/man/man-1.5m2-bug11621.patch
index 051299906b..051299906b 100644
--- a/meta/recipes-extended/man/man-1.6f/man-1.5m2-bug11621.patch
+++ b/meta/recipes-extended/man/man/man-1.5m2-bug11621.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.5m2-buildroot.patch b/meta/recipes-extended/man/man/man-1.5m2-buildroot.patch
index bc97f56b9a..bc97f56b9a 100644
--- a/meta/recipes-extended/man/man-1.6f/man-1.5m2-buildroot.patch
+++ b/meta/recipes-extended/man/man/man-1.5m2-buildroot.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.5m2-multiple.patch b/meta/recipes-extended/man/man/man-1.5m2-multiple.patch
index ec06ab7833..ec06ab7833 100644
--- a/meta/recipes-extended/man/man-1.6f/man-1.5m2-multiple.patch
+++ b/meta/recipes-extended/man/man/man-1.5m2-multiple.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.5m2-no-color-for-printing.patch b/meta/recipes-extended/man/man/man-1.5m2-no-color-for-printing.patch
index c85ff1d8c7..c85ff1d8c7 100644
--- a/meta/recipes-extended/man/man-1.6f/man-1.5m2-no-color-for-printing.patch
+++ b/meta/recipes-extended/man/man/man-1.5m2-no-color-for-printing.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.5m2-sigpipe.patch b/meta/recipes-extended/man/man/man-1.5m2-sigpipe.patch
index 8af78eab7b..8af78eab7b 100644
--- a/meta/recipes-extended/man/man-1.6f/man-1.5m2-sigpipe.patch
+++ b/meta/recipes-extended/man/man/man-1.5m2-sigpipe.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.5m2-tv_fhs.patch b/meta/recipes-extended/man/man/man-1.5m2-tv_fhs.patch
index fe66d7599a..fe66d7599a 100644
--- a/meta/recipes-extended/man/man-1.6f/man-1.5m2-tv_fhs.patch
+++ b/meta/recipes-extended/man/man/man-1.5m2-tv_fhs.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.6e-i18n_whatis.patch b/meta/recipes-extended/man/man/man-1.6e-i18n_whatis.patch
index e321325d63..e321325d63 100644
--- a/meta/recipes-extended/man/man-1.6f/man-1.6e-i18n_whatis.patch
+++ b/meta/recipes-extended/man/man/man-1.6e-i18n_whatis.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.6e-lzma+xz-support.patch b/meta/recipes-extended/man/man/man-1.6e-lzma+xz-support.patch
index aae980fc7f..aae980fc7f 100644
--- a/meta/recipes-extended/man/man-1.6f/man-1.6e-lzma+xz-support.patch
+++ b/meta/recipes-extended/man/man/man-1.6e-lzma+xz-support.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.6e-mandirs.patch b/meta/recipes-extended/man/man/man-1.6e-mandirs.patch
index b240064c98..b240064c98 100644
--- a/meta/recipes-extended/man/man-1.6f/man-1.6e-mandirs.patch
+++ b/meta/recipes-extended/man/man/man-1.6e-mandirs.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.6e-new_sections.patch b/meta/recipes-extended/man/man/man-1.6e-new_sections.patch
index fb9773c646..fb9773c646 100644
--- a/meta/recipes-extended/man/man-1.6f/man-1.6e-new_sections.patch
+++ b/meta/recipes-extended/man/man/man-1.6e-new_sections.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.6e-ro_usr.patch b/meta/recipes-extended/man/man/man-1.6e-ro_usr.patch
index 1d1cb0c724..1d1cb0c724 100644
--- a/meta/recipes-extended/man/man-1.6f/man-1.6e-ro_usr.patch
+++ b/meta/recipes-extended/man/man/man-1.6e-ro_usr.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.6e-security.patch b/meta/recipes-extended/man/man/man-1.6e-security.patch
index 312a882f06..312a882f06 100644
--- a/meta/recipes-extended/man/man-1.6f/man-1.6e-security.patch
+++ b/meta/recipes-extended/man/man/man-1.6e-security.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.6e-use_i18n_vars_in_a_std_way.patch b/meta/recipes-extended/man/man/man-1.6e-use_i18n_vars_in_a_std_way.patch
index 568f742100..568f742100 100644
--- a/meta/recipes-extended/man/man-1.6f/man-1.6e-use_i18n_vars_in_a_std_way.patch
+++ b/meta/recipes-extended/man/man/man-1.6e-use_i18n_vars_in_a_std_way.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.6e-whatis2.patch b/meta/recipes-extended/man/man/man-1.6e-whatis2.patch
index 7f013836c0..7f013836c0 100644
--- a/meta/recipes-extended/man/man-1.6f/man-1.6e-whatis2.patch
+++ b/meta/recipes-extended/man/man/man-1.6e-whatis2.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man.1.gz b/meta/recipes-extended/man/man/man.1.gz
index c368045153..c368045153 100644
--- a/meta/recipes-extended/man/man-1.6f/man.1.gz
+++ b/meta/recipes-extended/man/man/man.1.gz
diff --git a/meta/recipes-extended/man/man-1.6f/man.7.gz b/meta/recipes-extended/man/man/man.7.gz
index e85af82426..e85af82426 100644
--- a/meta/recipes-extended/man/man-1.6f/man.7.gz
+++ b/meta/recipes-extended/man/man/man.7.gz
diff --git a/meta/recipes-extended/man/man-1.6f/man.conf b/meta/recipes-extended/man/man/man.conf
index bb3c69720e..bb3c69720e 100644
--- a/meta/recipes-extended/man/man-1.6f/man.conf
+++ b/meta/recipes-extended/man/man/man.conf
diff --git a/meta/recipes-extended/man/man-1.6f/manpath.5.gz b/meta/recipes-extended/man/man/manpath.5.gz
index c012ff8976..c012ff8976 100644
--- a/meta/recipes-extended/man/man-1.6f/manpath.5.gz
+++ b/meta/recipes-extended/man/man/manpath.5.gz
diff --git a/meta/recipes-extended/man/man_1.6f.bb b/meta/recipes-extended/man/man_1.6g.bb
index 90bd0d30e1..a2d6acefa6 100644
--- a/meta/recipes-extended/man/man_1.6f.bb
+++ b/meta/recipes-extended/man/man_1.6g.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://primates.ximian.com/~flucifredi/man"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 
-PR = "r5"
+PR = "r0"
 
 DEPENDS = "groff less"
 
@@ -34,12 +34,10 @@ SRC_URI = "http://primates.ximian.com/~flucifredi/${BPN}/${BPN}-${PV}.tar.gz \
            file://man-1.5m2-sigpipe.patch; \
            file://man-1.6e-i18n_whatis.patch; \
            file://man-1.6e-new_sections.patch; \
-           file://man-1.6e-lzma+xz-support.patch; \
            file://man*"
 
-SRC_URI[md5sum] = "67aaaa6df35215e812fd7d89472c44b6"
-SRC_URI[sha256sum] = "9f208c7e1981371ad4481d6e6c2c566bc726a15778723f94136d220fb9375f6c"
-
+SRC_URI[md5sum] = "ba154d5796928b841c9c69f0ae376660"
+SRC_URI[sha256sum] = "ccdcb8c3f4e0080923d7e818f0e4a202db26c46415eaef361387c20995b8959f"
 
 do_configure () {
         ${S}/configure -default -confdir /etc +sgid +fhs +lang all