Update nxserver patch to detect Gentoo based on /etc/os-release, fallback /etc/gentoo-release, suggested by ssuominen in bug #380579

Package-Manager: portage-2.2.0_alpha158/cvs/Linux x86_64
Manifest-Sign-Key: 0xC74525F2

4 files changed, 102 insertions, 14 deletions

diff --git a/net-misc/nxserver-freeedition/ChangeLog b/net-misc/nxserver-freeedition/ChangeLog
index 0460103edd57..9ddda8a93f93 100644
--- a/net-misc/nxserver-freeedition/ChangeLog
+++ b/net-misc/nxserver-freeedition/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/nxserver-freeedition
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/ChangeLog,v 1.60 2012/07/12 08:51:13 voyageur Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/ChangeLog,v 1.61 2013/01/22 00:15:11 voyageur Exp $
+
+*nxserver-freeedition-3.5.0.11-r1 (22 Jan 2013)
+
+  22 Jan 2013; Bernard Cafarelli <voyageur@gentoo.org>
+  -nxserver-freeedition-3.5.0.9.ebuild,
+  +nxserver-freeedition-3.5.0.11-r1.ebuild,
+  +files/nxserver-3.5.0.11-setup.patch:
+  Update nxserver patch to detect Gentoo based on /etc/os-release, fallback
+  /etc/gentoo-release, suggested by ssuominen in bug #380579
 
   12 Jul 2012; Bernard Cafarelli <voyageur@gentoo.org>
   nxserver-freeedition-3.5.0.5.ebuild, nxserver-freeedition-3.5.0.9.ebuild,
diff --git a/net-misc/nxserver-freeedition/Manifest b/net-misc/nxserver-freeedition/Manifest
index 786f719022bc..d66f3e780756 100644
--- a/net-misc/nxserver-freeedition/Manifest
+++ b/net-misc/nxserver-freeedition/Manifest
@@ -4,21 +4,20 @@ Hash: SHA256
 AUX nxserver-2.1.0-init 494 SHA256 4c937f114be2a2e5bfebf6f7b96d00e841c46a9104c300e6773aae5b9d3d75bf SHA512 7852082069d2ddc81e5055b931f6d91424aa6d6a2a0ec39e1a21e4347dd856ee3590cd17da1abfac1a0ec3b4132609f6c85b52888f007c033f21bd6f92f68e29 WHIRLPOOL 002d54742236dfb0d34c3a06ad35a7eca5231da935946de3cf365df203a0e318ebc511e43ecaca7965f1a5358144110a80445829a9842b56adddf2db7be97a67
 AUX nxserver-3.0.0-r4-setup.patch 2240 SHA256 9517e84c742ca444d46bc15cf71a56c8ae5026092a2c2bcedf0cb8d23c2e15d0 SHA512 c810d50d9b8b7773fa09dbb1df2e07b07ac7fe0e762da588cbf97722d872c6a0d97b438b2d03aa23d4f2e44d4a69bdf6221276122b94d338f8ca63f3c8213ebf WHIRLPOOL 6c4ee8459fe88475888d3047751875ab087f2e73147368c5b10f9ecb97a44258ecf1fd00d43e3c42237c797a40d24908069103d8b0675e77ac5c28d269f4764a
 AUX nxserver-3.3.0-dontupdatekeys.patch 333 SHA256 4b4202a988d9b8841a5aef358b6ef50cc5864644ff4e9192cbd77cab54d1f298 SHA512 e04734582a1a125fa894bbbd49c8b8e78443ac8007df4b33b3f8ceae66a2e440350b814b22bf4719cfd37ba1ef84bd2d461757ae347d434bbad06a755f7dbec3 WHIRLPOOL 08ee75467e417bc169a4d05241192ade7059b27ef004955970a17ba810c73a254362d5a04615da2161cece623563de05cae18bdf6fb69d5bf4fdc72dc913ef6b
