Fix glibc 2.8 build w/ version bump, add option to build against system libvncserver

(Portage version: 2.2_rc23/cvs/Linux x86_64)

7 files changed, 111 insertions, 115 deletions

diff --git a/net-misc/italc/ChangeLog b/net-misc/italc/ChangeLog
index 044a01c88299..faf9d6223692 100644
--- a/net-misc/italc/ChangeLog
+++ b/net-misc/italc/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/italc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/italc/ChangeLog,v 1.13 2009/01/21 22:24:13 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/italc/ChangeLog,v 1.14 2009/01/31 21:21:12 jokey Exp $
+
+*italc-1.0.9 (31 Jan 2009)
+
+  31 Jan 2009; <jokey@gentoo.org> +files/italc-1.0.9-qt4-libpath.patch,
+  +files/italc-1.0.9-strip.patch,
+  +files/italc-1.0.9-system-libvncserver.patch, metadata.xml,
+  -italc-1.0.2.ebuild, -italc-1.0.3.ebuild, +italc-1.0.9.ebuild:
+  Fix glibc 2.8 build w/ version bump, add option to build against system
+  libvncserver
 
   21 Jan 2009; Markus Meier <maekke@gentoo.org> italc-1.0.3-r1.ebuild:
   amd64/x86 stable, bug #248038
