[gentoo-commits] repo/gentoo:master commit in: app-text/wgetpaste/, app-text/wgetpaste/files/

["Sam James" <sam@gentoo.org>]

commit:     ed023c4032fc830a3e851b86798665426b87fd31
Author:     Oskari Pirhonen <xxc3ncoredxx <AT> gmail <DOT> com>
AuthorDate: Sat Jan 14 21:41:55 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 14 23:22:49 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed023c40

app-text/wgetpaste: drop 2.29-r1, 2.30_p20210222-r2

Signed-off-by: Oskari Pirhonen <xxc3ncoredxx <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/29109
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-text/wgetpaste/Manifest                        |  2 --
 .../files/wgetpaste-2.29-fix-bpaste.patch          | 40 ----------------------
 .../files/wgetpaste-2.30-fix-dpaste-escapes.patch  | 13 -------
 app-text/wgetpaste/wgetpaste-2.29-r1.ebuild        | 28 ---------------
 .../wgetpaste/wgetpaste-2.30_p20210222-r2.ebuild   | 31 -----------------
 5 files changed, 114 deletions(-)

diff --git a/app-text/wgetpaste/Manifest b/app-text/wgetpaste/Manifest
index 15e185e5b013..9cb47b54e77f 100644
--- a/app-text/wgetpaste/Manifest
+++ b/app-text/wgetpaste/Manifest
@@ -1,4 +1,2 @@
-DIST wgetpaste-2.29.tar.bz2 12988 BLAKE2B 838b84632754f6e07c25fe3648e14bf939dff4e08ae8e8064e94008beb436f77738e4f54859115321fbf445a323641ebfecf5fd7d09bbbb46c72e913687deb07 SHA512 6596842733bb5d1d52cbb3cbcf61ba714f0cbfdc13acb4d6025ccfd27c214adaf886ac3a0a11baefaa4af3f33165619e5a3360b4e0807d29e8dc8ef5ff819bb6
-DIST wgetpaste-2.30_p20210222.tar.gz 14654 BLAKE2B e74332826f7faec3c2be2dddfd5f81d1ec14aec92888f27cdcd081b59262ac742003f2f48af3c3ca25be9e02f583a37dd1bec315236ab54912ebf6cf61308a10 SHA512 467daff5531fd6361ade87913ab867f67f72d5ffc07a35c263cd3dad65774ed31b3a6b0d69d2b52726a24419758d784c23e8c587f23e9028afd0e0a27966f32f
 DIST wgetpaste-2.32.tar.gz 16626 BLAKE2B a8628a47edec5797f011fdf648cccf4147043bb699fe6ebfc38b66d1bbff1840147613e1de1a2abf1048b83247e9a16026bed4174be605f99e59035cf7c64f9f SHA512 57f6194c864adf3eabffe46163d1c83a5c2c30affc4c353fee5cafe6aaf19cfa306e134cb5dd216577eb34cc93eee66b28297e5a1d4fa92d78d38597170d40bb
 DIST wgetpaste-2.33.tar.xz 16408 BLAKE2B 78baebf4edb6e6340a73127099366d306359d02c0c1eab137822c56669da0609a5479940b4fb2accbc79978df091dcd34415876618e64aa556d1584f74773736 SHA512 9bf1f379316da372b4f69296b54f9a266dcf9fdaa2a8718165a2029571f4c2c0166304ffebeb2ec4657ea6f49087793f40d9da383f5da052bce0543c90ea13ab

