summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-misc/nxserver-freenx/Manifest24
-rw-r--r--net-misc/nxserver-freenx/files/nxserver-freenx-0.4.4-xorg7.patch29
-rw-r--r--net-misc/nxserver-freenx/files/nxserver-freenx-0.4.5-xorg7.patch29
-rw-r--r--net-misc/nxserver-freenx/nxserver-freenx-0.4.4-r1.ebuild6
-rw-r--r--net-misc/nxserver-freenx/nxserver-freenx-0.4.5.20060305.ebuild6
-rw-r--r--net-misc/nxserver-freenx/nxserver-freenx-0.5.0.20060311-r1.ebuild6
6 files changed, 24 insertions, 76 deletions
diff --git a/net-misc/nxserver-freenx/Manifest b/net-misc/nxserver-freenx/Manifest
index 358fc88..9f11aba 100644
--- a/net-misc/nxserver-freenx/Manifest
+++ b/net-misc/nxserver-freenx/Manifest
@@ -10,21 +10,15 @@ SHA256 e5907d10423769e2a53586e6a14c24fdb7dcadf1adb4c787771c4e8d63526d2c files/di
MD5 925fd2cad3adceb556bf1de6cf866ed0 files/freenx-0.4.4-adduser-fix.patch 562
RMD160 a6dcc853d73cf13cf395cc346fa5da86a00ec4ec files/freenx-0.4.4-adduser-fix.patch 562
SHA256 f5cbff53a8fe403e7068b43bc4c3005132e578e14effcbd3063ccf5da112ed17 files/freenx-0.4.4-adduser-fix.patch 562
-MD5 39f14a5d716264bcb04988f14d00a22d files/nxserver-freenx-0.4.4-xorg7.patch 1079
-RMD160 4efa015b61d29c0a19ceb43bb3142fdd9411569f files/nxserver-freenx-0.4.4-xorg7.patch 1079
-SHA256 f79919173211ca5d63a6921b0eb303f850d621d1b4f3a2e93bf834d9d4233f89 files/nxserver-freenx-0.4.4-xorg7.patch 1079
-MD5 2c6946908ee2002bd76e04036f5c3cbd files/nxserver-freenx-0.4.5-xorg7.patch 1100
-RMD160 a3f5df283de33cbab9bfa1ad4c63f802c9d64905 files/nxserver-freenx-0.4.5-xorg7.patch 1100
-SHA256 46a0237a7c89cd1c1a3d788d506d33d2f41259b726c7ad7c46321e9b09b710e1 files/nxserver-freenx-0.4.5-xorg7.patch 1100
MD5 77fd36d93b0a1b9f35abbe6a1c146561 metadata.xml 482
RMD160 43d7ffbdffac6f9862dfea8535446439e8c03cc7 metadata.xml 482
SHA256 a057fa4844b9a4b9a6213a3dad7e620bee77a1e36bc0571ea948ecf585c17e45 metadata.xml 482
-MD5 b00d293d895fc7975a546b08b2ca6c91 nxserver-freenx-0.4.4-r1.ebuild 3177
-RMD160 be42bbf4ab6df0da3d23af5e9e2a925eee66b6c8 nxserver-freenx-0.4.4-r1.ebuild 3177
-SHA256 ffce326733dd0827d8604a39934bd79db0cb1f69977a736e67aa588e07e024f4 nxserver-freenx-0.4.4-r1.ebuild 3177
-MD5 98ead23a57e9392d22c439fb3cc1ae6e nxserver-freenx-0.4.5.20060305.ebuild 3109
-RMD160 ed5bd084d905b31555c9b14390cc7f71f909e603 nxserver-freenx-0.4.5.20060305.ebuild 3109
-SHA256 fb1ee08b2e3b7fec2bd4276018264baebb5536a1894785ca693513519faa7bd4 nxserver-freenx-0.4.5.20060305.ebuild 3109
-MD5 a8cedf879b08b674b30b542debf9624b nxserver-freenx-0.5.0.20060311-r1.ebuild 2960
-RMD160 a55db7f7f85b0b76283530a94047fa3d5af89dff nxserver-freenx-0.5.0.20060311-r1.ebuild 2960
-SHA256 f838c36ec23df047a059406335c46fac7cc0bd6a10bf3812d9554a01326b7cbe nxserver-freenx-0.5.0.20060311-r1.ebuild 2960
+MD5 867eac8e04accb98634beb3a15563484 nxserver-freenx-0.4.4-r1.ebuild 3318
+RMD160 fea926fb419948878458a206b73863395e1d00c9 nxserver-freenx-0.4.4-r1.ebuild 3318
+SHA256 d6b893e5412eb592b4744203c2c882359de8f9e730422573c7f57c03287f841c nxserver-freenx-0.4.4-r1.ebuild 3318
+MD5 247074de720c6e35948077e2cc8da97a nxserver-freenx-0.4.5.20060305.ebuild 3250
+RMD160 5773c7b44d72ae814cbf7c8acf46bb2b159f5e10 nxserver-freenx-0.4.5.20060305.ebuild 3250
+SHA256 22fc1559804410d75cf2981d14e62b02ca853b3d5aec282a2bcb634a2ca42038 nxserver-freenx-0.4.5.20060305.ebuild 3250
+MD5 25f577c7bc875e92b52373cc6eb0476e nxserver-freenx-0.5.0.20060311-r1.ebuild 3101
+RMD160 0d8260b8b5a01bc76cd29aa8c48526f6e08d2c22 nxserver-freenx-0.5.0.20060311-r1.ebuild 3101
+SHA256 6ecb0df44c5fb9f5ae57eea5d224125cdac7e3f1e20ca092eb14a7e749d64722 nxserver-freenx-0.5.0.20060311-r1.ebuild 3101
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.4.4-xorg7.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.4.4-xorg7.patch
deleted file mode 100644
index 72d1a99..0000000
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.4.4-xorg7.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- freenx-server/nxnode 2005-08-07 12:53:57.000000000 +0300
-+++ freenx-server/nxnode 2006-02-02 00:00:25.000000000 +0200
-@@ -22,6 +22,26 @@
-
- echo "NX> 1000 NXNODE - Version $NX_VERSION $NX_LICENSE"
-
-+### Patch for Xorg-x11 >=7.0 by Oskari Rauta begins here ###
-+
-+# Meet me at IRC-net/#gentoo as jake1981 or jake___
-+# or mail me to jake1981 under domain luukku.com
-+# if you got questions. Implement/use or develop it freely.
-+
-+# Reason of patch:
-+# Keyboard doesn't work in Xorg-x11 >= 7.0 if XKEYSYMDB isn't exported
-+# and pointed to correct file. Hopefully your file is located in same
-+# place as mine (default installation location).
-+
-+if test `X -version 2>&1 | grep "X Window System Version" | awk '{ print $5 }' | awk -F. '{ print $1 }'` -ge 7
-+ then
-+ export XKEYSYMDB=/usr/share/X11/XKeysymDB
-+ echo "NX> NXNODE - Detected Xorg-X11 Version 7.0 or newer."
-+ echo "NX> NXNODE - Exporting XKEYSYMDB for enabling keyboard."
-+ fi
-+
-+### Patch for Xorg-x11 >= 7.0 by Oskari Rauta ends here..
-+
- if [ "$1" != "--check" -a "$1" != "--setkey" ]
- then
- read CMDLINE
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.4.5-xorg7.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.4.5-xorg7.patch
deleted file mode 100644
index 4f169ab..0000000
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.4.5-xorg7.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- freenx-server/nxnode 2005-08-07 12:53:57.000000000 +0300
-+++ freenx-server/nxnode 2006-02-02 00:00:25.000000000 +0200
-@@ -22,6 +22,26 @@
-
- echo "NX> 1000 NXNODE - Version $NX_VERSION $NX_LICENSE"
-
-+### Patch for Xorg-x11 >=7.0 by Oskari Rauta begins here ###
-+
-+# Meet me at IRC-net/#gentoo as jake1981 or jake___
-+# or mail me to jake1981 under domain luukku.com
-+# if you got questions. Implement/use or develop it freely.
-+
-+# Reason of patch:
-+# Keyboard doesn't work in Xorg-x11 >= 7.0 if XKEYSYMDB isn't exported
-+# and pointed to correct file. Hopefully your file is located in same
-+# place as mine (default installation location).
-+
-+if test `X -version 2>&1 | grep "X Window System Version" | awk '{ print $5 }' | awk -F. '{ print $1 }'` -ge 7
-+ then
-+ export XKEYSYMDB=/usr/share/X11/XKeysymDB
-+ echo "NX> NXNODE - Detected Xorg-X11 Version 7.0 or newer."
-+ echo "NX> NXNODE - Exporting XKEYSYMDB for enabling keyboard."
-+ fi
-+
-+### Patch for Xorg-x11 >= 7.0 by Oskari Rauta ends here..
-+
- if [ "$1" != "--check" -a "$1" != "--setkey" -a "$1" != "--agent" ]
- then
- read CMDLINE
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.4.4-r1.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.4.4-r1.ebuild
index c460f9b..d569b89 100644
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.4.4-r1.ebuild
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.4.4-r1.ebuild
@@ -36,7 +36,6 @@ src_unpack() {
epatch gentoo-nomachine.diff
# Patch to fix the adduser error
epatch $FILESDIR/freenx-0.4.4-adduser-fix.patch
- epatch $FILESDIR/$PN-0.4.4-xorg7.patch
}
src_compile() {
@@ -50,6 +49,11 @@ src_install() {
NX_SESS_DIR=$NX_DIR/var/db
NX_HOME_DIR=$NX_DIR/home/nx
+ if [ -f ${ROOT}/usr/share/X11/XKeysymDB ] && [ ! -f ${ROOT}/usr/lib/X11/XKeysymDB ] ; then
+ mkdir -p ${D}/usr/lib/X11
+ dosym /usr/share/X11/XKeysymDB /usr/lib/X11/XKeysymDB
+ fi
+
into ${NX_DIR}
dobin nxserver
dobin nxnode
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.4.5.20060305.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.4.5.20060305.ebuild
index 21f8e0f..e951a17 100644
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.4.5.20060305.ebuild
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.4.5.20060305.ebuild
@@ -35,7 +35,6 @@ src_unpack() {
unpack ${A}
cd ${S}
epatch gentoo-nomachine.diff
- epatch $FILESDIR/$PN-0.4.5-xorg7.patch
}
src_compile() {
@@ -49,6 +48,11 @@ src_install() {
NX_SESS_DIR=$NX_DIR/var/db
NX_HOME_DIR=$NX_DIR/home/nx
+ if [ -f ${ROOT}/usr/share/X11/XKeysymDB ] && [ ! -f ${ROOT}/usr/lib/X11/XKeysymDB ] ; then
+ mkdir -p ${D}/usr/lib/X11
+ dosym /usr/share/X11/XKeysymDB /usr/lib/X11/XKeysymDB
+ fi
+
into ${NX_DIR}
dobin nxserver
dobin nxnode
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.5.0.20060311-r1.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.5.0.20060311-r1.ebuild
index 53abdc4..902597e 100644
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.5.0.20060311-r1.ebuild
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.5.0.20060311-r1.ebuild
@@ -34,7 +34,6 @@ src_unpack() {
unpack ${A}
cd ${S}
epatch gentoo-nomachine.diff
- epatch $FILESDIR/$PN-0.4.5-xorg7.patch
}
src_compile() {
@@ -48,6 +47,11 @@ src_install() {
NX_SESS_DIR=$NX_DIR/var/db
NX_HOME_DIR=$NX_DIR/home/nx
+ if [ -f ${ROOT}/usr/share/X11/XKeysymDB ] && [ ! -f ${ROOT}/usr/lib/X11/XKeysymDB ] ; then
+ mkdir -p ${D}/usr/lib/X11
+ dosym /usr/share/X11/XKeysymDB /usr/lib/X11/XKeysymDB
+ fi
+
into ${NX_DIR}
dobin nxserver
dobin nxnode