diff --git a/net-misc/italc/files/italc-1.0.9-qt4-libpath.patch b/net-misc/italc/files/italc-1.0.9-qt4-libpath.patch
new file mode 100644
index 000000000000..b2c92c7aa05d
--- /dev/null
+++ b/net-misc/italc/files/italc-1.0.9-qt4-libpath.patch
@@ -0,0 +1,14 @@
+--- ./italc-1.0.9/acinclude.m4	2008-05-24 11:19:33.000000000 +0200
++++ ./italc-1.0.9/acinclude.m4	2009-01-31 21:24:54.000000000 +0100
+@@ -127,9 +127,9 @@
+ 	fi
+         ;;
+     *)
+-       	QT_LIBS=`ls $QTDIR/lib64/libQt*.so 2> /dev/null` 
++       	QT_LIBS=`ls $QTDIR/lib64/qt4/libQt*.so 2> /dev/null` 
+         if test "x$QT_LIBS" = x;  then
+-        	QT_LIBS=`ls $QTDIR/lib/libQt*.so 2> /dev/null` 
++        	QT_LIBS=`ls $QTDIR/lib/qt4/libQt*.so 2> /dev/null` 
+             	if test "x$QT_LIBS" = x;  then
+ 			AC_MSG_ERROR([*** Couldn't find any Qt4 libraries])
+             	fi
diff --git a/net-misc/italc/files/italc-1.0.9-strip.patch b/net-misc/italc/files/italc-1.0.9-strip.patch
new file mode 100644
index 000000000000..831b9723930a
--- /dev/null
+++ b/net-misc/italc/files/italc-1.0.9-strip.patch
@@ -0,0 +1,16 @@
+--- ./italc-1.0.9/Makefile.am	2008-07-23 13:25:55.000000000 +0200
++++ ./italc-1.0.9/Makefile.am	2009-01-31 21:59:40.000000000 +0100
+@@ -10,13 +10,6 @@
+ 	rm -rf `find $(distdir) -name *.moc`
+ 	rm -rf `find $(distdir) -name *_qrc.cpp`
+ 
+-# strip all binaries after installation
+-install-exec-hook:
+-	cd $(DESTDIR)$(bindir) ; \
+-	strip ica; \
+-	strip italc
+-
+-
+ if HAVE_RPM
+ $(PACKAGE)-$(VERSION).tar.gz: dist
+ 
diff --git a/net-misc/italc/files/italc-1.0.9-system-libvncserver.patch b/net-misc/italc/files/italc-1.0.9-system-libvncserver.patch
new file mode 100644
index 000000000000..c48441eaaa62
--- /dev/null
+++ b/net-misc/italc/files/italc-1.0.9-system-libvncserver.patch
@@ -0,0 +1,52 @@
+--- ./italc-1.0.9.orig/ica/Makefile.am	2008-04-17 23:23:57.000000000 +0200
++++ ./italc-1.0.9/ica/Makefile.am	2009-01-31 22:08:53.000000000 +0100
+@@ -6,47 +6,14 @@
+ IVS_INCLUDES = -I$(srcdir)/x11 -I$(srcdir)/x11/x11vnc -I$(srcdir)/x11/libvncserver
+ 
+ IVS_SRCS =	$(srcdir)/x11/x11vnc.c				\
+-		$(srcdir)/x11/libvncserver/auth.c		\
+-		$(srcdir)/x11/libvncserver/cargs.c		\
+-		$(srcdir)/x11/libvncserver/corre.c		\
+-		$(srcdir)/x11/libvncserver/cursor.c		\
+-		$(srcdir)/x11/libvncserver/cutpaste.c		\
+-		$(srcdir)/x11/libvncserver/d3des.c		\
+-		$(srcdir)/x11/libvncserver/draw.c		\
+-		$(srcdir)/x11/libvncserver/font.c		\
+-		$(srcdir)/x11/libvncserver/hextile.c		\
+-		$(srcdir)/x11/libvncserver/httpd.c		\
+-		$(srcdir)/x11/libvncserver/main.c		\
+-		$(srcdir)/x11/libvncserver/rfbregion.c		\
+-		$(srcdir)/x11/libvncserver/rfbserver.c		\
+-		$(srcdir)/x11/libvncserver/rre.c		\
+-		$(srcdir)/x11/libvncserver/scale.c		\
+-		$(srcdir)/x11/libvncserver/selbox.c		\
+-		$(srcdir)/x11/libvncserver/sockets.c		\
+-		$(srcdir)/x11/libvncserver/stats.c		\
+-		$(srcdir)/x11/libvncserver/translate.c		\
+-		$(srcdir)/x11/libvncserver/ultra.c		\
+-		$(srcdir)/x11/libvncserver/vncauth.c		\
+ 		$(srcdir)/x11/rfb/rfbregion.h			\
+-		$(srcdir)/x11/rfb/default8x16.h			\
+-		$(srcdir)/x11/libvncserver/d3des.h		\
+-		$(srcdir)/x11/libvncserver/private.h		\
+-		$(srcdir)/x11/libvncserver/scale.h		\
+-		$(srcdir)/x11/libvncserver/zrleoutstream.h	\
+-		$(srcdir)/x11/libvncserver/zrlepalettehelper.h	\
+-		$(srcdir)/x11/libvncserver/zrletypes.h		\
+-		$(srcdir)/x11/libvncserver/zlib.c		\
+-		$(srcdir)/x11/libvncserver/zrle.c		\
+-		$(srcdir)/x11/libvncserver/zrleoutstream.c	\
+-		$(srcdir)/x11/libvncserver/zrlepalettehelper.c	\
+-		$(srcdir)/x11/libvncserver/tight.c
+-
++		$(srcdir)/x11/rfb/default8x16.h
+ 
+ if HAVE_LIBPTHREAD
+ PTHREADLDADD = -lpthread
+ endif
+ 
+-IVSLDADD = @X_LIBS@ $(PTHREADLDADD)
++IVSLDADD = @X_LIBS@ $(PTHREADLDADD) -lvncserver
+ 
+ 
+ else
diff --git a/net-misc/italc/italc-1.0.2.ebuild b/net-misc/italc/italc-1.0.2.ebuild
deleted file mode 100644
index 1b65775d27ad..000000000000
--- a/net-misc/italc/italc-1.0.2.ebuild
+++ /dev/null
@@ -1,97 +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/italc/italc-1.0.2.ebuild,v 1.5 2008/07/28 21:30:06 carlo Exp $
-
-EAPI=1
-
-inherit qt4 eutils autotools
-
-DESCRIPTION="Intelligent Teaching And Learning with Computers (iTALC) supports working with computers in school"
-HOMEPAGE="http://italc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/italc/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-
-IUSE="X v4l crypt xinerama threads fbcon"
-
-DEPEND="dev-libs/lzo
-	sys-apps/tcp-wrappers
-	media-libs/jpeg
-	sys-libs/zlib
-	dev-libs/openssl
-	=x11-libs/qt-4.3*:4
-	xinerama? ( x11-libs/libXinerama )
-	X? ( x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXdamage
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXrandr
-		x11-libs/libXtst )"
-RDEPEND=${DEPEND}
-
-pkg_setup() {
-	enewgroup italc
-}
-
-src_compile() {
-	econf \
-		"--with-qtdir=${ROOT}/usr" \
-		"--with-linux" \
-		"--with-uinput" \
-		"--without-macosx-native" \
-		$(use_with xinerama) \
-		$(use_with X x) \
-		$(use_with X xkeyboard) \
-		$(use_with X xrandr) \
-		$(use_with X xfixes) \
-		$(use_with X xdamage) \
-		$(use_with X xtrap) \
-		$(use_with X xrecord) \
-		$(use_with X dpms) \
-		$(use_with v4l) \
-		$(use_with fbcon fbdev) \
-		$(use_with fbcon fbpm) \
-		$(use_with threads pthread) \
-		$(use_with crypt) \
-		|| die "econf failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-	rm -r "${D}/usr/share/italc"
-	dodoc TODO README AUTHORS INSTALL ChangeLog
-
-	# -- disabled per 2007-04-04 as the icon is missing in upstream file
-	# -- joke
-	# Install server logo
-	#newicon ima/resources/client_manager.png ${PN}.png
-	#make_desktop_entry "${PN}" "iTALC Master" "${PN}.png" "Qt;KDE;Education"
-}
-
-pkg_postinst() {
-	elog "On the master, please run "
-	elog "# emerge --config =${CATEGORY}/${PF}"
-
-	elog "Please add the logins of master users (teachers) to the italc group by running"
-	elog "# usermod -a -G italc <loginname>"
-
-	elog ""
-}
-
-pkg_config() {
-	if [ ! -d /etc/italc/keys ] ; then
-		einfo "Creating public and private keys for italc in /etc/italc/keys."
-		/usr/bin/ica -role teacher -createkeypair > /dev/null
-		eend $?
-		einfo "Setting chmod 640 on private keys."
-		chgrp -R italc /etc/italc
-		chmod -R o-rwx /etc/italc/keys/private
-	else
-		einfo "Not creating new keypair, as /etc/italc/keys already exists"
-	fi
-}
diff --git a/net-misc/italc/italc-1.0.3.ebuild b/net-misc/italc/italc-1.0.9.ebuild
index f8b43fc82f0d..02cd84b9ee8e 100644
--- a/net-misc/italc/italc-1.0.3.ebuild
+++ b/net-misc/italc/italc-1.0.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/italc/italc-1.0.3.ebuild,v 1.7 2008/08/25 08:15:33 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/italc/italc-1.0.9.ebuild,v 1.1 2009/01/31 21:21:12 jokey Exp $
 
-EAPI=1
+EAPI=2
 
 inherit autotools qt4 eutils autotools
 
@@ -12,16 +12,18 @@ SRC_URI="mirror://sourceforge/italc/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
-IUSE="X v4l crypt xinerama threads fbcon"
+IUSE="X v4l crypt xinerama threads fbcon system-libvncserver"
 
 RDEPEND="dev-libs/lzo
 	sys-apps/tcp-wrappers
 	media-libs/jpeg
 	sys-libs/zlib
 	dev-libs/openssl
-	=x11-libs/qt-4.3*:4
+	x11-libs/qt-core
+	x11-libs/qt-xmlpatterns
+	system-libvncserver? ( net-libs/libvncserver )
 	xinerama? ( x11-libs/libXinerama )
 	X? ( x11-libs/libICE
 		x11-libs/libSM
@@ -31,7 +33,8 @@ RDEPEND="dev-libs/lzo
 		x11-libs/libXfixes
 		x11-libs/libXrandr
 		x11-libs/libXtst
-		x11-misc/xinput )"
+		x11-misc/xinput
+		x11-libs/qt-gui:4 )"
 DEPEND="${RDEPEND}
 	X? ( x11-proto/inputproto )"
 
@@ -39,19 +42,16 @@ pkg_setup() {
 	enewgroup italc
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# From upstream subversion with extra modification for asneeded,
-	# both working but very likely incorrect solutions.
-	# http://italc.svn.sourceforge.net/viewvc/italc/branches/STABLE_1-0/configure.in?r1=217&r2=219
-	epatch "${FILESDIR}"/${P}-fpic-asneeded.patch
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-qt4-libpath.patch
+	epatch "${FILESDIR}"/${P}-strip.patch
+	use system-libvncserver && epatch "${FILESDIR}"/${P}-system-libvncserver.patch
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	econf \
-		"--with-qtdir=${ROOT}/usr" \
+		"--with-qtdir=/usr" \
 		"--with-linux" \
 		"--with-uinput" \
 		"--without-macosx-native" \
@@ -70,7 +70,6 @@ src_compile() {
 		$(use_with threads pthread) \
 		$(use_with crypt) \
 		|| die "econf failed"
-	emake || die "make failed"
 }
 
 src_install() {
diff --git a/net-misc/italc/metadata.xml b/net-misc/italc/metadata.xml
index a9f0ede778fb..b5e80e971723 100644
--- a/net-misc/italc/metadata.xml
+++ b/net-misc/italc/metadata.xml
@@ -6,4 +6,7 @@
 		<email>jokey@gentoo.org</email>
 		<name>Markus Ullmann</name>
 	</maintainer>
+	<use>
+		<flag name="system-libvncserver">Build against the system libvncserver (experimental)</flag>
+	</use>
 </pkgmetadata>