Added patch for pinnwand engine, currently used on bpaste.net, thanks to nvinson. Bug #521854.

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8DBDADE

5 files changed, 110 insertions, 16 deletions

diff --git a/app-text/wgetpaste/ChangeLog b/app-text/wgetpaste/ChangeLog
index 1b4ee37a9fbd..e414f5419f68 100644
--- a/app-text/wgetpaste/ChangeLog
+++ b/app-text/wgetpaste/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/wgetpaste
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wgetpaste/ChangeLog,v 1.139 2014/08/15 11:49:51 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wgetpaste/ChangeLog,v 1.140 2014/09/07 10:47:21 maksbotan Exp $
+
+*wgetpaste-2.25-r1 (07 Sep 2014)
+
+  07 Sep 2014; Maxim Koltsov <maksbotan@gentoo.org>
+  +files/wgetpaste-2.25-pinnwand.patch, +wgetpaste-2.25-r1.ebuild,
+  -wgetpaste-2.25.ebuild, files/wgetpaste-config-services:
+  Added patch for pinnwand engine, currently used on bpaste.net, thanks to
+  nvinson. Bug #521854.
 
 *wgetpaste-2.25 (15 Aug 2014)
 
diff --git a/app-text/wgetpaste/Manifest b/app-text/wgetpaste/Manifest
index 0c5612397fde..57be43de9745 100644
--- a/app-text/wgetpaste/Manifest
+++ b/app-text/wgetpaste/Manifest
@@ -1,22 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX wgetpaste-2.25-pinnwand.patch 6219 SHA256 e849d721c23b0ca1bc0505f4f007d3c8a6facb518ed5da76adee779bd511d89d SHA512 88fcadae8edfdffe7a86b373c9925afc657b5681c5a154b40301bbb2f9706e47f76359227e4b0b7a7bdd14d2b01ee383045f19e8faeee718b0a09368119a66d8 WHIRLPOOL 89c12576c121369f80fd66815a41a943d1354c1a5a781b9fc248ab1d6b426a2c69f357c6a4cc399a267ea9b040ceb4a13b4a35d7337ac8e422086212031f4998
 AUX wgetpaste-config-default-lodgeit 25 SHA256 5de5d00c66474d70bd8e2e22f355b10ac39a22225c553b9b94c49494188296dc SHA512 dc32356ce0625f3115bc7d3707f9f12c06be201b32442291b96d5b228b57e164119c82bd3b55c593212583e0b8e56470672a8977927bf248971f8e51b425be30 WHIRLPOOL 0eae19406c2445269ca2f22c63aa5a53d637f53fc54366c8c3465092aab73ad00d1ae88d818ab775828a4c607ef29dac62257ab7170c0fdfa81f8617ae435d58
-AUX wgetpaste-config-services 166 SHA256 ab1101a1fa64ca4980e83eea7fcb0b10a85e42a20bb8f1795bbe3e91b1040019 SHA512 96c3c12ed03aaf57534e33ee9d4b424d13bac88cf867c18754e1fb4960d51b20b51006e85a390c5cd668ad86f44a2de0a47a4eb335a0e19dff8966c3fa674cee WHIRLPOOL c0e7d489b5730db599781a312d0b52a736d64583036bccd26a01c64f0897eb50a2325ee79d0f3cb2c9f454c732838eb79b1b9b4084dcd04ec479052838e93395
+AUX wgetpaste-config-services 105 SHA256 bdf8fe3cdb8ac049cd8aed21024896adca780e9d694a9e5b5d6d6ed6cbe7cb84 SHA512 7b1e519461b7357139d0a0541f9f80fc95e0b24daa620de980703621a9ece261a2c05e93ec6b1100761cf2ecbb4ea5f73fc424c6d670d0a70b721026b8f236e3 WHIRLPOOL a0b6fb8fbcf5ddcfe974dc660934ac2085b9a0182777ba495acdd512580952c5c480e7906f0b828351020aaca9a82cc11dcaf9dbd1f0201b25efc85fbe5bdacb
 DIST wgetpaste-2.22.tar.bz2 10842 SHA256 a903d4b93e487046226ad77037a28cb5f6cf2465bf212e5edf568c4135f6fe05 SHA512 4a9fd56b1d4924a863d10af38721469ac0116cb05b5e5e79f5ecf149ba2af69acf79a30bc66450b9363b2fa7116b20222073dc8d7bc1e7dbab79981e6ce80396 WHIRLPOOL c25fc58c0e0a01b0960ebb07e270c7c8136d1589f16eae9c1e94c614260b479abdbf5255d60d9ebe477c5acd201f0e598f69a3501cd127fb7f42e9a80b443d77
 DIST wgetpaste-2.25.tar.bz2 11107 SHA256 6a7e078e6607f4fe819fc52857a601630ec0f7d2ee855d3b1cd7e75a904c40f4 SHA512 c3cd56f32311c77ce5ac970f0cd6b2e8285cac3caaf61669237ac707ed3b9aab285fbe9dee6260ea13b8df41a22acfaa3b8439298560ab68c3a568d60557d82e WHIRLPOOL ad64e1d45cb49dd70a2b33e49e81f255b304def9e4b8d8c29ac4b4161fb7cc290574686a0488a731cd36f339fde0f78da90ad439f1b771b8d5bd2f2df9cd67c3
 EBUILD wgetpaste-2.22.ebuild 1130 SHA256 234e8b82e9ea97f6f18328cc188effe2538d66cd008a8a1879fc5278abd5a936 SHA512 291d4ef32fd2ca18ca95347109f4309258256c597cd70de817dc0588e72d0496035ca95bd6a8914b54da7bc0a9a6a3b2b152537098857a2376f38c3042d9f104 WHIRLPOOL b9afdd4d2883f934c604808a5363100279c7535e89d73461a7c8bfef3587c25b08e89151a79abe0b0aa9c2d3e9646a1c10b4c259a972373d0228a23ba3696a87
