gentoo resync : 28.04.2021

6 files changed, 8 insertions, 24 deletions

diff --git a/net-nds/tac_plus/files/tac_plus-4.0.4.19-deansification.patch b/net-nds/tac_plus/files/tac_plus-4.0.4.19-deansification.patch
index 4dbc33707263..4a1f579c62e0 100644
--- a/net-nds/tac_plus/files/tac_plus-4.0.4.19-deansification.patch
+++ b/net-nds/tac_plus/files/tac_plus-4.0.4.19-deansification.patch
@@ -1,6 +1,5 @@
-diff -uNr tacacs+-F4.0.4.19.ORIG/configure.in tacacs+-F4.0.4.19/configure.in
---- tacacs+-F4.0.4.19.ORIG/configure.in	2013-02-28 21:26:31.724310410 +0000
-+++ tacacs+-F4.0.4.19/configure.in	2013-02-28 21:26:41.936309960 +0000
+--- a/configure.in
++++ b/configure.in
 @@ -126,7 +126,6 @@
  
  # compiler specifics
diff --git a/net-nds/tac_plus/files/tac_plus-4.0.4.19-parallelmake.patch b/net-nds/tac_plus/files/tac_plus-4.0.4.19-parallelmake.patch
index 556f75806fbd..a8ca67e73626 100644
--- a/net-nds/tac_plus/files/tac_plus-4.0.4.19-parallelmake.patch
+++ b/net-nds/tac_plus/files/tac_plus-4.0.4.19-parallelmake.patch
@@ -1,7 +1,5 @@
-Index: tacacs+-F4.0.4.19/Makefile.am
-===================================================================
---- tacacs+-F4.0.4.19.orig/Makefile.am
-+++ tacacs+-F4.0.4.19/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -16,7 +16,7 @@ if TACSKEY
  tac_plus_SOURCES += skey_fn.c
  endif
diff --git a/net-nds/tac_plus/files/tac_plus-4.0.4.27a-deansification.patch b/net-nds/tac_plus/files/tac_plus-4.0.4.27a-deansification.patch
deleted file mode 100644
index ee1bcb231838..000000000000
--- a/net-nds/tac_plus/files/tac_plus-4.0.4.27a-deansification.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -uNr tacacs+-F4.0.4.27a.ORIG/configure.in tacacs+-F4.0.4.27a/configure.in
---- tacacs+-F4.0.4.27a.ORIG/configure.in	2015-03-25 11:13:06.976024203 +0000
-+++ tacacs+-F4.0.4.27a/configure.in	2015-03-25 11:13:36.816025689 +0000
-@@ -126,7 +126,6 @@
- 
- # compiler specifics
- AC_PROG_CC
--AM_C_PROTOTYPES
- AC_PROG_CPP
- AC_C_CONST
- AC_C_INLINE
diff --git a/net-nds/tac_plus/files/tac_plus-4.0.4.27a-parallelmake.patch b/net-nds/tac_plus/files/tac_plus-4.0.4.27a-parallelmake.patch
index c75a05b0cd12..d77c4714e384 100644
--- a/net-nds/tac_plus/files/tac_plus-4.0.4.27a-parallelmake.patch
+++ b/net-nds/tac_plus/files/tac_plus-4.0.4.27a-parallelmake.patch
@@ -1,6 +1,5 @@
-diff -uNr tacacs+-F4.0.4.27a.ORIG/Makefile.am tacacs+-F4.0.4.27a/Makefile.am
---- tacacs+-F4.0.4.27a.ORIG/Makefile.am	2015-03-25 11:10:26.821016226 +0000
-+++ tacacs+-F4.0.4.27a/Makefile.am	2015-03-25 11:11:04.954018126 +0000
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -19,7 +19,7 @@
  tac_plus_SOURCES += aceclnt_fn.c
  endif
diff --git a/net-nds/tac_plus/files/tac_plus.conf b/net-nds/tac_plus/files/tac_plus.conf
index 83403e0bc1cc..dfdf2186a816 100644
--- a/net-nds/tac_plus/files/tac_plus.conf
+++ b/net-nds/tac_plus/files/tac_plus.conf
@@ -6,7 +6,6 @@
 #key = kEy4U
 
 #user = youruser {
-#  login = des ndkKAzNoc37VA 
+#  login = des ndkKAzNoc37VA
 #  enable = des ndkKAzNoc37VA
 #}
-
diff --git a/net-nds/tac_plus/files/tac_plus.conf2 b/net-nds/tac_plus/files/tac_plus.conf2
index 617e34420281..406fff33b800 100644
--- a/net-nds/tac_plus/files/tac_plus.conf2
+++ b/net-nds/tac_plus/files/tac_plus.conf2
@@ -6,7 +6,7 @@
 #key = kEy4U
 
 #user = youruser {
-#  login = des ndkKAzNoc37VA 
+#  login = des ndkKAzNoc37VA
 #  enable = des ndkKAzNoc37VA
 #}