Remove unused patches. Fix repoman complains.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

9 files changed, 27 insertions, 723 deletions

diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index 33a26b9ddd36..5daa003ac24e 100644
--- a/app-arch/rpm/ChangeLog
+++ b/app-arch/rpm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/rpm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.103 2009/09/05 13:26:49 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.104 2009/09/06 19:27:42 idl0r Exp $
+
+  06 Sep 2009; Christian Ruppert <idl0r@gentoo.org>
+  -files/rpm-4.0.4-gentoo-uclibc.patch, -files/rpm-4.0.4-sandbox.patch,
+  rpm-4.4.6-r6.ebuild, rpm-4.4.7-r1.ebuild, rpm-4.4.7-r2.ebuild,
+  rpm-4.4.7-r4.ebuild, -files/rpm-4.4.7-config.rpath.patch:
+  Remove unused patches. Fix repoman complains.
 
   05 Sep 2009; Torsten Veller <tove@gentoo.org> rpm-4.4.6-r6.ebuild,
   rpm-4.4.7-r1.ebuild, rpm-4.4.7-r2.ebuild, rpm-4.4.7-r4.ebuild,
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index 55d28dacdc17..4349bcc04d4f 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,15 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX rpm-4.0.4-gentoo-uclibc.patch 1418 RMD160 b2b89f401c6f6f3d275e4666312555a3ad6ffbeb SHA1 673ea952b741a140f9f20a24282589ef4f2a1198 SHA256 8671a390a1e1673e0415f8a4da96d0b8234d870d02d4e28b28d735dc35e49cf7
-AUX rpm-4.0.4-sandbox.patch 938 RMD160 95dad47ac3b18213a271657db643ca3188c2d208 SHA1 96ae471af884a0b4abbe6cbdcc55b62e58683bd6 SHA256 d10e4674993bbfd3294837639a3cfbd2cda443fad3486ef15ee695c2f0f80651
 AUX rpm-4.4.6-autotools.patch 660 RMD160 63155d3737ffdf9927b1763ddf068c5964e168c9 SHA1 70dd2346df0e5d95ec4a06587485381b48d52b81 SHA256 dd4828899e760358b702d0c2ca75e781619f7b65140cf2cc5600ea687a085569
 AUX rpm-4.4.6-buffer-overflow.patch 1952 RMD160 468c71731ec6893de165b4e1047f85f5b240f2f7 SHA1 dc41417f4064eb9476de9ef51e616042e55e5f73 SHA256 6ae715632dabd6cc6c24a92312ac22c1bd57235ff2f027f68943df68dcfc957b
 AUX rpm-4.4.6-neon-0.28.patch 2393 RMD160 7cc24ef31e46682bffa57721e18299c4a9b74637 SHA1 14dd947d44150caa89b58991ed7dbdd358152c3e SHA256 e7b9c177a4ff8027f731ae54b2d6a836ea7be3e6eca92b704dbe30b33b8166c4
 AUX rpm-4.4.6-qa-fix-undefined.patch 553 RMD160 647b19a10c86850873d65b5a65c2530d5a44ed54 SHA1 75e1bb924ed57f3b0ef7776551c3d782a9121904 SHA256 1c72bb60b4c9af6b0c366debe7276f948308e777ff6fef090bb778d9bc724a06
 AUX rpm-4.4.6-stupidness.patch 4992 RMD160 d8f0e831599a72e6224e19a568fffadd999ebc4a SHA1 317f19c9f181ca2cd40d832536c458884bb5b279 SHA256 84af6ddab50982e15df90d2c7895ecd0f0b568caa6cd0af57ce33e1af784b4a7
 AUX rpm-4.4.6-with-sqlite.patch 517 RMD160 0af724f63b528aabd05f4bcf2d4c4830ebdf98d2 SHA1 0a22207c6bd4114aef4cc9cdca840e996fcf0297 SHA256 c84020fd6402c4d9bfddb554f251b4ac13c6ca151689070a7471e66c8f7bb6ac
-AUX rpm-4.4.7-config.rpath.patch 16926 RMD160 50bc34ed9768e9dd4210e32e4ecb154b7508cb83 SHA1 4f356f76c88fb2b8b2a2e902e389053c0ed55fcb SHA256 528479c7dbc0096040342058466d5739acebec0f390807d7c5113bc72993e44d
 AUX rpm-4.4.7-qa-fix-undefined.patch 776 RMD160 895ab185d15c94890ed8f2a34bf4f6b54c8bfb61 SHA1 d16d4a491625d304e96ba85fda982011c9d6d946 SHA256 87a444e00328cd6d78391acdf58ac3ab57fa161241c944df173ac14b2cb025a4
 AUX rpm-4.4.7-qa-implicit-function-to-pointer.patch 604 RMD160 f87086379c28fa878c94dbcd6855af82ee852caf SHA1 61079e3109a41c639015f312603ea43ae49a5bb7 SHA256 a8f12898b8ddba5d7dcc70c1128a2b27dd729c7fe2247450cca068bfa68f1d65
 AUX rpm-4.4.7-stupidness.patch 5268 RMD160 631f1bf3dc4553e27dec4a901fa84e17ffc7c7c9 SHA1 e957a9a549fa1ec52b449b1e8fc3ea14af7b7a09 SHA256 e563657e648e9b5ecfc0a653d7515f93db7785ec6867c81591663213965c0850