-EBUILD wgetpaste-2.25.ebuild 1026 SHA256 357453bdeff1033c4dcd6b33ab8efc6986b7150a2ae016316a42d3823b77439a SHA512 079a30372b3be63c952aa3d6a5935d4d2fd21b2a744748c2ae20394589b2d8a0e139ead485457973be7672b5a44726fce29ad66b9120285cd78178382d4497cf WHIRLPOOL 3c323db75e1a9674c0d94107e10ff121f5fe9b6ce2ac7e5fe81c11ca185a51a980e9d03a76fc80c674ad8864ed435d7ac58d9135b40a791e88979288ae16b45c
-MISC ChangeLog 16913 SHA256 f09cc5b825e722cb679cb56338749d4c2180feb75d525011866b6a1d0fd7ee4e SHA512 ce7eb379cea265a6bb0b91d68eb5b647f478aa65ffae3b8e124b6463f294596b773ead5fb6466efe7d2794f8ac3e8ab8a837a23a11862632c90aef6ca72fceae WHIRLPOOL ce8e22a8eb1e7605870fada988f733a7d23bafe7779cd6c84f503cc89914ed58b73c16e1e694ae5ee522b86d4abf038e04eecb53bad9a0832829ea8c11f7bc06
+EBUILD wgetpaste-2.25-r1.ebuild 1097 SHA256 99a73c3b4d7d4db168f2d847f80ef23455605e1e5c75dfe14f6c99730ad0dce5 SHA512 bf53d311de96f4a3ec4a2bdc24dc0861bd2f11fef42b045f22d14d7a74c78942426ed8f45b2d3c38e8ed7846462a33b2951bcf051a6abfc3b50907fb3d13dc15 WHIRLPOOL 400138748c8c080d472d9c69d7b849422f4c85a1aa7593848fe416b9f3912cd393d82155bfd9d17a6e882590f36b3251896855dfb4c931443333ea5baa6b252f
+MISC ChangeLog 17225 SHA256 3a9d683fbd503a38518b713c8e8fe28e6d2af3d6c4d1146fa9b9eb0b346b68c6 SHA512 1c4a6d16a96a3e3f195b3076c4d1645ef8ca376b705b52d0675d397372649a15e1e5b6f0c0f10214f97746a5e6d08fc563b8eb11d58dfc1847f55f74925eab35 WHIRLPOOL 6533f6e2181443add65403af5cc8897aee74f813cf380995999e27cdc4d7ff1674b0ef120a559b3111c8955ff23617eed540477bdd05db6a08574ad5f034f787
 MISC metadata.xml 453 SHA256 4a011eaf16109125b442dda3a4138063bce7b55488f6d096816a0a753f26e412 SHA512 f500a47e25030a64d45bb5c5d7967eaba2600f716bb975425eb85f41e4e35083f639b542bf22ac09a8e4625cc312733c728e101d9e066b70cd11fe96b0ab3740 WHIRLPOOL d0424206af5aec25d57b30809e326ff74a360572fa7e279a95a1547bf7a6fbb8fc4a0435df36ab40b084056987f755a1c43c2970da5fc1a48bade3707c0babe7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT7fPKAAoJEAmJmMX429re02QH/3PYpMx6VWi78QheNnXPmTwU
