[QA] Remove unused files.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

14 files changed, 42 insertions, 681 deletions

diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog
index a72eb157e92d..7242e5d4bde6 100644
--- a/app-emulation/emul-linux-x86-java/ChangeLog
+++ b/app-emulation/emul-linux-x86-java/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/emul-linux-x86-java
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.132 2013/10/18 15:42:45 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.133 2013/12/31 16:55:46 tomwij Exp $
+
+  31 Dec 2013; Tom Wijsman <TomWij@gentoo.org> -files/construct-1.6.sh:
+  [QA] Remove unused files.
 
   18 Oct 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   This case is special: java emul package is entirely handled by java team
diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest
index 76cc2f75d9f9..971e4e667c79 100644
--- a/app-emulation/emul-linux-x86-java/Manifest
+++ b/app-emulation/emul-linux-x86-java/Manifest
@@ -1,19 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX construct-1.6.sh 6799 SHA256 4369309ba29da4dcdbda4ea614e2db00ff7e3a801fa58b897de818fe33d78e80 SHA512 a625b1b414f63370ce802669d569ee254f7f256a927a267629267a60bf66c5d887e1557b83d21a602008b39222499d56e20cad17b0ab5dbfc13d44e8f7b0ba69 WHIRLPOOL 69459effacb42f56d339ec8010b22e5c0ede7c7a35657f42e08ead5928039c4394031c1e210914131c86d563f8c1e7b5b23ef9b2e11233c69038b6641dfb9b48
 AUX emul-linux-x86-java-1.6.env-r1 969 SHA256 841a8e27157b8bcc6a526bf69716ba0d0fe259255f20ec861a9fbcc2794b9df4 SHA512 c6f257971d1ad52b1af6041f84978d7029598b7abef7bd25e3d4f7e83cf170325fc80a53eaad70085bc1f45f14af6f0dc322ac729535fd6e0c80704dedb32811 WHIRLPOOL 33d29b11ef6ebe62672cb4a483867e2e38cd73827f902ed3b4d1784a466c266446b8306447e9c7ed175d7b4e416165159aef51a73b31a14df611efdeca185fed
 AUX fontconfig.Gentoo.properties 11196 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9 WHIRLPOOL f4c5364255f8da18bf61501d6fac10972216182e891cadd90e2cccd27917caaeeb29cf3691e865ce02937904efb30716fd8de2fca875929ff89b06ada2cff0b6
 DIST jre-6u43-linux-i586.bin 21727684 SHA256 e6bb81281f661580ea0351726611e064ba95d929f83a7a9f9b71e5ac50d315a3 SHA512 25ca97b5d0811b430fc546c4efa5b8fbdb4cd7bb677370600f8333d8e4e70bb511a5db2b0a4fafc84b5abad099d678f64727d6dcde0fb609795db4ef2f5981b0 WHIRLPOOL 10d0549661a69c61144be9a477c77edf844ee7b1c2f8941f30230157261db6cb8297e5c4217980409b3416cc979e0289fedc330142e97a0a364ae60c9577291e
 DIST jre-6u45-linux-i586.bin 21770712 SHA256 6f6155623537162e169044454856c41c4443eab65bdc71eba0b90b242ecf0030 SHA512 5454918675dd27619989fdae2fa46b0f87367deca99632c53a5d0e47010ca5c1256384ed1ebbb504bc0ea24ea605fed518969fae73f5defae26fad7081006e82 WHIRLPOOL e294c4b308516c4117ff7f9b337f652f692fe69db37e098ece4627632e7d49b949d9d37f58be4bef7a9a3949da08d3c725356e238569190d5a184c094fea002a
 EBUILD emul-linux-x86-java-1.6.0.43.ebuild 3461 SHA256 3e9da4a629e63687c9c07d808264825ea0287c1feaacce589f58be0c66245d92 SHA512 8ba4ec6873ac2df2db825747e5f6e292cb89720a74591a1cd57ec1331a6eed97dca6b8ba38368a8e06d6bedae9393a3ae70c5b4b33af5c5eedad7e6fd6eef304 WHIRLPOOL cf2230181c568822ed8f3411c620300364bfd3fee428be36f9b92620798520f6299fc7164171a5e8ef76b7afcb003a8a59daa5ca6c6948098b863a18e0e254f9
 EBUILD emul-linux-x86-java-1.6.0.45.ebuild 3461 SHA256 45741a2f4ca96ab97d34e6b3fbff5bec09327bea3896fcd9171b6f534b4e1921 SHA512 86b90bf991fa95417023f538580ad234b6e76da5784168f5b880346e405f38b894c2cebc7cf58ff81b3baf8029c4114f6da281b93e08681dff7f7bda09b3f3e9 WHIRLPOOL b86517b9820951d88a02c0dbc067f6b3f0501632c1fdb93d24d4800c495ca1a31681f13d834f30c066bd15cd834a758bbac781981847e99c887d721979c46d5f