diff --git a/app-text/wgetpaste/files/wgetpaste-2.29-fix-bpaste.patch b/app-text/wgetpaste/files/wgetpaste-2.29-fix-bpaste.patch
deleted file mode 100644
index 0af9a6f855d7..000000000000
--- a/app-text/wgetpaste/files/wgetpaste-2.29-fix-bpaste.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 6175f89cb618fef83882ed86ab049a7fd1035770 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bo=20=C3=98rsted=20Andresen?= <zlin@exherbo.org>
-Date: Tue, 23 Jul 2019 00:16:19 +0200
-Subject: [PATCH] Fix handling of bpaste urls.
-
----
- wgetpaste | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/wgetpaste b/wgetpaste
-index 585fcd9..99eb7f1 100755
---- a/wgetpaste
-+++ b/wgetpaste
-@@ -181,7 +181,8 @@ xml+cheetah xml+django xml+evoque xml+lasso xml+mako xml+myghty xml+php xml+erb
- xml+velocity xml xquery xslt xtend yaml"
- EXPIRATIONS_pinnwand="1day 1week 1month never"
- POST_pinnwand="submit=Paste! % % lexer expiry % code"
--REGEX_RAW_pinnwand='s|^\(https\?://[^/]*/\)show\(/[[:alnum:]]*/\?\)$|\1raw\2|'
-+REGEX_LOC_pinnwand="\(/show/[^ ]*\).*$|https://bpaste.net\1"
-+REGEX_RAW_pinnwand='s|^\(https\?://[^/]*/\)show\(/[^ ]*/\?\)$|\1raw\2|'
- 
- ### errors
- die() {
-@@ -550,11 +551,15 @@ postdata() {
- 
- # get url from response from server
- geturl() {
--	local regex
-+	local regex location
- 	regex=REGEX_URL_$ENGINE
-+	location=REGEX_LOC_$ENGINE
- 	if [[ -n ${!regex} ]]; then
- 		[[ needstdout = $1 ]] && return 0
- 		sed -n -e "${!regex}" <<< "$*"
-+	elif [[ -n ${!location} ]]; then
-+		[[ needstdout = $1 ]] && return 1
-+		sed -n -e "s|^.*Location: ${!location}|p" <<< "$*"
- 	else
- 		[[ needstdout = $1 ]] && return 1
- 		sed -n -e 's|^.*Location: \(https\{0,1\}://[^ ]*\).*$|\1|p' <<< "$*"

diff --git a/app-text/wgetpaste/files/wgetpaste-2.30-fix-dpaste-escapes.patch b/app-text/wgetpaste/files/wgetpaste-2.30-fix-dpaste-escapes.patch
deleted file mode 100644
index b4d57f843c96..000000000000
--- a/app-text/wgetpaste/files/wgetpaste-2.30-fix-dpaste-escapes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/wgetpaste b/wgetpaste
-index 0f8219b..ed0bdac 100755
---- a/wgetpaste
-+++ b/wgetpaste
-@@ -110,6 +110,8 @@ Python Python%Interactive/Traceback Ruby Ruby%HTML%(ERB) SQL XML"
- LANGUAGE_VALUES_dpaste="% Apache Bash Css Diff DjangoTemplate Haskell JScript Python PythonConsole \
- Ruby Rhtml Sql Xml"
- EXPIRATIONS_dpaste=$(printf "%s " {1..365})
-+escape_description_dpaste() { echo "$*"; }
-+escape_input_dpaste() { echo "$*"; }
- POST_dpaste() {
- 	local title="${2}"
- 	local syntax="${3}"

diff --git a/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild b/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
deleted file mode 100644
index 2600ece9d578..000000000000
--- a/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="Command-line interface to various pastebins"
-HOMEPAGE="https://github.com/zlin/wgetpaste"
-SRC_URI="https://wgetpaste.zlin.dk/${P}.tar.bz2"
-
-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"
-
-RDEPEND="net-misc/wget[ssl?]"
-
-PATCHES=( "${FILESDIR}/${P}-fix-bpaste.patch" )
-
-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
deleted file mode 100644
index 42f4a1862ccb..000000000000
--- a/app-text/wgetpaste/wgetpaste-2.30_p20210222-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="Command-line interface to various pastebins"
-HOMEPAGE="https://github.com/zlin/wgetpaste"
-COMMIT_HASH="f9b08c50009485817e8b44300f79a92e37fe9f22"
-SRC_URI="https://github.com/zlin/wgetpaste/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
-
-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"
-
-RDEPEND="net-misc/wget[ssl?]"
-
-S="${WORKDIR}/${PN}-${COMMIT_HASH}"
-
-PATCHES=( "${FILESDIR}/wgetpaste-2.30-fix-dpaste-escapes.patch" )
-
-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
-}