Fix building with a patchset from FreeBSD and keyword ~amd64 wrt #196764, thanks to Martic Berkemeier for reporting. Also respect correct CXX and CXXFLAGS targets and sanitize ebuild.

Package-Manager: portage-2.1.4_rc14

3 files changed, 68 insertions, 12 deletions

diff --git a/x11-misc/accessx/files/access-gcc3-gentoo.patch b/x11-misc/accessx/files/access-gcc3-gentoo.patch
deleted file mode 100644
index 49e8c9132622..000000000000
--- a/x11-misc/accessx/files/access-gcc3-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur accessx/ax.C accessx.m/ax.C
---- accessx/ax.C	2001-03-13 23:42:10.000000000 -0600
-+++ accessx.m/ax.C	2002-07-24 22:15:20.000000000 -0500
-@@ -713,7 +713,7 @@
- ///////////////////////////////////////////////////////////////////////////////
- 
- 
--void main(int argc, char** argv)
-+int main(int argc, char** argv)
- {
-   Access ax;
-   ax.QueryServer();
diff --git a/x11-misc/accessx/files/accessx-0951-build.patch b/x11-misc/accessx/files/accessx-0951-build.patch
new file mode 100644
index 000000000000..6d732487214f
--- /dev/null
+++ b/x11-misc/accessx/files/accessx-0951-build.patch
@@ -0,0 +1,65 @@
+diff -ur accessx.orig/Access.C accessx/Access.C
+--- accessx.orig/Access.C	2003-09-19 19:08:01.000000000 +0300
++++ accessx/Access.C	2008-01-07 18:53:43.000000000 +0200
+@@ -22,6 +22,8 @@
+ #include <X11/XKBlib.h>
+ #include "Access.h"
+ 
++using namespace std;
++
+ //
+ // Access()
+ //
+@@ -153,7 +155,7 @@
+     //Get the state of the keyboard.
+ 
+     XkbDescPtr xkb = XkbGetMap(display, 0, XkbUseCoreKbd);
+-    if ((int)xkb == BadAlloc || xkb == NULL)
++    if (xkb == NULL)
+       {
+ 	return 5; /*AccessKeyboardQueryFailure;*/
+       }
+@@ -262,7 +264,7 @@
+     //Get the state of the keyboard.
+ 
+     XkbDescPtr xkb = XkbGetMap(display, 0, XkbUseCoreKbd);
+-    if ((int)xkb == BadAlloc || xkb == NULL)
++    if (xkb == NULL)
+       {
+ 	return 5; /*AccessKeyboardQueryFailure;*/
+       }
+diff -ur accessx.orig/Access.h accessx/Access.h
+--- accessx.orig/Access.h	2003-09-19 19:00:42.000000000 +0300
++++ accessx/Access.h	2008-01-07 18:53:47.000000000 +0200
+@@ -21,7 +21,7 @@
+  *
+  */
+ 
+-#include <iostream.h>
++#include <iostream>
+ #include <math.h>
+ 
+ inline char* onoroff(int val)
+diff -ur accessx.orig/ax.C accessx/ax.C
+--- accessx.orig/ax.C	2003-09-19 19:09:31.000000000 +0300
++++ accessx/ax.C	2008-01-07 18:53:49.000000000 +0200
+@@ -20,6 +20,7 @@
+ 
+ #include "ax.h"
+ 
++using namespace std;
+ 
+ ///////////////////////////////////////////////////////////////////////////////
+ //
+diff -ur accessx.orig/ax.h accessx/ax.h
+--- accessx.orig/ax.h	2003-09-19 19:06:56.000000000 +0300
++++ accessx/ax.h	2008-01-07 18:53:51.000000000 +0200
+@@ -24,7 +24,7 @@
+ 
+ // Include Files
+ 
+-#include <iostream.h>
++#include <iostream>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/x11-misc/accessx/files/digest-accessx-0951-r1 b/x11-misc/accessx/files/digest-accessx-0951-r1
new file mode 100644
index 000000000000..d034ebeb7b3d
--- /dev/null
+++ b/x11-misc/accessx/files/digest-accessx-0951-r1
@@ -0,0 +1,3 @@
+MD5 e61286559b65e452705a6329646776f1 accessx0951.tar.gz 17199
+RMD160 505db30895d16137ff893ee0adbc1e8a8c706e4b accessx0951.tar.gz 17199
+SHA256 441e9316552a88d26b265a3074656ec56a84d8ea287d7dcebdb7a2b562111863 accessx0951.tar.gz 17199