Fix some missing includes. Make sure Makefile does not run make Makefiles as xmkmf -a already does that. Move xmkmf to src_configure(). Respect LDFLAGS (bug #336116), CC, CFLAGS. Add missing deps. Fix quoting issue.

Package-Manager: portage-2.2_rc86/cvs/Linux i686

4 files changed, 87 insertions, 3 deletions

diff --git a/net-misc/vncrec/ChangeLog b/net-misc/vncrec/ChangeLog
index 88344b285d6f..fa11e1ccfc62 100644
--- a/net-misc/vncrec/ChangeLog
+++ b/net-misc/vncrec/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/vncrec
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vncrec/ChangeLog,v 1.7 2007/07/22 08:06:24 dberkholz Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vncrec/ChangeLog,v 1.8 2010/09/28 18:28:34 jer Exp $
+
+*vncrec-0.2-r1 (28 Sep 2010)
+
+  28 Sep 2010; Jeroen Roovers <jer@gentoo.org> +vncrec-0.2-r1.ebuild,
+  +files/vncrec-0.2-includes.patch:
+  Fix some missing includes. Make sure Makefile does not run make Makefiles
+  as xmkmf -a already does that. Move xmkmf to src_configure(). Respect
+  LDFLAGS (bug #336116), CC, CFLAGS. Add missing deps. Fix quoting issue.
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; vncrec-0.2.ebuild:
   Drop virtual/x11 references.
diff --git a/net-misc/vncrec/Manifest b/net-misc/vncrec/Manifest
index 62d7789ec40d..0616b866893e 100644
--- a/net-misc/vncrec/Manifest
+++ b/net-misc/vncrec/Manifest
@@ -1,4 +1,6 @@
+AUX vncrec-0.2-includes.patch 565 RMD160 7730cf68eb12e30265536516bc7c671df51670e2 SHA1 739c0bba5c183a9af6faf2a9bcf982b992ea6fcd SHA256 591481a0e62fa3cbe331b37954c33d4f94586bedec35df7fd0f13c8cf5835cfb
 DIST vncrec-0.2.tar.gz 65768 RMD160 605fc95dd8f25ad92e124fd230f531515f36f7f7 SHA1 d8eb6f9a9c75fe721182491a566a07d9d6b3cfcb SHA256 fd4abed79892c68c078d74ec9cd7599d782325f5f59b71f356aec0120c21295b
+EBUILD vncrec-0.2-r1.ebuild 1077 RMD160 cdf547844e5a8f5f49e012cac7f2fd6b14e519f4 SHA1 54037a5301e6b5029180496f4a447d78b73ddd7a SHA256 a44bdcd6b9885f97d14d9c58b87e9f2f2a685c087cfd9f7337ec2bae8347072d
 EBUILD vncrec-0.2.ebuild 790 RMD160 e276439973349faef87f4a282905cf174edd05d0 SHA1 23db7a40ce3b2112991500f40c4d54c2b649b3b0 SHA256 9c21b1df5dd37b541537c1aed50f0117e001c8af1228e3d7d762475e2e66904c
-MISC ChangeLog 821 RMD160 c624b6e75f4cc7076818694e1250f1506565deb5 SHA1 3e4108b5580efaeb9c902b90b31ee1492974de9a SHA256 1f78f1076624233478ce49ddd35cf1c961e5e85c27f732893c16d05d32d3d8d6
+MISC ChangeLog 1174 RMD160 69b26f7162e82ff2752be2d7e079db524b7ccf7e SHA1 b7bd25972541923add851f6a7ae5258be91f55c6 SHA256 5745cd6fea2cf1d8a5e38d41c26cf7acf9fe092d93c125c84142de57f6bc845d
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
diff --git a/net-misc/vncrec/files/vncrec-0.2-includes.patch b/net-misc/vncrec/files/vncrec-0.2-includes.patch
new file mode 100644
index 000000000000..174a42738ab7
--- /dev/null
+++ b/net-misc/vncrec/files/vncrec-0.2-includes.patch
@@ -0,0 +1,21 @@
+--- a/vncconnect/vncconnect.c	2001-06-09 05:41:45.000000000 +0200
++++ b/vncconnect/vncconnect.c	2010-09-28 20:19:03.000000000 +0200
+@@ -5,6 +5,8 @@
+ #include <stdio.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xatom.h>
++#include <stdlib.h> /* exit() */
++#include <string.h> /* strlen() */
+ 
+ static char *programName;
+ 
+--- a/libvncauth/vncauth.c	2001-06-09 05:41:45.000000000 +0200
++++ b/libvncauth/vncauth.c	2010-09-28 20:19:44.000000000 +0200
+@@ -28,6 +28,7 @@
+ #include <sys/stat.h>
+ #include <vncauth.h>
+ #include <d3des.h>
++#include <time.h> /* time() */
+ 
+ 
+ /*
diff --git a/net-misc/vncrec/vncrec-0.2-r1.ebuild b/net-misc/vncrec/vncrec-0.2-r1.ebuild
new file mode 100644
index 000000000000..d880fc425207
--- /dev/null
+++ b/net-misc/vncrec/vncrec-0.2-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vncrec/vncrec-0.2-r1.ebuild,v 1.1 2010/09/28 18:28:34 jer Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="VNC session recorder and player"
+HOMEPAGE="http://www.sodan.org/~penny/vncrec/"
+SRC_URI="http://www.sodan.org/~penny/vncrec/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXp
+	x11-libs/libXpm
+	x11-libs/libXt"
+DEPEND="${RDEPEND}
+	app-text/rman
+	x11-misc/gccmakedep
+	x11-misc/imake
+	x11-proto/xextproto"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-includes.patch
+	touch vncrec/vncrec.man
+	sed -i Imakefile \
+		-e '/make Makefiles/d' \
+		|| die "sed Imakefile"
+}
+
+src_configure() {
+	xmkmf -a || die
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) \
+		CCOPTIONS="${CXXFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}" \
+		World || die
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc ChangeLog README README.vnc
+}