gentoo resync : 24.02.2018

3 files changed, 122 insertions, 0 deletions

diff --git a/net-misc/x2goserver/files/x2goserver-4.1.0.0-Xresources.patch b/net-misc/x2goserver/files/x2goserver-4.1.0.0-Xresources.patch
new file mode 100644
index 000000000000..e75355c835dc
--- /dev/null
+++ b/net-misc/x2goserver/files/x2goserver-4.1.0.0-Xresources.patch
@@ -0,0 +1,11 @@
+diff -Naur x2goserver-4.1.0.0.orig/x2goserver-xsession/Makefile x2goserver-4.1.0.0/x2goserver-xsession/Makefile
+--- x2goserver-4.1.0.0.orig/x2goserver-xsession/Makefile	2018-02-15 23:08:27.000000000 +0100
++++ x2goserver-4.1.0.0/x2goserver-xsession/Makefile	2018-02-23 14:36:33.539717610 +0100
+@@ -53,7 +53,6 @@
+ 	$(INSTALL_DIR) $(DESTDIR)$(ETCDIR)
+ #       provide target dirs for X11 related symlinks
+ 	$(INSTALL_PROGRAM) etc/Xsession                 $(DESTDIR)$(ETCDIR)/
+-	$(INSTALL_SYMLINK) /etc/X11/Xresources          $(DESTDIR)$(ETCDIR)/
+ 	if [ -e /etc/debian_version ]; then if [ -e $(XSESSIONOPTIONFILE) ]; then $(INSTALL_SYMLINK) $(XSESSIONOPTIONFILE) $(DESTDIR)$(ETCDIR)/Xsession.options; else touch $(DESTDIR)$(ETCDIR)/Xsession.options; fi; fi
+ 	if [ -e /etc/debian_version ]; then if [ -d $(XSESSIONDIR) ]; then $(INSTALL_SYMLINK) $(XSESSIONDIR) $(DESTDIR)$(ETCDIR)/Xsession.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xsession.d; fi; fi
+ 	if [ -e /etc/redhat-release ]; then if [ -d $(XINITRCDIR) ]; then $(INSTALL_SYMLINK) $(XINITRCDIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; fi; fi
diff --git a/net-misc/x2goserver/files/x2goserver-4.1.0.0-provided_by_nx.patch b/net-misc/x2goserver/files/x2goserver-4.1.0.0-provided_by_nx.patch
new file mode 100644
index 000000000000..e189b918dbd3
--- /dev/null
+++ b/net-misc/x2goserver/files/x2goserver-4.1.0.0-provided_by_nx.patch
@@ -0,0 +1,27 @@
+diff -Naur x2goserver-4.1.0.0.orig/x2goserver-x2goagent/Makefile x2goserver-4.1.0.0/x2goserver-x2goagent/Makefile
+--- x2goserver-4.1.0.0.orig/x2goserver-x2goagent/Makefile	2018-02-15 23:08:27.000000000 +0100
++++ x2goserver-4.1.0.0/x2goserver-x2goagent/Makefile	2018-02-23 14:42:03.106562501 +0100
+@@ -49,7 +49,7 @@
+ clean_man2html:
+ 	rm -rf `dirname $(MAN2HTML_DEST)`
+ 
+-install: install_scripts install_config install_data install_man install_version
++install: install_scripts install_config install_data install_man
+ 
+ install_scripts:
+ 	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
+@@ -57,14 +57,11 @@
+ 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
+ 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d
+ 	$(INSTALL_PROGRAM) share/x2go/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/
+-	$(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/bin/
+-	$(INSTALL_SYMLINK) nxagent $(DESTDIR)$(NXLIBDIR)/bin/x2goagent
+ 
+ install_data:
+ 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/
+ 	$(INSTALL_FILE) etc/rgb $(DESTDIR)$(SHAREDIR)/
+ 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/../pixmaps/
+-	$(INSTALL_FILE) share/pixmaps/x2go.xpm $(DESTDIR)$(SHAREDIR)/../pixmaps/
+ 	$(INSTALL_SYMLINK) $(ETCDIR)/rgb $(DESTDIR)$(SHAREDIR)/
+ 
+ install_config:
diff --git a/net-misc/x2goserver/files/x2goserver-4.1.0.0-skip_man2html.patch b/net-misc/x2goserver/files/x2goserver-4.1.0.0-skip_man2html.patch
new file mode 100644
index 000000000000..5e51101f528e
--- /dev/null
+++ b/net-misc/x2goserver/files/x2goserver-4.1.0.0-skip_man2html.patch
@@ -0,0 +1,84 @@
+diff -Naur x2goserver-4.1.0.0.orig/x2goserver/Makefile x2goserver-4.1.0.0/x2goserver/Makefile
+--- x2goserver-4.1.0.0.orig/x2goserver/Makefile	2018-02-15 23:08:27.000000000 +0100
++++ x2goserver-4.1.0.0/x2goserver/Makefile	2018-02-23 14:37:56.512675411 +0100
+@@ -36,7 +36,7 @@
+ 
+ build-arch:
+ 
+-build-indep: build_man2html
++build-indep:
+ 
+ build_man2html:
+ 	if [ -n "$(MAN2HTML_BIN)" ]; then \
+diff -Naur x2goserver-4.1.0.0.orig/x2goserver-common/Makefile x2goserver-4.1.0.0/x2goserver-common/Makefile
+--- x2goserver-4.1.0.0.orig/x2goserver-common/Makefile	2018-02-15 23:08:27.000000000 +0100
++++ x2goserver-4.1.0.0/x2goserver-common/Makefile	2018-02-23 14:37:56.510675412 +0100
+@@ -36,7 +36,7 @@
+ 
+ build-arch:
+ 
+-build-indep: build_man2html
++build-indep:
+ 
+ build_man2html:
+ 	if [ -n "$(MAN2HTML_BIN)" ]; then \
+diff -Naur x2goserver-4.1.0.0.orig/x2goserver-extensions/Makefile x2goserver-4.1.0.0/x2goserver-extensions/Makefile
+--- x2goserver-4.1.0.0.orig/x2goserver-extensions/Makefile	2018-02-15 23:08:27.000000000 +0100
++++ x2goserver-4.1.0.0/x2goserver-extensions/Makefile	2018-02-23 14:37:56.511675412 +0100
+@@ -33,7 +33,7 @@
+ 
+ build-arch:
+ 
+-build-indep: build_man2html
++build-indep:
+ 
+ build_man2html:
+ 	if [ -n "$(MAN2HTML_BIN)" ]; then \
+diff -Naur x2goserver-4.1.0.0.orig/x2goserver-fmbindings/Makefile x2goserver-4.1.0.0/x2goserver-fmbindings/Makefile
+--- x2goserver-4.1.0.0.orig/x2goserver-fmbindings/Makefile	2018-02-15 23:08:27.000000000 +0100
++++ x2goserver-4.1.0.0/x2goserver-fmbindings/Makefile	2018-02-23 14:37:56.511675412 +0100
+@@ -33,7 +33,7 @@
+ 
+ build-arch:
+ 
+-build-indep: build_man2html
++build-indep:
+ 
+ build_man2html:
+ 	if [ -n "$(MAN2HTML_BIN)" ]; then \
+diff -Naur x2goserver-4.1.0.0.orig/x2goserver-printing/Makefile x2goserver-4.1.0.0/x2goserver-printing/Makefile
+--- x2goserver-4.1.0.0.orig/x2goserver-printing/Makefile	2018-02-15 23:08:27.000000000 +0100
++++ x2goserver-4.1.0.0/x2goserver-printing/Makefile	2018-02-23 14:37:56.512675411 +0100
+@@ -34,7 +34,7 @@
+ 
+ build-arch:
+ 
+-build-indep: build_man2html
++build-indep:
+ 
+ build_man2html:
+ 	if [ -n "$(MAN2HTML_BIN)" ]; then \
+diff -Naur x2goserver-4.1.0.0.orig/x2goserver-x2goagent/Makefile x2goserver-4.1.0.0/x2goserver-x2goagent/Makefile
+--- x2goserver-4.1.0.0.orig/x2goserver-x2goagent/Makefile	2018-02-15 23:08:27.000000000 +0100
++++ x2goserver-4.1.0.0/x2goserver-x2goagent/Makefile	2018-02-23 14:37:56.512675411 +0100
+@@ -35,7 +35,7 @@
+ 
+ build-arch:
+ 
+-build-indep: build_man2html
++build-indep:
+ 
+ build_man2html:
+ 	if [ -n "$(MAN2HTML_BIN)" ]; then \
+diff -Naur x2goserver-4.1.0.0.orig/x2goserver-xsession/Makefile x2goserver-4.1.0.0/x2goserver-xsession/Makefile
+--- x2goserver-4.1.0.0.orig/x2goserver-xsession/Makefile	2018-02-15 23:08:27.000000000 +0100
++++ x2goserver-4.1.0.0/x2goserver-xsession/Makefile	2018-02-23 14:37:56.513675411 +0100
+@@ -34,7 +34,7 @@
+ 
+ build-arch:
+ 
+-build-indep: build_man2html
++build-indep:
+ 
+ build_man2html:
+