@@ -18,19 +12,12 @@ DIST rpm-4.4.7.tar.gz 14125623 RMD160 9002eb0fe1d680d8bff447d6918f9726c9a4e34c S
 DIST rpm-5.0.0.tar.gz 8990824 RMD160 a10793c9a776dd1478b0675914a71f46eb5e2999 SHA1 df5fbaf2e729a0d3ea101a17c86b6a7fc3d00a05 SHA256 d3424770f3db6c79dda76e01155134065f28c046ea8a18a173e74070ec6e3b17
 DIST rpm-5.0.3.tar.gz 9337992 RMD160 d26cdfef5a3bf18442e1825d810afb32bcfa2161 SHA1 d3461710de17a8f7dc3e49371d7edf620b10c27e SHA256 224d15c52511b453b2a63e6447b279a622c03af5fe373a67757979f4d00cd042
 DIST rpm-5.1.6.tar.gz 8305612 RMD160 88645f4a7c2e25fffaa5628d267e86eaac137b35 SHA1 3ab7d1edf333102c748c22e9144ab90d9719ab0b SHA256 82ee1a737bd77ddd90b0fe1e9a2f478c46033e451fac3881d00ab9e166951799
-EBUILD rpm-4.4.6-r6.ebuild 3108 RMD160 41acc22297536b94f51f23e5eefcbc8177c13984 SHA1 d8bc8271eff8dc28d73a09d189b90080523c7144 SHA256 ef174d71fb7bada362741f324825e74f4ba6a85e81127f0cdd3aa4782b288b39
-EBUILD rpm-4.4.7-r1.ebuild 2810 RMD160 a3cd1b85edd3279de7ddbdb8ae27ea763f5b9aa8 SHA1 5748d339820145e8fe7acca2ebcf04299c9711de SHA256 1e978909b624bc362e8dcdecb222fa085f6ee8180698abe665550fc711a957dd
-EBUILD rpm-4.4.7-r2.ebuild 3005 RMD160 f9e07cc96f0e3685df31db96f9e8bc5f991eac0f SHA1 e0307982c32286daccd694f0f62f0e37bb2636ee SHA256 feedf2f08a615fe939aacc5d6e7b4264618bfaf30ce43f5b60ae14db85d2d8c2
-EBUILD rpm-4.4.7-r4.ebuild 3065 RMD160 d96411042a0e7b27802fdde71879ab77f1379f8b SHA1 5eaae8a2d6fe76b162ffb73e95d1f198dab72720 SHA256 fc1b9d0b4975a375ce0a8680bfe01f67e3cfb7cb7d23bb9c25221f2c58d20223
+EBUILD rpm-4.4.6-r6.ebuild 3114 RMD160 6b8bc05c1ccb71dd62da4898813f26165cb16966 SHA1 5de1cd945dfdee36bed6ed729b069967a6e4c395 SHA256 ffdd7b4a7d43501ff7ed6bbf03cb785cd4084b2864a49c07e9fa619c8fd5a72c
+EBUILD rpm-4.4.7-r1.ebuild 2771 RMD160 13b5d51d0f6ef0956156e05cd129f672d3b468bb SHA1 652d476d9949e542579bdc2169c3321696f9deb6 SHA256 1ad3a80d20b6808f5555e8dfbbf9c7af38077958a91d4a663bdfda53090397de
+EBUILD rpm-4.4.7-r2.ebuild 3012 RMD160 92749f8a200cbb41c46db769b839e2c1636cdca7 SHA1 75b4d1a2c17f6a43ed84ed9b2a64ec876d8baf73 SHA256 968bbc1d4b9fbc879d0c572e235cb9a5ff95068b0ce3f18ce91fff084f298d2a
+EBUILD rpm-4.4.7-r4.ebuild 3072 RMD160 707199dea3fbe0e39d93d400e68b5939f45aab2b SHA1 7826f87d63c96a48b445c56322a73309339ceb9e SHA256 4ac5246429eab579ee5cc690aedd58978a87747ed0061a6e44b7a0f5e7c31739
 EBUILD rpm-5.0.0.ebuild 2756 RMD160 74d809bdf7eee2be80e568348511a2850792da3e SHA1 149e41110cf0cc271a1b297d87c08e891b5920cb SHA256 a906707d9855d9ca0e0315abe0a1892f5fcc588d7760cdfb2bf9d42853edf0a7
 EBUILD rpm-5.0.3.ebuild 2766 RMD160 030231432e16ae8262b0eb45d339ffb39e50bb4d SHA1 2de7470b6348ca90a0e0972cdaa9432e7ade864a SHA256 d7c5ad9c7c845acd70a91a196afb3d4bcc1976cc638d726b2cdd64b627c1a428
 EBUILD rpm-5.1.6.ebuild 2978 RMD160 6c446517d8fa25286430cfeb3a2c3d7cee2af4ce SHA1 66e737e881b4e26ef8583a27d326b81f5c59b304 SHA256 a9b6850f44ea8728bccfa1488db9b8e4c058acb4779208f9af9ae97bca38aed1
