gentoo resync : 22.05.2021

4 files changed, 5 insertions, 37 deletions

diff --git a/app-text/wgetpaste/Manifest b/app-text/wgetpaste/Manifest
index 34d8b52a3e53..7edeb598daeb 100644
--- a/app-text/wgetpaste/Manifest
+++ b/app-text/wgetpaste/Manifest
@@ -2,7 +2,6 @@ AUX wgetpaste-2.29-fix-bpaste.patch 1401 BLAKE2B c7a08ac708aace5fbafcd8de2452133
 AUX wgetpaste-2.30-fix-dpaste-escapes.patch 493 BLAKE2B db87670a90aa94a2b79844d7b1abdf349cbb600118b8a2a09def19185bc2d3460cdce36f56a09f1c51e178e7927abfe50772b75c39889bef55a284fa0312fb6e SHA512 0cec0d469327c9d6700977f36744b24d1f450bb3486058ba43c233190dd2d4bc10c52d7a90a53896596a06534d39ed929cdea1a0facb5a1bd9c97f92c986f46b
 DIST wgetpaste-2.29.tar.bz2 12988 BLAKE2B 838b84632754f6e07c25fe3648e14bf939dff4e08ae8e8064e94008beb436f77738e4f54859115321fbf445a323641ebfecf5fd7d09bbbb46c72e913687deb07 SHA512 6596842733bb5d1d52cbb3cbcf61ba714f0cbfdc13acb4d6025ccfd27c214adaf886ac3a0a11baefaa4af3f33165619e5a3360b4e0807d29e8dc8ef5ff819bb6
 DIST wgetpaste-2.30_p20210222.tar.gz 14654 BLAKE2B e74332826f7faec3c2be2dddfd5f81d1ec14aec92888f27cdcd081b59262ac742003f2f48af3c3ca25be9e02f583a37dd1bec315236ab54912ebf6cf61308a10 SHA512 467daff5531fd6361ade87913ab867f67f72d5ffc07a35c263cd3dad65774ed31b3a6b0d69d2b52726a24419758d784c23e8c587f23e9028afd0e0a27966f32f
-EBUILD wgetpaste-2.29-r1.ebuild 689 BLAKE2B 3f803efebbe86ace4e41a78f358d820f2609f534b6b976cecebef1223754be95ec1301f4c7d03e50579a7a2e7586f7092deab40a224a660a2c2c86b38ea8ec81 SHA512 4818b22025d7b3e985479596558a3832371df3df2e5f9862c08eba3011d3bb022a87c3131ac6e421e99381a3bfb09468be133394e1b5470907f21396311bae13
-EBUILD wgetpaste-2.30_p20210222-r1.ebuild 771 BLAKE2B 4e3f23e7f0fff4a74b139cd5f5534f491a086d8c363cfbeea9f4180f5854df1b0fc9675176f273ab288c81411f40393b4dc35af1375dc996f912d49d56062dd7 SHA512 bf823e8f3dda78ad78594b4d2ba1f1b1cc75ee3b34c49c9ba6f42bd4f225ce6199e9c1a674f22747fa7d8806e7ba6e523e713cf59081fe55b8e8aa4175bc44d3
-EBUILD wgetpaste-2.30_p20210222-r2.ebuild 829 BLAKE2B 21ab964a57d4a27b95a0a4a1e12575a343c52254941d657933d0f80a9b897278677e0513322cbe06dbca25e4d2ee3cfed55f1e42e791b02529f422bd6e41a912 SHA512 666a06bab8f9820be2fb7eb3f5a7deac61255d6f62e10b8bc42fb083fc0acb6e4e79063f6dee5626bc4d704a3179116c2643022e8d02dd2ac738f4e6dd168d85
+EBUILD wgetpaste-2.29-r1.ebuild 669 BLAKE2B c0003f40085795be13306b8dd3b5fa26d5dba6d5475726aaf6e483e4e958ecd7ae862b3df089210beee017eefbfc30dc88a3e6aca3aa9b85e0e397b4b51baa5d SHA512 0fa556949fe80fe15d5231a2940e35b571b3403e5106659027368cfa562dec6bab0512f93442740db2d73bdff143fd4a708b01fb8bead94c96e226e986ff38af
+EBUILD wgetpaste-2.30_p20210222-r2.ebuild 819 BLAKE2B c109de02941711ed4d6d13887d1e34b89f271bfe8d45dd4139562b6f3a8eb9d782e26ebdbefb857994fc0e57fdcb20ebb72abbbd8cd939b53cef2b3eeb531f12 SHA512 c41ca1c9151e87de932e0ff1c5207e90f27c79e548d57491521573b6729f2a6aed8cdd5d63ae074e20949adc32630acfb38ad46dcb94a663837c8d7dc4323d48
 MISC metadata.xml 412 BLAKE2B e746785155941e2ca0d1c502bfc90a5f709b2afbf45e9e7f5ac291eea71ad67d54f5da691d72206556d7681ba5ebb8c9cd3bd8e1352353fdee802cd8fe7c2fff SHA512 1fecddde86406300943195b5be5502cb6efa1c5d061e56155946ec8b7fe9daaa74234f03a8f93a29a86544b0280ef58d697a9e96599d6fa5a2712d56c47ab236
diff --git a/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild b/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
index 664406626a3a..3f189edaa450 100644
--- a/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
+++ b/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -7,12 +7,11 @@ DESCRIPTION="Command-line interface to various pastebins"
 HOMEPAGE="http://wgetpaste.zlin.dk/"
 SRC_URI="http://wgetpaste.zlin.dk/${P}.tar.bz2"
 
-LICENSE="public-domain"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="+ssl"
 
-DEPEND=""
 RDEPEND="net-misc/wget[ssl?]"
 
 PATCHES=( "${FILESDIR}/${P}-fix-bpaste.patch" )
diff --git a/app-text/wgetpaste/wgetpaste-2.30_p20210222-r1.ebuild b/app-text/wgetpaste/wgetpaste-2.30_p20210222-r1.ebuild
deleted file mode 100644
index c3eb7ed45128..000000000000
--- a/app-text/wgetpaste/wgetpaste-2.30_p20210222-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="Command-line interface to various pastebins"
-HOMEPAGE="http://wgetpaste.zlin.dk/"
-
-COMMIT_HASH="f9b08c50009485817e8b44300f79a92e37fe9f22"
-SRC_URI="https://github.com/zlin/wgetpaste/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="+ssl"
-
-RDEPEND="net-misc/wget[ssl?]"
-
-S="${WORKDIR}/${PN}-${COMMIT_HASH}"
-
-src_prepare() {
-	sed -i -e "s:/etc:\"${EPREFIX}\"/etc:g" wgetpaste || die
-	default
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /usr/share/zsh/site-functions
-	doins _wgetpaste
-}
diff --git a/app-text/wgetpaste/wgetpaste-2.30_p20210222-r2.ebuild b/app-text/wgetpaste/wgetpaste-2.30_p20210222-r2.ebuild
index 62b07cb4f813..95f415fdbb80 100644
--- a/app-text/wgetpaste/wgetpaste-2.30_p20210222-r2.ebuild
+++ b/app-text/wgetpaste/wgetpaste-2.30_p20210222-r2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://wgetpaste.zlin.dk/"
 COMMIT_HASH="f9b08c50009485817e8b44300f79a92e37fe9f22"
 SRC_URI="https://github.com/zlin/wgetpaste/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="public-domain"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 amd64-linux ~x86-linux ~x64-macos"
 IUSE="+ssl"