diff --git a/packages/app-crypt/gnupg/Manifest b/packages/app-crypt/gnupg/Manifest
index 7e83668d..1c395748 100644
--- a/packages/app-crypt/gnupg/Manifest
+++ b/packages/app-crypt/gnupg/Manifest
@@ -1,6 +1,2 @@
-DIST hasufell-binhost--app-crypt--gnupg-2.1.14--C.16615.1471189613.927904.C.tar.bz2 1790867 SHA256 33b6aef9d2beec6ea5c4cec8ebe51575b9760e755a64fb2e3317f6b6ebf6eb7e SHA512 36fd45ac8ccdf2e705c42d75065288a206821f1568e193a64fae693b072a9513a238380977ad8d447fdd4ec456831d020a167bfaa941a7e3cbcb15c3b4a5d748 WHIRLPOOL 97ef4c43d7ffcf7de19f72b1df11dd176d71557ec1c984a3cb4c635aa52fa86941b3d828dc48d379b7193a154449634d40b3269817a4aa0d145359a9d8b41982
-DIST hasufell-binhost--app-crypt--gnupg-2.1.15--C.27546.1475492417.910290.C.tar.bz2 1796634 SHA256 3d867684fcd6f04d151b03a6fcd1f8c0b06d3726a064abc7a3ffe3eefbac030c SHA512 6e2a2a70a0084af90b35cf5f51cd9739262839b51b4b679dbe6d281bdcfacda22f74fc4b6f4322895a7774aa63526a3d0f0c4c028b44203242d6b8a0fc5ab602 WHIRLPOOL 0c2f740aebab7b2da47e59c56969b4e06ba514d73fe6fb4826f0fec09d9784b455520ca41f785868dcff0b1cf8056f106e18e09bb9631e4a03a2fc24c50dd010
-DIST hasufell-binhost--app-crypt--gnupg-2.1.15-r1--C.8671.1475496385.515280.C.tar.bz2 1797144 SHA256 362ca2edf4ca1ee91a7bc2672a29638239280173a5c34e79b1e19810ac024209 SHA512 c804787de153bcde0d62a7de620a82eb5f21a42cc0bfa798aaad1cfcb375f872d535bf74ae278ccadf2bb685c3008bbe446b3020b5324266fcfa774c646c90f7 WHIRLPOOL 601141d079294ca9b84ad2ce8b62657add0e3d2cf3b4ca8ce5e1e4d9c1deb91c296de61ca69480d45996963b3183ec14902bcebbe5787f94ff0cebd97a5ab28b
-PBIN gnupg-2.1.14.pbin-1+exheres-0 2674 SHA256 bab1357489fd32755ef775a7324a61f7bbcef474025d08e0158ba30cabbb5807 SHA512 0a5e653343c49fa53f38b2978ebca672e9a498b6939c3cfdaabc276b22f225889394f6a71dbc257d9953da161e4e1d46dc88e38cc5424393cf768f72cfd9c1b8 WHIRLPOOL 81c5697299226e141fa6ecaa480e8e972e0a5e043baf9ee184a6c2628cdb13d0201151bd072218ed46adcd63502bf16ccd13bd8d0680547635bb5b36862d0eb3
-PBIN gnupg-2.1.15-r1.pbin-1+exheres-0 2687 SHA256 13e7fb91d4003a72ae76eeb7049465992d342f20841ac2edaff046459e084252 SHA512 8dbc5f5b13983ea27b1f573f7531ba2ce3ce22a608eb6a5066a1db2f5be95eb1d20c36432575fe197b973c6cf7c3239275d59b7540a133a3ec09c45ce64fc5b4 WHIRLPOOL 2d5378dc8e5fa2576a43d87d0b3e75178f18c04f4276708a870715e3e8772f124962c33cb1509fe5a2444c09300fcd04a177b2c819e3c4d0004d73e5fee3cbce
-PBIN gnupg-2.1.15.pbin-1+exheres-0 2676 SHA256 86c10868ecb002247da370fa2113319eeaba8aadd52efc4fc1827fc82ad266f9 SHA512 1c34976ef62e91753450015712c53f4d6ee80cdea1a6d7d6c8283e19c04861deb35859d54c67492180e1f5e70200d529b8f31d740941dceb97212c6780464687 WHIRLPOOL 243518c07384b7b55e0ba720aabee543e830d49afef42a1fdce73e45390218a4b92bc798764157a8db531782bc48504bf97f3d78ceeb57415e1dfc3c5c89a5c7
+DIST hasufell-binhost--app-crypt--gnupg-2.1.15-r2--C.16308.1476899926.824540.C.tar.bz2 1796861 SHA256 cd699d5f6ac192037922c3a6f802e082186488c22d642f8faaf0569e26710fb2 SHA512 148315c44f793002c2be7c3532bfe84f96eb2d399fd37bad5cd4e7b132e74b18c7419f3d8515e71c408b5657489ec7d950041820ff11534d47e914dc5b5ba78e WHIRLPOOL 2c95bdb343482c5e12aa25f8928d00cdc10f74d027ba958fa6b258dc4e955bfb1e9b00eb52f4acb99282c298f1b9da2bf5ab23e6fa22b347142bad145328784a
+PBIN gnupg-2.1.15-r2.pbin-1+exheres-0 2688 SHA256 d76aa750328d958747dba7aafd8b21e00abc8c1c6de10d90d07aa004f43e3306 SHA512 cf4daa78c8e82171e5323c53ef772ef1168691b54bc196791f1176e48de052c44b738250ed3e6446819f14ba9a613c245eca0929c54a36e45ca2a32f442e1fd4 WHIRLPOOL 2a5dbd405f646dbee7e7bf2e2cc45517bc5b9ca6c4a2c9aab6abe68e915b2b7fb4241dd14af25ce59effda68528c3ba25b24ce695c962bcd45eff9313fd6f98f
diff --git a/packages/app-crypt/gnupg/gnupg-2.1.14.pbin-1+exheres-0 b/packages/app-crypt/gnupg/gnupg-2.1.14.pbin-1+exheres-0
deleted file mode 100644
index 68942b3e..00000000
--- a/packages/app-crypt/gnupg/gnupg-2.1.14.pbin-1+exheres-0
+++ /dev/null
@@ -1,38 +0,0 @@
-# Created by paludis-2.6.0-git-2.6.0-13-g7d83832 on Sun Aug 14 17:46:54 CEST 2016
-CHOST="x86_64-pc-linux-gnu"
-DEPENDENCIES="( build: sys-devel/gettext[>=0.17] doc? ( sys-apps/texinfo ) build+run: app-arch/bzip2 dev-libs/libassuan[>=2.4.3] dev-libs/libgcrypt[>=1.7.0] dev-libs/libgpg-error[>=1.24] dev-libs/libksba[>=1.3.4] dev-libs/npth[>=1.2] net-misc/curl[>=7.10] sys-libs/readline hkps? ( dev-libs/gnutls[>=3.0] ) smartcard? ( dev-libs/libusb:1 group/scard ) tofu? ( dev-db/sqlite[>=3.7] ) recommendation: app-crypt/pinentry [[ description = [ Provides GTK+, Qt, and ncurses password prompts ] ]] smartcard? ( sys-apps/pcsc-lite ) [[ description = [ Provides the default pcsc library for accessing smartcards ] ]] ) [[ defined-in = [ gnupg-2.1.14.exheres-0 ] ]]"
-DESCRIPTION=""
-EAPI="pbin-1+exheres-0"
-HOMEPAGE="https://www.gnupg.org"
-INHERITED=" udev-rules"
-MYOPTIONS="( ( doc [[ description = [ Adds extra documentation (API, Javadoc, etc) ] ]] hkps [[ description = [ Enable support for HKPS protocol using GnuTLS ] ]] smartcard [[ description = [ Install the smartcard daemon ( includes CCID support ) ] ]] tofu [[ description = [ Support for the Trust on First Use trust model ] ]] ) [[ defined-in = [ gnupg-2.1.14.exheres-0 ] ]] ) "
-PLATFORMS="~amd64 ~x86"
-LICENCES="GPL-3"
-SLOT="0"
-DOWNLOADS="mirror://gnupg/gnupg/gnupg-2.1.14.tar.bz2"
-OPTIONS=""
-GENERATED_USING="paludis-2.6.0-git-2.6.0-13-g7d83832"
-GENERATED_TIME="1471189614"
-SUBOPTIONS="AMD64_CPU_FEATURES ANT_DATA_TYPES ANT_SCRIPTING ANT_TASKS APACHE_MODULES ARM_CPU_FEATURES COURIER_MODULES ENCODINGS EPIPHANY_EXTENSIONS EXTENSIONS FPRINT_DRIVERS GCC_VERSION GIT_REMOTE_HELPERS GSTREAMER_PLUGINS IM_PROTOCOLS INPUT_DRIVERS KDE_PARTS KIPI_PLUGINS KOPETE_PLUGINS LIBC LINGUAS LUA_ABIS MODULES MULTIBUILD_C NGINX_MODULES NUT_DRIVERS P2P_NETWORKS PCSC_DRIVERS PHP_ABIS PHP_EXTENSIONS PLATFORM PLUGINS POSTGRESQL_EXTENSIONS PROVIDERS PYTHON_ABIS RUBY_ABIS TARGETS VALA_ABIS VIDEO_DRIVERS X86_CPU_FEATURES"
-HIDDEN_SUBOPTIONS="ARM_CPU_FEATURES LIBC MULTIBUILD_C PLATFORM X86_CPU_FEATURES"
-ASFLAGS=""
-CBUILD=""
-CC="x86_64-pc-linux-gnu-cc"
-CFLAGS="-march=core2 -pipe -O2"
-CHOST="x86_64-pc-linux-gnu"
-CTARGET=""
-CXX="x86_64-pc-linux-gnu-c++"
-CXXFLAGS="-march=core2 -pipe -O2"
-LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu"
-LIBCXXFLAGS=""
-GENERATED_FROM_REPOSITORY="arbor"
-PLATFORMS="~amd64 ~x86"
-BINARY_PLATFORMS="~amd64"
-BINARY_URI="mirror://hasufell-binhost/hasufell-binhost--app-crypt--gnupg-2.1.14--C.16615.1471189613.927904.C.tar.bz2"
-SUMMARY="The GNU Privacy Guard, a GPL pgp replacement"
-BUGS_TO=""
-REMOTE_IDS=""
-UPSTREAM_CHANGELOG=""
-UPSTREAM_RELEASE_NOTES=""
-UPSTREAM_DOCUMENTATION=""
-SCM_REVISION=""
diff --git a/packages/app-crypt/gnupg/gnupg-2.1.15-r1.pbin-1+exheres-0 b/packages/app-crypt/gnupg/gnupg-2.1.15-r2.pbin-1+exheres-0
similarity index 90%
rename from packages/app-crypt/gnupg/gnupg-2.1.15-r1.pbin-1+exheres-0
rename to packages/app-crypt/gnupg/gnupg-2.1.15-r2.pbin-1+exheres-0
index 7f38c9ae..a4c44a80 100644
--- a/packages/app-crypt/gnupg/gnupg-2.1.15-r1.pbin-1+exheres-0
+++ b/packages/app-crypt/gnupg/gnupg-2.1.15-r2.pbin-1+exheres-0
@@ -1,18 +1,18 @@
-# Created by paludis-2.6.0-git-2.6.0-13-g7d83832 on Mon Oct  3 14:06:26 CEST 2016
+# Created by paludis-2.6.0-git-2.6.0-13-g7d83832 on Wed Oct 19 19:58:47 CEST 2016
 CHOST="x86_64-pc-linux-gnu"