-MISC ChangeLog 15774 RMD160 f0749f54a1c2e5223c54fc2833fe9fb18f6fdddc SHA1 d5369ec91bd1b00253c6039d673166fc990917cb SHA256 59bd4d953dff85bbce97e54e202fe3ea646d453e75f186fb84373dab7d1f634d
+MISC ChangeLog 16073 RMD160 95041125f61995a393fc9203095054c1479f6c96 SHA1 14733fe9ffc4a6dde61720039b9783386c5e6004 SHA256 ee01fb98d1d96fe73700d3893f0533c42c9b6638b10430fc2c5c0eb5624fa1f8
 MISC metadata.xml 396 RMD160 5370081b5c621536cf1043f44c0b6d45051dc895 SHA1 b5dbf8427940398fef39ed6ecf44fc40ab79a261 SHA256 c202b9189a05829f811129efd19db92cdc3ea04161472e4bb1011be344b4935d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqiZyAACgkQV3J2n04Eauyp+QCeJEaDpf3P6vmoJkA1IlZzdBXC
-9PUAoLmaihgfAhwvxS+WruKPxDXzVtMY
-=CxsY
------END PGP SIGNATURE-----
diff --git a/app-arch/rpm/files/rpm-4.0.4-gentoo-uclibc.patch b/app-arch/rpm/files/rpm-4.0.4-gentoo-uclibc.patch
deleted file mode 100644
index 4b94d1224a6d..000000000000
--- a/app-arch/rpm/files/rpm-4.0.4-gentoo-uclibc.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- rpm-4.0.4/installplatform.uclibc~	Wed Dec  1 18:17:32 2004
-+++ rpm-4.0.4/installplatform	Wed Dec  1 18:27:13 2004
-@@ -92,6 +92,12 @@
-     ;;
-   esac
- 
-+  case $OS in
-+  *uclibc)
-+    UCLIBCSED='-e s,^@uclibc@,,'
-+    ;;
-+  esac
-+
-   cat $PLATFORM \
-   | sed -e "s,@RPMRC_OPTFLAGS@,$RPMRC_OPTFLAGS," \
- 	-e "s,@RPMRC_ARCH@,$base_arch," \
-@@ -102,6 +108,7 @@
- 	-e '/FLAGS:-/!s,\${,%{_,' \
- 	$MULTILIBSED \
- 	$VENDORSED \
-+	$UCLIBCSED \
-   | grep -v '^@' \
-   > ${PPD}/macros
- 
---- rpm-4.0.4/platform.in.uclibc~	Wed Dec  1 18:27:24 2004
-+++ rpm-4.0.4/platform.in	Wed Dec  1 18:34:19 2004
-@@ -310,3 +310,24 @@
- @gentoo@	--mandir=%{_mandir} \\\
- @gentoo@	--infodir=%{_infodir}
- #
-+@uclibc@# uClibc specific settings
-+@uclibc@#
-+@uclibc@# busybox settings
-+@uclibc@%__chown_Rhf %{__chown} -Rh
-+@uclibc@%__chgrp_Rhf %{__chgrp} -R
-+@uclibc@%_fixperms %{__chmod} -R a+rX,g-w,o-w
-+@uclibc@
-+@uclibc@# overwrite usage of getconf (only in glibc)
-+@uclibc@%_smp_mflags		%(echo "-j2")
-+@uclibc@#%_vendor		uclibc
-+@uclibc@#%_os			linux
-+@uclibc@#%_host			%{_arch}-%{_host_os}
-+@uclibc@#%_host_os		linux-uclibc
-+@uclibc@%_gnu			-uclibc
-+@uclibc@#%_target_platform	%{_target_cpu}-%{_vendor}-%{_target_os}%{?_gnu}
-+@uclibc@
-+@uclibc@%_excludedocs 1
-+@uclibc@
-+@uclibc@#%_build_name_fmt	%%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}uc.%%{ARCH}.rpm
-+@uclibc@#%_repackage_name_fmt	%%{NAME}-%%{VERSION}-%%{RELEASE}uc.%%{ARCH}.rpm
-+@uclibc@
diff --git a/app-arch/rpm/files/rpm-4.0.4-sandbox.patch b/app-arch/rpm/files/rpm-4.0.4-sandbox.patch
deleted file mode 100644
index 76795451c3a8..000000000000
--- a/app-arch/rpm/files/rpm-4.0.4-sandbox.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- rpm-4.0.4/autodeps/linux.req.mps	2005-06-10 13:44:36 +0200
-+++ rpm-4.0.4/autodeps/linux.req	2005-06-10 13:46:24 +0200
-@@ -46,7 +46,7 @@
-     lib64=`if file -L $f 2>/dev/null | \
- 	grep "ELF 64-bit" >/dev/null; then echo "$mark64"; fi`
-     ldd $f | awk '/=>/ {
--	if ($1 !~ /libNoVersion.so/ && $1 !~ /4[um]lib.so/ && $1 !~ /libredhat-kernel.so/) {
-+	if ($1 !~ /libNoVersion.so/ && $1 !~ /4[um]lib.so/ && $1 !~ /libredhat-kernel.so/ && $1 !~ /libsandbox.so/) {
- 	    gsub(/'\''"/,"\\&",$1);
- 	    printf "%s'$lib64'\n", $1
- 	}
-@@ -60,7 +60,7 @@
-     lib64=`if file -L $f 2>/dev/null | \
- 	grep "ELF 64-bit" >/dev/null; then echo "$mark64"; fi`
-     ldd $f | awk '/=>/ {
--	if ($1 !~ /libNoVersion.so/ && $1 !~ /4[um]lib.so/ && $1 !~ /libredhat-kernel.so/) {
-+	if ($1 !~ /libNoVersion.so/ && $1 !~ /4[um]lib.so/ && $1 !~ /libredhat-kernel.so/ && $1 !~ /libsandbox.so/) {
- 	    gsub(/'\''"/,"\\&",$1);
- 	    printf "%s'$lib64'\n", $1
- 	}
diff --git a/app-arch/rpm/files/rpm-4.4.7-config.rpath.patch b/app-arch/rpm/files/rpm-4.4.7-config.rpath.patch
deleted file mode 100644
index fb86b369cca5..000000000000
--- a/app-arch/rpm/files/rpm-4.4.7-config.rpath.patch
+++ /dev/null
@@ -1,617 +0,0 @@
---- a/rpm-4.4.7/config.rpath	1970-01-01 01:00:00.000000000 +0100
-+++ b/rpm-4.4.7/config.rpath	2007-01-15 21:50:24.004178000 +0100
-@@ -0,0 +1,614 @@
-+#! /bin/sh
-+# Output a system dependent set of variables, describing how to set the
-+# run time search path of shared libraries in an executable.
-+#
-+#   Copyright 1996-2006 Free Software Foundation, Inc.
-+#   Taken from GNU libtool, 2001
-+#   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-+#
-+#   This file is free software; the Free Software Foundation gives
-+#   unlimited permission to copy and/or distribute it, with or without
-+#   modifications, as long as this notice is preserved.
-+#
-+# The first argument passed to this file is the canonical host specification,
-+#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-+# or
-+#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-+# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
-+# should be set by the caller.
-+#
-+# The set of defined variables is at the end of this script.
-+
-+# Known limitations:
-+# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
-+#   than 256 bytes, otherwise the compiler driver will dump core. The only
-+#   known workaround is to choose shorter directory names for the build
-+#   directory and/or the installation directory.
-+
-+# All known linkers require a `.a' archive for static linking (except MSVC,
-+# which needs '.lib').
-+libext=a
-+shrext=.so
-+
-+host="$1"
-+host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-+host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-+host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+
-+# Code taken from libtool.m4's _LT_CC_BASENAME.
-+
-+for cc_temp in $CC""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
-+
-+# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
-+
-+wl=
-+if test "$GCC" = yes; then
-+  wl='-Wl,'
-+else
-+  case "$host_os" in
-+    aix*)
-+      wl='-Wl,'
-+      ;;
-+    darwin*)
-+      case $cc_basename in
-+        xlc*)
-+          wl='-Wl,'
-+          ;;
-+      esac
-+      ;;
-+    mingw* | pw32* | os2*)
-+      ;;
-+    hpux9* | hpux10* | hpux11*)
-+      wl='-Wl,'
-+      ;;
-+    irix5* | irix6* | nonstopux*)
-+      wl='-Wl,'
-+      ;;
-+    newsos6)
-+      ;;
-+    linux*)
-+      case $cc_basename in
-+        icc* | ecc*)
-+          wl='-Wl,'
-+          ;;
-+        pgcc | pgf77 | pgf90)
-+          wl='-Wl,'
-+          ;;
-+        ccc*)
-+          wl='-Wl,'
-+          ;;
-+        como)
-+          wl='-lopt='
-+          ;;
-+        *)
-+          case `$CC -V 2>&1 | sed 5q` in
-+            *Sun\ C*)
-+              wl='-Wl,'
-+              ;;
-+          esac
-+          ;;
-+      esac
-+      ;;
-+    osf3* | osf4* | osf5*)
-+      wl='-Wl,'
-+      ;;
-+    sco3.2v5*)
-+      ;;
-+    solaris*)
-+      wl='-Wl,'
-+      ;;
-+    sunos4*)
-+      wl='-Qoption ld '
-+      ;;
-+    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+      wl='-Wl,'
-+      ;;
-+    sysv4*MP*)
-+      ;;
-+    unicos*)
-+      wl='-Wl,'
-+      ;;
-+    uts4*)
-+      ;;
-+  esac
-+fi
-+
-+# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
-+
-+hardcode_libdir_flag_spec=
-+hardcode_libdir_separator=
-+hardcode_direct=no
-+hardcode_minus_L=no
-+
-+case "$host_os" in
-+  cygwin* | mingw* | pw32*)
-+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-+    # When not using gcc, we currently assume that we are using
-+    # Microsoft Visual C++.
-+    if test "$GCC" != yes; then
-+      with_gnu_ld=no
-+    fi
-+    ;;
-+  interix*)
-+    # we just hope/assume this is gcc and not c89 (= MSVC++)
-+    with_gnu_ld=yes
-+    ;;
-+  openbsd*)
-+    with_gnu_ld=no
-+    ;;
-+esac
-+
-+ld_shlibs=yes
-+if test "$with_gnu_ld" = yes; then
-+  # Set some defaults for GNU ld with shared library support. These
-+  # are reset later if shared libraries are not supported. Putting them
-+  # here allows them to be overridden if necessary.
-+  # Unlike libtool, we use -rpath here, not --rpath, since the documented
-+  # option of GNU ld is called -rpath, not --rpath.
-+  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+  case "$host_os" in
-+    aix3* | aix4* | aix5*)
-+      # On AIX/PPC, the GNU linker is very broken
-+      if test "$host_cpu" != ia64; then
-+        ld_shlibs=no
-+      fi
-+      ;;
-+    amigaos*)
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_minus_L=yes
-+      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-+      # that the semantics of dynamic libraries on AmigaOS, at least up
-+      # to version 4, is to share data among multiple programs linked
-+      # with the same dynamic library.  Since this doesn't match the
-+      # behavior of shared libraries on other platforms, we cannot use
-+      # them.
-+      ld_shlibs=no
-+      ;;
-+    beos*)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+        :
-+      else
-+        ld_shlibs=no
-+      fi
-+      ;;
-+    cygwin* | mingw* | pw32*)
-+      # hardcode_libdir_flag_spec is actually meaningless, as there is
-+      # no search path for DLLs.
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-+        :
-+      else
-+        ld_shlibs=no
-+      fi
-+      ;;
-+    interix3*)
-+      hardcode_direct=no
-+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+      ;;
-+    linux*)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+        :
-+      else
-+        ld_shlibs=no
-+      fi
-+      ;;
-+    netbsd*)
-+      ;;
-+    solaris*)
-+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-+        ld_shlibs=no
-+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+        :
-+      else
-+        ld_shlibs=no
-+      fi
-+      ;;
-+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-+      case `$LD -v 2>&1` in
-+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-+          ld_shlibs=no
-+          ;;
-+        *)
-+          if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+            hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-+          else
-+            ld_shlibs=no
-+          fi
-+          ;;
-+      esac
-+      ;;
-+    sunos4*)
-+      hardcode_direct=yes
-+      ;;
-+    *)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+        :
-+      else
-+        ld_shlibs=no
-+      fi
-+      ;;
-+  esac
-+  if test "$ld_shlibs" = no; then
-+    hardcode_libdir_flag_spec=
-+  fi
-+else
-+  case "$host_os" in
-+    aix3*)
-+      # Note: this linker hardcodes the directories in LIBPATH if there
-+      # are no directories specified by -L.
-+      hardcode_minus_L=yes
-+      if test "$GCC" = yes; then
-+        # Neither direct hardcoding nor static linking is supported with a
-+        # broken collect2.
-+        hardcode_direct=unsupported
-+      fi
-+      ;;
-+    aix4* | aix5*)
-+      if test "$host_cpu" = ia64; then
-+        # On IA64, the linker does run time linking by default, so we don't
-+        # have to do anything special.
-+        aix_use_runtimelinking=no
-+      else
-+        aix_use_runtimelinking=no
-+        # Test if we are trying to use run time linking or normal
-+        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-+        # need to do runtime linking.
-+        case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-+          for ld_flag in $LDFLAGS; do
-+            if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-+              aix_use_runtimelinking=yes
-+              break
-+            fi
-+          done
-+          ;;
-+        esac
-+      fi
-+      hardcode_direct=yes
-+      hardcode_libdir_separator=':'
-+      if test "$GCC" = yes; then
-+        case $host_os in aix4.[012]|aix4.[012].*)
-+          collect2name=`${CC} -print-prog-name=collect2`
-+          if test -f "$collect2name" && \
-+            strings "$collect2name" | grep resolve_lib_name >/dev/null
-+          then
-+            # We have reworked collect2
-+            hardcode_direct=yes
-+          else
-+            # We have old collect2
-+            hardcode_direct=unsupported
-+            hardcode_minus_L=yes
-+            hardcode_libdir_flag_spec='-L$libdir'
-+            hardcode_libdir_separator=
-+          fi
-+          ;;
-+        esac
-+      fi
-+      # Begin _LT_AC_SYS_LIBPATH_AIX.
-+      echo 'int main () { return 0; }' > conftest.c
-+      ${CC} ${LDFLAGS} conftest.c -o conftest
-+      aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`
-+      if test -z "$aix_libpath"; then
-+        aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`
-+      fi
-+      if test -z "$aix_libpath"; then
-+        aix_libpath="/usr/lib:/lib"
-+      fi
-+      rm -f conftest.c conftest
-+      # End _LT_AC_SYS_LIBPATH_AIX.
-+      if test "$aix_use_runtimelinking" = yes; then
-+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-+      else
-+        if test "$host_cpu" = ia64; then
-+          hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-+        else
-+          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-+        fi
-+      fi
-+      ;;
-+    amigaos*)
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_minus_L=yes
-+      # see comment about different semantics on the GNU ld section
-+      ld_shlibs=no
-+      ;;
-+    bsdi[45]*)
-+      ;;
-+    cygwin* | mingw* | pw32*)
-+      # When not using gcc, we currently assume that we are using
-+      # Microsoft Visual C++.
-+      # hardcode_libdir_flag_spec is actually meaningless, as there is
-+      # no search path for DLLs.
-+      hardcode_libdir_flag_spec=' '
-+      libext=lib
-+      ;;
-+    darwin* | rhapsody*)
-+      hardcode_direct=no
-+      if test "$GCC" = yes ; then
-+        :
-+      else
-+        case $cc_basename in
-+          xlc*)
-+            ;;
-+          *)
-+            ld_shlibs=no
-+            ;;
-+        esac
-+      fi
-+      ;;
-+    dgux*)
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      ;;
-+    freebsd1*)
-+      ld_shlibs=no
-+      ;;
-+    freebsd2.2*)
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      hardcode_direct=yes
-+      ;;
-+    freebsd2*)
-+      hardcode_direct=yes
-+      hardcode_minus_L=yes
-+      ;;
-+    freebsd* | kfreebsd*-gnu | dragonfly*)
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      hardcode_direct=yes
-+      ;;
-+    hpux9*)
-+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+      hardcode_libdir_separator=:
-+      hardcode_direct=yes
-+      # hardcode_minus_L: Not really in the search PATH,
-+      # but as the default location of the library.
-+      hardcode_minus_L=yes
-+      ;;
-+    hpux10*)
-+      if test "$with_gnu_ld" = no; then
-+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+        hardcode_libdir_separator=:
-+        hardcode_direct=yes
-+        # hardcode_minus_L: Not really in the search PATH,
-+        # but as the default location of the library.
-+        hardcode_minus_L=yes
-+      fi
-+      ;;
-+    hpux11*)
-+      if test "$with_gnu_ld" = no; then
-+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+        hardcode_libdir_separator=:
-+        case $host_cpu in
-+          hppa*64*|ia64*)
-+            hardcode_direct=no
-+            ;;
-+          *)
-+            hardcode_direct=yes
-+            # hardcode_minus_L: Not really in the search PATH,
-+            # but as the default location of the library.
-+            hardcode_minus_L=yes
-+            ;;
-+        esac
-+      fi
-+      ;;
-+    irix5* | irix6* | nonstopux*)
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+      hardcode_libdir_separator=:
-+      ;;
-+    netbsd*)
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      hardcode_direct=yes
-+      ;;
-+    newsos6)
-+      hardcode_direct=yes
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+      hardcode_libdir_separator=:
-+      ;;
-+    openbsd*)
-+      hardcode_direct=yes
-+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+      else
-+        case "$host_os" in
-+          openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+            hardcode_libdir_flag_spec='-R$libdir'
-+            ;;
-+          *)
-+            hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+            ;;
-+        esac
-+      fi
-+      ;;
-+    os2*)
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_minus_L=yes
-+      ;;
-+    osf3*)
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+      hardcode_libdir_separator=:
-+      ;;
-+    osf4* | osf5*)
-+      if test "$GCC" = yes; then
-+        hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+      else
-+        # Both cc and cxx compiler support -rpath directly
-+        hardcode_libdir_flag_spec='-rpath $libdir'
-+      fi
-+      hardcode_libdir_separator=:
-+      ;;
-+    solaris*)
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      ;;
-+    sunos4*)
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_direct=yes
-+      hardcode_minus_L=yes
-+      ;;
-+    sysv4)
-+      case $host_vendor in
-+        sni)
-+          hardcode_direct=yes # is this really true???
-+          ;;
-+        siemens)
-+          hardcode_direct=no
-+          ;;
-+        motorola)
-+          hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-+          ;;
-+      esac
-+      ;;
-+    sysv4.3*)
-+      ;;
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+        ld_shlibs=yes
-+      fi
-+      ;;
-+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
-+      ;;
-+    sysv5* | sco3.2v5* | sco5v6*)
-+      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-+      hardcode_libdir_separator=':'
-+      ;;
-+    uts4*)
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      ;;
-+    *)
-+      ld_shlibs=no
-+      ;;
-+  esac
-+fi
-+
-+# Check dynamic linker characteristics
-+# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
-+libname_spec='lib$name'
-+case "$host_os" in
-+  aix3*)
-+    ;;
-+  aix4* | aix5*)
-+    ;;
-+  amigaos*)
-+    ;;
-+  beos*)
-+    ;;
-+  bsdi[45]*)
-+    ;;
-+  cygwin* | mingw* | pw32*)
-+    shrext=.dll
-+    ;;
-+  darwin* | rhapsody*)
-+    shrext=.dylib
-+    ;;
-+  dgux*)
-+    ;;
-+  freebsd1*)
-+    ;;
-+  kfreebsd*-gnu)
-+    ;;
-+  freebsd* | dragonfly*)
-+    ;;
-+  gnu*)
-+    ;;
-+  hpux9* | hpux10* | hpux11*)
-+    case $host_cpu in
-+      ia64*)
-+        shrext=.so
-+        ;;
-+      hppa*64*)
-+        shrext=.sl
-+        ;;
-+      *)
-+        shrext=.sl
-+        ;;
-+    esac
-+    ;;
-+  interix3*)
-+    ;;
-+  irix5* | irix6* | nonstopux*)
-+    case "$host_os" in
-+      irix5* | nonstopux*)
-+        libsuff= shlibsuff=
-+        ;;
-+      *)
-+        case $LD in
-+          *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
-+          *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
-+          *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
-+          *) libsuff= shlibsuff= ;;
-+        esac
-+        ;;
-+    esac
-+    ;;
-+  linux*oldld* | linux*aout* | linux*coff*)
-+    ;;
-+  linux*)
-+    ;;
-+  knetbsd*-gnu)
-+    ;;
-+  netbsd*)
-+    ;;
-+  newsos6)
-+    ;;
-+  nto-qnx*)
-+    ;;
-+  openbsd*)
-+    ;;
-+  os2*)
-+    libname_spec='$name'
-+    shrext=.dll
-+    ;;
-+  osf3* | osf4* | osf5*)
-+    ;;
-+  solaris*)
-+    ;;
-+  sunos4*)
-+    ;;
-+  sysv4 | sysv4.3*)
-+    ;;
-+  sysv4*MP*)
-+    ;;
-+  sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+    ;;
-+  uts4*)
-+    ;;
-+esac
-+
-+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-+escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
-+shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
-+escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
-+
-+LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
-+
-+# How to pass a linker flag through the compiler.
-+wl="$escaped_wl"
-+
-+# Static library suffix (normally "a").
-+libext="$libext"
-+
-+# Shared library suffix (normally "so").
-+shlibext="$shlibext"
-+
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
-+
-+# Whether we need a single -rpath flag with a separated argument.
-+hardcode_libdir_separator="$hardcode_libdir_separator"
-+
-+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_direct="$hardcode_direct"
-+
-+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_minus_L="$hardcode_minus_L"
-+
-+EOF
diff --git a/app-arch/rpm/rpm-4.4.6-r6.ebuild b/app-arch/rpm/rpm-4.4.6-r6.ebuild
index 966a912eb106..b902ce7b2eb2 100644
--- a/app-arch/rpm/rpm-4.4.6-r6.ebuild
+++ b/app-arch/rpm/rpm-4.4.6-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.4.6-r6.ebuild,v 1.9 2009/09/05 13:26:49 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.4.6-r6.ebuild,v 1.10 2009/09/06 19:27:42 idl0r Exp $
 
 inherit eutils autotools distutils perl-module flag-o-matic
 