+AUX nxserver-3.5.0.11-setup.patch 2331 SHA256 6b88bde9f1309f99cf03756844987db377b41eb006657320933e2f1bc4c67550 SHA512 9b960076ca9d8ce9aa0a38e77a4ba0814b404d1e77b15ae034e6520e822ecc481f85cefa46c526e950fc4c677bc4553633676d60030333983ca7db780bb77d2d WHIRLPOOL 08a0e7432df4042c33c22badd2388f6edbf807bcc777ef7e98b513ba767304f02e9539bc4cda6bd99b7fef773c234bfb47d329e9f7007d22aad19ec428588e36
 DIST nxserver-3.5.0-11.i386.tar.gz 6866158 SHA256 860a5de07e247e38d951f77b87f4dae3eb338120d768f2098df6332e63910074
-DIST nxserver-3.5.0-11.x86_64.tar.gz 7903110 SHA256 05b462bf6b888dbdd22246a521a0b6ed18ba5d55de673a53c5ae9d9c6dd68c63
+DIST nxserver-3.5.0-11.x86_64.tar.gz 7903110 SHA256 05b462bf6b888dbdd22246a521a0b6ed18ba5d55de673a53c5ae9d9c6dd68c63 SHA512 6a2483c874acbe824b766e06b01ad364d163380df02d9a36f7449762a1feeecf3106663503acd3d3435fe9bc6e7adea8e146b8d4d6d3d0a9c38c85c3c85a3d29 WHIRLPOOL 7d73064dffdcc231a72a9e8fdcdc9979b5c4c01af67923b50c2b9ea4a527a6b6d564876c61d607ad664d6ddec4e0a81835f5dee4eb0771e5c5c2c294a26bd41f
 DIST nxserver-3.5.0-5.i386.tar.gz 6858520 SHA256 2d7aeeedafc45b26df3d736e171c2939cee10938a590b6702ec9602d0e898633
 DIST nxserver-3.5.0-5.x86_64.tar.gz 7893612 SHA256 530742c1df514c288155a626da20e2222873468734c1be51de59e43ada007520
-DIST nxserver-3.5.0-9.i386.tar.gz 6865686 SHA256 b009852d7f2c06ff9fb0dee7ea141ab5fb6178d0da5327c52aa8b1b2c14cdec5
-DIST nxserver-3.5.0-9.x86_64.tar.gz 7901088 SHA256 9b1072a14beb7478f3513af3c35b1380084f02015eff66f0671f8b568d7f6eeb
+EBUILD nxserver-freeedition-3.5.0.11-r1.ebuild 3179 SHA256 04efe701df8b6b64160035600b365d8b0190e5b45c4404c29039d3282fa4f03c SHA512 5afd3974c86dde2c7292e76f1805a0e594923e4260c9788d40e1e602285a7b6c81767deb9c6911e9afcae9d3bb9c08a81b37d9f2146149cd97a02cdf6ecc6e8f WHIRLPOOL 7d5b7348c4e26c87560aab7c904b96b30b32af67f196229c31bcd4958e13857b6751e9578c8b2b3fe79704755c9c9de639c9e7a3665a58f2c6fcc5ae3067595d
 EBUILD nxserver-freeedition-3.5.0.11.ebuild 3176 SHA256 15511210466a82dc9667735f320df1035314a6ecaf7ec668a1966d5d4c8a3694 SHA512 5fe1142e03bed113bfec48219702486bd1285d62133beba723a9466167c079982e63ee70dc577f2ec5fb080f7b070692022aeefcecdcaeeb9944c21ca81b9724 WHIRLPOOL 505cec885f013b99e836c612a89dd0625c35335731a826e416632d19141fd82cf9abec751d8bb37ffee41153bd4a95f72ac48b402b5c42398a2012daf59c9b92
 EBUILD nxserver-freeedition-3.5.0.5.ebuild 3172 SHA256 ba6aa1d5d38a444d03820c1bfb002f94a5357eae87959e75c73a9d1387e61cbe SHA512 6ed1306b33a84d5c6a8962b9c52431ab7148250f6b51a7c1992b877eb9085eda46eb0fc2383ad92ec5875e3ce7bf22c0bbb7a7938aeb3ad19384d15f9ba6a0a8 WHIRLPOOL a3eadfea0b0cb9d43e6456d1bd66c494cfc748b770edf5b8b69fa3d742855a617ca19a3cc445be69d93d340f3e4f4f053beb576b3d8f49509f10fa7a75ed6d09
