tomwij      14/04/03 19:54:29

  Modified:             ChangeLog
  Added:                tightvnc-1.3.10-r2.ebuild
  Log:
  [QA] Revision bump. EAPI 5. Use emake instead of make. Turn parallel build 
warnings into repoman warnings. Added missing die. Refactored phase functions. 
Support user's LDFLAGS; fixes bug #331953, reported by Diego.
  
  (Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 
6D34E57D)

Revision  Changes    Path
1.155                net-misc/tightvnc/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tightvnc/ChangeLog?rev=1.155&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tightvnc/ChangeLog?rev=1.155&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tightvnc/ChangeLog?r1=1.154&r2=1.155

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- ChangeLog   26 Sep 2013 00:33:38 -0000      1.154
+++ ChangeLog   3 Apr 2014 19:54:29 -0000       1.155
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/tightvnc
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.154 
2013/09/26 00:33:38 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.155 
2014/04/03 19:54:29 tomwij Exp $
+
+*tightvnc-1.3.10-r2 (03 Apr 2014)
+
+  03 Apr 2014; Tom Wijsman <tom...@gentoo.org> +tightvnc-1.3.10-r2.ebuild:
+  [QA] Revision bump. EAPI 5. Use emake instead of make. Turn parallel build
+  warnings into repoman warnings. Added missing die. Refactored phase 
functions.
+  Support user's LDFLAGS; fixes bug #331953, reported by Diego.
 
   26 Sep 2013; Jeroen Roovers <j...@gentoo.org> tightvnc-1.3.10-r1.ebuild:
   Drop HPPA keywording.



1.1                  net-misc/tightvnc/tightvnc-1.3.10-r2.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tightvnc/tightvnc-1.3.10-r2.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tightvnc/tightvnc-1.3.10-r2.ebuild?rev=1.1&content-type=text/plain

Index: tightvnc-1.3.10-r2.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.3.10-r2.ebuild,v 1.1 
2014/04/03 19:54:29 tomwij Exp $

EAPI="5"

inherit eutils toolchain-funcs java-pkg-opt-2

IUSE="java tcpd server"

S="${WORKDIR}/vnc_unixsrc"
DESCRIPTION="A great client/server software package allowing remote network 
access to graphical desktops."
SRC_URI="mirror://sourceforge/vnc-tight/${P}_unixsrc.tar.bz2
        mirror://gentoo/${PN}.png
        java? ( mirror://sourceforge/vnc-tight/${P}_javasrc.tar.gz )"
HOMEPAGE="http://www.tightvnc.com/";

KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux 
~x86-linux"
LICENSE="GPL-2"
SLOT="0"

CDEPEND="media-fonts/font-misc-misc
        virtual/jpeg
        server? (
                media-fonts/font-cursor-misc
                x11-apps/rgb
                x11-apps/xauth
                x11-apps/xsetroot
        )
        x11-libs/libX11
        x11-libs/libXaw
        x11-libs/libXmu
        x11-libs/libXp
        x11-libs/libXt
        tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )"
RDEPEND="${CDEPEND}
        java? ( >=virtual/jre-1.4 )"
DEPEND="${CDEPEND}
        java? ( >=virtual/jdk-1.4 )
        x11-proto/xextproto
        x11-proto/xproto
        server? (
                x11-proto/inputproto
                x11-proto/kbproto
                x11-proto/printproto
        )
        >=x11-misc/imake-1
        x11-misc/gccmakedep
        x11-misc/makedepend
        !net-misc/tigervnc"

pkg_setup() {
        if ! use server;
        then
                echo
                einfo "The 'server' USE flag will build tightvnc's server."
                einfo "If '-server' is chosen only the client is built to save 
space."
                einfo "Stop the build now if you need to add 'server' to USE 
flags.\n"
        fi
}

src_prepare() {
        epatch "${FILESDIR}/${PN}-1.3.10-pathfixes.patch" # fixes bug 78385 and 
146099
        epatch "${FILESDIR}/${PN}-1.3.8-imake-tmpdir.patch" # fixes bug 23483
        epatch "${FILESDIR}/${PN}-1.3.8-darwin.patch" # fixes bug 89908
        epatch "${FILESDIR}/${PN}-1.3.8-mips.patch"
        epatch "${FILESDIR}"/server-CVE-2007-1003.patch
        epatch "${FILESDIR}"/server-CVE-2007-1351-1352.patch
        epatch "${FILESDIR}"/1.3.9-fbsd.patch
        epatch "${FILESDIR}"/1.3.9-arm.patch
        epatch "${FILESDIR}"/1.3.9-sh.patch
        epatch "${FILESDIR}"/${PV}-sparc.patch
        sed -e "s:\\(/etc/\\|/usr/share/\\):${EPREFIX}\\1:g" -i vncserver || die

        if use java; then
                cd "${WORKDIR}"
                epatch "${FILESDIR}/${PN}-1.3.10-java-build.patch"
        fi
}

src_compile() {
        xmkmf -a || die "xmkmf failed"

        emake -j1 CDEBUGFLAGS="${CFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}" World

        if use server; then
                cd Xvnc || die
                econf

                if use tcpd; then
                        local myextra="-lwrap"
                        emake -j1 EXTRA_LIBRARIES="${myextra}" \
                                CDEBUGFLAGS="${CFLAGS}" 
EXTRA_LDOPTIONS="${LDFLAGS}" \
                                EXTRA_DEFINES="-DUSE_LIBWRAP=1"
                else
                        emake -j1 CDEBUGFLAGS="${CFLAGS}" 
EXTRA_LDOPTIONS="${LDFLAGS}"
                fi
        fi

        if use java; then
                cd "${WORKDIR}/vnc_javasrc" || die
                emake -j1 JAVACFLAGS="$(java-pkg_javac-args)" all
        fi

}

src_install() {
        # the web based interface and the java viewer need the java class files
        if use java; then
                java-pkg_newjar "${WORKDIR}/vnc_javasrc/VncViewer.jar"
                java-pkg_dolauncher "${PN}-java"
                insinto /usr/share/${PN}/classes
                doins "${WORKDIR}"/vnc_javasrc/*.vnc || die
                dosym /usr/share/${PN}/lib/${PN}.jar 
/usr/share/${PN}/classes/VncViewer.jar
        fi

        dodir /usr/share/man/man1 /usr/bin
        ./vncinstall "${ED}"/usr/bin "${ED}"/usr/share/man || die "vncinstall 
failed"

        if use server; then
                newconfd "${FILESDIR}"/tightvnc.confd vnc
                newinitd "${FILESDIR}"/tightvnc.initd vnc
        else
                rm -f "${ED}"/usr/bin/vncserver || die
                rm -f "${ED}"/usr/share/man/man1/{Xvnc,vncserver}* || die
        fi

        newicon "${DISTDIR}"/tightvnc.png vncviewer.png
        make_desktop_entry vncviewer vncviewer vncviewer Network

        dodoc ChangeLog README WhatsNew
        use java && dodoc "${FILESDIR}"/README.JavaViewer
        newdoc vncviewer/README README.vncviewer
}




Reply via email to