@@ -98,10 +98,10 @@ src_install() {
 pkg_postinst() {
 	if [[ -f ${ROOT}/var/lib/rpm/Packages ]] ; then
 		einfo "RPM database found... Rebuilding database (may take a while)..."
-		"${ROOT}"/usr/bin/rpm --rebuilddb --root=${ROOT}
+		"${ROOT}"/usr/bin/rpm --rebuilddb --root="${ROOT}"
 	else
 		einfo "No RPM database found... Creating database..."
-		"${ROOT}"/usr/bin/rpm --initdb --root=${ROOT}
+		"${ROOT}"/usr/bin/rpm --initdb --root="${ROOT}"
 	fi
 
 	distutils_pkg_postinst
diff --git a/app-arch/rpm/rpm-4.4.7-r1.ebuild b/app-arch/rpm/rpm-4.4.7-r1.ebuild
index c3bfc7177433..90d090d0b177 100644
--- a/app-arch/rpm/rpm-4.4.7-r1.ebuild
+++ b/app-arch/rpm/rpm-4.4.7-r1.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.4.7-r1.ebuild,v 1.3 2009/09/05 13:26:49 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.4.7-r1.ebuild,v 1.4 2009/09/06 19:27:42 idl0r Exp $
 
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
 inherit eutils autotools distutils perl-module
 
 DESCRIPTION="Red Hat Package Management Utils"
@@ -88,12 +86,12 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ -f ${ROOT}/var/lib/rpm/Packages ]] ; then
+	if [[ -f "${ROOT}"/var/lib/rpm/Packages ]] ; then
 		einfo "RPM database found... Rebuilding database (may take a while)..."
