Attachment #83075 for bug #101691

View | Details | Raw Unified | Return to bug 101691 | Differences between

and this patch




SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
RESTRICT="nomirror strip"
IUSE="nxclient esd arts cups"
DEPEND="virtual/ssh
	dev-tcltk/expect
	sys-apps/gawk
	net-analyzer/gnu-netcat
	x86? ( nxclient? ( >=net-misc/nxclient-1.4.0 )
	      !nxclient? ( !net-misc/nxclient ) )
	amd64? ( nxclient? ( >=net-misc/nxclient-1.4.0 )
	      !nxclient? ( !net-misc/nxclient ) )
	!x86? ( !amd64? ( !net-misc/nxclient ) )
	>=net-misc/nxproxy-1.4.0
	|| ( >=net-misc/nx-x11-1.4.0
	     >=net-misc/nx-x11-bin-1.4.0 )
	arts? ( kde-base/arts )
	esd? ( media-sound/esound )
	cups? ( net-print/cups )
	!net-misc/nxserver-personal
	!net-misc/nxserver-business
	!net-misc/nxserver-enterprise"

	has_multilib_profile && \
		sed -i "/PATH_LIB=/s/lib/$(get_abi_LIBDIR x86)/" nxloadconfig

	[ -f "/usr/NX/etc/node.conf" ] && cp /usr/NX/etc/node.conf .
	# Automatically enable the 1.5 backend if it's installed.
	if has_version "~net-misc/nx-x11-1.5.0" || has_version "~net-misc/nx-x11-bin-1.5.0" ; then
		sed -i '/ENABLE_1_5_0_BACKEND=/s/"0"/"1"/' nxloadconfig
		sed -i '/ENABLE_1_5_0_BACKEND=/s/"0"/"1"/' node.conf.sample
		[ -f "node.conf" ] && sed -i '/ENABLE_1_5_0_BACKEND=/s/"0"/"1"/' node.conf
	else
		[ -f "node.conf" ] && sed -i '/ENABLE_1_5_0_BACKEND=/s/"1"/"0"/' node.conf
	fi

	if use esd ; then
		sed -i '/ENABLE_ESD_PRELOAD=/s/"0"/"1"/' nxloadconfig
		sed -i '/ENABLE_ESD_PRELOAD=/s/"0"/"1"/' node.conf.sample
		[ -f "node.conf" ] && sed -i '/ENABLE_ESD_PRELOAD=/s/"0"/"1"/' node.conf
	else
		[ -f "node.conf" ] && sed -i '/ENABLE_ESD_PRELOAD=/s/"1"/"0"/' node.conf
	fi

	if use arts ; then
		sed -i '/ENABLE_ARTSD_PRELOAD=/s/"0"/"1"/' nxloadconfig
		sed -i '/ENABLE_ARTSD_PRELOAD=/s/"0"/"1"/' node.conf.sample
		[ -f "node.conf" ] && sed -i '/ENABLE_ARTSD_PRELOAD=/s/"0"/"1"/' node.conf
	else
		[ -f "node.conf" ] && sed -i '/ENABLE_ARTSD_PRELOAD=/s/"1"/"0"/' node.conf
	fi

	if use cups ; then
		sed -i '/ENABLE_KDE_CUPS=/s/"0"/"1"/' nxloadconfig
		sed -i '/ENABLE_KDE_CUPS=/s/"0"/"1"/' node.conf.sample
		[ -f "node.conf" ] && sed -i '/ENABLE_KDE_CUPS=/s/"0"/"1"/' node.conf
	else
		[ -f "node.conf" ] && sed -i '/ENABLE_KDE_CUPS=/s/"1"/"0"/' node.conf
	fi
}


	dobin nxkeygen
	dobin nxloadconfig
	dobin nxsetup
	( ( use x86 || use amd64 ) && use nxclient ) || dobin nxprint
	( ( use x86 || use amd64 ) && use nxclient ) || dobin nxclient

	dodir ${NX_ETC_DIR}
	for x in passwords passwords.orig ; do


	insinto ${NX_ETC_DIR}
	doins node.conf.sample
	[ -f "node.conf" ] && doins node.conf
	if has_version "~net-misc/nx-x11-1.5.0" || has_version "~net-misc/nx-x11-bin-1.5.0" ; then
		doins node.conf
	fi

	ssh-keygen -f ${D}${NX_ETC_DIR}/users.id_dsa -t dsa -N "" -q


