signing-party 1.1.7, vendor dependencies

1 files changed, 44 insertions, 18 deletions

diff --git a/Library/Formula/signing-party.rb b/Library/Formula/signing-party.rb
index af2765364..b00c72ee4 100644
--- a/Library/Formula/signing-party.rb
+++ b/Library/Formula/signing-party.rb
@@ -1,15 +1,15 @@
-require 'formula'
+require "formula"
 
 class GnupgInstalled < Requirement
   fatal true
-  default_formula 'gnupg2'
-  satisfy { which('gpg') || which('gpg2') }
+  default_formula "gnupg"
+  satisfy { which("gpg") || which("gpg2") }
 end
 
 class SigningParty < Formula
-  homepage 'http://pgp-tools.alioth.debian.org/'
-  url 'http://ftp.debian.org/debian/pool/main/s/signing-party/signing-party_1.1.5.orig.tar.gz'
-  sha1 '79b4aae0b8c23adda8a6438138154f3fb8d348ea'
+  homepage "http://pgp-tools.alioth.debian.org/"
+  url "http://ftp.debian.org/debian/pool/main/s/signing-party/signing-party_1.1.7.orig.tar.gz"
+  sha1 "8bb854eab064b67740a23c44c1bb2eb497d9fdeb"
 
   option 'with-rename-pgpring', 'Install pgpring as pgppubring to avoid conflicting with mutt'
 
@@ -18,13 +18,26 @@ class SigningParty < Formula
       :because => 'mutt installs a private copy of pgpring'
   end
 
+  depends_on "autoconf" => :build
+  depends_on "automake" => :build
+  depends_on "dialog"
+  depends_on "qprint"
   depends_on GnupgInstalled
-  depends_on 'dialog'
-  depends_on 'qprint'
-  depends_on 'MIME::Tools' => :perl
-  depends_on 'Text::Template' => :perl
-  depends_on 'Text::Iconv' => :perl
-  depends_on 'GnuPG::Interface' => :perl
+
+  resource "GnuPG::Interface" do
+    url "http://search.cpan.org/CPAN/authors/id/A/AL/ALEXMV/GnuPG-Interface-0.50.tar.gz"
+    sha1 "471c61d262552548df5980cbfc5ccbe6a4607aca"
+  end
+
+  resource "Text::Iconv" do
+    url "http://search.cpan.org/CPAN/authors/id/M/MP/MPIOTR/Text-Iconv-1.7.tar.gz"
+    sha1 "542849325b2d66c72e19ffb48bdc67fdd7e4bbea"
+  end
+
+  resource "Text::Template" do
+    url "http://search.cpan.org/CPAN/authors/id/M/MJ/MJD/Text-Template-1.46.tar.gz"
+    sha1 "008df9cfa6f9ab8d0b4f38c3e59d4e8679280bc1"
+  end
 
   # gpgparticipants data on OS X behaves differently from linux version
   # https://github.com/Homebrew/homebrew/pull/21628
@@ -35,6 +48,15 @@ class SigningParty < Formula
     # springraph is not included because it depends on the 'GD' perl module
     # which has its own dependency issues
 
+    ENV.prepend_create_path "PERL5LIB", libexec+"lib/perl5"
+
+    resources.each do |r|
+      r.stage do
+        system "perl", "Makefile.PL", "INSTALL_BASE=#{libexec}"
+        system "make", "install"
+      end
+    end
+
     doc.install 'README'
 
     cd 'caff' do
@@ -76,11 +98,13 @@ class SigningParty < Formula
     cd 'gpgsigs' do
       system "make"
       man1.install 'gpgsigs.1'
-      bin.install 'gpgsigs', 'gpgsigs-eps-helper'
+      bin.install 'gpgsigs'
       (doc/'gpgsigs').install Dir['gpgsigs-lt2k5*.txt']
     end
 
     cd 'keyanalyze' do
+      inreplace "pgpring/configure.in", "AM_C_PROTOTYPES", ""
+      inreplace "Makefile", "automake-1.11 --add-missing && automake-1.11", "autoreconf -fvi"
       system "make"
       if build.with? 'rename-pgpring'
         # Install pgpring as pgppubring to avoid conflicting with Mutt.
@@ -106,20 +130,22 @@ class SigningParty < Formula
       man1.install 'sig2dot.1'
       (doc/'sig2dot').install 'README.sig2dot'
     end
+
+    bin.env_script_all_files(libexec+"bin", "PERL5LIB" => ENV["PERL5LIB"])
   end
 end
 
 __END__
 diff --git a/gpgparticipants/gpgparticipants b/gpgparticipants/gpgparticipants
-index 4dd06e8..ea76aff 100755
+index aaf97bb..7a6bd38 100755
 --- a/gpgparticipants/gpgparticipants
 +++ b/gpgparticipants/gpgparticipants
-@@ -29,7 +29,7 @@ title=$(echo "$5"|tr a-z A-Z|sed 's/\(.\)/\1 /g')
- exec > "$output"
+@@ -65,7 +65,7 @@ title=$(echo "$5"|tr a-z A-Z|sed 's/\(.\)/\1 /g')
+ [ "$output" = - ] && output=/path/to/ksp-file.txt || { exec > "$output"; }
  
  # Date of event
--LANG=C date --date="$date" +"%A, %B %e, %Y;  %H:%M"
-+LANG=C date -j -f "%Y%m%d %H%M" "$date" +"%A, %B %e, %Y;  %H:%M"
+-LC_ALL=C date --date="$date" +"%A, %B %e, %Y;  %H:%M"
++LC_ALL=C date -j -f "%Y%m%d %H%M" "$date" +"%A, %B %e, %Y;  %H:%M"
  # Organiser contact
  printf "%80s\n\n\n" "$org"
  # Title