Subject: [bug#27944] perl-net-psyc: Update to 1.2

From: ng0 <[email-masked]>
Date: Fri, 4 Aug 2017 08:56:56 +0000

The appended patch updates to 1.2, as it builds from git
I have included the commit + revision numbers in the version.

Changes:
Dependency on rxaudio is removed, the author has worked on
a new version of the binary which required this with primarily
mplayer support. rxaudio is now optional. It can still be used,
but you have to have it in the path and pass a switch to psycamp.
This is all commented in the perl script, the overall impression
I have is that it no longer promotes rxaudio because mplayer is
supported.

Issues:
I ran into the "dotless @INC" issue here. Is this fixed on
core-updates?

user@abyayala ~$ psycion
BEGIN failed--compilation aborted at /gnu/store/kxscm40rignddlas7qxpdb4bmi0qrqld-perl-net-psyc-1.2-1.5a24e0e/bin/.psycion-real line 41.

-- 
ng0
GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588
GnuPG: https://n0is.noblogs.org/my-keys
https://www.infotropique.org https://krosos.org
From 03691625a0ec0b05407601f32686aeb9bf3fd76a Mon Sep 17 00:00:00 2001
From: ng0 <[email-masked]>
Date: Fri, 4 Aug 2017 08:06:37 +0000
Subject: [PATCH] gnu: perl-net-psyc: Update to 1.2.

* gnu/packages/messaging.scm (perl-net-psyc): Update to 1.2.
(source): Switch to git.
---
 gnu/packages/messaging.scm | 149 +++++++++++++++++++++++----------------------
 1 file changed, 75 insertions(+), 74 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index eb9e86915..07c06d3fe 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2015 Andreas Enge <[email-masked]>
 ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <[email-masked]>
 ;;; Copyright © 2015 Efraim Flashner <[email-masked]>
-;;; Copyright © 2016, 2017 <[email-masked]>
+;;; Copyright © 2016, 2017 <[email-masked]>
 ;;; Copyright © 2016 Andy Patterson <[email-masked]>
 ;;; Copyright © 2016, 2017 Clément Lassieur <[email-masked]>
 ;;; Copyright © 2017 Mekeor Melire <[email-masked]>
@@ -939,84 +939,85 @@ into existing applications.")
     (home-page "https://camaya.net/gloox")
     (license license:gpl3)))
 
