* [gentoo-commits] repo/gentoo:master commit in: app-text/wgetpaste/, app-text/wgetpaste/files/
@ 2019-02-23 15:34 Ben Kohler
0 siblings, 0 replies; 7+ messages in thread
From: Ben Kohler @ 2019-02-23 15:34 UTC (permalink / raw
To: gentoo-commits
commit: 085038f1e996bdbb0502ef0b222a4e3cb0c83cb4
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 23 15:03:52 2019 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Sat Feb 23 15:33:46 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=085038f1
app-text/wgetpaste: revbump to work around broken default service
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
.../wgetpaste-2.28-remove-broken-services.patch | 20 +++++++++++++++
app-text/wgetpaste/wgetpaste-2.28-r2.ebuild | 29 ++++++++++++++++++++++
2 files changed, 49 insertions(+)
diff --git a/app-text/wgetpaste/files/wgetpaste-2.28-remove-broken-services.patch b/app-text/wgetpaste/files/wgetpaste-2.28-remove-broken-services.patch
new file mode 100644
index 00000000000..f648a6d15eb
--- /dev/null
+++ b/app-text/wgetpaste/files/wgetpaste-2.28-remove-broken-services.patch
@@ -0,0 +1,20 @@
+--- a/wgetpaste 2019-02-22 09:16:47.016742824 +0100
++++ a/wgetpaste 2019-02-22 09:21:05.049530136 +0100
+@@ -14,7 +14,7 @@ E=$'\e'
+ N=$'\n'
+
+ ### services
+-SERVICES="codepad bpaste dpaste gists poundpython"
++SERVICES="bpaste dpaste"
+ # bpaste
+ ENGINE_bpaste=pinnwand
+ URL_bpaste="https://bpaste.net/"
+@@ -722,7 +722,7 @@ load_configs() {
+ load_configs
+ [[ $SERVICESET ]] && verifyservice "$SERVICESET" && SERVICE=$(escape "$SERVICESET")
+ DEFAULT_NICK=${DEFAULT_NICK:-$(whoami)} || die "whoami failed"
+-DEFAULT_SERVICE=${DEFAULT_SERVICE:-poundpython}
++DEFAULT_SERVICE=${DEFAULT_SERVICE:-bpaste}
+ DEFAULT_LANGUAGE=${DEFAULT_LANGUAGE:-Plain Text}
+ DEFAULT_EXPIRATION=${DEFAULT_EXPIRATION:-1 month}
+ SERVICE=${SERVICE:-${DEFAULT_SERVICE}}
diff --git a/app-text/wgetpaste/wgetpaste-2.28-r2.ebuild b/app-text/wgetpaste/wgetpaste-2.28-r2.ebuild
new file mode 100644
index 00000000000..bae4fd9c2dc
--- /dev/null
+++ b/app-text/wgetpaste/wgetpaste-2.28-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Command-line interface to various pastebins"
+HOMEPAGE="http://wgetpaste.zlin.dk/"
+SRC_URI="http://wgetpaste.zlin.dk/${P}.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="+ssl"
+
+DEPEND=""
+RDEPEND="net-misc/wget[ssl?]"
+
+PATCHES=( "${FILESDIR}"/wgetpaste-2.28-remove-broken-services.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
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/wgetpaste/, app-text/wgetpaste/files/
@ 2019-02-23 18:43 Mikle Kolyada
0 siblings, 0 replies; 7+ messages in thread
From: Mikle Kolyada @ 2019-02-23 18:43 UTC (permalink / raw
To: gentoo-commits
commit: d07bf461eeac79f8eac953f09f45450808e800af
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 23 18:43:14 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Feb 23 18:43:43 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d07bf461
app-text/wgetpaste: version bump to disable did paste service
Closes: https://bugs.gentoo.org/678552
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
.../wgetpaste/files/wgetpaste-remove-dead.patch | 35 ++++++++++++++++++++++
app-text/wgetpaste/wgetpaste-2.28-r2.ebuild | 29 ++++++++++++++++++
2 files changed, 64 insertions(+)
diff --git a/app-text/wgetpaste/files/wgetpaste-remove-dead.patch b/app-text/wgetpaste/files/wgetpaste-remove-dead.patch
new file mode 100644
index 00000000000..038d5349a7c
--- /dev/null
+++ b/app-text/wgetpaste/files/wgetpaste-remove-dead.patch
@@ -0,0 +1,35 @@
+From 166ec045945eff08ca27129b38d2f5395710e8fb Mon Sep 17 00:00:00 2001
+From: Mikle Kolyada <zlogene@gentoo.org>
+Date: Sat, 23 Feb 2019 21:14:08 +0300
+Subject: [PATCH] fix wgetpaste services
+
+Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
+---
+ wgetpaste | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/wgetpaste b/wgetpaste
+index 2c198e0..def51de 100755
+--- a/wgetpaste
++++ b/wgetpaste
+@@ -14,7 +14,7 @@ E=$'\e'
+ N=$'\n'
+
+ ### services
+-SERVICES="codepad bpaste dpaste gists poundpython"
++SERVICES="codepad bpaste dpaste gists"
+ # bpaste
+ ENGINE_bpaste=pinnwand
+ URL_bpaste="https://bpaste.net/"
+@@ -722,7 +722,7 @@ load_configs() {
+ load_configs
+ [[ $SERVICESET ]] && verifyservice "$SERVICESET" && SERVICE=$(escape "$SERVICESET")
+ DEFAULT_NICK=${DEFAULT_NICK:-$(whoami)} || die "whoami failed"
+-DEFAULT_SERVICE=${DEFAULT_SERVICE:-poundpython}
++DEFAULT_SERVICE=${DEFAULT_SERVICE:-dpaste}
+ DEFAULT_LANGUAGE=${DEFAULT_LANGUAGE:-Plain Text}
+ DEFAULT_EXPIRATION=${DEFAULT_EXPIRATION:-1 month}
+ SERVICE=${SERVICE:-${DEFAULT_SERVICE}}
+--
+2.19.2
+
diff --git a/app-text/wgetpaste/wgetpaste-2.28-r2.ebuild b/app-text/wgetpaste/wgetpaste-2.28-r2.ebuild
new file mode 100644
index 00000000000..30f97b5311a
--- /dev/null
+++ b/app-text/wgetpaste/wgetpaste-2.28-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 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/"
+SRC_URI="http://wgetpaste.zlin.dk/${P}.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="+ssl"
+
+DEPEND=""
+RDEPEND="net-misc/wget[ssl?]"
+
+PATCHES=( "${FILESDIR}"/${PN}-remove-dead.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
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/wgetpaste/, app-text/wgetpaste/files/
@ 2019-02-23 18:46 Mikle Kolyada
0 siblings, 0 replies; 7+ messages in thread
From: Mikle Kolyada @ 2019-02-23 18:46 UTC (permalink / raw
To: gentoo-commits
commit: ad63d42005130927de7c9408d17f7d3ff0bbda9f
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 23 18:46:43 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Feb 23 18:46:43 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad63d420
app-text/wgetpaste: Drop old
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
app-text/wgetpaste/Manifest | 1 -
.../files/wgetpaste-2.25-pinnwand-raw.patch | 11 ---
.../wgetpaste/files/wgetpaste-2.25-pinnwand.patch | 87 ----------------------
app-text/wgetpaste/files/wgetpaste-config-services | 6 --
app-text/wgetpaste/wgetpaste-2.25-r3.ebuild | 32 --------
app-text/wgetpaste/wgetpaste-2.28-r1.ebuild | 27 -------
app-text/wgetpaste/wgetpaste-2.28.ebuild | 26 -------
7 files changed, 190 deletions(-)
diff --git a/app-text/wgetpaste/Manifest b/app-text/wgetpaste/Manifest
index e8c5b5027b8..957ed7adae8 100644
--- a/app-text/wgetpaste/Manifest
+++ b/app-text/wgetpaste/Manifest
@@ -1,2 +1 @@
-DIST wgetpaste-2.25.tar.bz2 11107 BLAKE2B 1ed46ada9045326583900a78bbbd66ea7776ae7ae7191b14f258ef417ef65c344d6ff7e6c5ac0592d93c2936bc189ea0a33c18a8f2e6a0eb9e4e1d9d3b67701b SHA512 c3cd56f32311c77ce5ac970f0cd6b2e8285cac3caaf61669237ac707ed3b9aab285fbe9dee6260ea13b8df41a22acfaa3b8439298560ab68c3a568d60557d82e
DIST wgetpaste-2.28.tar.bz2 12448 BLAKE2B 231b6d00ecf9c355f45683d56537c0fe6a5d6561e42edee680b228f5a76e7e1b202669e429f7941b6daaf14682e5a8469521713930bb42387e168965acfccca2 SHA512 b3b9ee4bfbc52da6762b06c2640385eeedab7910ad1bc4e92ff9304371ec2442e2d30b69ebc0f1407a00a9c8afde398e00dc3d3c048452d730517227a68e6b97
diff --git a/app-text/wgetpaste/files/wgetpaste-2.25-pinnwand-raw.patch b/app-text/wgetpaste/files/wgetpaste-2.25-pinnwand-raw.patch
deleted file mode 100644
index 1b4cd12b5dd..00000000000
--- a/app-text/wgetpaste/files/wgetpaste-2.25-pinnwand-raw.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /usr/bin/wgetpaste 2014-09-25 22:20:39.097103971 +0300
-+++ wgetpaste 2014-10-09 10:06:41.765195553 +0300
-@@ -200,7 +200,7 @@
- xml+velocity xml xquery xslt xtend yaml"
- EXPIRATIONS_pinnwand="1day 1week 1month never"
- POST_pinnwand="submit=Paste! % % lexer expiry % code"
--REGEX_RAW_pinnwand='s|^\(http://[^/]*/\)show\(/[[:alnum:]]*/\)$|\1raw\2|'
-+REGEX_RAW_pinnwand='s|^\(https\?://[^/]*/\)show\(/[[:alnum:]]*/\?\)$|\1raw\2|'
-
- ### errors
- die() {
diff --git a/app-text/wgetpaste/files/wgetpaste-2.25-pinnwand.patch b/app-text/wgetpaste/files/wgetpaste-2.25-pinnwand.patch
deleted file mode 100644
index 64a23e4fd94..00000000000
--- a/app-text/wgetpaste/files/wgetpaste-2.25-pinnwand.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- /var/tmp/portage/app-text/wgetpaste-2.25-r1/work/wgetpaste-2.25/wgetpaste 2014-05-23 20:51:44.000000000 +0400
-+++ /usr/bin/wgetpaste 2014-09-14 16:46:21.345261294 +0400
-@@ -16,8 +16,10 @@
- ### services
- SERVICES="bpaste ca codepad dpaste gists poundpython"
- # bpaste
--ENGINE_bpaste=lodgeit
--URL_bpaste="http://bpaste.net/"
-+ENGINE_bpaste=pinnwand
-+URL_bpaste="https://bpaste.net/"
-+DEFAULT_EXPIRATION_bpaste="1week"
-+DEFAULT_LANGUAGE_bpaste="text"
- # ca
- ENGINE_ca=ca
- URL_ca="http://pastebin.ca/"
-@@ -143,6 +145,62 @@
- vim xml xml+cheetah xml+django xml+evoque xml+mako xml+myghty xml+php xml+erb xml+smarty xslt yaml"
- POST_lodgeit="submit=Paste! % % language % % code"
- REGEX_RAW_lodgeit='s|^\(http://[^/]*/\)show\(/[[:alnum:]]*/\)$|\1raw\2|'
-+# pinnwand
-+LANGUAGES_pinnwand="ABAP ActionScript%3 ActionScript Ada ANTLR ANTLR%With%ActionScript%Target \
-+ANTLR%With%CPP%Target ANTLR%With%C#%Target ANTLR%With%Java%Target ANTLR%With%ObjectiveC%Target \
-+ANTLR%With%Perl%Target ANTLR%With%Python%Target ANTLR%With%Ruby%Target ApacheConf AppleScript \
-+AspectJ aspx-cs aspx-vb Asymptote autohotkey AutoIt Awk Base%Makefile Bash Bash%Session Batchfile \
-+BBCode Befunge BlitzMax Boo Brainfuck Bro BUGS ca65 CBM%BASIC%V2 C C++ C# Ceylon CFEngine3 \
-+cfstatement Cheetah Clojure CMake c-objdump COBOL COBOLFree CoffeeScript Coldfusion%HTML Common%Lisp \
-+Coq cpp-objdump Croc CSS CSS+Django/Jinja CSS+Genshi%Text CSS+Lasso CSS+Mako CSS+Myghty CSS+PHP \
-+CSS+Ruby CSS+Smarty CUDA Cython Darcs%Patch Dart D Debian%Control%file Debian%Sourcelist Delphi dg \
-+Diff Django/Jinja d-objdump DTD Duel Dylan DylanLID Dylan%session eC ECL Elixir Elixir%iex%session \
-+Embedded%Ragel ERB Erlang Erlang%erl%session Evoque Factor Fancy Fantom Felix Fortran FoxPro FSharp \
-+GAS Genshi Genshi%Text Gettext%Catalog Gherkin GLSL Gnuplot Go GoodData-CL Gosu Gosu%Template Groff \
-+Groovy Haml Haskell haXe HTML+Cheetah HTML+Django/Jinja HTML+Evoque HTML+Genshi HTML HTML+Lasso \
-+HTML+Mako HTML+Myghty HTML+PHP HTML+Smarty HTML+Velocity HTTP Hxml Hybris IDL INI Io Ioke IRC%logs \
-+Jade JAGS Java JavaScript+Cheetah JavaScript+Django/Jinja JavaScript+Genshi%Text JavaScript \
-+JavaScript+Lasso JavaScript+Mako JavaScript+Myghty JavaScript+PHP JavaScript+Ruby JavaScript+Smarty \
-+Java%Server%Page JSON Julia%console Julia Kconfig Koka Kotlin Lasso Lighttpd%configuration%file \
-+Literate%Haskell LiveScript LLVM Logos Logtalk Lua Makefile Mako MAQL Mason Matlab Matlab%session \
-+MiniD Modelica Modula-2 MoinMoin/Trac%Wiki%markup Monkey MOOCode MoonScript Mscgen MuPAD MXML Myghty \
-+MySQL NASM Nemerle NewLisp Newspeak Nginx%configuration%file Nimrod NSIS NumPy objdump Objective-C++ \
-+Objective-C Objective-J OCaml Octave Ooc Opa OpenEdge%ABL Perl PHP PL/pgSQL \
-+PostgreSQL%console%(psql) PostgreSQL%SQL%dialect PostScript POVRay PowerShell Prolog Properties \
-+Protocol%Buffer Puppet PyPy%Log Python%3.0%Traceback Python%3 Python%console%session Python \
-+Python%Traceback QML Racket Ragel%in%C%Host Ragel%in%CPP%Host Ragel%in%D%Host Ragel%in%Java%Host \
-+Ragel%in%Objective%C%Host Ragel%in%Ruby%Host Ragel Raw%token%data RConsole Rd REBOL Redcode reg \
-+reStructuredText RHTML RobotFramework RPMSpec Ruby%irb%session Ruby Rust Sass Scala \
-+Scalate%Server%Page Scaml Scheme Scilab SCSS Shell%Session Smali Smalltalk Smarty Snobol SourcePawn \
-+sqlite3con SQL SquidConf S Standard%ML Stan systemverilog Tcl Tcsh Tea TeX Text%only Text Treetop \
-+TypeScript UrbiScript Vala VB.net Velocity verilog VGL vhdl VimL XML+Cheetah XML+Django/Jinja \
-+XML+Evoque XML+Lasso XML+Mako XML+Myghty XML+PHP XML+Ruby XML+Smarty XML+Velocity XML XQuery XSLT \
-+Xtend YAML"
-+LANGUAGE_VALUES_pinnwand="abap as3 as ada antlr antlr-as antlr-cpp antlr-csharp antlr-java \
-+antlr-objc antlr-perl antlr-python antlr-ruby apacheconf applescript aspectj aspx-cs aspx-vb asy ahk \
-+autoit awk basemake bash console bat bbcode befunge blitzmax boo brainfuck bro bugs ca65 cbmbas c \
-+cpp csharp ceylon cfengine3 cfs cheetah clojure cmake c-objdump cobol cobolfree coffee-script cfm \
-+common-lisp coq cpp-objdump croc css css+django css+genshitext css+lasso css+mako css+myghty css+php \
-+css+erb css+smarty cuda cython dpatch dart d control sourceslist delphi dg diff django d-objdump dtd \
-+duel dylan dylan-lid dylan-console ec ecl elixir iex ragel-em erb erlang erl evoque factor fancy fan \
-+felix fortran Clipper fsharp gas genshi genshitext pot Cucumber glsl gnuplot go gooddata-cl gosu gst \
-+groff groovy haml haskell hx html+cheetah html+django html+evoque html+genshi html html+lasso \
-+html+mako html+myghty html+php html+smarty html+velocity http haxeml hybris idl ini io ioke irc jade \
-+jags java js+cheetah js+django js+genshitext js js+lasso js+mako js+myghty js+php js+erb js+smarty \
-+jsp json jlcon julia kconfig koka kotlin lasso lighty lhs live-script llvm logos logtalk lua make \
-+mako maql mason matlab matlabsession minid modelica modula2 trac-wiki monkey moocode moon mscgen \
-+mupad mxml myghty mysql nasm nemerle newlisp newspeak nginx nimrod nsis numpy objdump objective-c++ \
-+objective-c objective-j ocaml octave ooc opa openedge perl php plpgsql psql postgresql postscript \
-+pov powershell prolog properties protobuf puppet pypylog py3tb python3 pycon python pytb qml racket \
-+ragel-c ragel-cpp ragel-d ragel-java ragel-objc ragel-ruby ragel raw rconsole rd rebol redcode \
-+registry rst rhtml RobotFramework spec rbcon rb rust sass scala ssp scaml scheme scilab scss \
-+shell-session smali smalltalk smarty snobol sp sqlite3 sql squidconf splus sml stan systemverilog \
-+tcl tcsh tea tex text text treetop ts urbiscript vala vb.net velocity verilog vgl vhdl vim \
-+xml+cheetah xml+django xml+evoque xml+lasso xml+mako xml+myghty xml+php xml+erb xml+smarty \
-+xml+velocity xml xquery xslt xtend yaml"
-+EXPIRATIONS_pinnwand="1day 1week 1month never"
-+POST_pinnwand="submit=Paste! % % lexer expiry % code"
-+REGEX_RAW_pinnwand='s|^\(http://[^/]*/\)show\(/[[:alnum:]]*/\)$|\1raw\2|'
-
- ### errors
- die() {
-@@ -514,7 +572,7 @@
- sed -n -e "${!regex}" <<< "$*"
- else
- [[ needstdout = $1 ]] && return 1
-- sed -n -e 's|^.*Location: \(http://[^ ]*\).*$|\1|p' <<< "$*"
-+ sed -n -e 's|^.*Location: \(https\{0,1\}://[^ ]*\).*$|\1|p' <<< "$*"
- fi
- }
-
diff --git a/app-text/wgetpaste/files/wgetpaste-config-services b/app-text/wgetpaste/files/wgetpaste-config-services
deleted file mode 100644
index 0f7014b1722..00000000000
--- a/app-text/wgetpaste/files/wgetpaste-config-services
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-SERVICES="${SERVICES} lugons"
-
-ENGINE_lugons=lodgeit
-URL_lugons="https://paste.lugons.org/"
diff --git a/app-text/wgetpaste/wgetpaste-2.25-r3.ebuild b/app-text/wgetpaste/wgetpaste-2.25-r3.ebuild
deleted file mode 100644
index b159d3d8f93..00000000000
--- a/app-text/wgetpaste/wgetpaste-2.25-r3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="Command-line interface to various pastebins"
-HOMEPAGE="http://wgetpaste.zlin.dk/"
-SRC_URI="http://wgetpaste.zlin.dk/${P}.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND="net-misc/wget"
-
-src_prepare() {
- sed -i -e "s:/etc:\"${EPREFIX}\"/etc:g" wgetpaste || die
- epatch "${FILESDIR}"/wgetpaste-2.25-pinnwand.patch
- epatch "${FILESDIR}"/wgetpaste-2.25-pinnwand-raw.patch
-}
-
-src_install() {
- dobin ${PN}
- insinto /etc/wgetpaste.d
- newins "${FILESDIR}"/wgetpaste-config-services services.conf
- insinto /usr/share/zsh/site-functions
- doins _wgetpaste
-}
diff --git a/app-text/wgetpaste/wgetpaste-2.28-r1.ebuild b/app-text/wgetpaste/wgetpaste-2.28-r1.ebuild
deleted file mode 100644
index 57bf3e74861..00000000000
--- a/app-text/wgetpaste/wgetpaste-2.28-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Command-line interface to various pastebins"
-HOMEPAGE="http://wgetpaste.zlin.dk/"
-SRC_URI="http://wgetpaste.zlin.dk/${P}.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="+ssl"
-
-DEPEND=""
-RDEPEND="net-misc/wget[ssl?]"
-
-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.28.ebuild b/app-text/wgetpaste/wgetpaste-2.28.ebuild
deleted file mode 100644
index 92c22cb8573..00000000000
--- a/app-text/wgetpaste/wgetpaste-2.28.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="Command-line interface to various pastebins"
-HOMEPAGE="http://wgetpaste.zlin.dk/"
-SRC_URI="http://wgetpaste.zlin.dk/${P}.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND="net-misc/wget"
-
-src_prepare() {
- sed -i -e "s:/etc:\"${EPREFIX}\"/etc:g" wgetpaste || die
-}
-
-src_install() {
- dobin ${PN}
- insinto /usr/share/zsh/site-functions
- doins _wgetpaste
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/wgetpaste/, app-text/wgetpaste/files/
@ 2019-08-26 23:14 Louis Sautier
0 siblings, 0 replies; 7+ messages in thread
From: Louis Sautier @ 2019-08-26 23:14 UTC (permalink / raw
To: gentoo-commits
commit: dead0ce4020de9e4d2cc394b122f2ac03346010b
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 26 23:11:34 2019 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Mon Aug 26 23:12:50 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dead0ce4
app-text/wgetpaste: backport upstream's patch to fix bpaste.net
Package-Manager: Portage-2.3.71, Repoman-2.3.16
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
.../files/wgetpaste-2.29-fix-bpaste.patch | 40 ++++++++++++++++++++++
app-text/wgetpaste/wgetpaste-2.29-r1.ebuild | 29 ++++++++++++++++
2 files changed, 69 insertions(+)
diff --git a/app-text/wgetpaste/files/wgetpaste-2.29-fix-bpaste.patch b/app-text/wgetpaste/files/wgetpaste-2.29-fix-bpaste.patch
new file mode 100644
index 00000000000..0af9a6f855d
--- /dev/null
+++ b/app-text/wgetpaste/files/wgetpaste-2.29-fix-bpaste.patch
@@ -0,0 +1,40 @@
+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/wgetpaste-2.29-r1.ebuild b/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
new file mode 100644
index 00000000000..175617a320c
--- /dev/null
+++ b/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 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/"
+SRC_URI="http://wgetpaste.zlin.dk/${P}.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="+ssl"
+
+DEPEND=""
+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
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/wgetpaste/, app-text/wgetpaste/files/
@ 2021-02-25 16:57 Ben Kohler
0 siblings, 0 replies; 7+ messages in thread
From: Ben Kohler @ 2021-02-25 16:57 UTC (permalink / raw
To: gentoo-commits
commit: 2dea256ca4aa52a84ad01dc3f7dfe1067e304bce
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 25 16:57:11 2021 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Thu Feb 25 16:57:39 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dea256c
app-text/wgetpaste: fix dpaste escapes
Without this fix, all spaces are converted to "+", and more
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
.../files/wgetpaste-2.30-fix-dpaste-escapes.patch | 13 +++++++++
.../wgetpaste/wgetpaste-2.30_p20210222-r2.ebuild | 32 ++++++++++++++++++++++
2 files changed, 45 insertions(+)
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
new file mode 100644
index 00000000000..b4d57f843c9
--- /dev/null
+++ b/app-text/wgetpaste/files/wgetpaste-2.30-fix-dpaste-escapes.patch
@@ -0,0 +1,13 @@
+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.30_p20210222-r2.ebuild b/app-text/wgetpaste/wgetpaste-2.30_p20210222-r2.ebuild
new file mode 100644
index 00000000000..c4c95081e20
--- /dev/null
+++ b/app-text/wgetpaste/wgetpaste-2.30_p20210222-r2.ebuild
@@ -0,0 +1,32 @@
+# 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}"
+
+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
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/wgetpaste/, app-text/wgetpaste/files/
@ 2023-01-14 23:25 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2023-01-14 23:25 UTC (permalink / raw
To: gentoo-commits
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
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/wgetpaste/, app-text/wgetpaste/files/
@ 2023-07-29 3:13 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2023-07-29 3:13 UTC (permalink / raw
To: gentoo-commits
commit: e1d85b00ac57ee129fd4e82eba5462365dfa8d28
Author: Oskari Pirhonen <xxc3ncoredxx <AT> gmail <DOT> com>
AuthorDate: Sat Jul 29 02:52:23 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 29 03:12:55 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1d85b00
app-text/wgetpaste: disable sprunge
Sprunge seems dead...
Signed-off-by: Oskari Pirhonen <xxc3ncoredxx <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32089
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/wgetpaste-2.33-disable-sprunge.patch | 29 ++++++++++++++++++++++
...ste-2.33-r1.ebuild => wgetpaste-2.33-r2.ebuild} | 16 ++++++++++++
2 files changed, 45 insertions(+)
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..7d335728bea2
--- /dev/null
+++ b/app-text/wgetpaste/files/wgetpaste-2.33-disable-sprunge.patch
@@ -0,0 +1,29 @@
+From ab4632ca9cd54c9e7478f37eee821113c0135c37 Mon Sep 17 00:00:00 2001
+From: Oskari Pirhonen <xxc3ncoredxx@gmail.com>
+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-r2.ebuild
similarity index 68%
rename from app-text/wgetpaste/wgetpaste-2.33-r1.ebuild
rename to app-text/wgetpaste/wgetpaste-2.33-r2.ebuild
index 9550b6ea686d..d7840c31c259 100644
--- a/app-text/wgetpaste/wgetpaste-2.33-r1.ebuild
+++ b/app-text/wgetpaste/wgetpaste-2.33-r2.ebuild
@@ -21,6 +21,7 @@ RDEPEND="net-misc/wget[ssl?]"
PATCHES=(
"${FILESDIR}"/${PN}-2.33-tests.patch
+ "${FILESDIR}"/${PN}-2.33-disable-sprunge.patch
)
src_prepare() {
@@ -42,4 +43,19 @@ src_install() {
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
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-07-29 3:13 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-08-26 23:14 [gentoo-commits] repo/gentoo:master commit in: app-text/wgetpaste/, app-text/wgetpaste/files/ Louis Sautier
-- strict thread matches above, loose matches on Subject: below --
2023-07-29 3:13 Sam James
2023-01-14 23:25 Sam James
2021-02-25 16:57 Ben Kohler
2019-02-23 18:46 Mikle Kolyada
2019-02-23 18:43 Mikle Kolyada
2019-02-23 15:34 Ben Kohler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox