diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index 8c849dd36c1e..b6401356189a 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -4,3 +4,4 @@ DIST unrarsrc-5.2.1.tar.gz 217272 SHA256 a075a8943412abb2ff5600038330a3d5a8f5a39
 DIST unrarsrc-5.2.2.tar.gz 217481 SHA256 4c134a739467dd0a18bd8aaa48f32750335c842d8a27e11b955ccc33a73ac834 SHA512 ae1d9c3009b9e632bffff54553c0ccc347e59a77236b0a76d9fe603285e17229ce295e718ca6e7658fb050a3145a03dcb2daa6e704cd459d2b7a6eb1a101daa3 WHIRLPOOL 6e3e98be8df13729b89a0c64e775c148ac560c31bb2ff8d61c7ba3ba75421da698e702336604944787eee5e3edc774ee09df62395610c4af0f6262f5870134be
 DIST unrarsrc-5.2.3.tar.gz 217841 SHA256 d249d34541dba39234cdf661ccec80e44334efe50c3ca1d7c51186cd5d26e072 SHA512 94ff765c2aa4ede7d5f2f35c3c35c634b7691559ac9bc978a4f760e22e005422a3a0d36ab09e4c492cea456161cc13dbf256eb2ead23a7976e79bf3cc89903ed WHIRLPOOL dbb7408444078a0ad507fba2d2a483c91a9519193635b25a04c076b92c27c7af9e53481cd89927ca040e03422b5a36e1192f906043706bf9ad2a80f867c27b0f
 DIST unrarsrc-5.2.7.tar.gz 218880 SHA256 ef14757e943787b439fedf2c564c1f38d0db315528a928e0de170860717e2fac SHA512 95e06451e2bec46a12e5b9b1423c3ea31ce86859f8086812d9c442aaa69627f72635a6a8c197b30dbc7e99bbf7c7caaa25d703caecbe03c697cc0e5b7644d638 WHIRLPOOL 49f5492a7441192d96616f892012ca2dac8a94063e806ece3c62bf13d29beb9d2d0368a186c0f0bff8814c9e6af542ba6b447a61683295f560f120ff75507379
+DIST unrarsrc-5.3.2.tar.gz 221786 SHA256 2d8712eed32367b1a404633f230f94f545c1f2ce0552f851266b00c261a786ea SHA512 ea3ee5dd3c15a52f577896bca0d5136c9a6e76a5552d6f56be519eb59c2cc137aba0dafe53dfb50c768e8e7f2e1c1c067a3e4d0c67383da3ae1da58ed68fe99b WHIRLPOOL 07454ef4e00ad8982cd4658aa35a120d8318b3bc7979360abdb7973855e1d6e78cd28473cf4127aa7673b26c27c7e379e483017f0f29b49b6c65d08271326d05
diff --git a/app-arch/unrar/unrar-5.3.2.ebuild b/app-arch/unrar/unrar-5.3.2.ebuild
new file mode 100644
index 000000000000..ba3f09cdf491
--- /dev/null
+++ b/app-arch/unrar/unrar-5.3.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+MY_PN=${PN}src
+
+DESCRIPTION="Uncompress rar files"
+HOMEPAGE="http://www.rarlab.com/rar_add.htm"
+SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="unRAR"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
+
+S=${WORKDIR}/unrar
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-5.0.2-build.patch
+	epatch "${FILESDIR}"/${PN}-5.2.2-no-auto-clean.patch #528218
+	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
+	else
+		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
+	fi
+	sed -i "${sed_args[@]}" makefile
+}
+
+src_configure() {
+	mkdir -p build-{lib,bin}
+	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
+	cp build-{lib,bin}/Makefile || die
+}
+
+src_compile() {
+	unrar_make() {
+		emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+	}
+
+	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname)
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV})
+
+	unrar_make -C build-bin
+}
+
+src_install() {
+	dobin build-bin/unrar
+	dodoc readme.txt
+
+	dolib.so build-lib/libunrar*
+
+	insinto /usr/include/libunrar${PV%.*.*}
+	doins *.hpp
+	dosym libunrar${PV%.*.*} /usr/include/libunrar
+}
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index dc6ffed3d995..3cf3b3ef4f3c 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -1,2 +1,3 @@
 DIST neovim-0.0.0_pre20150627.tar.xz 4715400 SHA256 5e5769c81a60637b731dc13e7584b6f91c7a4f2fa9116c7d688b938aa000ab69 SHA512 44f527e82dc8d70735110b7da687b87fb622127078dd32b9d8b284d8f3c3bce2c9978640234583f130e71378190c29e9c37cc19be8fd994eb338d1d9a5a98701 WHIRLPOOL 08125b0a0d96d2f5202b314e85b26e32e7aaf2170dfa69df660b2d36ad3218b24a9313c6f7a7c0e0ed8677a717e5d478851d1dc6bc8c020dc6798e3dd4462a2d
 DIST neovim-0.0.0_pre20150727.tar.xz 4703336 SHA256 da9bd3070ac60691be4e033947548c13b0ede86b2422d66bd207ac2310b735c1 SHA512 db225fff860d730d4514a33c363ed7748949aaeb3a5fb31c0775120d31219a9fad154ff6f457c4ea25aff666e34dc0e7c8ab1acbc3bbe73bed17d01c67d13627 WHIRLPOOL 23b553f6be136f42c7279d332e1c917083d48aa0ae27df949972ce4eae93d07ea301f9b5853d3d320cc4a6366a483f3f9d43e016607d500646c71ea33e5ffdb8
+DIST neovim-0.0.0_pre20150814.tar.xz 4718836 SHA256 e7abdb0b3a44ec3c312b06aa825caca4520f1b857045c45c925e8005e2bf3ada SHA512 638e6807929880c2648bd2d0efde509842423488272926bb3ae89a6681144b86fe5137ef313ae102fe8c2fa82819fe96e0dcc0a8d45e3ccaf18b207cf9c1aad1 WHIRLPOOL f1ca40e0bef46da63c466e0fcc51bcf37c57f64009a680f6e51cb1cf3b0d481011dff33957b5da38dfe8d55978c368efe9d905d4f26a272e915470fab239dcff
diff --git a/app-editors/neovim/files/nvimrc b/app-editors/neovim/files/nvimrc
index 316d8672e32d..635fc62a0c27 100644
--- a/app-editors/neovim/files/nvimrc
+++ b/app-editors/neovim/files/nvimrc
@@ -6,37 +6,10 @@
 " "/etc/vim/nvimrc.local" file, and on a per-user basis via "~/.nvimrc".
 " You may need to create these.
 
-" {{{ General settings
-" The following are some sensible defaults for Vim for most users.
-set bs=2                " Allow backspacing over everything in insert mode
-set ai                  " Always set auto-indenting on
-set history=50          " keep 50 lines of command history
-set ruler               " Show the cursor position all the time
-set formatoptions+=j    " Delete comment character when joining commented lines
-
-" Don't use Ex mode, use Q for formatting
-map Q gq
-
-" When doing tab completion, give the following files lower priority. You may
-" wish to set 'wildignore' to completely ignore files, and 'wildmenu' to enable
-" enhanced tab completion. These can be done in the user vimrc file.
-set suffixes+=.info,.aux,.log,.dvi,.bbl,.out,.o,.lo
-
-" When displaying line numbers, don't use an annoyingly wide number column. This
-" doesn't enable line numbers -- :set number will do that. The value given is a
-" minimum width to use for the number column, not a fixed size.
-set numberwidth=3
-
-" Use sensible whitespace indicators
-set listchars=tab:>\ ,trail:-,extends:>,precedes:<,nbsp:+
-" }}}
-
-" {{{ Modeline settings
-" We don't allow modelines by default. See bug #14088 and bug #73715.
-" If you're not concerned about these, you can enable them on a per-user
-" basis by adding "set modeline" to your ~/.vimrc file.
-set nomodeline
-" }}}
+" Neovim comes with sensible defaults, see:
+" https://github.com/neovim/neovim/issues/2676
+" Most of the general settings from Gentoo's vimrc have been dropped here.
+" We add only some necessary fixes and a few Gentoo specific settings.
 
 " {{{ Locale settings
 " If we have a BOM, always honour that rather than trying to guess.
@@ -52,44 +25,6 @@ if &fileencodings !~? "utf-8"
 endif
 " }}}
 
-" {{{ Syntax highlighting settings
-" Switch syntax highlighting on, when the terminal has colors
-" Also switch on highlighting the last used search pattern.
-if &t_Co > 2 || has("gui_running")
-  syntax on
-  set hlsearch
-endif
-" }}}
-
-" {{{ Terminal fixes
-if &term ==? "xterm"
-  set t_Sb=^[4%dm
-  set t_Sf=^[3%dm
-  set ttymouse=xterm2
-endif
-
-if &term ==? "gnome" && has("eval")
-  " Set useful keys that vim doesn't discover via termcap but are in the
-  " builtin xterm termcap. See bug #122562. We use exec to avoid having to
-  " include raw escapes in the file.
-  exec "set <C-Left>=\eO5D"
-  exec "set <C-Right>=\eO5C"
-endif
-" }}}
-
-" {{{ Filetype plugin settings
-" Enable plugin-provided filetype settings, but only if the ftplugin
-" directory exists (which it won't on livecds, for example).
-if isdirectory(expand("$VIMRUNTIME/ftplugin"))
-  filetype plugin on
-
-  " Uncomment the next line (or copy to your ~/.vimrc) for plugin-provided
-  " indent settings. Some people don't like these, so we won't turn them on by
-  " default.
-  " filetype indent on
-endif
-" }}}
-
 " {{{ Fix &shell, see bug #101665.
 if "" == &shell
   if executable("/bin/bash")
@@ -119,22 +54,21 @@ augroup gentoo
   " Note that the rules below are very minimal and don't cover everything.
   " Better to emerge app-vim/gentoo-syntax, which provides full syntax,
   " filetype and indent settings for all things Gentoo.
-  au BufRead,BufNewFile *.e{build,class} let is_bash=1|setfiletype sh
   au BufRead,BufNewFile *.e{build,class} set ts=4 sw=4 noexpandtab
 
   " In text files, limit the width of text to 78 characters, but be careful
   " that we don't override the user's setting.
   autocmd BufNewFile,BufRead *.txt
         \ if &tw == 0 && ! exists("g:leave_my_textwidth_alone") |
-        \     setlocal textwidth=78 |
+        \   setlocal textwidth=78 |
         \ endif
 
   " When editing a file, always jump to the last cursor position
   autocmd BufReadPost *
         \ if ! exists("g:leave_my_cursor_position_alone") |
-        \     if line("'\"") > 0 && line ("'\"") <= line("$") |
-        \         exe "normal g'\"" |
-        \     endif |
+        \   if line("'\"") > 0 && line ("'\"") <= line("$") |
+        \     exe "normal g'\"" |
+        \   endif |
         \ endif
 
   " When editing a crontab file, set backupcopy to yes rather than auto. See
@@ -147,22 +81,25 @@ augroup gentoo
   " Except of course if a byte-order mark is in effect.
   autocmd BufReadPost *
         \ if exists("g:added_fenc_utf8") && &fileencoding == "utf-8" &&
-        \    ! &bomb && search('[\x80-\xFF]','nw') == 0 && &modifiable |
-        \       set fileencoding= |
+        \   ! &bomb && search('[\x80-\xFF]','nw') == 0 && &modifiable |
+        \     set fileencoding= |
         \ endif
 
-augroup END
+  " Strip trailing spaces on write
+  autocmd BufWritePre *.e{build,class}
+        \ if ! exists("g:leave_my_trailing_space_alone") |
+        \   :%s/\s\+$//e |
+        \ endif
 
-" Strip trailing spaces on write
-autocmd BufWritePre * :%s/\s\+$//e
+augroup END
 
 endif " has("autocmd")
 " }}}
 
-" {{{ vimrc.local
+" {{{ nvimrc.local
 if filereadable("/etc/vim/nvimrc.local")
   source /etc/vim/nvimrc.local
 endif
 " }}}
 
-" vim: set fenc=utf-8 tw=80 sw=2 sts=2 et foldmethod=marker :
+" vim: set tw=80 sw=2 sts=2 et foldmethod=marker :
diff --git a/app-editors/neovim/metadata.xml b/app-editors/neovim/metadata.xml
index d5a0b7af40f6..4ead8c2a61bf 100644
--- a/app-editors/neovim/metadata.xml
+++ b/app-editors/neovim/metadata.xml
@@ -2,6 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>vim</herd>
+  <use>
+    <flag name='nvimpager'>Install nvimpager symlink to less.sh macro</flag>
+  </use>
   <upstream>
     <remote-id type="github">neovim/neovim</remote-id>
   </upstream>
diff --git a/app-editors/neovim/neovim-0.0.0_pre20150814.ebuild b/app-editors/neovim/neovim-0.0.0_pre20150814.ebuild
new file mode 100644
index 000000000000..27615d2a9f9e
--- /dev/null
+++ b/app-editors/neovim/neovim-0.0.0_pre20150814.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="Ambitious vim fork focused on extensibility and agility"
+HOMEPAGE="https://github.com/neovim/neovim"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/neovim/neovim.git"
+else
+	SRC_URI="http://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0 vim"
+SLOT="0"
+IUSE="+nvimpager perl python"
+
+CDEPEND="dev-lang/luajit:2
+	>=dev-libs/libtermkey-0.17
+	dev-libs/libvterm-neovim
+	>=dev-libs/unibilium-1.1.1
+	>=dev-libs/libuv-1.2.0
+	>=dev-libs/msgpack-0.6.0_pre20150220
+	dev-lua/lpeg
+	dev-lua/messagepack"
+DEPEND="${CDEPEND}
+	virtual/libiconv
+	virtual/libintl"
+RDEPEND="${CDEPEND}
+	perl? ( dev-lang/perl )
+	python? ( dev-python/neovim-python-client )"
+
+src_prepare() {
+	# use our system vim dir
+	sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
+		-i src/nvim/os/unix_defs.h || die
+
+	# add eclass to bash filetypes
+	sed -e 's|*.ebuild|*.ebuild,*.eclass|' -i runtime/filetype.vim || die
+
+	# make less.sh macro actually work with neovim
+	sed -e 's|vim |nvim |g' -i runtime/macros/less.sh || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	export USE_BUNDLED_DEPS=OFF
+	append-cflags "-Wno-error"
+	append-cppflags "-DNDEBUG -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1"
+	local mycmakeargs=(
+		-DCMAKE_BUILD_TYPE=Release
+		-DLIBUNIBILIUM_USE_STATIC=OFF
+		-DLIBTERMKEY_USE_STATIC=OFF
+		-DLIBVTERM_USE_STATIC=OFF
+		)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# install a default configuration file
+	insinto /etc/vim
+	doins "${FILESDIR}"/nvimrc
+
+	# conditionally install a symlink for nvimpager
+	if use nvimpager; then
+		dosym /usr/share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
+	fi
+}
diff --git a/dev-dotnet/libgdiplus/Manifest b/dev-dotnet/libgdiplus/Manifest
index c3082d64f6d7..11b004f5e97c 100644
--- a/dev-dotnet/libgdiplus/Manifest
+++ b/dev-dotnet/libgdiplus/Manifest
@@ -1 +1,2 @@
 DIST libgdiplus-2.10.9.tar.bz2 2074317 SHA256 6ddeb6c327bada7cb6e06d1a20714f526a0c69520dfd42c12ddd032c3c5d964e SHA512 7f1944795c7ede5fd92a6d7e8d7d6cf2ef3c154e656b83e769b417f8f7195dd975084afe3c3cd1dda1ecb2c1167f76c0b5714cd16d549ff056add09763c6b26c WHIRLPOOL 0930cb2ad191c34b7ebd073f687536663bcfe9a44ed3296cf81bc9d43cfc7ee39d8f60f9b9f83f89847164b7366e514ee945737be50b82257209507c3b6e9c5d
+DIST libgdiplus-3.12.tar.gz 688120 SHA256 e61c4dc1bc2ba993e4f79029472efcf5760eb9e60eb20d9cd31f0ebe9113bfc9 SHA512 12c58e7ad99e5aa7caf19f64f47bddd399648292f3c2b9ade64e9051b0495bb8772af8ca9cdb6cb664d20c845d7136f028e10e659548bffd35e7604548bb8743 WHIRLPOOL 288ea9f2b8f5599278f039be1af32f54d0496da6ce70c3e937485d0a3a40494680a7c0fc55430602c256c487df1d57c0b6d8f6220a52b8ac0d7a48e6211d6ead
diff --git a/dev-dotnet/libgdiplus/files/libgdiplus-3.12-giflib-quantizebuffer.patch b/dev-dotnet/libgdiplus/files/libgdiplus-3.12-giflib-quantizebuffer.patch
new file mode 100644
index 000000000000..5d0b9c227e1a
--- /dev/null
+++ b/dev-dotnet/libgdiplus/files/libgdiplus-3.12-giflib-quantizebuffer.patch
@@ -0,0 +1,298 @@
+diff --git a/src/gifcodec.c b/src/gifcodec.c
+index e1a0697..e645c6e 100644
+--- a/src/gifcodec.c
++++ b/src/gifcodec.c
+@@ -39,6 +39,293 @@ GUID gdip_gif_image_format_guid = {0xb96b3cb0U, 0x0728U, 0x11d3U, {0x9d, 0x7b, 0
+ 
+ #include "gifcodec.h"
+ 
++#define COLOR_ARRAY_SIZE 32768
++#define BITS_PER_PRIM_COLOR 5
++#define MAX_PRIM_COLOR      0x1f
++
++static int SortRGBAxis;
++
++typedef struct QuantizedColorType {
++    GifByteType RGB[3];
++    GifByteType NewColorIndex;
++    long Count;
++    struct QuantizedColorType *Pnext;
++} QuantizedColorType;
++
++typedef struct NewColorMapType {
++    GifByteType RGBMin[3], RGBWidth[3];
++    unsigned int NumEntries; /* # of QuantizedColorType in linked list below */
++    unsigned long Count; /* Total number of pixels in all the entries */
++    QuantizedColorType *QuantizedColors;
++} NewColorMapType;
++
++
++/****************************************************************************
++ * Routine called by qsort to compare two entries.
++ ****************************************************************************/
++static int
++SortCmpRtn(const void *Entry1,
++           const void *Entry2) {
++
++    return (*((QuantizedColorType **) Entry1))->RGB[SortRGBAxis] -
++       (*((QuantizedColorType **) Entry2))->RGB[SortRGBAxis];
++}
++
++/******************************************************************************
++ * Routine to subdivide the RGB space recursively using median cut in each
++ * axes alternatingly until ColorMapSize different cubes exists.
++ * The biggest cube in one dimension is subdivide unless it has only one entry.
++ * Returns GIF_ERROR if failed, otherwise GIF_OK.
++ ******************************************************************************/
++static int
++SubdivColorMap(NewColorMapType * NewColorSubdiv,
++               unsigned int ColorMapSize,
++               unsigned int *NewColorMapSize) {
++
++    int MaxSize;
++    unsigned int i, j, Index = 0, NumEntries, MinColor, MaxColor;
++    long Sum, Count;
++    QuantizedColorType *QuantizedColor, **SortArray;
++
++    while (ColorMapSize > *NewColorMapSize) {
++        /* Find candidate for subdivision: */
++        MaxSize = -1;
++        for (i = 0; i < *NewColorMapSize; i++) {
++            for (j = 0; j < 3; j++) {
++                if ((((int)NewColorSubdiv[i].RGBWidth[j]) > MaxSize) &&
++                      (NewColorSubdiv[i].NumEntries > 1)) {
++                    MaxSize = NewColorSubdiv[i].RGBWidth[j];
++                    Index = i;
++                    SortRGBAxis = j;
++                }
++            }
++        }
++
++        if (MaxSize == -1)
++            return GIF_OK;
++
++        /* Split the entry Index into two along the axis SortRGBAxis: */
++
++        /* Sort all elements in that entry along the given axis and split at
++         * the median.  */
++        SortArray = (QuantizedColorType **)malloc(
++                      sizeof(QuantizedColorType *) *
++                      NewColorSubdiv[Index].NumEntries);
++        if (SortArray == NULL)
++            return GIF_ERROR;
++        for (j = 0, QuantizedColor = NewColorSubdiv[Index].QuantizedColors;
++             j < NewColorSubdiv[Index].NumEntries && QuantizedColor != NULL;
++             j++, QuantizedColor = QuantizedColor->Pnext)
++            SortArray[j] = QuantizedColor;
++
++        qsort(SortArray, NewColorSubdiv[Index].NumEntries,
++              sizeof(QuantizedColorType *), SortCmpRtn);
++
++        /* Relink the sorted list into one: */
++        for (j = 0; j < NewColorSubdiv[Index].NumEntries - 1; j++)
++            SortArray[j]->Pnext = SortArray[j + 1];
++        SortArray[NewColorSubdiv[Index].NumEntries - 1]->Pnext = NULL;
++        NewColorSubdiv[Index].QuantizedColors = QuantizedColor = SortArray[0];
++        free((char *)SortArray);
++
++        /* Now simply add the Counts until we have half of the Count: */
++        Sum = NewColorSubdiv[Index].Count / 2 - QuantizedColor->Count;
++        NumEntries = 1;
++        Count = QuantizedColor->Count;
++        while (QuantizedColor->Pnext != NULL &&
++              (Sum -= QuantizedColor->Pnext->Count) >= 0 &&
++               QuantizedColor->Pnext->Pnext != NULL) {
++            QuantizedColor = QuantizedColor->Pnext;
++            NumEntries++;
++            Count += QuantizedColor->Count;
++        }
++        /* Save the values of the last color of the first half, and first
++         * of the second half so we can update the Bounding Boxes later.
++         * Also as the colors are quantized and the BBoxes are full 0..255,
++         * they need to be rescaled.
++         */
++        MaxColor = QuantizedColor->RGB[SortRGBAxis]; /* Max. of first half */
++       /* coverity[var_deref_op] */
++        MinColor = QuantizedColor->Pnext->RGB[SortRGBAxis]; /* of second */
++        MaxColor <<= (8 - BITS_PER_PRIM_COLOR);
++        MinColor <<= (8 - BITS_PER_PRIM_COLOR);
++
++        /* Partition right here: */
++        NewColorSubdiv[*NewColorMapSize].QuantizedColors =
++           QuantizedColor->Pnext;
++        QuantizedColor->Pnext = NULL;
++        NewColorSubdiv[*NewColorMapSize].Count = Count;
++        NewColorSubdiv[Index].Count -= Count;
++        NewColorSubdiv[*NewColorMapSize].NumEntries =
++           NewColorSubdiv[Index].NumEntries - NumEntries;
++        NewColorSubdiv[Index].NumEntries = NumEntries;
++        for (j = 0; j < 3; j++) {
++            NewColorSubdiv[*NewColorMapSize].RGBMin[j] =
++               NewColorSubdiv[Index].RGBMin[j];
++            NewColorSubdiv[*NewColorMapSize].RGBWidth[j] =
++               NewColorSubdiv[Index].RGBWidth[j];
++        }
++        NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] =
++           NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] +
++           NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] - MinColor;
++        NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] = MinColor;
++
++        NewColorSubdiv[Index].RGBWidth[SortRGBAxis] =
++           MaxColor - NewColorSubdiv[Index].RGBMin[SortRGBAxis];
++
++        (*NewColorMapSize)++;
++    }
++
++    return GIF_OK;
++}
++
++/******************************************************************************
++ * Quantize high resolution image into lower one. Input image consists of a
++ * 2D array for each of the RGB colors with size Width by Height. There is no
++ * Color map for the input. Output is a quantized image with 2D array of
++ * indexes into the output color map.
++ *   Note input image can be 24 bits at the most (8 for red/green/blue) and
++ * the output has 256 colors at the most (256 entries in the color map.).
++ * ColorMapSize specifies size of color map up to 256 and will be updated to
++ * real size before returning.
++ *   Also non of the parameter are allocated by this routine.
++ *   This function returns GIF_OK if succesfull, GIF_ERROR otherwise.
++ ******************************************************************************/
++static int
++QuantizeBuffer(unsigned int Width,
++               unsigned int Height,
++               int *ColorMapSize,
++               GifByteType * RedInput,
++               GifByteType * GreenInput,
++               GifByteType * BlueInput,
++               GifByteType * OutputBuffer,
++               GifColorType * OutputColorMap) {
++
++    unsigned int Index, NumOfEntries;
++    int i, j, MaxRGBError[3];
++    unsigned int NewColorMapSize;
++    long Red, Green, Blue;
++    NewColorMapType NewColorSubdiv[256];
++    QuantizedColorType *ColorArrayEntries, *QuantizedColor;
++
++    ColorArrayEntries = (QuantizedColorType *)malloc(
++                           sizeof(QuantizedColorType) * COLOR_ARRAY_SIZE);
++    if (ColorArrayEntries == NULL) {
++        return GIF_ERROR;
++    }
++
++    for (i = 0; i < COLOR_ARRAY_SIZE; i++) {
++        ColorArrayEntries[i].RGB[0] = i >> (2 * BITS_PER_PRIM_COLOR);
++        ColorArrayEntries[i].RGB[1] = (i >> BITS_PER_PRIM_COLOR) &
++           MAX_PRIM_COLOR;
++        ColorArrayEntries[i].RGB[2] = i & MAX_PRIM_COLOR;
++        ColorArrayEntries[i].Count = 0;
++    }
++
++    /* Sample the colors and their distribution: */
++    for (i = 0; i < (int)(Width * Height); i++) {
++        Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
++                  (2 * BITS_PER_PRIM_COLOR)) +
++                ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
++                  BITS_PER_PRIM_COLOR) +
++                (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR));
++        ColorArrayEntries[Index].Count++;
++    }
++
++    /* Put all the colors in the first entry of the color map, and call the
++     * recursive subdivision process.  */
++    for (i = 0; i < 256; i++) {
++        NewColorSubdiv[i].QuantizedColors = NULL;
++        NewColorSubdiv[i].Count = NewColorSubdiv[i].NumEntries = 0;
++        for (j = 0; j < 3; j++) {
++            NewColorSubdiv[i].RGBMin[j] = 0;
++            NewColorSubdiv[i].RGBWidth[j] = 255;
++        }
++    }
++
++    /* Find the non empty entries in the color table and chain them: */
++    for (i = 0; i < COLOR_ARRAY_SIZE; i++)
++        if (ColorArrayEntries[i].Count > 0)
++            break;
++    QuantizedColor = NewColorSubdiv[0].QuantizedColors = &ColorArrayEntries[i];
++    NumOfEntries = 1;
++    while (++i < COLOR_ARRAY_SIZE)
++        if (ColorArrayEntries[i].Count > 0) {
++            QuantizedColor->Pnext = &ColorArrayEntries[i];
++            QuantizedColor = &ColorArrayEntries[i];
++            NumOfEntries++;
++        }
++    QuantizedColor->Pnext = NULL;
++
++    NewColorSubdiv[0].NumEntries = NumOfEntries; /* Different sampled colors */
++    NewColorSubdiv[0].Count = ((long)Width) * Height; /* Pixels */
++    NewColorMapSize = 1;
++    if (SubdivColorMap(NewColorSubdiv, *ColorMapSize, &NewColorMapSize) !=
++       GIF_OK) {
++        free((char *)ColorArrayEntries);
++        return GIF_ERROR;
++    }
++    if (NewColorMapSize < *ColorMapSize) {
++        /* And clear rest of color map: */
++        for (i = NewColorMapSize; i < *ColorMapSize; i++)
++            OutputColorMap[i].Red = OutputColorMap[i].Green =
++                OutputColorMap[i].Blue = 0;
++    }
++
++    /* Average the colors in each entry to be the color to be used in the
++     * output color map, and plug it into the output color map itself. */
++    for (i = 0; i < NewColorMapSize; i++) {
++        if ((j = NewColorSubdiv[i].NumEntries) > 0) {
++            QuantizedColor = NewColorSubdiv[i].QuantizedColors;
++            Red = Green = Blue = 0;
++            while (QuantizedColor) {
++                QuantizedColor->NewColorIndex = i;
++                Red += QuantizedColor->RGB[0];
++                Green += QuantizedColor->RGB[1];
++                Blue += QuantizedColor->RGB[2];
++                QuantizedColor = QuantizedColor->Pnext;
++            }
++            OutputColorMap[i].Red = (Red << (8 - BITS_PER_PRIM_COLOR)) / j;
++            OutputColorMap[i].Green = (Green << (8 - BITS_PER_PRIM_COLOR)) / j;
++            OutputColorMap[i].Blue = (Blue << (8 - BITS_PER_PRIM_COLOR)) / j;
++        } else
++            fprintf(stderr,
++                    "\n%s: Null entry in quantized color map - that's weird.\n",
++                    "libgdiplus");
++    }
++
++    /* Finally scan the input buffer again and put the mapped index in the
++     * output buffer.  */
++    MaxRGBError[0] = MaxRGBError[1] = MaxRGBError[2] = 0;
++    for (i = 0; i < (int)(Width * Height); i++) {
++        Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
++                 (2 * BITS_PER_PRIM_COLOR)) +
++                ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
++                 BITS_PER_PRIM_COLOR) +
++                (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR));
++        Index = ColorArrayEntries[Index].NewColorIndex;
++        OutputBuffer[i] = Index;
++        if (MaxRGBError[0] < ABS(OutputColorMap[Index].Red - RedInput[i]))
++            MaxRGBError[0] = ABS(OutputColorMap[Index].Red - RedInput[i]);
++        if (MaxRGBError[1] < ABS(OutputColorMap[Index].Green - GreenInput[i]))
++            MaxRGBError[1] = ABS(OutputColorMap[Index].Green - GreenInput[i]);
++        if (MaxRGBError[2] < ABS(OutputColorMap[Index].Blue - BlueInput[i]))
++            MaxRGBError[2] = ABS(OutputColorMap[Index].Blue - BlueInput[i]);
++    }
++
++#ifdef DEBUG
++    fprintf(stderr,
++            "Quantization L(0) errors: Red = %d, Green = %d, Blue = %d.\n",
++            MaxRGBError[0], MaxRGBError[1], MaxRGBError[2]);
++#endif /* DEBUG */
++
++    free((char *)ColorArrayEntries);
++
++    *ColorMapSize = NewColorMapSize;
++
++    return GIF_OK;
++}
++
+ #ifdef EgifOpen
+ /* giflib declares this incorrectly as EgifOpen */
+ extern GifFileType *EGifOpen(void *userData, OutputFunc writeFunc);
diff --git a/dev-dotnet/libgdiplus/libgdiplus-3.12.ebuild b/dev-dotnet/libgdiplus/libgdiplus-3.12.ebuild
new file mode 100644
index 000000000000..5959db39b917
--- /dev/null
+++ b/dev-dotnet/libgdiplus/libgdiplus-3.12.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit base eutils dotnet flag-o-matic
+
+DESCRIPTION="Library for using System.Drawing with mono"
+HOMEPAGE="http://www.mono-project.com"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.gz"
+
+IUSE="cairo"
+
+RDEPEND=">=dev-libs/glib-2.2.3:2
+	>=media-libs/freetype-2.3.7
+	>=media-libs/fontconfig-2.6
+	>=media-libs/libpng-1.4:0
+	x11-libs/libXrender
+	x11-libs/libX11
+	x11-libs/libXt
+	>=x11-libs/cairo-1.8.4[X]
+	media-libs/libexif
+	>=media-libs/giflib-4.2.3
+	virtual/jpeg:0
+	media-libs/tiff:0
+	!cairo? ( >=x11-libs/pango-1.20 )"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-giflib-quantizebuffer.patch"  )
+
+RESTRICT="test"
+
+src_prepare() {
+	base_src_prepare
+	sed -i -e 's:ungif:gif:g' configure || die
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	econf 	--disable-dependency-tracking		\
+		--disable-static			\
+		--with-cairo=system			\
+		$(use !cairo && printf %s --with-pango)
+}
+
+src_compile() {
+	emake "$@"
+}
+
+src_install () {
+	emake -j1 DESTDIR="${D}" "$@" install #nowarn
+	dotnet_multilib_comply
+	local commondoc=( AUTHORS ChangeLog README TODO )
+	for docfile in "${commondoc[@]}"
+	do
+		[[ -e "${docfile}" ]] && dodoc "${docfile}"
+	done
+	if [[ "${DOCS[@]}" ]]
+	then
+		dodoc "${DOCS[@]}"
+	fi
+	prune_libtool_files
+}
diff --git a/dev-dotnet/mono-addins/Manifest b/dev-dotnet/mono-addins/Manifest
index 9a8d458b7480..22e394d6f4da 100644
--- a/dev-dotnet/mono-addins/Manifest
+++ b/dev-dotnet/mono-addins/Manifest
@@ -1 +1,2 @@
 DIST mono-addins-0.6.2.tar.bz2 337614 SHA256 3c24199e1de00860bffcfa0ff0859abe8ee38cacdcbffff0c6854042d8ea2f2c SHA512 6556cf8c82c9f25eba5df88bbec8d9d3dd39ad5b3a904cdadc82d6eccc71b27e07ad2faa2b41eba5b3519fd6dbcc50a398104e396dcae09b152252adb8f3f0f5 WHIRLPOOL b307fb11476bd2e29cdb80260b0c54556ebe5d3a25d4d84751415972085a72680218948fdbf030ba94cf7a5aacf155ce774d399f28771f73ddd41b060269faff
+DIST mono-addins-1.0.tar.gz 548940 SHA256 aee8ce94208478c98f04310ff5a7915d6fd143d1431d420911d58d3c6b951647 SHA512 ba2f625b2f9c9f0c367c87670c930b4c8ee874b04721fd1ca636c8ef5c27702256057c9bcebc9a3d1edd7bedd21a700268cbeadeecc795d3004a7b7ada8f5c24 WHIRLPOOL bec45263394880a12839c72283c4b5366af538f819018a0a86aa3f81d304c95da0ce43fe92f8fad8bb6a2a291854c05eb28d913db8ed56d0aa8a6086941b945a
diff --git a/dev-dotnet/mono-addins/files/gmcs.patch b/dev-dotnet/mono-addins/files/gmcs.patch
new file mode 100644
index 000000000000..a2426cf90945
--- /dev/null
+++ b/dev-dotnet/mono-addins/files/gmcs.patch
@@ -0,0 +1,15 @@
+diff -u origin/configure.ac mono-addins-mono-addins-1.0/configure.ac
+--- origin/configure.ac
++++ mono-addins-mono-addins-1.0/configure.ac
+@@ -18,7 +18,10 @@
+ 
+ AC_PROG_INSTALL
+ 
+-AC_PATH_PROG(MCS, gmcs, no)
++MCS=no
++AC_PATH_PROG(MCS, gmcs)
++AC_PATH_PROG(MCS, dmcs)
++AC_PATH_PROG(MCS, mcs)
+ if test "x$MCS" = "xno"; then
+         AC_MSG_ERROR([mcs Not found])
+ fi
diff --git a/dev-dotnet/mono-addins/mono-addins-1.0-r1.ebuild b/dev-dotnet/mono-addins/mono-addins-1.0-r1.ebuild
new file mode 100644
index 000000000000..1af43b0e33ac
--- /dev/null
+++ b/dev-dotnet/mono-addins/mono-addins-1.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils dotnet multilib autotools-utils
+
+DESCRIPTION="A generic framework for creating extensible applications"
+HOMEPAGE="http://www.mono-project.com/Mono.Addins"
+SRC_URI="http://github.com/mono/${PN}/archive/${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+gtk"
+
+RDEPEND=">=dev-lang/mono-3
+	gtk? ( >=dev-dotnet/gtk-sharp-2.12.21:2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+MAKEOPTS="${MAKEOPTS} -j1" #nowarn
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/gmcs.patch"
+
+	eautoreconf
+	autotools-utils_src_prepare
+	## with dev-dotnet/gtk-sharp-2.99.1
+	## it gives
+	## checking for GTK_SHARP_20... no
+	## configure: error: Package requirements (gtk-sharp-2.0) were not met:
+	##
+	## No package 'gtk-sharp-2.0' found
+
+	sed -i "s;Mono.Cairo;Mono.Cairo, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756;g" Mono.Addins.Gui/Mono.Addins.Gui.csproj || die "sed failed"
+}
+
+src_configure() {
+	econf $(use_enable gtk gui)
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+	dotnet_multilib_comply
+}
diff --git a/dev-dotnet/xdt-for-monodevelop/Manifest b/dev-dotnet/xdt-for-monodevelop/Manifest
index cc4ad97146fd..45116f30d5ef 100644
--- a/dev-dotnet/xdt-for-monodevelop/Manifest
+++ b/dev-dotnet/xdt-for-monodevelop/Manifest
@@ -1 +1,2 @@
+DIST xdt-for-monodevelop-2.8.1.tar.gz 50980 SHA256 d4e87e92eb5e38ea46c9d1a8df54b99f52b628f8283e5b819cd0a354db61df61 SHA512 67732aea4fd65e01c32e83a14c8a5b08e9173779cfdabd03bc43d373074b3b4d80c682c04e3ef35bdfd56bedc33f8f4e6ba6980565bccb711001f87a3e675210 WHIRLPOOL 6b53cb25f9e1b8db93e1d2bed9879eb406e8470ff4999ac4438e472ee201b975ae819e8d9ec12fe1d4ae29a746feaf1ab8a49bf10bf2256af6dd77dfd9ff252e
 DIST xdt-for-monodevelop-2.8.3.tar.gz 50974 SHA256 fb1a92dd745ca564d7179113bef6ca4e719d75583b33ca2bc65b74ce89c5d3c4 SHA512 3770b1ad8aab9c85e0b93bbf42415130b83eccf766fee5a2d08fe276af01cbf31ff4ab4cac661df982587e5b83b8efc8cd733a79bc387d666526aeb146f79f02 WHIRLPOOL 75fcc1b9054de7c8f6ed0e99ea3cb40e1d60fbaa4a077c86ed018ed462ceb2194111133e6a66a46e503eb5cd6230e3d1c96d97ed0c2572e0571c872b501eb099
