From 1798c4aeca70ac8d0a243684d6a798fbc65735f8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:57:42 +0100 Subject: gentoo resync : 14.07.2018 --- .../files/cyberjack-3.99.5_p03-gcc47.patch | 34 ---------------------- dev-libs/cyberjack/files/cyberjack-manpages.patch | 34 ---------------------- dev-libs/cyberjack/files/cyberjack-r1.rules | 18 ------------ .../cyberjack/files/cyberjack-returnvalue.patch | 29 ------------------ dev-libs/cyberjack/files/cyberjack.rules | 10 ------- 5 files changed, 125 deletions(-) delete mode 100644 dev-libs/cyberjack/files/cyberjack-3.99.5_p03-gcc47.patch delete mode 100644 dev-libs/cyberjack/files/cyberjack-manpages.patch delete mode 100644 dev-libs/cyberjack/files/cyberjack-r1.rules delete mode 100644 dev-libs/cyberjack/files/cyberjack-returnvalue.patch delete mode 100644 dev-libs/cyberjack/files/cyberjack.rules (limited to 'dev-libs/cyberjack/files') diff --git a/dev-libs/cyberjack/files/cyberjack-3.99.5_p03-gcc47.patch b/dev-libs/cyberjack/files/cyberjack-3.99.5_p03-gcc47.patch deleted file mode 100644 index 035d414a09d9..000000000000 --- a/dev-libs/cyberjack/files/cyberjack-3.99.5_p03-gcc47.patch +++ /dev/null @@ -1,34 +0,0 @@ -http://bugs.gentoo.org/423757 - ---- libcyberjack/checksuite/cm_distri.cpp -+++ libcyberjack/checksuite/cm_distri.cpp -@@ -15,6 +15,7 @@ - #include "cm_distri.h" - #include "checksuite.h" - -+#include /* unlink */ - #include - #include - #include ---- tools/fox-dialog/main.cpp -+++ tools/fox-dialog/main.cpp -@@ -9,6 +9,8 @@ - - #include - -+#include /* unlink */ -+ - #include - #include - #include ---- tools/mac-ui-helper/main.m -+++ tools/mac-ui-helper/main.m -@@ -31,6 +31,8 @@ - #import "PinDialog.h" - #import "Delegate.h" - -+#include /* unlink */ -+ - #include - #include - #include diff --git a/dev-libs/cyberjack/files/cyberjack-manpages.patch b/dev-libs/cyberjack/files/cyberjack-manpages.patch deleted file mode 100644 index 98568f34910d..000000000000 --- a/dev-libs/cyberjack/files/cyberjack-manpages.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e5d3ac2ab70cb773671a63dfed45816d6e24d36d Mon Sep 17 00:00:00 2001 -From: Christian Ruppert -Date: Thu, 13 Feb 2014 21:40:48 +0100 -Subject: [PATCH 1/3] Fix installation of man pages - -Signed-off-by: Christian Ruppert ---- - doc/Makefile.am | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/doc/Makefile.am b/doc/Makefile.am -index a0a68f4..cba2e30 100644 ---- a/doc/Makefile.am -+++ b/doc/Makefile.am -@@ -6,14 +6,12 @@ DOCFILES=\ - #docfiledir=$(datarootdir)/doc/$(PACKAGE) - #docfile_DATA=$(DOCFILES) - --manpagedir=$(mandir) --manpage_DATA= \ -- cyberjack.8 -+man8_MANS=cyberjack.8 - - EXTRA_DIST=\ - README.xml LIESMICH.xml \ - verifypin_ascii.c verifypin_fpin2.c \ -- $(DOCFILES) $(manpage_DATA) -+ $(DOCFILES) $(man8_MANS) - - - %.ps: %.xml --- -1.8.3.2 - diff --git a/dev-libs/cyberjack/files/cyberjack-r1.rules b/dev-libs/cyberjack/files/cyberjack-r1.rules deleted file mode 100644 index 775ed4cb592d..000000000000 --- a/dev-libs/cyberjack/files/cyberjack-r1.rules +++ /dev/null @@ -1,18 +0,0 @@ -# If not adding the device, go away -ACTION!="add", GOTO="cyberjack_rules_end" -SUBSYSTEM!="usb", GOTO="cyberjack_rules_end" -ENV{DEVTYPE}!="usb_device", GOTO="cyberjack_rules_end" - - -ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0100", MODE="660", GROUP="pcscd" -ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0300", MODE="660", GROUP="pcscd" -ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0400", MODE="660", GROUP="pcscd" -ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0401", MODE="660", GROUP="pcscd" -ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0500", MODE="660", GROUP="pcscd" -ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0501", MODE="660", GROUP="pcscd" -ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0502", MODE="660", GROUP="pcscd" -ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0504", MODE="660", GROUP="pcscd" -ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0505", MODE="660", GROUP="pcscd" - -# All done -LABEL="cyberjack_rules_end" diff --git a/dev-libs/cyberjack/files/cyberjack-returnvalue.patch b/dev-libs/cyberjack/files/cyberjack-returnvalue.patch deleted file mode 100644 index 0bdf275ff0c8..000000000000 --- a/dev-libs/cyberjack/files/cyberjack-returnvalue.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b6d3ab6d0324f8b462f57aaa551bd1d4aa1465f3 Mon Sep 17 00:00:00 2001 -From: Christian Ruppert -Date: Thu, 13 Feb 2014 22:19:40 +0100 -Subject: [PATCH 2/3] Fix return value of rsct_platform_create_com if - --disable-nonserial - -Return NULL instead of CJ_ERR_OPENING_DEVICE (int). - -Signed-off-by: Christian Ruppert ---- - cjeca32/Platform_unix.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cjeca32/Platform_unix.cpp b/cjeca32/Platform_unix.cpp -index e3f4997..cbe6876 100644 ---- a/cjeca32/Platform_unix.cpp -+++ b/cjeca32/Platform_unix.cpp -@@ -54,7 +54,7 @@ CBaseCommunication *rsct_platform_create_com(const char *deviceName, CReader *re - com=new CUSBUnix(deviceName, reader); - # else - /* libusb and libhal not supported for serial devices */ -- return CJ_ERR_OPENING_DEVICE; -+ return NULL; - # endif - else - com=new CSerialUnix(deviceName, reader); --- -1.8.3.2 - diff --git a/dev-libs/cyberjack/files/cyberjack.rules b/dev-libs/cyberjack/files/cyberjack.rules deleted file mode 100644 index ac94b1b663f5..000000000000 --- a/dev-libs/cyberjack/files/cyberjack.rules +++ /dev/null @@ -1,10 +0,0 @@ -# If not adding the device, go away -ACTION!="add", GOTO="cyberjack_rules_end" -SUBSYSTEM!="usb", GOTO="cyberjack_rules_end" -ENV{DEVTYPE}!="usb_device", GOTO="cyberjack_rules_end" - -# Tested on cyberJack RFID standard -ATTRS{idVendor}=="0c4b", ATTRS{idProduct}=="0500", ENV{PCSCD}="1" - -# All done -LABEL="cyberjack_rules_end" -- cgit v1.2.3