-EBUILD nxserver-freeedition-3.5.0.9.ebuild 3174 SHA256 08c8cdd963892a040c2d2ac57178d8520b1d8357b02b5573039cd5c941790073 SHA512 a032a29c809000034230d65f25aa4d531006e748c219ced82398d6bf6b712d9e872f93f91d9d3a618e2e12fb8a8bbd6042601c43ce20c01f9ee987a2e6235446 WHIRLPOOL b25db62b3475adacabaa7ffe171b5e071e56388de53be7348be4f5044beae59c6f5e598eb263a6a43a227a6a89c6faffa4ec388e40a78e0d34e6a32be9617d73
-MISC ChangeLog 11877 SHA256 2de929c9f3b9fe1471366dfb92ce977c12539bab333285424de5dced30d25080 SHA512 3ba956c93aa7e00be47e000f4f01bb112aaf4fa751da82ef8b738e630bc7aebb674dc6a5d558a879afd136dd040450130dc5024fd43a6a91a703efa25b274f4c WHIRLPOOL 1bdf2329dd5f02b73034eb2401a7cfc2913409a08bc42741611ab68ecccee44e36f1edf4d974000d6c222d0b8d67d65d86dc54e05c9b64ceb8fd3583294a1b2a
+MISC ChangeLog 12243 SHA256 a14b3c5739dcb226d697f30af39d8eae0a9b9aaee78ce72e0af50b5ecec8ea46 SHA512 a4ac4d00e9564554af9c6b95546f8f8e49fe3cce6cb1063ee6d18f39aa8d1fa59e1429f07d663a4b5f0d1346d1a3b49b0bc60d22ad72b40229ea4b89fc0a0a9b WHIRLPOOL 23cf770d0ea8dbd51b1f2c744667336c708e79ed4b033e7b9f4d4e0d265ed8653abced2687eed238fc3f51f9c1632f2d1de2560db86ace7ad0da888755b5bb54
 MISC metadata.xml 229 SHA256 445516ce54a07930b5cf708034023dddbc5fd8125be710709912ef849e623bc5 SHA512 25d354f2acdedcc4aacd99ded3c1ab0a88e038f87c8cbcd7bea1096c12e9450c9ec9666822157c9491483dfcb6d03eeeb31987d8639486ce46529a8121a04e9b WHIRLPOOL cba8e7212166ca371409754f9929209a5378f8b75d95ffaf67b7e2d1f38370f9dacbe2c4a0868e38dee117aee508ed2d782a2a12b3afa34d31703cff42aa966c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk/+kA0ACgkQFYEBGcdFJfLpwwD8CLz8YDRgB0NOyTuWQf7Wkw3I
-+HM8btQiRNRksGQAdkIA/1P/EKiA7uvA/nJCiFWhAw69goiNMg9u2xxOpBQnAdI7
-=SKmZ
+iF4EAREIAAYFAlD92hQACgkQFYEBGcdFJfLBGAD+LGBhW/4KsYUqKqMqT8si9Xc5
+m6oPFgYTI0M4z6LhUGQA/2p6hBu+ndE0AAPR3iH7eCzNLSAqH3+SDPsr5m/3U5Fn
+=Ud4X
 -----END PGP SIGNATURE-----
