Attachment #83701 for bug #101691

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

and this patch




#
# eclass for handling the different nxserver binaries available
# from nomachine's website
#
# now handles freenx as well

inherit rpm eutils


SRC_URI="nxserver-${MY_PV}.i386.rpm"
DEPEND=">=sys-apps/shadow-4.0.3-r6
	>=net-misc/openssh-3.6.1_p2
	>=net-misc/nxclient-1.4.0
	>=net-misc/nxproxy-1.4.0
	>=net-misc/nx-x11-1.4.0
	=net-misc/nx-x11-1.4*"

RDEPEND=">=media-libs/jpeg-6b-r3
	>=sys-libs/glibc-2.3.2-r1
	>=sys-libs/zlib-1.1.4-r1
	virtual/x11
	>=net-misc/openssh-3.6.1_p2
	>=dev-lang/perl-5.8.0-r12"

S="${WORKDIR}"




MY_PV="${PV}-91"
SRC_URI="http://www.nomachine.com/download/nxclient/1.4.0/RedHat-9.0/${PN}-${MY_PV}.i386.rpm"

DEPEND="
	>=net-misc/nxproxy-1.4.0
	>=net-misc/nxssh-1.4.0
	>=dev-libs/expat-1.95.6-r1
	>=media-libs/fontconfig-2.2.0-r2
	>=media-libs/freetype-2.1.4
	>=media-libs/jpeg-6b-r3
	>=x11-libs/qt-3.3.2
	=net-misc/nx-x11-1.4*
	=net-misc/nxproxy-1.4*
	net-analyzer/gnu-netcat
	sys-libs/lib-compat"
	|| ( (	x11-libs/libX11
			x11-libs/libXext
		)
		virtual/x11
	)"

S="${WORKDIR}"





SLOT="0"
KEYWORDS="~ppc ~sparc x86"
IUSE=""
DEPEND="~net-misc/nx-x11-1.4.0"
	sys-devel/patch
	>=media-libs/jpeg-6b-r3
	>=sys-libs/glibc-2.3.2-r1
	>=sys-libs/zlib-1.1.4-r1"

# Run-time dependencies, same as DEPEND if RDEPEND isn't defined:
#RDEPEND=""

S=${WORKDIR}/${PN}


Lines 15-25 Link Here

(-)net-misc/nxserver-freenx/nxserver-freenx-0.4.0.ebuild (-3 / +3 lines)
15	DEPEND="virtual/ssh	15	DEPEND="virtual/ssh
16	dev-tcltk/expect	16	dev-tcltk/expect
17	net-analyzer/gnu-netcat	17	net-analyzer/gnu-netcat
18	x86? ( commercial? ( =net-misc/nxclient-1.4* )	18	x86? ( commercial? ( ~net-misc/nxclient-1.4.0 )
19	!commercial? ( !net-misc/nxclient ) )	19	!commercial? ( !net-misc/nxclient ) )
20	!x86? ( !net-misc/nxclient )	20	!x86? ( !net-misc/nxclient )
21	>=net-misc/nxproxy-1.4.0	21	~net-misc/nxproxy-1.4.0
22	=net-misc/nx-x11-1.4*	22	~net-misc/nx-x11-1.4.0
23	!net-misc/nxserver-personal	23	!net-misc/nxserver-personal
24	!net-misc/nxserver-business	24	!net-misc/nxserver-business
25	!net-misc/nxserver-enterprise"	25	!net-misc/nxserver-enterprise"

Lines 25-32 Link Here

(-)net-misc/nx-x11/nx-x11-1.4.0-r4.ebuild (-2 / +5 lines)
25	IUSE=""	25	IUSE=""
26	#RESTRICT="nostrip"	26	#RESTRICT="nostrip"
27	DEPEND="virtual/x11	27	DEPEND="virtual/x11
28	media-libs/jpeg"	28	>=media-libs/jpeg-6b-r3
29	#RDEPEND=""	29	>=media-libs/libpng-1.2.8
		30	>=sys-libs/zlib-1.1.4-r1
		31	>=sys-libs/glibc-2.3.2-r1"
		32