diff --git a/dev-dotnet/xdt-for-monodevelop/xdt-for-monodevelop-2.8.1.ebuild b/dev-dotnet/xdt-for-monodevelop/xdt-for-monodevelop-2.8.1.ebuild
new file mode 100644
index 000000000000..811cade9e5bf
--- /dev/null
+++ b/dev-dotnet/xdt-for-monodevelop/xdt-for-monodevelop-2.8.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit dotnet eutils
+
+DESCRIPTION="Microsoft's Xml Document Transformation library"
+HOMEPAGE="https://github.com/mrward/xdt"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+SRC_URI="https://github.com/mrward/xdt/archive/Release-NuGet-${PV}-Mono.tar.gz -> xdt-for-monodevelop-${PV}.tar.gz"
+S=${WORKDIR}/xdt-Release-NuGet-${PV}-Mono
+
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND="|| ( dev-lang/mono )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	dotnet_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/disable-testproject-build-in-sln.patch"
+	cp "${FILESDIR}/rsa-4096.snk" "${S}/XmlTransform" || die
+	epatch "${FILESDIR}/add-keyfile-option-to-csproj.patch"
+	sed -i -e "s/1.0.0/${PV}/g"  "${S}/XmlTransform/Properties/AssemblyInfo.cs" || die
+}
+
+src_configure() {
+	export EnableNuGetPackageRestore="true"
+}
+
+src_compile() {
+	exbuild Microsoft.Web.XmlTransform.sln
+}
+
+src_install() {
+	elog "Installing Microsoft.Web.XmlTransform.dll to GAC"
+	egacinstall XmlTransform/bin/Release/Microsoft.Web.XmlTransform.dll
+}
diff --git a/dev-dotnet/xsp/Manifest b/dev-dotnet/xsp/Manifest
index 01017d5b3e17..e69de29bb2d1 100644
--- a/dev-dotnet/xsp/Manifest
+++ b/dev-dotnet/xsp/Manifest
@@ -1 +0,0 @@
-DIST xsp-2.10.2.tar.bz2 284801 SHA256 f4657f724167244d9baedf94e1d5747b8f1f53c339c7a11897154c1eb1289d4e SHA512 9b49e3a712e062b9a272e72609eda3cb8139127bc9780d6374a3567f51f15f38233f92252c2e4c22778b1841de66855dfe6a8cf81c97c6ebbf84f71dda0d43dd WHIRLPOOL fce613fedf164f7cd4cf0bae622884a4f7b6747e249d965c4ea23997586371b6a588ad96d66bcc5c6e74f98b76de3f374cd676de164ba1f3a889e4b00b8b6dcc
diff --git a/dev-dotnet/xsp/xsp-2.10.2-r2.ebuild b/dev-dotnet/xsp/xsp-2.10.2-r2.ebuild
deleted file mode 100644
index dcf35279a672..000000000000
--- a/dev-dotnet/xsp/xsp-2.10.2-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils go-mono mono user
-
-PATCHDIR="${FILESDIR}/2.2/"
-
-DESCRIPTION="XSP is a small web server that can host ASP.NET pages"
-HOMEPAGE="http://www.mono-project.com/ASP.NET"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-IUSE=""
-
-RDEPEND="dev-db/sqlite:3"
-DEPEND="${RDEPEND}"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_prepare() {
-	# Added try/catch around EndRequest Record sending, bug #432750
-	epatch "${FILESDIR}/${PN}-2.10.2-endrequest.patch"
-}
-
-src_configure() {
-	default
-}
-
-pkg_preinst() {
-	enewgroup aspnet
-	# Give aspnet home dir of /tmp since it must create ~/.wapi
-	enewuser aspnet -1 -1 /tmp aspnet
-}
-
-src_install() {
-	mv_command="cp -ar" go-mono_src_install
-	newinitd "${PATCHDIR}"/xsp.initd xsp
-	newinitd "${PATCHDIR}"/mod-mono-server-r1.initd mod-mono-server
-	newconfd "${PATCHDIR}"/xsp.confd xsp
-	newconfd "${PATCHDIR}"/mod-mono-server.confd mod-mono-server
-
-	keepdir /var/run/aspnet
-}
-
-pkg_postinst() {
-	chown aspnet:aspnet /var/run/aspnet
-}
diff --git a/dev-libs/ace/Manifest b/dev-libs/ace/Manifest
index 4ff8308da3af..f30eb6166a78 100644
--- a/dev-libs/ace/Manifest
+++ b/dev-libs/ace/Manifest
@@ -1,3 +1,6 @@
 DIST ACE+TAO+CIAO-5.7.2.tar.bz2 49824451 SHA256 5290e378c9417892e7e57eef06e74affeb6a93ba3e7c67e24e02e72c282ea37a SHA512 798707aaa04b253f4b1241cd3263a87bdf7188437f858aac910a6fbf54bcf27c41f827fe81cea68b813ac068bd7a04f63e7f4eb948432d9240c4979fdf7f0ce1 WHIRLPOOL 23214425fd1d2a13622b1f21ec16fde84eb76a22305a6393642cdb4ea3d6d58481b59323a64ac91bed7ff672d5b5e8b6fe389ed9620ce898a00bf6332370d38e
+DIST ACE+TAO+CIAO-5.8.3.tar.bz2 44653860 SHA256 db4e7722e8c931902b7781c6a17f6d22037c93edc979ab5581a59e4990e59562 SHA512 e062c1922ebec33eea7d55fbb97acc487cb2f0342a80312a5eeebe0d3e026df9632a1b2e93e146c308971c4cfc0189cf7cfbdadfb003493971c837b506e22184 WHIRLPOOL f36decf821a3943677b74b632d7ca17444646b5cb7b867128224fa1f8f4bfb10ce4515282ab671056529aa6f9dc96026709a08e16f4c90c2969c68e8ad82db5a
 DIST ACE+TAO-5.7.2.tar.bz2 26111373 SHA256 95d9bfe506bfe55e489863413d83f214d2f6948a836449ed4dce6cf8c7d05d1d SHA512 9c25bc3773dd92d943bf67595470a485be1d7ebe893ddf20ec55a77d66080cf755e0c5cdc77a8f53d49d1f2ae4ec03cdbc7ac0dc68e179467b8ce7ad3abb5387 WHIRLPOOL 02b575fc831e988164be3667f1c8b34ef7bd6c5fe131884d4443058a70ca68f975391e5b7efc56235e4d4b598879941fd6737a7a1d0448b837a512ee7269630e
+DIST ACE+TAO-5.8.3.tar.bz2 21366503 SHA256 d7b7a8c570b479959465a2b0fe5013933513958b36716c05327b256a63e7c9ae SHA512 9474251a0dff0659cf0951ad7ef48bf98503e6aa293121fecaaa6d4eba665dc557b17d004f4a589b13a45bccf9ddba893fc9ea454b257c7117d8747bbc04c886 WHIRLPOOL 17fe4a016cd4d5b25bda9041a9a6ccf4d9d4ba3daf0f7266c2e3f74797ee492b59b259313e7806d07d8d3768824e15fe06383a1769e060a8b3a62156fc49278a
 DIST ACE-5.7.2.tar.bz2 9724175 SHA256 e358281a93cbc932351030675fb7956875f996e0dc42cf1f499a2d5bd018e0ad SHA512 7f5d77ea9ab1f03ad615cf6b01cb75b0484c5e828790609b8492463153a34c62d974000c0f3952dfdab143cad3c0aa6e2ddc7ea089989b6e9b9797bc6430d38b WHIRLPOOL e57db857a3ca1411fe3bcf166b7aee059d8e07e752cdd919e9ca7a1766bea7562027752326a24937719da432323569f302360849d3976bd44f05f0bfb1ce0946
+DIST ACE-5.8.3.tar.bz2 8956345 SHA256 fabf53dd64674b80eee296cc95705f13866230c70bbac10f475e5a6169395b9d SHA512 3b1e0dfdd59dacbfd987499653e42ad41273de28bb5e920105b897567eed96f6e1b09a03c7f342277c2cf82231426b2bee4ed76ad98fec05e0fe589c9d86c469 WHIRLPOOL 61641e94452a538f90ded35c9b91030246566c3e90e9e7ea48831a7232d765de9207106a9ca58a7674a8e7631e8e8731e648fadb613995c87fe84181a0973105
diff --git a/dev-libs/ace/ace-5.8.3.ebuild b/dev-libs/ace/ace-5.8.3.ebuild
new file mode 100644
index 000000000000..66aa47cf3a2d
--- /dev/null
+++ b/dev-libs/ace/ace-5.8.3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="The Adaptive Communications Environment"
+HOMEPAGE="http://www.cs.wustl.edu/~schmidt/ACE.html"
+SRC_URI="!tao? ( http://download.dre.vanderbilt.edu/previous_versions/ACE-${PV}.tar.bz2 )
+	tao? (
+		!ciao? ( http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-${PV}.tar.bz2 )
+		ciao? ( http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-${PV}.tar.bz2 )
+	)"
+
+LICENSE="ACE BSD BSD-4 BSD-2 tao? ( sun-iiop RSA )"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="X ciao ipv6 static-libs tao"
+
+COMMON_DEPEND="dev-libs/openssl:0"
+# TODO probably more
+RDEPEND="${COMMON_DEPEND}
+	X? ( x11-libs/libXt x11-libs/libXaw )"
+
+DEPEND="${COMMON_DEPEND}
+	X? ( x11-proto/xproto )"
+
+S="${WORKDIR}/ACE_wrappers"
+
+src_prepare() {
+	sed -i \
+		-e 's:SSL_METHOD:const SSL_METHOD:' \
+		-e 's/-O3//' \
+		configure || die "sed on configure failed"
+	mkdir build || die
+	export ACE_ROOT="${S}"
+
+	epatch_user
+}
+
+src_configure() {
+	pushd build >/dev/null || die
+	ECONF_SOURCE="${S}"
+	econf \
+		--enable-lib-all \
+		$(use_with X) \
+		$(use_enable ipv6) \
+		$(use_enable static-libs static)
+	popd >/dev/null || die
+}
+
+src_compile() {
+	# --with-qos needs ACE_HAS_RAPI
+	emake -C build
+}
+
+src_install() {
+	emake -C build ACE_ROOT="${S}" DESTDIR="${D}" install
+	# punt gperf stuff
+	rm -rf "${D}/usr/bin" "${D}/usr/share"
+	# remove PACKAGE_* definitions from installed config.h (#192676)
+	sed -i -e "s:^[ \t]*#define[ \t]\+PACKAGE_.*$:/\* & \*/:g" "${D}/usr/include/ace/config.h" || die
+
+	# Install some docs
+	dodoc README NEWS ChangeLog AUTHORS VERSION
+
+	prune_libtool_files
+}
+
+src_test() {
+	emake -C build ACE_ROOT="${S}" check
+}
+
+pkg_postinst() {
+
+	local CC_MACHINE=$($(tc-getCC) -dumpmachine)
+	if [ -d "/usr/$(get_libdir)/gcc-lib/${CC_MACHINE}/$(gcc-fullversion)/include/ace" ]; then
+	ewarn "moving /usr/$(get_libdir)/gcc-lib/${CC_MACHINE}/$(gcc-fullversion)/include/ace to"
+	ewarn "ace.old"
+	ewarn "This is required, as anything trying to compile against ACE will"
+	ewarn "have problems with conflicting OS.h files if this is not done."
+		mv "/usr/$(get_libdir)/gcc-lib/${CC_MACHINE}/$(gcc-fullversion)/include/ace" \
+			"/usr/$(get_libdir)/gcc-lib/${CC_MACHINE}/$(gcc-fullversion)/include/ace.old"
+	fi
+}
diff --git a/dev-python/amodem/Manifest b/dev-python/amodem/Manifest
index 49a37e5bf836..d15c70d160cc 100644
--- a/dev-python/amodem/Manifest
+++ b/dev-python/amodem/Manifest
@@ -1,3 +1,2 @@
-DIST amodem-1.10.tar.gz 19168 SHA256 a3ba8fc29230d40e0077040561e47b2626a375ca2a42e31aed1401187ae2c421 SHA512 408e2ec0c81f08d5e1567cf0216b9918efbd76887726dc8afade03669aa43f7f32052d8428718333d4e118be8716e9edf4cccd8a813609bc025ad6f1e1631c63 WHIRLPOOL 7fba535ad787303e281ebdc3a1482399fc50f5dd61ca4afe1a202334662e6e28bae53d9e4dd30992811e6b075bc0c1b446180634c91eaa5cb824a4e1832f0c5f
 DIST amodem-1.11.tar.gz 19869 SHA256 00a4c19fb8a9e6dff9459a2cb021c0adc5c669ac1658685f2388457c409931c6 SHA512 f045a771215b50eb387a92209bd1aba0f47f7779b78b720ce49590d6e14ad0b176be6099f78e3b959a61f018b06768bad1f39555c77388d545d088f5cede3fb7 WHIRLPOOL b6b42dd5b240c4704ee26a86a43e9b254673bee2782c976317abf501075b0ed225028df650e03f1b88195c31d75269217ee573ac29370af2afc367cc7488fae9
-DIST amodem-1.9.tar.gz 19301 SHA256 a668abe618446a6925b4262cbd884ea9f2ef38bf44481d37f09cf1f1f0989c95 SHA512 92206cc45d58605f3bc2f00c466712e9ca7e4af6e257817483e69c9f84cdcf8996c99872360b1717f584357b395d81c907493180318bf8b93c6f0ad40caf1305 WHIRLPOOL a1c0ec6cbcf4d18890d22f1c051e78dc904a4bbca3d745fc7615ea93eca57f1110038e21a4091479d0ba75f4d5c885d361ec05b6b51d0385498ac328987f5318
+DIST amodem-1.12.tar.gz 27490 SHA256 d4842f2df83d0eda7036665d0699e2c265a1933a3b0c3d6555040c52bdac282e SHA512 7fc5927137f0c250092aafafcfacd218218874c4bd2803a126f5310cf22aa2339217094420cba7b003492477670ba83c04ff7610fc15b80c905eb75ee35b1d2d WHIRLPOOL 1c5f0337f47ddc5bd4812e891f7fa2c8c5699541eb5530def8d1b7bd2331b7a039c711077ddc5ba6c748b0ab7a887765f859e3782d29e2c0e1ced921a5d18ae1
diff --git a/dev-python/amodem/amodem-1.10.ebuild b/dev-python/amodem/amodem-1.12.ebuild
similarity index 74%
rename from dev-python/amodem/amodem-1.10.ebuild
rename to dev-python/amodem/amodem-1.12.ebuild
index 1eb9d3a0f427..2089e14bf656 100644
--- a/dev-python/amodem/amodem-1.10.ebuild
+++ b/dev-python/amodem/amodem-1.12.ebuild
@@ -10,7 +10,8 @@ inherit distutils-r1
 
 DESCRIPTION="Transmit data between two computers using audio"
 HOMEPAGE="https://github.com/romanz/amodem"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/romanz/amodem/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/amodem/amodem-1.9.ebuild b/dev-python/amodem/amodem-1.9.ebuild
deleted file mode 100644
index 1eb9d3a0f427..000000000000
--- a/dev-python/amodem/amodem-1.9.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Transmit data between two computers using audio"
-HOMEPAGE="https://github.com/romanz/amodem"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-ruby/bson/Manifest b/dev-ruby/bson/Manifest
index 94b5b5d59354..e4ad23c17f63 100644
--- a/dev-ruby/bson/Manifest
+++ b/dev-ruby/bson/Manifest
@@ -1,3 +1,4 @@
 DIST bson-3.0.4.tar.gz 49517 SHA256 10a34e681804abfde9a2c047d9fa4554e40aef28f0a7114b88f7324215041de4 SHA512 8a57ff6706af44ef22841fdd33cd8c9d2ea4fd94dfde9f4fe94fdb08d95d3249b96939866459294c8258d99f37ff3e0ab8ac16b53fad1db6ddb26506135a4008 WHIRLPOOL 07f81925049e23c5f8f75e08b3eb4594e0df4a890bc864674d19a3a291eca8a58f121b3d045d14c44f454753dc3d0be425ff140d3d0eb72bc2cd8a61734d08d8
 DIST bson-3.2.0.tar.gz 50495 SHA256 a452bf4f77548697f36659413fa2c106e592d29b8259c285262a1db5c1ffae06 SHA512 258cd31e390cafb12b93d326686e2a08e55da44b458a68cbf5ce8ebc51a477844934a346a77914a9baf1004ca465b45d7399e7daab74b2b9e7389b7c23cbf777 WHIRLPOOL d8c192343dcabbf162d16dd4f19612ddeb43cdabe8e13559014db2ca2d7dda2c5df759631fba7f0f4ed7b5e2d76e7327dc4a46d695a792afbc84aaaf8f6b4489
+DIST bson-3.2.1.tar.gz 50640 SHA256 8e81a04bd433bd82fd558b1ef58b35a53448eb6dc9c85a808238b0d21dfa71d4 SHA512 c5565965615036608b87895d40d62b42193eb7ba31f168051222595f9095627157606ba8ba7966ed349ec05005645320ce10cc510e1fa47368f907368734fb0a WHIRLPOOL 1e1007132aeb99655f1af49de0696ba104d1ac9d63c09b3136e5e523318acb36c568fe813ecbd663212a109bd94486fda1074f12fd18b3336e600b239252a4e4
 DIST mongo-ruby-driver-1.12.0.tar.gz 360669 SHA256 84c87d26601c9bd91a6604bcb3630be50d239e471542f9b0a68379705dd03e11 SHA512 725110c527867379def85fde50b6825e94a320356f062e4403d9d55c223f2503676f83ae42916d6ab45afd90d30b2a4272519e070c4af2095c0965297fd72bb6 WHIRLPOOL c152aa579a0535707909560cc73fc878521aac95c034ec71bca6c2397754b5e057c1e7ca32f6b2b3393ce975f122e65926820cdde29aa5f5734fb9717bd980e0
