From af951a33bb81b1d784c3f4ea7bb7ca472e5b8d2b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 29 Jul 2023 10:39:26 +0100 Subject: gentoo auto-resync : 29:07:2023 - 10:39:26 --- app-text/wgetpaste/Manifest | 3 +- .../files/wgetpaste-2.33-disable-sprunge.patch | 31 +++++++++++ app-text/wgetpaste/wgetpaste-2.33-r1.ebuild | 45 ---------------- app-text/wgetpaste/wgetpaste-2.33-r2.ebuild | 61 ++++++++++++++++++++++ 4 files changed, 94 insertions(+), 46 deletions(-) create mode 100644 app-text/wgetpaste/files/wgetpaste-2.33-disable-sprunge.patch delete mode 100644 app-text/wgetpaste/wgetpaste-2.33-r1.ebuild create mode 100644 app-text/wgetpaste/wgetpaste-2.33-r2.ebuild (limited to 'app-text/wgetpaste') diff --git a/app-text/wgetpaste/Manifest b/app-text/wgetpaste/Manifest index 4401595e5dda..f2964afbb754 100644 --- a/app-text/wgetpaste/Manifest +++ b/app-text/wgetpaste/Manifest @@ -1,4 +1,5 @@ +AUX wgetpaste-2.33-disable-sprunge.patch 790 BLAKE2B 9cd8c336072d7e2bff27a54d904ffa88331905dd8fe5a6a5d11c84c8fefc663bf24a481149bee8ff25f3d4140a81e6de5686ae97ffe545e77c52a2ea1c69d128 SHA512 179d3e38033d3f845c348c9a46fb40368c729fe721cc78580ed7b16ad507ead19595609998722c13423fdec6a1c9f2221fae34994840120f2ab2cdda65145d13 AUX wgetpaste-2.33-tests.patch 2742 BLAKE2B 3bb6c60de41ff4e428048816b093f40691de2a625e2a27a75b8db9f4e7333ab43778be704ddba01e2d5eb43a20f6ca6a83059f8bb2d04d08dc9d196901e53a17 SHA512 6d8a65215d4c1939c2f0acdd486171d37c4f1ef71b8ef6341fcf50db9cd057de1d616b3f3ac57820082d6fce1d8c75d72c8613865a0cf46df5fd3f5104716024 DIST wgetpaste-2.33.tar.xz 16408 BLAKE2B 78baebf4edb6e6340a73127099366d306359d02c0c1eab137822c56669da0609a5479940b4fb2accbc79978df091dcd34415876618e64aa556d1584f74773736 SHA512 9bf1f379316da372b4f69296b54f9a266dcf9fdaa2a8718165a2029571f4c2c0166304ffebeb2ec4657ea6f49087793f40d9da383f5da052bce0543c90ea13ab -EBUILD wgetpaste-2.33-r1.ebuild 955 BLAKE2B dde07f82c8edc0c18fc7ba646a70305ab42278d6631c6bcddb193d9aac33329ed64b9f995dd27a50a40d3d3a895bcde82c57023786404318a8e6732cd855ed48 SHA512 cb9cba9b2cb6678b4565732ae1ec287e5a56401492490cc78ef70eb69ef22269f2874cd28fd732289da1f988b2b5dca5cf394db91b2a9060b1ebf902bb084689 +EBUILD wgetpaste-2.33-r2.ebuild 1389 BLAKE2B d5a2404497194b01f451443922b38c28d65428cc98bb4b958b87facd6da6da71f743e0a0385202b1e0927b6012ecb19b876619390e79ac2f27a6d5f9ef93d2ba SHA512 4570060e6163857cc08416ef335bcac6da5e8cbf480ae22a7179a5f53cea0505376f49eb174e35ed60947c99a296d89a2ade01e3f254b2d24a6b9014b659a0e7 MISC metadata.xml 566 BLAKE2B 1f63219976e414e688b0e8b5d0ce84dc4480af3e59ebbbe550d26ca5973ac22148b87d1b43304bbbfbcaba1731d14a6f7639b7352e2b77d1141f8dee6875d2ce SHA512 779b873177a5b294e6a140d8d658980469b50cdb1c65f6c4a387e8af82f996f109ed14ae208f8603cdfc80ac0f9f0a50ad00202e92c0f5c6aaea13d01ecf8862 diff --git a/app-text/wgetpaste/files/wgetpaste-2.33-disable-sprunge.patch b/app-text/wgetpaste/files/wgetpaste-2.33-disable-sprunge.patch new file mode 100644 index 000000000000..8c6a523ac5cd --- /dev/null +++ b/app-text/wgetpaste/files/wgetpaste-2.33-disable-sprunge.patch @@ -0,0 +1,31 @@ +https://github.com/zlin/wgetpaste/pull/45 + +From ab4632ca9cd54c9e7478f37eee821113c0135c37 Mon Sep 17 00:00:00 2001 +From: Oskari Pirhonen +Date: Fri, 28 Jul 2023 18:55:10 -0500 +Subject: [PATCH] Disable sprunge + +Sprunge seems to have recently died. Disable it by removing it from the +service list, but keep the core bits in case it decides to come back. + +RIP ;( +--- + wgetpaste | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/wgetpaste b/wgetpaste +index 864d5ef..b3a537b 100755 +--- a/wgetpaste ++++ b/wgetpaste +@@ -41,7 +41,7 @@ POST_generic() { + } + + ### services +-SERVICES="0x0 bpaste codepad dpaste gists ix_io snippets sprunge" ++SERVICES="0x0 bpaste codepad dpaste gists ix_io snippets" + # 0x0 + ENGINE_0x0=0x0 + URL_0x0="http://0x0.st" +-- +2.41.0 + diff --git a/app-text/wgetpaste/wgetpaste-2.33-r1.ebuild b/app-text/wgetpaste/wgetpaste-2.33-r1.ebuild deleted file mode 100644 index 9550b6ea686d..000000000000 --- a/app-text/wgetpaste/wgetpaste-2.33-r1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit optfeature - -DESCRIPTION="Command-line interface to various pastebins" -HOMEPAGE="https://github.com/zlin/wgetpaste" -SRC_URI="https://github.com/zlin/wgetpaste/releases/download/${PV}/${P}.tar.xz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="+ssl" - -PROPERTIES="test_network" -RESTRICT="test" - -RDEPEND="net-misc/wget[ssl?]" - -PATCHES=( - "${FILESDIR}"/${PN}-2.33-tests.patch -) - -src_prepare() { - default - - sed -i -e "s:/etc:\"${EPREFIX}\"/etc:g" wgetpaste || die -} - -src_test() { - test/test.sh || die -} - -src_install() { - dobin ${PN} - insinto /usr/share/zsh/site-functions - doins _wgetpaste -} - -pkg_postinst() { - optfeature "ANSI (color code) stripping support" app-text/ansifilter - optfeature "xclip support" x11-misc/xclip -} diff --git a/app-text/wgetpaste/wgetpaste-2.33-r2.ebuild b/app-text/wgetpaste/wgetpaste-2.33-r2.ebuild new file mode 100644 index 000000000000..d7840c31c259 --- /dev/null +++ b/app-text/wgetpaste/wgetpaste-2.33-r2.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit optfeature + +DESCRIPTION="Command-line interface to various pastebins" +HOMEPAGE="https://github.com/zlin/wgetpaste" +SRC_URI="https://github.com/zlin/wgetpaste/releases/download/${PV}/${P}.tar.xz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="+ssl" + +PROPERTIES="test_network" +RESTRICT="test" + +RDEPEND="net-misc/wget[ssl?]" + +PATCHES=( + "${FILESDIR}"/${PN}-2.33-tests.patch + "${FILESDIR}"/${PN}-2.33-disable-sprunge.patch +) + +src_prepare() { + default + + sed -i -e "s:/etc:\"${EPREFIX}\"/etc:g" wgetpaste || die +} + +src_test() { + test/test.sh || die +} + +src_install() { + dobin ${PN} + insinto /usr/share/zsh/site-functions + doins _wgetpaste +} + +pkg_postinst() { + optfeature "ANSI (color code) stripping support" app-text/ansifilter + optfeature "xclip support" x11-misc/xclip + + if [[ -n ${REPLACING_VERSIONS} ]]; then + local old + + for old in ${REPLACING_VERSIONS}; do + if ver_test ${old} -lt '2.33-r2'; then + ewarn + ewarn "Sprunge is dead and the service has been dropped from the code. Remove or" + ewarn "replace sprunge as the default service in the system or user wgetpaste" + ewarn "config if applicable." + ewarn + break + fi + done + fi +} -- cgit v1.2.3