30	S=${WORKDIR}/${MY_PN}	33	S=${WORKDIR}/${MY_PN}
31		34
32	src_unpack() {	35	src_unpack() {

Return to bug 101691

Lines 4-11 Link Here

(-)eclass/nxserver-1.4.eclass (-12 / +3 lines)
4	#	4	#
5	# eclass for handling the different nxserver binaries available	5	# eclass for handling the different nxserver binaries available
6	# from nomachine's website	6	# from nomachine's website
7	#
8	# now handles freenx as well
9		7
10	inherit rpm eutils	8	inherit rpm eutils
11		9
Lines 19-34 Link Here
19	SRC_URI="nxserver-${MY_PV}.i386.rpm"	17	SRC_URI="nxserver-${MY_PV}.i386.rpm"
20	DEPEND=">=sys-apps/shadow-4.0.3-r6	18	DEPEND=">=sys-apps/shadow-4.0.3-r6
21	>=net-misc/openssh-3.6.1_p2	19	>=net-misc/openssh-3.6.1_p2
22	=net-misc/nxssh-1.4*	20	>=net-misc/nxclient-1.4.0
23	=net-misc/nxproxy-1.4*	21	>=net-misc/nxproxy-1.4.0
24	=net-misc/nxclient-1.4*	22	>=net-misc/nx-x11-1.4.0
25	=net-misc/nx-x11-1.4*"
26
27	RDEPEND=">=media-libs/jpeg-6b-r3
28	>=sys-libs/glibc-2.3.2-r1
29	>=sys-libs/zlib-1.1.4-r1
30	virtual/x11
31	>=net-misc/openssh-3.6.1_p2
32	>=dev-lang/perl-5.8.0-r12"	23	>=dev-lang/perl-5.8.0-r12"
33		24
34	S="${WORKDIR}"	25	S="${WORKDIR}"

Lines 16-38 Link Here

(-)net-misc/nxclient/nxclient-1.4.0-r5.ebuild (-12 / +4 lines)
16	MY_PV="${PV}-91"	16	MY_PV="${PV}-91"
17	SRC_URI="http://www.nomachine.com/download/nxclient/1.4.0/RedHat-9.0/${PN}-${MY_PV}.i386.rpm"	17	SRC_URI="http://www.nomachine.com/download/nxclient/1.4.0/RedHat-9.0/${PN}-${MY_PV}.i386.rpm"
18		18
19	DEPEND=">=media-libs/jpeg-6b-r3	19	DEPEND="
20	>=sys-libs/glibc-2.3.2-r1	20	>=net-misc/nxproxy-1.4.0
21	>=sys-libs/zlib-1.1.4-r1	21	>=net-misc/nxssh-1.4.0
22	>=dev-libs/expat-1.95.6-r1	22	>=dev-libs/expat-1.95.6-r1
23	>=media-libs/fontconfig-2.2.0-r2	23	>=media-libs/fontconfig-2.2.0-r2
24	>=media-libs/freetype-2.1.4	24	>=media-libs/freetype-2.1.4
25	>=media-libs/jpeg-6b-r3
26	>=x11-libs/qt-3.3.2	25	>=x11-libs/qt-3.3.2
27	=net-misc/nx-x11-1.4*
28	=net-misc/nxproxy-1.4*
29	net-analyzer/gnu-netcat	26	net-analyzer/gnu-netcat
30	=net-misc/nxssh-1.4*	27	sys-libs/lib-compat"
31	\|\| ( ( x11-libs/libX11
32	x11-libs/libXext
33	)
34	virtual/x11
35	)"
36		28
37	S="${WORKDIR}"	29	S="${WORKDIR}"
38		30

Lines 12-25 Link Here

(-)net-misc/nxproxy/nxproxy-1.4.0-r2.ebuild (-8 / +1 lines)
12	SLOT="0"	12	SLOT="0"
13	KEYWORDS="~ppc ~sparc x86"	13	KEYWORDS="~ppc ~sparc x86"
14	IUSE=""	14	IUSE=""
15	DEPEND="=net-misc/nx-x11-1.4*	15	DEPEND="~net-misc/nx-x11-1.4.0"
16	sys-devel/patch
17	>=media-libs/jpeg-6b-r3
18	>=sys-libs/glibc-2.3.2-r1
19	>=sys-libs/zlib-1.1.4-r1"
20
21	# Run-time dependencies, same as DEPEND if RDEPEND isn't defined:
22	#RDEPEND=""
23		16
24	S=${WORKDIR}/${PN}	17	S=${WORKDIR}/${PN}
25		18