Return to bug 101691

Lines 11-29 Link Here

(-)../../nx-overlay/net-misc/nxserver-freenx/nxserver-freenx-0.4.4-r1.ebuild (-17 / +41 lines)
11	SLOT="0"	11	SLOT="0"
12	KEYWORDS="~amd64 ~ppc ~x86"	12	KEYWORDS="~amd64 ~ppc ~x86"
13	RESTRICT="nomirror strip"	13	RESTRICT="nomirror strip"
14	IUSE="nxclient"	14	IUSE="nxclient esd arts cups"
15	DEPEND="virtual/ssh	15	DEPEND="virtual/ssh
16	dev-tcltk/expect	16	dev-tcltk/expect
17	sys-apps/gawk	17	sys-apps/gawk
18	net-analyzer/gnu-netcat	18	net-analyzer/gnu-netcat
19	x86? ( commercial? ( >=net-misc/nxclient-1.4.0 )	19	x86? ( nxclient? ( >=net-misc/nxclient-1.4.0 )
20	!commercial? ( !net-misc/nxclient ) )	20	!nxclient? ( !net-misc/nxclient ) )
21	amd64? ( commercial? ( >=net-misc/nxclient-1.4.0 )	21	amd64? ( nxclient? ( >=net-misc/nxclient-1.4.0 )
22	!commercial? ( !net-misc/nxclient ) )	22	!nxclient? ( !net-misc/nxclient ) )
23	!x86? ( !amd64? ( !net-misc/nxclient ) )	23	!x86? ( !amd64? ( !net-misc/nxclient ) )
24	>=net-misc/nxproxy-1.4.0	24	>=net-misc/nxproxy-1.4.0
25	\|\| ( >=net-misc/nx-x11-1.4.0	25	\|\| ( >=net-misc/nx-x11-1.4.0
26	>=net-misc/nx-x11-bin-1.4.0 )	26	>=net-misc/nx-x11-bin-1.4.0 )
		27	arts? ( kde-base/arts )
		28	esd? ( media-sound/esound )
		29	cups? ( net-print/cups )
27	!net-misc/nxserver-personal	30	!net-misc/nxserver-personal
28	!net-misc/nxserver-business	31	!net-misc/nxserver-business
29	!net-misc/nxserver-enterprise"	32	!net-misc/nxserver-enterprise"
Lines 46-59 Link Here
46	has_multilib_profile && \	49	has_multilib_profile && \
47	sed -i "/PATH_LIB=/s/lib/$(get_abi_LIBDIR x86)/" nxloadconfig	50	sed -i "/PATH_LIB=/s/lib/$(get_abi_LIBDIR x86)/" nxloadconfig
48		51
		52	[ -f "/usr/NX/etc/node.conf" ] && cp /usr/NX/etc/node.conf .
