fakeroot: backport 1.9.6, clean up old. close bug# 4227

Acked-by Koen Kooi <koen@openembedded.org>  and Philip Balister 
philip@balister.org
plucked revisions from dev:
d2682ccdf4be68f6b1b181b6a06003be2cc4122c
bf48b6d6236ec7cc942c0fdb3a14fc52a4c3fb36
27af07b24c1b4984eb3a5a4d2ff45e002defc2e6
0b810921c6253a825b7cdbf747d75f199d615b10
8fcdb2f1fccee0071e688926468076553b533bd5
25e81d935c6695f357801dec900ef78104a54b4a
628571dcb273ef51c3a731e01e15363b43f8a85a 

11 files changed, 12 insertions, 65 deletions

diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index 45d85ff65c..d76479e866 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -338,8 +338,8 @@ PREFERRED_VERSION_faad2 ?= "2.0"
 PREFERRED_VERSION_fakechroot ?= "2.5"
 PREFERRED_VERSION_fakechroot-native ?= "2.5"
 PREFERRED_VERSION_fakeconnect ?= "1.2.1"
-PREFERRED_VERSION_fakeroot ?= "1.7.1"
-PREFERRED_VERSION_fakeroot-native ?= "1.7.1"
+PREFERRED_VERSION_fakeroot ?= "1.9.6"
+PREFERRED_VERSION_fakeroot-native ?= "1.9.6"
 PREFERRED_VERSION_fam ?= "2.7.0"
 PREFERRED_VERSION_farsight ?= "0.1.5"
 PREFERRED_VERSION_fastcgi ?= "2.4.0"