-		"${ROOT}"/usr/bin/rpm --rebuilddb --root=${ROOT}
+		"${ROOT}"/usr/bin/rpm --rebuilddb --root="${ROOT}"
 	else
 		einfo "No RPM database found... Creating database..."
-		"${ROOT}"/usr/bin/rpm --initdb --root=${ROOT}
+		"${ROOT}"/usr/bin/rpm --initdb --root="${ROOT}"
 	fi
 
 	distutils_pkg_postinst
diff --git a/app-arch/rpm/rpm-4.4.7-r2.ebuild b/app-arch/rpm/rpm-4.4.7-r2.ebuild
index 2bfa7f6c8a83..6620775e066c 100644
--- a/app-arch/rpm/rpm-4.4.7-r2.ebuild
+++ b/app-arch/rpm/rpm-4.4.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.4.7-r2.ebuild,v 1.3 2009/09/05 13:26:49 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.4.7-r2.ebuild,v 1.4 2009/09/06 19:27:42 idl0r Exp $
 
 inherit eutils autotools distutils perl-module flag-o-matic
 
@@ -91,12 +91,12 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ -f ${ROOT}/var/lib/rpm/Packages ]] ; then
+	if [[ -f "${ROOT}"/var/lib/rpm/Packages ]] ; then
 		einfo "RPM database found... Rebuilding database (may take a while)..."