diff --git a/dev-ruby/bson/bson-3.2.1.ebuild b/dev-ruby/bson/bson-3.2.1.ebuild
new file mode 100644
index 000000000000..0627cb8ec76c
--- /dev/null
+++ b/dev-ruby/bson/bson-3.2.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+GITHUB_USER="mongodb"
+GITHUB_PROJECT="bson-ruby"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A Ruby BSON implementation for MongoDB. (Includes binary C-based extension.)"
+HOMEPAGE="http://www.mongodb.org/"
+SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="bson-ruby-${PV}"
+
+LICENSE="APSL-2"
+SLOT="3"
+KEYWORDS="~amd64"
+IUSE="test doc"
+
+all_ruby_prepare() {
+	# Remove bundler support
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+
+	# Remove project-specific rspec options
+	rm .rspec || die
+}
+
+each_ruby_configure() {
+	${RUBY} -C ext/bson extconf.rb || die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	emake -C ext/bson V=1 CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
+	cp ext/bson/*$(get_modname) lib/ || die
+}
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index 43937f8d798f..a688374b3736 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -1,4 +1,4 @@
+DIST bundler-1.10.6.tar.gz 313526 SHA256 6c700c2183577be4991b82a975b981bf85a6eb32c9a9a86027aa8e88f1768c19 SHA512 63791bca60c0981aebd69a8fab8bd3741976a0c2a94a5d99f54560917e3a9661b87812385d88a9b858e8d08ffe3b68b42e1c06eb8370dd216713fd6daa1a2166 WHIRLPOOL f74fdfa82a96a8bb3f695bd4126283bc1076a42944227476bda98084e8e50f56e87508f8e63f102fc6297f38ae6325130a9750ee1ccb340c2163d35ab1ed1e36
 DIST bundler-1.7.13.gem 307200 SHA256 a3c7f6fa006c62c88acd21655eaa31dd6731cdd5a77b826be23f9d17e728e78b SHA512 36dfd314172d1de9c91c7e7c3b8938c2225e61cb6e33d08710c1f644d9cf8e08cdda34997ce15bc204b9b53332b25c52e09d23c58788d42bd2a676efc075cd7a WHIRLPOOL fcb45ee78009466772e58a3567be5a65e25fc8aee3224e91b9baea3f20c923bea2e11d4e53a9ab1cb246860a1705ec15618105902756372e672c8a3780687a68
 DIST bundler-1.8.9.tar.gz 290462 SHA256 9ecbe18147b990e8c5c7f299e9bc7b63eb274f54b05134ad334e0abeb943f733 SHA512 2e3378e2c329c53eb6e578b496e1fb332c4f96eca58299e59dd8cb7f5d3b78f43bc6bf96c452cbeb99a0459c016a824248f907b58dcc2081490e4f59ea7a32ba WHIRLPOOL 887a72075093405dd5c94902865589e4946d70f1cc390725e8ae35f6a36cdc2bdd05b9c27958a5c2497d6f42011791c2432f15ab45e1ccbc8c7f0d7da37799c9
 DIST bundler-1.9.10.tar.gz 301546 SHA256 ea56d906a96f14ffb8ebd3bd5f35ebb4389901be10c8470f6741d6567f16f844 SHA512 0cd05ae67543c5993d2e33cc9287dc375703cda3250de3556442ae513825b200d534640a9232806b1c4bdec192937de2b40d54563030d9aff8f7727f349a7b17 WHIRLPOOL ac2a118bd85d5b6c9ef2819dec95c6580c769a4985429fd959cffc0e0a6be1f6e37106b2d713e42c360dd19761b71f93dbf519f68fd5bcda0ffb09f97e5eff89
-DIST bundler-1.9.9.tar.gz 301352 SHA256 ddbb3d90a2053a3ed833b66fe3c839ef2c0d7e6326cc522bfa7e2c98ece8d421 SHA512 d34929c4200290850642574c8a5ba3ce03589511173a19d57eaa48d68e8345963a9494c9ba7b89a5b0ec55b22222a260ad6b5564a07286a62a59fe761468384f WHIRLPOOL a3887a32a546371439144bd8f227a06f5b625bf2046da3b06c4d500abb350c5c72d6a278355b61ceed5d8044b3c0c4e0dfc6750e57288a9af5d97236a7f27a5d
diff --git a/dev-ruby/bundler/bundler-1.9.9.ebuild b/dev-ruby/bundler/bundler-1.10.6.ebuild
similarity index 96%
rename from dev-ruby/bundler/bundler-1.9.9.ebuild
rename to dev-ruby/bundler/bundler-1.10.6.ebuild
index 724f6ce4866c..3bad3fb6dd22 100644
--- a/dev-ruby/bundler/bundler-1.9.9.ebuild
+++ b/dev-ruby/bundler/bundler-1.10.6.ebuild
@@ -10,7 +10,7 @@ USE_RUBY="ruby19 ruby20 ruby21 ruby22"
 
 # No documentation task
 RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md ISSUES.md UPGRADING.md"
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md ISSUES.md"
 
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 
diff --git a/dev-ruby/bunny/Manifest b/dev-ruby/bunny/Manifest
index 91f7235fc928..b980c6059f75 100644
--- a/dev-ruby/bunny/Manifest
+++ b/dev-ruby/bunny/Manifest
@@ -1,4 +1,3 @@
-DIST bunny-1.5.0.gem 178688 SHA256 9bc88dd4760ab29fabd304b47aec8abc4a28c59509d9ca791d120da7a41a6c9a SHA512 1271c268df9f8e75750ad6bea5f8a6ab51348acc5806c102c00d96d7094e723bb968b733df8a6ab212b4871bf1d1d59f87f7239ff90a242ef648bb118d24a7e6 WHIRLPOOL ca29470ee951e4814457909a80c641f07b2f5903e4b6974340dbc770308a0e799978928fe5690d6f0b7e285576c3551fe3a6613191b4e81f3c8a508b14906980
-DIST bunny-1.5.1.gem 178688 SHA256 0668e58dd5a020cb6614515276964b7d2563ca643a98d126429128b33d54f65e SHA512 82add6e87343d6c7df1dfc4cb5d91d413626e2b608b9a5a22397039aede3017fb400117c959a0274a4eb1bd737b724d7bbd98e901133f68428fc5cbed20df810 WHIRLPOOL e1d3bbc2df08dec252f07c981e5eb39b5f31f5358f0f3cf42aa40c393c0494086862acf7094e854a552cc295c77afbc7066a153a9400ced6087487d355fcc8fc
 DIST bunny-1.6.3.gem 180224 SHA256 3eb1339993db6ea5b8655be374c0427924c13bdc9cafee8141e513d334e0a52d SHA512 ceeca544cd05c78adb3bd3164ca84851b65270ecd069e923979b432abc92160642f334df088364ae9960b2c3523260a0ffcd06dd20b51bd798178231efa74a95 WHIRLPOOL 7a9a20240e15c3b480aa870c6270f08ba0d95d12d4ea68e71c444e5abe4933a9dfadbe3babf71c1e35c78a04be09a0d8c01159781b749db3be79189ddede9e13
 DIST bunny-1.7.0.gem 181248 SHA256 889b3bb5b173d8ce16ec7d96cd72ccd742a3e31eaaf0f0336b762cec1f0bf806 SHA512 158ea3906c1318458da7551519ff00e30191f91f0cf3ea777b1069f55cd5fce865591495f56177f8d23a4498bdf95b145caa2027136fab2d3108af6a685eca59 WHIRLPOOL 05fa177b554a5d0c4a76f953242b3d715c4dc969b939375ac22e5d054fee4a1a6634c8a851f25f11120037a1992af7202ff5727452415cea5a3e60cea6c24a03
+DIST bunny-2.0.1.gem 183296 SHA256 ceff06015fa1ddc3aeea397f23242a9de13f3bc7f3481ace1a0b194d66a84236 SHA512 53ef3ec503f4ed5cbcec72343a492f102c358f7f2bd6f4833a3306384faf03195e59f9ca5ef9a7e0d7dc21ae1428c9b107bbbc5a4691853920d3410765e576be WHIRLPOOL 465ea17a2c1ed51127ed37f4ad8fc916d9227111debec127bfcd4e539a7c697c8f5395c3f26cc47c4665948f7e67027d1d0b20c1235b93482aa17302bcbf7771
diff --git a/dev-ruby/bunny/bunny-1.5.0.ebuild b/dev-ruby/bunny/bunny-1.5.0.ebuild
deleted file mode 100644
index 5e036a609531..000000000000
--- a/dev-ruby/bunny/bunny-1.5.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-# Tests require a live AMQP server.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Another synchronous Ruby AMQP client"
-HOMEPAGE="http://github.com/celldee/bunny"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/amq-protocol-1.9.2"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}
-	doins -r examples || die
-}
diff --git a/dev-ruby/bunny/bunny-1.5.1.ebuild b/dev-ruby/bunny/bunny-2.0.1.ebuild
similarity index 87%
rename from dev-ruby/bunny/bunny-1.5.1.ebuild
rename to dev-ruby/bunny/bunny-2.0.1.ebuild
index 5e036a609531..da0ff7ed81c2 100644
--- a/dev-ruby/bunny/bunny-1.5.1.ebuild
+++ b/dev-ruby/bunny/bunny-2.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-util/mingw64-runtime/Manifest b/dev-util/mingw64-runtime/Manifest
index 9911b6f526a6..7a7a74891e49 100644
--- a/dev-util/mingw64-runtime/Manifest
+++ b/dev-util/mingw64-runtime/Manifest
@@ -1,5 +1,5 @@
-DIST mingw-w64-v2.0.8.tar.gz 7017057 SHA256 1a5a2c57f90c7f1b5eb8402a52f93de645925a8af62c2cfe748f39ce66008cf4 SHA512 c526bad968c74d86e740862f5e492329b32a1782c69b3a22f7203ac7e38697ba2017f95ed7bf519b737328a92d7c1b4e519f9103d634550f30bdb4a21921303e WHIRLPOOL 913bc444941c4c9c630404847cfb9bb54083fcd366a240e47992d3ee65cfc4c86f340099970243d3d251d5a1e5a00005c09e9d1aecb884256e125155bbcfbd0e
 DIST mingw-w64-v3.0.0.tar.bz2 7012419 SHA256 ffd381a53cb774843667ccdaeb3a23f86be77b0344355e1a5947b3ceb8343c67 SHA512 7fc438908328ae4429f79dfaaae92bc7e88bc0f46517bdebdc3c45b3e8062ff6c27f166eb51103c2d49aae01851d82f33e0b031c8d98198baaeb119e19221989 WHIRLPOOL ea2820ab24dcd6f35fab0404b2bd26273b117731bb25e2e3ef753e9a3a9b6661564605cdae7ed5e6e4f9fc6b3c3d000761fa44afa19f79b5d6deaebca44f709c
 DIST mingw-w64-v3.1.0.tar.bz2 7021162 SHA256 ece7a7e7e1ab5e25d5ce469f8e4de7223696146fffa71c16e2a9b017d0e017d2 SHA512 9f418694aa0f072e2f08766fcee8929ac3022187750028781336243e050495b9709bb9ae87b4a83a8e9d3856478c525d8636277a4c219e282421b269dafa68d8 WHIRLPOOL 90a3a7056df7c4da2e605da1578e65b16e0f831370d8b1d399fed48945828604a94f9402b2d53bc4ca26623f1d34e6c45c862bf1f7590ddf9325fd4a053a18fb
 DIST mingw-w64-v3.2.0.tar.bz2 7053254 SHA256 78a0de610829a1145ae12c4a29603344963a0b8156ba39a9a31a0e79c3b29142 SHA512 dd483bcf7ba0e698a33a0b02a811b181e601cd344b87dafd0f6c477f68efb9a617a4109046fd06735242623f87833cf97688f057583e1378d6d84e7818927593 WHIRLPOOL 99ba5ddaa99c40309d12d75d3953deaf9cc31280ad2446793d1525702963edd1b33e91053e99bdfd06d37980049d30b7fb4e9f3a5358f8277c2fabe587c56037
 DIST mingw-w64-v4.0.1.tar.bz2 10803072 SHA256 89d2524a071b6337dfd9f3b6e6f46d8002b2633f928c833dc4e873a13e045b17 SHA512 a216a09a460c56c29208aee1e1cdb428e856f9c8d59dd399723ccf6d549368f0a13a6aacb046d211ddec7c0a1f1c227d5dd599e4f0c33ba4b6d9c92bd0a7fa1b WHIRLPOOL e021031e2820e918fe0f291624335fadc08641e811f6cf19d45b1586d2ac96c6bff4fb936bcd154a7b48711db9f5faabd27bfdced3a38073b4a20c8471a91915
+DIST mingw-w64-v4.0.4.tar.bz2 10812375 SHA256 89356a0aa8cf9f8b9dc8d92bc8dd01a131d4750c3acb30c6350a406316c42199 SHA512 06de6b592f776676184a9c50c63eb105c82a912965dee5d8217f9b5b325e0258c188f5d7d5e28aaeacf7bad44ce5d36bd837b9f1cbb91358754787738fb15146 WHIRLPOOL ff557b2aff821c1833ab6d5fdade4f256b71cb37e84a476d3e5a4cfe13f60db68c336d7e72f6e3eb13b3d127e1bac2cbfdde160ea2f7016867f10efa6a02914b
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-2.0.8.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-2.0.8.ebuild
deleted file mode 100644
index 66af6446edee..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-2.0.8.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64-v${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="crosscompile_opts_headers-only"
-RESTRICT="strip"
-
-S=${WORKDIR}/mingw-w64-v${PV}/mingw-w64-crt
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	find "${WORKDIR}" -type f -exec touch -r . {} +
-}
-
-src_compile() {
-	# install the local headers as the crt step wants latest
-	pushd ../mingw-w64-headers >/dev/null
-	CHOST=${CTARGET} econf --enable-sdk || die
-	emake install DESTDIR="${WORKDIR}/sysroot" || die
-	popd >/dev/null
-
-	just_headers && return 0
-
-	CHOST=${CTARGET} strip-unsupported-flags
-	append-cppflags -isystem "${WORKDIR}/sysroot/usr/${CTARGET}/include"
-	CHOST=${CTARGET} econf || die
-	emake || die
-}
-
-src_install() {
-	insinto /usr/${CTARGET}/usr/include
-	doins -r "${WORKDIR}"/sysroot/usr/${CTARGET}/include/* || die
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-	just_headers && return 0
-
-	emake install DESTDIR="${D}" || die
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${D}"/usr/doc
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-4.0.4.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-4.0.4.ebuild
new file mode 100644
index 000000000000..f738c15fccba
--- /dev/null
+++ b/dev-util/mingw64-runtime/mingw64-runtime-4.0.4.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+WANT_AUTOMAKE="1.15"
+
+inherit autotools flag-o-matic eutils
+
+DESCRIPTION="Free Win64 runtime and import library definitions"
+HOMEPAGE="http://mingw-w64.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="crosscompile_opts_headers-only idl libraries tools"
+RESTRICT="strip"
+
+S="${WORKDIR}/mingw-w64-v${PV}"
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+just_headers() {
+	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
+}
+crt_with() {
+	just_headers && echo --without-$1 || echo --with-$1
+}
+crt_use_enable() {
+	just_headers && echo --without-$2 || use_enable "$@"
+}
+crt_use_with() {
+	just_headers && echo --without-$2 || use_with "$@"
+}
+
+pkg_setup() {
+	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
+		die "Invalid configuration"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-4.0.1-winpthreads.patch"
+	epatch "${FILESDIR}/${PN}-4.0.1-build.patch"
+	eautoreconf
+}
+
+src_configure() {
+	CHOST=${CTARGET} strip-unsupported-flags
+
+	if ! just_headers; then
+		mkdir "${WORKDIR}/headers"
+		pushd "${WORKDIR}/headers" > /dev/null
+		CHOST=${CTARGET} "${S}/configure" \
+			--prefix="${T}/tmproot" \
+			--with-headers \
+			--without-crt \
+			|| die
+		popd > /dev/null
+		append-cppflags "-I${T}/tmproot/include"
+	fi
+
+	local extra_conf=()
+
+	case ${CTARGET} in
+	x86_64*) extra_conf+=( --disable-lib32 --enable-lib64 ) ;;
+	i?86*) extra_conf+=( --enable-lib32 --disable-lib64 ) ;;
+	*) die "Unsupported ${CTARGET}" ;;
+	esac
+
+	CHOST=${CTARGET} econf \
+		--prefix=/usr/${CTARGET} \
+		--includedir=/usr/${CTARGET}/usr/include \
+		--with-headers \
+		--enable-sdk \
+		$(crt_with crt) \
+		$(crt_use_enable idl) \
+		$(crt_use_with libraries libraries winpthreads,libmangle) \
+		$(crt_use_with tools) \
+		"${extra_conf[@]}"
+}
+
+src_compile() {
+	if ! just_headers; then
+		emake -C "${WORKDIR}/headers" install
+	fi
+	default
+}
+
+src_install() {
+	default
+
+	if is_crosscompile ; then
+		# gcc is configured to look at specific hard-coded paths for mingw #419601
+		dosym usr /usr/${CTARGET}/mingw
+		dosym usr /usr/${CTARGET}/${CTARGET}
+		dosym usr/include /usr/${CTARGET}/sys-include
+	fi
+
+	env -uRESTRICT CHOST=${CTARGET} prepallstrip
+	rm -rf "${ED}/usr/share"
+}
diff --git a/dev-util/monodevelop/monodevelop-5.9.5.5.ebuild b/dev-util/monodevelop/monodevelop-5.9.5.5.ebuild
index a22347892d4a..a9aa4141556f 100644
--- a/dev-util/monodevelop/monodevelop-5.9.5.5.ebuild
+++ b/dev-util/monodevelop/monodevelop-5.9.5.5.ebuild
@@ -19,14 +19,14 @@ SRC_URI="https://launchpadlibrarian.net/68057829/NUnit-2.5.10.11092.zip
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+subversion +git doc +gnome qtcurve"
+IUSE="+subversion +git +gnome qtcurve"
 
+#TODO: doc use flag and mono-docbrowser
 RDEPEND=">=dev-lang/mono-3.2.8
 	>=dev-dotnet/nuget-2.8.3
 	gnome? ( >=dev-dotnet/gnome-sharp-2.24.2-r1 )
 	>=dev-dotnet/gtk-sharp-2.12.21:2
-	doc? ( dev-util/mono-docbrowser )
-	>=dev-dotnet/xsp-2
+	>=www-servers/xsp-2
 	dev-util/ctags
 	sys-apps/dbus[X]
 	subversion? ( dev-vcs/subversion )
diff --git a/dev-vcs/subversion/subversion-1.8.14.ebuild b/dev-vcs/subversion/subversion-1.8.14.ebuild
index aee667b1c32d..daa6a2bbb8a3 100644
--- a/dev-vcs/subversion/subversion-1.8.14.ebuild
+++ b/dev-vcs/subversion/subversion-1.8.14.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Subversion GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kde nls perl python ruby sasl test vim-syntax"
 
 COMMON_DEPEND=">=dev-db/sqlite-3.7.12
diff --git a/eclass/gtk-sharp-module.eclass b/eclass/gtk-sharp-module.eclass
index 5479fd0abc01..7ecff1d6d091 100644
--- a/eclass/gtk-sharp-module.eclass
+++ b/eclass/gtk-sharp-module.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -87,13 +87,21 @@ case ${GTK_SHARP_MODULE} in
 	glib|glade|gtk|gdk|atk|pango|gtk-dotnet|gtk-gapi|gtk-docs)
 		TARBALL="gtk-sharp"
 		case ${PVR} in
-			2.12.*)
+			2.12.10*)
 				SRC_URI="mirror://gentoo/${TARBALL}-2.12.7.patch.bz2"
 				#Upstream: https://bugzilla.novell.com/show_bug.cgi?id=$bugno
 				#Upstream bug #470390 for the gtk-sharp-2.12.7.patch
 				PATCHES=(
 					"${WORKDIR}/${TARBALL}-2.12.7.patch"
 				)
+				;;
+			2.12.11*)
+				SRC_URI="mirror://gentoo/${TARBALL}-2.12.11.patch.bz2"
+				PATCHES=(
+					"${WORKDIR}/${TARBALL}-2.12.11.patch"
+				)
+				;;
+			2.12.1*)
 				EAUTORECONF="YES"
 				add_bdepend "=sys-devel/automake-1.10*"
 				add_bdepend ">=sys-devel/autoconf-2.61"
@@ -137,7 +145,7 @@ esac
 case ${PF} in
 	#gtk-sharp tarball
 	gtk-sharp-docs*)
-		add_depend ">=dev-lang/mono-2.0"
+		add_depend ">=virtual/monodoc-2.0"
 		;;
 	gtk-sharp-gapi*)
 		add_rdepend "!<=dev-dotnet/gtk-sharp-2.12.7:2"
@@ -275,8 +283,13 @@ S="${WORKDIR}/${TARBALL}-${PV}"
 # @ECLASS-VARIABLE: SRC_URI
 # @DESCRIPTION:
 # Default value: mirror://gnome/sources/${TARBALL}/${PV_MAJOR}/${TARBALL}-${PV}.tar.bz2
-SRC_URI="${SRC_URI}
-	mirror://gnome/sources/${TARBALL}/${PV_MAJOR}/${TARBALL}-${PV}.tar.bz2"
+if TARBALL="gtk-sharp"; then
+	SRC_URI="${SRC_URI}
+		http://download.mono-project.com/sources/gtk-sharp212/${TARBALL}-${PV}.tar.bz2"
+else
+	SRC_URI="${SRC_URI}
+		mirror://gnome/sources/${TARBALL}/${PV_MAJOR}/${TARBALL}-${PV}.tar.bz2"
+fi
 
 # @FUNCTION: get_sharp_apis
 # @USAGE: <type> <pkgconfig-package>
@@ -522,13 +535,13 @@ gtk-sharp-module_src_configure() {
 # @FUNCTION: gtk-sharp-module_src_compile
 # @DESCRIPTION:
 # Calls emake in the subdir of the module.
-# Sets CSC=/usr/bin/gmcs. Deletes top_srcdir Makefiles to prevent recursing in
+# Sets CSC=/usr/bin/mcs. Deletes top_srcdir Makefiles to prevent recursing in
 # case we missed some dll references.
 # Is exported.
 gtk-sharp-module_src_compile() {
 	rm -f "${S}"/Makefile* &> /dev/null
 	cd "${S}/${GTK_SHARP_MODULE_DIR}"
-	emake CSC=/usr/bin/gmcs || die "emake failed"
+	emake CSC=/usr/bin/mcs || die "emake failed"
 }
 
 # @FUNCTION: gtk-sharp-module_src_install
diff --git a/media-libs/imlib2/imlib2-9999.ebuild b/media-libs/imlib2/imlib2-9999.ebuild
index 3d0fb2ef858f..9ec411dac7d2 100644
--- a/media-libs/imlib2/imlib2-9999.ebuild
+++ b/media-libs/imlib2/imlib2-9999.ebuild
@@ -16,7 +16,7 @@ inherit enlightenment toolchain-funcs multilib-minimal
 DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
 HOMEPAGE="http://www.enlightenment.org/"
 
-IUSE="bzip2 gif jpeg cpu_flags_x86_mmx mp3 png static-libs tiff X zlib"
+IUSE="bzip2 gif jpeg cpu_flags_x86_mmx cpu_flags_x86_sse2 mp3 png static-libs tiff X zlib"
 
 RDEPEND="=media-libs/freetype-2*[${MULTILIB_USEDEP}]
 	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
@@ -38,9 +38,9 @@ DEPEND="${RDEPEND}
 	)"
 
 multilib_src_configure() {
-	# imlib2 has diff configure options for x86/amd64 mmx
+	# imlib2 has diff configure options for x86/amd64 assembly
 	if [[ $(tc-arch) == amd64 ]]; then
-		E_ECONF+=( $(use_enable cpu_flags_x86_mmx amd64) --disable-mmx )
+		E_ECONF+=( $(use_enable cpu_flags_x86_sse2 amd64) --disable-mmx )
 	else
 		E_ECONF+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) )
 	fi
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.6.2.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.6.2-r1.ebuild
similarity index 98%
rename from media-plugins/audacious-plugins/audacious-plugins-3.6.2.ebuild
rename to media-plugins/audacious-plugins/audacious-plugins-3.6.2-r1.ebuild
index d32cf6cd0736..b14098c3c96c 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.6.2.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.6.2-r1.ebuild
@@ -37,7 +37,7 @@ RDEPEND="app-arch/unzip
 		>=media-libs/flac-1.2.1-r1 )
 	fluidsynth? ( media-sound/fluidsynth )
 	http? ( >=net-libs/neon-0.26.4 )
-	gtk3? ( x11-libs/gtk+:2 )
+	!gtk3? ( x11-libs/gtk+:2 )
 	gtk3? ( x11-libs/gtk+:3 )
 	qt5? ( dev-qt/qtcore:5
 	      dev-qt/qtgui:5
@@ -102,8 +102,8 @@ src_configure() {
 	econf \
 		${ffmpeg} \
 		--enable-modplug \
+		--enable-statusicon \
 		--disable-soxr \
-		--enable-neon \
 		$(use_enable adplug) \
 		$(use_enable aac) \
 		$(use_enable alsa) \
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 9357f9b21f3a..8ff843a09526 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 14 Aug 2015 06:11:08 +0000
+Fri, 14 Aug 2015 12:11:06 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 9357f9b21f3a..8ff843a09526 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 14 Aug 2015 06:11:08 +0000
+Fri, 14 Aug 2015 12:11:06 +0000
diff --git a/metadata/md5-cache/app-arch/unrar-5.3.2 b/metadata/md5-cache/app-arch/unrar-5.3.2
new file mode 100644
index 000000000000..918e4320e5b8
--- /dev/null
+++ b/metadata/md5-cache/app-arch/unrar-5.3.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare
+DESCRIPTION=Uncompress rar files
+EAPI=5
+HOMEPAGE=http://www.rarlab.com/rar_add.htm
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=unRAR
+RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
+SLOT=0
+SRC_URI=http://www.rarlab.com/rar/unrarsrc-5.3.2.tar.gz
+_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	flag-o-matic	02090c5a622458303e6bf68837ac6b96	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
+_md5_=6cdf602e930364ebc4ec05896cfa8df2
diff --git a/metadata/md5-cache/app-editors/neovim-0.0.0_pre20150814 b/metadata/md5-cache/app-editors/neovim-0.0.0_pre20150814
new file mode 100644
index 000000000000..2261b85067ce
--- /dev/null
+++ b/metadata/md5-cache/app-editors/neovim-0.0.0_pre20150814
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/luajit:2 >=dev-libs/libtermkey-0.17 dev-libs/libvterm-neovim >=dev-libs/unibilium-1.1.1 >=dev-libs/libuv-1.2.0 >=dev-libs/msgpack-0.6.0_pre20150220 dev-lua/lpeg dev-lua/messagepack virtual/libiconv virtual/libintl sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=Ambitious vim fork focused on extensibility and agility
+EAPI=5
+HOMEPAGE=https://github.com/neovim/neovim
+IUSE=+nvimpager perl python
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 vim
+RDEPEND=dev-lang/luajit:2 >=dev-libs/libtermkey-0.17 dev-libs/libvterm-neovim >=dev-libs/unibilium-1.1.1 >=dev-libs/libuv-1.2.0 >=dev-libs/msgpack-0.6.0_pre20150220 dev-lua/lpeg dev-lua/messagepack perl? ( dev-lang/perl ) python? ( dev-python/neovim-python-client )
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~yngwin/distfiles/neovim-0.0.0_pre20150814.tar.xz
+_eclasses_=cmake-utils	f474224ef49d530640a43a04ae94928e	eutils	351a78113be5b393c09a2c948701ad36	flag-o-matic	02090c5a622458303e6bf68837ac6b96	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
+_md5_=43b0ef09d5d22462040ccf5537835d7e
diff --git a/metadata/md5-cache/dev-dotnet/art-sharp-2.24.2 b/metadata/md5-cache/dev-dotnet/art-sharp-2.24.2
index d1ed266cdaae..a0a8545ac50f 100644
--- a/metadata/md5-cache/dev-dotnet/art-sharp-2.24.2
+++ b/metadata/md5-cache/dev-dotnet/art-sharp-2.24.2
@@ -10,5 +10,5 @@ RDEPEND==dev-dotnet/gtk-sharp-2.12* >=dev-lang/mono-2.7 >=media-libs/libart_lgpl
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-sharp/2.24/gnome-sharp-2.24.2.tar.bz2
-_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	gtk-sharp-module	4af5cdeccbe0871872fe121969e1437f	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	gtk-sharp-module	e7c36c41de637c396bc8a7c453ea5171	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cc10fe20223a00f9b37f04cbf3f5093d
diff --git a/metadata/md5-cache/dev-dotnet/atk-sharp-2.12.10 b/metadata/md5-cache/dev-dotnet/atk-sharp-2.12.10
index 05247ba2bad6..d868a5c4cfee 100644
--- a/metadata/md5-cache/dev-dotnet/atk-sharp-2.12.10
+++ b/metadata/md5-cache/dev-dotnet/atk-sharp-2.12.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=!<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/libtool-2.4 =sys-devel/automake-1.10* >=sys-devel/autoconf-2.61 ~dev-dotnet/gtk-sharp-gapi-2.12.10 ~dev-dotnet/glib-sharp-2.12.10 dev-libs/atk >=dev-lang/mono-2.0.1 >=sys-apps/sed-4 virtual/pkgconfig >=app-shells/bash-3.1
+DEPEND=!<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/libtool-2.4 ~dev-dotnet/gtk-sharp-gapi-2.12.10 ~dev-dotnet/glib-sharp-2.12.10 dev-libs/atk >=dev-lang/mono-2.0.1 >=sys-apps/sed-4 virtual/pkgconfig >=app-shells/bash-3.1
 DESCRIPTION=GtkSharp's atk module of the gtk-sharp tarball
 EAPI=2
 HOMEPAGE=http://www.mono-project.com/GtkSharp
@@ -9,6 +9,6 @@ LICENSE=LGPL-2.1
 RDEPEND=~dev-dotnet/glib-sharp-2.12.10 dev-libs/atk !<=dev-dotnet/gtk-sharp-2.12.7:2 >=dev-lang/mono-2.0.1
 RESTRICT=test
 SLOT=2
-SRC_URI=mirror://gentoo/gtk-sharp-2.12.7.patch.bz2 mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.bz2
-_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	gtk-sharp-module	4af5cdeccbe0871872fe121969e1437f	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+SRC_URI=mirror://gentoo/gtk-sharp-2.12.7.patch.bz2 http://download.mono-project.com/sources/gtk-sharp212/gtk-sharp-2.12.10.tar.bz2
+_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	gtk-sharp-module	4108307ac62ede1ee9ce7b99f9669db6	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8dd0eb86e615b02487c382d0ea770dac
diff --git a/metadata/md5-cache/dev-dotnet/gconf-sharp-2.24.2 b/metadata/md5-cache/dev-dotnet/gconf-sharp-2.24.2
index 7248d4af020f..8bc0b084fdc9 100644
--- a/metadata/md5-cache/dev-dotnet/gconf-sharp-2.24.2
+++ b/metadata/md5-cache/dev-dotnet/gconf-sharp-2.24.2
@@ -10,5 +10,5 @@ RDEPEND==dev-dotnet/gtk-sharp-2.12* >=dev-lang/mono-2.7 >=gnome-base/gconf-2.24:
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-sharp/2.24/gnome-sharp-2.24.2.tar.bz2
-_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	gtk-sharp-module	4af5cdeccbe0871872fe121969e1437f	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	gtk-sharp-module	e7c36c41de637c396bc8a7c453ea5171	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=121518f3142ead1411357102be9a3e32
diff --git a/metadata/md5-cache/dev-dotnet/gdk-sharp-2.12.10 b/metadata/md5-cache/dev-dotnet/gdk-sharp-2.12.10
index e2cac1f352ea..7a5f7a9e0da7 100644
--- a/metadata/md5-cache/dev-dotnet/gdk-sharp-2.12.10
+++ b/metadata/md5-cache/dev-dotnet/gdk-sharp-2.12.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=!<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/libtool-2.4 =sys-devel/automake-1.10* >=sys-devel/autoconf-2.61 ~dev-dotnet/gtk-sharp-gapi-2.12.10 ~dev-dotnet/glib-sharp-2.12.10 x11-libs/gtk+:2 ~dev-dotnet/pango-sharp-2.12.10 >=dev-lang/mono-2.0.1 >=sys-apps/sed-4 virtual/pkgconfig >=app-shells/bash-3.1
+DEPEND=!<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/libtool-2.4 ~dev-dotnet/gtk-sharp-gapi-2.12.10 ~dev-dotnet/glib-sharp-2.12.10 x11-libs/gtk+:2 ~dev-dotnet/pango-sharp-2.12.10 >=dev-lang/mono-2.0.1 >=sys-apps/sed-4 virtual/pkgconfig >=app-shells/bash-3.1
 DESCRIPTION=GtkSharp's gdk module of the gtk-sharp tarball
 EAPI=2
 HOMEPAGE=http://www.mono-project.com/GtkSharp
@@ -9,6 +9,6 @@ LICENSE=LGPL-2.1
 RDEPEND=~dev-dotnet/glib-sharp-2.12.10 x11-libs/gtk+:2 ~dev-dotnet/pango-sharp-2.12.10 !<=dev-dotnet/gtk-sharp-2.12.7:2 >=dev-lang/mono-2.0.1
 RESTRICT=test
 SLOT=2
-SRC_URI=mirror://gentoo/gtk-sharp-2.12.7.patch.bz2 mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.bz2
-_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	gtk-sharp-module	4af5cdeccbe0871872fe121969e1437f	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+SRC_URI=mirror://gentoo/gtk-sharp-2.12.7.patch.bz2 http://download.mono-project.com/sources/gtk-sharp212/gtk-sharp-2.12.10.tar.bz2
+_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	gtk-sharp-module	4108307ac62ede1ee9ce7b99f9669db6	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8dd0eb86e615b02487c382d0ea770dac
diff --git a/metadata/md5-cache/dev-dotnet/glade-sharp-2.12.10 b/metadata/md5-cache/dev-dotnet/glade-sharp-2.12.10
index 1e77b58b4542..07025ce531af 100644
--- a/metadata/md5-cache/dev-dotnet/glade-sharp-2.12.10
+++ b/metadata/md5-cache/dev-dotnet/glade-sharp-2.12.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=!<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/libtool-2.4 =sys-devel/automake-1.10* >=sys-devel/autoconf-2.61 ~dev-dotnet/gtk-sharp-gapi-2.12.10 ~dev-dotnet/glib-sharp-2.12.10 ~dev-dotnet/atk-sharp-2.12.10 ~dev-dotnet/gdk-sharp-2.12.10 ~dev-dotnet/gtk-sharp-2.12.10 ~dev-dotnet/pango-sharp-2.12.10 >=gnome-base/libglade-2.3.6:2.0 >=dev-lang/mono-2.0.1 >=sys-apps/sed-4 virtual/pkgconfig >=app-shells/bash-3.1
+DEPEND=!<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/libtool-2.4 ~dev-dotnet/gtk-sharp-gapi-2.12.10 ~dev-dotnet/glib-sharp-2.12.10 ~dev-dotnet/atk-sharp-2.12.10 ~dev-dotnet/gdk-sharp-2.12.10 ~dev-dotnet/gtk-sharp-2.12.10 ~dev-dotnet/pango-sharp-2.12.10 >=gnome-base/libglade-2.3.6:2.0 >=dev-lang/mono-2.0.1 >=sys-apps/sed-4 virtual/pkgconfig >=app-shells/bash-3.1
 DESCRIPTION=GtkSharp's glade module of the gtk-sharp tarball
 EAPI=2
 HOMEPAGE=http://www.mono-project.com/GtkSharp
@@ -9,6 +9,6 @@ LICENSE=LGPL-2.1
 RDEPEND=~dev-dotnet/glib-sharp-2.12.10 ~dev-dotnet/atk-sharp-2.12.10 ~dev-dotnet/gdk-sharp-2.12.10 ~dev-dotnet/gtk-sharp-2.12.10 ~dev-dotnet/pango-sharp-2.12.10 >=gnome-base/libglade-2.3.6:2.0 >=dev-lang/mono-2.0.1
 RESTRICT=test
 SLOT=2
-SRC_URI=mirror://gentoo/gtk-sharp-2.12.7.patch.bz2 mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.bz2
-_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	gtk-sharp-module	4af5cdeccbe0871872fe121969e1437f	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+SRC_URI=mirror://gentoo/gtk-sharp-2.12.7.patch.bz2 http://download.mono-project.com/sources/gtk-sharp212/gtk-sharp-2.12.10.tar.bz2
+_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	gtk-sharp-module	4108307ac62ede1ee9ce7b99f9669db6	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8dd0eb86e615b02487c382d0ea770dac
diff --git a/metadata/md5-cache/dev-dotnet/glib-sharp-2.12.10 b/metadata/md5-cache/dev-dotnet/glib-sharp-2.12.10
index 11e4299a977e..170732c6fd56 100644
--- a/metadata/md5-cache/dev-dotnet/glib-sharp-2.12.10
+++ b/metadata/md5-cache/dev-dotnet/glib-sharp-2.12.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=!<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/libtool-2.4 =sys-devel/automake-1.10* >=sys-devel/autoconf-2.61 dev-libs/glib:2 >=dev-lang/mono-2.0.1 >=sys-apps/sed-4 virtual/pkgconfig >=app-shells/bash-3.1
+DEPEND=!<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/libtool-2.4 dev-libs/glib:2 >=dev-lang/mono-2.0.1 >=sys-apps/sed-4 virtual/pkgconfig >=app-shells/bash-3.1
 DESCRIPTION=GtkSharp's glib module of the gtk-sharp tarball
 EAPI=4
 HOMEPAGE=http://www.mono-project.com/GtkSharp
@@ -9,6 +9,6 @@ LICENSE=LGPL-2.1
 RDEPEND=!<=dev-dotnet/gtk-sharp-2.12.7:2 dev-libs/glib:2 >=dev-lang/mono-2.0.1
 RESTRICT=test
 SLOT=2
-SRC_URI=mirror://gentoo/gtk-sharp-2.12.7.patch.bz2 mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.bz2
-_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	gtk-sharp-module	4af5cdeccbe0871872fe121969e1437f	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+SRC_URI=mirror://gentoo/gtk-sharp-2.12.7.patch.bz2 http://download.mono-project.com/sources/gtk-sharp212/gtk-sharp-2.12.10.tar.bz2
+_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	gtk-sharp-module	4108307ac62ede1ee9ce7b99f9669db6	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=356f95b45e669986d0e19b077bbab2a3
diff --git a/metadata/md5-cache/dev-dotnet/gnome-desktop-sharp-2.26.0-r1 b/metadata/md5-cache/dev-dotnet/gnome-desktop-sharp-2.26.0-r1
index aed6c98e4edd..16569f3a66de 100644
--- a/metadata/md5-cache/dev-dotnet/gnome-desktop-sharp-2.26.0-r1
+++ b/metadata/md5-cache/dev-dotnet/gnome-desktop-sharp-2.26.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=gnome-base/gnome-desktop-2.30:2 =dev-dotnet/gtk-sharp-2.12* =dev-dotne
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-desktop-sharp/2.26/gnome-desktop-sharp-2.26.0.tar.bz2
-_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	gtk-sharp-module	4af5cdeccbe0871872fe121969e1437f	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	gtk-sharp-module	e7c36c41de637c396bc8a7c453ea5171	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6b0239dce2f6c26b56c2bdb64ba5959a
diff --git a/metadata/md5-cache/dev-dotnet/gnome-sharp-2.24.2 b/metadata/md5-cache/dev-dotnet/gnome-sharp-2.24.2
index 50882fd67604..6f5b8d1fa7a3 100644
--- a/metadata/md5-cache/dev-dotnet/gnome-sharp-2.24.2
+++ b/metadata/md5-cache/dev-dotnet/gnome-sharp-2.24.2
@@ -10,5 +10,5 @@ RDEPEND==dev-dotnet/gtk-sharp-2.12* >=dev-lang/mono-2.7 >=gnome-base/libgnomeui-
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-sharp/2.24/gnome-sharp-2.24.2.tar.bz2
-_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	gtk-sharp-module	4af5cdeccbe0871872fe121969e1437f	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	gtk-sharp-module	e7c36c41de637c396bc8a7c453ea5171	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c5bdf30654fa82240e0d4dd8b05b4379
diff --git a/metadata/md5-cache/dev-dotnet/gnomevfs-sharp-2.24.2 b/metadata/md5-cache/dev-dotnet/gnomevfs-sharp-2.24.2
index 2186783d427f..9807b2300684 100644
--- a/metadata/md5-cache/dev-dotnet/gnomevfs-sharp-2.24.2
+++ b/metadata/md5-cache/dev-dotnet/gnomevfs-sharp-2.24.2
@@ -10,5 +10,5 @@ RDEPEND==dev-dotnet/gtk-sharp-2.12* >=dev-lang/mono-2.7 >=gnome-base/gnome-vfs-2
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-sharp/2.24/gnome-sharp-2.24.2.tar.bz2
-_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	gtk-sharp-module	4af5cdeccbe0871872fe121969e1437f	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	gtk-sharp-module	e7c36c41de637c396bc8a7c453ea5171	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cc10fe20223a00f9b37f04cbf3f5093d
diff --git a/metadata/md5-cache/dev-dotnet/gtk-dotnet-sharp-2.12.10 b/metadata/md5-cache/dev-dotnet/gtk-dotnet-sharp-2.12.10
index 81399c0c1abd..10b772f765a6 100644
--- a/metadata/md5-cache/dev-dotnet/gtk-dotnet-sharp-2.12.10
+++ b/metadata/md5-cache/dev-dotnet/gtk-dotnet-sharp-2.12.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=!<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/libtool-2.4 =sys-devel/automake-1.10* >=sys-devel/autoconf-2.61 ~dev-dotnet/glib-sharp-2.12.10 ~dev-dotnet/gdk-sharp-2.12.10 ~dev-dotnet/pango-sharp-2.12.10 ~dev-dotnet/gtk-sharp-2.12.10 dev-lang/mono[-minimal] >=dev-lang/mono-2.0.1 >=sys-apps/sed-4 virtual/pkgconfig >=app-shells/bash-3.1
+DEPEND=!<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/libtool-2.4 ~dev-dotnet/glib-sharp-2.12.10 ~dev-dotnet/gdk-sharp-2.12.10 ~dev-dotnet/pango-sharp-2.12.10 ~dev-dotnet/gtk-sharp-2.12.10 dev-lang/mono[-minimal] >=dev-lang/mono-2.0.1 >=sys-apps/sed-4 virtual/pkgconfig >=app-shells/bash-3.1
 DESCRIPTION=GtkSharp's gtk-dotnet module of the gtk-sharp tarball
 EAPI=2
 HOMEPAGE=http://www.mono-project.com/GtkSharp
@@ -9,6 +9,6 @@ LICENSE=LGPL-2.1
 RDEPEND=~dev-dotnet/glib-sharp-2.12.10 ~dev-dotnet/gdk-sharp-2.12.10 ~dev-dotnet/pango-sharp-2.12.10 ~dev-dotnet/gtk-sharp-2.12.10 dev-lang/mono[-minimal] !<=dev-dotnet/gtk-sharp-2.12.7:2 >=dev-lang/mono-2.0.1
 RESTRICT=test
 SLOT=2
-SRC_URI=mirror://gentoo/gtk-sharp-2.12.7.patch.bz2 mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.bz2
-_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	gtk-sharp-module	4af5cdeccbe0871872fe121969e1437f	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+SRC_URI=mirror://gentoo/gtk-sharp-2.12.7.patch.bz2 http://download.mono-project.com/sources/gtk-sharp212/gtk-sharp-2.12.10.tar.bz2
+_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	gtk-sharp-module	4108307ac62ede1ee9ce7b99f9669db6	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=360f6aacaed3948282de63c5822212b2
diff --git a/metadata/md5-cache/dev-dotnet/gtk-sharp-2.12.10 b/metadata/md5-cache/dev-dotnet/gtk-sharp-2.12.10
index 49951ba242da..eb027282bd4a 100644
--- a/metadata/md5-cache/dev-dotnet/gtk-sharp-2.12.10
+++ b/metadata/md5-cache/dev-dotnet/gtk-sharp-2.12.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=!<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/libtool-2.4 =sys-devel/automake-1.10* >=sys-devel/autoconf-2.61 ~dev-dotnet/gtk-sharp-gapi-2.12.10 ~dev-dotnet/glib-sharp-2.12.10 ~dev-dotnet/atk-sharp-2.12.10 ~dev-dotnet/gdk-sharp-2.12.10 ~dev-dotnet/pango-sharp-2.12.10 >=dev-lang/mono-2.0.1 >=sys-apps/sed-4 virtual/pkgconfig >=app-shells/bash-3.1
+DEPEND=!<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/libtool-2.4 ~dev-dotnet/gtk-sharp-gapi-2.12.10 ~dev-dotnet/glib-sharp-2.12.10 ~dev-dotnet/atk-sharp-2.12.10 ~dev-dotnet/gdk-sharp-2.12.10 ~dev-dotnet/pango-sharp-2.12.10 >=dev-lang/mono-2.0.1 >=sys-apps/sed-4 virtual/pkgconfig >=app-shells/bash-3.1
 DESCRIPTION=GtkSharp's gtk module of the gtk-sharp tarball
 EAPI=2
 HOMEPAGE=http://www.mono-project.com/GtkSharp
@@ -9,6 +9,6 @@ LICENSE=LGPL-2.1
 RDEPEND=~dev-dotnet/glib-sharp-2.12.10 ~dev-dotnet/atk-sharp-2.12.10 ~dev-dotnet/gdk-sharp-2.12.10 ~dev-dotnet/pango-sharp-2.12.10 >=dev-lang/mono-2.0.1
 RESTRICT=test
 SLOT=2
-SRC_URI=mirror://gentoo/gtk-sharp-2.12.7.patch.bz2 mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.bz2
-_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	gtk-sharp-module	4af5cdeccbe0871872fe121969e1437f	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+SRC_URI=mirror://gentoo/gtk-sharp-2.12.7.patch.bz2 http://download.mono-project.com/sources/gtk-sharp212/gtk-sharp-2.12.10.tar.bz2
+_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	gtk-sharp-module	4108307ac62ede1ee9ce7b99f9669db6	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ffa62357a39486c5e84550be30565f6a
diff --git a/metadata/md5-cache/dev-dotnet/gtk-sharp-docs-2.12.10 b/metadata/md5-cache/dev-dotnet/gtk-sharp-docs-2.12.10
index 54e0fa45d240..5a7a589cbe97 100644
--- a/metadata/md5-cache/dev-dotnet/gtk-sharp-docs-2.12.10
+++ b/metadata/md5-cache/dev-dotnet/gtk-sharp-docs-2.12.10
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=!<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/libtool-2.4 =sys-devel/automake-1.10* >=sys-devel/autoconf-2.61 >=dev-lang/mono-2.0 >=dev-lang/mono-2.0.1 >=sys-apps/sed-4 virtual/pkgconfig >=app-shells/bash-3.1
+DEPEND=!<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/libtool-2.4 >=virtual/monodoc-2.0 >=dev-lang/mono-2.0.1 >=sys-apps/sed-4 virtual/pkgconfig >=app-shells/bash-3.1
 DESCRIPTION=GtkSharp's gtk-docs module of the gtk-sharp tarball
 EAPI=2
 HOMEPAGE=http://www.mono-project.com/GtkSharp
 IUSE=debug
 KEYWORDS=amd64 ppc x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=>=dev-lang/mono-2.0 >=dev-lang/mono-2.0.1
+RDEPEND=>=virtual/monodoc-2.0 >=dev-lang/mono-2.0.1
 RESTRICT=test
 SLOT=2
-SRC_URI=mirror://gentoo/gtk-sharp-2.12.7.patch.bz2 mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.bz2
-_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	gtk-sharp-module	4af5cdeccbe0871872fe121969e1437f	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+SRC_URI=mirror://gentoo/gtk-sharp-2.12.7.patch.bz2 http://download.mono-project.com/sources/gtk-sharp212/gtk-sharp-2.12.10.tar.bz2
+_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	gtk-sharp-module	4108307ac62ede1ee9ce7b99f9669db6	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7901e7ed29391cda4d5358e49638b4bc
diff --git a/metadata/md5-cache/dev-dotnet/gtk-sharp-gapi-2.12.10 b/metadata/md5-cache/dev-dotnet/gtk-sharp-gapi-2.12.10
index 917e18d22138..ff00bc0f782b 100644
--- a/metadata/md5-cache/dev-dotnet/gtk-sharp-gapi-2.12.10
+++ b/metadata/md5-cache/dev-dotnet/gtk-sharp-gapi-2.12.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=!<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/libtool-2.4 =sys-devel/automake-1.10* >=sys-devel/autoconf-2.61 dev-perl/XML-LibXML >=dev-lang/mono-2.0.1 >=sys-apps/sed-4 virtual/pkgconfig >=app-shells/bash-3.1
+DEPEND=!<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/libtool-2.4 dev-perl/XML-LibXML >=dev-lang/mono-2.0.1 >=sys-apps/sed-4 virtual/pkgconfig >=app-shells/bash-3.1
 DESCRIPTION=GtkSharp's gtk-gapi module of the gtk-sharp tarball
 EAPI=2
 HOMEPAGE=http://www.mono-project.com/GtkSharp
@@ -9,6 +9,6 @@ LICENSE=LGPL-2.1
 RDEPEND=!<=dev-dotnet/gtk-sharp-2.12.7:2 dev-perl/XML-LibXML >=dev-lang/mono-2.0.1
 RESTRICT=test
 SLOT=2
-SRC_URI=mirror://gentoo/gtk-sharp-2.12.7.patch.bz2 mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.bz2
-_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	gtk-sharp-module	4af5cdeccbe0871872fe121969e1437f	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+SRC_URI=mirror://gentoo/gtk-sharp-2.12.7.patch.bz2 http://download.mono-project.com/sources/gtk-sharp212/gtk-sharp-2.12.10.tar.bz2
+_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	gtk-sharp-module	4108307ac62ede1ee9ce7b99f9669db6	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f06498a381f6bfee872ca9f1b761a243
diff --git a/metadata/md5-cache/dev-dotnet/gtksourceview-sharp-2.24.0-r10 b/metadata/md5-cache/dev-dotnet/gtksourceview-sharp-2.24.0-r10
index ff218cc38b77..a94155ace704 100644
--- a/metadata/md5-cache/dev-dotnet/gtksourceview-sharp-2.24.0-r10
+++ b/metadata/md5-cache/dev-dotnet/gtksourceview-sharp-2.24.0-r10
@@ -10,5 +10,5 @@ RDEPEND==dev-dotnet/gtk-sharp-2.12* =dev-dotnet/gnome-sharp-2.24* gnome-base/gno
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-desktop-sharp/2.24/gnome-desktop-sharp-2.24.0.tar.bz2
-_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	gtk-sharp-module	4af5cdeccbe0871872fe121969e1437f	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	gtk-sharp-module	e7c36c41de637c396bc8a7c453ea5171	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b038e2da2a6fec7c37fba6985eaa853e
diff --git a/metadata/md5-cache/dev-dotnet/libgdiplus-3.12 b/metadata/md5-cache/dev-dotnet/libgdiplus-3.12
new file mode 100644
index 000000000000..63dcafca93a5
--- /dev/null
+++ b/metadata/md5-cache/dev-dotnet/libgdiplus-3.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup unpack
+DEPEND=>=dev-libs/glib-2.2.3:2 >=media-libs/freetype-2.3.7 >=media-libs/fontconfig-2.6 >=media-libs/libpng-1.4:0 x11-libs/libXrender x11-libs/libX11 x11-libs/libXt >=x11-libs/cairo-1.8.4[X] media-libs/libexif >=media-libs/giflib-4.2.3 virtual/jpeg:0 media-libs/tiff:0 !cairo? ( >=x11-libs/pango-1.20 ) dev-lang/mono
+DESCRIPTION=Library for using System.Drawing with mono
+EAPI=5
+HOMEPAGE=http://www.mono-project.com
+IUSE=cairo
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=dev-libs/glib-2.2.3:2 >=media-libs/freetype-2.3.7 >=media-libs/fontconfig-2.6 >=media-libs/libpng-1.4:0 x11-libs/libXrender x11-libs/libX11 x11-libs/libXt >=x11-libs/cairo-1.8.4[X] media-libs/libexif >=media-libs/giflib-4.2.3 virtual/jpeg:0 media-libs/tiff:0 !cairo? ( >=x11-libs/pango-1.20 )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://download.mono-project.com/sources/libgdiplus/libgdiplus-3.12.tar.gz
+_eclasses_=base	84d9f879f57a8316ff02be0373a3d6f9	dotnet	b8788d81fe4ec93fda9fc56fed2981d0	eutils	351a78113be5b393c09a2c948701ad36	flag-o-matic	02090c5a622458303e6bf68837ac6b96	mono-env	10809200679bcceefebac9e72bebb6e6	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=29af7f633094cd344e1474a246c670de
diff --git a/metadata/md5-cache/dev-dotnet/mono-addins-1.0-r1 b/metadata/md5-cache/dev-dotnet/mono-addins-1.0-r1
new file mode 100644
index 000000000000..7992ed535dc7
--- /dev/null
+++ b/metadata/md5-cache/dev-dotnet/mono-addins-1.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-lang/mono-3 gtk? ( >=dev-dotnet/gtk-sharp-2.12.21:2 ) virtual/pkgconfig dev-lang/mono
+DESCRIPTION=A generic framework for creating extensible applications
+EAPI=5
+HOMEPAGE=http://www.mono-project.com/Mono.Addins
+IUSE=+gtk
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/mono-3 gtk? ( >=dev-dotnet/gtk-sharp-2.12.21:2 )
+SLOT=0
+SRC_URI=http://github.com/mono/mono-addins/archive/mono-addins-1.0.tar.gz -> mono-addins-1.0.tar.gz
+_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	autotools-utils	0bf099a6e3dfeaf20a7a94504d8dd896	dotnet	b8788d81fe4ec93fda9fc56fed2981d0	eutils	351a78113be5b393c09a2c948701ad36	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono-env	10809200679bcceefebac9e72bebb6e6	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=8cf3f4feb15595123b82f0351b3d0c5c
diff --git a/metadata/md5-cache/dev-dotnet/pango-sharp-2.12.10 b/metadata/md5-cache/dev-dotnet/pango-sharp-2.12.10
index de6cecd68025..c5f166e9a7b9 100644
--- a/metadata/md5-cache/dev-dotnet/pango-sharp-2.12.10
+++ b/metadata/md5-cache/dev-dotnet/pango-sharp-2.12.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=!<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/libtool-2.4 =sys-devel/automake-1.10* >=sys-devel/autoconf-2.61 ~dev-dotnet/gtk-sharp-gapi-2.12.10 ~dev-dotnet/glib-sharp-2.12.10 x11-libs/pango >=dev-lang/mono-2.0.1 >=sys-apps/sed-4 virtual/pkgconfig >=app-shells/bash-3.1
+DEPEND=!<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/libtool-2.4 ~dev-dotnet/gtk-sharp-gapi-2.12.10 ~dev-dotnet/glib-sharp-2.12.10 x11-libs/pango >=dev-lang/mono-2.0.1 >=sys-apps/sed-4 virtual/pkgconfig >=app-shells/bash-3.1
 DESCRIPTION=GtkSharp's pango module of the gtk-sharp tarball
 EAPI=2
 HOMEPAGE=http://www.mono-project.com/GtkSharp
@@ -9,6 +9,6 @@ LICENSE=LGPL-2.1
 RDEPEND=~dev-dotnet/glib-sharp-2.12.10 x11-libs/pango !<=dev-dotnet/gtk-sharp-2.12.7:2 >=dev-lang/mono-2.0.1
 RESTRICT=test
 SLOT=2
-SRC_URI=mirror://gentoo/gtk-sharp-2.12.7.patch.bz2 mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.bz2
-_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	gtk-sharp-module	4af5cdeccbe0871872fe121969e1437f	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+SRC_URI=mirror://gentoo/gtk-sharp-2.12.7.patch.bz2 http://download.mono-project.com/sources/gtk-sharp212/gtk-sharp-2.12.10.tar.bz2
+_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	gtk-sharp-module	4108307ac62ede1ee9ce7b99f9669db6	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8dd0eb86e615b02487c382d0ea770dac
diff --git a/metadata/md5-cache/dev-dotnet/rsvg-sharp-2.24.0-r10 b/metadata/md5-cache/dev-dotnet/rsvg-sharp-2.24.0-r10
index 5b9cf9e36503..a760c4985bc3 100644
--- a/metadata/md5-cache/dev-dotnet/rsvg-sharp-2.24.0-r10
+++ b/metadata/md5-cache/dev-dotnet/rsvg-sharp-2.24.0-r10
@@ -10,5 +10,5 @@ RDEPEND==dev-dotnet/gtk-sharp-2.12* =dev-dotnet/gnome-sharp-2.24* gnome-base/gno
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-desktop-sharp/2.24/gnome-desktop-sharp-2.24.0.tar.bz2
-_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	gtk-sharp-module	4af5cdeccbe0871872fe121969e1437f	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	gtk-sharp-module	e7c36c41de637c396bc8a7c453ea5171	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5125f0fc7e8bd9918a496ef0e0735a74
diff --git a/metadata/md5-cache/dev-dotnet/vte-sharp-2.24.0-r10 b/metadata/md5-cache/dev-dotnet/vte-sharp-2.24.0-r10
index 38115ff202e5..d57f2fbc5fef 100644
--- a/metadata/md5-cache/dev-dotnet/vte-sharp-2.24.0-r10
+++ b/metadata/md5-cache/dev-dotnet/vte-sharp-2.24.0-r10
@@ -10,5 +10,5 @@ RDEPEND==dev-dotnet/gtk-sharp-2.12* =dev-dotnet/gnome-sharp-2.24* gnome-base/gno
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-desktop-sharp/2.24/gnome-desktop-sharp-2.24.0.tar.bz2
-_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	gtk-sharp-module	4af5cdeccbe0871872fe121969e1437f	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	gtk-sharp-module	e7c36c41de637c396bc8a7c453ea5171	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b884eac4325ad9e1f16809b6de51c26c
diff --git a/metadata/md5-cache/dev-dotnet/wnck-sharp-2.24.0-r10 b/metadata/md5-cache/dev-dotnet/wnck-sharp-2.24.0-r10
index 0a0ccdac7264..c317b8a41119 100644
--- a/metadata/md5-cache/dev-dotnet/wnck-sharp-2.24.0-r10
+++ b/metadata/md5-cache/dev-dotnet/wnck-sharp-2.24.0-r10
@@ -10,5 +10,5 @@ RDEPEND==dev-dotnet/gtk-sharp-2.12* =dev-dotnet/gnome-sharp-2.24* gnome-base/gno
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-desktop-sharp/2.24/gnome-desktop-sharp-2.24.0.tar.bz2
-_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	gtk-sharp-module	4af5cdeccbe0871872fe121969e1437f	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	gtk-sharp-module	e7c36c41de637c396bc8a7c453ea5171	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=af31a6cc1c5f63103f7fa9b17745664c
diff --git a/metadata/md5-cache/dev-dotnet/xdt-for-monodevelop-2.8.1 b/metadata/md5-cache/dev-dotnet/xdt-for-monodevelop-2.8.1
new file mode 100644
index 000000000000..aff14aed643e
--- /dev/null
+++ b/metadata/md5-cache/dev-dotnet/xdt-for-monodevelop-2.8.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=|| ( dev-lang/mono ) dev-lang/mono
+DESCRIPTION=Microsoft's Xml Document Transformation library
+EAPI=5
+HOMEPAGE=https://github.com/mrward/xdt
+KEYWORDS=~x86 ~amd64
+LICENSE=Apache-2.0
+RDEPEND=|| ( dev-lang/mono )
+SLOT=0
+SRC_URI=https://github.com/mrward/xdt/archive/Release-NuGet-2.8.1-Mono.tar.gz -> xdt-for-monodevelop-2.8.1.tar.gz
+_eclasses_=dotnet	b8788d81fe4ec93fda9fc56fed2981d0	eutils	351a78113be5b393c09a2c948701ad36	mono-env	10809200679bcceefebac9e72bebb6e6	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=a1077e46560cf95d23af3cb28fc9774f
diff --git a/metadata/md5-cache/dev-dotnet/xsp-2.10.2-r2 b/metadata/md5-cache/dev-dotnet/xsp-2.10.2-r2
deleted file mode 100644
index 7e1dc5253dc5..000000000000
--- a/metadata/md5-cache/dev-dotnet/xsp-2.10.2-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare unpack
-DEPEND=dev-db/sqlite:3 >=dev-lang/mono-2.10 virtual/pkgconfig userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=XSP is a small web server that can host ASP.NET pages
-EAPI=4
-HOMEPAGE=http://www.mono-project.com/ASP.NET
-KEYWORDS=amd64 ppc x86
-LICENSE=MIT
-RDEPEND=dev-db/sqlite:3 >=dev-lang/mono-2.10
-SLOT=0
-SRC_URI=http://download.mono-project.com/sources/xsp/xsp-2.10.2.tar.bz2
-_eclasses_=base	84d9f879f57a8316ff02be0373a3d6f9	eutils	351a78113be5b393c09a2c948701ad36	go-mono	fdf799ccb71e4bdd1e25fb365343d74f	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ddeba779145f8cb7496e942bfd4f6194
diff --git a/metadata/md5-cache/dev-libs/ace-5.8.3 b/metadata/md5-cache/dev-libs/ace-5.8.3
new file mode 100644
index 000000000000..c78ba0c7320d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/ace-5.8.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-libs/openssl:0 X? ( x11-proto/xproto )
+DESCRIPTION=The Adaptive Communications Environment
+EAPI=5
+HOMEPAGE=http://www.cs.wustl.edu/~schmidt/ACE.html
+IUSE=X ciao ipv6 static-libs tao
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=ACE BSD BSD-4 BSD-2 tao? ( sun-iiop RSA )
+RDEPEND=dev-libs/openssl:0 X? ( x11-libs/libXt x11-libs/libXaw )
+SLOT=0/5.8.3
+SRC_URI=!tao? ( http://download.dre.vanderbilt.edu/previous_versions/ACE-5.8.3.tar.bz2 ) tao? ( !ciao? ( http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.8.3.tar.bz2 ) ciao? ( http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.8.3.tar.bz2 ) )
+_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
+_md5_=8fd1156d1cf885a9cf044af44ca569e9
diff --git a/metadata/md5-cache/dev-python/amodem-1.10 b/metadata/md5-cache/dev-python/amodem-1.12
similarity index 92%
rename from metadata/md5-cache/dev-python/amodem-1.10
rename to metadata/md5-cache/dev-python/amodem-1.12
index b8582bd8aa66..8b0e52736906 100644
--- a/metadata/md5-cache/dev-python/amodem-1.10
+++ b/metadata/md5-cache/dev-python/amodem-1.12
@@ -9,6 +9,6 @@ LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3 )
 SLOT=0
-SRC_URI=mirror://pypi/a/amodem/amodem-1.10.tar.gz
+SRC_URI=https://github.com/romanz/amodem/archive/v1.12.tar.gz -> amodem-1.12.tar.gz mirror://pypi/a/amodem/amodem-1.12.tar.gz
 _eclasses_=distutils-r1	1375d7df3597739c70e997d7508c6f79	eutils	351a78113be5b393c09a2c948701ad36	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	fca51bba23ab2e206194470b2e56c92c	python-utils-r1	39c6b012a0512678e698e712b5b7ecc2	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=eba24b5bed0603b04ba1611922c97190
+_md5_=1b1c0540b8b99cd1c9710174bab1af7e
diff --git a/metadata/md5-cache/dev-python/amodem-1.9 b/metadata/md5-cache/dev-python/amodem-1.9
deleted file mode 100644
index c0b024776dca..000000000000
--- a/metadata/md5-cache/dev-python/amodem-1.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
-DESCRIPTION=Transmit data between two computers using audio
-EAPI=5
-HOMEPAGE=https://github.com/romanz/amodem
-IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3 )
-SLOT=0
-SRC_URI=mirror://pypi/a/amodem/amodem-1.9.tar.gz
-_eclasses_=distutils-r1	1375d7df3597739c70e997d7508c6f79	eutils	351a78113be5b393c09a2c948701ad36	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	fca51bba23ab2e206194470b2e56c92c	python-utils-r1	39c6b012a0512678e698e712b5b7ecc2	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=eba24b5bed0603b04ba1611922c97190
diff --git a/metadata/md5-cache/dev-ruby/bson-3.2.1 b/metadata/md5-cache/dev-ruby/bson-3.2.1
new file mode 100644
index 000000000000..66c4b91ec70d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/bson-3.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DESCRIPTION=A Ruby BSON implementation for MongoDB. (Includes binary C-based extension.)
+EAPI=5
+HOMEPAGE=http://www.mongodb.org/
+IUSE=test doc elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+KEYWORDS=~amd64
+LICENSE=APSL-2
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+SLOT=3
+SRC_URI=https://github.com/mongodb/bson-ruby/archive/v3.2.1.tar.gz -> bson-3.2.1.tar.gz
+_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	java-utils-2	7c8af272d218f7b7df22fd16bb0bfb63	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	ruby-fakegem	b34b8f1debda62e461897a3f85df97e4	ruby-ng	497a8201c1d4a4129a8ac57a2bf2abb5	ruby-utils	97c910cb6b087c64260df641a9b3de0c	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=6be1f9376b6a12be575300f878ad5878
diff --git a/metadata/md5-cache/dev-ruby/bundler-1.9.9 b/metadata/md5-cache/dev-ruby/bundler-1.10.6
similarity index 96%
rename from metadata/md5-cache/dev-ruby/bundler-1.9.9
rename to metadata/md5-cache/dev-ruby/bundler-1.10.6
index 67ea38c6d293..7334144637ba 100644
--- a/metadata/md5-cache/dev-ruby/bundler-1.9.9
+++ b/metadata/md5-cache/dev-ruby/bundler-1.10.6
@@ -10,6 +10,6 @@ RDEPEND=ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/carlhuda/bundler/archive/v1.9.9.tar.gz -> bundler-1.9.9.tar.gz
+SRC_URI=https://github.com/carlhuda/bundler/archive/v1.10.6.tar.gz -> bundler-1.10.6.tar.gz
 _eclasses_=eutils	351a78113be5b393c09a2c948701ad36	java-utils-2	7c8af272d218f7b7df22fd16bb0bfb63	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	ruby-fakegem	b34b8f1debda62e461897a3f85df97e4	ruby-ng	497a8201c1d4a4129a8ac57a2bf2abb5	ruby-utils	97c910cb6b087c64260df641a9b3de0c	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6b928dbaaf336a3c420b69751e4a0ab7
+_md5_=6ff06591607aa6585cd8e76b801b7af8
diff --git a/metadata/md5-cache/dev-ruby/bunny-1.5.0 b/metadata/md5-cache/dev-ruby/bunny-1.5.0
deleted file mode 100644
index c0f3bf6171d1..000000000000
--- a/metadata/md5-cache/dev-ruby/bunny-1.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/amq-protocol-1.9.2[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/amq-protocol-1.9.2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/amq-protocol-1.9.2[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
-DESCRIPTION=Another synchronous Ruby AMQP client
-EAPI=5
-HOMEPAGE=http://github.com/celldee/bunny
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/amq-protocol-1.9.2[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/amq-protocol-1.9.2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/amq-protocol-1.9.2[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
-SLOT=0
-SRC_URI=mirror://rubygems/bunny-1.5.0.gem
-_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	java-utils-2	7c8af272d218f7b7df22fd16bb0bfb63	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	ruby-fakegem	b34b8f1debda62e461897a3f85df97e4	ruby-ng	497a8201c1d4a4129a8ac57a2bf2abb5	ruby-utils	97c910cb6b087c64260df641a9b3de0c	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c00c4831a7ab2393fee54c9caff70eb7
diff --git a/metadata/md5-cache/dev-ruby/bunny-1.5.1 b/metadata/md5-cache/dev-ruby/bunny-1.5.1
deleted file mode 100644
index 8021402f95f4..000000000000
--- a/metadata/md5-cache/dev-ruby/bunny-1.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/amq-protocol-1.9.2[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/amq-protocol-1.9.2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/amq-protocol-1.9.2[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
-DESCRIPTION=Another synchronous Ruby AMQP client
-EAPI=5
-HOMEPAGE=http://github.com/celldee/bunny
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/amq-protocol-1.9.2[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/amq-protocol-1.9.2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/amq-protocol-1.9.2[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
-SLOT=0
-SRC_URI=mirror://rubygems/bunny-1.5.1.gem
-_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	java-utils-2	7c8af272d218f7b7df22fd16bb0bfb63	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	ruby-fakegem	b34b8f1debda62e461897a3f85df97e4	ruby-ng	497a8201c1d4a4129a8ac57a2bf2abb5	ruby-utils	97c910cb6b087c64260df641a9b3de0c	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c00c4831a7ab2393fee54c9caff70eb7
diff --git a/metadata/md5-cache/dev-ruby/bunny-2.0.1 b/metadata/md5-cache/dev-ruby/bunny-2.0.1
new file mode 100644
index 000000000000..18bcba95461c
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/bunny-2.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/amq-protocol-1.9.2[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/amq-protocol-1.9.2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/amq-protocol-1.9.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/amq-protocol-1.9.2[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DESCRIPTION=Another synchronous Ruby AMQP client
+EAPI=5
+HOMEPAGE=http://github.com/celldee/bunny
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/amq-protocol-1.9.2[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/amq-protocol-1.9.2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/amq-protocol-1.9.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/amq-protocol-1.9.2[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+SLOT=0
+SRC_URI=mirror://rubygems/bunny-2.0.1.gem
+_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	java-utils-2	7c8af272d218f7b7df22fd16bb0bfb63	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	ruby-fakegem	b34b8f1debda62e461897a3f85df97e4	ruby-ng	497a8201c1d4a4129a8ac57a2bf2abb5	ruby-utils	97c910cb6b087c64260df641a9b3de0c	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=88122d09bd368c0697450b361d71e07e
diff --git a/metadata/md5-cache/dev-util/mingw64-runtime-2.0.8 b/metadata/md5-cache/dev-util/mingw64-runtime-2.0.8
deleted file mode 100644
index e385f741b3f1..000000000000
--- a/metadata/md5-cache/dev-util/mingw64-runtime-2.0.8
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install setup unpack
-DESCRIPTION=Free Win64 runtime and import library definitions
-HOMEPAGE=http://mingw-w64.sourceforge.net/
-IUSE=crosscompile_opts_headers-only
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RESTRICT=strip
-SLOT=0
-SRC_URI=mirror://sourceforge/mingw-w64/mingw-w64-v2.0.8.tar.gz
-_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	flag-o-matic	02090c5a622458303e6bf68837ac6b96	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=9dde974c41b5bc965579724589890a19
diff --git a/metadata/md5-cache/dev-util/mingw64-runtime-4.0.4 b/metadata/md5-cache/dev-util/mingw64-runtime-4.0.4
new file mode 100644
index 000000000000..4c3711189394
--- /dev/null
+++ b/metadata/md5-cache/dev-util/mingw64-runtime-4.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=!<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.15* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Free Win64 runtime and import library definitions
+EAPI=5
+HOMEPAGE=http://mingw-w64.sourceforge.net/
+IUSE=crosscompile_opts_headers-only idl libraries tools
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v4.0.4.tar.bz2
+_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	eutils	351a78113be5b393c09a2c948701ad36	flag-o-matic	02090c5a622458303e6bf68837ac6b96	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
+_md5_=51191902fd958671ca43944c1ee9e614
diff --git a/metadata/md5-cache/dev-util/monodevelop-5.9.5.5 b/metadata/md5-cache/dev-util/monodevelop-5.9.5.5
index 692c3f5126a1..b8b1b066dda3 100644
--- a/metadata/md5-cache/dev-util/monodevelop-5.9.5.5
+++ b/metadata/md5-cache/dev-util/monodevelop-5.9.5.5
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-lang/mono-3.2.8 >=dev-dotnet/nuget-2.8.3 gnome? ( >=dev-dotnet/gnome-sharp-2.24.2-r1 ) >=dev-dotnet/gtk-sharp-2.12.21:2 doc? ( dev-util/mono-docbrowser ) >=dev-dotnet/xsp-2 dev-util/ctags sys-apps/dbus[X] subversion? ( dev-vcs/subversion ) !<dev-util/monodevelop-boo-5.9 !<dev-util/monodevelop-java-5.9 !<dev-util/monodevelop-database-5.9 !<dev-util/monodevelop-debugger-gdb-5.9 !<dev-util/monodevelop-debugger-mdb-5.9 !<dev-util/monodevelop-vala-5.9 dev-util/intltool virtual/pkgconfig sys-devel/gettext x11-misc/shared-mime-info x11-terms/xterm app-arch/unzip >=sys-apps/sed-4 dev-lang/mono >=dev-vcs/git-1.8.2.1
+DEPEND=>=dev-lang/mono-3.2.8 >=dev-dotnet/nuget-2.8.3 gnome? ( >=dev-dotnet/gnome-sharp-2.24.2-r1 ) >=dev-dotnet/gtk-sharp-2.12.21:2 >=www-servers/xsp-2 dev-util/ctags sys-apps/dbus[X] subversion? ( dev-vcs/subversion ) !<dev-util/monodevelop-boo-5.9 !<dev-util/monodevelop-java-5.9 !<dev-util/monodevelop-database-5.9 !<dev-util/monodevelop-debugger-gdb-5.9 !<dev-util/monodevelop-debugger-mdb-5.9 !<dev-util/monodevelop-vala-5.9 dev-util/intltool virtual/pkgconfig sys-devel/gettext x11-misc/shared-mime-info x11-terms/xterm app-arch/unzip >=sys-apps/sed-4 dev-lang/mono >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Integrated Development Environment for .NET
 EAPI=5
 HOMEPAGE=http://www.monodevelop.com/
-IUSE=+subversion +git doc +gnome qtcurve
+IUSE=+subversion +git +gnome qtcurve
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-lang/mono-3.2.8 >=dev-dotnet/nuget-2.8.3 gnome? ( >=dev-dotnet/gnome-sharp-2.24.2-r1 ) >=dev-dotnet/gtk-sharp-2.12.21:2 doc? ( dev-util/mono-docbrowser ) >=dev-dotnet/xsp-2 dev-util/ctags sys-apps/dbus[X] subversion? ( dev-vcs/subversion ) !<dev-util/monodevelop-boo-5.9 !<dev-util/monodevelop-java-5.9 !<dev-util/monodevelop-database-5.9 !<dev-util/monodevelop-debugger-gdb-5.9 !<dev-util/monodevelop-debugger-mdb-5.9 !<dev-util/monodevelop-vala-5.9
+RDEPEND=>=dev-lang/mono-3.2.8 >=dev-dotnet/nuget-2.8.3 gnome? ( >=dev-dotnet/gnome-sharp-2.24.2-r1 ) >=dev-dotnet/gtk-sharp-2.12.21:2 >=www-servers/xsp-2 dev-util/ctags sys-apps/dbus[X] subversion? ( dev-vcs/subversion ) !<dev-util/monodevelop-boo-5.9 !<dev-util/monodevelop-java-5.9 !<dev-util/monodevelop-database-5.9 !<dev-util/monodevelop-debugger-gdb-5.9 !<dev-util/monodevelop-debugger-mdb-5.9 !<dev-util/monodevelop-vala-5.9
 SLOT=0
 SRC_URI=https://launchpadlibrarian.net/68057829/NUnit-2.5.10.11092.zip https://www.nuget.org/api/v2/package/NUnit/2.6.3 -> NUnit.2.6.3.zip https://www.nuget.org/api/v2/package/NUnit.Runners/2.6.3 -> NUnit.Runners.2.6.3.zip https://www.nuget.org/api/v2/package/System.Web.Mvc.Extensions.Mvc.4/1.0.9 -> System.Web.Mvc.Extensions.Mvc.4.1.0.9.zip https://www.nuget.org/api/v2/package/Microsoft.AspNet.Mvc/5.2.2 -> Microsoft.AspNet.Mvc.5.2.2.zip https://www.nuget.org/api/v2/package/Microsoft.AspNet.Razor/3.2.2 -> Microsoft.AspNet.Razor.3.2.2.zip https://www.nuget.org/api/v2/package/Microsoft.AspNet.WebPages/3.2.2 -> Microsoft.AspNet.WebPages.3.2.2.zip https://www.nuget.org/api/v2/package/Microsoft.Web.Infrastructure/1.0.0.0 -> Microsoft.Web.Infrastructure.1.0.0.0.zip
 _eclasses_=dotnet	b8788d81fe4ec93fda9fc56fed2981d0	eutils	351a78113be5b393c09a2c948701ad36	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	git-r3	1502b9838d043db47700b8120083e637	gnome2-utils	ba8b66b446cac0566ae76d6e5bf2f914	mono-env	10809200679bcceefebac9e72bebb6e6	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f5cb2b92e2078160e46c381a69a20c23
+_md5_=8af287849cdb6c3cb6c81db06299c03f
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.8.14 b/metadata/md5-cache/dev-vcs/subversion-1.8.14
index c9b424dbba1b..f0703d4d90d7 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.8.14
+++ b/metadata/md5-cache/dev-vcs/subversion-1.8.14
@@ -4,11 +4,11 @@ DESCRIPTION=Advanced version control system
 EAPI=5
 HOMEPAGE=http://subversion.apache.org/
 IUSE=apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kde nls perl python ruby sasl test vim-syntax apache2 python_targets_python2_7 elibc_FreeBSD java
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Subversion GPL-2
 RDEPEND=>=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-apps/file sys-libs/zlib app-arch/bzip2 berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/libgnome-keyring ) kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( >=dev-lang/ruby-2.0:2.0 dev-ruby/rubygems[ruby_targets_ruby20] ) sasl? ( dev-libs/cyrus-sasl ) http? ( >=net-libs/serf-1.2.1 ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) kde? ( kde-apps/kwalletd:4 ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0 )
 REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) !dso )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.8.14.tar.bz2
 _eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	bash-completion-r1	b1fc4d30333bb528c8abb4332bb70ea6	db-use	a4966c7f4f7df444ead1212848c13cc9	depend.apache	e3c541cb90838388f81620d630c28f41	distutils-r1	1375d7df3597739c70e997d7508c6f79	elisp-common	73c48c11ad6a6494eda0d0cca848c8fa	eutils	351a78113be5b393c09a2c948701ad36	flag-o-matic	02090c5a622458303e6bf68837ac6b96	java-pkg-opt-2	4a567b4a22dd2dc61b77c056d29353a5	java-utils-2	7c8af272d218f7b7df22fd16bb0bfb63	libtool	7f78cd7d403808a350c9ae23f5821fb4	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	perl-module	1cfb38bf68a24c8394e41d2f53003146	python-r1	fca51bba23ab2e206194470b2e56c92c	python-utils-r1	39c6b012a0512678e698e712b5b7ecc2	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	unpacker	1ca344bd9b922a7f8084a3fa02933b79	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f49a1716ed248c01a2aa09b494d2dd41
+_md5_=c419e1870a8070488672f8188790382e
diff --git a/metadata/md5-cache/media-libs/imlib2-9999 b/metadata/md5-cache/media-libs/imlib2-9999
index 99a1371c45d6..dc0d3eeb9100 100644
--- a/metadata/md5-cache/media-libs/imlib2-9999
+++ b/metadata/md5-cache/media-libs/imlib2-9999
@@ -3,9 +3,9 @@ DEPEND==media-libs/freetype-2*[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi
 DESCRIPTION=Version 2 of an advanced replacement library for libraries like libXpm
 EAPI=4
 HOMEPAGE=http://www.enlightenment.org/
-IUSE=bzip2 gif jpeg cpu_flags_x86_mmx mp3 png static-libs tiff X zlib nls doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+IUSE=bzip2 gif jpeg cpu_flags_x86_mmx cpu_flags_x86_sse2 mp3 png static-libs tiff X zlib nls doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 LICENSE=BSD
 RDEPEND==media-libs/freetype-2*[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gif? ( >=media-libs/giflib-4.1.6-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-4.0.3-r6:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-libs/libid3tag-0.15.1b-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext )
 SLOT=0
 _eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	enlightenment	c185b1fa0d87798fd07fb1cd85866b23	eutils	351a78113be5b393c09a2c948701ad36	git-2	1bb87192831f668cd20d93ffb1689c94	libtool	7f78cd7d403808a350c9ae23f5821fb4	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multilib-build	c47eec09e82c8a750127ff2abf0745b1	multilib-minimal	a93a9b4153a5f1c746bdd3b20ef9d834	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=daf883361c64b2e7112c790a76ecca63
+_md5_=bb1ecbb44d3649d5625ea0bf5c671058
diff --git a/metadata/md5-cache/media-plugins/audacious-plugins-3.6.2 b/metadata/md5-cache/media-plugins/audacious-plugins-3.6.2-r1
similarity index 74%
rename from metadata/md5-cache/media-plugins/audacious-plugins-3.6.2
rename to metadata/md5-cache/media-plugins/audacious-plugins-3.6.2-r1
index eeea7054835c..f327c1405cda 100644
--- a/metadata/md5-cache/media-plugins/audacious-plugins-3.6.2
+++ b/metadata/md5-cache/media-plugins/audacious-plugins-3.6.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure prepare unpack
-DEPEND=app-arch/unzip >=dev-libs/dbus-glib-0.60 dev-libs/libxml2:2 media-libs/libmodplug ~media-sound/audacious-3.6.2 ( || ( >=dev-libs/glib-2.32.2[utils] dev-util/gdbus-codegen ) ) aac? ( >=media-libs/faad2-2.7 ) adplug? ( >=dev-cpp/libbinio-1.4 ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) bs2b? ( media-libs/libbs2b ) cdda? ( >=media-libs/libcddb-1.2.1 dev-libs/libcdio-paranoia ) cue? ( media-libs/libcue ) ffmpeg? ( >=virtual/ffmpeg-0.7.3 ) flac? ( >=media-libs/libvorbis-1.0 >=media-libs/flac-1.2.1-r1 ) fluidsynth? ( media-sound/fluidsynth ) http? ( >=net-libs/neon-0.26.4 ) gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 ) jack? ( >=media-libs/bio2jack-0.4 media-sound/jack-audio-connection-kit ) lame? ( media-sound/lame ) libnotify? ( x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) lirc? ( app-misc/lirc ) mms? ( >=media-libs/libmms-0.3 ) mp3? ( >=media-sound/mpg123-1.12.1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) scrobbler? ( net-misc/curl ) sdl? ( media-libs/libsdl[sound] ) sid? ( >=media-libs/libsidplayfp-1.0.0 ) sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) vorbis? ( >=media-libs/libvorbis-1.2.0 >=media-libs/libogg-1.1.3 ) wavpack? ( >=media-sound/wavpack-4.50.1-r1 ) nls? ( dev-util/intltool ) virtual/pkgconfig
+DEPEND=app-arch/unzip >=dev-libs/dbus-glib-0.60 dev-libs/libxml2:2 media-libs/libmodplug ~media-sound/audacious-3.6.2 ( || ( >=dev-libs/glib-2.32.2[utils] dev-util/gdbus-codegen ) ) aac? ( >=media-libs/faad2-2.7 ) adplug? ( >=dev-cpp/libbinio-1.4 ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) bs2b? ( media-libs/libbs2b ) cdda? ( >=media-libs/libcddb-1.2.1 dev-libs/libcdio-paranoia ) cue? ( media-libs/libcue ) ffmpeg? ( >=virtual/ffmpeg-0.7.3 ) flac? ( >=media-libs/libvorbis-1.0 >=media-libs/flac-1.2.1-r1 ) fluidsynth? ( media-sound/fluidsynth ) http? ( >=net-libs/neon-0.26.4 ) !gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 ) jack? ( >=media-libs/bio2jack-0.4 media-sound/jack-audio-connection-kit ) lame? ( media-sound/lame ) libnotify? ( x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) lirc? ( app-misc/lirc ) mms? ( >=media-libs/libmms-0.3 ) mp3? ( >=media-sound/mpg123-1.12.1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) scrobbler? ( net-misc/curl ) sdl? ( media-libs/libsdl[sound] ) sid? ( >=media-libs/libsidplayfp-1.0.0 ) sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) vorbis? ( >=media-libs/libvorbis-1.2.0 >=media-libs/libogg-1.1.3 ) wavpack? ( >=media-sound/wavpack-4.50.1-r1 ) nls? ( dev-util/intltool ) virtual/pkgconfig
 DESCRIPTION=Audacious Player - Your music, your way, no exceptions
 EAPI=5
 HOMEPAGE=http://audacious-media-player.org/
 IUSE=aac adplug alsa bs2b cdda cue ffmpeg flac fluidsynth gnome http gtk3 jack lame libnotify libsamplerate lirc mms mp3 nls pulseaudio qt5 scrobbler sdl sid sndfile vorbis wavpack
 KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=app-arch/unzip >=dev-libs/dbus-glib-0.60 dev-libs/libxml2:2 media-libs/libmodplug ~media-sound/audacious-3.6.2 ( || ( >=dev-libs/glib-2.32.2[utils] dev-util/gdbus-codegen ) ) aac? ( >=media-libs/faad2-2.7 ) adplug? ( >=dev-cpp/libbinio-1.4 ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) bs2b? ( media-libs/libbs2b ) cdda? ( >=media-libs/libcddb-1.2.1 dev-libs/libcdio-paranoia ) cue? ( media-libs/libcue ) ffmpeg? ( >=virtual/ffmpeg-0.7.3 ) flac? ( >=media-libs/libvorbis-1.0 >=media-libs/flac-1.2.1-r1 ) fluidsynth? ( media-sound/fluidsynth ) http? ( >=net-libs/neon-0.26.4 ) gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 ) jack? ( >=media-libs/bio2jack-0.4 media-sound/jack-audio-connection-kit ) lame? ( media-sound/lame ) libnotify? ( x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) lirc? ( app-misc/lirc ) mms? ( >=media-libs/libmms-0.3 ) mp3? ( >=media-sound/mpg123-1.12.1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) scrobbler? ( net-misc/curl ) sdl? ( media-libs/libsdl[sound] ) sid? ( >=media-libs/libsidplayfp-1.0.0 ) sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) vorbis? ( >=media-libs/libvorbis-1.2.0 >=media-libs/libogg-1.1.3 ) wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
+RDEPEND=app-arch/unzip >=dev-libs/dbus-glib-0.60 dev-libs/libxml2:2 media-libs/libmodplug ~media-sound/audacious-3.6.2 ( || ( >=dev-libs/glib-2.32.2[utils] dev-util/gdbus-codegen ) ) aac? ( >=media-libs/faad2-2.7 ) adplug? ( >=dev-cpp/libbinio-1.4 ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) bs2b? ( media-libs/libbs2b ) cdda? ( >=media-libs/libcddb-1.2.1 dev-libs/libcdio-paranoia ) cue? ( media-libs/libcue ) ffmpeg? ( >=virtual/ffmpeg-0.7.3 ) flac? ( >=media-libs/libvorbis-1.0 >=media-libs/flac-1.2.1-r1 ) fluidsynth? ( media-sound/fluidsynth ) http? ( >=net-libs/neon-0.26.4 ) !gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 ) jack? ( >=media-libs/bio2jack-0.4 media-sound/jack-audio-connection-kit ) lame? ( media-sound/lame ) libnotify? ( x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) lirc? ( app-misc/lirc ) mms? ( >=media-libs/libmms-0.3 ) mp3? ( >=media-sound/mpg123-1.12.1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) scrobbler? ( net-misc/curl ) sdl? ( media-libs/libsdl[sound] ) sid? ( >=media-libs/libsidplayfp-1.0.0 ) sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) vorbis? ( >=media-libs/libvorbis-1.2.0 >=media-libs/libogg-1.1.3 ) wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
 REQUIRED_USE=|| ( alsa flac lame jack pulseaudio qt5 sdl )
 SLOT=0
 SRC_URI=!gtk3? ( http://distfiles.audacious-media-player.org/audacious-plugins-3.6.2.tar.bz2 ) gtk3? ( http://distfiles.audacious-media-player.org/audacious-plugins-3.6.2-gtk3.tar.bz2 )
 _eclasses_=eutils	351a78113be5b393c09a2c948701ad36	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=d5054bc86a92edeaa6b272b0e3d6657b
+_md5_=c5c17f3da0c92e19e15754561335c268
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.10 b/metadata/md5-cache/net-firewall/iptables-1.4.10
deleted file mode 100644
index 81bc65efaf90..000000000000
--- a/metadata/md5-cache/net-firewall/iptables-1.4.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=virtual/os-headers
-DESCRIPTION=Linux kernel (2.4+) firewall, NAT and packet mangling tools
-EAPI=2
-HOMEPAGE=http://www.iptables.org/
-IUSE=ipv6
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://iptables.org/projects/iptables/files/iptables-1.4.10.tar.bz2
-_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	eutils	351a78113be5b393c09a2c948701ad36	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=2239c04751a26bb7b6bb1772a28aa09e
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.10-r1 b/metadata/md5-cache/net-firewall/iptables-1.4.10-r1
deleted file mode 100644
index 1d29a6eebf1b..000000000000
--- a/metadata/md5-cache/net-firewall/iptables-1.4.10-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=netlink? ( net-libs/libnfnetlink ) virtual/os-headers
-DESCRIPTION=Linux kernel (2.4+) firewall, NAT and packet mangling tools
-EAPI=2
-HOMEPAGE=http://www.iptables.org/
-IUSE=ipv6 netlink
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=netlink? ( net-libs/libnfnetlink )
-SLOT=0
-SRC_URI=http://iptables.org/projects/iptables/files/iptables-1.4.10.tar.bz2
-_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	eutils	351a78113be5b393c09a2c948701ad36	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=e88d163de52c72a6b8bb8aa649302f54
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.11.1-r2 b/metadata/md5-cache/net-firewall/iptables-1.4.11.1-r2
deleted file mode 100644
index 67adef2b970d..000000000000
--- a/metadata/md5-cache/net-firewall/iptables-1.4.11.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=netlink? ( net-libs/libnfnetlink ) virtual/os-headers sys-devel/automake
-DESCRIPTION=Linux kernel (2.4+) firewall, NAT and packet mangling tools
-EAPI=4
-HOMEPAGE=http://www.iptables.org/
-IUSE=ipv6 netlink
-KEYWORDS=alpha amd64 arm ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=GPL-2
-RDEPEND=netlink? ( net-libs/libnfnetlink )
-SLOT=0
-SRC_URI=http://iptables.org/projects/iptables/files/iptables-1.4.11.1.tar.bz2
-_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	eutils	351a78113be5b393c09a2c948701ad36	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=d5d25bed600c67332d6d667198e35e51
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.12 b/metadata/md5-cache/net-firewall/iptables-1.4.12
deleted file mode 100644
index 5c9011c27a06..000000000000
--- a/metadata/md5-cache/net-firewall/iptables-1.4.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=netlink? ( net-libs/libnfnetlink ) virtual/os-headers sys-devel/automake
-DESCRIPTION=Linux kernel (2.4+) firewall, NAT and packet mangling tools
-EAPI=4
-HOMEPAGE=http://www.iptables.org/
-IUSE=ipv6 netlink
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=netlink? ( net-libs/libnfnetlink )
-SLOT=0
-SRC_URI=http://iptables.org/projects/iptables/files/iptables-1.4.12.tar.bz2
-_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	eutils	351a78113be5b393c09a2c948701ad36	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=9c18e08e322d3d2b07dce50d45409a98
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.12.1 b/metadata/md5-cache/net-firewall/iptables-1.4.12.1
deleted file mode 100644
index 86e47490ada5..000000000000
--- a/metadata/md5-cache/net-firewall/iptables-1.4.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=netlink? ( net-libs/libnfnetlink ) virtual/os-headers sys-devel/automake
-DESCRIPTION=Linux kernel (2.4+) firewall, NAT and packet mangling tools
-EAPI=4
-HOMEPAGE=http://www.iptables.org/
-IUSE=ipv6 netlink
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=GPL-2
-RDEPEND=netlink? ( net-libs/libnfnetlink )
-SLOT=0
-SRC_URI=http://iptables.org/projects/iptables/files/iptables-1.4.12.1.tar.bz2
-_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	eutils	351a78113be5b393c09a2c948701ad36	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=0923f7eb34f33e308a3ef40f4ae0579d
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.12.1-r1 b/metadata/md5-cache/net-firewall/iptables-1.4.12.1-r1
deleted file mode 100644
index 788f6f970386..000000000000
--- a/metadata/md5-cache/net-firewall/iptables-1.4.12.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=netlink? ( net-libs/libnfnetlink ) virtual/os-headers sys-devel/automake
-DESCRIPTION=Linux kernel (2.4+) firewall, NAT and packet mangling tools
-EAPI=4
-HOMEPAGE=http://www.iptables.org/
-IUSE=ipv6 netlink static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=netlink? ( net-libs/libnfnetlink )
-SLOT=0
-SRC_URI=http://iptables.org/projects/iptables/files/iptables-1.4.12.1.tar.bz2
-_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	eutils	351a78113be5b393c09a2c948701ad36	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=dad371cb3329d33b60d99a9ae61b68fc
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.13 b/metadata/md5-cache/net-firewall/iptables-1.4.13
deleted file mode 100644
index 31677ee7e2ab..000000000000
--- a/metadata/md5-cache/net-firewall/iptables-1.4.13
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=netlink? ( net-libs/libnfnetlink ) virtual/os-headers !>=sys-kernel/linux-headers-3.5
-DESCRIPTION=Linux kernel (2.4+) firewall, NAT and packet mangling tools
-EAPI=4
-HOMEPAGE=http://www.iptables.org/
-IUSE=ipv6 netlink static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=GPL-2
-RDEPEND=netlink? ( net-libs/libnfnetlink )
-SLOT=0
-SRC_URI=http://iptables.org/projects/iptables/files/iptables-1.4.13.tar.bz2
-_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	eutils	351a78113be5b393c09a2c948701ad36	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=183a731912091cd995589567aca4517d
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.13-r2 b/metadata/md5-cache/net-firewall/iptables-1.4.13-r2
deleted file mode 100644
index cb15a4b48e92..000000000000
--- a/metadata/md5-cache/net-firewall/iptables-1.4.13-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=netlink? ( net-libs/libnfnetlink ) virtual/os-headers !>=sys-kernel/linux-headers-3.5
-DESCRIPTION=Linux kernel (2.4+) firewall, NAT and packet mangling tools
-EAPI=4
-HOMEPAGE=http://www.iptables.org/
-IUSE=ipv6 netlink static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=netlink? ( net-libs/libnfnetlink )
-SLOT=0
-SRC_URI=http://iptables.org/projects/iptables/files/iptables-1.4.13.tar.bz2
-_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	eutils	351a78113be5b393c09a2c948701ad36	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=381cf576f5aff18191e44774dedef357
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.14-r1 b/metadata/md5-cache/net-firewall/iptables-1.4.14-r1
deleted file mode 100644
index ea44c5973b71..000000000000
--- a/metadata/md5-cache/net-firewall/iptables-1.4.14-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=netlink? ( net-libs/libnfnetlink ) virtual/os-headers !>=sys-kernel/linux-headers-3.5
-DESCRIPTION=Linux kernel (2.4+) firewall, NAT and packet mangling tools
-EAPI=4
-HOMEPAGE=http://www.iptables.org/
-IUSE=ipv6 netlink static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=netlink? ( net-libs/libnfnetlink )
-SLOT=0
-SRC_URI=http://iptables.org/projects/iptables/files/iptables-1.4.14.tar.bz2
-_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	eutils	351a78113be5b393c09a2c948701ad36	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=d84cae2066401a6b4f20a31239375e5c
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.15-r1 b/metadata/md5-cache/net-firewall/iptables-1.4.15-r1
deleted file mode 100644
index 2f236571d241..000000000000
--- a/metadata/md5-cache/net-firewall/iptables-1.4.15-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=netlink? ( net-libs/libnfnetlink ) virtual/os-headers !>=sys-kernel/linux-headers-3.5
-DESCRIPTION=Linux kernel (2.4+) firewall, NAT and packet mangling tools
-EAPI=4
-HOMEPAGE=http://www.iptables.org/
-IUSE=ipv6 netlink static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=netlink? ( net-libs/libnfnetlink )
-SLOT=0
-SRC_URI=http://iptables.org/projects/iptables/files/iptables-1.4.15.tar.bz2
-_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	eutils	351a78113be5b393c09a2c948701ad36	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=d84cae2066401a6b4f20a31239375e5c
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.16.2 b/metadata/md5-cache/net-firewall/iptables-1.4.16.2
deleted file mode 100644
index 67ed8cbaeb37..000000000000
--- a/metadata/md5-cache/net-firewall/iptables-1.4.16.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=netlink? ( net-libs/libnfnetlink ) virtual/os-headers virtual/pkgconfig
-DESCRIPTION=Linux kernel (2.4+) firewall, NAT and packet mangling tools
-EAPI=4
-HOMEPAGE=http://www.iptables.org/
-IUSE=ipv6 netlink static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=netlink? ( net-libs/libnfnetlink )
-SLOT=0
-SRC_URI=http://iptables.org/projects/iptables/files/iptables-1.4.16.2.tar.bz2
-_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	eutils	351a78113be5b393c09a2c948701ad36	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=c75a88130864f112ea595e2c0f5a0f83
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.16.3 b/metadata/md5-cache/net-firewall/iptables-1.4.16.3
deleted file mode 100644
index ce3e02df25df..000000000000
--- a/metadata/md5-cache/net-firewall/iptables-1.4.16.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=netlink? ( net-libs/libnfnetlink ) virtual/os-headers virtual/pkgconfig
-DESCRIPTION=Linux kernel (2.4+) firewall, NAT and packet mangling tools
-EAPI=4
-HOMEPAGE=http://www.iptables.org/
-IUSE=ipv6 netlink static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=GPL-2
-RDEPEND=netlink? ( net-libs/libnfnetlink )
-SLOT=0
-SRC_URI=http://iptables.org/projects/iptables/files/iptables-1.4.16.3.tar.bz2
-_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	eutils	351a78113be5b393c09a2c948701ad36	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=c199a4326ec0a677ce763f4a26f86704
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.17 b/metadata/md5-cache/net-firewall/iptables-1.4.17
deleted file mode 100644
index f471497c3e44..000000000000
--- a/metadata/md5-cache/net-firewall/iptables-1.4.17
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=netlink? ( net-libs/libnfnetlink ) virtual/os-headers virtual/pkgconfig
-DESCRIPTION=Linux kernel (2.4+) firewall, NAT and packet mangling tools
-EAPI=4
-HOMEPAGE=http://www.iptables.org/
-IUSE=ipv6 netlink static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=netlink? ( net-libs/libnfnetlink )
-SLOT=0
-SRC_URI=http://iptables.org/projects/iptables/files/iptables-1.4.17.tar.bz2
-_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	eutils	351a78113be5b393c09a2c948701ad36	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=515f06d3f816aa280634a39a5e93fef4
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.18 b/metadata/md5-cache/net-firewall/iptables-1.4.18
deleted file mode 100644
index dc1726be6b05..000000000000
--- a/metadata/md5-cache/net-firewall/iptables-1.4.18
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=netlink? ( net-libs/libnfnetlink ) virtual/os-headers virtual/pkgconfig
-DESCRIPTION=Linux kernel (2.4+) firewall, NAT and packet mangling tools
-EAPI=4
-HOMEPAGE=http://www.netfilter.org/projects/iptables/
-IUSE=ipv6 netlink static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=netlink? ( net-libs/libnfnetlink )
-SLOT=0
-SRC_URI=http://www.netfilter.org/projects/iptables/files/iptables-1.4.18.tar.bz2
-_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	eutils	351a78113be5b393c09a2c948701ad36	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=827b2101a867fd9a56c7a5fb6060af2e
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.19.1 b/metadata/md5-cache/net-firewall/iptables-1.4.19.1
deleted file mode 100644
index edcdcefe686a..000000000000
--- a/metadata/md5-cache/net-firewall/iptables-1.4.19.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=netlink? ( net-libs/libnfnetlink ) virtual/os-headers virtual/pkgconfig
-DESCRIPTION=Linux kernel (2.4+) firewall, NAT and packet mangling tools
-EAPI=4
-HOMEPAGE=http://www.netfilter.org/projects/iptables/
-IUSE=ipv6 netlink static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=netlink? ( net-libs/libnfnetlink )
-SLOT=0
-SRC_URI=http://www.netfilter.org/projects/iptables/files/iptables-1.4.19.1.tar.bz2
-_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	eutils	351a78113be5b393c09a2c948701ad36	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=03e3c1663a86d36a45ad6dc4ffa3bd64
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.20 b/metadata/md5-cache/net-firewall/iptables-1.4.20
deleted file mode 100644
index c74c3d39ece9..000000000000
--- a/metadata/md5-cache/net-firewall/iptables-1.4.20
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=netlink? ( net-libs/libnfnetlink ) virtual/os-headers virtual/pkgconfig
-DESCRIPTION=Linux kernel (2.4+) firewall, NAT and packet mangling tools
-EAPI=4
-HOMEPAGE=http://www.netfilter.org/projects/iptables/
-IUSE=ipv6 netlink static-libs
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=GPL-2
-RDEPEND=netlink? ( net-libs/libnfnetlink )
-SLOT=0
-SRC_URI=http://www.netfilter.org/projects/iptables/files/iptables-1.4.20.tar.bz2
-_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	eutils	351a78113be5b393c09a2c948701ad36	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=5e44280b31b90343b3e0d7cc680b0957
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.21 b/metadata/md5-cache/net-firewall/iptables-1.4.21
deleted file mode 100644
index ff9dfbe110a0..000000000000
--- a/metadata/md5-cache/net-firewall/iptables-1.4.21
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=netlink? ( net-libs/libnfnetlink ) virtual/os-headers virtual/pkgconfig
-DESCRIPTION=Linux kernel (2.4+) firewall, NAT and packet mangling tools
-EAPI=5
-HOMEPAGE=http://www.netfilter.org/projects/iptables/
-IUSE=ipv6 netlink static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=netlink? ( net-libs/libnfnetlink )
-SLOT=0
-SRC_URI=http://www.netfilter.org/projects/iptables/files/iptables-1.4.21.tar.bz2
-_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	eutils	351a78113be5b393c09a2c948701ad36	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=76c952fe2c98e46f4aa2a06185c714dc
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.21-r1 b/metadata/md5-cache/net-firewall/iptables-1.4.21-r1
index 1cf830a4a934..1554d3742871 100644
--- a/metadata/md5-cache/net-firewall/iptables-1.4.21-r1
+++ b/metadata/md5-cache/net-firewall/iptables-1.4.21-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=netlink? ( net-libs/libnfnetlink ) virtual/os-headers virtual/pkgconfig virtual/pkgconfig
+DEPEND=conntrack? ( net-libs/libnetfilter_conntrack ) netlink? ( net-libs/libnfnetlink ) virtual/os-headers virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=Linux kernel (2.4+) firewall, NAT and packet mangling tools
 EAPI=5
 HOMEPAGE=http://www.netfilter.org/projects/iptables/
-IUSE=ipv6 netlink static-libs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
+IUSE=conntrack ipv6 netlink static-libs
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=GPL-2
-RDEPEND=netlink? ( net-libs/libnfnetlink )
+RDEPEND=conntrack? ( net-libs/libnetfilter_conntrack ) netlink? ( net-libs/libnfnetlink )
 SLOT=0
 SRC_URI=http://www.netfilter.org/projects/iptables/files/iptables-1.4.21.tar.bz2
 _eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	eutils	351a78113be5b393c09a2c948701ad36	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	systemd	6b4f0cefa642270eded7e6ca816fd181	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=38a861f0780855789f4b21c988b8fcb6
+_md5_=27bc1b7f3597f3961e72f86960a85bbc
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.21-r2 b/metadata/md5-cache/net-firewall/iptables-1.4.21-r2
new file mode 100644
index 000000000000..8469a27eea1e
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/iptables-1.4.21-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=conntrack? ( net-libs/libnetfilter_conntrack ) netlink? ( net-libs/libnfnetlink ) pcap? ( net-libs/libpcap ) virtual/os-headers virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=Linux kernel (2.4+) firewall, NAT and packet mangling tools
+EAPI=5
+HOMEPAGE=http://www.netfilter.org/projects/iptables/
+IUSE=conntrack ipv6 netlink pcap static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=conntrack? ( net-libs/libnetfilter_conntrack ) netlink? ( net-libs/libnfnetlink ) pcap? ( net-libs/libpcap )
+SLOT=0/10
+SRC_URI=http://www.netfilter.org/projects/iptables/files/iptables-1.4.21.tar.bz2
+_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	eutils	351a78113be5b393c09a2c948701ad36	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	systemd	6b4f0cefa642270eded7e6ca816fd181	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
+_md5_=51b6362698781532fb9e5f383b94aa09
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.6 b/metadata/md5-cache/net-firewall/iptables-1.4.6
deleted file mode 100644
index 019b24300b6d..000000000000
--- a/metadata/md5-cache/net-firewall/iptables-1.4.6
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=virtual/os-headers !>=sys-kernel/linux-headers-2.6.33
-DESCRIPTION=Linux kernel (2.4+) firewall, NAT and packet mangling tools
-HOMEPAGE=http://www.iptables.org/
-IUSE=ipv6
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://iptables.org/projects/iptables/files/iptables-1.4.6.tar.bz2
-_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=878299f1daf970155e03b8a709c6418d
diff --git a/metadata/md5-cache/net-misc/ipv6calc-0.98.0 b/metadata/md5-cache/net-misc/ipv6calc-0.99.0
similarity index 97%
rename from metadata/md5-cache/net-misc/ipv6calc-0.98.0
rename to metadata/md5-cache/net-misc/ipv6calc-0.99.0
index bb124d3763e4..fbcd4902864e 100644
--- a/metadata/md5-cache/net-misc/ipv6calc-0.98.0
+++ b/metadata/md5-cache/net-misc/ipv6calc-0.99.0
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/openssl:= geoip? ( >=dev-libs/geoip-1.4.7 )
 SLOT=0
-SRC_URI=ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/ipv6calc-0.98.0.tar.gz
+SRC_URI=ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/ipv6calc-0.99.0.tar.gz
 _eclasses_=eutils	351a78113be5b393c09a2c948701ad36	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
 _md5_=2b4ccb5de5cf8b4aa3eb544a986b2012
diff --git a/metadata/md5-cache/net-proxy/bfilter-1.1.4-r1 b/metadata/md5-cache/net-proxy/bfilter-1.1.4-r1
index c4f5f955b3d5..235cf4343d7e 100644
--- a/metadata/md5-cache/net-proxy/bfilter-1.1.4-r1
+++ b/metadata/md5-cache/net-proxy/bfilter-1.1.4-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst preinst prepare
-DEPEND=sys-libs/zlib dev-libs/ace dev-libs/libsigc++:2 X? ( dev-cpp/gtkmm:2.4 x11-libs/libX11 ) dev-libs/boost dev-util/scons virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=sys-libs/zlib <dev-libs/ace-5.8.3 dev-libs/libsigc++:2 X? ( dev-cpp/gtkmm:2.4 x11-libs/libX11 ) dev-libs/boost dev-util/scons virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=An ad-filtering web proxy featuring an effective heuristic ad-detection algorithm
 EAPI=4
 HOMEPAGE=http://bfilter.sourceforge.net/
 IUSE=X debug
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=sys-libs/zlib dev-libs/ace dev-libs/libsigc++:2 X? ( dev-cpp/gtkmm:2.4 x11-libs/libX11 ) dev-libs/boost
+RDEPEND=sys-libs/zlib <dev-libs/ace-5.8.3 dev-libs/libsigc++:2 X? ( dev-cpp/gtkmm:2.4 x11-libs/libX11 ) dev-libs/boost
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/bfilter/bfilter-1.1.4.tar.gz
 _eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	eutils	351a78113be5b393c09a2c948701ad36	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=fdd67caad6aa13a95091952b27baf88b
+_md5_=87a037afa5c9519d0da63d10783b0c82
diff --git a/metadata/md5-cache/net-proxy/bfilter-1.1.4-r2 b/metadata/md5-cache/net-proxy/bfilter-1.1.4-r2
new file mode 100644
index 000000000000..0ae346c7a95a
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/bfilter-1.1.4-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst preinst prepare
+DEPEND=sys-libs/zlib dev-libs/ace:= dev-libs/libsigc++:2 X? ( dev-cpp/gtkmm:2.4 x11-libs/libX11 ) dev-libs/boost:= dev-util/scons virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=An ad-filtering web proxy featuring an effective heuristic ad-detection algorithm
+EAPI=5
+HOMEPAGE=http://bfilter.sourceforge.net/
+IUSE=X debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib dev-libs/ace:= dev-libs/libsigc++:2 X? ( dev-cpp/gtkmm:2.4 x11-libs/libX11 ) dev-libs/boost:=
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/bfilter/bfilter-1.1.4.tar.gz
+_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	eutils	351a78113be5b393c09a2c948701ad36	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	user	906f3c8eb3a2350a4f1191a89baa3e46
+_md5_=7202be633145064bb0f9b6bc594f8523
diff --git a/metadata/md5-cache/sys-apps/rng-tools-5-r1 b/metadata/md5-cache/sys-apps/rng-tools-5-r1
new file mode 100644
index 000000000000..8b5ff07dcc83
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/rng-tools-5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=dev-libs/libgcrypt:0 dev-libs/libgpg-error !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Daemon to use hardware random number generators
+EAPI=5
+HOMEPAGE=http://gkernel.sourceforge.net/
+IUSE=selinux
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libgcrypt:0 dev-libs/libgpg-error selinux? ( sec-policy/selinux-rngd )
+SLOT=0
+SRC_URI=mirror://sourceforge/gkernel/rng-tools-5.tar.gz
+_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	eutils	351a78113be5b393c09a2c948701ad36	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	systemd	6b4f0cefa642270eded7e6ca816fd181	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
+_md5_=3528776a300999a556131c629048a127
diff --git a/metadata/md5-cache/sys-apps/rsbac-admin-1.4.6 b/metadata/md5-cache/sys-apps/rsbac-admin-1.4.6
deleted file mode 100644
index b078375cb3ee..000000000000
--- a/metadata/md5-cache/sys-apps/rsbac-admin-1.4.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DEPEND=dev-util/dialog pam? ( sys-libs/pam ) sys-apps/baselayout
-DESCRIPTION=Rule Set Based Access Control (RSBAC) Admin Tools
-EAPI=4
-HOMEPAGE=http://www.rsbac.org/
-IUSE=pam
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-util/dialog pam? ( sys-libs/pam ) sys-apps/baselayout >=sys-libs/ncurses-5.2
-SLOT=0
-SRC_URI=http://www.rsbac.org/dl.php?file=code/1.4.6/rsbac-admin-1.4.6.tar.bz2
-_eclasses_=multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=18cb79b2e4704b15cca795cad091950f
diff --git a/metadata/md5-cache/sys-apps/rsbac-admin-1.4.6-r1 b/metadata/md5-cache/sys-apps/rsbac-admin-1.4.6-r1
deleted file mode 100644
index 161db9e74fec..000000000000
--- a/metadata/md5-cache/sys-apps/rsbac-admin-1.4.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DEPEND=dev-util/dialog pam? ( sys-libs/pam ) sys-apps/baselayout >=sys-libs/ncurses-5.2
-DESCRIPTION=Rule Set Based Access Control (RSBAC) Admin Tools
-EAPI=4
-HOMEPAGE=http://www.rsbac.org/
-IUSE=pam rklogd
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-util/dialog pam? ( sys-libs/pam ) sys-apps/baselayout >=sys-libs/ncurses-5.2
-SLOT=0
-SRC_URI=http://www.rsbac.org/dl.php?file=code/1.4.6/rsbac-admin-1.4.6.tar.bz2
-_eclasses_=multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=3047dc4192353e0a9c342cc0ea91e6f1
diff --git a/metadata/md5-cache/sys-apps/rsbac-admin-1.4.7 b/metadata/md5-cache/sys-apps/rsbac-admin-1.4.7
deleted file mode 100644
index e2ba6fb32c43..000000000000
--- a/metadata/md5-cache/sys-apps/rsbac-admin-1.4.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DEPEND=dev-util/dialog pam? ( sys-libs/pam ) sys-apps/baselayout >=sys-libs/ncurses-5.2
-DESCRIPTION=Rule Set Based Access Control (RSBAC) Admin Tools
-EAPI=5
-HOMEPAGE=http://www.rsbac.org/
-IUSE=pam rklogd
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-util/dialog pam? ( sys-libs/pam ) sys-apps/baselayout >=sys-libs/ncurses-5.2
-SLOT=0
-SRC_URI=http://download.rsbac.org/code/1.4.7/rsbac-admin-1.4.7.tar.xz
-_eclasses_=multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=a5c67c8c818da39328fdb898cb07823c
diff --git a/metadata/md5-cache/sys-apps/rsbac-admin-1.4.8 b/metadata/md5-cache/sys-apps/rsbac-admin-1.4.9
similarity index 82%
rename from metadata/md5-cache/sys-apps/rsbac-admin-1.4.8
rename to metadata/md5-cache/sys-apps/rsbac-admin-1.4.9
index 88cf0c0f6d3d..be82a11146dc 100644
--- a/metadata/md5-cache/sys-apps/rsbac-admin-1.4.8
+++ b/metadata/md5-cache/sys-apps/rsbac-admin-1.4.9
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-util/dialog pam? ( sys-libs/pam ) sys-apps/baselayout >=sys-libs/ncurses-5.2
 SLOT=0
-SRC_URI=http://download.rsbac.org/code/1.4.8/rsbac-admin-1.4.8.tar.xz
+SRC_URI=http://download.rsbac.org/code/1.4.9/rsbac-admin-1.4.9.tar.xz
 _eclasses_=multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=3fda78d1dbdefa388dabebf79284a8d0
+_md5_=c730214a53165e1ffc37a59062a98aa0
diff --git a/metadata/md5-cache/sys-kernel/rsbac-sources-3.10.7 b/metadata/md5-cache/sys-kernel/rsbac-sources-3.14.28
similarity index 66%
rename from metadata/md5-cache/sys-kernel/rsbac-sources-3.10.7
rename to metadata/md5-cache/sys-kernel/rsbac-sources-3.14.28
index c61335261427..710bfdf64365 100644
--- a/metadata/md5-cache/sys-kernel/rsbac-sources-3.10.7
+++ b/metadata/md5-cache/sys-kernel/rsbac-sources-3.14.28
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
 DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=RSBAC kernel sources (kernel series 3.10)
+DESCRIPTION=RSBAC kernel sources (kernel series 3.14)
 EAPI=5
 HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
 IUSE=symlink build
@@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.10.7
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz http://download.rsbac.org/patches/1.4.7/patch-linux-3.10.7-rsbac-1.4.7.diff.xz mirror://gentoo/genpatches-3.10-13.base.tar.xz mirror://gentoo/genpatches-3.10-13.extras.tar.xz
+SLOT=3.14.28
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz http://download.rsbac.org/patches/1.4.9/patch-linux-3.14.28-rsbac-1.4.9.diff.xz mirror://gentoo/genpatches-3.14-33.base.tar.xz mirror://gentoo/genpatches-3.14-33.extras.tar.xz
 _eclasses_=eutils	351a78113be5b393c09a2c948701ad36	kernel-2	58fa20f3bda6877b31f6672ca5baec4e	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	python-any-r1	22fd4ff5f65f020695315a5127524a91	python-utils-r1	39c6b012a0512678e698e712b5b7ecc2	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=103b6be9f64c094bea8d242518c3db69
+_md5_=434ea5853d3f8fec7f95d34bb4b38621
diff --git a/metadata/md5-cache/www-servers/xsp-2014.12-r2014120900 b/metadata/md5-cache/www-servers/xsp-2014.12-r2014120900
new file mode 100644
index 000000000000..a56d045fa2cd
--- /dev/null
+++ b/metadata/md5-cache/www-servers/xsp-2014.12-r2014120900
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test unpack
+DEPEND=dev-db/sqlite:3 virtual/pkgconfig dev-lang/mono !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=XSP is a small web server that can host ASP.NET pages
+EAPI=5
+HOMEPAGE=http://www.mono-project.com/ASP.NET
+IUSE=doc test developer net35 net40 net45
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=MIT
+RDEPEND=dev-db/sqlite:3
+SLOT=0
+SRC_URI=http://github.com/mono/xsp/archive/e272a2c006211b6b03be2ef5bbb9e3f8fefd0768.zip -> xsp-2014.12.zip
+_eclasses_=autotools	8056957fdccf2b3cd6e282a4b4551d1a	autotools-utils	0bf099a6e3dfeaf20a7a94504d8dd896	base	84d9f879f57a8316ff02be0373a3d6f9	dotnet	b8788d81fe4ec93fda9fc56fed2981d0	eutils	351a78113be5b393c09a2c948701ad36	libtool	7f78cd7d403808a350c9ae23f5821fb4	mono-env	10809200679bcceefebac9e72bebb6e6	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	systemd	6b4f0cefa642270eded7e6ca816fd181	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=ea73ef1f52c45c487f1d1aeee10a7550
diff --git a/metadata/md5-cache/x11-terms/st-0.6-r1 b/metadata/md5-cache/x11-terms/st-0.6-r1
new file mode 100644
index 000000000000..7d7ca3888f8c
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/st-0.6-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare
+DEPEND=!<sys-libs/ncurses-6.0 media-libs/fontconfig x11-libs/libX11 x11-libs/libXext x11-libs/libXft virtual/pkgconfig x11-proto/xextproto x11-proto/xproto
+DESCRIPTION=simple terminal implementation for X
+EAPI=5
+HOMEPAGE=http://st.suckless.org/
+IUSE=savedconfig savedconfig
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=MIT-with-advertising
+RDEPEND=!<sys-libs/ncurses-6.0 media-libs/fontconfig x11-libs/libX11 x11-libs/libXext x11-libs/libXft
+SLOT=0
+SRC_URI=http://dl.suckless.org/st/st-0.6.tar.gz
+_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	portability	3a50b3ec310b86914f98babecc8f89c6	savedconfig	7de7daa586f6bf361639e77d6f2299db	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
+_md5_=5b85c0e6526056371f9070b986e86201
diff --git a/metadata/md5-cache/x11-terms/st-9999 b/metadata/md5-cache/x11-terms/st-9999
index 0b06188bee61..a58a0e26b731 100644
--- a/metadata/md5-cache/x11-terms/st-9999
+++ b/metadata/md5-cache/x11-terms/st-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install postinst prepare unpack
-DEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXext x11-libs/libXft sys-libs/ncurses virtual/pkgconfig x11-proto/xextproto x11-proto/xproto >=dev-vcs/git-1.8.2.1
+DEPEND=!<sys-libs/ncurses-6.0 media-libs/fontconfig x11-libs/libX11 x11-libs/libXext x11-libs/libXft virtual/pkgconfig x11-proto/xextproto x11-proto/xproto >=dev-vcs/git-1.8.2.1
 DESCRIPTION=simple terminal implementation for X
 EAPI=5
 HOMEPAGE=http://st.suckless.org/
 IUSE=savedconfig savedconfig
 LICENSE=MIT-with-advertising
-RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXext x11-libs/libXft
+RDEPEND=!<sys-libs/ncurses-6.0 media-libs/fontconfig x11-libs/libX11 x11-libs/libXext x11-libs/libXft
 SLOT=0
 _eclasses_=eutils	351a78113be5b393c09a2c948701ad36	git-r3	1502b9838d043db47700b8120083e637	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	portability	3a50b3ec310b86914f98babecc8f89c6	savedconfig	7de7daa586f6bf361639e77d6f2299db	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=55d0ce6de714b526a91f47b77995dac1
+_md5_=441999223a0d6ac4037e6224ef3bbd04
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index f498a2d4a49c..fe7c53c77b22 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 14 Aug 2015 06:11:12 +0000
+Fri, 14 Aug 2015 12:11:09 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 74c9b55327a4..0ed33f3730de 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Aug 14 06:11:08 UTC 2015
+Fri Aug 14 12:11:06 UTC 2015
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index cb3a914c40e7..f711e91e84cd 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 14 Aug 2015 06:30:01 +0000
+Fri, 14 Aug 2015 12:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 2bc22ecb18ad..6410a8be91f3 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1439532601 Fri 14 Aug 2015 06:10:01 AM UTC
+1439554202 Fri 14 Aug 2015 12:10:02 PM UTC
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 285a257c0005..e3c1f23d09e5 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -1,15 +1 @@
-DIST iptables-1.4.10.tar.bz2 478007 SHA256 7544e437d2222078b15e6cd063b521c6f1ec4dac49e6af9ba3bfece2a6a93445 SHA512 264a974cc303cf9b352ccdf50d3aa1491167cdf1d7919074925645cc94d7f5e40d315cff048d0fab48e31853dcdad64bd65b83ef6fdd05f9e896be4e3317cd1e WHIRLPOOL 4ca6629ed2f43f1393be5a24284147272ff208d27e8bc073ccadb80f27887f2ef2c477e08ab2f8f22414cd11ab6a33dc42071f2ee3168e15026a76a3270cbc2e
-DIST iptables-1.4.11.1.tar.bz2 486926 SHA256 170c294698ca573477b1b2a3815e1563bf9929d182efef6cf0331a6e955c9ade SHA512 432dff8d1bc2b65cd636bb7a8d9ace5402db134df6e5e15c11c2bf1684d513a0f3cf70af099875fbddb25a1ef8868716b4a80791d7475848dd9d7917752d451a WHIRLPOOL ace3dc5ed59f98faea78cce2f1e673cb9b9726360cb1fcaa6ff73b9c36ba2ece8b415f191f1c6862a85829bb857202571bb851132a503ffb272c078d87889cbf
-DIST iptables-1.4.12.1.tar.bz2 473418 SHA256 77e6581f21f15946a814fa311236e5f3f7c6593180f9d695cea06aa95e464aba SHA512 ca8960d6d11faaba293e62169a32f8821d9240907d7ca11741dfca78ce92e32d5e2625f99786f55fb08d27ff7643e2531cc741aa0867f45df61248264b8ffe18 WHIRLPOOL b737fb2704511066d052227f7fe73a1ce64f427c614e56a1a681a7dcc37bac214448f9821b416a35cbe7efdf5436c49d0202f6da77aa0ec60de724137d28abda
-DIST iptables-1.4.12.tar.bz2 487036 SHA256 3e07a0beb746b580fbcfb04b3842ef0bd94a2f281786552f586415b26a7e971c SHA512 e61652cee5b3e691643769ac16dd9674ad7e2d5684f9e3146200be91a6db5674cead4525a97e232644f966692bea9143eb3b0c64a2dc01a32bf34834d3a0b4de WHIRLPOOL c5f5b29387322b36cce9c59fd548bb582b7b9b11da2616f5ff14c4ddc5eec8bc500da3756593406f5a5a4ab5b43d0f0b9d44b028b270479e10d1d8f716e1d0a0
-DIST iptables-1.4.13.tar.bz2 502942 SHA256 321e2600fc4541a958e44cafd85a42864b0035404097e0f2e082d474029b9ded SHA512 598b05aa1446172c65b5103bdd02e29f8c8253eb3395e8cabc33e664e7d7afb4a842deea4f0faaac4645acd29a4fbfc0c0675c55f67e38c822ae28b549eab73c WHIRLPOOL 44df42d7fd66349c6bdef8cfa6d80571e7ec7d58a7092b188ef41a8431cd02394835177bdc4d31255b8a115f088daba269f6ecb9230b8d04df6e01151a926017
-DIST iptables-1.4.14.tar.bz2 507123 SHA256 9be675696f41cd4f35cc332b667d285fe9489ca93c8e1f77804bd04b3315a522 SHA512 3bf6db564359acafa738068980793129982318317bea69f21282d80f40dcb1e16938f8e2928e6cdcc4e77d89b2bc3f6c45aad7eb11ff84063b78e5f8e1907f9e WHIRLPOOL 16f630e38272b76c3d7eefa83869902b0f111d9ffba2eca6fe885759619dc81f1c9fc1bfe2f946adc99edfdfc5f4002a331e412a8fef674f63bfb760aa44e868
-DIST iptables-1.4.15.tar.bz2 514830 SHA256 867c144e60075e7bebe6fcecf0b65169d5e2d1fa5ceec2ebd9780cd5026123ea SHA512 2ef559f1079838b2aa8348e66248aac7bc7549be93014ddbdaf730fbad168a657e20e031dcfd9ffa62ed45a52dbefc3683783a5d9b929d539d07ba6ad6adcfa0 WHIRLPOOL 8a56ed3cffd572f2202f172a3b903283452b4fd9647b6123530a1cc489a150bc88e7eb1f911f896b655d1de37f26c0a5eadd383c06103a0f395a82e1bc321b89
-DIST iptables-1.4.16.2.tar.bz2 536755 SHA256 4468ce7e1d68349a8e30f26110eb7969dbfdbf497d6c53758883123b3f2d6f6e SHA512 1ec9d12cc069a8acb1a443e7325c2bb98f0216e0a454413424b49c90bd6f4f94832ed1187a8fc75bdc7d80aa4ca9f3534e15799c46cb17344886d7b4ad34e4c0 WHIRLPOOL b0c782f41bb7d0df794064b1f57853ec664ddf0f899ab4b1f8cf51df0f98594065b7e7e3a77ee398cbb4fcc03fe360e67cf679bf6f9f730263ad29be394e76e0
-DIST iptables-1.4.16.3.tar.bz2 536872 SHA256 643ccf34099d53d5b839e1d889c05627745a51ec122648e76a9fcec3a8a9ec79 SHA512 c232a927fe63623cc0d336b4a09d7baad2d0c5a2a5e3b7ad083727e9f17cd0b668a826a4c5ff0bbb45233fee6c38c153710b13f458514516af7cf7df10d720e2 WHIRLPOOL 2dadcdb39f7741cb7b3c493bc36792a6edbdd9ddaa0c862d2ec0a6fbb89eb82c55f04ae407ab641f425208b15ef6e689af10ce6c03368e40652367c39dead75f
-DIST iptables-1.4.17.tar.bz2 541137 SHA256 51e7a769469383b6ad308a6a19cdd2bd813cf4593e21a156a543a1cd70554925 SHA512 022f89cbf56408842bdeb1adbe05076addaad007599fdb662f32a1c134d743dade28c26842acc7545d2474903164be5fe3ec7fd1e276cd2c37bd3b33b8a30de1 WHIRLPOOL f2cb85d5f4080fce2c6673a58737ace3d55130f74c66207bc515d0c7b4ecd75bd7ac8540a862e8af133e740d34eee40833d72c9c3236c7ef4dc75cd43816ec41
-DIST iptables-1.4.18.tar.bz2 542308 SHA256 14a99fb8b0ca22027a9ac6eb72fa32c834ceb3073820e0ba79bf251c6a7bcf3c SHA512 fc62916bd90863c0868f70d711fd6716cbcb54402c32bdeebfd0cee05137fa3ff1a137f0a4b5b31ee0bb6492e23e60e7025d51914b26c0e0b233181cbb1cb1b5 WHIRLPOOL 5d89e0f8d2dfad0f25a369f936f86386c799b2c475cef9fb13fb3c8cb9fcb201361c7d134a24f68099b2b5468c97476e1982bc116fa6448a07d776c724fddbd3
-DIST iptables-1.4.19.1.tar.bz2 543785 SHA256 dd51d3b942758a462afc7c8495930d25c93058e5319303247375183ad50164d2 SHA512 a3232ae92b997f67b5895c110f2cb8ec3aecbc383e804a870351c61e49cd83c1d7bf750818768f5560d615090157a17cc5c4ef101bc104905915de67fa022088 WHIRLPOOL 99ec72c45eb5a5721e4228b3ae79ffa2d1a67db362a9c67a09190c8bed54f023e6550b300b41d0d119c518d234559d7bc1182313b26460a2d224768d1f7955b3
-DIST iptables-1.4.20.tar.bz2 546864 SHA256 109b8c7ca90b4536bc5de869ae705f6d5efcc0c08ef3003755aad3ed6d2d49ad SHA512 6c8e1d89db66c0cfd76afd7fa7de8a7d451337f6f15f01d811585714f6d488275621ca9a1f4967a2ae99e90f3890cf0e3c7f7a9a3a98fda902b0a56717d7ffe0 WHIRLPOOL 8146d632ec00c663988d4e82e3adfa8b9fa2df269df2e6cc359dae65727e59f4ef614540eb4f970d020eac558d7423731a88246f9df1265718346ca62e59a8e7
 DIST iptables-1.4.21.tar.bz2 547439 SHA256 52004c68021da9a599feed27f65defcfb22128f7da2c0531c0f75de0f479d3e0 SHA512 dd4baccdb080284d8620e6ed59beafc2677813f3e099051764b07f8e394f6d94ca11861b181f3cce7c55c66de64c1e2add13dc1a0b64e24050cd9fb7aea0689b WHIRLPOOL 475541d1b2b7fe4ee8fa3b537274ef082aab8bfd262201ee14cd53577dfac6f591445cc6d64ed93b226a4b71d54ae1b9ab4cbb378b5440861a585f770f0db200
-DIST iptables-1.4.6.tar.bz2 463758 SHA256 6e732798cad62163d6e033aa52e22b771246556a230c0f66cd33fe69e96d72a4 SHA512 0ec1314462a154b5892093b17b997f130760b2ada4fb2b7cdc0f6cb7bb9da9ddaf77400c3fcbe57c4db1400adaec37d38f9debe37f7ed33dabbbe3b58c13e942 WHIRLPOOL 39e1f0f3f46350c81d2fe219b5d40174f4a390180f71ac8c896a634aa29abe98da665c8e93d373465dad351a9604d6c5e36c0f99f7256b85ffbc3615cefa28ae
diff --git a/net-firewall/iptables/files/ip6tables-1.3.2.confd b/net-firewall/iptables/files/ip6tables-1.3.2.confd
deleted file mode 100644
index 93c0bc89b38a..000000000000
--- a/net-firewall/iptables/files/ip6tables-1.3.2.confd
+++ /dev/null
@@ -1,11 +0,0 @@
-# /etc/conf.d/ip6tables
-
-# Location in which iptables initscript will save set rules on 
-# service shutdown
-IP6TABLES_SAVE="/var/lib/ip6tables/rules-save"
-
-# Options to pass to iptables-save and iptables-restore 
-SAVE_RESTORE_OPTIONS="-c"
-
-# Save state on stopping iptables
-SAVE_ON_STOP="yes"
diff --git a/net-firewall/iptables/files/iptables-1.3.2.confd b/net-firewall/iptables/files/iptables-1.3.2.confd
deleted file mode 100644
index 91287debdbcf..000000000000
--- a/net-firewall/iptables/files/iptables-1.3.2.confd
+++ /dev/null
@@ -1,11 +0,0 @@
-# /etc/conf.d/iptables
-
-# Location in which iptables initscript will save set rules on 
-# service shutdown
-IPTABLES_SAVE="/var/lib/iptables/rules-save"
-
-# Options to pass to iptables-save and iptables-restore 
-SAVE_RESTORE_OPTIONS="-c"
-
-# Save state on stopping iptables
-SAVE_ON_STOP="yes"
diff --git a/net-firewall/iptables/files/iptables-1.3.2.init b/net-firewall/iptables/files/iptables-1.3.2.init
deleted file mode 100644
index 907a39e7479a..000000000000
--- a/net-firewall/iptables/files/iptables-1.3.2.init
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-extra_commands="save panic"
-extra_started_commands="reload"
-
-iptables_name=${SVCNAME}
-if [ "${iptables_name}" != "iptables" -a "${iptables_name}" != "ip6tables" ] ; then
-	iptables_name="iptables"
-fi
-
-iptables_bin="/sbin/${iptables_name}"
-case ${iptables_name} in
-	iptables)  iptables_proc="/proc/net/ip_tables_names"
-	           iptables_save=${IPTABLES_SAVE};;
-	ip6tables) iptables_proc="/proc/net/ip6_tables_names"
-	           iptables_save=${IP6TABLES_SAVE};;
-esac
-
-depend() {
-	before net
-	use logger
-}
-
-set_table_policy() {
-	local chains table=$1 policy=$2
-	case ${table} in
-		nat)    chains="PREROUTING POSTROUTING OUTPUT";;
-		mangle) chains="PREROUTING INPUT FORWARD OUTPUT POSTROUTING";;
-		filter) chains="INPUT FORWARD OUTPUT";;
-		*)      chains="";;
-	esac
-	local chain
-	for chain in ${chains} ; do
-		${iptables_bin} -t ${table} -P ${chain} ${policy}
-	done
-}
-
-checkkernel() {
-	if [ ! -e ${iptables_proc} ] ; then
-		eerror "Your kernel lacks ${iptables_name} support, please load"
-		eerror "appropriate modules and try again."
-		return 1
-	fi
-	return 0
-}
-checkconfig() {
-	if [ ! -f ${iptables_save} ] ; then
-		eerror "Not starting ${iptables_name}.  First create some rules then run:"
-		eerror "/etc/init.d/${iptables_name} save"
-		return 1
-	fi
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Loading ${iptables_name} state and starting firewall"
-	${iptables_bin}-restore ${SAVE_RESTORE_OPTIONS} < "${iptables_save}"
-	eend $?
-}
-
-stop() {
-	if [ "${SAVE_ON_STOP}" = "yes" ] ; then
-		save || return 1
-	fi
-	checkkernel || return 1
-	ebegin "Stopping firewall"
-	local a
-	for a in $(cat ${iptables_proc}) ; do
-		set_table_policy $a ACCEPT
-
-		${iptables_bin} -F -t $a
-		${iptables_bin} -X -t $a
-	done
-	eend $?
-}
-
-reload() {
-	checkkernel || return 1
-	ebegin "Flushing firewall"
-	local a
-	for a in $(cat ${iptables_proc}) ; do
-		${iptables_bin} -F -t $a
-		${iptables_bin} -X -t $a
-	done
-	eend $?
-
-	start
-}
-
-save() {
-	ebegin "Saving ${iptables_name} state"
-	touch "${iptables_save}"
-	chmod 0600 "${iptables_save}"
-	${iptables_bin}-save ${SAVE_RESTORE_OPTIONS} > "${iptables_save}"
-	eend $?
-}
-
-panic() {
-	checkkernel || return 1
-	service_started ${iptables_name} && svc_stop
-
-	local a
-	ebegin "Dropping all packets"
-	for a in $(cat ${iptables_proc}) ; do
-		${iptables_bin} -F -t $a
-		${iptables_bin} -X -t $a
-
-		set_table_policy $a DROP
-	done
-	eend $?
-}
diff --git a/net-firewall/iptables/files/iptables-1.4.11.1-man-fixes.patch b/net-firewall/iptables/files/iptables-1.4.11.1-man-fixes.patch
deleted file mode 100644
index d83a7059f37b..000000000000
--- a/net-firewall/iptables/files/iptables-1.4.11.1-man-fixes.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/iptables/Makefile.am b/iptables/Makefile.am
-index 13cca9c..a068278 100644
---- a/iptables/Makefile.am
-+++ b/iptables/Makefile.am
-@@ -51,10 +51,10 @@ v6_sbin_links  = ip6tables ip6tables-restore ip6tables-save
- endif
- 
- iptables.8: ${srcdir}/iptables.8.in ../extensions/matches4.man ../extensions/targets4.man
--	${AM_VERBOSE_GEN} sed -e 's/@PACKAGE_AND_VERSION@/${PACKAGE} ${PACKAGE_VERSION}/g' -e '/@MATCH@/ r extensions/matches4.man' -e '/@TARGET@/ r extensions/targets4.man' $< >$@;
-+	${AM_VERBOSE_GEN} sed -e 's/@PACKAGE_AND_VERSION@/${PACKAGE} ${PACKAGE_VERSION}/g' -e '/@MATCH@/ r ../extensions/matches4.man' -e '/@TARGET@/ r ../extensions/targets4.man' $< >$@;
- 
- ip6tables.8: ${srcdir}/ip6tables.8.in ../extensions/matches6.man ../extensions/targets6.man
--	${AM_VERBOSE_GEN} sed -e 's/@PACKAGE_AND_VERSION@/${PACKAGE} ${PACKAGE_VERSION}/g' -e '/@MATCH@/ r extensions/matches6.man' -e '/@TARGET@/ r extensions/targets6.man' $< >$@;
-+	${AM_VERBOSE_GEN} sed -e 's/@PACKAGE_AND_VERSION@/${PACKAGE} ${PACKAGE_VERSION}/g' -e '/@MATCH@/ r ../extensions/matches6.man' -e '/@TARGET@/ r ../extensions/targets6.man' $< >$@;
- 
- pkgconfig_DATA = xtables.pc
- 
diff --git a/net-firewall/iptables/files/iptables-1.4.12.1-conntrack-v2-ranges.patch b/net-firewall/iptables/files/iptables-1.4.12.1-conntrack-v2-ranges.patch
deleted file mode 100644
index 9bbcc67cb6a5..000000000000
--- a/net-firewall/iptables/files/iptables-1.4.12.1-conntrack-v2-ranges.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-commit 3412bd0bfb8b8bac9834cbfd3392b3d5487133bf
-Author: Tom Eastep <teastep@shorewall.net>
-Date:   Thu Aug 18 15:11:16 2011 -0700
-
-    libxt_conntrack: improve error message on parsing violation
-    
-    Tom Eastep noted:
-    
-    $ iptables -A foo -m conntrack --ctorigdstport 22
-    iptables v1.4.12: conntrack rev 2 does not support port ranges
-    Try `iptables -h' or 'iptables --help' for more information.
-    
-    Commit v1.4.12-41-g1ad6407 takes care of the actual cause of the bug,
-    but let's include Tom's patch nevertheless for the better error
-    message in case one actually does specify a range with rev 2.
-    
-    References: http://marc.info/?l=netfilter-devel&m=131370592105298&w=2
-    Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
-
-diff --git a/extensions/libxt_conntrack.c b/extensions/libxt_conntrack.c
-index 060b947..fff69f8 100644
---- a/extensions/libxt_conntrack.c
-+++ b/extensions/libxt_conntrack.c
-@@ -129,13 +129,20 @@ static const struct xt_option_entry conntrack2_mt_opts[] = {
- 	 .flags = XTOPT_INVERT},
- 	{.name = "ctexpire", .id = O_CTEXPIRE, .type = XTTYPE_UINT32RC,
- 	 .flags = XTOPT_INVERT},
--	{.name = "ctorigsrcport", .id = O_CTORIGSRCPORT, .type = XTTYPE_PORT,
-+	/*
-+	 * Rev 1 and 2 only store one port, and we would normally use
-+	 * %XTTYPE_PORT (rather than %XTTYPE_PORTRC) for that. The resulting
-+	 * error message - in case a user passed a range nevertheless -
-+	 * "port 22:23 resolved to nothing" is not quite as useful as using
-+	 * %XTTYPE_PORTC and libxt_conntrack's own range test.
-+	 */
-+	{.name = "ctorigsrcport", .id = O_CTORIGSRCPORT, .type = XTTYPE_PORTRC,
- 	 .flags = XTOPT_INVERT | XTOPT_NBO},
--	{.name = "ctorigdstport", .id = O_CTORIGDSTPORT, .type = XTTYPE_PORT,
-+	{.name = "ctorigdstport", .id = O_CTORIGDSTPORT, .type = XTTYPE_PORTRC,
- 	 .flags = XTOPT_INVERT | XTOPT_NBO},
--	{.name = "ctreplsrcport", .id = O_CTREPLSRCPORT, .type = XTTYPE_PORT,
-+	{.name = "ctreplsrcport", .id = O_CTREPLSRCPORT, .type = XTTYPE_PORTRC,
- 	 .flags = XTOPT_INVERT | XTOPT_NBO},
--	{.name = "ctrepldstport", .id = O_CTREPLDSTPORT, .type = XTTYPE_PORT,
-+	{.name = "ctrepldstport", .id = O_CTREPLDSTPORT, .type = XTTYPE_PORTRC,
- 	 .flags = XTOPT_INVERT | XTOPT_NBO},
- 	{.name = "ctdir", .id = O_CTDIR, .type = XTTYPE_STRING},
- 	XTOPT_TABLEEND,
diff --git a/net-firewall/iptables/files/iptables-1.4.12.1-lm.patch b/net-firewall/iptables/files/iptables-1.4.12.1-lm.patch
deleted file mode 100644
index 4d9e1d8ed4dd..000000000000
--- a/net-firewall/iptables/files/iptables-1.4.12.1-lm.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-parent 2ca6273c73b42e8c74afd5f8b1fe10c5c93ce363 (v1.4.12-43-g2ca6273)
-commit d4e72dc1c684c2f8361d87e6bde2902cd2ee8efb
-Author: Jan Engelhardt <jengelh@medozas.de>
-Date:   Sat Sep 3 13:34:40 2011 +0200
-
-libxt_statistic: link with -lm
-
-$ ldd -r libxt_statistic.so
-undefined symbol: lround        (./libxt_statistic.so)
-
-References: https://bugs.archlinux.org/task/25358
-Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
----
- extensions/GNUmakefile.in |    5 ++++-
- iptables/Makefile.am      |    9 +++++++--
- 2 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
-index 2b48d84..dbf210c 100644
---- a/extensions/GNUmakefile.in
-+++ b/extensions/GNUmakefile.in
-@@ -90,11 +90,14 @@ init%.o: init%.c
- #	Shared libraries
- #
- lib%.so: lib%.oo
--	${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $<;
-+	${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $< ${$*_LIBADD};
- 
- lib%.oo: ${srcdir}/lib%.c
- 	${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} -o $@ -c $<;
- 
-+# Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD
-+xt_statistic_LIBADD = -lm
-+
- 
- #
- #	Static bits
-diff --git a/iptables/Makefile.am b/iptables/Makefile.am
-index addb159..f6db32d 100644
---- a/iptables/Makefile.am
-+++ b/iptables/Makefile.am
-@@ -6,12 +6,17 @@ AM_CPPFLAGS      = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_srcdir}
- lib_LTLIBRARIES       = libxtables.la
- libxtables_la_SOURCES = xtables.c xtoptions.c
- libxtables_la_LDFLAGS = -version-info ${libxtables_vcurrent}:0:${libxtables_vage}
-+libxtables_la_LIBADD  =
-+if ENABLE_STATIC
-+# With --enable-static, shipped extensions are linked into the main executable,
-+# so we need all the LIBADDs here too
-+libxtables_la_LIBADD += -lm
-+endif
- if ENABLE_SHARED
- libxtables_la_CFLAGS  = ${AM_CFLAGS}
--libxtables_la_LIBADD  = -ldl
-+libxtables_la_LIBADD += -ldl
- else
- libxtables_la_CFLAGS  = ${AM_CFLAGS} -DNO_SHARED_LIBS=1
--libxtables_la_LIBADD  =
- endif
- 
- xtables_multi_SOURCES  = xtables-multi.c iptables-xml.c
diff --git a/net-firewall/iptables/files/iptables-1.4.13.init b/net-firewall/iptables/files/iptables-1.4.13.init
deleted file mode 100644
index a45c6d1a9918..000000000000
--- a/net-firewall/iptables/files/iptables-1.4.13.init
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-extra_commands="save panic"
-extra_started_commands="reload"
-
-iptables_name=${SVCNAME}
-if [ "${iptables_name}" != "iptables" -a "${iptables_name}" != "ip6tables" ] ; then
-	iptables_name="iptables"
-fi
-
-iptables_bin="/sbin/${iptables_name}"
-case ${iptables_name} in
-	iptables)  iptables_proc="/proc/net/ip_tables_names"
-	           iptables_save=${IPTABLES_SAVE};;
-	ip6tables) iptables_proc="/proc/net/ip6_tables_names"
-	           iptables_save=${IP6TABLES_SAVE};;
-esac
-
-depend() {
-	before net
-}
-
-set_table_policy() {
-	local chains table=$1 policy=$2
-	case ${table} in
-		nat)    chains="PREROUTING POSTROUTING OUTPUT";;
-		mangle) chains="PREROUTING INPUT FORWARD OUTPUT POSTROUTING";;
-		filter) chains="INPUT FORWARD OUTPUT";;
-		*)      chains="";;
-	esac
-	local chain
-	for chain in ${chains} ; do
-		${iptables_bin} -t ${table} -P ${chain} ${policy}
-	done
-}
-
-checkkernel() {
-	if [ ! -e ${iptables_proc} ] ; then
-		eerror "Your kernel lacks ${iptables_name} support, please load"
-		eerror "appropriate modules and try again."
-		return 1
-	fi
-	return 0
-}
-checkconfig() {
-	if [ ! -f ${iptables_save} ] ; then
-		eerror "Not starting ${iptables_name}.  First create some rules then run:"
-		eerror "/etc/init.d/${iptables_name} save"
-		return 1
-	fi
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Loading ${iptables_name} state and starting firewall"
-	${iptables_bin}-restore ${SAVE_RESTORE_OPTIONS} < "${iptables_save}"
-	eend $?
-}
-
-stop() {
-	if [ "${SAVE_ON_STOP}" = "yes" ] ; then
-		save || return 1
-	fi
-	checkkernel || return 1
-	ebegin "Stopping firewall"
-	local a
-	for a in $(cat ${iptables_proc}) ; do
-		set_table_policy $a ACCEPT
-
-		${iptables_bin} -F -t $a
-		${iptables_bin} -X -t $a
-	done
-	eend $?
-}
-
-reload() {
-	checkkernel || return 1
-	ebegin "Flushing firewall"
-	local a
-	for a in $(cat ${iptables_proc}) ; do
-		${iptables_bin} -F -t $a
-		${iptables_bin} -X -t $a
-	done
-	eend $?
-
-	start
-}
-
-save() {
-	ebegin "Saving ${iptables_name} state"
-	touch "${iptables_save}"
-	chmod 0600 "${iptables_save}"
-	${iptables_bin}-save ${SAVE_RESTORE_OPTIONS} > "${iptables_save}"
-	eend $?
-}
-
-panic() {
-	checkkernel || return 1
-	if service_started ${iptables_name}; then
-		rc-service ${iptables_name} stop
-	fi
-
-	local a
-	ebegin "Dropping all packets"
-	for a in $(cat ${iptables_proc}) ; do
-		${iptables_bin} -F -t $a
-		${iptables_bin} -X -t $a
-
-		set_table_policy $a DROP
-	done
-	eend $?
-}
diff --git a/net-firewall/iptables/files/iptables-1.4.16.2-static.patch b/net-firewall/iptables/files/iptables-1.4.16.2-static.patch
deleted file mode 100644
index a5d6fe71f670..000000000000
--- a/net-firewall/iptables/files/iptables-1.4.16.2-static.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-https://bugs.gentoo.org/437712
-
-From 269655d54e22f3a36250bb2c4639dddd102258c6 Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt <jengelh@inai.de>
-Date: Mon, 8 Oct 2012 12:04:56 +0000
-Subject: [PATCH] build: remove symlink-only extensions from static object
- list
-
-$ ./configure --enable-static --disable-shared --enable-ipv4
-  --enable-ipv6 && make
-[...]
-make[3]: *** No rule to make target "libxt_NOTRACK.o", needed by
-"libext.a". Stop.
-
-Signed-off-by: Jan Engelhardt <jengelh@inai.de>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- extensions/GNUmakefile.in | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
-index 8b38df9..1cef239 100644
---- a/extensions/GNUmakefile.in
-+++ b/extensions/GNUmakefile.in
-@@ -39,7 +39,7 @@ endif
- #	Wildcard module list
- #
- pfx_build_mod := $(patsubst ${srcdir}/libxt_%.c,%,$(sort $(wildcard ${srcdir}/libxt_*.c)))
--pfx_build_mod += NOTRACK state
-+pfx_symlinks  := NOTRACK state
- @ENABLE_IPV4_TRUE@ pf4_build_mod := $(patsubst ${srcdir}/libipt_%.c,%,$(sort $(wildcard ${srcdir}/libipt_*.c)))
- @ENABLE_IPV6_TRUE@ pf6_build_mod := $(patsubst ${srcdir}/libip6t_%.c,%,$(sort $(wildcard ${srcdir}/libip6t_*.c)))
- pfx_build_mod := $(filter-out @blacklist_modules@,${pfx_build_mod})
-@@ -48,7 +48,7 @@ pf6_build_mod := $(filter-out @blacklist_modules@,${pf6_build_mod})
- pfx_objs      := $(patsubst %,libxt_%.o,${pfx_build_mod})
- pf4_objs      := $(patsubst %,libipt_%.o,${pf4_build_mod})
- pf6_objs      := $(patsubst %,libip6t_%.o,${pf6_build_mod})
--pfx_solibs    := $(patsubst %,libxt_%.so,${pfx_build_mod})
-+pfx_solibs    := $(patsubst %,libxt_%.so,${pfx_build_mod} ${pfx_symlinks})
- pf4_solibs    := $(patsubst %,libipt_%.so,${pf4_build_mod})
- pf6_solibs    := $(patsubst %,libip6t_%.so,${pf6_build_mod})
- 
-@@ -220,7 +220,7 @@ man_run    = \
- 	done >$@;
- 
- matches.man: .initext.dd .initext4.dd .initext6.dd $(wildcard ${srcdir}/lib*.man)
--	$(call man_run,$(call ex_matches,${pfx_build_mod} ${pf4_build_mod} ${pf6_build_mod}))
-+	$(call man_run,$(call ex_matches,${pfx_build_mod} ${pf4_build_mod} ${pf6_build_mod} ${pfx_symlinks}))
- 
- targets.man: .initext.dd .initext4.dd .initext6.dd $(wildcard ${srcdir}/lib*.man)
--	$(call man_run,$(call ex_targets,${pfx_build_mod} ${pf4_build_mod} ${pf6_build_mod}))
-+	$(call man_run,$(call ex_targets,${pfx_build_mod} ${pf4_build_mod} ${pf6_build_mod} ${pfx_symlinks}))
--- 
-1.7.12
-
diff --git a/net-firewall/iptables/files/iptables-1.4.17-libip6tc.patch b/net-firewall/iptables/files/iptables-1.4.17-libip6tc.patch
deleted file mode 100644
index 5212dd253aa8..000000000000
--- a/net-firewall/iptables/files/iptables-1.4.17-libip6tc.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From d42bc7c100de69396a527e90736198f8e4e3000b Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 30 Dec 2012 18:06:15 -0500
-Subject: [PATCH] extensions: fix linking against -lip6tc
-
-The current build forgets to specify a path to find libip6tc which means
-it either fails (if there is no libip6tc in the system), or links against
-an old version (if there is one in the system).
-
-References: https://bugs.gentoo.org/449262
-Reported-by: Mike Gilbert <floppym@gentoo.org>
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- extensions/GNUmakefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
-index e71e3ff..a605474 100644
---- a/extensions/GNUmakefile.in
-+++ b/extensions/GNUmakefile.in
-@@ -101,7 +101,7 @@ libxt_state.so: libxt_conntrack.so
- 	ln -fs $< $@
- 
- # Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD
--ip6t_NETMAP_LIBADD  = -lip6tc
-+ip6t_NETMAP_LIBADD  = -L../libiptc/.libs -lip6tc
- xt_RATEEST_LIBADD   = -lm
- xt_statistic_LIBADD = -lm
- 
--- 
-1.8.0
-
diff --git a/net-firewall/iptables/files/iptables-1.4.18-extensions-link.patch b/net-firewall/iptables/files/iptables-1.4.18-extensions-link.patch
deleted file mode 100644
index 33d048163a18..000000000000
--- a/net-firewall/iptables/files/iptables-1.4.18-extensions-link.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 37b19d08f3cbc83a653386d76261490e173a874b Mon Sep 17 00:00:00 2001
-From: Pablo Neira Ayuso <pablo@netfilter.org>
-Date: Sat, 16 Mar 2013 12:15:30 +0100
-Subject: [PATCH] Revert "build: resolve link failure for ip6t_NETMAP"
-
-This reverts commit 68e77a26111ee6b8f10c735a76891a7de6d57ee6.
-
-The use of libtool was introduced to resolve linking problems
-in NETMAP (IPv6 version), but that resulted in RPATH problems
-reported from distributors and warnings spotted by libtool at
-linking stage.
-
-Since (0ca548b libip6t_NETMAP: Use xtables_ip6mask_to_cidr and
-get rid of libip6tc dependency) fixed the NETMAP issue, let's
-roll back to our previous stage.
-
-A small conflicts in extensions/GNUmakefile.in has been resolved
-in this revert.
-
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- extensions/GNUmakefile.in | 18 +++++++-----------
- 1 file changed, 7 insertions(+), 11 deletions(-)
-
-diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
-index 3db6985..1ae7f74 100644
---- a/extensions/GNUmakefile.in
-+++ b/extensions/GNUmakefile.in
-@@ -33,7 +33,6 @@ AM_VERBOSE_CXX    = @echo "  CXX     " $@;
- AM_VERBOSE_CXXLD  = @echo "  CXXLD   " $@;
- AM_VERBOSE_AR     = @echo "  AR      " $@;
- AM_VERBOSE_GEN    = @echo "  GEN     " $@;
--AM_VERBOSE_NULL   = @
- endif
- 
- #
-@@ -76,7 +75,7 @@ install: ${targets_install}
- 	if test -n "${targets_install}"; then install -pm0755 $^ "${DESTDIR}${xtlibdir}/"; fi;
- 
- clean:
--	rm -f *.la *.o *.lo *.so *.a {matches,targets}.man initext.c initext4.c initext6.c;
-+	rm -f *.o *.oo *.so *.a {matches,targets}.man initext.c initext4.c initext6.c;
- 	rm -f .*.d .*.dd;
- 
- distclean: clean
-@@ -90,19 +89,16 @@ init%.o: init%.c
- #
- #	Shared libraries
- #
--lib%.so: lib%.la
--	${AM_VERBOSE_NULL} ln -fs .libs/$@ $@
-+lib%.so: lib%.oo
-+	${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $< -L../libxtables/.libs -lxtables ${$*_LIBADD};
- 
--lib%.la: lib%.lo
--	${AM_VERBOSE_CCLD} ../libtool ${AM_LIBTOOL_SILENT} --tag=CC --mode=link ${CCLD} ${AM_LDFLAGS} -module ${LDFLAGS} -o $@ $< ../libxtables/libxtables.la ${$*_LIBADD} -rpath ${xtlibdir}
--
--lib%.lo: ${srcdir}/lib%.c
--	${AM_VERBOSE_CC} ../libtool ${AM_LIBTOOL_SILENT} --tag=CC --mode=compile ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init ${CFLAGS} -o $@ -c $<
-+lib%.oo: ${srcdir}/lib%.c
-+	${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} -o $@ -c $<;
- 
- libxt_NOTRACK.so: libxt_CT.so
--	${AM_VERBOSE_GEN} ln -fs $< $@
-+	ln -fs $< $@
- libxt_state.so: libxt_conntrack.so
--	${AM_VERBOSE_GEN} ln -fs $< $@
-+	ln -fs $< $@
- 
- # Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD
- xt_RATEEST_LIBADD   = -lm
--- 
-1.8.2.1
-
diff --git a/net-firewall/iptables/files/iptables-1.4.18-ipv6-linkage.patch b/net-firewall/iptables/files/iptables-1.4.18-ipv6-linkage.patch
deleted file mode 100644
index 52829de24a5f..000000000000
--- a/net-firewall/iptables/files/iptables-1.4.18-ipv6-linkage.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From cccfff9309743f173c504dd265fae173caa5b47f Mon Sep 17 00:00:00 2001
-From: Pablo Neira Ayuso <pablo@netfilter.org>
-Date: Sat, 16 Mar 2013 12:11:07 +0100
-Subject: [PATCH] libip6t_NETMAP: Use xtables_ip6mask_to_cidr and get rid of
- libip6tc dependency
-
-This patch changes the NETMAP target extension (IPv6 side) to use
-the xtables_ip6mask_to_cidr available in libxtables.
-
-As a side effect, we get rid of the libip6tc dependency.
-
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- extensions/GNUmakefile.in   | 1 -
- extensions/libip6t_NETMAP.c | 2 +-
- include/libiptc/libip6tc.h  | 3 ---
- iptables/ip6tables.c        | 2 +-
- libiptc/libip6tc.c          | 2 +-
- 5 files changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
-index adad4d6..3db6985 100644
---- a/extensions/GNUmakefile.in
-+++ b/extensions/GNUmakefile.in
-@@ -105,7 +105,6 @@ libxt_state.so: libxt_conntrack.so
- 	${AM_VERBOSE_GEN} ln -fs $< $@
- 
- # Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD
--ip6t_NETMAP_LIBADD  = ../libiptc/libip6tc.la
- xt_RATEEST_LIBADD   = -lm
- xt_statistic_LIBADD = -lm
- 
-diff --git a/extensions/libip6t_NETMAP.c b/extensions/libip6t_NETMAP.c
-index d14dece..a4df70e 100644
---- a/extensions/libip6t_NETMAP.c
-+++ b/extensions/libip6t_NETMAP.c
-@@ -61,7 +61,7 @@ static void NETMAP_print(const void *ip, const struct xt_entry_target *target,
- 	printf("%s", xtables_ip6addr_to_numeric(&a));
- 	for (i = 0; i < 4; i++)
- 		a.s6_addr32[i] = ~(r->min_addr.ip6[i] ^ r->max_addr.ip6[i]);
--	bits = ipv6_prefix_length(&a);
-+	bits = xtables_ip6mask_to_cidr(&a);
- 	if (bits < 0)
- 		printf("/%s", xtables_ip6addr_to_numeric(&a));
- 	else
-diff --git a/include/libiptc/libip6tc.h b/include/libiptc/libip6tc.h
-index c656bc4..9aed80a 100644
---- a/include/libiptc/libip6tc.h
-+++ b/include/libiptc/libip6tc.h
-@@ -154,9 +154,6 @@ int ip6tc_get_raw_socket(void);
- /* Translates errno numbers into more human-readable form than strerror. */
- const char *ip6tc_strerror(int err);
- 
--/* Return prefix length, or -1 if not contiguous */
--int ipv6_prefix_length(const struct in6_addr *a);
--
- extern void dump_entries6(struct xtc_handle *const);
- 
- extern const struct xtc_ops ip6tc_ops;
-diff --git a/iptables/ip6tables.c b/iptables/ip6tables.c
-index 4cfbea3..7d02cc1 100644
---- a/iptables/ip6tables.c
-+++ b/iptables/ip6tables.c
-@@ -1022,7 +1022,7 @@ static void print_ip(const char *prefix, const struct in6_addr *ip,
- 		     const struct in6_addr *mask, int invert)
- {
- 	char buf[51];
--	int l = ipv6_prefix_length(mask);
-+	int l = xtables_ip6mask_to_cidr(mask);
- 
- 	if (l == 0 && !invert)
- 		return;
-diff --git a/libiptc/libip6tc.c b/libiptc/libip6tc.c
-index 7128e1c..ca01bcb 100644
---- a/libiptc/libip6tc.c
-+++ b/libiptc/libip6tc.c
-@@ -113,7 +113,7 @@ typedef unsigned int socklen_t;
- #define BIT6(a, l) \
-  ((ntohl(a->s6_addr32[(l) / 32]) >> (31 - ((l) & 31))) & 1)
- 
--int
-+static int
- ipv6_prefix_length(const struct in6_addr *a)
- {
- 	int l, i;
--- 
-1.8.2.1
-
diff --git a/net-firewall/iptables/files/iptables-1.4.11.init b/net-firewall/iptables/files/iptables.init
old mode 100644
new mode 100755
similarity index 73%
rename from net-firewall/iptables/files/iptables-1.4.11.init
rename to net-firewall/iptables/files/iptables.init
index 6b2b88c5dbed..f396ea2ef148
--- a/net-firewall/iptables/files/iptables-1.4.11.init
+++ b/net-firewall/iptables/files/iptables.init
@@ -1,15 +1,16 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-extra_commands="save panic"
+extra_commands="check save panic"
 extra_started_commands="reload"
 
 iptables_name=${SVCNAME}
-if [ "${iptables_name}" != "iptables" -a "${iptables_name}" != "ip6tables" ] ; then
-	iptables_name="iptables"
-fi
+case ${iptables_name} in
+iptables|ip6tables) ;;
+*) iptables_name="iptables" ;;
+esac
 
 iptables_bin="/sbin/${iptables_name}"
 case ${iptables_name} in
@@ -20,8 +21,8 @@ case ${iptables_name} in
 esac
 
 depend() {
+	need localmount #434774
 	before net
-	use logger
 }
 
 set_table_policy() {
@@ -34,7 +35,7 @@ set_table_policy() {
 	esac
 	local chain
 	for chain in ${chains} ; do
-		${iptables_bin} -t ${table} -P ${chain} ${policy}
+		${iptables_bin} -w -t ${table} -P ${chain} ${policy}
 	done
 }
 
@@ -72,29 +73,41 @@ stop() {
 	for a in $(cat ${iptables_proc}) ; do
 		set_table_policy $a ACCEPT
 
-		${iptables_bin} -F -t $a
-		${iptables_bin} -X -t $a
+		${iptables_bin} -w -F -t $a
+		${iptables_bin} -w -X -t $a
 	done
 	eend $?
 }
 
 reload() {
 	checkkernel || return 1
+	checkrules || return 1
 	ebegin "Flushing firewall"
 	local a
 	for a in $(cat ${iptables_proc}) ; do
-		${iptables_bin} -F -t $a
-		${iptables_bin} -X -t $a
+		${iptables_bin} -w -F -t $a
+		${iptables_bin} -w -X -t $a
 	done
 	eend $?
 
 	start
 }
 
+checkrules() {
+	ebegin "Checking rules"
+	${iptables_bin}-restore --test ${SAVE_RESTORE_OPTIONS} < "${iptables_save}"
+	eend $?
+}
+
+check() {
+	# Short name for users of init.d script.
+	checkrules
+}
+
 save() {
 	ebegin "Saving ${iptables_name} state"
-	touch "${iptables_save}"
-	chmod 0600 "${iptables_save}"
+	checkpath -q -d "$(dirname "${iptables_save}")"
+	checkpath -q -m 0600 -f "${iptables_save}"
 	${iptables_bin}-save ${SAVE_RESTORE_OPTIONS} > "${iptables_save}"
 	eend $?
 }
@@ -108,8 +121,8 @@ panic() {
 	local a
 	ebegin "Dropping all packets"
 	for a in $(cat ${iptables_proc}) ; do
-		${iptables_bin} -F -t $a
-		${iptables_bin} -X -t $a
+		${iptables_bin} -w -F -t $a
+		${iptables_bin} -w -X -t $a
 
 		set_table_policy $a DROP
 	done
diff --git a/net-firewall/iptables/iptables-1.4.10-r1.ebuild b/net-firewall/iptables/iptables-1.4.10-r1.ebuild
deleted file mode 100644
index ff152ec86761..000000000000
--- a/net-firewall/iptables/iptables-1.4.10-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-# Force users doing their own patches to install their own tools
-AUTOTOOLS_AUTO_DEPEND=no
-
-inherit eutils multilib toolchain-funcs autotools
-
-DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
-HOMEPAGE="http://www.iptables.org/"
-SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ipv6 netlink"
-
-COMMON_DEPEND="
-	netlink? ( net-libs/libnfnetlink )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	virtual/os-headers
-"
-RDEPEND="
-	${COMMON_DEPEND}
-"
-
-src_prepare() {
-	# Only run autotools if user patched something
-	epatch_user && eautoreconf || elibtoolize
-}
-
-src_configure() {
-	sed -i \
-		-e "/nfnetlink=[01]/s:=[01]:=$(use netlink && echo 1 || echo 0):" \
-		configure
-	econf \
-		--sbindir=/sbin \
-		--libexecdir=/$(get_libdir) \
-		--enable-devel \
-		--enable-libipq \
-		--enable-shared \
-		--enable-static \
-		$(use_enable ipv6)
-}
-
-src_compile() {
-	emake V=1 || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	doman iptables-apply.8 || die
-	dodoc INCOMPATIBILITIES iptables.xslt || die
-
-	# all the iptables binaries are in /sbin, so might as well
-	# put these small files in with them
-	into /
-	dosbin iptables-apply || die
-	dosym iptables-apply /sbin/ip6tables-apply || die
-
-	insinto /usr/include
-	doins include/iptables.h $(use ipv6 && echo include/ip6tables.h) || die
-	insinto /usr/include/iptables
-	doins include/iptables/internal.h || die
-
-	keepdir /var/lib/iptables
-	newinitd "${FILESDIR}"/${PN}-1.3.2.init iptables || die
-	newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables || die
-	if use ipv6 ; then
-		keepdir /var/lib/ip6tables
-		newinitd "${FILESDIR}"/iptables-1.3.2.init ip6tables || die
-		newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables || die
-	fi
-
-	# Move important libs to /lib
-	gen_usr_ldscript -a ip{4,6}tc ipq iptc xtables
-	find "${D}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
-}
diff --git a/net-firewall/iptables/iptables-1.4.10.ebuild b/net-firewall/iptables/iptables-1.4.10.ebuild
deleted file mode 100644
index 82e42fdf7ee5..000000000000
--- a/net-firewall/iptables/iptables-1.4.10.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-# Force users doing their own patches to install their own tools
-AUTOTOOLS_AUTO_DEPEND=no
-
-inherit eutils multilib toolchain-funcs autotools
-
-DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
-HOMEPAGE="http://www.iptables.org/"
-SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="ipv6"
-
-DEPEND="virtual/os-headers"
-RDEPEND=""
-
-src_prepare() {
-	# Only run autotools if user patched something
-	epatch_user && eautoreconf || elibtoolize
-}
-
-src_configure() {
-	econf \
-		--sbindir=/sbin \
-		--libexecdir=/$(get_libdir) \
-		--enable-devel \
-		--enable-libipq \
-		--enable-shared \
-		--enable-static \
-		$(use_enable ipv6)
-}
-
-src_compile() {
-	emake V=1 || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dosbin iptables-apply || die
-	doman iptables-apply.8 || die
-	dodoc INCOMPATIBILITIES iptables.xslt || die
-
-	insinto /usr/include
-	doins include/iptables.h $(use ipv6 && echo include/ip6tables.h) || die
-	insinto /usr/include/iptables
-	doins include/iptables/internal.h || die
-
-	keepdir /var/lib/iptables
-	newinitd "${FILESDIR}"/${PN}-1.3.2.init iptables || die
-	newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables || die
-	if use ipv6 ; then
-		keepdir /var/lib/ip6tables
-		newinitd "${FILESDIR}"/iptables-1.3.2.init ip6tables || die
-		newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables || die
-	fi
-
-	# Move important libs to /lib
-	gen_usr_ldscript -a ip{4,6}tc ipq iptc xtables
-	find "${D}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
-}
diff --git a/net-firewall/iptables/iptables-1.4.11.1-r2.ebuild b/net-firewall/iptables/iptables-1.4.11.1-r2.ebuild
deleted file mode 100644
index 77310ab04511..000000000000
--- a/net-firewall/iptables/iptables-1.4.11.1-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-# Force users doing their own patches to install their own tools
-AUTOTOOLS_AUTO_DEPEND=no
-
-inherit eutils multilib toolchain-funcs autotools
-
-DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
-HOMEPAGE="http://www.iptables.org/"
-SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="ipv6 netlink"
-
-COMMON_DEPEND="
-	netlink? ( net-libs/libnfnetlink )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	virtual/os-headers
-	sys-devel/automake
-"
-RDEPEND="
-	${COMMON_DEPEND}
-"
-
-src_prepare() {
-	# Only run autotools if user patched something
-	epatch "${FILESDIR}/${P}-man-fixes.patch"
-	eautomake
-	epatch_user && eautoreconf || elibtoolize
-}
-
-src_configure() {
-	sed -i \
-		-e "/nfnetlink=[01]/s:=[01]:=$(use netlink && echo 1 || echo 0):" \
-		configure
-	econf \
-		--sbindir=/sbin \
-		--libexecdir=/$(get_libdir) \
-		--enable-devel \
-		--enable-libipq \
-		--enable-shared \
-		--enable-static \
-		$(use_enable ipv6)
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc INCOMPATIBILITIES iptables/iptables.xslt
-
-	# all the iptables binaries are in /sbin, so might as well
-	# put these small files in with them
-	into /
-	dosbin iptables/iptables-apply
-	dosym iptables-apply /sbin/ip6tables-apply
-	doman iptables/iptables-apply.8
-
-	insinto /usr/include
-	doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
-	insinto /usr/include/iptables
-	doins include/iptables/internal.h
-
-	keepdir /var/lib/iptables
-	newinitd "${FILESDIR}"/${PN}-1.4.11.init iptables
-	newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables
-	if use ipv6 ; then
-		keepdir /var/lib/ip6tables
-		newinitd "${FILESDIR}"/iptables-1.4.11.init ip6tables
-		newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables
-	fi
-
-	# Move important libs to /lib
-	gen_usr_ldscript -a ip{4,6}tc ipq iptc xtables
-	find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
-}
diff --git a/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild b/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild
deleted file mode 100644
index 2055cf251814..000000000000
--- a/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-# Force users doing their own patches to install their own tools
-AUTOTOOLS_AUTO_DEPEND=no
-
-inherit eutils multilib toolchain-funcs autotools
-
-DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
-HOMEPAGE="http://www.iptables.org/"
-SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ipv6 netlink static-libs"
-
-RDEPEND="
-	netlink? ( net-libs/libnfnetlink )
-"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	sys-devel/automake
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/iptables-1.4.12.1-lm.patch" \
-		"${FILESDIR}/iptables-1.4.12.1-conntrack-v2-ranges.patch"
-	eautomake
-
-	# use the saner headers from the kernel
-	rm -f include/linux/{kernel,types}.h
-
-	# Only run autotools if user patched something
-	epatch_user && eautoreconf || elibtoolize
-}
-
-src_configure() {
-	sed -i \
-		-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
-		configure || die
-	econf \
-		--sbindir=/sbin \
-		--libexecdir=/$(get_libdir) \
-		--enable-devel \
-		--enable-libipq \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable ipv6)
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	default
-	dodoc INCOMPATIBILITIES iptables/iptables.xslt
-
-	# all the iptables binaries are in /sbin, so might as well
-	# put these small files in with them
-	into /
-	dosbin iptables/iptables-apply
-	dosym iptables-apply /sbin/ip6tables-apply
-	doman iptables/iptables-apply.8
-
-	insinto /usr/include
-	doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
-	insinto /usr/include/iptables
-	doins include/iptables/internal.h
-
-	keepdir /var/lib/iptables
-	newinitd "${FILESDIR}"/${PN}-1.4.11.init iptables
-	newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables
-	if use ipv6 ; then
-		keepdir /var/lib/ip6tables
-		newinitd "${FILESDIR}"/iptables-1.4.11.init ip6tables
-		newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables
-	fi
-
-	# Move important libs to /lib
-	gen_usr_ldscript -a ip{4,6}tc ipq iptc xtables
-	find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
-}
diff --git a/net-firewall/iptables/iptables-1.4.12.1.ebuild b/net-firewall/iptables/iptables-1.4.12.1.ebuild
deleted file mode 100644
index 2639b2e56363..000000000000
--- a/net-firewall/iptables/iptables-1.4.12.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-# Force users doing their own patches to install their own tools
-AUTOTOOLS_AUTO_DEPEND=no
-
-inherit eutils multilib toolchain-funcs autotools
-
-DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
-HOMEPAGE="http://www.iptables.org/"
-SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="ipv6 netlink"
-
-COMMON_DEPEND="
-	netlink? ( net-libs/libnfnetlink )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	virtual/os-headers
-	sys-devel/automake
-"
-RDEPEND="
-	${COMMON_DEPEND}
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/iptables-1.4.12.1-lm.patch"
-	eautomake
-
-	# Only run autotools if user patched something
-	epatch_user && eautoreconf || elibtoolize
-}
-
-src_configure() {
-	sed -i \
-		-e "/nfnetlink=[01]/s:=[01]:=$(use netlink && echo 1 || echo 0):" \
-		configure || die
-	econf \
-		--sbindir=/sbin \
-		--libexecdir=/$(get_libdir) \
-		--enable-devel \
-		--enable-libipq \
-		--enable-shared \
-		--enable-static \
-		$(use_enable ipv6)
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc INCOMPATIBILITIES iptables/iptables.xslt
-
-	# all the iptables binaries are in /sbin, so might as well
-	# put these small files in with them
-	into /
-	dosbin iptables/iptables-apply
-	dosym iptables-apply /sbin/ip6tables-apply
-	doman iptables/iptables-apply.8
-
-	insinto /usr/include
-	doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
-	insinto /usr/include/iptables
-	doins include/iptables/internal.h
-
-	keepdir /var/lib/iptables
-	newinitd "${FILESDIR}"/${PN}-1.4.11.init iptables
-	newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables
-	if use ipv6 ; then
-		keepdir /var/lib/ip6tables
-		newinitd "${FILESDIR}"/iptables-1.4.11.init ip6tables
-		newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables
-	fi
-
-	# Move important libs to /lib
-	gen_usr_ldscript -a ip{4,6}tc ipq iptc xtables
-	find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
-}
diff --git a/net-firewall/iptables/iptables-1.4.12.ebuild b/net-firewall/iptables/iptables-1.4.12.ebuild
deleted file mode 100644
index 80e13cc88046..000000000000
--- a/net-firewall/iptables/iptables-1.4.12.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-# Force users doing their own patches to install their own tools
-AUTOTOOLS_AUTO_DEPEND=no
-
-inherit eutils multilib toolchain-funcs autotools
-
-DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
-HOMEPAGE="http://www.iptables.org/"
-SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ipv6 netlink"
-
-COMMON_DEPEND="
-	netlink? ( net-libs/libnfnetlink )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	virtual/os-headers
-	sys-devel/automake
-"
-RDEPEND="
-	${COMMON_DEPEND}
-"
-
-src_prepare() {
-	# Only run autotools if user patched something
-	epatch_user && eautoreconf || elibtoolize
-}
-
-src_configure() {
-	sed -i \
-		-e "/nfnetlink=[01]/s:=[01]:=$(use netlink && echo 1 || echo 0):" \
-		configure || die
-	econf \
-		--sbindir=/sbin \
-		--libexecdir=/$(get_libdir) \
-		--enable-devel \
-		--enable-libipq \
-		--enable-shared \
-		--enable-static \
-		$(use_enable ipv6)
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc INCOMPATIBILITIES iptables/iptables.xslt
-
-	# all the iptables binaries are in /sbin, so might as well
-	# put these small files in with them
-	into /
-	dosbin iptables/iptables-apply
-	dosym iptables-apply /sbin/ip6tables-apply
-	doman iptables/iptables-apply.8
-
-	insinto /usr/include
-	doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
-	insinto /usr/include/iptables
-	doins include/iptables/internal.h
-
-	keepdir /var/lib/iptables
-	newinitd "${FILESDIR}"/${PN}-1.4.11.init iptables
-	newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables
-	if use ipv6 ; then
-		keepdir /var/lib/ip6tables
-		newinitd "${FILESDIR}"/iptables-1.4.11.init ip6tables
-		newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables
-	fi
-
-	# Move important libs to /lib
-	gen_usr_ldscript -a ip{4,6}tc ipq iptc xtables
-	find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
-}
diff --git a/net-firewall/iptables/iptables-1.4.13-r2.ebuild b/net-firewall/iptables/iptables-1.4.13-r2.ebuild
deleted file mode 100644
index e10df947ab5c..000000000000
--- a/net-firewall/iptables/iptables-1.4.13-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-# Force users doing their own patches to install their own tools
-AUTOTOOLS_AUTO_DEPEND=no
-
-inherit eutils multilib toolchain-funcs autotools
-
-DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
-HOMEPAGE="http://www.iptables.org/"
-SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ipv6 netlink static-libs"
-
-RDEPEND="
-	netlink? ( net-libs/libnfnetlink )
-"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	!>=sys-kernel/linux-headers-3.5
-"
-
-src_prepare() {
-	# use the saner headers from the kernel
-	rm -f include/linux/{kernel,types}.h
-
-	# Only run autotools if user patched something
-	epatch_user && eautoreconf || elibtoolize
-}
-
-src_configure() {
-	sed -i \
-		-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
-		configure || die
-	econf \
-		--sbindir="${EPREFIX}/sbin" \
-		--libexecdir="${EPREFIX}/$(get_libdir)" \
-		--enable-devel \
-		--enable-libipq \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable ipv6)
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	default
-	dodoc INCOMPATIBILITIES iptables/iptables.xslt
-
-	# all the iptables binaries are in /sbin, so might as well
-	# put these small files in with them
-	into /
-	dosbin iptables/iptables-apply
-	dosym iptables-apply /sbin/ip6tables-apply
-	doman iptables/iptables-apply.8
-
-	insinto /usr/include
-	doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
-	insinto /usr/include/iptables
-	doins include/iptables/internal.h
-
-	keepdir /var/lib/iptables
-	newinitd "${FILESDIR}"/${PN}-1.4.13-r1.init iptables
-	newconfd "${FILESDIR}"/${PN}-1.4.13.confd iptables
-	if use ipv6 ; then
-		keepdir /var/lib/ip6tables
-		newinitd "${FILESDIR}"/iptables-1.4.13-r1.init ip6tables
-		newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables
-	fi
-
-	# Move important libs to /lib
-	gen_usr_ldscript -a ip{4,6}tc ipq iptc xtables
-	find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
-}
diff --git a/net-firewall/iptables/iptables-1.4.13.ebuild b/net-firewall/iptables/iptables-1.4.13.ebuild
deleted file mode 100644
index efa45e2e066b..000000000000
--- a/net-firewall/iptables/iptables-1.4.13.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-# Force users doing their own patches to install their own tools
-AUTOTOOLS_AUTO_DEPEND=no
-
-inherit eutils multilib toolchain-funcs autotools
-
-DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
-HOMEPAGE="http://www.iptables.org/"
-SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="ipv6 netlink static-libs"
-
-RDEPEND="
-	netlink? ( net-libs/libnfnetlink )
-"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	!>=sys-kernel/linux-headers-3.5
-"
-
-src_prepare() {
-	# use the saner headers from the kernel
-	rm -f include/linux/{kernel,types}.h
-
-	# Only run autotools if user patched something
-	epatch_user && eautoreconf || elibtoolize
-}
-
-src_configure() {
-	sed -i \
-		-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
-		configure || die
-	econf \
-		--sbindir="${EPREFIX}/sbin" \
-		--libexecdir="${EPREFIX}/$(get_libdir)" \
-		--enable-devel \
-		--enable-libipq \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable ipv6)
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	default
-	dodoc INCOMPATIBILITIES iptables/iptables.xslt
-
-	# all the iptables binaries are in /sbin, so might as well
-	# put these small files in with them
-	into /
-	dosbin iptables/iptables-apply
-	dosym iptables-apply /sbin/ip6tables-apply
-	doman iptables/iptables-apply.8
-
-	insinto /usr/include
-	doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
-	insinto /usr/include/iptables
-	doins include/iptables/internal.h
-
-	keepdir /var/lib/iptables
-	newinitd "${FILESDIR}"/${PN}-1.4.11.init iptables
-	newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables
-	if use ipv6 ; then
-		keepdir /var/lib/ip6tables
-		newinitd "${FILESDIR}"/iptables-1.4.11.init ip6tables
-		newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables
-	fi
-
-	# Move important libs to /lib
-	gen_usr_ldscript -a ip{4,6}tc ipq iptc xtables
-	find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
-}
diff --git a/net-firewall/iptables/iptables-1.4.14-r1.ebuild b/net-firewall/iptables/iptables-1.4.14-r1.ebuild
deleted file mode 100644
index 829beb00e618..000000000000
--- a/net-firewall/iptables/iptables-1.4.14-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-# Force users doing their own patches to install their own tools
-AUTOTOOLS_AUTO_DEPEND=no
-
-inherit eutils multilib toolchain-funcs autotools
-
-DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
-HOMEPAGE="http://www.iptables.org/"
-SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ipv6 netlink static-libs"
-
-RDEPEND="
-	netlink? ( net-libs/libnfnetlink )
-"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	!>=sys-kernel/linux-headers-3.5
-"
-
-src_prepare() {
-	# use the saner headers from the kernel
-	rm -f include/linux/{kernel,types}.h
-
-	# Only run autotools if user patched something
-	epatch_user && eautoreconf || elibtoolize
-}
-
-src_configure() {
-	sed -i \
-		-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
-		configure || die
-	econf \
-		--sbindir="${EPREFIX}/sbin" \
-		--libexecdir="${EPREFIX}/$(get_libdir)" \
-		--enable-devel \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable ipv6)
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	default
-	dodoc INCOMPATIBILITIES iptables/iptables.xslt
-
-	# all the iptables binaries are in /sbin, so might as well
-	# put these small files in with them
-	into /
-	dosbin iptables/iptables-apply
-	dosym iptables-apply /sbin/ip6tables-apply
-	doman iptables/iptables-apply.8
-
-	insinto /usr/include
-	doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
-	insinto /usr/include/iptables
-	doins include/iptables/internal.h
-
-	keepdir /var/lib/iptables
-	newinitd "${FILESDIR}"/${PN}-1.4.13-r1.init iptables
-	newconfd "${FILESDIR}"/${PN}-1.4.13.confd iptables
-	if use ipv6 ; then
-		keepdir /var/lib/ip6tables
-		newinitd "${FILESDIR}"/iptables-1.4.13-r1.init ip6tables
-		newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables
-	fi
-
-	# Move important libs to /lib
-	gen_usr_ldscript -a ip{4,6}tc iptc xtables
-	find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
-}
diff --git a/net-firewall/iptables/iptables-1.4.15-r1.ebuild b/net-firewall/iptables/iptables-1.4.15-r1.ebuild
deleted file mode 100644
index 829beb00e618..000000000000
--- a/net-firewall/iptables/iptables-1.4.15-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-# Force users doing their own patches to install their own tools
-AUTOTOOLS_AUTO_DEPEND=no
-
-inherit eutils multilib toolchain-funcs autotools
-
-DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
-HOMEPAGE="http://www.iptables.org/"
-SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ipv6 netlink static-libs"
-
-RDEPEND="
-	netlink? ( net-libs/libnfnetlink )
-"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	!>=sys-kernel/linux-headers-3.5
-"
-
-src_prepare() {
-	# use the saner headers from the kernel
-	rm -f include/linux/{kernel,types}.h
-
-	# Only run autotools if user patched something
-	epatch_user && eautoreconf || elibtoolize
-}
-
-src_configure() {
-	sed -i \
-		-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
-		configure || die
-	econf \
-		--sbindir="${EPREFIX}/sbin" \
-		--libexecdir="${EPREFIX}/$(get_libdir)" \
-		--enable-devel \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable ipv6)
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	default
-	dodoc INCOMPATIBILITIES iptables/iptables.xslt
-
-	# all the iptables binaries are in /sbin, so might as well
-	# put these small files in with them
-	into /
-	dosbin iptables/iptables-apply
-	dosym iptables-apply /sbin/ip6tables-apply
-	doman iptables/iptables-apply.8
-
-	insinto /usr/include
-	doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
-	insinto /usr/include/iptables
-	doins include/iptables/internal.h
-
-	keepdir /var/lib/iptables
-	newinitd "${FILESDIR}"/${PN}-1.4.13-r1.init iptables
-	newconfd "${FILESDIR}"/${PN}-1.4.13.confd iptables
-	if use ipv6 ; then
-		keepdir /var/lib/ip6tables
-		newinitd "${FILESDIR}"/iptables-1.4.13-r1.init ip6tables
-		newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables
-	fi
-
-	# Move important libs to /lib
-	gen_usr_ldscript -a ip{4,6}tc iptc xtables
-	find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
-}
diff --git a/net-firewall/iptables/iptables-1.4.16.2.ebuild b/net-firewall/iptables/iptables-1.4.16.2.ebuild
deleted file mode 100644
index 4dc89f6921c8..000000000000
--- a/net-firewall/iptables/iptables-1.4.16.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-# Force users doing their own patches to install their own tools
-AUTOTOOLS_AUTO_DEPEND=no
-
-inherit eutils multilib toolchain-funcs autotools
-
-DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
-HOMEPAGE="http://www.iptables.org/"
-SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ipv6 netlink static-libs"
-
-RDEPEND="
-	netlink? ( net-libs/libnfnetlink )
-"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# use the saner headers from the kernel
-	rm -f include/linux/{kernel,types}.h
-
-	epatch "${FILESDIR}"/${P}-static.patch #437712
-
-	# Only run autotools if user patched something
-	epatch_user && eautoreconf || elibtoolize
-}
-
-src_configure() {
-	sed -i \
-		-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
-		configure || die
-
-	econf \
-		--sbindir="${EPREFIX}/sbin" \
-		--libexecdir="${EPREFIX}/$(get_libdir)" \
-		--enable-devel \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable ipv6)
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	default
-	dodoc INCOMPATIBILITIES iptables/iptables.xslt
-
-	# all the iptables binaries are in /sbin, so might as well
-	# put these small files in with them
-	into /
-	dosbin iptables/iptables-apply
-	dosym iptables-apply /sbin/ip6tables-apply
-	doman iptables/iptables-apply.8
-
-	insinto /usr/include
-	doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
-	insinto /usr/include/iptables
-	doins include/iptables/internal.h
-
-	keepdir /var/lib/iptables
-	newinitd "${FILESDIR}"/${PN}-1.4.13-r1.init iptables
-	newconfd "${FILESDIR}"/${PN}-1.4.13.confd iptables
-	if use ipv6 ; then
-		keepdir /var/lib/ip6tables
-		newinitd "${FILESDIR}"/iptables-1.4.13-r1.init ip6tables
-		newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables
-	fi
-
-	# Move important libs to /lib
-	gen_usr_ldscript -a ip{4,6}tc iptc xtables
-	find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
-}
diff --git a/net-firewall/iptables/iptables-1.4.16.3.ebuild b/net-firewall/iptables/iptables-1.4.16.3.ebuild
deleted file mode 100644
index a5c40e6fda90..000000000000
--- a/net-firewall/iptables/iptables-1.4.16.3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-# Force users doing their own patches to install their own tools
-AUTOTOOLS_AUTO_DEPEND=no
-
-inherit eutils multilib toolchain-funcs autotools
-
-DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
-HOMEPAGE="http://www.iptables.org/"
-SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="ipv6 netlink static-libs"
-
-RDEPEND="
-	netlink? ( net-libs/libnfnetlink )
-"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# use the saner headers from the kernel
-	rm -f include/linux/{kernel,types}.h
-
-	# Only run autotools if user patched something
-	epatch_user && eautoreconf || elibtoolize
-}
-
-src_configure() {
-	sed -i \
-		-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
-		configure || die
-
-	econf \
-		--sbindir="${EPREFIX}/sbin" \
-		--libexecdir="${EPREFIX}/$(get_libdir)" \
-		--enable-devel \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable ipv6)
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	default
-	dodoc INCOMPATIBILITIES iptables/iptables.xslt
-
-	# all the iptables binaries are in /sbin, so might as well
-	# put these small files in with them
-	into /
-	dosbin iptables/iptables-apply
-	dosym iptables-apply /sbin/ip6tables-apply
-	doman iptables/iptables-apply.8
-
-	insinto /usr/include
-	doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
-	insinto /usr/include/iptables
-	doins include/iptables/internal.h
-
-	keepdir /var/lib/iptables
-	newinitd "${FILESDIR}"/${PN}-1.4.13-r1.init iptables
-	newconfd "${FILESDIR}"/${PN}-1.4.13.confd iptables
-	if use ipv6 ; then
-		keepdir /var/lib/ip6tables
-		newinitd "${FILESDIR}"/iptables-1.4.13-r1.init ip6tables
-		newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables
-	fi
-
-	# Move important libs to /lib
-	gen_usr_ldscript -a ip{4,6}tc iptc xtables
-	find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
-}
diff --git a/net-firewall/iptables/iptables-1.4.17.ebuild b/net-firewall/iptables/iptables-1.4.17.ebuild
deleted file mode 100644
index 0bbfa2b99cba..000000000000
--- a/net-firewall/iptables/iptables-1.4.17.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-# Force users doing their own patches to install their own tools
-AUTOTOOLS_AUTO_DEPEND=no
-
-inherit eutils multilib toolchain-funcs autotools
-
-DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
-HOMEPAGE="http://www.iptables.org/"
-SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ipv6 netlink static-libs"
-
-RDEPEND="
-	netlink? ( net-libs/libnfnetlink )
-"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# use the saner headers from the kernel
-	rm -f include/linux/{kernel,types}.h
-	epatch "${FILESDIR}"/${P}-libip6tc.patch #449262
-
-	# Only run autotools if user patched something
-	epatch_user && eautoreconf || elibtoolize
-}
-
-src_configure() {
-	# Some libs use $(AR) rather than libtool to build #444282
-	tc-export AR
-
-	sed -i \
-		-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
-		configure || die
-
-	econf \
-		--sbindir="${EPREFIX}/sbin" \
-		--libexecdir="${EPREFIX}/$(get_libdir)" \
-		--enable-devel \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable ipv6)
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	default
-	dodoc INCOMPATIBILITIES iptables/iptables.xslt
-
-	# all the iptables binaries are in /sbin, so might as well
-	# put these small files in with them
-	into /
-	dosbin iptables/iptables-apply
-	dosym iptables-apply /sbin/ip6tables-apply
-	doman iptables/iptables-apply.8
-
-	insinto /usr/include
-	doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
-	insinto /usr/include/iptables
-	doins include/iptables/internal.h
-
-	keepdir /var/lib/iptables
-	newinitd "${FILESDIR}"/${PN}-1.4.13-r1.init iptables
-	newconfd "${FILESDIR}"/${PN}-1.4.13.confd iptables
-	if use ipv6 ; then
-		keepdir /var/lib/ip6tables
-		newinitd "${FILESDIR}"/iptables-1.4.13-r1.init ip6tables
-		newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables
-	fi
-
-	# Move important libs to /lib
-	gen_usr_ldscript -a ip{4,6}tc iptc xtables
-	find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
-}
diff --git a/net-firewall/iptables/iptables-1.4.18.ebuild b/net-firewall/iptables/iptables-1.4.18.ebuild
deleted file mode 100644
index 6976767da282..000000000000
--- a/net-firewall/iptables/iptables-1.4.18.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-# Force users doing their own patches to install their own tools
-AUTOTOOLS_AUTO_DEPEND=no
-
-inherit eutils multilib toolchain-funcs autotools
-
-DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
-HOMEPAGE="http://www.netfilter.org/projects/iptables/"
-SRC_URI="http://www.netfilter.org/projects/iptables/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ipv6 netlink static-libs"
-
-RDEPEND="
-	netlink? ( net-libs/libnfnetlink )
-"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# use the saner headers from the kernel
-	rm -f include/linux/{kernel,types}.h
-	epatch "${FILESDIR}"/${P}-extensions-link.patch
-	epatch "${FILESDIR}"/${P}-ipv6-linkage.patch
-
-	# Only run autotools if user patched something
-	epatch_user && eautoreconf || elibtoolize
-}
-
-src_configure() {
-	# Some libs use $(AR) rather than libtool to build #444282
-	tc-export AR
-
-	sed -i \
-		-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
-		configure || die
-
-	econf \
-		--sbindir="${EPREFIX}/sbin" \
-		--libexecdir="${EPREFIX}/$(get_libdir)" \
-		--enable-devel \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable ipv6)
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	default
-	dodoc INCOMPATIBILITIES iptables/iptables.xslt
-
-	# all the iptables binaries are in /sbin, so might as well
-	# put these small files in with them
-	into /
-	dosbin iptables/iptables-apply
-	dosym iptables-apply /sbin/ip6tables-apply
-	doman iptables/iptables-apply.8
-
-	insinto /usr/include
-	doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
-	insinto /usr/include/iptables
-	doins include/iptables/internal.h
-
-	keepdir /var/lib/iptables
-	newinitd "${FILESDIR}"/${PN}-1.4.13-r1.init iptables
-	newconfd "${FILESDIR}"/${PN}-1.4.13.confd iptables
-	if use ipv6 ; then
-		keepdir /var/lib/ip6tables
-		newinitd "${FILESDIR}"/iptables-1.4.13-r1.init ip6tables
-		newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables
-	fi
-
-	# Move important libs to /lib
-	gen_usr_ldscript -a ip{4,6}tc iptc xtables
-	find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
-}
diff --git a/net-firewall/iptables/iptables-1.4.19.1.ebuild b/net-firewall/iptables/iptables-1.4.19.1.ebuild
deleted file mode 100644
index 052c7e70e34e..000000000000
--- a/net-firewall/iptables/iptables-1.4.19.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-# Force users doing their own patches to install their own tools
-AUTOTOOLS_AUTO_DEPEND=no
-
-inherit eutils multilib toolchain-funcs autotools
-
-DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
-HOMEPAGE="http://www.netfilter.org/projects/iptables/"
-SRC_URI="http://www.netfilter.org/projects/iptables/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ipv6 netlink static-libs"
-
-RDEPEND="
-	netlink? ( net-libs/libnfnetlink )
-"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# use the saner headers from the kernel
-	rm -f include/linux/{kernel,types}.h
-
-	# Only run autotools if user patched something
-	epatch_user && eautoreconf || elibtoolize
-}
-
-src_configure() {
-	# Some libs use $(AR) rather than libtool to build #444282
-	tc-export AR
-
-	sed -i \
-		-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
-		configure || die
-
-	econf \
-		--sbindir="${EPREFIX}/sbin" \
-		--libexecdir="${EPREFIX}/$(get_libdir)" \
-		--enable-devel \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable ipv6)
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	default
-	dodoc INCOMPATIBILITIES iptables/iptables.xslt
-
-	# all the iptables binaries are in /sbin, so might as well
-	# put these small files in with them
-	into /
-	dosbin iptables/iptables-apply
-	dosym iptables-apply /sbin/ip6tables-apply
-	doman iptables/iptables-apply.8
-
-	insinto /usr/include
-	doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
-	insinto /usr/include/iptables
-	doins include/iptables/internal.h
-
-	keepdir /var/lib/iptables
-	newinitd "${FILESDIR}"/${PN}-1.4.13-r1.init iptables
-	newconfd "${FILESDIR}"/${PN}-1.4.13.confd iptables
-	if use ipv6 ; then
-		keepdir /var/lib/ip6tables
-		newinitd "${FILESDIR}"/iptables-1.4.13-r1.init ip6tables
-		newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables
-	fi
-
-	# Move important libs to /lib
-	gen_usr_ldscript -a ip{4,6}tc iptc xtables
-
-	prune_libtool_files
-}
diff --git a/net-firewall/iptables/iptables-1.4.20.ebuild b/net-firewall/iptables/iptables-1.4.20.ebuild
deleted file mode 100644
index 43dc46ce3714..000000000000
--- a/net-firewall/iptables/iptables-1.4.20.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-# Force users doing their own patches to install their own tools
-AUTOTOOLS_AUTO_DEPEND=no
-
-inherit eutils multilib toolchain-funcs autotools
-
-DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
-HOMEPAGE="http://www.netfilter.org/projects/iptables/"
-SRC_URI="http://www.netfilter.org/projects/iptables/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="ipv6 netlink static-libs"
-
-RDEPEND="
-	netlink? ( net-libs/libnfnetlink )
-"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# use the saner headers from the kernel
-	rm -f include/linux/{kernel,types}.h
-
-	# Only run autotools if user patched something
-	epatch_user && eautoreconf || elibtoolize
-}
-
-src_configure() {
-	# Some libs use $(AR) rather than libtool to build #444282
-	tc-export AR
-
-	sed -i \
-		-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
-		configure || die
-
-	econf \
-		--sbindir="${EPREFIX}/sbin" \
-		--libexecdir="${EPREFIX}/$(get_libdir)" \
-		--enable-devel \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable ipv6)
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	default
-	dodoc INCOMPATIBILITIES iptables/iptables.xslt
-
-	# all the iptables binaries are in /sbin, so might as well
-	# put these small files in with them
-	into /
-	dosbin iptables/iptables-apply
-	dosym iptables-apply /sbin/ip6tables-apply
-	doman iptables/iptables-apply.8
-
-	insinto /usr/include
-	doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
-	insinto /usr/include/iptables
-	doins include/iptables/internal.h
-
-	keepdir /var/lib/iptables
-	newinitd "${FILESDIR}"/${PN}-1.4.13-r1.init iptables
-	newconfd "${FILESDIR}"/${PN}-1.4.13.confd iptables
-	if use ipv6 ; then
-		keepdir /var/lib/ip6tables
-		newinitd "${FILESDIR}"/iptables-1.4.13-r1.init ip6tables
-		newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables
-	fi
-
-	# Move important libs to /lib
-	gen_usr_ldscript -a ip{4,6}tc iptc xtables
-
-	prune_libtool_files
-}
diff --git a/net-firewall/iptables/iptables-1.4.21-r1.ebuild b/net-firewall/iptables/iptables-1.4.21-r1.ebuild
index 95ceda5539c2..056b1b498180 100644
--- a/net-firewall/iptables/iptables-1.4.21-r1.ebuild
+++ b/net-firewall/iptables/iptables-1.4.21-r1.ebuild
@@ -15,10 +15,11 @@ SRC_URI="http://www.netfilter.org/projects/iptables/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="ipv6 netlink static-libs"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+IUSE="conntrack ipv6 netlink static-libs"
 
 RDEPEND="