49	# Automatically enable the 1.5 backend if it's installed.	53	# Automatically enable the 1.5 backend if it's installed.
50	if has_version "~net-misc/nx-x11-1.5.0" \|\| has_version "~net-misc/nx-x11-bin-1.5.0" ; then	54	if has_version "~net-misc/nx-x11-1.5.0" \|\| has_version "~net-misc/nx-x11-bin-1.5.0" ; then
51	sed '/^ENABLE_1_5_0_BACKEND=/s/"0"/"1"' nxloadconfig	55	sed -i '/ENABLE_1_5_0_BACKEND=/s/"0"/"1"/' nxloadconfig
52	sed '/^#ENABLE_1_5_0_BACKEND=/s/"0"/"1"' node.conf.sample	56	sed -i '/ENABLE_1_5_0_BACKEND=/s/"0"/"1"/' node.conf.sample
53	cat <<EOF > node.conf	57	[ -f "node.conf" ] && sed -i '/ENABLE_1_5_0_BACKEND=/s/"0"/"1"/' node.conf
54	# For more configure options see node.conf.sample	58	else
55	ENABLE_1_5_0_BACKEND="1"	59	[ -f "node.conf" ] && sed -i '/ENABLE_1_5_0_BACKEND=/s/"1"/"0"/' node.conf
56	EOF	60	fi
		61
		62	if use esd ; then
		63	sed -i '/ENABLE_ESD_PRELOAD=/s/"0"/"1"/' nxloadconfig
		64	sed -i '/ENABLE_ESD_PRELOAD=/s/"0"/"1"/' node.conf.sample
		65	[ -f "node.conf" ] && sed -i '/ENABLE_ESD_PRELOAD=/s/"0"/"1"/' node.conf
		66	else
		67	[ -f "node.conf" ] && sed -i '/ENABLE_ESD_PRELOAD=/s/"1"/"0"/' node.conf
		68	fi
		69
		70	if use arts ; then
		71	sed -i '/ENABLE_ARTSD_PRELOAD=/s/"0"/"1"/' nxloadconfig
		72	sed -i '/ENABLE_ARTSD_PRELOAD=/s/"0"/"1"/' node.conf.sample
		73	[ -f "node.conf" ] && sed -i '/ENABLE_ARTSD_PRELOAD=/s/"0"/"1"/' node.conf
		74	else
		75	[ -f "node.conf" ] && sed -i '/ENABLE_ARTSD_PRELOAD=/s/"1"/"0"/' node.conf
		76	fi
		77
		78	if use cups ; then
		79	sed -i '/ENABLE_KDE_CUPS=/s/"0"/"1"/' nxloadconfig
		80	sed -i '/ENABLE_KDE_CUPS=/s/"0"/"1"/' node.conf.sample
		81	[ -f "node.conf" ] && sed -i '/ENABLE_KDE_CUPS=/s/"0"/"1"/' node.conf
		82	else
		83	[ -f "node.conf" ] && sed -i '/ENABLE_KDE_CUPS=/s/"1"/"0"/' node.conf
57	fi	84	fi
58	}	85	}
59		86
Lines 75-82 Link Here
75	dobin nxkeygen	102	dobin nxkeygen
76	dobin nxloadconfig	103	dobin nxloadconfig
77	dobin nxsetup	104	dobin nxsetup
78	( ( use x86 \|\| use amd64 ) && use commercial ) \|\| dobin nxprint	105	( ( use x86 \|\| use amd64 ) && use nxclient ) \|\| dobin nxprint
79	( ( use x86 \|\| use amd64 ) && use commercial ) \|\| dobin nxclient	106	( ( use x86 \|\| use amd64 ) && use nxclient ) \|\| dobin nxclient
80		107
81	dodir ${NX_ETC_DIR}	108	dodir ${NX_ETC_DIR}
82	for x in passwords passwords.orig ; do	109	for x in passwords passwords.orig ; do
Lines 86-95 Link Here
86		113
87	insinto ${NX_ETC_DIR}	114	insinto ${NX_ETC_DIR}
88	doins node.conf.sample	115	doins node.conf.sample
89		116	[ -f "node.conf" ] && doins node.conf
90	if has_version "~net-misc/nx-x11-1.5.0" \|\| has_version "~net-misc/nx-x11-bin-1.5.0" ; then
91	doins node.conf
92	fi
93		117
94	ssh-keygen -f ${D}${NX_ETC_DIR}/users.id_dsa -t dsa -N "" -q	118	ssh-keygen -f ${D}${NX_ETC_DIR}/users.id_dsa -t dsa -N "" -q
95		119