gentoo resync : 03.03.2019

8 files changed, 42 insertions, 172 deletions

diff --git a/app-text/wgetpaste/Manifest b/app-text/wgetpaste/Manifest
index 649037ffd29c..aa34497c65b1 100644
--- a/app-text/wgetpaste/Manifest
+++ b/app-text/wgetpaste/Manifest
@@ -1,9 +1,4 @@
-AUX wgetpaste-2.25-pinnwand-raw.patch 463 BLAKE2B 245c70767e886b7dae22fce03695897ef2b3dbde98f72c312488ef04e5be375fc618514cab98ee50fd87d5d8fc347837423aad93a7a197dde372822f1bd3428f SHA512 96add7303eae8c51a6d218fe3ed5de9bae7989d2771ddef0f4569c73c4bb1c61fc8451620e50eb26a749dd1c74c892cef503c170101561f4c4f00efd97ce688c
-AUX wgetpaste-2.25-pinnwand.patch 6240 BLAKE2B c46f6683159f91fa0d3c1775d533f1a0d43cccd1a1291f405a8270f547e5255c546974b532aade11baf3500111005544ebbfd6c43a1a75a1ebbd3a844cb1b713 SHA512 28885bd7ed1e6ad7e6eba5283435fc9a40264cefd9bf021ad1873596866fb438f24113610fee55787e92bc8db688f9a7dd1b38e4382ceeefa4dddb981b9ce129
-AUX wgetpaste-config-services 105 BLAKE2B b2ee82eb523622a46b7b9922276703a3afa15fdb52589d4430f56e59d24445e5ca8280d1aa16e1ec13c6b51bcb0af540c0390c82c2d7d77f83d9ca020ad27774 SHA512 7b1e519461b7357139d0a0541f9f80fc95e0b24daa620de980703621a9ece261a2c05e93ec6b1100761cf2ecbb4ea5f73fc424c6d670d0a70b721026b8f236e3
-DIST wgetpaste-2.25.tar.bz2 11107 BLAKE2B 1ed46ada9045326583900a78bbbd66ea7776ae7ae7191b14f258ef417ef65c344d6ff7e6c5ac0592d93c2936bc189ea0a33c18a8f2e6a0eb9e4e1d9d3b67701b SHA512 c3cd56f32311c77ce5ac970f0cd6b2e8285cac3caaf61669237ac707ed3b9aab285fbe9dee6260ea13b8df41a22acfaa3b8439298560ab68c3a568d60557d82e
+AUX wgetpaste-remove-dead.patch 1069 BLAKE2B d11664112833cf72b3f0cfd338e6a3e7b41549b60dedb61915501f45f86d72e6003415fd30badb3820453c3b4c81829b34d5bbe501e33aba735b8668487f109d SHA512 edc121802218f7c32664d76e737195b50e167b8b86e62314bc5c818822ee8dca2807d0d38c81167c9771a9a2023ef507f509abed574bc5f1906fbf39ba72ee18
 DIST wgetpaste-2.28.tar.bz2 12448 BLAKE2B 231b6d00ecf9c355f45683d56537c0fe6a5d6561e42edee680b228f5a76e7e1b202669e429f7941b6daaf14682e5a8469521713930bb42387e168965acfccca2 SHA512 b3b9ee4bfbc52da6762b06c2640385eeedab7910ad1bc4e92ff9304371ec2442e2d30b69ebc0f1407a00a9c8afde398e00dc3d3c048452d730517227a68e6b97
-EBUILD wgetpaste-2.25-r3.ebuild 919 BLAKE2B a6b04fa999c708d990d074e5e40465e6bf518b6728423a1ee2c125911d7124fd466696f9c048b1c55ffc521c50767a95145f102a97ceb4eefdc8b8fc08bfd387 SHA512 749f899f89c0f1ba27b2fd937297fb2b27e4d749a7c232b8274fe89d530aa03082da70019bb120a8fb58fa74ee8180f437c0dcab4f427d487d3b16eb8408ffe6
-EBUILD wgetpaste-2.28-r1.ebuild 733 BLAKE2B b11cbdcdc7cb9fb600d5fcd4a502c6fab57502fdeb994a77df26dbc73398e44d4121cb8455f43b7823f2d6a20a234ab54a12421d758e29e14e071c3744f2c01e SHA512 6cfb7ae835d840368b7ddbe98ee6b318b07c229313e1e78cb10fca1899ed4eed366830f99c38718d3312a707c28f4ffd91b549eb80ac25a10fad118ac04a11af
-EBUILD wgetpaste-2.28.ebuild 706 BLAKE2B 69fce5b98143b44c27536b84e2d09f71d742dd39394cc57d0d4f40250cce44506326edc5f93c603fdbd09460147e953e38afecc31f6ae0afa0f4be7d50b9f124 SHA512 8eebb90528664d16898c6161ec38a5b10e09e81b4531693fc50b5af5265014fe8917f13b96f9b39eb3eaee2bac45337dc8af6536ec740840a6168a27a127fb41
+EBUILD wgetpaste-2.28-r2.ebuild 772 BLAKE2B e81c8037fc07bf3a23c6737f46de9b0476cd76807ac22cac780826d8ba20ad1dcded7bda972222aba61791fba785878ac396263ffe8cb65c92e139e5594fb78e SHA512 ba0f580616d54bec3965dcb8b4b75083ce4af51c06833af910badf135421d70e9bc0d1eaf0536c193f11f1a37410b3c78f151ae9be6bceed6a3a4d5e39ef9490
 MISC metadata.xml 355 BLAKE2B cfb82b6309e5508319685ccad6757d701ad60ca2c9b015bf04cd500348a1c43e951876917d60e118e4008088a40761cd57b0f08a220cf1e97b9f638a4efe086a SHA512 04699e3fb3122aa304bcb525a1130732c949473086ed946ae9051928e7e84edd5347cab006e6a31f0ad854c7d8f51f07c3e77f6e3a7dac450619f4decb52f2f5
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 1b4cd12b5dd1..000000000000
--- 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 64a23e4fd944..000000000000
--- 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 0f7014b17220..000000000000
--- 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/files/wgetpaste-remove-dead.patch b/app-text/wgetpaste/files/wgetpaste-remove-dead.patch
new file mode 100644
index 000000000000..038d5349a7c6
--- /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.25-r3.ebuild b/app-text/wgetpaste/wgetpaste-2.25-r3.ebuild
deleted file mode 100644
index b159d3d8f938..000000000000
--- 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-r2.ebuild
index 57bf3e74861c..30f97b5311ac 100644
--- a/app-text/wgetpaste/wgetpaste-2.28-r1.ebuild
+++ b/app-text/wgetpaste/wgetpaste-2.28-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 DESCRIPTION="Command-line interface to various pastebins"
 HOMEPAGE="http://wgetpaste.zlin.dk/"
@@ -9,12 +9,14 @@ 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"
+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
diff --git a/app-text/wgetpaste/wgetpaste-2.28.ebuild b/app-text/wgetpaste/wgetpaste-2.28.ebuild
deleted file mode 100644
index 92c22cb8573b..000000000000
--- 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
-}