-DEPENDENCIES="( build: sys-devel/gettext[>=0.17] doc? ( sys-apps/texinfo ) build+run: app-arch/bzip2 dev-libs/libassuan[>=2.4.3] dev-libs/libgcrypt[>=1.7.0] dev-libs/libgpg-error[>=1.24] dev-libs/libksba[>=1.3.4] dev-libs/npth[>=1.2] net-misc/curl[>=7.10] sys-libs/readline:=7 hkps? ( dev-libs/gnutls[>=3.0] ) smartcard? ( dev-libs/libusb:1 group/scard ) tofu? ( dev-db/sqlite[>=3.7] ) recommendation: app-crypt/pinentry [[ description = [ Provides GTK+, Qt, and ncurses password prompts ] ]] smartcard? ( sys-apps/pcsc-lite ) [[ description = [ Provides the default pcsc library for accessing smartcards ] ]] ) [[ defined-in = [ gnupg-2.1.15-r1.exheres-0 ] ]]"
+DEPENDENCIES="( build: sys-devel/gettext[>=0.17] doc? ( sys-apps/texinfo ) build+run: app-arch/bzip2 dev-libs/libassuan[>=2.4.3] dev-libs/libgcrypt[>=1.7.0] dev-libs/libgpg-error[>=1.24] dev-libs/libksba[>=1.3.4] dev-libs/npth[>=1.2] net-misc/curl[>=7.10] sys-libs/readline:=7 hkps? ( dev-libs/gnutls[>=3.0] ) smartcard? ( dev-libs/libusb:1 group/scard ) tofu? ( dev-db/sqlite[>=3.7] ) recommendation: app-crypt/pinentry [[ description = [ Provides GTK+, Qt, and ncurses password prompts ] ]] smartcard? ( sys-apps/pcsc-lite ) [[ description = [ Provides the default pcsc library for accessing smartcards ] ]] ) [[ defined-in = [ gnupg-2.1.15-r2.exheres-0 ] ]]"
 DESCRIPTION=""
 EAPI="pbin-1+exheres-0"
 HOMEPAGE="https://www.gnupg.org"
 INHERITED=" udev-rules"
