From 8541447825a8befd11222b84152fb1cfc0f17383 Mon Sep 17 00:00:00 2001 From: Yixun Lan Date: Sat, 11 Nov 2023 23:38:05 +0000 Subject: app-text/wgetpaste: Revert "app-text/wgetpaste: add -q/--quiet" the version isn't updated, should not been pushed This reverts commit cc06acf6af6966565992c137bc843bcff54da812. Signed-off-by: Yixun Lan --- .../files/wgetpaste-2.33-added-quiet-flag.patch | 61 --------------------- app-text/wgetpaste/wgetpaste-2.33-r3.ebuild | 62 +++++++++++++++++++++ app-text/wgetpaste/wgetpaste-2.33-r4.ebuild | 63 ---------------------- 3 files changed, 62 insertions(+), 124 deletions(-) delete mode 100644 app-text/wgetpaste/files/wgetpaste-2.33-added-quiet-flag.patch create mode 100644 app-text/wgetpaste/wgetpaste-2.33-r3.ebuild delete mode 100644 app-text/wgetpaste/wgetpaste-2.33-r4.ebuild (limited to 'app-text') diff --git a/app-text/wgetpaste/files/wgetpaste-2.33-added-quiet-flag.patch b/app-text/wgetpaste/files/wgetpaste-2.33-added-quiet-flag.patch deleted file mode 100644 index f8bac315d2f2..000000000000 --- a/app-text/wgetpaste/files/wgetpaste-2.33-added-quiet-flag.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 75e68f79adaae7f50920e84a748b7ebb4a3a8a1d Mon Sep 17 00:00:00 2001 -From: Richard-Rogalski -Date: Mon, 6 Nov 2023 14:00:02 -0600 -Subject: [PATCH] Added --quiet flag - -Signed-off-by: Richard Rogalski -Closes: #19 ---- -See also: https://github.com/zlin/wgetpaste/pull/51 -- Oskari - - _wgetpaste | 1 + - wgetpaste | 6 +++++- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/_wgetpaste b/_wgetpaste -index c4703e5..63696ad 100644 ---- a/_wgetpaste -+++ b/_wgetpaste -@@ -50,6 +50,7 @@ _arguments -s : \ - '(--xclippaste -C)'{--xclippaste,-C}'[write resulting url to the X clipboard selection buffer]' \ - '(--raw -r)'{--raw,-r}'[show url for the raw paste]' \ - '(--tee -t)'{--tee,-t}'[use tee to show what is being pasted]' \ -+ '(--quiet -q)'{--quiet,-q}'[show the url only]' \ - '(--verbose -v)'{--verbose,-v}'[show wget stderr output if no url is received]' \ - '--debug[be very verbose]' \ - '(--help -h)'{--help,-h}'[show help and exit]' \ -diff --git a/wgetpaste b/wgetpaste -index fc0b559..d016515 100755 ---- a/wgetpaste -+++ b/wgetpaste -@@ -559,6 +559,7 @@ Options: - - -r, --raw show url for the raw paste (no syntax highlighting or html) - -t, --tee use tee to show what is being pasted -+ -q, --quiet show the url only - -v, --verbose show wget stderr output if no url is received - --completions emit output suitable for shell completions (only affects --list-*) - --debug be *very* verbose (implies -v) -@@ -657,7 +658,7 @@ showexpirations() { - } - - showurl() { -- echo -n "Your ${2}paste can be seen here: " >&2 -+ [[ $QUIET ]] || echo -n "Your ${2}paste can be seen here: " >&2 - echo "$1" - [[ $XPASTE ]] && x_paste "$1" primary - [[ $XCLIPPASTE ]] && x_paste "$1" clipboard -@@ -809,6 +810,9 @@ while [[ -n $1 ]]; do - -N | --no-ansi ) - NOANSI=0 - ;; -+ -q | --quiet) -+ QUIET=0 -+ ;; - -r | --raw ) - RAW=0 - ;; --- -2.41.0 - diff --git a/app-text/wgetpaste/wgetpaste-2.33-r3.ebuild b/app-text/wgetpaste/wgetpaste-2.33-r3.ebuild new file mode 100644 index 000000000000..89f63061351c --- /dev/null +++ b/app-text/wgetpaste/wgetpaste-2.33-r3.ebuild @@ -0,0 +1,62 @@ +# 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 + "${FILESDIR}"/${PN}-2.33-add-paste-gentoo-zip.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 +} diff --git a/app-text/wgetpaste/wgetpaste-2.33-r4.ebuild b/app-text/wgetpaste/wgetpaste-2.33-r4.ebuild deleted file mode 100644 index 4a7f3ee27a86..000000000000 --- a/app-text/wgetpaste/wgetpaste-2.33-r4.ebuild +++ /dev/null @@ -1,63 +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 - "${FILESDIR}"/${PN}-2.33-disable-sprunge.patch - "${FILESDIR}"/${PN}-2.33-add-paste-gentoo-zip.patch - "${FILESDIR}"/${PN}-2.33-added-quiet-flag.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-65-gdbad