+;; There is no release tarball of this release version.
 (define-public perl-net-psyc
-  (package
-    (name "perl-net-psyc")
-    (version "1.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "http://perlpsyc.psyc.eu/"
-                           "perlpsyc-" version ".zip"))
-       (file-name (string-append name "-" version ".zip"))
-       (sha256
-        (base32
-         "1lw6807qrbmvzbrjn1rna1dhir2k70xpcjvyjn45y35hav333a42"))
-       ;; psycmp3 currently depends on MP3::List and rxaudio (shareware),
-       ;; we can add it back when this is no longer the case.
-       (snippet '(delete-file "contrib/psycmp3"))))
-    (build-system perl-build-system)
-    (inputs
-     `(("perl-curses" ,perl-curses)
-       ("perl-io-socket-ssl" ,perl-io-socket-ssl)))
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (delete 'configure) ; No configure script
-         ;; There is a Makefile, but it does not install everything
-         ;; (leaves out psycion) and says
-         ;; "# Just to give you a rough idea". XXX: Fix it upstream.
-         (replace 'build
-           (lambda _
-             (zero? (system* "make" "manuals"))))
-         (replace 'install
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (doc (string-append out "/share/doc/perl-net-psyc"))
-                    (man1 (string-append out "/share/man/man1"))
-                    (man3 (string-append out "/share/man/man3"))
-                    (bin (string-append out "/bin"))
-                    (libpsyc (string-append out "/lib/psyc/ion"))
-                    (libperl (string-append out "/lib/perl5/site_perl/"
-                                            ,(package-version perl))))
+  (let ((commit "5a24e0e643885a16e7c3b7b6ac50e4db31e476d0")
+        (revision "1"))
+    (package
+      (name "perl-net-psyc")
+      (version (string-append "1.2-" revision "." (string-take commit 7)))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "git://git.psyced.org/git/perlpsyc")
+               (commit commit)))
+         (file-name (string-append name "-" version "-checkout"))
+         (sha256
+          (base32
+           "16kwxzkrfzl1hq02ablmflbaciijlyd4d7ggqhpabb8m7xn5vx7w"))))
+      (build-system perl-build-system)
+      (inputs
+       `(("perl-curses" ,perl-curses)
+         ("perl-io-socket-ssl" ,perl-io-socket-ssl)))
+      (arguments
+       `(#:phases
+         (modify-phases %standard-phases
+           (delete 'configure) ; No configure script
+           ;; There is a Makefile, but it does not install everything
+           ;; (leaves out psycion) and says
+           ;; "# Just to give you a rough idea". XXX: Fix it upstream.
+           (replace 'build
+             (lambda _
+               (zero? (system* "make" "manuals"))))
+           (replace 'install
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let* ((out (assoc-ref outputs "out"))
+                      (doc (string-append out "/share/doc/perl-net-psyc"))
+                      (man1 (string-append out "/share/man/man1"))
+                      (man3 (string-append out "/share/man/man3"))
+                      (bin (string-append out "/bin"))
+                      (libpsyc (string-append out "/lib/psyc/ion"))
+                      (libperl (string-append out "/lib/perl5/site_perl/"
+                                              ,(package-version perl))))
 
-               (copy-recursively "lib/perl5" libperl)
-               (copy-recursively "lib/psycion" libpsyc)
-               (copy-recursively "bin" bin)
-               (install-file "cgi/psycpager" (string-append doc "/cgi"))
-               (copy-recursively "contrib" (string-append doc "/contrib"))
-               (copy-recursively "hooks" (string-append doc "/hooks"))
-               (copy-recursively "sdj" (string-append doc "/sdj"))
-               (install-file "README.txt" doc)
-               (install-file "TODO.txt" doc)
-               (copy-recursively "share/man/man1" man1)
-               (copy-recursively "share/man/man3" man3)
-               #t)))
-         (add-after 'install 'wrap-programs
-           (lambda* (#:key outputs #:allow-other-keys)
-             ;; Make sure all executables in "bin" find the Perl modules
-             ;; provided by this package at runtime.
-             (let* ((out  (assoc-ref outputs "out"))
-                    (bin  (string-append out "/bin/"))
-                    (path (getenv "PERL5LIB")))
-               (for-each (lambda (file)
-                           (wrap-program file
-                             `("PERL5LIB" ":" prefix (,path))))
-                         (find-files bin "\\.*$"))
-               #t))))))
-    (description
-     "@code{Net::PSYC} with support for TCP, UDP, Event.pm, @code{IO::Select} and
+                 (copy-recursively "lib/perl5" libperl)
+                 (copy-recursively "lib/psycion" libpsyc)
+                 (copy-recursively "bin" bin)
+                 (install-file "cgi/psycpager" (string-append doc "/cgi"))
+                 (copy-recursively "contrib" (string-append doc "/contrib"))
+                 (copy-recursively "hooks" (string-append doc "/hooks"))
+                 (copy-recursively "sdj" (string-append doc "/sdj"))
+                 (install-file "README.txt" doc)
+                 (install-file "TODO.txt" doc)
+                 (copy-recursively "share/man/man1" man1)
+                 (copy-recursively "share/man/man3" man3)
+                 #t)))
+           (add-after 'install 'wrap-programs
+             (lambda* (#:key outputs #:allow-other-keys)
+               ;; Make sure all executables in "bin" find the Perl modules
+               ;; provided by this package at runtime.
+               (let* ((out  (assoc-ref outputs "out"))
+                      (bin  (string-append out "/bin/"))
+                      (path (getenv "PERL5LIB")))
+                 (for-each (lambda (file)
+                             (wrap-program file
+                               `("PERL5LIB" ":" prefix (,path))))
+                           (find-files bin "\\.*$"))
+                 #t))))))
+      (description
+       "@code{Net::PSYC} with support for TCP, UDP, Event.pm, @code{IO::Select} and
 Gtk2 event loops.  This package includes 12 applications and additional scripts:
 psycion (a @uref{http://about.psyc.eu,PSYC} chat client), remotor (a control console
 for @uref{https://torproject.org,tor} router) and many more.")
-    (synopsis "Perl implementation of PSYC protocol")
-    (home-page "http://perlpsyc.psyc.eu/")
-    (license (list license:gpl2
-                   license:perl-license
-                   ;; contrib/irssi-psyc.pl:
-                   license:public-domain
-                   ;; bin/psycplay states AGPL with no version:
-                   license:agpl3+))))
+      (synopsis "Perl implementation of PSYC protocol")
+      (home-page "http://perlpsyc.psyc.eu/")
+      (license (list license:gpl2
+                     license:perl-license
+                     ;; contrib/irssi-psyc.pl:
+                     license:public-domain
+                     ;; bin/psycplay states AGPL with no version:
+                     license:agpl3+)))))
 
 (define-public libpsyc
   (package
-- 
2.13.4