-MYOPTIONS="( ( doc [[ description = [ Adds extra documentation (API, Javadoc, etc) ] ]] hkps [[ description = [ Enable support for HKPS protocol using GnuTLS ] ]] smartcard [[ description = [ Install the smartcard daemon ( includes CCID support ) ] ]] tofu [[ description = [ Support for the Trust on First Use trust model ] ]] ) [[ defined-in = [ gnupg-2.1.15-r1.exheres-0 ] ]] ) "
+MYOPTIONS="( ( doc [[ description = [ Adds extra documentation (API, Javadoc, etc) ] ]] hkps [[ description = [ Enable support for HKPS protocol using GnuTLS ] ]] smartcard [[ description = [ Install the smartcard daemon ( includes CCID support ) ] ]] tofu [[ description = [ Support for the Trust on First Use trust model ] ]] ) [[ defined-in = [ gnupg-2.1.15-r2.exheres-0 ] ]] ) "
 PLATFORMS="~amd64 ~x86"
 LICENCES="GPL-3"
 SLOT="0"
 DOWNLOADS="mirror://gnupg/gnupg/gnupg-2.1.15.tar.bz2"
 OPTIONS=""
 GENERATED_USING="paludis-2.6.0-git-2.6.0-13-g7d83832"
-GENERATED_TIME="1475496386"
+GENERATED_TIME="1476899927"
 SUBOPTIONS="AMD64_CPU_FEATURES ANT_DATA_TYPES ANT_SCRIPTING ANT_TASKS APACHE_MODULES ARM_CPU_FEATURES COURIER_MODULES ENCODINGS EPIPHANY_EXTENSIONS EXTENSIONS FPRINT_DRIVERS GCC_VERSION GIT_REMOTE_HELPERS GSTREAMER_PLUGINS IM_PROTOCOLS INPUT_DRIVERS KDE_PARTS KIPI_PLUGINS KOPETE_PLUGINS LIBC LINGUAS LUA_ABIS MODULES MULTIBUILD_C NGINX_MODULES NUT_DRIVERS P2P_NETWORKS PCSC_DRIVERS PHP_ABIS PHP_EXTENSIONS PLATFORM PLUGINS POSTGRESQL_EXTENSIONS PROVIDERS PYTHON_ABIS RUBY_ABIS TARGETS VALA_ABIS VIDEO_DRIVERS X86_CPU_FEATURES"
 HIDDEN_SUBOPTIONS="ARM_CPU_FEATURES LIBC MULTIBUILD_C PLATFORM X86_CPU_FEATURES"
 ASFLAGS=""
