diff --git a/dev-embedded/cc65/Manifest b/dev-embedded/cc65/Manifest
index 2497a980..f3407c73 100644
--- a/dev-embedded/cc65/Manifest
+++ b/dev-embedded/cc65/Manifest
@@ -1,3 +1,2 @@
-AUX cc65-2.13.2-asneeded-1.patch 4394 SHA256 c1b4590f80a7f96ee0c096f366515caeac322e4e88d41365973b325394300034 SHA512 98df2303b43c6bb390366d0d5b13a59648a4869c73891114790c9ad7e1cceec22daa3ae171b283ad1e220d35352c15bbc873666b5430eba05e6e6238d6027447 WHIRLPOOL 5a069ff1b9a9c61ff85a37a1f66ec85eeee662322c2e7f373b0da87a89193952b13f82e6a0bf94d7097a09c1332c265c3d421cc87f87f1c6507dd2c8cddbc97d
DIST cc65-2.16.tar.gz 2030854 SHA256 fdbbf1efbf2324658a5774fdceef4a1b202322a04f895688d95694843df76792 SHA512 89c61bd2655a466d619cf40f31f65d10e7cead24c04f548c969a79e0a946db239a4fee925708b0621dbdadf4ab1bdb67719c709edd8b989a218f7dc2270862f9 WHIRLPOOL b0df617d65d4a67a78bf880b80f2ed72331a6923bab57717a0d093b8c154e98258555f98285bbc5d38677ec3905b7eb1243ad741fe105734209860baeca31373
EBUILD cc65-2.16.ebuild 476 SHA256 1d39df09f45fac21050aa747ada5d25194b8fffd04100276058b1342ae51975e SHA512 5767c7bbd31004431a61877a3eece9273129613ce35350c4f17394973ab43badf810c14a41eb48d2a6007d38beaa67b1a65e350a356eeb10a2c32132aba8d3b8 WHIRLPOOL 02c4fdab64c9bd27d5299fe2537f7170b54cba2936f9abf52fea2fdf5a87b3dd8baf49a6c0ca9c1383cf78c0f0e7175ce65b17e7694348b4a161f7e4ee690b6f
diff --git a/dev-embedded/cc65/files/cc65-2.13.2-asneeded-1.patch b/dev-embedded/cc65/files/cc65-2.13.2-asneeded-1.patch
deleted file mode 100755
index e03100a0..00000000
--- a/dev-embedded/cc65/files/cc65-2.13.2-asneeded-1.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
-Date: 2010-11-07
-Initial Package Version: 2.13.2
-Origin: me
-Upstream Status: unknown
-Description: correct the linkorder in the make files
-
-diff -Naur cc65-2.13.2.orig/src/ar65/make/gcc.mak cc65-2.13.2/src/ar65/make/gcc.mak
---- cc65-2.13.2.orig/src/ar65/make/gcc.mak 2010-11-07 05:47:25.000000000 +0000
-+++ cc65-2.13.2/src/ar65/make/gcc.mak 2010-11-07 05:51:00.000000000 +0000
-@@ -51,7 +51,7 @@
- endif
-
- $(EXE): $(OBJS) $(LIBS)
-- $(CC) $^ $(LDFLAGS) -o $@
-+ $(CC) $(LDFLAGS) $^ -o $@
- @if [ $(OS2_SHELL) ] ; then $(EBIND) $(EXE) ; fi
-
- clean:
-diff -Naur cc65-2.13.2.orig/src/ca65/make/gcc.mak cc65-2.13.2/src/ca65/make/gcc.mak
---- cc65-2.13.2.orig/src/ca65/make/gcc.mak 2010-11-07 05:47:25.000000000 +0000
-+++ cc65-2.13.2/src/ca65/make/gcc.mak 2010-11-07 05:50:17.000000000 +0000
-@@ -93,7 +93,7 @@
- endif
-
- $(EXE): $(INCS) $(OBJS) $(LIBS)
-- $(CC) $(OBJS) $(LIBS) $(LDFLAGS) -o $@
-+ $(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
- @if [ $(OS2_SHELL) ] ; then $(EBIND) $(EXE) ; fi
-
- inc: $(INCS)
-diff -Naur cc65-2.13.2.orig/src/cc65/make/gcc.mak cc65-2.13.2/src/cc65/make/gcc.mak
---- cc65-2.13.2.orig/src/cc65/make/gcc.mak 2010-11-07 05:47:24.000000000 +0000
-+++ cc65-2.13.2/src/cc65/make/gcc.mak 2010-11-07 05:48:00.000000000 +0000
-@@ -127,7 +127,7 @@
- endif
-
- $(EXE): $(OBJS) $(LIBS)
-- $(CC) $(OBJS) $(LIBS) $(LDFLAGS) -o $@
-+ $(CC) $(LDFLAGS) $(OBJS) $(LIBS) -lm -o $@
- @if [ $(OS2_SHELL) ] ; then $(EBIND) $(EXE) ; fi
-
- .PHONY: svnversion
-diff -Naur cc65-2.13.2.orig/src/cl65/make/gcc.mak cc65-2.13.2/src/cl65/make/gcc.mak
---- cc65-2.13.2.orig/src/cl65/make/gcc.mak 2010-11-07 05:47:25.000000000 +0000
-+++ cc65-2.13.2/src/cl65/make/gcc.mak 2010-11-07 05:51:15.000000000 +0000
-@@ -44,7 +44,7 @@
- endif
-
- $(EXE): $(OBJS) $(LIBS)
-- $(CC) $^ $(LDFLAGS) -o $@
-+ $(CC) $(LDFLAGS) $^ -o $@
- @if [ $(OS2_SHELL) ] ; then $(EBIND) $(EXE) ; fi
-
- clean:
-diff -Naur cc65-2.13.2.orig/src/co65/make/gcc.mak cc65-2.13.2/src/co65/make/gcc.mak
---- cc65-2.13.2.orig/src/co65/make/gcc.mak 2010-11-07 05:47:25.000000000 +0000
-+++ cc65-2.13.2/src/co65/make/gcc.mak 2010-11-07 05:50:34.000000000 +0000
-@@ -44,7 +44,7 @@
- endif
-
- $(EXE): $(OBJS) $(LIBS)
-- $(CC) $^ $(LDFLAGS) -o $@
-+ $(CC) $(LDFLAGS) $^ -o $@
- @if [ $(OS2_SHELL) ] ; then $(EBIND) $(EXE) ; fi
-
- clean:
-diff -Naur cc65-2.13.2.orig/src/da65/make/gcc.mak cc65-2.13.2/src/da65/make/gcc.mak
---- cc65-2.13.2.orig/src/da65/make/gcc.mak 2010-11-07 05:47:25.000000000 +0000
-+++ cc65-2.13.2/src/da65/make/gcc.mak 2010-11-07 05:49:57.000000000 +0000
-@@ -58,7 +58,7 @@
- endif
-
- $(EXE): $(OBJS) $(LIBS)
-- $(CC) $^ $(LDFLAGS) -o $@
-+ $(CC) $(LDFLAGS) $^ -o $@
- @if [ $(OS2_SHELL) ] ; then $(EBIND) $(EXE) ; fi
-
- clean:
-diff -Naur cc65-2.13.2.orig/src/grc/make/gcc.mak cc65-2.13.2/src/grc/make/gcc.mak
---- cc65-2.13.2.orig/src/grc/make/gcc.mak 2010-11-07 05:47:25.000000000 +0000
-+++ cc65-2.13.2/src/grc/make/gcc.mak 2010-11-07 05:50:47.000000000 +0000
-@@ -38,7 +38,7 @@
- endif
-
- $(EXE): $(OBJS) $(LIBS)
-- $(CC) $^ $(LDFLAGS) -o $@
-+ $(CC) $(LDFLAGS) $^ -o $@
- @if [ $(OS2_SHELL) ] ; then $(EBIND) $(EXE) ; fi
-
- clean:
-diff -Naur cc65-2.13.2.orig/src/ld65/make/gcc.mak cc65-2.13.2/src/ld65/make/gcc.mak
---- cc65-2.13.2.orig/src/ld65/make/gcc.mak 2010-11-07 05:47:25.000000000 +0000
-+++ cc65-2.13.2/src/ld65/make/gcc.mak 2010-11-07 05:49:43.000000000 +0000
-@@ -100,7 +100,7 @@
- endif
-
- $(EXE): $(INCS) $(OBJS) $(LIBS)
-- $(CC) $(OBJS) $(LIBS) $(LDFLAGS) -o $@
-+ $(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
- @if [ $(OS2_SHELL) ] ; then $(EBIND) $(EXE) ; fi
-
- inc: $(INCS)
-diff -Naur cc65-2.13.2.orig/src/od65/make/gcc.mak cc65-2.13.2/src/od65/make/gcc.mak
---- cc65-2.13.2.orig/src/od65/make/gcc.mak 2010-11-07 05:47:25.000000000 +0000
-+++ cc65-2.13.2/src/od65/make/gcc.mak 2010-11-07 05:49:09.000000000 +0000
-@@ -44,7 +44,7 @@
- endif
-
- $(EXE): $(OBJS) $(LIBS)
-- $(CC) $^ $(LDFLAGS) -o $@
-+ $(CC) $(LDFLAGS) $^ -o $@
- @if [ $(OS2_SHELL) ] ; then $(EBIND) $(EXE) ; fi
-
- clean:
-diff -Naur cc65-2.13.2.orig/src/sim65/make/gcc.mak cc65-2.13.2/src/sim65/make/gcc.mak
---- cc65-2.13.2.orig/src/sim65/make/gcc.mak 2010-11-07 05:47:24.000000000 +0000
-+++ cc65-2.13.2/src/sim65/make/gcc.mak 2010-11-07 05:48:47.000000000 +0000
-@@ -53,7 +53,7 @@
- endif
-
- $(EXE): $(OBJS) $(LIBS)
-- $(CC) $^ $(LDFLAGS) -o $@
-+ $(CC) $(LDFLAGS) $^ -o $@
- @if [ $(OS2_SHELL) ] ; then $(EBIND) $(EXE) ; fi
-
- .PHONY: chips
diff --git a/dev-libs/amdgpu-pro-opencl/Manifest b/dev-libs/amdgpu-pro-opencl/Manifest
deleted file mode 100644
index f5e131a2..00000000
--- a/dev-libs/amdgpu-pro-opencl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST amdgpu-pro-17.30-465504.tar.xz 394216628 SHA256 b74494d142542164b5582e8bed845315f788aa3d9eb0c1ed5f2a6c5f982beaf5 SHA512 fa515d5397488ebd4271988f7b9b538190c4277a3c4dcaeb4b05f5cd5bdec657f13546de644b1a6825c88bd3b73e6c1a6aaa6b6c74e3cf942783b2df530cf4c7 WHIRLPOOL 3a1617cd8b8fd096614cf04b7e716b607ec718d122b286533d8dabc862c82b644ba864eb661b1d5e5da45c8fe674192d3f8038dbd85311d9ffc5c6f793f7d32b
-EBUILD amdgpu-pro-opencl-17.30.465504.ebuild 2356 SHA256 fad3c146dd00814913132a9ea6cc9e696faa8a0628c8a1ed2526302c5dd3115f SHA512 0c834c94be9975bf7c727243912bcc4bce46af8d734d4a8b65bdf769643769549883193e029bc7aec7d423588030423a3116c08a016352e10b203e39c550b13a WHIRLPOOL 715c5c6c7ec72e59ffec3ac8599705cd15576b3460d1a4f14197cb342105e5d35b95a62880d223cce431c569411215282c29f415056113488ccaf082aa876a08
-MISC metadata.xml 536 SHA256 470656217ffaa8fb735bea6b795f5206a727d783ec8ae671dc518af9b7e6c40c SHA512 912ff2f26e27d5c20219a26505f3a4545409773f1f761de4591cbd7086cd1ff241fca18d7ae5081ed12e04c1b5dc46deeb02b4a68e2a3787d1d20739a818325d WHIRLPOOL eab775a0a603cc6562a02a7cb79585d1dddfb837e67cecf82a6c325148b53cca7e4079e79f6d9a6e09486fb31a2f5a1fadbc92ee30a5b09313c5aa0871b1837a
diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.30.465504.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.30.465504.ebuild
deleted file mode 100644
index 971d4999..00000000
--- a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.30.465504.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit unpacker versionator
-
-SUPER_PN='amdgpu-pro'
-MY_PV=$(replace_version_separator 2 '-')
-
-DESCRIPTION="Proprietary OpenCL implementation for AMD GPUs"
-HOMEPAGE="https://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Driver-for-Linux-Release-Notes.aspx"
-SRC_URI="${SUPER_PN}-${MY_PV}.tar.xz"
-
-LICENSE="AMD-GPU-PRO-EULA"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="mirror fetch strip"
-
-DEPEND="dev-util/patchelf"
-RDEPEND="dev-libs/ocl-icd"
-
-QA_PREBUILT="/opt/${SUPER_PN}/lib*/*"
-
-S="${WORKDIR}/${SUPER_PN}-${MY_PV}"
-
-pkg_nofetch() {
- local pkgver=$(get_version_component_range 1-2)
- einfo "Please download the AMDGPU-Pro Driver ${pkgver} for Ubuntu from"
- einfo " ${HOMEPAGE}"
- einfo "The archive should then be placed into ${DISTDIR}."
-}
-
-src_unpack() {
- default
-
- local ids_ver="1.0.0"
- local libdrm_ver="2.4.70"
- local patchlevel=$(get_version_component_range 3)
- cd "${S}" || die
- unpack_deb opencl-${SUPER_PN}-icd_${MY_PV}_amd64.deb
- unpack_deb libdrm-${SUPER_PN}-amdgpu1_${libdrm_ver}-${patchlevel}_amd64.deb
- unpack_deb ids-${SUPER_PN}_${ids_ver}-${patchlevel}_all.deb
-}
-
-src_prepare() {
- default
-
- cd "${S}/opt/${SUPER_PN}/lib/x86_64-linux-gnu" || die
- patchelf --set-rpath '$ORIGIN' libamdocl64.so || die "Failed to fix library rpath"
-}
-
-src_install() {
-
- into "/opt/${SUPER_PN}"
- dolib opt/${SUPER_PN}/lib/x86_64-linux-gnu/*
- insinto "/opt/${SUPER_PN}"
- doins -r opt/${SUPER_PN}/share
-
- insinto /etc/OpenCL/vendors/
- echo "/opt/${SUPER_PN}/$(get_libdir)/libamdocl64.so" > "${SUPER_PN}.icd" || die "Failed to generate ICD file"
- doins "${SUPER_PN}.icd"
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- ewarn "Please note that using proprietary OpenCL libraries together with the"
- ewarn "Open Source amdgpu stack is not officially supported by AMD. Do not ask them"
- ewarn "for support in case of problems with this package."
- ewarn ""
- ewarn "Furthermore, if you have the whole AMDGPU-Pro stack installed this package"
- ewarn "will almost certainly conflict with it. This might change once AMDGPU-Pro"
- ewarn "has become officially supported by Gentoo."
- fi
-
- elog "AMD OpenCL driver relies on dev-libs/ocl-icd to work. To enable it, please run"
- elog ""
- elog " eselect opencl set ocl-icd"
- elog ""
-}
diff --git a/dev-libs/amdgpu-pro-opencl/metadata.xml b/dev-libs/amdgpu-pro-opencl/metadata.xml
deleted file mode 100644
index 8c9e58cc..00000000
--- a/dev-libs/amdgpu-pro-opencl/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- marecki@gentoo.org
- Marek Szuba
-
-
- This package contains the libraries necessary to enable OpenCL support
- on AMD GPUs supported by the amdgpu driver. The libraries themselves
- are part of the proprietary AMDGPU-Pro suite but work fine with the
- free amdgpu driver stack.
-
-
diff --git a/dev-php/PEAR-Net_NNTP/Manifest b/dev-php/PEAR-Net_NNTP/Manifest
index 7096d7d5..0dff75b9 100644
--- a/dev-php/PEAR-Net_NNTP/Manifest
+++ b/dev-php/PEAR-Net_NNTP/Manifest
@@ -1,3 +1,3 @@
-DIST Net_NNTP-1.4.0.tgz 41856 RMD160 32d5526e26f4253f6215fe17ae6ed0b8d5e8346f SHA1 769330e6153ab7f83553a851bb9cb742d772f388 SHA256 4425fc271ad7ac23417bea4824c0414aee21ed288f3f0155e4bf4bd4e0f91e62
-EBUILD PEAR-Net_NNTP-1.4.0.ebuild 445 RMD160 b4f683a650a2343225f80394dc4a578008eaaca8 SHA1 b5597ebb834fc1a2d44ab87e4f193e4ca9cb20ae SHA256 23e4cd08e5bc0ab907586d9c79db7e6d311efa2ae7f5cebe372294d819b58058
-MISC package.xml 26806 RMD160 afc34a4f58d0070b3f1b9329da75cf25648d7211 SHA1 4862d31c7564698178a5008dc0e6cbc56019a0df SHA256 1fc219d8ee6cc4cbc53f355e30536fdb4853ad0805dc8cea3d624c4a5eda61cf
+DIST Net_NNTP-1.5.2.tgz 39016 SHA256 68e49c94d6b78fecc03e200692657977e31221866cd244a6dddaaa7993e07666 SHA512 ae3afad6fae8a1b877218c56948679ab3cb6572dd77ad298a9706aae55594fe781018ccc01b036c22b99e84bf47fb0133d6b3a6e808072fc46fd70d9ae075b34 WHIRLPOOL cda62698116753a8efbaeb81ce001bafe8b21ae037dbebe7f005f18536bc21fd42cce6e997106b58d4e7f0de8e93cd456a717c3ac97532bf7e6d4addf5b33981
+EBUILD PEAR-Net_NNTP-1.5.2.ebuild 445 SHA256 23e4cd08e5bc0ab907586d9c79db7e6d311efa2ae7f5cebe372294d819b58058 SHA512 b4e40a7e97c0edcd5a4c55841ba8e1e16170f74f850406443533a79ebfce683bbc8b928572ad87ea958546d616a3470d26fb6ea5abfdbc4ddebef13cb23bc795 WHIRLPOOL e1838eecad6798a4b26bd7291d378e704054d8cbcbef9c5fa7212d38e53b9fb5e891ce3280af12d8b2dfd16a7d264e24489a72238d60c55d94989515d516ed8d
+MISC package.xml 26806 SHA256 1fc219d8ee6cc4cbc53f355e30536fdb4853ad0805dc8cea3d624c4a5eda61cf SHA512 907abb8dd028e4ca3354f32dbaeca93691a37428efc92bca725a3c98acd7defd048f3e04ec0d331015b0e8e3ae55a148e5213f0ce8534f693db228b40f0998fb WHIRLPOOL 952e8941c0235cb7442c7cf221b5cc91a5242b149f02eb5facbfb606cd4cb202071831e80674b8ac926b81b727b9ac4dd2a9ed82157f31d428e2cb87c0a51f2c
diff --git a/dev-php/PEAR-Net_NNTP/PEAR-Net_NNTP-1.4.0.ebuild b/dev-php/PEAR-Net_NNTP/PEAR-Net_NNTP-1.5.2.ebuild
similarity index 100%
rename from dev-php/PEAR-Net_NNTP/PEAR-Net_NNTP-1.4.0.ebuild
rename to dev-php/PEAR-Net_NNTP/PEAR-Net_NNTP-1.5.2.ebuild
diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
deleted file mode 100644
index 5843bba6..00000000
--- a/dev-php/PEAR-PEAR/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX gentoo-libtool-mismatch-fix-v2.patch 510 SHA256 f4d702b44b86e481f6351b2880dccbe90b037032d140bf5fe57286ec0f3aa8bd SHA512 03848aa6447c2969715e872481e17f7a6dbe7df9e42a13305fdbcfaf09505de40ed6d91c9c93f11a944adc94389472f04eac2b656f08dbdd9d1c3a1d07946ff4 WHIRLPOOL def6a87f5e90498b882efd948799a8e70997869c782ca83a6984f7544d497c40b875bcfad90de76c91e0dffdc7b9acfb3370258b27480c5b68f0372fb983bbfd
-AUX gentoo-libtool-mismatch-fix.patch 718 SHA256 7ee96d72e09529f773c14db4da099fdb8beec12a370b76fb8901cc010cdb6fb5 SHA512 11fa9687c05ca448124b9b10801ca161ef1a5e77aa1aa9fe264a1e5ffa8947227e370a0f0d5f29d00bd5e7a280815dd43fc592996f52114cbf309556861db88e WHIRLPOOL 931d2d9c995dcaabaa2b5160a41146ad8771cb2b1947e2bd749b64be8c6520ad018ccc7bd8759aae7e3afeae78801c908b5362d089d89f55addaff1a7e1d1eeb
-AUX pear.conf-r2 379 SHA256 33296ad828fdbe5447edc93aea6e81351f643fc2e845c6e4bdfad84b299023aa SHA512 81e4c95ccfd1a50d30d6e9db90fa099f3dd098bf4fa2c023f5369d0e96a197da91d2572ff3785bcfc83dba82abeca3932431083b5aa2aed155336697764666be WHIRLPOOL 23a9d300340b463064a4f26489386d786c151394d763a9bcdbb6d5fd6ef72536849c375edd48c57f7c58e63a80650a975fdb7d6cbb368f59471789da4c65ae9a
-DIST PEAR-1.10.1.tgz 291167 SHA256 7eca0d8e4f6391d66d92abc4faebd5a9346e739b92573e20392db9e878a8d59f SHA512 df5f09a92d211a09dae147af474399171aed46e0536c091468b73b43ba4acdbdbf7b5cbdd17ef48b7d36d7b9dd23187dc6c75733731c267768d49c89698b0ef2 WHIRLPOOL ef067937d805a1e5c082c5945ffcbffd005757326f72572563154f2b5c573713050cc002af7727ebe053b3956fa1113c29bbbad6e74d8fb110704b07b7291929
-EBUILD PEAR-PEAR-1.10.1-r1.ebuild 5093 SHA256 52245173132d1c5bf1d4a4f241d937ce57508813d07213893c3a8ee132e20079 SHA512 272955741c11d1b2d28a91ab87c6eb98358a509e57bc8de6bff61ab7f2c6b9e4a67462fe8273dde35fa813d474644ea9a7db4fe7fd4ea23ca00480e9feb20d26 WHIRLPOOL 43f3cb0f90b540f2a0faf3767bb6b2cae3f56e368edfc3605f0617db14f9a27b974651ba873e0918a446b9ec4f9f1fa8f594bb4f630370b4c83ea5f52a0d275d
-MISC metadata.xml 306 SHA256 91b4007b73df9f43b5286941673f49f3a9aae409c62c48ab31af8b4dcd191012 SHA512 2e46d7a6fcadfed2ff7be17a5f0a82b5cbf6184b50384f868a6ad8821746badfe126279ef9c114ef9d9a42374931193dba4b84483d437797636b95e6e97247fa WHIRLPOOL 196291f2331d8f65b33f4f450ae97951a391a0240b9f3e1be58338eddf5b88e7c3e11660427f78a15b138ff20eb24c36293fbe6120dfc54eb9931d2f8e717f59
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.1-r1.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.1-r1.ebuild
deleted file mode 100644
index ac211865..00000000
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.1-r1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-MY_PN="${PN/PEAR-/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="PEAR Base System"
-HOMEPAGE="http://pear.php.net/package/${MY_PN}"
-SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/php:*[cli,xml,zlib]
- >=dev-php/PEAR-Archive_Tar-1.4.0
- >=dev-php/PEAR-Console_Getopt-1.4.1
- >=dev-php/PEAR-Structures_Graph-1.1.0
- >=dev-php/PEAR-XML_Util-1.3.0"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/gentoo-libtool-mismatch-fix-v2.patch" )
-
-pkg_setup() {
- [[ -z "${PEAR_CACHEDIR}" ]] && PEAR_CACHEDIR="${EPREFIX}/var/cache/pear"
- [[ -z "${PEAR_DOWNLOADDIR}" ]] && PEAR_DOWNLOADDIR="${EPREFIX}/var/tmp/pear"
- [[ -z "${PEAR_TEMPDIR}" ]] && PEAR_TEMPDIR="${EPREFIX}/tmp"
-
- elog
- elog "cache_dir is set to: ${PEAR_CACHEDIR}"
- elog "download_dir is set to: ${PEAR_DOWNLOADDIR}"
- elog "temp_dir is set to: ${PEAR_TEMPDIR}"
- elog
- elog "If you want to change the above values, you need to set"
- elog "PEAR_CACHEDIR, PEAR_DOWNLOADDIR and PEAR_TEMPDIR variable(s)"
- elog "accordingly in /etc/portage/make.conf and re-emerge ${PN}."
- elog
-}
-
-src_install() {
- insinto /usr/share/php
- doins -r PEAR/
- doins -r OS/
- doins PEAR.php System.php
- doins scripts/pearcmd.php
- doins scripts/peclcmd.php
-
- newbin scripts/pear.sh pear
- newbin scripts/peardev.sh peardev
- newbin scripts/pecl.sh pecl
-
- # adjust some scripts for current version
- for i in pearcmd.php peclcmd.php ; do
- sed "s:@pear_version@:${PEAR}:g" -i "${D}/usr/share/php/${i}" \
- || die "failed to sed pear_version"
- done
-
- for i in pear peardev pecl ; do
- sed "s:@bin_dir@:${EPREFIX}/usr/bin:g" -i "${D}/usr/bin/${i}" \
- || die "failed to sed @bin_dir@ in ${i}"
- sed "s:@php_dir@:${EPREFIX}/usr/share/php:g" -i "${D}/usr/bin/${i}" \
- || die "failed to sed @php_dir@ in ${i}"
- done
-
- sed "s:-d output_buffering=1:-d output_buffering=1 -d memory_limit=32M:g" \
- -i "${D}/usr/bin/pear" \
- || die "failed to set PHP ini values in pear executable"
-
- sed "s:@package_version@:${PEAR}:g" \
- -i "${D}/usr/share/php/PEAR/Command/Package.php" \
- || die "failed to sed @package_version@"
-
- sed "s:@PEAR-VER@:${PEAR}:g" \
- -i "${D}/usr/share/php/PEAR/Dependency2.php" \
- || die "failed to sed @PEAR-VER@ in Dependency2.php"
-
- sed "s:@PEAR-VER@:${PEAR}:g" \
- -i "${D}/usr/share/php/PEAR/PackageFile/Parser/v1.php" \
- || die "failed to sed @PEAR-VER@ in v1.php"
-
- sed "s:@PEAR-VER@:${PEAR}:g" \
- -i "${D}/usr/share/php/PEAR/PackageFile/Parser/v2.php" \
- || die "failed to sed @PEAR-VER@ in v2.php"
-
- # finalize install
- insinto /etc
- newins "${FILESDIR}"/pear.conf-r2 pear.conf
-
- sed "s|s:PHPCLILEN:\"PHPCLI\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" \
- -i "${D}/etc/pear.conf" \
- || die "failed to sed PHPCLILEN in pear.conf"
-
- sed "s|s:CACHEDIRLEN:\"CACHEDIR\"|s:${#PEAR_CACHEDIR}:\"${PEAR_CACHEDIR}\"|g" \
- -i "${D}/etc/pear.conf" \
- || die "failed to sed CACHEDIRLEN in pear.conf"
-
- sed "s|s:DOWNLOADDIRLEN:\"DOWNLOADDIR\"|s:${#PEAR_DOWNLOADDIR}:\"${PEAR_DOWNLOADDIR}\"|g" \
- -i "${D}/etc/pear.conf" \
- || die "failed to sed DOWNLOADDIRLEN in pear.conf"
-
- sed "s|s:TEMPDIRLEN:\"TEMPDIR\"|s:${#PEAR_TEMPDIR}:\"${PEAR_TEMPDIR}\"|g" \
- -i "${D}/etc/pear.conf" \
- || die "failed to sed TEMPDIRLEN in pear.conf"
-
- # Change the paths for eprefix!
- sed "s|s:19:\"/usr/share/php/docs\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/docs\"|g" \
- -i "${D}/etc/pear.conf" \
- || die "failed to sed the docs path (prefix) in pear.conf"
-
- sed "s|s:19:\"/usr/share/php/data\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/data\"|g" \
- -i "${D}/etc/pear.conf" \
- || die "failed to sed the data path (prefix) in pear.conf"
-
- sed "s|s:20:\"/usr/share/php/tests\"|s:$(( ${#EPREFIX}+20 )):\"${EPREFIX}/usr/share/php/tests\"|g" \
- -i "${D}/etc/pear.conf" \
- || die "failed to sed the tests path (prefix) in pear.conf"
-
- sed "s|s:14:\"/usr/share/php\"|s:$(( ${#EPREFIX}+14 )):\"${EPREFIX}/usr/share/php\"|g" \
- -i "${D}/etc/pear.conf" \
- || die "failed to sed the PHP include path (prefix) in pear.conf"
-
- sed "s|s:8:\"/usr/bin\"|s:$(( ${#EPREFIX}+8 )):\"${EPREFIX}/usr/bin\"|g" \
- -i "${D}/etc/pear.conf" \
- || die "failed to sed the bin path (prefix) in pear.conf"
-
- [[ "${PEAR_TEMPDIR}" != "/tmp" ]] && keepdir "${PEAR_TEMPDIR#${EPREFIX}}"
- keepdir "${PEAR_CACHEDIR#${EPREFIX}}"
- diropts -m1777
- keepdir "${PEAR_DOWNLOADDIR#${EPREFIX}}"
-}
-
-pkg_postinst() {
- pear clear-cache || die "failed to clear PEAR cache"
-
- # Update PEAR/PECL channels as needed, add new ones to the list if needed
- elog "Updating PEAR/PECL channels"
- local pearchans="pear.php.net pecl.php.net pear.phing.info "
- pearchans+="pear.symfony-project.com"
-
- for chan in ${pearchans} ; do
- # The first command may fail if, for example, the channels have
- # already been initialized.
- pear channel-discover ${chan}
- pear channel-update ${chan} || die "failed to update channels"
- done
-}
diff --git a/dev-php/PEAR-PEAR/files/gentoo-libtool-mismatch-fix-v2.patch b/dev-php/PEAR-PEAR/files/gentoo-libtool-mismatch-fix-v2.patch
deleted file mode 100644
index f9a89410..00000000
--- a/dev-php/PEAR-PEAR/files/gentoo-libtool-mismatch-fix-v2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -aruN PEAR.orig/Builder.php PEAR/Builder.php
---- a/PEAR/Builder.php 2014-07-12 08:25:32.000000000 -0400
-+++ b/PEAR/Builder.php 2015-01-16 13:43:14.927894013 -0500
-@@ -340,6 +340,11 @@
- }
- // }}} end of interactive part
-
-+ if (file_exists('aclocal.m4')) {
-+ $this->_runCommand('rm aclocal.m4');
-+ $this->_runCommand('autoreconf');
-+ }
-+
- // FIXME make configurable
- if (!$user=getenv('USER')) {
- $user='defaultuser';
diff --git a/dev-php/PEAR-PEAR/files/gentoo-libtool-mismatch-fix.patch b/dev-php/PEAR-PEAR/files/gentoo-libtool-mismatch-fix.patch
deleted file mode 100644
index 53a33b83..00000000
--- a/dev-php/PEAR-PEAR/files/gentoo-libtool-mismatch-fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Fixed libtool mismatch issues.
-Gentoo bug: 344605
-
-*** PEAR/Builder.php.old Mon Nov 8 16:22:52 2010
---- PEAR/Builder.php Mon Nov 8 16:20:22 2010
-***************
-*** 326,331 ****
---- 326,336 ----
- }
- // }}} end of interactive part
-
-+ if (file_exists('aclocal.m4')) {
-+ $this->_runCommand('rm aclocal.m4');
-+ $this->_runCommand('autoreconf');
-+ }
-+
- // FIXME make configurable
- if(!$user=getenv('USER')){
- $user='defaultuser';
-***************
-*** 471,474 ****
- }
- return PEAR_Common::log($level, $msg);
- }
-! }
-\ No newline at end of file
---- 476,479 ----
- }
- return PEAR_Common::log($level, $msg);
- }
-! }
diff --git a/dev-php/PEAR-PEAR/files/pear.conf-r2 b/dev-php/PEAR-PEAR/files/pear.conf-r2
deleted file mode 100644
index 277227b4..00000000
--- a/dev-php/PEAR-PEAR/files/pear.conf-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-#PEAR_Config 0.9
-a:9:{s:7:"doc_dir";s:19:"/usr/share/php/docs";s:8:"data_dir";s:19:"/usr/share/php/data";s:8:"test_dir";s:20:"/usr/share/php/tests";s:7:"php_dir";s:14:"/usr/share/php";s:7:"bin_dir";s:8:"/usr/bin";s:7:"php_bin";s:12:"/usr/bin/php";s:9:"cache_dir";s:CACHEDIRLEN:"CACHEDIR";s:12:"download_dir";s:DOWNLOADDIRLEN:"DOWNLOADDIR";s:8:"temp_dir";s:TEMPDIRLEN:"TEMPDIR";}
diff --git a/dev-php/PEAR-PEAR/metadata.xml b/dev-php/PEAR-PEAR/metadata.xml
deleted file mode 100644
index 6470e34f..00000000
--- a/dev-php/PEAR-PEAR/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- php-bugs@gentoo.org
- PHP
-
-
- PEAR
-
-
diff --git a/dev-php/composer/Manifest b/dev-php/composer/Manifest
deleted file mode 100644
index fa30780f..00000000
--- a/dev-php/composer/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST composer-1.0.0-alpha11.phar 1179424 SHA256 47347f16d366145eafb45d2e800012dc80cb8fc08d1d299849825c51465381ac SHA512 ff2c81d66694f43777a46de1c91218983b0cb9d621fcb900c9df77e9a3a10020b9266a1b2e75bde77877c5129166d26ef0ef38c425785f1f2fae490b17f3a7c3 WHIRLPOOL ae9c5ff22cf3b645bc618ea0a9af133b55c611048778bfd0dbd163a5a76f25444e35eae17a8b39c7f8050f92679f6d221ff34be53f0eb12585027a381c6f2cd9
-EBUILD composer-1.0.0_alpha11.ebuild 632 SHA256 a04ae298c5a858306a290c71a6526ae572a7ffe692995111e2085708539bb8ef SHA512 20f58aa41062d822ff9d56bc2ee56ecfad3818729c2e04209496ac57e87563cb0f5690b3a23efb316e4dab3a279ae251ccba115c203fd67d200577c890bd9ca0 WHIRLPOOL c6d3dfa9e76a677f1517c59e3ec74daae28fac648b9dfbc5069b02978866522e7cfbf3d37c78b5a426c963f1b1c47bcf84f7726567bab16f425619f223606c61
diff --git a/dev-php/composer/composer-1.0.0_alpha11.ebuild b/dev-php/composer/composer-1.0.0_alpha11.ebuild
deleted file mode 100644
index a7c1cc46..00000000
--- a/dev-php/composer/composer-1.0.0_alpha11.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-inherit versionator
-
-DESCRIPTION="A dependancy manager for PHP"
-HOMEPAGE="http://getcomposer.org"
-
-MY_PV=$(replace_version_separator _ -)
-
-SRC_URI="http://getcomposer.org/download/${MY_PV}/composer.phar -> ${PN}-${MY_PV}.phar"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND=">=dev-lang/php-5.3.4"
-RDEPEND="dev-lang/php[zip,gmp,xmlreader]"
-
-src_unpack() {
- cp "${DISTDIR}/${A}" "${WORKDIR}"
- S=${WORKDIR}
-}
-
-src_install() {
- mv "${WORKDIR}/${A}" "${WORKDIR}/composer"
- dobin composer
-}
diff --git a/dev-php/libsmbclient-php/Manifest b/dev-php/libsmbclient-php/Manifest
index b6fb19cc..0ec23c31 100644
--- a/dev-php/libsmbclient-php/Manifest
+++ b/dev-php/libsmbclient-php/Manifest
@@ -1,2 +1,2 @@
-DIST libsmbclient-php-0.7.0.tar.gz 22235 SHA256 f31b5297c70173ba2f6ab3a95b713ad704a082a119fc9cbb82b1d84b3bb450d1 SHA512 de61a3873b9b90914e1c2568f0f94ba8e57df0a496c60ad8c7cce214d1a71f93d8e1371574592ff6ad48b072929e85759b40b4416d0aa6bda5ff5d237eab61cf WHIRLPOOL 9cddb691cf0e94bfcea9e7a8fc426ff3d0373eabcddf17bfb785dbc7c95c263f7b320122d49370c35f292f1b57626b061a8dd3bea1e2f37b5c78582721ad2d63
-EBUILD libsmbclient-php-0.7.0.ebuild 409 SHA256 3688e0c4c0047c16e40837f179295322af4b0d46a7160365999d6d5c47f98bc2 SHA512 7ca30386667dddc8492f3f4ec58a089ba110cc82cf61e968abc68055e2489430099ad75cec2b0112a16c482cd7eeb234cd20734ee7c71532db37083af16dde3c WHIRLPOOL 9defc787286c5574ebc1010317825fc8712e02897a77f4b72b96e2031735d3001ad947cb53851008c5911e5b55783bfc0de2309706e29ef0822c6485c6fee5fe
+DIST libsmbclient-php-0.9.0.tar.gz 31285 SHA256 2d23c23d4c3c070472a045f03d34de04b8b20ff93bd2ad65ad4478b46323e03e SHA512 fb54582f0067d758c6eab8d704071bad92f26a176035abaa6b067c8ffb6c866f7aca01e5f1fa9347bf5725a0aee98aad9b556cf4ebd050238cc2ce8a52a9c8f7 WHIRLPOOL 8785a5eb77ecbcfe99715cfcc76c7a43488503ce2696340c94307b2215c5f22b4deb8245aaa0029151aa4ea5b95876dc272221c5683b29867bc74f84f74f653f
+EBUILD libsmbclient-php-0.9.0.ebuild 515 SHA256 7c7ed952706a8856ba9eec2886aefe7be15473500e4aee0a7db94af99532170f SHA512 fedc3221fb30a8c10e74d3179d64eedfe8f05ab8b42b59ca70f46a495c86231bfc1ad4cd5577153aa46ff1c2ba421f83ca5520f0256a999483d6a9adef268b95 WHIRLPOOL 1e0be9f7836d354c0690d3d408e570a49d73564ba7313be52ad5f643bb7bb501aeabb01e656b23d41b1b37e603d7813d93a641a2cf9ef29d23fbe0a1dc226bc7
diff --git a/dev-php/libsmbclient-php/libsmbclient-php-0.7.0.ebuild b/dev-php/libsmbclient-php/libsmbclient-php-0.9.0.ebuild
similarity index 73%
rename from dev-php/libsmbclient-php/libsmbclient-php-0.7.0.ebuild
rename to dev-php/libsmbclient-php/libsmbclient-php-0.9.0.ebuild
index 886392f3..f3422d5e 100644
--- a/dev-php/libsmbclient-php/libsmbclient-php-0.7.0.ebuild
+++ b/dev-php/libsmbclient-php/libsmbclient-php-0.9.0.ebuild
@@ -3,7 +3,7 @@
EAPI=5
PHP_EXT_NAME="libsmbclient"
-USE_PHP="php5-6 php5-5 php5-4"
+USE_PHP="php5-6 php5-5 php5-4 php7-0"
inherit php-ext-source-r2 eutils
@@ -17,3 +17,9 @@ KEYWORDS="~amd64 ~x86"
DEPEND="|| ( >=net-fs/samba-4[client] g-pypi-0.3.ebuild:
- Clean up obsolete dependencies on virtual/python-argparse and virtual/python-
- unittest2 (those packages were only required for <=python-2.6).
-
- 19 Jul 2013; Michał Górny g-pypi-0.3.ebuild:
- Switch the dep back to dev-python/unittest2 due to bug #450648.
-
- 18 May 2013; Ian Delaney g-pypi-0.3.ebuild:
- rm listing argparse from setup.py & installed requires.txt, fixes Bug #69972
-
- 06 Jan 2013; Michał Górny g-pypi-0.3.ebuild:
- Use virtual/python-unittest2.
-
- 29 Oct 2012; Michał Górny g-pypi-0.3.ebuild:
- Use virtual for argparse.
-
- 23 Jul 2012; Mike Gilbert g-pypi-0.3.ebuild:
- Make sphinxcontrib-googleanalytics an unconditional dependency for by 427742
- by José Romildo Malaquias.
-
-*g-pypi-0.3 (28 Jun 2012)
-
- 28 Jun 2012; Mike Gilbert +g-pypi-0.3.ebuild,
- +metadata.xml:
- New package, bug 381939. Thanks to Domen Kožar (iElectric). Based on an ebuild
- generated by g-pypi.
diff --git a/dev-python/g-pypi/Manifest b/dev-python/g-pypi/Manifest
deleted file mode 100644
index d38f8b3c..00000000
--- a/dev-python/g-pypi/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST g-pypi-0.3.tar.gz 55676 SHA256 187e60191a82c86029644d4721a290c8124903d1a0a054b2e7229cab0f57d326 SHA512 fe89d9aff91435adf68d44054fc455b734edd5af331342b8b3774b0e931fc3578fdebe9d448f958da9e46295d0fa8d4297737fa44d92fd98f8a4bad4232df844 WHIRLPOOL 38ad0f997fc8f263b381df86caed069735b2b05b67fbf357517230334ba2662c26d8d2f0f8efa2df669a65537df64a8cb0a89f62157a3925a89b83ec3a53b00a
-EBUILD g-pypi-0.3.ebuild 1221 SHA256 a0eeb5fa64c99cd59890cfa8ec2248a21415554af19bf14d0ca0aafb20b68682 SHA512 02ae5ea365bad4acb9442ffc4fd9cf6665e416b572ec4d3ff88dbf2f3a25ab07f5f2db9e9f1aad08b2e764f3827807cc7c4737ad5609ed6198c6a8c365be2eb9 WHIRLPOOL 72fa45ce94548430736afd1eab13548bb541447e5bd87aa6521158b1ad3bb48d2e2e4a8f55bac42141c726ce78d198977b1216fbc34859aa3826def2d6ffd8c6
-MISC ChangeLog 1302 SHA256 315d7415774b497ba0629731ebcc7345a06a18bc47aeca27ce1cd1bb31d8d3ec SHA512 5b9a09339f7d18aaa46b543db276d0bddf0e92f2668142dfc392f91bcd4139aed975ee3fb1cabfc77582ba314fe5ae4512b185b9be08016af2af48258b70ee78 WHIRLPOOL 2357569c1dbd99a580a608d82be92262de882cf5349f65742c780bec5aa95abe42b735693ea9f970c139d95914bf560309fdb69e24d2d0b3267d3d4c78412109
-MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13
diff --git a/dev-python/g-pypi/g-pypi-0.3.ebuild b/dev-python/g-pypi/g-pypi-0.3.ebuild
deleted file mode 100644
index 0a0e7351..00000000
--- a/dev-python/g-pypi/g-pypi-0.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/g-pypi/g-pypi-0.3.ebuild,v 1.7 2014/07/06 12:41:29 mgorny Exp $
-
-EAPI="5"
-PYTHON_COMPAT=(python{2_6,2_7})
-
-inherit distutils-r1
-
-DESCRIPTION="Manages ebuilds using information from Python Package Index"
-HOMEPAGE="https://github.com/iElectric/g-pypi"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="doc test"
-
-DEPEND="
- dev-python/setuptools
- doc? (
- dev-python/sphinx
- )
- test? (
- dev-python/mock
- dev-python/mocker
- dev-python/scripttest
- )
-"
-# dev-python/unittest2 may not be necessary, bug #450648
-RDEPEND="
- app-portage/gentoolkit
- app-portage/gentoolkit-dev
- app-portage/metagen
- >=dev-python/jaxml-3.02
- dev-python/setuptools
- dev-python/jinja
- dev-python/pygments
- dev-python/sphinxcontrib-googleanalytics
- dev-python/unittest2
- dev-python/yolk
-"
-
-src_prepare() {
- distutils-r1_src_prepare
- sed -e "s:'argparse',::" -i setup.py || die
-}
-
-src_compile() {
- distutils-r1_src_compile
- use doc && emake -C docs html
-}
-
-src_install() {
- distutils-r1_src_install
- use doc && dohtml -r docs/build/html/*
-}
diff --git a/dev-python/g-pypi/metadata.xml b/dev-python/g-pypi/metadata.xml
deleted file mode 100644
index 301d2207..00000000
--- a/dev-python/g-pypi/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
- python
-
diff --git a/dev-python/python-nmap/Manifest b/dev-python/python-nmap/Manifest
index dd13ea9c..5caf1c9f 100644
--- a/dev-python/python-nmap/Manifest
+++ b/dev-python/python-nmap/Manifest
@@ -1,2 +1,2 @@
-DIST python-nmap-0.5.0.tar.gz 39836 SHA256 ec110d0b86b32ca8d18867a2a0fb9caa84e61a0b46f6cd5d611c31dd0a9234e9 SHA512 e12d15660d4fa62ce3e45a2474b014890974c28a43c8335a2376c905adb0620f9fbefec6093d5fa381a3d194eefa0e54ef31fb1ef57f28eb120f9dc9ef3ac99f WHIRLPOOL 021eaa7e4f4f85dfa7aa028e81ca8cc1da8671f9dadb88995d54c2c927dbf24cfaf357711a1c2ef3b580d70c55e1f7a4e241067c048ed2b59e41d2a5ead1acc2
-EBUILD python-nmap-0.5.0.ebuild 502 SHA256 ce66e0ac280fb529562d3fdd0d97ac1309e97013bd9e7f2dc2442cbef765d8ff SHA512 3b427d0330d467c33c4837a90a62a03865ae29c29dd1d215e4fc910dbabcc51305edf42fdfb149fd5a726b8514f8760be50763123b05722d9ddabfab492419a5 WHIRLPOOL 3683293082f15a4dbd1331282ac0f7f27550a27ada7ffd8b690769092586317aba73d92cd820de58b4c930b9e09821b810c19ab5207a57090fa22bb1575903c4
+DIST python-nmap-0.6.1.tar.gz 41953 SHA256 80ba0eb10a52283a54a633f40b5baa9c2ff08675d6621dd089ead942852f5bd3 SHA512 8de9ba6d0a4cecce09e82765b8a9ac77fb4368298d5a5f9ce07b7737a90def795f1ad00885fc73ec720bea2a592230e86aaca8cacd884c9299f64ad934bcee18 WHIRLPOOL 3a7bf42f88a19b637141aa385fc5b69ae8edbefbfce68563dac8b318e95b4129ce092a2339152e335d6894de70bff25ece45dac761d90b5251d58fcc0a272436
+EBUILD python-nmap-0.6.1.ebuild 546 SHA256 703e0e841bd8932fceb41c9cc38fe4b7cc5f40dd8730ddd7839f048808fe4d2a SHA512 ea5eadc5f9ad561cb962b06c56c5f540972fc7ec27232467e41b112efc19898678cbd65808d3d06321f12af1d0b1be251f613a150f276f5f66735ed1079a3658 WHIRLPOOL e897561b2e600961fc1676870c5dbaa6fc91ab35ad5912d2509208cf616f2d0398cc20166d98dcbb251729a7390f0429c9c81f7e270c3ca94c2d4d17ddf156f4
diff --git a/dev-python/python-nmap/python-nmap-0.5.0.ebuild b/dev-python/python-nmap/python-nmap-0.6.1.ebuild
similarity index 68%
rename from dev-python/python-nmap/python-nmap-0.5.0.ebuild
rename to dev-python/python-nmap/python-nmap-0.6.1.ebuild
index d7b582ac..77b94f04 100644
--- a/dev-python/python-nmap/python-nmap-0.5.0.ebuild
+++ b/dev-python/python-nmap/python-nmap-0.6.1.ebuild
@@ -10,8 +10,8 @@ inherit distutils-r1
DESCRIPTION="This is a python class to use nmap and access scan results from python3"
-HOMEPAGE="http://xael.org/norman/python/python-nmap/"
-SRC_URI="https://pypi.python.org/packages/source/p/python-nmap/${P}.tar.gz"
+HOMEPAGE="https://pypi.python.org/pypi/python-nmap"
+SRC_URI="https://pypi.python.org/packages/dc/f2/9e1a2953d4d824e183ac033e3d223055e40e695fa6db2cb3e94a864eaa84/${P}.tar.gz"
LICENSE="GPL-2"
KEYWORDS="~amd64"
diff --git a/dev-python/python-pushover/Manifest b/dev-python/python-pushover/Manifest
index e199099c..f28f2ca6 100644
--- a/dev-python/python-pushover/Manifest
+++ b/dev-python/python-pushover/Manifest
@@ -1,3 +1,3 @@
-DIST python-pushover-0.2.tar.gz 19243 SHA256 39eefdcfa2335a4ad98bd321a25b56936abed4ea5922ba3fc372d091273e0775 SHA512 de33b1085a92b040ba7c3d10f943531b1717a2809947def2a9ad7ec85a952d3f876dae3781c31336de22379f627645a6d29462e87d76e9eee93f850799e62474 WHIRLPOOL 2e765df6be2957b66fc89b7b62722796cdc3df83c91409e92e7417e54383ce275df1a780ace9df3ce247356a523d770f675390c002e2e67d6a77b989adba9c6e
-EBUILD python-pushover-0.2.ebuild 611 SHA256 4ddccbb9656987b28893051b27d867f0fe84814034d4a2d701b4ca6ec0be7b7f SHA512 c626817d20664cb3d83f7dc7c36a7e1c065ec49afeccc28c427d7f804fe5574f5e5e8f6aabae506f13095b5fdf8a431281acb12dcdec60a6ca0d82ecf1dbdbe3 WHIRLPOOL 6fd5248a67d472da72758c098610b82eb2f738f970036a561e11d0eb621314bfddb95b260369b5a398554c1754c71c57104118a84f902028709003883bb40e4e
+DIST python-pushover-0.3.tar.gz 22883 SHA256 cdfaec28c5cf7816697e4fbe5da4e4b6550d2e9520e6651cf36b32acab3440bf SHA512 501dc8ac92194a4da9c7d61ddc3fc495af95070e43d51706d0c633418995546195be9671b45082832cca8c3e9cb93526b9f6973b3f30c86b9613dae49ffa856f WHIRLPOOL 3cb6d51b843520fc559d28e8bb47113b6d250c39b309545ffa28a3e240eac6e81c9d50f8cc22f4c00e298f8a143fb966eeeab0d021fe7b13b0774808c0e16fc0
+EBUILD python-pushover-0.3.ebuild 612 SHA256 65ca0675ebd59b7f49b1bb96574e163bebb6d90e24528ea4abb994561257b22d SHA512 ea55e36ba095cfb1940a805a219e620e36f5af2d7a1f817ac753d14456db68e0d58a0edb107caa20c457ad1962a471b836ff6f7489df38a8e77d40a29a7711c7 WHIRLPOOL bf97fc339c7465f95398467d228c5e3920f6b972407c419fabc3757665b38ecd087022cbf9041d06026131607fd1bed26946bda0e600288cbaf838f2023a0bae
MISC metadata.xml 198 SHA256 a6cced7fd655d4e5e10239d91957eb486c00169084460d93433922262241bcab SHA512 33543ed4e9dc5bc7a5459c9125d4261d6fb1b148e8b11a84c87180e91fc5df01e3198145283d225e2155f0da9f601df3f52501e8e8805029fe6f4ce039ca87f6 WHIRLPOOL 721377940fa57bccddaeb00f9862f73dd97d6eb58115d7ff85e81743e89d58f16efe91d84ebc4f2dd9aeb84802aa229a2be3182b15750e38cfbe581629232f54
diff --git a/dev-python/python-pushover/python-pushover-0.2.ebuild b/dev-python/python-pushover/python-pushover-0.3.ebuild
similarity index 86%
rename from dev-python/python-pushover/python-pushover-0.2.ebuild
rename to dev-python/python-pushover/python-pushover-0.3.ebuild
index 6e349b4e..4999449e 100644
--- a/dev-python/python-pushover/python-pushover-0.2.ebuild
+++ b/dev-python/python-pushover/python-pushover-0.3.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
DESCRIPTION="Comprehensive bindings and command line utility for the Pushover notification service"
HOMEPAGE="https://github.com/Thibauth/python-pushover"
-SRC_URI="https://pypi.python.org/packages/source/p/python-pushover/${P}.tar.gz"
+SRC_URI="https://github.com/Thibauth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
KEYWORDS="~amd64"
diff --git a/dev-python/python-sane/Manifest b/dev-python/python-sane/Manifest
index cc9065e0..60106ef2 100644
--- a/dev-python/python-sane/Manifest
+++ b/dev-python/python-sane/Manifest
@@ -1,2 +1,2 @@
-DIST python-sane-2.8.1.tar.gz 18756 SHA256 1d16a667f08ec127287c53ef46bac33683417eda28578177bb455ea38c2030f0 SHA512 fda0ee49061e29572f8b986d6b76d668f67cb08c983d2b72fe4dc9d5373fe94c742d232c1f094fc34b126d9c649c1fbc218d3683e7a239215ad4aa47559efa9e WHIRLPOOL d86503d5b16ee16c04e0c543c4c206e2fc1908bbb08c55f74ea8fa4919ea58a11645d16eb22ed98f873bb51338ad267c2f42fbc95a917fe7c96c85c26ce647f5
-EBUILD python-sane-2.8.1.ebuild 445 SHA256 48002cac485eebe85765a9522f0284976bb2c6625f7587d9b3fd0b38a798b6a6 SHA512 86e65207bdd2914b59a1b7487042693c7ca6d3f2904c8b0f2d79bc5ea31afdd75e0a169562aa248ac9dcde51b98e0f7b7bac7e6521acc180581fa68b5b709d88 WHIRLPOOL 8397aabb85efdcb8f318839aaf4e6421a46eef940d8b586cdcf229004d83e0c25451f7daa5d34d4fffb0fb376e9e83e485ddaf554cd843b2ad962256c835035d
+DIST python-sane-2.8.2.tar.gz 19812 SHA256 102cd25a1696ebd8639066dfe5fba8ac82373a9a1d50376c10df88e34ccc2485 SHA512 d1eb7ad23a01ded674703e173f41807bdf4f51a4efeed30eabfa1a2dc22dc272870f59afdb46f10cfcc0c06ef2aeb8c75439a1fe32b13c46a339d15218b8b338 WHIRLPOOL b0e6825f2dcf83f73995ae90de4623987d3ab2a06a0d17c804ad939b472aec0009e943904c66cc263805cc4302ad770747e3112e8f933d3604b65b4b0b934b50
+EBUILD python-sane-2.8.2.ebuild 445 SHA256 48002cac485eebe85765a9522f0284976bb2c6625f7587d9b3fd0b38a798b6a6 SHA512 86e65207bdd2914b59a1b7487042693c7ca6d3f2904c8b0f2d79bc5ea31afdd75e0a169562aa248ac9dcde51b98e0f7b7bac7e6521acc180581fa68b5b709d88 WHIRLPOOL 8397aabb85efdcb8f318839aaf4e6421a46eef940d8b586cdcf229004d83e0c25451f7daa5d34d4fffb0fb376e9e83e485ddaf554cd843b2ad962256c835035d
diff --git a/dev-python/python-sane/python-sane-2.8.1.ebuild b/dev-python/python-sane/python-sane-2.8.2.ebuild
similarity index 100%
rename from dev-python/python-sane/python-sane-2.8.1.ebuild
rename to dev-python/python-sane/python-sane-2.8.2.ebuild