From 8736082d1b0eb9a1af8265bc443f2058550e9925 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Wed, 15 Jun 2016 15:55:36 -0400
Subject: do away with pgp-get-keyid-by-uid

---
 bin/pacman-make-keyring  | 3 ++-
 bin/pgp-get-keyid-by-uid | 5 -----
 2 files changed, 2 insertions(+), 6 deletions(-)
 delete mode 100755 bin/pgp-get-keyid-by-uid

diff --git a/bin/pacman-make-keyring b/bin/pacman-make-keyring
index 3951361..589984d 100755
--- a/bin/pacman-make-keyring
+++ b/bin/pacman-make-keyring
@@ -81,6 +81,7 @@ $(cachedir)/deps.mk: ${users} $(var)outputdir $(var)cachedir $(var)KEYRING_NAME|
 	{ \
 		echo $(outputdir)/${KEYRING_NAME}.gpg: $$($(bin)/pgp-list-keyids | sed -r 's|(\S+) .*|$$(cachedir)/keys/\1.asc|') && \
 		echo $(cachedir)/stamp.ownertrust: $$($(bin)/pgp-list-keyids | sed -rn 's|^(trusted/\S+) .*|$$(cachedir)/keys/\1.asc|p') && \
+		$(bin)/pgp-list-keyids | sed -rn 's|^trusted/(\S+) (.*)|keyid.\1 = \2|p' && \
 		$(bin)/uid-map | sed 's|.*|trusted:&\nsecondary:&\nrevoked:&|' | sed -r 's|(.*):(.*):(.*)|$$(cachedir)/keys/\1/\3.asc: $$(yamldir)/\2.yml|' && \
 	:; }> $@
 -include $(cachedir)/deps.mk
@@ -114,7 +115,7 @@ $(cachedir)/stamp.gpg-init: $(cachedir)/txt.gpg-init $(var)GPG | $(cachedir)/gpg
 
 # The appropriate ${uid}.yml file is added as a dependency to
 # ${username}.yml by deps.mk
-keyid=$$($(bin)/pgp-get-keyid-by-uid $(patsubst %.yml,%,$(notdir $(filter %.yml,$^))))
+keyid=$(keyid.$(patsubst %.asc,%,$(notdir $@)))
 
 # In 'update-keys', this is the 'master-keyids' loop
 $(outputdir)/${KEYRING_NAME}-trusted: ${users} | $(outputdir)
diff --git a/bin/pgp-get-keyid-by-uid b/bin/pgp-get-keyid-by-uid
deleted file mode 100755
index 94a869d..0000000
--- a/bin/pgp-get-keyid-by-uid
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-# Usage: pgp-get-keyid-by-uid {uid}
-
-load "#{File.dirname(__FILE__)}/common.rb"
-puts load_user_yaml("#{cfg["yamldir"]}/#{ARGV[0]}.yml")["pgp_keyid"]
-- 
cgit v1.2.2