diff --git a/net-misc/nxserver-freeedition/files/nxserver-3.5.0.11-setup.patch b/net-misc/nxserver-freeedition/files/nxserver-3.5.0.11-setup.patch
new file mode 100644
index 000000000000..cf8e24ede479
--- /dev/null
+++ b/net-misc/nxserver-freeedition/files/nxserver-3.5.0.11-setup.patch
@@ -0,0 +1,79 @@
+--- scripts/setup/nxserver.orig	2012-05-19 11:45:03.000000000 +0200
++++ scripts/setup/nxserver	2013-01-21 22:40:41.958166294 +0100
+@@ -679,6 +679,10 @@
+ 
+   printMsg "Verifying that all init scripts have been removed"
+ 
++  if [ "$system" = "gentoo" ]; then
++    return
++  fi
++
+   runCommand "$RMCOMMAND -f /etc/init.d/nxserver" "Unable to remove '/etc/init.d/nxserver'" "warn"
+ 
+   if [ "$system" = "solaris" ];
+@@ -853,6 +857,10 @@
+ 
+ addNXinit () {
+ 
++ if [ "$system" = "gentoo" ]; then
++   return
++ fi
++
+  runCommand "cat $NODE_ROOT/scripts/init/nxserver > /etc/init.d/nxserver" "Unable to create: '/etc/init.d/nxserver'" "warn"
+  runCommand "chmod +x /etc/init.d/nxserver" "Cannot set permissions of '/etc/init.d/nxserver' file" "warn"
+ 
+@@ -967,6 +975,12 @@
+ }
+ 
+ addNXUserLinux () {
++
++  # does the NX user already exist?
++  if id nx > /dev/null 2>&1 ; then
++    return
++  fi
++
+   if [ "x$system" != "xdebian" ]
+   then
+     sysuser=`useradd --help 2>&1|grep "\-r"`;
+@@ -2679,6 +2693,11 @@
+   system=fedora
+ fi
+ 
++if grep -q "ID=gentoo" /etc/os-release || [ -f /etc/gentoo-release ];
++then
++  system=gentoo
++fi
++
+ if [ "x$system" = "x" -a -f /etc/release ];
+ then
+   system=solaris
+@@ -2713,6 +2732,7 @@
+     "mandrake"           ) ;;
+     "fedora"             ) ;;
+     "debian"             ) ;;
++    "gentoo"             ) ;;
+     "solaris"             ) ;;
+     ""                 ) ARGS=-1 && errMsg="$PREFIX $ERROR ERROR: Unable to autodetect the operating system type, please specify it" ;;
+     *                  ) ARGS=-1 && errMsg="$PREFIX $ERROR ERROR: Unsupported operating system '$system'" ;;
+@@ -2892,21 +2912,6 @@
+     fi
+   fi
+ 
+-  
+-  result=`id nx 2>&1`
+-  if [ $? = 0 ];
+-  then
+-#     printMsg "Cannot add user: nx. User: nx already exists" "error"
+-#     printMsg "Please try to fix the problem by reinstalling the server" "error"
+-    printMsg "Cannot add user: nx" "error"
+-    printMsg "User: nx already exists" "error"
+-    printMsgNoDot "To fix the problem, you may try to completely uninstall NX" 
+-    printMsgNoDot "Server and install it from scratch. If this is not enough,"
+-    printMsgNoDot "please delete the nx user by using the system commands and"
+-    printMsg "proceed with a new installation of NX Server"
+-    exit 1
+-  fi
+-
+   LOGFILE="$INSTALLOG"
+   createLogdirectory
+   startLog
diff --git a/net-misc/nxserver-freeedition/nxserver-freeedition-3.5.0.9.ebuild b/net-misc/nxserver-freeedition/nxserver-freeedition-3.5.0.11-r1.ebuild
index 69d449476662..3585cb704040 100644
--- a/net-misc/nxserver-freeedition/nxserver-freeedition-3.5.0.9.ebuild
+++ b/net-misc/nxserver-freeedition/nxserver-freeedition-3.5.0.11-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/nxserver-freeedition-3.5.0.9.ebuild,v 1.3 2012/07/12 08:51:13 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/nxserver-freeedition-3.5.0.11-r1.ebuild,v 1.1 2013/01/22 00:15:11 voyageur Exp $
+
+EAPI=4
 
-EAPI=2
 inherit eutils user versionator
 
 MAJOR_PV="$(get_version_component_range 1-3)"
@@ -33,8 +34,8 @@ pkg_preinst() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/nxserver-3.0.0-r4-setup.patch
 	epatch "${FILESDIR}"/nxserver-3.3.0-dontupdatekeys.patch
+	epatch "${FILESDIR}"/nxserver-3.5.0.11-setup.patch
 }
 
 src_install() {