+	conntrack? ( net-libs/libnetfilter_conntrack )
 	netlink? ( net-libs/libnfnetlink )
 "
 DEPEND="${RDEPEND}
@@ -40,6 +41,7 @@ src_configure() {
 
 	sed -i \
 		-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
+		-e "/nfconntrack=[01]/s:=[01]:=$(usex conntrack 1 0):" \
 		configure || die
 
 	econf \
@@ -85,7 +87,7 @@ src_install() {
 		systemd_dounit "${FILESDIR}"/systemd/ip6tables{,-{re,}store}.service
 	fi
 
-	# Move important libs to /lib
+	# Move important libs to /lib #332175
 	gen_usr_ldscript -a ip{4,6}tc iptc xtables
 
 	prune_libtool_files
diff --git a/net-firewall/iptables/iptables-1.4.21.ebuild b/net-firewall/iptables/iptables-1.4.21-r2.ebuild
similarity index 72%
rename from net-firewall/iptables/iptables-1.4.21.ebuild
rename to net-firewall/iptables/iptables-1.4.21-r2.ebuild
index 56a8118d78b0..e70cf3346f99 100644
--- a/net-firewall/iptables/iptables-1.4.21.ebuild
+++ b/net-firewall/iptables/iptables-1.4.21-r2.ebuild
@@ -7,19 +7,23 @@ EAPI="5"
 # Force users doing their own patches to install their own tools
 AUTOTOOLS_AUTO_DEPEND=no
 
-inherit eutils multilib toolchain-funcs autotools
+inherit eutils multilib systemd toolchain-funcs autotools
 
 DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
 HOMEPAGE="http://www.netfilter.org/projects/iptables/"
 SRC_URI="http://www.netfilter.org/projects/iptables/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-SLOT="0"
+# Subslot tracks libxtables as that's the one other packages generally link
+# against and iptables changes.  Will have to revisit if other sonames change.
+SLOT="0/10"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ipv6 netlink static-libs"
+IUSE="conntrack ipv6 netlink pcap static-libs"
 
 RDEPEND="
+	conntrack? ( net-libs/libnetfilter_conntrack )
 	netlink? ( net-libs/libnfnetlink )
+	pcap? ( net-libs/libpcap )
 "
 DEPEND="${RDEPEND}
 	virtual/os-headers
@@ -40,6 +44,7 @@ src_configure() {
 
 	sed -i \
 		-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
+		-e "/nfconntrack=[01]/s:=[01]:=$(usex conntrack 1 0):" \
 		configure || die
 
 	econf \
@@ -47,6 +52,7 @@ src_configure() {
 		--libexecdir="${EPREFIX}/$(get_libdir)" \
 		--enable-devel \
 		--enable-shared \
+		$(use_enable pcap bpf-compiler) \
 		$(use_enable static-libs static) \
 		$(use_enable ipv6)
 }
@@ -72,15 +78,20 @@ src_install() {
 	doins include/iptables/internal.h
 
 	keepdir /var/lib/iptables
-	newinitd "${FILESDIR}"/${PN}-1.4.13-r1.init iptables
+	newinitd "${FILESDIR}"/${PN}.init iptables
 	newconfd "${FILESDIR}"/${PN}-1.4.13.confd iptables
 	if use ipv6 ; then
 		keepdir /var/lib/ip6tables
-		newinitd "${FILESDIR}"/iptables-1.4.13-r1.init ip6tables
+		newinitd "${FILESDIR}"/iptables.init ip6tables
 		newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables
 	fi
 
-	# Move important libs to /lib
+	systemd_dounit "${FILESDIR}"/systemd/iptables{,-{re,}store}.service
+	if use ipv6 ; then
+		systemd_dounit "${FILESDIR}"/systemd/ip6tables{,-{re,}store}.service
+	fi
+
+	# Move important libs to /lib #332175
 	gen_usr_ldscript -a ip{4,6}tc iptc xtables
 
 	prune_libtool_files
diff --git a/net-firewall/iptables/iptables-1.4.6.ebuild b/net-firewall/iptables/iptables-1.4.6.ebuild
deleted file mode 100644
index c8e790cd6996..000000000000
--- a/net-firewall/iptables/iptables-1.4.6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
-HOMEPAGE="http://www.iptables.org/"
-SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="ipv6"
-
-DEPEND="virtual/os-headers
-	!>=sys-kernel/linux-headers-2.6.33"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd "${S}"
-	epatch_user
-}
-
-src_compile() {
-	econf \
-		--sbindir=/sbin \
-		--libexecdir=/$(get_libdir) \
-		--enable-devel \
-		--enable-libipq \
-		--enable-shared \
-		--enable-static \
-		$(use_enable ipv6)
-	emake V=1 || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-
-	insinto /usr/include
-	doins include/iptables.h $(use ipv6 && echo include/ip6tables.h) || die
-	insinto /usr/include/iptables
-	doins include/iptables/internal.h || die
-
-	keepdir /var/lib/iptables
-	newinitd "${FILESDIR}"/${PN}-1.3.2.init iptables || die
-	newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables || die
-	if use ipv6 ; then
-		keepdir /var/lib/ip6tables
-		newinitd "${FILESDIR}"/iptables-1.3.2.init ip6tables || die
-		newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables || die
-	fi
-}
diff --git a/net-firewall/iptables/metadata.xml b/net-firewall/iptables/metadata.xml
index ed96e3dd4e4e..7979119512b0 100644
--- a/net-firewall/iptables/metadata.xml
+++ b/net-firewall/iptables/metadata.xml
@@ -3,7 +3,9 @@
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
- <flag name='netlink'>Build against libnfnetlink which enables the nfnl_osf util</flag>
+	<flag name='conntrack'>Build against <pkg>net-libs/libnetfilter_conntrack</pkg> when enables the connlabel matcher</flag>
+	<flag name='netlink'>Build against libnfnetlink which enables the nfnl_osf util</flag>
+	<flag name='pcap'>Build against <pkg>net-libs/libpcap</pkg> which enables the nfbpf_compile util</flag>
 </use>
 <longdescription>
   iptables is the userspace command line program used to set up, maintain, and
diff --git a/net-misc/ipv6calc/Manifest b/net-misc/ipv6calc/Manifest
index 932e8d460cbe..d4e371879e3f 100644
--- a/net-misc/ipv6calc/Manifest
+++ b/net-misc/ipv6calc/Manifest
@@ -1,3 +1,3 @@
 DIST ipv6calc-0.94.1.tar.gz 749953 SHA256 3bd73fd92c1d971fadea41b39830975b4a20bbcd26587dfb2835964b33de4040 SHA512 804aaa1a78aacd5c78e0de0642438ab85fe00d6bac36310022653c5f4d6e24c0d4c616133dcc9b0e35a0288f4f477f277376ea9465521702e5b46c098aa0fd16 WHIRLPOOL 481aabebcff8b4591105757c3e583c56f1fd2ae4ebe101cb562691abd0a2aaa55eee6eeaec9145e6caba2c1a5f9a4829af125465ea0836e4000c1a67a13e7691
 DIST ipv6calc-0.97.4.tar.gz 1037582 SHA256 ed2c9e895fdbffa3bee2e46591e0a010eacdefc1bf8eace5fbee9abaa9c3df39 SHA512 133f4e281da8eb1ea13b7c37123ae9f1b88e100553de758ceaa6cc63b0306e4711447bc7a4c171508fc5ce1ed447daec9749c5a75e5288deef0efcdc095bfcde WHIRLPOOL f6a9eb3201045851705f3631cd35e2aead26a167687b4c2064829ae530a803d6e48c57ac5d47996124b8e41706c1cc91850b9b42f225552640b4dbc9ebf17cb8
-DIST ipv6calc-0.98.0.tar.gz 1113488 SHA256 2397f7a77c76cb1c8df73bcd584e532af8bcdb913bfef6eada1184ff28c9200b SHA512 56899764528a38b6c1b628027bb14fb81f3ddb26939cfd73902fb0363a14d3cc7a271fa04d13a9d50b83633b53bc5dd0b7c37784d89a2ab21e34d07f6549c8ec WHIRLPOOL 868f4556a206a14bcb36622230d527db4a23bf11019020bdf7eeb5a8635f28da4047eac558de0fa90efd17d2cc3d5575fde3ac9c427b6e6d71baa03cb06aee33
+DIST ipv6calc-0.99.0.tar.gz 1155118 SHA256 fc7535b900339d75d9862b1c3d359304330f72e94a4cade539dfb714e533fdb5 SHA512 18993711a9203b1d7ecbaa885cb8cb21738b4d25e379593f18b7f833ae7f1675339ec25b39bec7424735a97781a3dc9f4b4453e00873a3526dd3c2ff5ef64965 WHIRLPOOL 7e66df01d4270f88003bf8c44e93b4d4988744b488bd28eacd6e375e3e51c4f1d5717caeebbe2a6810a49342a5df86ac1e2ee0eabfc6bb1f14b289c0d1312dad
diff --git a/net-misc/ipv6calc/ipv6calc-0.98.0.ebuild b/net-misc/ipv6calc/ipv6calc-0.99.0.ebuild
similarity index 100%
rename from net-misc/ipv6calc/ipv6calc-0.98.0.ebuild
rename to net-misc/ipv6calc/ipv6calc-0.99.0.ebuild
diff --git a/net-proxy/bfilter/bfilter-1.1.4-r1.ebuild b/net-proxy/bfilter/bfilter-1.1.4-r1.ebuild
index 832e92fdaa2a..773716a1ee98 100644
--- a/net-proxy/bfilter/bfilter-1.1.4-r1.ebuild
+++ b/net-proxy/bfilter/bfilter-1.1.4-r1.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="amd64 x86"
 IUSE="X debug"
 
 RDEPEND="sys-libs/zlib
-	dev-libs/ace
+	<dev-libs/ace-5.8.3
 	dev-libs/libsigc++:2
 	X? ( dev-cpp/gtkmm:2.4 x11-libs/libX11 )
 	dev-libs/boost"
diff --git a/net-proxy/bfilter/bfilter-1.1.4-r2.ebuild b/net-proxy/bfilter/bfilter-1.1.4-r2.ebuild
new file mode 100644
index 000000000000..aabb5d81c34a
--- /dev/null
+++ b/net-proxy/bfilter/bfilter-1.1.4-r2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils user
+
+DESCRIPTION="An ad-filtering web proxy featuring an effective heuristic ad-detection algorithm"
+HOMEPAGE="http://bfilter.sourceforge.net/"
+SRC_URI="mirror://sourceforge/bfilter/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X debug"
+
+RDEPEND="sys-libs/zlib
+	dev-libs/ace:=
+	dev-libs/libsigc++:2
+	X? ( dev-cpp/gtkmm:2.4 x11-libs/libX11 )
+	dev-libs/boost:="
+
+DEPEND="${RDEPEND}
+	dev-util/scons
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog )
+
+PATCHES=(
+	"${FILESDIR}/${P}-glib-2.32.patch"
+	"${FILESDIR}/${P}-external-boost.patch"
+	"${FILESDIR}/${P}-gtkmm-X11-underlinking.patch"
+)
+
+RESTRICT="test" # boost's test API has changed
+
+src_prepare() {
+	epatch ${PATCHES[@]}
+
+	# Some includes are missing and this breaks updates of ACE
+	sed -i \
+		-e "/#include <ace\/Synch.h>/a#include <ace\/Condition_T.h>\n#include <ace\/Guard_T.cpp>" \
+		libjs/nspr_impl/private.h \
+		main/*.h \
+		main/cache/*.h || die
+
+	mv configure.in configure.ac || die
+	rm -rf boost
+
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_with X gui) \
+		--without-builtin-boost
+}
+
+src_install() {
+	default
+
+	insinto /etc/bfilter
+	doins "${FILESDIR}/forwarding.xml"
+
+	dodoc "${FILESDIR}/forwarding-proxy.xml"
+	dohtml doc/*
+
+	newinitd "${FILESDIR}/bfilter.init" bfilter
+	newconfd "${FILESDIR}/bfilter.conf" bfilter
+}
+
+pkg_preinst() {
+	enewgroup bfilter
+	enewuser bfilter -1 -1 -1 bfilter
+}
+
+pkg_postinst() {
+	elog "The documentation is available at"
+	elog "   http://bfilter.sourceforge.net/documentation.php"
+	elog "For forwarding bfilter service traffic through a proxy,"
+	elog "see forwarding-proxy.xml example installed in the doc directory."
+}
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 7dbd486d216f..d9725b8f9145 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,9 +6,9 @@
 # New entries go on top.
 
 # Heather Cynede <cynede@gentoo.org> (13 Aug 2015)
-# mono 3.12.1 currently fails with doc most likely because of xattr
+# mono currently fails with doc most likely because of xattr
 # Gentoo bug: 554484
-~dev-lang/mono-3.12.1 doc
+>=dev-lang/mono-3.12.1 doc
 
 # Michael Palimaka <kensington@gentoo.org> (12 Aug 2015)
 # Requires unreleased dependency
@@ -226,6 +226,9 @@ dev-libs/efl pixman
 
 # Jeroen Roovers <jer@gentoo.org> (20 Jun 2014)
 # net-libs/adns is going away (bug #513982)
+app-admin/apachetop adns
+dev-libs/liboop adns
+net-analyzer/nepenthes adns
 net-analyzer/wireshark libadns
 
 # Zac Medico <zmedico@gentoo.org> (06 Jun 2014)
diff --git a/profiles/package.mask b/profiles/package.mask
index c7bc1b3bedd9..c740d062cb90 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,6 +30,16 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (14 Aug 2015)
+# net-libs/adns never had any Gentoo maintainer. Mostly dead upstream
+# since 2006 (short activity in 2014). Does not respect nsswitch.conf or
+# /etc/hosts. The current version does not support IPv6. net-dns/c-ares
+# is a suggested replacement. Removal in 30 days.
+# net-libs/adns: bug #513238
+# dev-python/adns-python: bug #513994
+dev-python/adns-python
+net-libs/adns
+
 # Patrice Clement <monsieurp@gentoo.org> (14 Aug 2015)
 # Unreachable HOMEPAGE (dead). Very very very old package: 
 # last release came out in 2001.
@@ -580,11 +590,6 @@ www-client/google-chrome:unstable
 # This is not for your production kit quite yet.
 =net-misc/asterisk-12*
 
-# Tom Wijsman <TomWij@gentoo.org> (09 Jan 2014)
-# Monolithic dev-dotnet/{gnome,gtk}-sharp introduction mask, see bug #382491.
->=dev-dotnet/gnome-sharp-2.24.2-r1
->=dev-dotnet/gtk-sharp-2.12.21
-
 # Michał Górny <mgorny@gentoo.org> (15 Dec 2013)
 # Masked for testing due to almost complete redesign. It is now
 # completely split and no longer has an integrated GUI. Currently,
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index ba4e4cfb0294..d98ef43c06bc 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -488,6 +488,7 @@ app-editors/nano:justify - Enable justify/unjustify functions for text formattin
 app-editors/nano:magic - Add magic file support (sys-apps/file) to automatically detect appropriate syntax highlighting
 app-editors/nano:minimal - Disable all fancy features, including ones that otherwise have a dedicated USE flag (such as spelling).
 app-editors/ne:tinfo - Link against libtinfo from sys-libs/ncurses
+app-editors/neovim:nvimpager - Install nvimpager symlink to less.sh macro
 app-editors/tea:aspell - Enable spellchecking using app-text/aspell
 app-editors/tea:hunspell - Enable spellchecking using app-text/hunspell
 app-editors/vim:X - Link console vim against X11 libraries to enable title and clipboard features in xterm
@@ -5059,7 +5060,9 @@ net-firewall/ipsec-tools:idea - Enable support for the IDEA algorithm
 net-firewall/ipsec-tools:nat - Enable NAT-Traversal
 net-firewall/ipsec-tools:rc5 - Enable support for the patented RC5 algorithm
 net-firewall/ipsec-tools:stats - Enable statistics reporting
+net-firewall/iptables:conntrack - Build against net-libs/libnetfilter_conntrack when enables the connlabel matcher
 net-firewall/iptables:netlink - Build against libnfnetlink which enables the nfnl_osf util
+net-firewall/iptables:pcap - Build against net-libs/libpcap which enables the nfbpf_compile util
 net-firewall/nufw:nfconntrack - Use netfilter_conntrack
 net-firewall/nufw:nfqueue - Use NFQUEUE instead of QUEUE
 net-firewall/nufw:pam_nuauth - Add support for pam nufw from PAM
@@ -7769,6 +7772,7 @@ www-servers/uwsgi:yaml - Support yaml as a configuration file format.
 www-servers/uwsgi:zeromq - Enable logging and deployment via ZeroMQ.
 www-servers/varnish:jemalloc - Use dev-libs/jemalloc for allocations
 www-servers/varnish:tools - Build additional tools: varnishhist, varnishstat, varnishtop, varnishsizes
+www-servers/xsp:developer - creates .mdb files for either Release and Debug
 x11-apps/ardesia:cwiid - cwiid support: collection of Linux tools written in C for interfacing to the Nintendo Wiimote.
 x11-apps/intel-gpu-tools:python - Install python based register dumper utilities
 x11-apps/intel-gpu-tools:test-programs - Install test programs for DRM driver development
diff --git a/sys-apps/rng-tools/files/rng-tools-5-man-fill-watermark.patch b/sys-apps/rng-tools/files/rng-tools-5-man-fill-watermark.patch
new file mode 100644
index 000000000000..4cedf8fc97d3
--- /dev/null
+++ b/sys-apps/rng-tools/files/rng-tools-5-man-fill-watermark.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/555094
+
+patch by Gokturk Yuksek <gokturk@binghamton.edu>
+
+--- rngd.8.in
++++ rngd.8.in
+@@ -66,7 +66,9 @@
+ .TP
+ \fB\-W\fI n\fR, \fB\-\-fill\-watermark=\fInnn\fR
+ Once we start doing it, feed entropy to \fIrandom-device\fR until at least
+-\fIfill-watermark\fR bits of entropy are available in its entropy pool (default: 2048).
++\fIfill-watermark\fR bits of entropy are available in its entropy pool.
++By default, this value is set to 75% of the entropy pool size or 2048 bits
++if the entropy pool size couldn't be determined.
+ Setting this too high will cause \fIrngd\fR to dominate the contents of the
+ entropy pool.  Low values will hurt system performance during entropy 
+ starves.  Do not set \fIfill-watermark\fR above the size of the
diff --git a/sys-apps/rng-tools/files/rng-tools-5-man-rng-device.patch b/sys-apps/rng-tools/files/rng-tools-5-man-rng-device.patch
new file mode 100644
index 000000000000..fd6b97eff326
--- /dev/null
+++ b/sys-apps/rng-tools/files/rng-tools-5-man-rng-device.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/555106
+
+patch by Gokturk Yuksek <gokturk@binghamton.edu>
+
+--- rngd.8.in
++++ rngd.8.in
+@@ -59,7 +59,7 @@
+ .TP
+ \fB\-r\fI file\fR, \fB\-\-rng-device=\fIfile\fR
+ Kernel device used for random number input
+-(default: /dev/hwrandom)
++(default: /dev/hwrng)
+ .TP
+ \fB\-s\fI nnn\fR, \fB\-\-random-step=\fInnn\fR
+ Number of bytes written to random-device at a time (default: 64)
diff --git a/sys-apps/rng-tools/rng-tools-5-r1.ebuild b/sys-apps/rng-tools/rng-tools-5-r1.ebuild
new file mode 100644
index 000000000000..5b7caf991103
--- /dev/null
+++ b/sys-apps/rng-tools/rng-tools-5-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools systemd toolchain-funcs
+
+DESCRIPTION="Daemon to use hardware random number generators"
+HOMEPAGE="http://gkernel.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gkernel/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ppc ~x86"
+IUSE="selinux"
+
+DEPEND="dev-libs/libgcrypt:0
+	dev-libs/libgpg-error"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-rngd )"
+
+src_prepare() {
+	echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am
+	epatch "${FILESDIR}"/test-for-argp.patch
+	epatch "${FILESDIR}"/${P}-fix-textrels-on-PIC-x86.patch #469962
+	epatch "${FILESDIR}"/${P}-man-fill-watermark.patch #555094
+	epatch "${FILESDIR}"/${P}-man-rng-device.patch #555106
+	eautoreconf
+
+	sed -i '/^AR /d' Makefile.in || die
+	tc-export AR
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}"/rngd-initd-4.1 rngd
+	newconfd "${FILESDIR}"/rngd-confd-4.1 rngd
+	systemd_dounit "${FILESDIR}"/rngd.service
+}
diff --git a/sys-apps/rsbac-admin/Manifest b/sys-apps/rsbac-admin/Manifest
index 8a83d9cef250..7aa2a64fdefc 100644
--- a/sys-apps/rsbac-admin/Manifest
+++ b/sys-apps/rsbac-admin/Manifest
@@ -1,3 +1 @@
-DIST rsbac-admin-1.4.6.tar.bz2 325844 SHA256 5edde3c5f84a3ebca8ff2c1164665dd4386d8cae1e215cd0784b613867ef03c1
-DIST rsbac-admin-1.4.7.tar.xz 267640 SHA256 d9fff603e6d4bd9b70cca3cae626aa1559863a22a8cacf8c1f7a38d91f8f088a SHA512 7ccdd1e9a87ebf5c0739975d58bcc60462d7c59c2b59bd5b0c9cd31b746e7cb90e2890245882f65b202aa61660b36507c6d895632ca12ecf4d626d560fed8901 WHIRLPOOL faad1a9900ba5e3926bf2a8c398cf03a4dc366a78051f800d8116fdd00a20381b9da48896b6cb808c492cd15019fbe0ede701ca92796cdf9ac907b85274f7a10
-DIST rsbac-admin-1.4.8.tar.xz 261512 SHA256 1e34b54702a4c8dfb2fc5d99a034dd7d3d9968e707dc51ac88c773cf9e0de5ed SHA512 4fe147d81f4dfe7a364557d07707ac5e218fbfc5658f2f1b14462edee377f10e778edb4535988210740fc68951cc05ac17bc3949fbae6803f3c25770b4be462e WHIRLPOOL 5caf07862d1dec309ab6978934b1fb007fe1bfaf711b6bf15df3f680103cb392b40a95c28c805ab552d07ccac67d103eea13894057d879b506e913b57bbe3a2f
+DIST rsbac-admin-1.4.9.tar.xz 260740 SHA256 df35b9930b2b42a038cf3e541b9c4aa393bd4c9d6493777f9cc661688c9960e9 SHA512 7978d80f0b88849f279ce7298a23f41420c889059171725962cc61d66ed99467556054dbcba060c196540dc9d2d04fe43947dfb1057f17457382600f20f900d5 WHIRLPOOL bba541f9051571f30ed0eff7f6bd5c7cd3e77747c23fd26fdf64ec6bf37630104c498db8ab65b817837e57eef28d1ae36066ba8ee82220cd9a93f0a1aea7cb2e
diff --git a/sys-apps/rsbac-admin/rsbac-admin-1.4.6-r1.ebuild b/sys-apps/rsbac-admin/rsbac-admin-1.4.6-r1.ebuild
deleted file mode 100644
index 8f5ce2dccb16..000000000000
--- a/sys-apps/rsbac-admin/rsbac-admin-1.4.6-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="Rule Set Based Access Control (RSBAC) Admin Tools"
-HOMEPAGE="http://www.rsbac.org/"
-SRC_URI="http://www.rsbac.org/dl.php?file=code/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# using rklogd is deprecated but offer the option since it is fully removed
-# from source
-IUSE="pam rklogd"
-
-DEPEND="
-	dev-util/dialog
-	pam? ( sys-libs/pam )
-	sys-apps/baselayout
-	>=sys-libs/ncurses-5.2"
-
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	local rsbacmakeargs="libs tools"
-	use rklogd && rsbacmakeargs="${rsbacmakeargs} rklogd"
-	use pam && rsbacmakeargs="${rsbacmakeargs} pam nss"
-	emake PREFIX=/usr LIBDIR=/$(get_libdir) ${rsbacmakeargs}
-}
-
-src_install() {
-	local rsbacinstallargs="headers-install libs-install tools-install"
-	use rklogd && rsbacinstallargs="${rsbacinstallargs} rklogd-install"
-	use pam && rsbacinstallargs="${rsbacinstallargs} pam-install nss-install"
-	emake PREFIX=/usr LIBDIR=/$(get_libdir) DESTDIR="${D}" ${rsbacinstallargs}
-
-	use rklogd && doinitd "${FILESDIR}"/rklogd
-
-	insinto /etc
-	doins "${FILESDIR}"/rsbac.conf
-
-	#FHS compliance
-	dodir /usr/$(get_libdir)
-	mv "${D}"/$(get_libdir)/librsbac.{,l}a "${D}"/usr/$(get_libdir)
-	mv "${D}"/$(get_libdir)/libnss_rsbac.{,l}a "${D}"/usr/$(get_libdir)
-	gen_usr_ldscript librsbac.so
-	gen_usr_ldscript libnss_rsbac.so
-}
-
-pkg_postinst() {
-	einfo "********************************************************************************"
-	einfo "You have to add a security user to your system if you have not already done so."
-	einfo "The name could be 'secoff' or 'security' and, if you did not change the default"
-	einfo "uid in the RSBAC kernel configuration, then the following will work:"
-	einfo
-	einfo "    groupadd -g 400 security"
-	einfo "    useradd -g 400 -u 400 security"
-	einfo
-	einfo "We suggest you run a separate copy of syslog-ng (for example) to log RSBAC"
-	einfo "messages as user 'audit' (uid 404) instead of using the deprecated rklogd."
-	einfo "See"
-	einfo
-	einfo "    http://www.rsbac.org/documentation/administration_examples/syslog-ng"
-	einfo
-	einfo "for more information."
-	einfo "********************************************************************************"
-}
diff --git a/sys-apps/rsbac-admin/rsbac-admin-1.4.6.ebuild b/sys-apps/rsbac-admin/rsbac-admin-1.4.6.ebuild
deleted file mode 100644
index ec800f62cd6a..000000000000
--- a/sys-apps/rsbac-admin/rsbac-admin-1.4.6.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit user multilib toolchain-funcs
-
-DESCRIPTION="Rule Set Based Access Control (RSBAC) Admin Tools"
-HOMEPAGE="http://www.rsbac.org/"
-SRC_URI="http://www.rsbac.org/dl.php?file=code/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pam"
-
-DEPEND="
-	dev-util/dialog
-	pam? ( sys-libs/pam )
-	sys-apps/baselayout"
-
-RDEPEND="
-	${DEPEND}
-	>=sys-libs/ncurses-5.2"
-
-src_compile() {
-	local rsbacmakeargs="libs tools"
-	use pam && rsbacmakeargs="${makeargs} pam nss"
-	emake PREFIX=/usr LIBDIR=/$(get_libdir) ${rsbacmakeargs}
-}
-
-src_install() {
-	local rsbacinstallargs="headers-install libs-install tools-install"
-	use pam && rsbacinstallargs="${rsbacinstallargs} pam-install nss-install"
-	emake PREFIX=/usr LIBDIR=/$(get_libdir) DESTDIR="${D}" ${rsbacinstallargs}
-
-	insinto /etc
-	doins "${FILESDIR}"/rsbac.conf
-	doins "${FILESDIR}"/nsswitch.conf
-
-	dodir /secoff
-	keepdir /secoff
-
-	dodir /var/log/rsbac
-	keepdir /var/log/rsbac
-
-	#FHS compliance
-	dodir /usr/$(get_libdir)
-	mv "${D}"/$(get_libdir)/librsbac.{,l}a "${D}"/usr/$(get_libdir)
-	mv "${D}"/$(get_libdir)/libnss_rsbac.{,l}a "${D}"/usr/$(get_libdir)
-	gen_usr_ldscript librsbac.so
-	gen_usr_ldscript libnss_rsbac.so
-}
-
-pkg_postinst() {
-	enewgroup secoff 400
-	enewuser secoff 400 /bin/bash /secoff secoff
-	enewgroup audit 404
-	enewuser audit 404 -1 /dev/null audit
-
-	chmod 700 /secoff /var/log/rsbac
-	chown secoff:secoff -R /secoff
-
-	einfo "It is suggested to run (for example) a separate copy of syslog-ng to"
-	einfo "log RSBAC messages, as user audit (uid 404) instead of using the deprecated"
-	einfo "rklogd. See http://www.rsbac.org/documentation/administration_examples/syslog-ng"
-	einfo "for more information."
-}
diff --git a/sys-apps/rsbac-admin/rsbac-admin-1.4.7.ebuild b/sys-apps/rsbac-admin/rsbac-admin-1.4.7.ebuild
deleted file mode 100644
index 90ceb6fefcab..000000000000
--- a/sys-apps/rsbac-admin/rsbac-admin-1.4.7.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="Rule Set Based Access Control (RSBAC) Admin Tools"
-HOMEPAGE="http://www.rsbac.org/"
-SRC_URI="http://download.rsbac.org/code/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# using rklogd is deprecated but offer the option since it is fully removed
-# from source
-IUSE="pam rklogd"
-
-DEPEND="
-	dev-util/dialog
-	pam? ( sys-libs/pam )
-	sys-apps/baselayout
-	>=sys-libs/ncurses-5.2"
-
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	local rsbacmakeargs="libs tools"
-	use rklogd && rsbacmakeargs="${rsbacmakeargs} rklogd"
-	use pam && rsbacmakeargs="${rsbacmakeargs} pam nss"
-	emake PREFIX=/usr LIBDIR=/$(get_libdir) ${rsbacmakeargs}
-}
-
-src_install() {
-	local rsbacinstallargs="headers-install libs-install tools-install"
-	use rklogd && rsbacinstallargs="${rsbacinstallargs} rklogd-install"
-	use pam && rsbacinstallargs="${rsbacinstallargs} pam-install nss-install"
-	emake PREFIX=/usr LIBDIR=/$(get_libdir) DESTDIR="${D}" ${rsbacinstallargs}
-
-	use rklogd && doinitd "${FILESDIR}"/rklogd
-
-	insinto /etc
-	doins "${FILESDIR}"/rsbac.conf
-
-	#FHS compliance
-	dodir /usr/$(get_libdir)
-	mv "${D}"/$(get_libdir)/librsbac.{,l}a "${D}"/usr/$(get_libdir)
-	mv "${D}"/$(get_libdir)/libnss_rsbac.{,l}a "${D}"/usr/$(get_libdir)
-	gen_usr_ldscript librsbac.so
-	gen_usr_ldscript libnss_rsbac.so
-}
-
-pkg_postinst() {
-	einfo "********************************************************************************"
-	einfo "You have to add a security user to your system if you have not already done so."
-	einfo "The name could be 'secoff' or 'security' and, if you did not change the default"
-	einfo "uid in the RSBAC kernel configuration, then the following will work:"
-	einfo
-	einfo "    groupadd -g 400 security"
-	einfo "    useradd -g 400 -u 400 security"
-	einfo
-	einfo "We suggest you run a separate copy of syslog-ng (for example) to log RSBAC"
-	einfo "messages as user 'audit' (uid 404) instead of using the deprecated rklogd."
-	einfo "See"
-	einfo
-	einfo "    http://www.rsbac.org/documentation/administration_examples/syslog-ng"
-	einfo
-	einfo "for more information."
-	einfo "********************************************************************************"
-}
diff --git a/sys-apps/rsbac-admin/rsbac-admin-1.4.8.ebuild b/sys-apps/rsbac-admin/rsbac-admin-1.4.9.ebuild
similarity index 99%
rename from sys-apps/rsbac-admin/rsbac-admin-1.4.8.ebuild
rename to sys-apps/rsbac-admin/rsbac-admin-1.4.9.ebuild
index 8c985209f283..b4a212ac783b 100644
--- a/sys-apps/rsbac-admin/rsbac-admin-1.4.8.ebuild
+++ b/sys-apps/rsbac-admin/rsbac-admin-1.4.9.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=5
 
 inherit multilib toolchain-funcs
 
diff --git a/sys-kernel/rsbac-sources/Manifest b/sys-kernel/rsbac-sources/Manifest
index aaefbd6c5bf3..bcf3b05ba8ea 100644
--- a/sys-kernel/rsbac-sources/Manifest
+++ b/sys-kernel/rsbac-sources/Manifest
@@ -1,4 +1,4 @@
-DIST genpatches-3.10-13.base.tar.xz 220108 SHA256 cc2c91b479e7dd78e5a793e220b4f4d067d8bb2cd89e84c35f82612eba2a62c2 SHA512 01a1b73bcf6ee1add8a307dd23e39cd0f8ef4798c6ccea42e676ac2dc8f8c2cb3e0c3802d80b5800c9c607f318aa63feaef90ae95375d29e664ce8d9c02ea671 WHIRLPOOL c938d8aa11eb2e701c6bff69301253e896c6c65f5f6c5da3cd1737e376fb2ef50aac5b80e1d0e4110298e17ab4c06db3e395e1e882b189a141412e41d83f3f01
-DIST genpatches-3.10-13.extras.tar.xz 17732 SHA256 aaec50b87931d58b16a0ca1a920e59baee9256fc2465a5ee9a3b9e7dde6d1a81 SHA512 9e30d1ff47600c85d655ffb6f4caefec5140550b517b6c97a5c668e93bc8c0dbd13dc12952f64c8070d3636860bcd41b7d9b428815a5cfed37a1228c646f3785 WHIRLPOOL dd80d37ca76da035dfdc457cd40f5bfb2b8398d604bec8ed0be27619a33ef68af5a02c93d604b6c7b322aab5aec9d9b11b0b2c628c959c562220082b18c65b72
-DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053
-DIST patch-linux-3.10.7-rsbac-1.4.7.diff.xz 382900 SHA256 57b283ac21ed14b61d4ccc672d3317f10abc4f1ac8e80ee3f6269d00e51ea1d2 SHA512 37ff26f5cef201c46cd8b585cf2c8cc7a1f4f3bc7d8eb7e112bdeecf10483325517921323917f76d63209b43707dde514e7a263f85328fd2ead0a1af7fd3e746 WHIRLPOOL 7038853c1503d521df51acc64ea295e683a12e970db6444ec765d3578ab881da7a9188aa1c54811065260ca230b8432d0aac7cac2621e838fe13ed3a355e1a96
+DIST genpatches-3.14-33.base.tar.xz 724864 SHA256 ed5310c921e513bd60a38a360bbd9f1e219a315f55bff03b58a586b49ee02201 SHA512 72c2618fa57b64c06d2373f7e94465fb2ef5e67706b947855f508c1e3ac491d7fe27643fd099993bb84a27f1734e45fdf49c7d9d1fc6d07fce4ccf56a3e06f8c WHIRLPOOL 1b06ca8a83d0780523cddc8dd7b5ff3f4a9490a6656e87ebfe18fc767f2e2e52fb1e117ade976063fb99dbbea42310526c079ad5baed35570ee082fc5ce9a116
+DIST genpatches-3.14-33.extras.tar.xz 18264 SHA256 1b25f873b53807751386c1c72a45b2dc7d7c67ab1acb853dfdbd8af5cb89d75c SHA512 2036b13f12e1d6f896c185ad133c9f431245db21b344b98f2d6eeffb2c2fc19a111a440ad49556e905aa04a739f8c7aed0e95aeadea2f0bb0fd8e93d0f9c6edf WHIRLPOOL 7aedd095c10f3b3b1c7cc82e917726eac3abb962e2efe6978244e54091720bc59bb3cc3874104d838c9fec856f62d126f24a3853f4871abd06c33b3579802192
+DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41
+DIST patch-linux-3.14.28-rsbac-1.4.9.diff.xz 362768 SHA256 62259a39a39cb8c326a4a1d728340aa1845e379bd09e6c361f7a64915f30dfd0 SHA512 24f8a2f3ea5370f632669a3dea9799f3aaadddd15af1fc74af8380479859e6ad5c1fd704eade6fe60ebdce4f173fe7318ea4071eb8cf527d76083ece05b94f9d WHIRLPOOL 39752bb9eb148d38a552df9f78988df130a8ce16d81f589f9710e6e8fa5aef55e843347ab4d33b5eb29a317015df90d8e3b2a51f4d89f12024cc31b8d1bdc7a3
diff --git a/sys-kernel/rsbac-sources/rsbac-sources-3.10.7.ebuild b/sys-kernel/rsbac-sources/rsbac-sources-3.14.28.ebuild
similarity index 93%
rename from sys-kernel/rsbac-sources/rsbac-sources-3.10.7.ebuild
rename to sys-kernel/rsbac-sources/rsbac-sources-3.14.28.ebuild
index 11e93b604098..298cb96a47f0 100644
--- a/sys-kernel/rsbac-sources/rsbac-sources-3.10.7.ebuild
+++ b/sys-kernel/rsbac-sources/rsbac-sources-3.14.28.ebuild
@@ -2,16 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=5
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="13"
+K_GENPATCHES_VER="33"
 
 inherit kernel-2
 detect_version
 
-RSBC_VER="1.4.7"
+RSBC_VER="1.4.9"
 RSBC_PATCH="patch-linux-${PV}-rsbac-${RSBC_VER}.diff.xz"
 
 HGPV_URI="http://download.rsbac.org/patches/${RSBC_VER}/${RSBC_PATCH}"
diff --git a/www-servers/xsp/Manifest b/www-servers/xsp/Manifest
new file mode 100644
index 000000000000..43adebae8bab
--- /dev/null
+++ b/www-servers/xsp/Manifest
@@ -0,0 +1 @@
+DIST xsp-2014.12.zip 632555 SHA256 1d115e3fe0bbcb3957be20e670e086ebddff3acaa5f641a9c143ea46d12e055c SHA512 a9d298079cfae4bacac1575f04e58c3106f532c1f283cc243a8a6560561c0a6b535320d1d3e925c7383bd1f7510f31f115d8e85506e31623c175d7f3f606ab91 WHIRLPOOL a5e06f72f51717682d80f6ac6554320db72a05d6d6c40439196073d118706607f99bf810d82e8cc68cf9e54bd0f7d176cc882fa74babb8d78308cbe7c4d9d8cc
diff --git a/dev-dotnet/xsp/files/2.2/mod-mono-server-r1.initd b/www-servers/xsp/files/2.2/mod-mono-server-r1.initd
similarity index 93%
rename from dev-dotnet/xsp/files/2.2/mod-mono-server-r1.initd
rename to www-servers/xsp/files/2.2/mod-mono-server-r1.initd
index 6fda67726d82..6ce6a60bcec2 100644
--- a/dev-dotnet/xsp/files/2.2/mod-mono-server-r1.initd
+++ b/www-servers/xsp/files/2.2/mod-mono-server-r1.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+# $Id: mod-mono-server-r1.initd,v 1.1 2012/01/22 12:54:29 pacho Exp $
 
 depend() {
 	use net
@@ -58,7 +58,7 @@ start() {
 		return 1
 	fi
 
-	MONO_SHARED_DIR=/tmp ; export MONO_SHARED_DIR
+	export MONO_SHARED_DIR=/tmp
 
 	ebegin "Starting mod-mono-server"
 
diff --git a/dev-dotnet/xsp/files/2.2/mod-mono-server.confd b/www-servers/xsp/files/2.2/mod-mono-server.confd
similarity index 94%
rename from dev-dotnet/xsp/files/2.2/mod-mono-server.confd
rename to www-servers/xsp/files/2.2/mod-mono-server.confd
index dbc5c4cf20c2..7cefdbea49b4 100644
--- a/dev-dotnet/xsp/files/2.2/mod-mono-server.confd
+++ b/www-servers/xsp/files/2.2/mod-mono-server.confd
@@ -1,5 +1,5 @@
 # Config file for /etc/init.d/mod-mono-server
-# $Id$
+# $Id: mod-mono-server.confd,v 1.1 2009/01/18 17:44:04 loki_val Exp $
 
 # Configuration directives for mod-mono-server.exe. For more information on
 # these variables, see the man page for xsp(1).
diff --git a/www-servers/xsp/files/2.2/mod-mono-server.initd b/www-servers/xsp/files/2.2/mod-mono-server.initd
new file mode 100644
index 000000000000..49119e5af497
--- /dev/null
+++ b/www-servers/xsp/files/2.2/mod-mono-server.initd
@@ -0,0 +1,81 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id: mod-mono-server.initd,v 1.1 2009/01/18 17:44:04 loki_val Exp $
+
+depend() {
+	use net
+	after dotnet
+}
+
+start() {
+	[ -z "$MonoServerRootDir" ] && \
+	MonoServerRootDir="/usr/lib/xsp/test"
+	[ -z "$MonoApplications" ] && \
+	MonoApplications="/mono:/usr/lib/xsp/test,/:."
+	[ -z "$UnixSocketFileName" ] && \
+	UnixSocketFileName="/tmp/mod_mono_server"
+	[ -z "$MonoServerAddress" ] && \
+	MonoServerAddress=127.0.0.1
+	[ -z "$MonoServerPort" ] && \
+	MonoServerPort=8080
+	[ -z "$MonoServerVersion" ] && \
+	MonoServerVersion=1
+
+	MONO_SERVER_OPTS="--root ${MonoServerRootDir} \
+--applications ${MonoApplications} --nonstop"
+
+	[ -n "$MonoApplicationsConfigDir" ] && \
+	MONO_SERVER_OPTS="${MONO_SERVER_OPTS} \
+--appconfigdir ${MonoApplicationsConfigDir}"
+
+	case "$MonoServerChannel" in
+	"tcp" )
+		MONO_SERVER_OPTS="${MONO_SERVER_OPTS} \
+--address ${MonoServerAddress} --port ${MonoServerPort}"
+		;;
+	
+	"unix" )
+		[ -f "$UnixSocketFileName" ] && rm -f $UnixSocketFileName
+		MONO_SERVER_OPTS="${MONO_SERVER_OPTS} \
+--filename ${UnixSocketFileName}"
+		;;
+
+	* )
+		eerror "Please set a valid value for MonoServerChannel"
+		return 1
+		;;
+	esac
+
+	if [ ${MonoServerVersion} -eq 1 ]; then
+		modmonoserverpath=1.0/mod-mono-server.exe
+	elif [ ${MonoServerVersion} -eq 2 ]; then
+		modmonoserverpath=2.0/mod-mono-server2.exe
+	else
+		eerror "MonoServerVersion was not properly set. Check your /etc/conf.d/xsp"
+		return 1
+	fi
+
+	export MONO_SHARED_DIR=/tmp
+
+	ebegin "Starting mod-mono-server"
+
+	start-stop-daemon --quiet --start \
+		--background \
+		--make-pidfile \
+		--pidfile /var/run/aspnet/mod-mono-server.pid \
+		--chuid aspnet \
+		--exec /usr/bin/mono /usr/lib/mono/${modmonoserverpath} \
+		-- $MONO_SERVER_OPTS
+
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping mod-mono-server"
+
+	start-stop-daemon -o --quiet --stop \
+		--pidfile /var/run/aspnet/mod-mono-server.pid
+
+	eend $?
+}
diff --git a/dev-dotnet/xsp/files/2.2/xsp.confd b/www-servers/xsp/files/2.2/xsp.confd
similarity index 84%
rename from dev-dotnet/xsp/files/2.2/xsp.confd
rename to www-servers/xsp/files/2.2/xsp.confd
index 1004e7428fa8..45a79a52bb63 100644
--- a/dev-dotnet/xsp/files/2.2/xsp.confd
+++ b/www-servers/xsp/files/2.2/xsp.confd
@@ -1,5 +1,5 @@
 # Config file for /etc/init.d/xsp
-# $Id$
+# $Id: xsp.confd,v 1.1 2009/01/18 17:44:04 loki_val Exp $
 
 # This is the document root; trailing slash is not necessary
 MonoServerRoot=/usr/lib/xsp/test
diff --git a/dev-dotnet/xsp/files/2.2/xsp.initd b/www-servers/xsp/files/2.2/xsp.initd
similarity index 88%
rename from dev-dotnet/xsp/files/2.2/xsp.initd
rename to www-servers/xsp/files/2.2/xsp.initd
index 5b609580ebfa..0432bca7d36e 100644
--- a/dev-dotnet/xsp/files/2.2/xsp.initd
+++ b/www-servers/xsp/files/2.2/xsp.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+# $Id: xsp.initd,v 1.1 2009/01/18 17:44:04 loki_val Exp $
 
 depend() {
 	need net
diff --git a/www-servers/xsp/files/aclocal-fix.patch b/www-servers/xsp/files/aclocal-fix.patch
new file mode 100644
index 000000000000..49a00050fe8d
--- /dev/null
+++ b/www-servers/xsp/files/aclocal-fix.patch
@@ -0,0 +1,13 @@
+--- Makefile_old.am	2013-07-30 09:11:50.033962122 +0400
++++ Makefile.am	2013-07-30 09:12:20.843574793 +0400
+@@ -1,10 +1,2 @@
+ SUBDIRS=build man src test tools scripts packaging lib
+ ACLOCAL_AMFLAGS += -I build/m4
+-
+-if UNITTESTS
+-SUBDIRS += unittests
+-endif
+-
+-if BUILD_DOCS
+-SUBDIRS += docs
+-endif
diff --git a/www-servers/xsp/files/systemd/mono-xsp4.service b/www-servers/xsp/files/systemd/mono-xsp4.service
new file mode 100644
index 000000000000..3e5f60291953
--- /dev/null
+++ b/www-servers/xsp/files/systemd/mono-xsp4.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=XSP 4.0 WebServer
+Wants=network.target
+ConditionFileNotEmpty=/etc/xsp4/mono.webapp
+ConditionDirectoryNotEmpty=/etc/xsp4/conf.d
+
+[Service]
+Type=simple
+User=aspnet
+Group=aspnet
+ExecStart=/usr/bin/xsp4 --port 8084 --address 0.0.0.0 --appconfigdir /etc/xsp4 --nonstop
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
diff --git a/www-servers/xsp/files/systemd/mono.webapp b/www-servers/xsp/files/systemd/mono.webapp
new file mode 100644
index 000000000000..3f611b1e2374
--- /dev/null
+++ b/www-servers/xsp/files/systemd/mono.webapp
@@ -0,0 +1,10 @@
+<web-application>
+        <name>Root</name>
+        <vpath>/</vpath>
+        <path>/usr/lib64/xsp/test</path>
+	<!-- vhost and port are ignored in xsp.exe -->
+        <vhost>my.host.name</vhost>
+        <vport>8084</vport>
+	<!-- <enabled> is true by default -->
+	<!-- <enabled>false</enabled> -->
+</web-application>
diff --git a/www-servers/xsp/files/systemd/readme.txt b/www-servers/xsp/files/systemd/readme.txt
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/www-servers/xsp/files/systemd/readme.txt
@@ -0,0 +1 @@
+
diff --git a/dev-dotnet/xsp/files/xsp-2.10.2-endrequest.patch b/www-servers/xsp/files/xsp-2.10.2-endrequest.patch
similarity index 100%
rename from dev-dotnet/xsp/files/xsp-2.10.2-endrequest.patch
rename to www-servers/xsp/files/xsp-2.10.2-endrequest.patch
diff --git a/dev-dotnet/xsp/metadata.xml b/www-servers/xsp/metadata.xml
similarity index 76%
rename from dev-dotnet/xsp/metadata.xml
rename to www-servers/xsp/metadata.xml
index c264edab779b..4a252355a3b0 100644
--- a/dev-dotnet/xsp/metadata.xml
+++ b/www-servers/xsp/metadata.xml
@@ -6,4 +6,7 @@
 		XSP is a standalone web server written in C# that can be used to run
 		your ASP.NET applications.
 	</longdescription>
+	<use>
+		<flag name='developer'>creates .mdb files for either Release and Debug</flag>
+	</use>
 </pkgmetadata>
diff --git a/www-servers/xsp/xsp-2014.12-r2014120900.ebuild b/www-servers/xsp/xsp-2014.12-r2014120900.ebuild
new file mode 100644
index 000000000000..cb38e334fadb
--- /dev/null
+++ b/www-servers/xsp/xsp-2014.12-r2014120900.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+USE_DOTNET="net35 net40 net45"
+PATCHDIR="${FILESDIR}/2.2/"
+
+inherit base eutils systemd dotnet user autotools autotools-utils
+
+DESCRIPTION="XSP is a small web server that can host ASP.NET pages"
+HOMEPAGE="http://www.mono-project.com/ASP.NET"
+
+EGIT_COMMIT="e272a2c006211b6b03be2ef5bbb9e3f8fefd0768"
+SRC_URI="http://github.com/mono/xsp/archive/${EGIT_COMMIT}.zip -> ${P}.zip"
+S="${WORKDIR}/xsp-${EGIT_COMMIT}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc test developer"
+
+RDEPEND="dev-db/sqlite:3"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/aclocal-fix.patch"
+
+	if [ -z "$LIBTOOL" ]; then
+		LIBTOOL=`which glibtool 2>/dev/null`
+		if [ ! -x "$LIBTOOL" ]; then
+			LIBTOOL=`which libtool`
+		fi
+	fi
+	eaclocal -I build/m4/shamrock -I build/m4/shave $ACLOCAL_FLAGS
+	if test -z "$NO_LIBTOOLIZE"; then
+		${LIBTOOL}ize --force --copy
+	fi
+	eautoconf
+}
+
+src_configure() {
+	myeconfargs=("--enable-maintainer-mode")
+	use test && myeconfargs+=("--with_unit_tests")
+	use doc || myeconfargs+=("--disable-docs")
+	eautomake --gnu --add-missing --force --copy #nowarn
+	autotools-utils_src_configure
+	./configure || die
+}
+
+METAFILETOBUILD=xsp.sln
+
+src_compile() {
+	exbuild xsp.sln
+	if use developer; then
+		exbuild /p:DebugSymbols=True ${METAFILETOBUILD}
+	else
+		exbuild /p:DebugSymbols=False ${METAFILETOBUILD}
+	fi
+}
+
+pkg_preinst() {
+	enewgroup aspnet
+	enewuser aspnet -1 -1 /tmp aspnet
+
+	# enewuser www-data
+	# www-data - is from debian, i think it's the same as aspnet here
+}
+
+src_install() {
+	mv_command="cp -ar" autotools-utils_src_install
+	newinitd "${PATCHDIR}"/xsp.initd xsp
+	newinitd "${PATCHDIR}"/mod-mono-server-r1.initd mod-mono-server
+	newconfd "${PATCHDIR}"/xsp.confd xsp
+	newconfd "${PATCHDIR}"/mod-mono-server.confd mod-mono-server
+
+	insinto /etc/xsp4
+	doins "${FILESDIR}"/systemd/mono.webapp
+	insinto /etc/xsp4/conf.d
+	doins "${FILESDIR}"/systemd/readme.txt
+	# mono-xsp4.service was original name from 
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=770458;filename=mono-xsp4.service;att=1;msg=5
+	# I think that using the same commands as in debian 
+	#     systemctl start mono-xsp4.service
+	#     systemctl start mono-xsp4
+	# is better than to have shorter command
+	#     systemctl start xsp
+	#
+	# insinto /usr/lib/systemd/system
+	systemd_dounit "${FILESDIR}"/systemd/mono-xsp4.service
+
+	keepdir /var/run/aspnet
+}
diff --git a/x11-terms/st/st-0.6-r1.ebuild b/x11-terms/st/st-0.6-r1.ebuild
new file mode 100644
index 000000000000..e0e54e1689a9
--- /dev/null
+++ b/x11-terms/st/st-0.6-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib savedconfig toolchain-funcs
+
+DESCRIPTION="simple terminal implementation for X"
+HOMEPAGE="http://st.suckless.org/"
+SRC_URI="http://dl.suckless.org/st/${P}.tar.gz"
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="savedconfig"
+
+RDEPEND="
+	!<sys-libs/ncurses-6.0
+	media-libs/fontconfig
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+
+src_prepare() {
+	epatch_user
+
+	sed -e '/^CFLAGS/s:[[:space:]]-O[^[:space:]]*[[:space:]]: :' \
+		-e '/^X11INC/{s:/usr/X11R6/include:/usr/include/X11:}' \
+		-e "/^X11LIB/{s:/usr/X11R6/lib:/usr/$(get_libdir)/X11:}" \
+		-i config.mk || die
+	sed -e '/@echo/!s:@::' \
+		-i Makefile || die
+	tc-export CC
+
+	restore_config config.h
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+
+	dodoc TODO
+
+	make_desktop_entry ${PN} simpleterm utilities-terminal 'System;TerminalEmulator;' ''
+
+	save_config config.h
+}
diff --git a/x11-terms/st/st-9999.ebuild b/x11-terms/st/st-9999.ebuild
index 7cde185fdd85..7d6761273bf3 100644
--- a/x11-terms/st/st-9999.ebuild
+++ b/x11-terms/st/st-9999.ebuild
@@ -11,18 +11,21 @@ EGIT_REPO_URI="git://git.suckless.org/st"
 
 LICENSE="MIT-with-advertising"
 SLOT="0"
-KEYWORDS=""
 IUSE="savedconfig"
 
-RDEPEND="media-libs/fontconfig
+RDEPEND="
+	!<sys-libs/ncurses-6.0
+	media-libs/fontconfig
 	x11-libs/libX11
 	x11-libs/libXext
-	x11-libs/libXft"
-DEPEND="${RDEPEND}
-	sys-libs/ncurses
+	x11-libs/libXft
+"
+DEPEND="
+	${RDEPEND}
 	virtual/pkgconfig
 	x11-proto/xextproto
-	x11-proto/xproto"
+	x11-proto/xproto
+"
 
 src_prepare() {
 	epatch_user
@@ -42,7 +45,6 @@ src_prepare() {
 
 src_install() {
 	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
-	tic -s -o "${ED}"/usr/share/terminfo st.info || die
 	dodoc TODO
 
 	make_desktop_entry ${PN} simpleterm utilities-terminal 'System;TerminalEmulator;' ''