-diBULVY+6kkPnjT62r+jHeH3YtcrsE1LotvemiO1OLFTYVwQxmhk37qwY6pnisod
-ZZeAvqiGS87r5XQbVCAznSK1t22FKi/u8nzFddbJk8dSx7JBI/Cdfzo29GAb4aYJ
-mYujDZJvzf1SopMrWtB59nzGJ6rpYhE/07Q91ctUrRylEVchkhiOCEiaJ4n4fmW3
-UXpKzHrifvrvA31Lv5NGFT0/zWAZ4xxGASoH2v5fbvB1cTE6440SalffAhqT53sf
-3o69ABqyQxofbNOOD2ItdHc4hmpcZf6G0cFFr5urO2bEoVsV0W55FEd70t4PAmU=
-=kWAV
+iQEcBAEBCAAGBQJUDDecAAoJEAmJmMX429regekIALH8fJXDq7GbB08YsoMppWxR
+a8EY0QknZzP9H4XPOzbgVHeEhySNSiUvbur6VVfYQzC/wbUMNfn8yxAw+9ZvLDHb
+FrUP468+WhBj/EFpGHvPHEanQrUQFCNRb+xDTTnI6Zz9mSBYcq/ZOE419NY/I0ec
+LDBtwmrDbSusIS6uFK0qHxHw3NPJyzKXnvgbUwwHaIoRUG71SLkMhxp6ZKPSf08u
+66OmHor63g7kjl35B/yi4fOsDQDPhjWjJMBgn8RNbXVGdEgl2lPny6bin2+DMbwv
+Us2ZX748Wqykr2Oj/91KjmfVedo/6nNMgKoceVUP5iZ7ne7rUGZetR+Z/mRTaJo=
+=e9pz
 -----END PGP SIGNATURE-----
diff --git a/app-text/wgetpaste/files/wgetpaste-2.25-pinnwand.patch b/app-text/wgetpaste/files/wgetpaste-2.25-pinnwand.patch
new file mode 100644
index 000000000000..cd1a5a2ccff7
--- /dev/null
+++ b/app-text/wgetpaste/files/wgetpaste-2.25-pinnwand.patch
@@ -0,0 +1,85 @@
+--- wgetpaste.old	2014-08-16 07:10:02.376075629 -0400
++++ wgetpaste	2014-08-31 16:02:46.996001592 -0400
+@@ -14,12 +14,14 @@ E=$'\e'
+ N=$'\n'
+ 
+ ### services
+ SERVICES="bpaste ca codepad dpaste gists poundpython"
+ # bpaste
+-ENGINE_bpaste=lodgeit
++ENGINE_bpaste=pinnwand
+ URL_bpaste="http://bpaste.net/"
++DEFAULT_EXPIRATION_bpaste="1week"
++DEFAULT_LANGUAGE_bpaste="text"
+ # ca
+ ENGINE_ca=ca
+ URL_ca="http://pastebin.ca/"
+ SIZE_ca="1024000 1%MB"
+ # codepad
+@@ -141,10 +143,66 @@ objective-c objective-j ocaml ooc perl p
+ ragel-c ragel-cpp ragel-d ragel-java ragel-objc ragel-ruby raw rconsole rebol redcode rst rhtml rb \
+ rbcon splus sass scala scheme smalltalk smarty sql sqlite3 squidconf tcl tcsh tex diff vala vb.net \
+ 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() {
+ 	echo "$@" >&2
+ 	exit 1
diff --git a/app-text/wgetpaste/files/wgetpaste-config-services b/app-text/wgetpaste/files/wgetpaste-config-services
index 17cffbb5368b..0f7014b17220 100644
--- a/app-text/wgetpaste/files/wgetpaste-config-services
+++ b/app-text/wgetpaste/files/wgetpaste-config-services
@@ -1,9 +1,6 @@
 #!/bin/bash
 
-SERVICES="${SERVICES} lugons bpaste"
+SERVICES="${SERVICES} lugons"
 
 ENGINE_lugons=lodgeit
 URL_lugons="https://paste.lugons.org/"
-
-ENGINE_bpaste=lodgeit
-URL_bpaste="http://bpaste.net"
diff --git a/app-text/wgetpaste/wgetpaste-2.25.ebuild b/app-text/wgetpaste/wgetpaste-2.25-r1.ebuild
index 872f7af73379..92d03a8c890c 100644
--- a/app-text/wgetpaste/wgetpaste-2.25.ebuild
+++ b/app-text/wgetpaste/wgetpaste-2.25-r1.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wgetpaste/wgetpaste-2.25.ebuild,v 1.1 2014/08/15 11:49:51 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wgetpaste/wgetpaste-2.25-r1.ebuild,v 1.1 2014/09/07 10:47:21 maksbotan Exp $
 
 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"
@@ -19,6 +21,7 @@ RDEPEND="net-misc/wget
 
 src_prepare() {
 	sed -i -e "s:/etc:\"${EPREFIX}\"/etc:g" wgetpaste || die
+	epatch "${FILESDIR}"/wgetpaste-2.25-pinnwand.patch
 }
 
 src_install() {