diff --git a/packages/fakeroot/fakeroot-1.8.3/.mtn2git_empty b/packages/fakeroot/fakeroot-1.8.3/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/fakeroot/fakeroot-1.8.3/.mtn2git_empty
+++ /dev/null
diff --git a/packages/fakeroot/fakeroot-native-1.8.3/.mtn2git_empty b/packages/fakeroot/fakeroot-native-1.8.3/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/fakeroot/fakeroot-native-1.8.3/.mtn2git_empty
+++ /dev/null
diff --git a/packages/fakeroot/fakeroot-native-1.8.3/configure-libtool.patch b/packages/fakeroot/fakeroot-native-1.8.3/configure-libtool.patch
deleted file mode 100644
index 8830328eb5..0000000000
--- a/packages/fakeroot/fakeroot-native-1.8.3/configure-libtool.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- fakeroot-1.8.3/configure.ac.orig	2007-10-31 00:17:27.000000000 -0500
-+++ fakeroot-1.8.3/configure.ac	2007-10-31 00:18:12.000000000 -0500
-@@ -1,14 +1,12 @@
- dnl Process this file with autoconf to produce a configure script.
- AC_INIT([fakeroot],[FAKEROOT_VERSION],[schizo@debian.org],[fakeroot])
- AC_PREREQ(2.61)
--LT_PREREQ(2.1a)
- AC_CANONICAL_TARGET
- AM_INIT_AUTOMAKE
- AM_MAINTAINER_MODE
- AC_CONFIG_HEADERS([config.h])
- AC_PROG_MAKE_SET
--LT_INIT
--LT_LANG(C)
-+AC_PROG_LIBTOOL
- 
- AC_ARG_WITH([ipc],
- 	    AS_HELP_STRING([--with-ipc@<:@=IPCTYPE@:>@],
diff --git a/packages/fakeroot/fakeroot-native_1.2.13.bb b/packages/fakeroot/fakeroot-native_1.2.13.bb
deleted file mode 100644
index 9d48d65229..0000000000
--- a/packages/fakeroot/fakeroot-native_1.2.13.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-SECTION = "base"
-PR = "r0"
-require fakeroot_${PV}.bb
-inherit native
-RDEPENDS="util-linux-native"
-
-SRC_URI += "file://fix-prefix.patch;patch=1"
-S = "${WORKDIR}/fakeroot-${PV}"
-
-EXTRA_OECONF = " --program-prefix="
-
-# Compatability for the rare systems not using or having SYSV
-python () {
-    if bb.data.getVar('HOST_NONSYSV', d, True) and bb.data.getVar('HOST_NONSYSV', d, True) != '0':
-        bb.data.setVar('EXTRA_OECONF', ' --with-ipc=tcp --program-prefix= ', d)
-}
-
-do_stage_append () {
-    oe_libinstall -so libfakeroot ${STAGING_LIBDIR}/libfakeroot/
-}
diff --git a/packages/fakeroot/fakeroot-native_1.7.1.bb b/packages/fakeroot/fakeroot-native_1.7.1.bb
index 8b3d2a1590..8a54d6497c 100644
--- a/packages/fakeroot/fakeroot-native_1.7.1.bb
+++ b/packages/fakeroot/fakeroot-native_1.7.1.bb
@@ -1,7 +1,6 @@
-SECTION = "base"
 require fakeroot_${PV}.bb
 inherit native
-RDEPENDS="util-linux-native"
+RDEPENDS = "util-linux-native"
 
 SRC_URI += "file://fix-prefix.patch;patch=1 "
 S = "${WORKDIR}/fakeroot-${PV}"
@@ -17,4 +16,3 @@ python () {
 do_stage_append () {
     oe_libinstall -so libfakeroot ${STAGING_LIBDIR}/libfakeroot/
 }
-
diff --git a/packages/fakeroot/fakeroot-native_1.8.3.bb b/packages/fakeroot/fakeroot-native_1.9.6.bb
index 8b3d2a1590..77d6f58651 100644
--- a/packages/fakeroot/fakeroot-native_1.8.3.bb
+++ b/packages/fakeroot/fakeroot-native_1.9.6.bb
@@ -1,11 +1,12 @@
-SECTION = "base"
 require fakeroot_${PV}.bb
-inherit native
+
 RDEPENDS="util-linux-native"
 
 SRC_URI += "file://fix-prefix.patch;patch=1 "
 S = "${WORKDIR}/fakeroot-${PV}"
 
+inherit native
+
 EXTRA_OECONF = " --program-prefix="
 
 # Compatability for the rare systems not using or having SYSV
diff --git a/packages/fakeroot/fakeroot_1.2.13.bb b/packages/fakeroot/fakeroot_1.2.13.bb
deleted file mode 100644
index e29cf162b4..0000000000
--- a/packages/fakeroot/fakeroot_1.2.13.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "Gives a fake root environment"
-HOMEPAGE = "http://joostje.op.het.net/fakeroot/index.html"
-SECTION = "base"
-LICENSE = "GPL"
-# fakeroot needs getopt which is provided by the util-linux package
-RDEPENDS = "util-linux"
-PR = "r1"
-
-SRC_URI = "http://openzaurus.org/mirror/fakeroot_${PV}.tar.gz"
-
-inherit autotools
-
-do_stage() {
-        install -d ${STAGING_INCDIR}/fakeroot
-        install -m 644 *.h ${STAGING_INCDIR}/fakeroot
-        autotools_stage_all
-}
diff --git a/packages/fakeroot/fakeroot_1.7.1.bb b/packages/fakeroot/fakeroot_1.7.1.bb
index 803b5f3ff4..ea3806d2f5 100644
--- a/packages/fakeroot/fakeroot_1.7.1.bb
+++ b/packages/fakeroot/fakeroot_1.7.1.bb
@@ -5,8 +5,10 @@ LICENSE = "GPL"
 RDEPENDS = "util-linux"
 PR = "r2"
 
-SRC_URI = "ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_${PV}.tar.gz \
-           file://work-with-older-libtool.patch;patch=1"
+SRC_URI = "\
+  ftp://ftp.gentoo.mesh-solutions.com/mirrors/gentoo/distfiles/fakeroot_1.7.1.tar.gz \
+  file://work-with-older-libtool.patch;patch=1 \
+"
 
 inherit autotools
 
diff --git a/packages/fakeroot/fakeroot_1.8.3.bb b/packages/fakeroot/fakeroot_1.9.6.bb
index ef4d1ba55c..aaf696d79d 100644
--- a/packages/fakeroot/fakeroot_1.8.3.bb
+++ b/packages/fakeroot/fakeroot_1.9.6.bb
@@ -1,11 +1,12 @@
 DESCRIPTION = "Gives a fake root environment"
+HOMEPAGE = "http://fakeroot.alioth.debian.org/"
 SECTION = "base"
 LICENSE = "GPL"
 # fakeroot needs getopt which is provided by the util-linux package
 RDEPENDS = "util-linux"
 PR = "r1"
 
-SRC_URI = "ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_${PV}.tar.gz \
+SRC_URI = "${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.tar.gz \
            file://configure-libtool.patch;patch=1"
 	    
 inherit autotools
diff --git a/packages/fakeroot/fakeroot-1.8.3/configure-libtool.patch b/packages/fakeroot/files/configure-libtool.patch
index 8830328eb5..8830328eb5 100644
--- a/packages/fakeroot/fakeroot-1.8.3/configure-libtool.patch
+++ b/packages/fakeroot/files/configure-libtool.patch