@@ -28,7 +28,7 @@ LIBCXXFLAGS=""
 GENERATED_FROM_REPOSITORY="arbor"
 PLATFORMS="~amd64 ~x86"
 BINARY_PLATFORMS="~amd64"
-BINARY_URI="mirror://hasufell-binhost/hasufell-binhost--app-crypt--gnupg-2.1.15-r1--C.8671.1475496385.515280.C.tar.bz2"
+BINARY_URI="mirror://hasufell-binhost/hasufell-binhost--app-crypt--gnupg-2.1.15-r2--C.16308.1476899926.824540.C.tar.bz2"
 SUMMARY="The GNU Privacy Guard, a GPL pgp replacement"
 BUGS_TO=""
 REMOTE_IDS=""
diff --git a/packages/app-crypt/gnupg/gnupg-2.1.15.pbin-1+exheres-0 b/packages/app-crypt/gnupg/gnupg-2.1.15.pbin-1+exheres-0
deleted file mode 100644
index 71520ff2..00000000
--- a/packages/app-crypt/gnupg/gnupg-2.1.15.pbin-1+exheres-0
+++ /dev/null
@@ -1,38 +0,0 @@
-# Created by paludis-2.6.0-git-2.6.0-13-g7d83832 on Mon Oct  3 13:00:18 CEST 2016
-CHOST="x86_64-pc-linux-gnu"
-DEPENDENCIES="( build: sys-devel/gettext[>=0.17] doc? ( sys-apps/texinfo ) build+run: app-arch/bzip2 dev-libs/libassuan[>=2.4.3] dev-libs/libgcrypt[>=1.7.0] dev-libs/libgpg-error[>=1.24] dev-libs/libksba[>=1.3.4] dev-libs/npth[>=1.2] net-misc/curl[>=7.10] sys-libs/readline hkps? ( dev-libs/gnutls[>=3.0] ) smartcard? ( dev-libs/libusb:1 group/scard ) tofu? ( dev-db/sqlite[>=3.7] ) recommendation: app-crypt/pinentry [[ description = [ Provides GTK+, Qt, and ncurses password prompts ] ]] smartcard? ( sys-apps/pcsc-lite ) [[ description = [ Provides the default pcsc library for accessing smartcards ] ]] ) [[ defined-in = [ gnupg-2.1.15.exheres-0 ] ]]"
-DESCRIPTION=""
-EAPI="pbin-1+exheres-0"
-HOMEPAGE="https://www.gnupg.org"
-INHERITED=" udev-rules"
-MYOPTIONS="( ( doc [[ description = [ Adds extra documentation (API, Javadoc, etc) ] ]] hkps [[ description = [ Enable support for HKPS protocol using GnuTLS ] ]] smartcard [[ description = [ Install the smartcard daemon ( includes CCID support ) ] ]] tofu [[ description = [ Support for the Trust on First Use trust model ] ]] ) [[ defined-in = [ gnupg-2.1.15.exheres-0 ] ]] ) "
-PLATFORMS="~amd64 ~x86"
-LICENCES="GPL-3"
-SLOT="0"
-DOWNLOADS="mirror://gnupg/gnupg/gnupg-2.1.15.tar.bz2"
-OPTIONS=""
-GENERATED_USING="paludis-2.6.0-git-2.6.0-13-g7d83832"
-GENERATED_TIME="1475492418"
-SUBOPTIONS="AMD64_CPU_FEATURES ANT_DATA_TYPES ANT_SCRIPTING ANT_TASKS APACHE_MODULES ARM_CPU_FEATURES COURIER_MODULES ENCODINGS EPIPHANY_EXTENSIONS EXTENSIONS FPRINT_DRIVERS GCC_VERSION GIT_REMOTE_HELPERS GSTREAMER_PLUGINS IM_PROTOCOLS INPUT_DRIVERS KDE_PARTS KIPI_PLUGINS KOPETE_PLUGINS LIBC LINGUAS LUA_ABIS MODULES MULTIBUILD_C NGINX_MODULES NUT_DRIVERS P2P_NETWORKS PCSC_DRIVERS PHP_ABIS PHP_EXTENSIONS PLATFORM PLUGINS POSTGRESQL_EXTENSIONS PROVIDERS PYTHON_ABIS RUBY_ABIS TARGETS VALA_ABIS VIDEO_DRIVERS X86_CPU_FEATURES"
-HIDDEN_SUBOPTIONS="ARM_CPU_FEATURES LIBC MULTIBUILD_C PLATFORM X86_CPU_FEATURES"
-ASFLAGS=""
-CBUILD=""
-CC="x86_64-pc-linux-gnu-cc"
-CFLAGS="-march=native -pipe -O2"
-CHOST="x86_64-pc-linux-gnu"
-CTARGET=""
-CXX="x86_64-pc-linux-gnu-c++"
-CXXFLAGS="-march=native -pipe -O2"
-LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu"
-LIBCXXFLAGS=""
-GENERATED_FROM_REPOSITORY="arbor"
-PLATFORMS="~amd64 ~x86"
-BINARY_PLATFORMS="~amd64"
-BINARY_URI="mirror://hasufell-binhost/hasufell-binhost--app-crypt--gnupg-2.1.15--C.27546.1475492417.910290.C.tar.bz2"
-SUMMARY="The GNU Privacy Guard, a GPL pgp replacement"
-BUGS_TO=""
-REMOTE_IDS=""
-UPSTREAM_CHANGELOG=""
-UPSTREAM_RELEASE_NOTES=""
-UPSTREAM_DOCUMENTATION=""
-SCM_REVISION=""