-		"${ROOT}"/usr/bin/rpm --rebuilddb --root=${ROOT}
+		"${ROOT}"/usr/bin/rpm --rebuilddb --root="${ROOT}"
 	else
 		einfo "No RPM database found... Creating database..."
-		"${ROOT}"/usr/bin/rpm --initdb --root=${ROOT}
+		"${ROOT}"/usr/bin/rpm --initdb --root="${ROOT}"
 	fi
 
 	distutils_pkg_postinst
diff --git a/app-arch/rpm/rpm-4.4.7-r4.ebuild b/app-arch/rpm/rpm-4.4.7-r4.ebuild
index 66da1d59995d..d0514ab4230d 100644
--- a/app-arch/rpm/rpm-4.4.7-r4.ebuild
+++ b/app-arch/rpm/rpm-4.4.7-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.4.7-r4.ebuild,v 1.2 2009/09/05 13:26:49 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.4.7-r4.ebuild,v 1.3 2009/09/06 19:27:42 idl0r Exp $
 
 inherit eutils autotools distutils perl-module flag-o-matic
 
@@ -93,12 +93,12 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ -f ${ROOT}/var/lib/rpm/Packages ]] ; then
+	if [[ -f "${ROOT}"/var/lib/rpm/Packages ]] ; then
 		einfo "RPM database found... Rebuilding database (may take a while)..."
-		"${ROOT}"/usr/bin/rpm --rebuilddb --root=${ROOT}
+		"${ROOT}"/usr/bin/rpm --rebuilddb --root="${ROOT}"
 	else
 		einfo "No RPM database found... Creating database..."
-		"${ROOT}"/usr/bin/rpm --initdb --root=${ROOT}
+		"${ROOT}"/usr/bin/rpm --initdb --root="${ROOT}"
 	fi
 
 	distutils_pkg_postinst