From 12719ecf8ecd646ae87a70271cc4832250838b01 Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Fri, 16 Jan 2009 10:51:59 +0000 Subject: Update to new 3.3.0 maintenance release packages, remove first 3.3.0 ebuild (Portage version: 2.2_rc22/cvs/Linux 2.6.28-gentoo x86_64) --- net-misc/nx/ChangeLog | 11 +++- net-misc/nx/nx-3.3.0-r2.ebuild | 123 +++++++++++++++++++++++++++++++++++++++++ net-misc/nx/nx-3.3.0.ebuild | 116 -------------------------------------- 3 files changed, 132 insertions(+), 118 deletions(-) create mode 100644 net-misc/nx/nx-3.3.0-r2.ebuild delete mode 100644 net-misc/nx/nx-3.3.0.ebuild (limited to 'net-misc/nx') diff --git a/net-misc/nx/ChangeLog b/net-misc/nx/ChangeLog index 53aa8bd5c277..4ae7fbd53c4b 100644 --- a/net-misc/nx/ChangeLog +++ b/net-misc/nx/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-misc/nx -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.35 2008/12/18 16:42:37 voyageur Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.36 2009/01/16 10:51:59 voyageur Exp $ + +*nx-3.3.0-r2 (16 Jan 2009) + + 16 Jan 2009; Bernard Cafarelli -nx-3.3.0.ebuild, + +nx-3.3.0-r2.ebuild: + Update to new 3.3.0 maintenance release packages, remove first 3.3.0 + ebuild *nx-3.3.0-r1 (18 Dec 2008) diff --git a/net-misc/nx/nx-3.3.0-r2.ebuild b/net-misc/nx/nx-3.3.0-r2.ebuild new file mode 100644 index 000000000000..4710b7e16836 --- /dev/null +++ b/net-misc/nx/nx-3.3.0-r2.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.3.0-r2.ebuild,v 1.1 2009/01/16 10:51:59 voyageur Exp $ + +EAPI=2 +inherit autotools eutils multilib + +DESCRIPTION="NX compression technology core libraries" +HOMEPAGE="http://www.nomachine.com/developers.php" + +URI_BASE="http://web04.nomachine.com/download/${PV}/sources" +SRC_NX_X11="nx-X11-$PV-4.tar.gz" +SRC_NXAGENT="nxagent-$PV-9.tar.gz" +SRC_NXAUTH="nxauth-$PV-1.tar.gz" +SRC_NXCOMP="nxcomp-$PV-3.tar.gz" +SRC_NXCOMPEXT="nxcompext-$PV-3.tar.gz" +SRC_NXCOMPSHAD="nxcompshad-$PV-2.tar.gz" +SRC_NXPROXY="nxproxy-$PV-2.tar.gz" + +SRC_URI="$URI_BASE/$SRC_NX_X11 $URI_BASE/$SRC_NXAGENT $URI_BASE/$SRC_NXPROXY $URI_BASE/$SRC_NXAUTH $URI_BASE/$SRC_NXCOMPEXT $URI_BASE/$SRC_NXCOMPSHAD $URI_BASE/$SRC_NXCOMP" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="rdesktop vnc" + +RDEPEND="x11-libs/libXau + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXdmcp + x11-libs/libXpm + x11-libs/libXrandr + x11-libs/libXtst + >=media-libs/jpeg-6b-r4 + >=media-libs/libpng-1.2.8 + >=sys-libs/zlib-1.2.3 + rdesktop? ( net-misc/rdesktop ) + vnc? ( || ( net-misc/vnc[server] net-misc/tightvnc[server] ) )" + +DEPEND="${RDEPEND} + x11-misc/gccmakedep + x11-misc/imake + x11-proto/inputproto" + +S=${WORKDIR}/${PN}-X11 + +src_unpack() { + unpack ${A} + + # For nxcl/qtnx + cd "${WORKDIR}"/nxproxy + epatch "${FILESDIR}"/${PN}-3.2.0-nxproxy_read_from_stdin.patch + + # Quiet some warnings + cd "${WORKDIR}"/nxcomp + epatch "${FILESDIR}"/${PN}-2.1.0-invalid-options.patch + + cd "${WORKDIR}" + # Fix sandbox violation + epatch "${FILESDIR}"/1.5.0/nx-x11-1.5.0-tmp-exec.patch + # -fPIC + epatch "${FILESDIR}"/1.5.0/nxcomp-1.5.0-pic.patch + # Respect CFLAGS/CXXFLAGS + epatch "${FILESDIR}"/${PN}-3.3.0-cflags.patch + # Run autoreconf in all neeed folders + for i in nxcomp nxcompext nxcompshad nxproxy; do + cd "${WORKDIR}"/${i} + eautoreconf ${i} + cd "${WORKDIR}" + done + + # From xorg-x11-6.9.0-r3.ebuild + cd "${S}" + HOSTCONF="config/cf/host.def" + echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF} + echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF} + echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF} +} + +src_compile() { + cd "${WORKDIR}"/nxcomp || die "No nxcomp directory found" + econf || die "nxcomp econf failed" + emake || die "nxcomp emake failed" + + cd "${WORKDIR}"/nxcompshad || die "No nxcompshad directory found" + + econf || die "nxcompshad econf failed" + emake || die "nxcompshad emake failed" + + cd "${WORKDIR}"/nxproxy || die "No nxproxy directory found" + econf || die "nxproxy econf failed" + emake || die "nxproxy emake failed" + + cd "${S}" || die "No nx-X11 directory found" + # Again, from xorg-x11-6.9.0-r3.ebuild + unset MAKE_OPTS + FAST=1 emake -j1 World WORLDOPTS="" MAKE="make" || die "nx-X11 emake failed" + + cd "${WORKDIR}"/nxcompext || die "No nxcompext directory found" + econf || die "nxcompext econf failed" + emake || die "nxcompext emake failed" +} + +src_install() { + NX_ROOT=/usr/$(get_libdir)/NX + + for x in nxagent nxauth nxproxy; do + make_wrapper $x ./$x ${NX_ROOT}/bin ${NX_ROOT}/$(get_libdir) || + die " $x wrapper creation failed" + done + + into ${NX_ROOT} + dobin "${S}"/programs/Xserver/nxagent + dobin "${S}"/programs/nxauth/nxauth + dobin "${WORKDIR}"/nxproxy/nxproxy + + dolib.so "${S}"/lib/X11/libX11.so* + dolib.so "${S}"/lib/Xext/libXext.so* + dolib.so "${S}"/lib/Xrender/libXrender.so* + dolib.so "${WORKDIR}"/nxcomp/libXcomp.so* + dolib.so "${WORKDIR}"/nxcompext/libXcompext.so* + dolib.so "${WORKDIR}"/nxcompshad/libXcompshad.so* +} diff --git a/net-misc/nx/nx-3.3.0.ebuild b/net-misc/nx/nx-3.3.0.ebuild deleted file mode 100644 index f540143e0716..000000000000 --- a/net-misc/nx/nx-3.3.0.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.3.0.ebuild,v 1.1 2008/11/24 14:08:17 voyageur Exp $ - -inherit autotools eutils multilib - -DESCRIPTION="NX compression technology core libraries" -HOMEPAGE="http://www.nomachine.com/developers.php" - -URI_BASE="http://web04.nomachine.com/download/${PV}/sources" -SRC_NX_X11="nx-X11-$PV-3.tar.gz" -SRC_NXAGENT="nxagent-$PV-6.tar.gz" -SRC_NXAUTH="nxauth-$PV-1.tar.gz" -SRC_NXCOMP="nxcomp-$PV-3.tar.gz" -SRC_NXCOMPEXT="nxcompext-$PV-2.tar.gz" -SRC_NXCOMPSHAD="nxcompshad-$PV-2.tar.gz" -SRC_NXPROXY="nxproxy-$PV-2.tar.gz" - -SRC_URI="$URI_BASE/$SRC_NX_X11 $URI_BASE/$SRC_NXAGENT $URI_BASE/$SRC_NXPROXY $URI_BASE/$SRC_NXAUTH $URI_BASE/$SRC_NXCOMPEXT $URI_BASE/$SRC_NXCOMPSHAD $URI_BASE/$SRC_NXCOMP" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="rdesktop vnc" - -RDEPEND="x11-libs/libXau - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXdmcp - x11-libs/libXpm - x11-libs/libXrandr - x11-libs/libXtst - >=media-libs/jpeg-6b-r4 - >=media-libs/libpng-1.2.8 - >=sys-libs/zlib-1.2.3 - rdesktop? ( net-misc/rdesktop ) - vnc? ( || ( net-misc/vnc net-misc/tightvnc ) )" - -DEPEND="${RDEPEND} - x11-misc/gccmakedep - x11-misc/imake - x11-proto/inputproto" - -S=${WORKDIR}/${PN}-X11 - -pkg_setup() { - if use vnc; then - if has_version net-misc/vnc && ! built_with_use net-misc/vnc server; - then - die "net-misc/vnc needs to be built with USE=\"server\" for VNC support" - fi - - if has_version net-misc/tightvnc && ! built_with_use net-misc/tightvnc server; - then - die "net-misc/tightvnc needs to be built with USE=\"server\" for VNC support" - fi - fi -} - -src_unpack() { - unpack ${A} - - cd "${WORKDIR}" - epatch "${FILESDIR}"/1.5.0/nx-x11-1.5.0-tmp-exec.patch - epatch "${FILESDIR}"/1.5.0/nxcomp-1.5.0-pic.patch - - cd "${WORKDIR}"/nxproxy - epatch "${FILESDIR}"/${PN}-3.2.0-nxproxy_read_from_stdin.patch - - cd "${WORKDIR}"/nxcomp - epatch "${FILESDIR}"/${PN}-2.1.0-invalid-options.patch - eautoreconf -} - -src_compile() { - cd "${WORKDIR}"/nxcomp || die "No nxcomp directory found" - econf || die "nxcomp econf failed" - emake || die "nxcomp emake failed" - - cd "${WORKDIR}"/nxcompshad || die "No nxcompshad directory found" - - econf || die "nxcompshad econf failed" - emake || die "nxcompshad emake failed" - - cd "${WORKDIR}"/nxproxy || die "No nxproxy directory found" - econf || die "nxproxy econf failed" - emake || die "nxproxy emake failed" - - cd "${S}" || die "No nx-X11 directory found" - emake World || die "nx-X11 emake failed" - - cd "${WORKDIR}"/nxcompext || die "No nxcompext directory found" - econf || die "nxcompext econf failed" - emake || die "nxcompext emake failed" -} - -src_install() { - NX_ROOT=/usr/$(get_libdir)/NX - - for x in nxagent nxauth nxproxy; do - make_wrapper $x ./$x ${NX_ROOT}/bin ${NX_ROOT}/$(get_libdir) || - die " $x wrapper creation failed" - done - - into ${NX_ROOT} - dobin "${S}"/programs/Xserver/nxagent - dobin "${S}"/programs/nxauth/nxauth - dobin "${WORKDIR}"/nxproxy/nxproxy - - dolib.so "${S}"/lib/X11/libX11.so* - dolib.so "${S}"/lib/Xext/libXext.so* - dolib.so "${S}"/lib/Xrender/libXrender.so* - dolib.so "${WORKDIR}"/nxcomp/libXcomp.so* - dolib.so "${WORKDIR}"/nxcompext/libXcompext.so* - dolib.so "${WORKDIR}"/nxcompshad/libXcompshad.so* -} -- cgit v1.2.3-65-gdbad