Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 318727 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/portage/net-misc/nxserver-freeedition/nxserver-freeedition-3.4.0.14.ebuild (-9 / +19 lines)
Lines 18-24 Link Here
18
IUSE=""
18
IUSE=""
19
RESTRICT="strip"
19
RESTRICT="strip"
20
20
21
DEPEND="=net-misc/nxnode-${MAJOR_PV}*"
21
#DEPEND="=net-misc/nxnode-${MAJOR_PV}*"
22
DEPEND=">=net-misc/nxnode-3.4.0.14"
22
RDEPEND="${DEPEND}
23
RDEPEND="${DEPEND}
23
	media-fonts/font-misc-misc
24
	media-fonts/font-misc-misc
24
	media-fonts/font-cursor-misc
25
	media-fonts/font-cursor-misc
Lines 28-39 Link Here
28
S="${WORKDIR}"/NX
29
S="${WORKDIR}"/NX
29
30
30
pkg_preinst() {
31
pkg_preinst() {
31
	enewuser nx -1 -1 /usr/NX/home/nx
32
	enewuser nx -1 -1 /var/lib/NX
32
}
33
}
33
34
34
src_prepare() {
35
src_prepare() {
35
	epatch "${FILESDIR}"/nxserver-3.0.0-r4-setup.patch
36
	epatch "${FILESDIR}"/nxserver-3.0.0-r4-setup.patch
36
	epatch "${FILESDIR}"/nxserver-3.3.0-dontupdatekeys.patch
37
	epatch "${FILESDIR}"/nxserver-3.3.0-dontupdatekeys.patch
38
	epatch "${FILESDIR}"/nxserver-3.4-chown.patch
37
}
39
}
38
40
39
src_install() {
41
src_install() {
Lines 43-50 Link Here
43
	into /usr/NX
45
	into /usr/NX
44
	dobin bin/nxserver
46
	dobin bin/nxserver
45
47
46
	dodir /usr/NX/etc/keys
48
	dodir /etc/NX/keys
47
	insinto /usr/NX/etc
49
	insinto /etc/NX
48
	doins etc/administrators.db.sample
50
	doins etc/administrators.db.sample
49
	doins etc/guests.db.sample
51
	doins etc/guests.db.sample
50
	doins etc/passwords.db.sample
52
	doins etc/passwords.db.sample
Lines 54-64 Link Here
54
56
55
	newins etc/server-debian.cfg.sample server-gentoo.cfg.sample
57
	newins etc/server-debian.cfg.sample server-gentoo.cfg.sample
56
58
57
	cp -R home "${D}"/usr/NX || die "Unable to install home folder"
59
	dodir /var/lib
60
	cp -R home/nx "${D}"/var/lib || die "Unable to install home folder"
61
	mv "${D}"/var/lib/{nx,NX}
62
58
	cp -R lib "${D}"/usr/NX || die "Unable to install lib folder"
63
	cp -R lib "${D}"/usr/NX || die "Unable to install lib folder"
59
	cp -R scripts "${D}"/usr/NX || die "Unable to install scripts folder"
64
	cp -R scripts "${D}"/usr/NX || die "Unable to install scripts folder"
60
	cp -R share "${D}"/usr/NX || die "Unable to install share folder"
65
	cp -R share "${D}"/usr/NX || die "Unable to install share folder"
61
	cp -R var "${D}"/usr/NX || die "Unable to install var folder"
66
67
	dodir /var/db/NX
68
	cp -R var/db/. "${D}"/var/db/NX || die "Unable to install var/db folder"
69
	dodir /var/run/NX
70
	cp -R var/run/. "${D}"/var/run/NX || die "Unable to install var/run folder"
71
	dodir /var/log/NX
62
72
63
	newinitd "${FILESDIR}"/nxserver-2.1.0-init nxserver
73
	newinitd "${FILESDIR}"/nxserver-2.1.0-init nxserver
64
}
74
}
Lines 68-83 Link Here
68
	# However they use different login shell/home directory paths
78
	# However they use different login shell/home directory paths
69
	if [[ ${ROOT} == "/" ]]; then
79
	if [[ ${ROOT} == "/" ]]; then
70
		usermod -s /usr/NX/bin/nxserver nx || die "Unable to set login shell of nx user!!"
80
		usermod -s /usr/NX/bin/nxserver nx || die "Unable to set login shell of nx user!!"
71
		usermod -d /usr/NX/home/nx nx || die "Unable to set home directory of nx user!!"
81
		usermod -d /var/lib/NX nx || die "Unable to set home directory of nx user!!"
72
	else
82
	else
73
		elog "If you had another NX server installed before, please make sure"
83
		elog "If you had another NX server installed before, please make sure"
74
		elog "the nx user account is correctly set to:"
84
		elog "the nx user account is correctly set to:"
75
		elog " * login shell: /usr/NX/bin/nxserver"
85
		elog " * login shell: /usr/NX/bin/nxserver"
76
		elog " * home directory: /usr/NX/home/nx"
86
		elog " * home directory: /var/lib/NX"
77
	fi
87
	fi
78
88
79
	# only run install when no configuration file is found
89
	# only run install when no configuration file is found
80
	if [ -f /usr/NX/etc/server.cfg ]; then
90
	if [ -f "${ROOT}"/etc/NX/server.cfg ]; then
81
		einfo "Running NoMachine's update script"
91
		einfo "Running NoMachine's update script"
82
		"${ROOT}"/usr/NX/scripts/setup/nxserver --update || die "Update script failed"
92
		"${ROOT}"/usr/NX/scripts/setup/nxserver --update || die "Update script failed"
83
	else
93
	else

Return to bug 318727