-MISC ChangeLog 26246 SHA256 187e43612a7f1735d913bdfc1ad90bd4ce84e796688d09c25bd1d3e7d3fe91e2 SHA512 6bc6a552e4b9b56bfd07fa3280fa48f57787ca544abf7af86f40e4adb8c4171ad97cb08a332f1ee55fd247d255c46aa6cbbdf720f687e76d528d677cf689129b WHIRLPOOL d0a3323972ca0a87383e9c686185a79ef2fb17484841097beb80003f02d6632ab795226b9d84cc1db257c4a93045b771a26a0d7b21daa491dc8d86ecbe12b7c3
+MISC ChangeLog 26348 SHA256 139d3ec9b0a0fd6b5ae7ed9c2ec77b9cbc7c76766800a4dcdc77b501b5f1665e SHA512 7390390fdfd1f0219e53d7af2d45cd6a21b2c5db5760cc0f1b8ac30eeaf49ba55969fa0152632cda054701e9d387045cc000d6926e21f29418dd210f47ac4ca7 WHIRLPOOL 564abd7e9e27b2cbabf62e6b39167ac12e9e2220c5acc67a2ddfc7cd0c9941a7aa87c95f24f0761abcc31ec9df16a5f0c929154c03cec603d5b14f3fc5ccb3bc
 MISC metadata.xml 243 SHA256 bec7d825ae2052459b6f40ddcf9a807c18caf8f5aa3e5844de29a9b337230536 SHA512 5a5dc347f5a2a29e3f122631df69dca812d0f649921a32ad21dfc33d57ac9757d2552c59a14c5a4275de5376c9b0f19fc0dde030eba69d47dd6682b1638536e1 WHIRLPOOL 9bdb79b376c2c7652455ab2e7117a9abd4e4110caa276c31e4b3e2ed8b0f49b4736083234b8bbc5012edc8b6ee866de055c6cfdf98794b11619cbd517ee2dd64
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlJhVvYACgkQCaWpQKGI+9Qh9wCgiHzJOvsvyPqrW9aSDYyG3JDP
-AA8An00SHEJi6CnMcIgVeXRQX8YgRtie
-=BuG8
+iQEcBAEBCAAGBQJSwvb8AAoJEJWyH81tNOV9YL8H/0/OBNOomQls06/7TQjtpQWf
+TlcSV9aBL30N24mn4a+WMKND6QaFY1RqklKl9XlypVXkkKrwuCoT09RGL6xyHmTc
+2e1kLAhabPnZiIbOCLw5xrL2Tm89clyIQ6sno68abazaZzacchCdz8dkVQQEn+gc
+Y3eoZXFZyYtFf6eYXqdkSUNfqjghbBnazEaMMyfKaotnBpxUxMyTa0HTKCL+D73F
+lqvAVqTGwpfsRkFoRCmIsQRdYM5uT+a3/ZgXcDG8L1nfn0mWjxDdTVklX6Z8V/lN
+eDdOBkrhwkpJNB3q6AP+4f4yst5VjUPr/VKCBr0bAacFceC7qLnDAmCGagre37I=
+=DW97
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-java/files/construct-1.6.sh b/app-emulation/emul-linux-x86-java/files/construct-1.6.sh
deleted file mode 100644
index a70e24b86d8a..000000000000
--- a/app-emulation/emul-linux-x86-java/files/construct-1.6.sh
+++ /dev/null
@@ -1,273 +0,0 @@
-#!/bin/bash
-# construct.sh
-# example construction of JRE and JDK directories from the DLJ bundles
-# 
-# Copyright © 2006 Sun Microsystems, Inc.
-# 
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-# 
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-# 
-# Sun, Sun Microsystems, the Sun logo and Java, Java HotSpot,
-# and JVM  trademarks or registered trademarks of Sun Microsystems,
-# Inc. in the U.S. and other countries.
-
-
-program=`basename $0`
-
-usage () {
-  echo "usage: ${program} path/to/unbundle-jdk path/to/linux-jdk path/to/linux-jre"
-}
-
-getargs() {
-  undir=$1
-  jdkdir=$2
-  jredir=$3
-  if [ ! -d $undir ]; then
-    echo "${program}: unbundle directory not found: $undir"
-    exit 2
-  fi
-  # make sure javahome is the JDK
-  javahome=`echo $undir/*/demo`
-  if [ ! -d $javahome ]; then
-    echo "${program}: unbundle directory incorrect: $undir"
-    echo "  expecting $undir/jdk1.5.0_xx"
-    exit 2
-  else
-    javahome=`dirname $javahome`
-  fi
-  # verify JDK dir
-  jdkdirp=`dirname $jdkdir`
-  jdkbase=`basename $jdkdir`
-  if [ ! -d $jdkdirp ]; then
-    echo "${program}: parent directory for JDK does not exist: $jdkdirp"
-    exit 2
-  fi
-  savedir=`pwd`
-  cd $jdkdirp
-  jdkdirp=`pwd`
-  cd $savedir
-  jdkdir=$jdkdirp/$jdkbase
-  # verify JRE dir
-  jredirp=`dirname $jredir`
-  jrebase=`basename $jredir`
-  if [ ! -d $jredirp ]; then
-    echo "${program}: parent directory for JRE does not exist: $jredirp"
-    exit 2
-  fi
-  savedir=`pwd`
-  cd $jredirp
-  jredirp=`pwd`
-  cd $savedir
-  jredir=$jredirp/$jrebase
-}
-
-checkfiles() {
-  if [ -r $jdkdir ]; then
-    echo "${program}: directory for JDK already exists: $jdkdir"
-    exit 2
-  fi
-  if [ -r $jredir ]; then
-    echo "${program}: directory for JRE already exists: $jredir"
-    exit 2
-  fi
-}
-
-copytree() {
-  echo "copying over the JDK tree..."
-  cp -a $javahome $jdkdir
-}
-
-linkrel() {
-  target=$1
-  link=$2
-  # make a softlink from the $link to the $target
-  # make this a relative link
-  targetb=(`echo $target | tr '/' ' '`)
-  linkb=(`echo $link | tr '/' ' '`)
-  (( n = ${#targetb[*]} ))
-  (( m = ${#linkb[*]} ))
-  c=$n  # common length
-  if [ $m -lt $c ]; then
-    (( c = m ))
-  fi
-  for (( i = 0 ; i < c ; i++ )); do 
-    if [ ${targetb[$i]} != ${linkb[$i]} ]; then
-      # echo components differ, stopping
-      break
-    fi
-  done
-  rel=""
-  for (( j = i + 1; j < m ; j++ )); do
-    if [ -z $rel ]; then
-      rel=".."
-    else
-      rel="$rel/.."
-    fi
-  done
-  for (( j = i; j < n ; j++ )); do
-    if [ -z $rel ]; then
-      rel=${targetb[$j]}
-    else
-      rel="$rel/${targetb[$j]}"
-    fi
-  done
-  ln -s $rel $link
-}
-
-createjre() {
-  echo "creating JRE directory..."
-  # absolute link
-  # ln -s $jdkdir/jre $jredir
-  # relative link
-  linkrel $jdkdir/jre $jredir
-}
-
-unpackjars() {
-  echo "unpacking jars..."
-  unpack200=$jdkdir/bin/unpack200
-  if [ ! -x $unpack200 ]; then
-    echo "${program}: file missing $unpack200"
-    exit 1
-  fi
-  cd $jdkdir
-  PACKED_JARS=`find . -name '*.pack'`
-  for i in $PACKED_JARS; do
-    # echo $i
-    jdir=`dirname $i`
-    jbase=`basename $i .pack`
-    if ! $unpack200 $jdkdir/$jdir/$jbase.pack $jdkdir/$jdir/$jbase.jar; then
-      echo "${program}: error unpacking $jdkdir/$jdir/$jbase.jar"
-    fi
-    if [ ! -r $jdkdir/$jdir/$jbase.jar ]; then
-      echo "${program}: missing $jdkdir/$jdir/$jbase.jar"
-    else
-      echo "  $jdir/$jbase.jar"
-      # remove pack file
-      rm $jdkdir/$jdir/$jbase.pack
-    fi
-  done
-}
-
-preparecds() {
-  # if this is a client installation...
-  compiler="`$jdkdir/bin/java -client -version 2>&1 | tail -n +3 | cut -d' ' -f1-4`"
-  if [ "X$compiler" = "XJava HotSpot(TM) Client VM" ]; then
-    # create the CDS archive
-    echo "creating the class data sharing archive..."
-    if ! $jdkdir/bin/java -client -Xshare:dump > /dev/null 2>&1; then
-       echo "returned error code $?"
-    fi
-  fi
-}
-
-jreman () {
-  echo "setting up the JRE man pages..."
-  # note this list is slightly different for OpenSolaris bundles
-  jreman="${T}/jre.man.txt"
-cat <<EOF > $jreman
-man/ja_JP.eucJP/man1/java.1
-man/ja_JP.eucJP/man1/javaws.1
-man/ja_JP.eucJP/man1/keytool.1
-man/ja_JP.eucJP/man1/orbd.1
-man/ja_JP.eucJP/man1/pack200.1
-man/ja_JP.eucJP/man1/policytool.1
-man/ja_JP.eucJP/man1/rmid.1
-man/ja_JP.eucJP/man1/rmiregistry.1
-man/ja_JP.eucJP/man1/servertool.1
-man/ja_JP.eucJP/man1/tnameserv.1
-man/ja_JP.eucJP/man1/unpack200.1
-man/man1/java.1
-man/man1/javaws.1
-man/man1/keytool.1
-man/man1/orbd.1
-man/man1/pack200.1
-man/man1/policytool.1
-man/man1/rmid.1
-man/man1/rmiregistry.1
-man/man1/servertool.1
-man/man1/tnameserv.1
-man/man1/unpack200.1
-EOF
-  # create jre/man directory
-  # mkdir $jdkdir/jre/man
-  # move the real JRE man pages to jre/man
-  # link the JDK JRE man pages to jre/man
-  # real JDK man pages stay where they are
-  for m in `cat $jreman`; do
-    manpath=`dirname $jdkdir/jre/$m`
-    mkdir -p $manpath
-    mv $jdkdir/$m $jdkdir/jre/$m
-    linkrel $jdkdir/jre/$m $jdkdir/$m
-  done
-  # link in Japanese man pages
-  ln -s ja_JP.eucJP $jdkdir/jre/man/ja
-  rm $jreman
-}
-
-elimdups() {
-  echo "eliminating duplication between the JDK and JDK/jre..."
-  jdkcomm="${T}/jdk.bin.comm.txt"
-cat <<EOF > $jdkcomm
-bin/ControlPanel
-bin/java
-bin/javaws
-bin/keytool
-bin/orbd
-bin/pack200
-bin/policytool
-bin/rmid
-bin/rmiregistry
-bin/servertool
-bin/tnameserv
-bin/unpack200
-EOF
-  # note there is little point in linking these common files
-  #   COPYRIGHT
-  #   LICENSE
-  #   THIRDPARTYLICENSEREADME.txt
-  # And this file is unique to the JDK
-  #   README.html
-  # And these files are unique to the JDK/jre/
-  #   CHANGES
-  #   README
-  #   Welcome.html
-  for p in `cat $jdkcomm`; do
-    rm $jdkdir/$p
-    # this is a relative link
-    ln -s ../jre/$p $jdkdir/$p
-  done
-  rm $jdkcomm
-}
-
-if [ $# -eq 3 ] ; then
-  getargs $1 $2 $3
-  checkfiles
-  copytree
-  createjre
-  unpackjars
-  #preparecds
-  jreman
-  elimdups
-else
-  usage
-  exit 1
-fi
-
-exit 0
-
diff --git a/app-emulation/libguestfs/ChangeLog b/app-emulation/libguestfs/ChangeLog
index 13226067a6e8..c524f70f06ab 100644
--- a/app-emulation/libguestfs/ChangeLog
+++ b/app-emulation/libguestfs/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-emulation/libguestfs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libguestfs/ChangeLog,v 1.31 2013/10/27 12:06:04 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libguestfs/ChangeLog,v 1.32 2013/12/31 16:59:55 tomwij Exp $
+
+  31 Dec 2013; Tom Wijsman <TomWij@gentoo.org>
+  -files/1.17/0002-configure_ac_automagic.patch,
+  -files/1.18/0001_add_gentoo_names_to_configure.patch,
+  -files/1.18/0002_add_doc_more_option.patch,
+  -files/1.18/0002_add_gentooway_to_remove_la_files.patch,
+  -files/1.18/0003_add_icoutils_configure_drop_automagic.patch,
+  -files/1.18/0103_disable_php_bindings_makefile.patch:
+  [QA] Remove unused files.
 
   27 Oct 2013; Maxim Koltsov <maksbotan@gentoo.org>
   +files/1.24/0001_add_gentoo_names_to_configure.patch,
diff --git a/app-emulation/libguestfs/Manifest b/app-emulation/libguestfs/Manifest
index 951f7430ad8b..6fe03880632c 100644
--- a/app-emulation/libguestfs/Manifest
+++ b/app-emulation/libguestfs/Manifest
@@ -1,12 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 1.17/0002-configure_ac_automagic.patch 4264 SHA256 74f904d28bf0568fc7f9846fcb5621b1ad179f050af1c1c39e49e3451b88385e SHA512 0da7996b9775c712319f06d8e2e82a9749a7eb0adfb5f2f01e3b946c7eb85743e316ed20c4394413abf88a7c6a2e560f2af23e97282c673aa54e02389bcc02fe WHIRLPOOL cbfe63451b576e6199c08d87db79cc7b0a064e3b314eee0bbddf992ce573398bae39a0d8589e0aa6c1f5a61afe706730e1b8dd96886d2f6d9a8917a82105ab13
-AUX 1.18/0001_add_gentoo_names_to_configure.patch 262 SHA256 4588b38059dded5de7281ce10ae1e4744bb090582a7d1010501c8d05d826c34b SHA512 d557ae72c283d64a270633515e125fd0ac67f1f0bd62ac2d2b6b9469f406107a5d7258b99a61d213ad12d43b8567b35eb790579ab6ec06f1b643f20ff0e7004b WHIRLPOOL 94078ad543bbbc8f6aba8f2ec37322d5fba6a7b9252ac8600603a24cd7790dc1e46fdacd116c50e13e6915f96fbbef241c165b3c830023430c932bbd6153a085
-AUX 1.18/0002_add_doc_more_option.patch 1249 SHA256 d74908e515e54fac64cd266bfa449d7f65bb5b3da3644a0318176238d84ea439 SHA512 b5b082b21dd55634f034105e2263d7009090c8fc3fe4983221d7813b10056f9ba36fef92a27ac3423bbbab2e72bd95083eb3f292d93f924d1f13ccad5b6aa229 WHIRLPOOL 9f25a767584e6151ca0dd3718abaae8a548c8fa359e68c15f3606bddb09b8206be22bd835ad7495b85a4837fc75c61d1c2ae152cdbda49f1a770dfb5270b0739
-AUX 1.18/0002_add_gentooway_to_remove_la_files.patch 546 SHA256 3c1354653cbf7374bd7accecdb2c9d2f5ed11b6096663543fe0c78fab2030221 SHA512 8fe6d7006fdb26678be7427406b7a3129470b36c25ca4c66cade02436ef83428803140a816c24863297be6bccec9972552ab36f12cebe34efc0be621aa7cf2f8 WHIRLPOOL b0a141345c1a7e3346b85d043ea80bbc1c8e9657346850c8b1acd84bd767fef0f2aee2060f2dc150298db963d4afab225cd0bff42037d7983d24874f6c28bb46
-AUX 1.18/0003_add_icoutils_configure_drop_automagic.patch 2253 SHA256 00b8ecef0a971186b311003a592c215505fdcb0eea3049f98b7ddf8a0586bc76 SHA512 983c605bcf87a5899cb0dbf333e819b4d67e5ef4a511bddfeb3ae752acd08cb0518319caadfc2146015ce60cd46f4df49cb06a41f000a0afdc13ddda775295b7 WHIRLPOOL 2557b65517ce8e7fa5bd53e8fa5911bb07a41221b344a7278b9ae3c797e3847eb4b0b3e80f6650362ada6038330548f378a21d6af88aadadcd304cc22aa225fa
-AUX 1.18/0103_disable_php_bindings_makefile.patch 231 SHA256 4134fcbb4f07bc41fd6d23bf2619a0b84aa18fbc11cacada6494671fa7855707 SHA512 24f6aa83a31a64aa2010b4c42fe9f26f191273b901cb1484a45e1decf6d63e08f59d4c484beea85fb46016e6e35581899414f6184bc9f52addd638f0364f2dcd WHIRLPOOL d4848d3e25694cfbd78b275064dc5f3d25a34bfe5ea9b85a7b0cd25a61cb783443e611c3a4db307ad31ae1d881530261e8c54f0ebddc25f7dc259c9cdb616ff8
 AUX 1.20/0001_add_gentoo_names_to_configure.patch 262 SHA256 0d18682bc8666cb3e6aab79731925acfae5a636b8ad6bb75b3dc4d63fae27dec SHA512 9e6ef0c0475c5b180bc0ca7ded197901e25383e0359c429514e9c0217b7059d5f900a19d30d7d864a386279be0fd45bd9d41c56062b48c11dff31a8f92c5b789 WHIRLPOOL dcc96a8e752653ca9aaa5676266ffe20b69bf168bb955428807f0134cbfc2dd379e5250919da0e9a48dfbd84d62ceb98c1acc0025e794aa5ecfaec02945e9783
 AUX 1.20/0002_add_gentooway_to_remove_la_files.patch 555 SHA256 fc65ce8df2f910c1ac1c4466c8f529fc442b136914b9f50ce1b910834349ca59 SHA512 5dd8f7a8eeed6e2e4e842cd9fb5fde5104ab47bfddcbe218107e181c3891350eb425648667c4d70becb437bbf52506035b20778ea3a7954f020e4a2be76f959b WHIRLPOOL e776522e5a2e14c3dea2f35ac3de1f36763ec6eaa2c29e2d32a062c4df2946268d54bd6be5216caf861979dc442ac9b0c2ce8a6b765a09f53ea56258cb0b6ef2
 AUX 1.20/0003_add_doc_more_option.patch 1287 SHA256 0853d5b42b4dec6416ecfae4253dcf5b8b52786c9729c58e3ee7c9c36ac595d4 SHA512 e234b5179fd9ecaa5ed655e6a0714c909e848b579ba9c8fbd9ee5cf9c48d276a215bbd54d5c8fe8517e667b3131704debf5cc2f9c7c39311b76d8a69aa80de20 WHIRLPOOL 83fb0508ec646481dbcc595f926f831f1e131224c927dc2a08856bbf53202328bb8d3f8651043291d5702ccd74742dbc76a8401bde95aedaa71ce5c662454ff3
@@ -31,16 +25,16 @@ DIST libguestfs-1.24.0.tar.gz 11017148 SHA256 72771e793a4de53d1214ed9d000d93dd6b
 EBUILD libguestfs-1.20.6.ebuild 3607 SHA256 b6ecc232f37eae3620dc78f6ebc5f74bb983c80d7fb24d0734536c1bc85ef6ac SHA512 5cf1a8d929d42c12919974a6121f0409275f3f1791aba7bc4d86176dd6d74a9bcb6ee543744ca24e6fa39515462ddad99805a64e05587872b7662af0db832ef0 WHIRLPOOL 91e10a6367bcd672e6527d9e6274edd9d49dc2ceeec1a703b740de4f01ad9b23ac6249a7a8b558affbe672096fa0018133d4c5eabc4e156869022702a6443c5f
 EBUILD libguestfs-1.22.7.ebuild 3711 SHA256 e92f777eb012b3e54c1f9542a5c01ef00f453be5b1b39934cf7aded43a4f45d4 SHA512 4ca4b3c3f190ca55635f3ab8e5c2aeda6dcec1f244ae33e8172f61af7fd2c5e28494e0256c5b57246a34a2fc5363eed2e0852ec1e42d5222c2eb3bf490d3080e WHIRLPOOL f27c94ceaae4ddcf044d57a9a6c263f53c7155a644ba82121b3d0faec09be63304bb07ea6119db252c952ffe9e2fef7b368918c3cdfd53e69ebf1eeea14a4efa
 EBUILD libguestfs-1.24.0.ebuild 3691 SHA256 d85f99a0332b18dcc70bf41b500c654e209e7ba7dfe14134567633a8d17b4fcb SHA512 7a8d5d4a419aec6ff022421853d7dc27e0b1c69fe001d9588f09dd37c6eccd768c56457559dd4bf28f8eab9cd03c1dd949cb84dd673ec42193326d92b3fce13f WHIRLPOOL 93c343bab09290c2ffad14eddf4eb453766b7b4d93921308fef958936625f25fc4de0463876598743dc4aae2d00bfd474f0ffe17527d8b210ea71bc06242aae2
-MISC ChangeLog 16255 SHA256 008d109a7666da4461a8a8b50f99112dd6da6e8d0d8a38e89e8d5ef7df226db9 SHA512 fe69ac78c3669c4f2eb4b818ef0635cabb1718dbdd632dc1af70cbbb2495b34bb14cc3efaf4bba8751d0fce52c56193d51915b0b9a652f17e5ea7b6635cfc0ef WHIRLPOOL 658ce11ee678e1db67de1e41ce7715333efa8bb4e1b93e5a12d8b7fc76f8d8bc6957114db302bde3667c19469e34c992b1266006c14ff3a725aa29ebd87ee546
+MISC ChangeLog 16658 SHA256 1e3da0477683edee34bf1c28a2c64dc3ae808afe9221711c3e14c00f731c588f SHA512 898f500a4ac1a20faa9aad4d637316c6913d1ead98a56e640fcf6bd951d77bccbfd38b58477e7936099ac3a2168edb36cd498cedad7e7d859f5a1ecbacb0624e WHIRLPOOL 1976e0db2559a2891b2764a2351179f22e92f7ce2911604e07c33ab40f86772652da608b55db23d3a5e0365740a20408b84163ba3b34f7119b5b45bbaa43e614
 MISC metadata.xml 1104 SHA256 608f76ad5aa195e6992e84c760b290d7a125d29c1b59c5531301da36e41e10af SHA512 17807bb807f9651bd2cb40c7f0b3d10329baff4f9026c973f4668fb2d2e046cb16a5c2f5d38cd6a1d3d2bd6b0e02cda1209aa484de90e914f127b63a0bd54c6d WHIRLPOOL f13ff36105bdd7a9093cc139e0eaa079f5693187c0306fb5e1b580341176291e04405c69dd4a7c4c6ceac8454f9356cb2537b7ce7518588d345ae8c35e39283e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSbQEqAAoJEAmJmMX429re5jYH/1exKkhJt4iha4Ga+gfppecD
-rrxF9ACPv56fDuYNy2bshKF27VzhyBHEtP4owgciUMsxHVg0XfYaXsl5S5Ex8kpI
-eteUkqsxBPFGcMrC77i/Uy939hpUcifUsZU4BmdwlG+Ul0Hut8B5YaRrc7PjEh4U
-SbDE+mQxyJoDzKvY+10geNsccG1hqNS4Pr0Zatp8jZaG4jaT9XTAMEmNwmkQ/hPY
-250jBG1EJrDVMcbW2Ucp5G/9LVYlKoQQgo8r/bf3JCQAelPO3gt0O/6cyAzaKLae
-U8cNB4J5rpkvXILcU2KxC2rkmsEaEBmzAAq/kQpWqhH3XCbADQ0/OXTDa4gjU6Y=
-=Dfx4
+iQEcBAEBCAAGBQJSwvf1AAoJEJWyH81tNOV9QvcH/2JTX4NQfVXFHt0Ymzacfn7s
+0WmMP9k1aiMPaNIKvGgsTRHzaRZpn83DXJBPfVkmrGLgv+GKFTVWjXZlR6M7TnuI
+mXlB+sHFlJysUgi8a3yOJ+l9f/ggh7KrYVPADXy08FryNMg97KHH1vOMSzWS3obB
+vDpa4suXVuj3SXeJg5d5BDn/czEDkWQf/D7kIVGv0FuIrgNNcdDRDRVlaWczEWw/
+Ey+uUWX25Ar+Oxbi70cbwy93kJ/InLk8ewflVqYM8Pet79Ytr1ZBlkaT0p3XU7Ar
+ZpBZICcUy1EUTKZJajPEnN6rbyGeNCy8br98p9u0cGl98wZtFbt0w95hWg0xLQ4=
+=LWdl
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/libguestfs/files/1.17/0002-configure_ac_automagic.patch b/app-emulation/libguestfs/files/1.17/0002-configure_ac_automagic.patch
deleted file mode 100644
index cf903357c286..000000000000
--- a/app-emulation/libguestfs/files/1.17/0002-configure_ac_automagic.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -75,9 +75,6 @@
- if HAVE_HASKELL
- SUBDIRS += haskell
- endif
--if HAVE_PHP
--SUBDIRS += php
--endif
- if HAVE_ERLANG
- SUBDIRS += erlang erlang/examples
- endif
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -356,6 +356,11 @@
-         DISTRO=UBUNTU
-     fi
- fi
-+if test -f /etc/gentoo-release; then
-+    DISTRO=GENTOO
-+fi
-+
-+
- if test -f /etc/arch-release; then
-     DISTRO=ARCHLINUX
- fi
-@@ -368,6 +373,7 @@
- AC_CHECK_LIB([portablexdr],[xdrmem_create],[],[
-         AC_SEARCH_LIBS([xdrmem_create],[rpc xdr nsl])
-         ])
-+AS_IF([test "xRPCGEN" = "xno"], [AC_MSG_ERROR([rpcgen not installed])],[])
- 
- dnl Check for Augeas (optional).
- PKG_CHECK_MODULES([AUGEAS], [augeas],
-@@ -381,9 +387,11 @@
-          AC_CHECK_FUNCS([aug_load aug_defvar aug_defnode])
-          LIBS="$old_LIBS"
-         ],
--        [AC_MSG_WARN([augeas not found, some core features will be disabled])])
-+ [AC_MSG_ERROR([augeas not found, some core features will be disabled])])
- 
- dnl Check for libselinux (optional).
-+dnl TODO selinux triplet
-+
- AC_CHECK_HEADERS([selinux/selinux.h])
- AC_CHECK_LIB([selinux],[setexeccon],[
-         have_libselinux="$ac_cv_header_selinux_selinux_h"
-@@ -409,7 +417,7 @@
- AS_IF([test "x$enable_probes" != "xno"],[
-     dnl http://sourceware.org/systemtap/wiki/AddingUserSpaceProbingToApps
-     AC_CHECK_HEADERS([sys/sdt.h])
--    dnl AC_CHECK_PROG([DTRACE],[dtrace],[dtrace],[no])
-+    AC_CHECK_PROG([DTRACE],[dtrace],[dtrace],[no])
-     AS_IF([test "x$ac_cv_header_sys_sdt_h" = "xyes"],[
-         AC_DEFINE([ENABLE_PROBES],[1],[enable systemtap/DTrace userspace probes])
-     ])
-@@ -442,7 +450,7 @@
-     AC_MSG_RESULT([yes])
-     POD2_STDERR_OPTION="--stderr"
- else
--    AC_MSG_RESULT([no])
-+    AC_MSG_RESULT([no]
-     POD2_STDERR_OPTION=""
- fi
- AC_SUBST([POD2_STDERR_OPTION])
-@@ -464,11 +472,20 @@
- 
- dnl Check for optional xmllint.
- AC_CHECK_PROG([XMLLINT],[xmllint],[xmllint],[no])
-+AS_IF([test "xXMLLINT" = "xno"], [AC_MSG_ERROR([xmllint not installed])],[])
-+
- AM_CONDITIONAL([HAVE_XMLLINT],[test "x$XMLLINT" != "xno"])
- 
- dnl po4a for translating man pages and POD files (optional).
- AC_CHECK_PROG([PO4A],[po4a],[po4a],[no])
--AM_CONDITIONAL([HAVE_PO4A], [test "x$PO4A" != "xno"])
-+AC_ARG_ENABLE([doc],
-+       AS_HELP_STRING([--enable-doc], [Enable generation translating man pages and doc]),
-+       [enable_doc=no],
-+       [enable_doc=yes])
-+AS_IF([test "xPO4A" = "xno"], [AC_MSG_WARN([po4a not installed])],[])  
-+AM_CONDITIONAL([HAVE_PO4A],[test "x$PO4A" != "xno" && test "x$enable_doc" != "xno"])
-+
-+
- 
- dnl Check for db_dump, db_load (optional).
- AC_CHECK_PROGS([DB_DUMP],
-@@ -641,6 +658,9 @@
-         [])
- 
- dnl Readline.
-+dnl TODO - add ncurses LDFLGS separately
-+dnl build --without-redline in fact broken with -lncurses not inherited
-+
- AC_ARG_WITH([readline],
-     [AS_HELP_STRING([--with-readline],
-         [support fancy command line editing @<:@default=check@:>@])],
-@@ -894,11 +914,13 @@
-     [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY"])
- 
- dnl Check for Java.
--AC_ARG_WITH(java_home,
--    [AS_HELP_STRING([--with-java-home],
--        [specify path to JDK directory @<:@default=check@:>@])],
--    [],
--    [with_java_home=check])
-+AC_ARG_ENABLE([java],
-+       AS_HELP_STRING([--enable-java], [Disable Java language bindings]),
-+        [enable_java=no],
-+       [enable_java=yes])
-+
-+AS_IF([test "x$enable_java" = "xyes"],
-+       [
- 
- if test "x$with_java_home" != "xno"; then
-     if test "x$with_java_home" != "xyes" && test "x$with_java_home" != "xcheck"
-@@ -1034,7 +1056,9 @@
- AC_SUBST(JNI_INSTALL_DIR)
- AC_SUBST(JNI_VERSION_INFO)
- 
--AM_CONDITIONAL([HAVE_JAVA],[test -n "$JAVAC"])
-+
-+])
-+AM_CONDITIONAL([HAVE_JAVA],[test -n "$JAVAC" && test "x$enable_java" != "xno"])
- 
- dnl Check for Haskell (GHC).
- GHC=no
-@@ -1153,7 +1177,7 @@
- 
- dnl Replace libtool with a wrapper that clobbers dependency_libs in *.la files
- dnl http://lists.fedoraproject.org/pipermail/devel/2010-November/146343.html
--LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool'
-+dnl LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool'
- AC_SUBST([LIBTOOL])
- 
- dnl Produce output files.
diff --git a/app-emulation/libguestfs/files/1.18/0001_add_gentoo_names_to_configure.patch b/app-emulation/libguestfs/files/1.18/0001_add_gentoo_names_to_configure.patch
deleted file mode 100644
index a30c7a059ec2..000000000000
--- a/app-emulation/libguestfs/files/1.18/0001_add_gentoo_names_to_configure.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -384,6 +384,11 @@
-         DISTRO=UBUNTU
-     fi
- fi
-+
-+if test -f /etc/gentoo-release; then
-+    DISTRO=GENTOO
-+fi
-+
- if test -f /etc/arch-release; then
-     DISTRO=ARCHLINUX
- fi
diff --git a/app-emulation/libguestfs/files/1.18/0002_add_doc_more_option.patch b/app-emulation/libguestfs/files/1.18/0002_add_doc_more_option.patch
deleted file mode 100644
index bc0989fc162c..000000000000
--- a/app-emulation/libguestfs/files/1.18/0002_add_doc_more_option.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -422,7 +422,7 @@
-          AC_CHECK_FUNCS([aug_load aug_defvar aug_defnode])
-          LIBS="$old_LIBS"
-         ],
--        [AC_MSG_WARN([augeas not found, some core features will be disabled])])
-+        [AC_MSG_ERROR([augeas not found, some core features will be disabled])])
- 
- dnl Check for libselinux (optional).
- AC_CHECK_HEADERS([selinux/selinux.h])
-@@ -496,11 +496,20 @@
- 
- dnl Check for optional xmllint.
- AC_CHECK_PROG([XMLLINT],[xmllint],[xmllint],[no])
-+AS_IF([test "xXMLLINT" = "xno"], [AC_MSG_ERROR([xmllint not installed])],[])
-+
- AM_CONDITIONAL([HAVE_XMLLINT],[test "x$XMLLINT" != "xno"])
- 
- dnl po4a for translating man pages and POD files (optional).
- AC_CHECK_PROG([PO4A],[po4a],[po4a],[no])
--AM_CONDITIONAL([HAVE_PO4A], [test "x$PO4A" != "xno"])
-+
-+AC_ARG_ENABLE([doc],
-+       AS_HELP_STRING([--enable-doc], [Enable generation translating man pages and doc]),
-+       [enable_doc=no],
-+       [enable_doc=yes])
-+AS_IF([test "xPO4A" = "xno"], [AC_MSG_WARN([po4a not installed])],[])  
-+AM_CONDITIONAL([HAVE_PO4A],[test "x$PO4A" != "xno" && test "x$enable_doc" != "xno"])
-+
- 
- dnl Check for db_dump, db_load (optional).
- AC_CHECK_PROGS([DB_DUMP],
diff --git a/app-emulation/libguestfs/files/1.18/0002_add_gentooway_to_remove_la_files.patch b/app-emulation/libguestfs/files/1.18/0002_add_gentooway_to_remove_la_files.patch
deleted file mode 100644
index 9ae028acf820..000000000000
--- a/app-emulation/libguestfs/files/1.18/0002_add_gentooway_to_remove_la_files.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -1351,8 +1351,9 @@
- 
- dnl Replace libtool with a wrapper that clobbers dependency_libs in *.la files
- dnl http://lists.fedoraproject.org/pipermail/devel/2010-November/146343.html
--LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool'
--AC_SUBST([LIBTOOL])
-+#LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool'
-+#AC_SUBST([LIBTOOL])
-+LT_INIT
- 
- dnl Produce output files.
- AC_CONFIG_HEADERS([config.h])
diff --git a/app-emulation/libguestfs/files/1.18/0003_add_icoutils_configure_drop_automagic.patch b/app-emulation/libguestfs/files/1.18/0003_add_icoutils_configure_drop_automagic.patch
deleted file mode 100644
index 58d5a8bccb3b..000000000000
--- a/app-emulation/libguestfs/files/1.18/0003_add_icoutils_configure_drop_automagic.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -524,29 +524,36 @@
- fi
- 
- dnl Check for netpbm programs (optional).
--AC_CHECK_PROGS([PBMTEXT],[pbmtext],[no])
--AC_CHECK_PROGS([PNMTOPNG],[pnmtopng],[no])
--AC_CHECK_PROGS([BMPTOPNM],[bmptopnm],[no])
--AC_CHECK_PROGS([PAMCUT],[pamcut],[no])
--if test "x$PBMTEXT" != "xno"; then
--    AC_DEFINE_UNQUOTED([PBMTEXT],["$PBMTEXT"],[Name of pbmtext program.])
--fi
--if test "x$PNMTOPNG" != "xno"; then
--    AC_DEFINE_UNQUOTED([PNMTOPNG],["$PNMTOPNG"],[Name of pnmtopng program.])
--fi
--if test "x$BMPTOPNM" != "xno"; then
--    AC_DEFINE_UNQUOTED([BMPTOPNM],["$BMPTOPNM"],[Name of bmptopnm program.])
--fi
--if test "x$PAMCUT" != "xno"; then
--    AC_DEFINE_UNQUOTED([PAMCUT],["$PAMCUT"],[Name of pamcut program.])
--fi
-+AC_ARG_ENABLE([icoutils],
-+	AS_HELP_STRING([with-icoutils], [ Enable ico and bmp icon file inspection]),
-+	[enable_icoutils=no],
-+	[enable_icoutils=yes])
-+AS_IF([test "enable_icoutils" != "xno"],
-+  [
-+	AC_CHECK_PROGS([PBMTEXT],[pbmtext],[no])
-+	AC_CHECK_PROGS([PNMTOPNG],[pnmtopng],[no])
-+	AC_CHECK_PROGS([BMPTOPNM],[bmptopnm],[no])
-+	AC_CHECK_PROGS([PAMCUT],[pamcut],[no])
-+	if test "x$PBMTEXT" != "xno"; then
-+	    AC_DEFINE_UNQUOTED([PBMTEXT],["$PBMTEXT"],[Name of pbmtext program.])
-+	fi
-+	if test "x$PNMTOPNG" != "xno"; then
-+	    AC_DEFINE_UNQUOTED([PNMTOPNG],["$PNMTOPNG"],[Name of pnmtopng program.])
-+	fi
-+	if test "x$BMPTOPNM" != "xno"; then
-+	    AC_DEFINE_UNQUOTED([BMPTOPNM],["$BMPTOPNM"],[Name of bmptopnm program.])
-+	fi
-+	if test "x$PAMCUT" != "xno"; then
-+	    AC_DEFINE_UNQUOTED([PAMCUT],["$PAMCUT"],[Name of pamcut program.])
-+	fi
- 
--dnl Check for icoutils (optional).
--AC_CHECK_PROGS([WRESTOOL],[wrestool],[no])
--if test "x$WRESTOOL" != "xno"; then
--    AC_DEFINE_UNQUOTED([WRESTOOL],["$WRESTOOL"],[Name of wrestool program.])
--fi
--
-+	dnl Check for icoutils (optional).
-+	AC_CHECK_PROGS([WRESTOOL],[wrestool],[no])
-+	if test "x$WRESTOOL" != "xno"; then
-+	    AC_DEFINE_UNQUOTED([WRESTOOL],["$WRESTOOL"],[Name of wrestool program.])
-+	fi
-+],
-+[])
- dnl Check for QEMU for running binaries on this $host_cpu, fall
- dnl back to basic 'qemu'.  Allow the user to override it.
- qemu_system="`echo qemu-system-$host_cpu | $SED 's/i@<:@456@:>@86/i386/g'`"
diff --git a/app-emulation/libguestfs/files/1.18/0103_disable_php_bindings_makefile.patch b/app-emulation/libguestfs/files/1.18/0103_disable_php_bindings_makefile.patch
deleted file mode 100644
index c86acbc2c333..000000000000
--- a/app-emulation/libguestfs/files/1.18/0103_disable_php_bindings_makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -79,9 +79,6 @@
- if HAVE_HASKELL
- SUBDIRS += haskell
- endif
--if HAVE_PHP
--SUBDIRS += php
--endif
- if HAVE_ERLANG
- SUBDIRS += erlang erlang/examples
- endif
diff --git a/app-emulation/open-vm-tools-kmod/ChangeLog b/app-emulation/open-vm-tools-kmod/ChangeLog
index 2f7df9f29a13..b97301c0bce0 100644
--- a/app-emulation/open-vm-tools-kmod/ChangeLog
+++ b/app-emulation/open-vm-tools-kmod/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/open-vm-tools-kmod
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/ChangeLog,v 1.42 2013/10/22 22:21:05 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/ChangeLog,v 1.43 2013/12/31 17:03:48 tomwij Exp $
+
+  31 Dec 2013; Tom Wijsman <TomWij@gentoo.org> -files/fragsize.patch:
+  [QA] Remove unused files.
 
   22 Oct 2013; Mike Gilbert <floppym@gentoo.org>
   open-vm-tools-kmod-2013.09.16.1328054.ebuild,
diff --git a/app-emulation/open-vm-tools-kmod/Manifest b/app-emulation/open-vm-tools-kmod/Manifest
index cdd2ba7cc0ea..4f37e217481b 100644
--- a/app-emulation/open-vm-tools-kmod/Manifest
+++ b/app-emulation/open-vm-tools-kmod/Manifest
@@ -3,7 +3,6 @@ Hash: SHA256
 
 AUX 1098359-vmblock-3.10.0.patch 919 SHA256 58758a02e6be2a9412bf16f5adc2ce6edfb49356e06cbd5ee7c455d8e8891223 SHA512 c59e4dd2f73a559c01d4b22c564b7d20067c50acf36de8bc1b84306b4f36020a1c2cb95b46c3851ec12a9e548d80ace2679c577415ed5d5b91ed623595739236 WHIRLPOOL c52d2420b75ca305e05a7f6f953b0a857800afe59d306f99f6c0bf2fe4831125d02b6a811cb46cbd47441ceab78799cf8a9f335e80be1a40d06873dace0d0129
 AUX 60-vmware.rules 42 SHA256 5e2a610bd563961d45fd20cbc6f832898006fdf74cf73cf1d4d46be1b455c661 SHA512 8abd88ba0189abd7392b88a895fb3e2a2a7116caf5208b0afdc99e1c8826dbdf96e150cdbab0ea325c5bda5b9fa3dd77fa80fbbea5324097568ea93ed7ef7adf WHIRLPOOL a813ebf49fbf6218fc608978cddae92aad7393dd25fa7aeae5b2b1684e844d60ebd7f623bf83403113f6c7827153548a697afbf070996d704d10dca12a855157
-AUX fragsize.patch 4543 SHA256 fee39ad39fb9d3d84bfa09b7a51096ffc7d1f65f78a227ab591c0c006eef9f8e SHA512 96566f82bf7b0fa78444823062d847e73a9b3020c6b873a6c838efe8ad2b1a317f7b1acaf55bb4f24d1d4974dd78f4baf2091d3dac6a4dfad6172af7a4188c82 WHIRLPOOL 762534c4b1c088df67dfc0f1ae6fdf0c3b5014bc2946a50d0571a5df14d726e25f056f9bf670142240885d307e82fe0d5b3a0b14dd41e67a6b7cc04662677a67
 AUX frozen.patch 1155 SHA256 5997f5aa4d1d2bb262b9ef24888d4706f1227af4d359862d3d49b4e6c961d193 SHA512 5dbee1a119d6abd13b8217d66b8f611fee92c863b0d48029b1c05f33a06f6a20f35eaf6f01fb268a811270c6c799a1fef26939f7bfc97a42421e7f14b4cfa46d WHIRLPOOL 34244123ac2eebe6aa9d144f2af12304c1355f455b4b04b15ff5f949ffa0b23c62d40436b16371e3c5055b94afd51b2dd9ea3f92864d4f597c9b568814e3fa48
 AUX putname.patch 430 SHA256 dccba065f71f7a27dd7d38e3eb7d1de9e87b82a18db618538054043829c5d961 SHA512 4a6da3c33bdd4b03ed7cf536c40c18d76a902687378e85cce08cf9ef9b23ae6ccedb0d334f69daee3588e6e83c080adce456f36fad69848e7089401052c4d2c2 WHIRLPOOL 7b81aae3e2f4cab193cffcb1f07122b7d030110b94532af15ba373a38b1e963510958de85f301a543cd0df5d91fa7bc4794b5fc5af01d23988df423378ebaabf
 AUX vmhgfs-linux-3.11.patch 1399 SHA256 e4b1100ebf2928d4c503b36fa9a83f42bc5ca91bd7ef57d43de5511a7eb35069 SHA512 aa2de071205419d2fca9e76a4d1004241200a8f2f89157e0f08b04f74eafcabde254b706da6c3745fb44d389b1b094019857786351a07599ff9d28f8a47be0f8 WHIRLPOOL 2c2b86973ba13d01d3582f7d374936da9c210358c27e78adb3bf302c9a19c83ddf1eaa8b8e48d4c66a309c7841b893264a396f6134ee1fcf464e9cf2956f7331
@@ -13,12 +12,16 @@ DIST open-vm-tools-9.4.0-1280544.tar.gz 3659504 SHA256 5d30652eb0f6dc5e930781029
 EBUILD open-vm-tools-kmod-2013.04.16.1098359.ebuild 1805 SHA256 904f03a7e1c24db74076a5661305910115350a86c0738a72f628f1414bc5e842 SHA512 ed8bc3f4292a34ffb0a9690d1e39daba9f3a6f2637a5a5d958d7fdf8671f2634745f081d01e05d53ae2f33abe91d231be42f6497a6833ca6bebf9b2ed6d7ff28 WHIRLPOOL cc66d89cd8a419d95dbe83081791bd0a7a1534ff7ba68d159df6507e19ee8ae0facf8ee2438406c578f746e515cbe09800b06ddcb01d360c85e0d63511a47227
 EBUILD open-vm-tools-kmod-2013.09.16.1328054.ebuild 1433 SHA256 e5f4b3d259004e01c9ed458213f6668a03ee61a61fbdc5ab3c6a5afd604fb842 SHA512 0e728ffa590db073c3dc21bb5f20e978887f1be97081742c18f482f995b8fe4ac4f59e03cc81c5bf838730c89162f866159f1df085a4785dc87837b1586a9472 WHIRLPOOL 2401b0609740014dd5677f753968dfef451f8486fd8573b741f9750b1eee63fb2eb12c6954a713ba065c474634122ebcc1f6647e19547ed4b7aca22d73f0ee73
 EBUILD open-vm-tools-kmod-9.4.0.1280544.ebuild 1454 SHA256 3e52033548f8196ebd0c90eab23e3325333fcf65c06100dde65bff36b97983cd SHA512 dd04d11089a59a27a19396c6fd895fc8b049d7ef5e55b7d333b79e5a030771d3f85677fe494a34c7ca133da774131135f978ff289ca2ad5d9c2c50abf7164b30 WHIRLPOOL 89005c93c16e6cb58374d28f5eab24678bc8b74f30dc43910775e1ab4e2a68d9d3babd38e7fcc8004b29060238bc925b2ad9d858e0e9833911082ecd4f98de4b
-MISC ChangeLog 8786 SHA256 df5e79ef9914bb4e55bce33ea0263a4bdc86e79a4e744220b92239e7eb6253cb SHA512 e5729dcf67768e66f9f24b1c32a660d3441fa0cce03a935df0fc0112e4ebf16a83680fbc4bcebd38ab5a28a16dce276d87882025a9ceac718ae415ca00c25b8c WHIRLPOOL ffb2b03a3ba95c7e5f5df998eaa0d275a85da6a5e8c1d0cefe857e0dea515992f80018cc08e61ecef7af72205c628cbcc0a7f0e5ce37bc77388fdd40fc190365
+MISC ChangeLog 8884 SHA256 eef310583086380cd2695fe9dba106f3715d4277d16b7dd7b869dc2c64ce7ab6 SHA512 5c82ac242a7ab74d265a3d9b07775a148db5fc9e613796b6468825edf889e6d371a7e3fe1d0ab8061d8035eb45180591a29c60b85b4422ea3d0ff1a1da26a6e2 WHIRLPOOL 646cdd786e54aa0bd9e159b3eba066fec781aa4dbcf12d01e4ac76235ce94c6ebb6e2e73416639924cbd6d0076e20adcabb89253e3ebe740617d610fa2e383ce
 MISC metadata.xml 439 SHA256 0d83c61a0bd4e45720f5c6052187d0aa236c246c330934533e7dffcc7668b2c6 SHA512 4080043ebdc6e0a172cd290a7c59dd2482a2bae3b00fc1d845b58e7e390d80e8db9d5311e473e1e384560026b6bc6c1dfcec84785b145047e08ed56c05829112 WHIRLPOOL 81b28c9e864047c0fccc948ac2f256546677b934d44830d084d3174458ffcbf8e092617b289af650840bfb1c66e4d8a8d246c1794b031aee84318ea1c846079b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlJm+lYACgkQC77qH+pIQ6TXAwD/dNT5c8ybEJK/1a8/AZ4GjFSF
-Tx9FyQ3h5XfpkFK/wFcBAIpXGz/5zg1Ocpe32i9UAa35e6saVb6VSXN7pdb6FT32
-=9Fyp
+iQEcBAEBCAAGBQJSwvjeAAoJEJWyH81tNOV9mWsH/1vcX0JWKU4ZGEjC8SqpnkQa
+fqA+8zboAfQZTda4L97Wxh4TkCCj2VD11khhqQY05nB14KyewAQwzZonZe0TlZWC
+eLLGmFWzvwjfd3u27nw4K8nGD6nKoLwDw5L9874FXyni1j6cj5+XERqK2cpZhH/2
+CgzLY7rvE5tJ4/GKQbmVOFTXGC5Wwid/+tkwUIjD4rSsGWxJJo7uMcArgi/W/vDi
+qqM05ULJBH9J+Ke0yykL0NQCxAcqCsdBjPfsHrdSFaGI9mJwIMj/D3mKsu+o1KoG
+iCNO9IBhR9tAyscK6lh0XB0oXYb/InoOiqdw7Vkid3C/XJ6e6zBSfNnExyB5JmM=
+=3xKJ
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/open-vm-tools-kmod/files/fragsize.patch b/app-emulation/open-vm-tools-kmod/files/fragsize.patch
deleted file mode 100644
index 1f85df500884..000000000000
--- a/app-emulation/open-vm-tools-kmod/files/fragsize.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-diff --git a/modules/linux/vmxnet/vmxnet.c b/modules/linux/vmxnet/vmxnet.c
-index a6f5740..3c75bb2 100644
---- a/modules/linux/vmxnet/vmxnet.c
-+++ b/modules/linux/vmxnet/vmxnet.c
-@@ -989,7 +989,7 @@ vmxnet_probe_device(struct pci_dev             *pdev, // IN: vmxnet PCI device
-       .ndo_start_xmit = &vmxnet_start_tx,
-       .ndo_stop = &vmxnet_close,
-       .ndo_get_stats = &vmxnet_get_stats,
--      .ndo_set_multicast_list = &vmxnet_set_multicast_list,
-+      .ndo_set_rx_mode = &vmxnet_set_multicast_list,
-       .ndo_change_mtu = &vmxnet_change_mtu,
- #   ifdef VMW_HAVE_POLL_CONTROLLER
-       .ndo_poll_controller = vmxnet_netpoll,
-@@ -2033,21 +2033,23 @@ vmxnet_map_pkt(struct sk_buff *skb,
-       offset -= skb_headlen(skb);
- 
-       for ( ; nextFrag < skb_shinfo(skb)->nr_frags; nextFrag++){
-+         int fragSize;
-          frag = &skb_shinfo(skb)->frags[nextFrag];
-+	fragSize = skb_frag_size(frag);
- 
-          // skip those frags that are completely copied
--         if (offset >= frag->size){
--            offset -= frag->size;
-+         if (offset >= fragSize){
-+            offset -= fragSize;
-          } else {
-             // map the part of the frag that is not copied
-             dma = pci_map_page(lp->pdev,
--                               frag->page,
-+                               frag->page.p,
-                                frag->page_offset + offset,
--                               frag->size - offset,
-+                               fragSize - offset,
-                                PCI_DMA_TODEVICE);
--            VMXNET_FILL_SG(xre->sg.sg[nextSg], dma, frag->size - offset);
-+            VMXNET_FILL_SG(xre->sg.sg[nextSg], dma, fragSize - offset);
-             VMXNET_LOG("vmxnet_map_tx: txRing[%u].sg[%d] -> frag[%d]+%u (%uB)\n",
--                       dd->txDriverNext, nextSg, nextFrag, offset, frag->size - offset);
-+                       dd->txDriverNext, nextSg, nextFrag, offset, fragSize - offset);
-             nextSg++;
-             nextFrag++;
- 
-@@ -2058,11 +2060,14 @@ vmxnet_map_pkt(struct sk_buff *skb,
- 
-    // map the remaining frags, we might need to use additional tx entries
-    for ( ; nextFrag < skb_shinfo(skb)->nr_frags; nextFrag++) {
-+      int fragSize;
-       frag = &skb_shinfo(skb)->frags[nextFrag];
-+      fragSize = skb_frag_size(frag);
-+     
-       dma = pci_map_page(lp->pdev,
--                         frag->page,
-+                         frag->page.p,
-                          frag->page_offset,
--                         frag->size,
-+                         fragSize,
-                          PCI_DMA_TODEVICE);
- 
-       if (nextSg == VMXNET2_SG_DEFAULT_LENGTH) {
-@@ -2091,9 +2096,9 @@ vmxnet_map_pkt(struct sk_buff *skb,
- 
-          nextSg = 0;
-       }
--      VMXNET_FILL_SG(xre->sg.sg[nextSg], dma, frag->size);
-+      VMXNET_FILL_SG(xre->sg.sg[nextSg], dma, fragSize);
-       VMXNET_LOG("vmxnet_map_tx: txRing[%u].sg[%d] -> frag[%d] (%uB)\n",
--                 dd->txDriverNext, nextSg, nextFrag, frag->size);
-+                 dd->txDriverNext, nextSg, nextFrag, fragSize);
-       nextSg++;
-    }
- 
-@@ -2548,7 +2553,7 @@ vmxnet_rx_frags(Vmxnet_Private *lp, struct sk_buff *skb)
-          if (UNLIKELY(newPage == NULL)) {
-             skb_shinfo(skb)->nr_frags = numFrags;
-             skb->len += skb->data_len;
--            skb->truesize += skb->data_len;
-+            skb->truesize += PAGE_SIZE;
- 
-             compat_dev_kfree_skb(skb, FREE_WRITE);
- 
-@@ -2558,10 +2563,12 @@ vmxnet_rx_frags(Vmxnet_Private *lp, struct sk_buff *skb)
-          }
- 
-          pci_unmap_page(pdev, rre2->paddr, PAGE_SIZE, PCI_DMA_FROMDEVICE);
--         skb_shinfo(skb)->frags[numFrags].page = lp->rxPages[dd->rxDriverNext2];
-+         __skb_frag_set_page(&skb_shinfo(skb)->frags[numFrags],
-+                             lp->rxPages[dd->rxDriverNext2]);
-          skb_shinfo(skb)->frags[numFrags].page_offset = 0;
-          skb_shinfo(skb)->frags[numFrags].size = rre2->actualLength;
-          skb->data_len += rre2->actualLength;
-+         skb->truesize += PAGE_SIZE;
-          numFrags++;
- 
-          /* refill the buffer */
-@@ -2579,7 +2586,7 @@ vmxnet_rx_frags(Vmxnet_Private *lp, struct sk_buff *skb)
-    VMXNET_ASSERT(numFrags > 0);
-    skb_shinfo(skb)->nr_frags = numFrags;
-    skb->len += skb->data_len;
--   skb->truesize += skb->data_len;
-+   skb->truesize += PAGE_SIZE;
-    VMXNET_LOG("vmxnet_rx: %dB from rxRing[%d](%dB)+rxRing2[%d, %d)(%dB)\n",
-               skb->len, dd->rxDriverNext, skb_headlen(skb),
-               firstFrag, dd->rxDriverNext2, skb->data_len);