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

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

8 files changed, 118 insertions, 130 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/Manifest b/net-misc/italc/Manifest
index faa9a0b975a4..27fe01542e8b 100644
--- a/net-misc/italc/Manifest
+++ b/net-misc/italc/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX italc-1.0.3-fpic-asneeded.patch 918 RMD160 fa05d7c9d9e506a3ed5ad7c6a3d0b5a9b7a3dd0e SHA1 b7b57c48dd36101e81827dc5bd3ef723cb432c23 SHA256 269fbcd7f305b1680422324334627585180bb0288d051182a97b37c704ffdfc8
-DIST italc-1.0.2.tar.bz2 2168941 RMD160 445d816497d5bc2f2724025e986a9a12566932d6 SHA1 b216e64e09e9ba50a3a39389ebb84a56d4f9d803 SHA256 7ef935ab21eb1f082e5670099fe39fcd402da8317ef2c2debe646dc712797929
+AUX italc-1.0.9-qt4-libpath.patch 579 RMD160 7b2c919b98f155044bf8ce9aaf5f32e9e2dfa7d2 SHA1 1a2738896cbd16d4657e513f9a770c8a7400a91c SHA256 0d3c17003cb903de2f7704905e3bdabc80fa68bd1037e9bf43ca2ec2701f89f7
+AUX italc-1.0.9-strip.patch 409 RMD160 82d89f6884d091bccf31e4ac61d1cb85072b3cff SHA1 0799fb9b6752476218b129f4d4928f2d4a54c024 SHA256 a9111a731b48bf2522d2ef82ee528162de6e75f774cd847f4a4ca59d1255679a
+AUX italc-1.0.9-system-libvncserver.patch 1921 RMD160 fd01a3a8174dbc669749bf9595cdabd0cf1740d5 SHA1 86ff97c200befe591ccfa42f760d978d5429d753 SHA256 2489cb125c29ac163e088da10225f60318adc4a52a9dd924be45819550477fa9
 DIST italc-1.0.3.tar.bz2 2215904 RMD160 0ffc8518aabdab9b6d0c23e464c35b20a216fc84 SHA1 bb14175bc9aa6a5530ea1cb78dd072e82a46b5f5 SHA256 8719c088e8e6b75a8319733dbc4661e7df9183db34ad1db561cb94c04348df50
-EBUILD italc-1.0.2.ebuild 2453 RMD160 39ba258e0ce0bbeba275f059797bb9ab95c03a88 SHA1 b1fc56cfb45041e860544428f63b780186ccf1cf SHA256 c8edac65e41eccc81702f4f346afd543ead09a7320842552de5c5cbe02b890d4
+DIST italc-1.0.9.tar.bz2 2737753 RMD160 299d443e17307bf196e29de1d159b9e5a4ba1a05 SHA1 f87b0666a96101f552612678c519f2ed21f65ed1 SHA256 0f810816b1a0e7ccecc4adbf289a0e61e93ba0d29412dd36b8553456c72b2ce0
 EBUILD italc-1.0.3-r1.ebuild 2831 RMD160 8723683c56277d610f36bdb55bcceac20d84e518 SHA1 11e4303972d20e4741d3f91af7cf6c19d0f7c81f SHA256 4f6e80ab4c35662fddbbc790b77ae97666e3b97d5ebba87d1e7d370a7c37e5ee
-EBUILD italc-1.0.3.ebuild 2829 RMD160 45c127ead1053a222d5f3cac3b52052c8cd1378d SHA1 32d4c05c7525b8ef6701b3fc6ea9a3222ad26223 SHA256 30a5ee74448488fb27a03e3b2e28100398a67b73dafc60bf863d6fc3334b0a31
-MISC ChangeLog 2091 RMD160 ca7ec2d68fadc9a6ab787a767f43bb5f0c98f1b5 SHA1 82b3578094ed1107ddb254edb22b48e65cb86256 SHA256 653dc4b87cf4b030af56989b4e87ee0326a987f49b9b9853e559399165a16b54
-MISC metadata.xml 254 RMD160 ead1eab9abeaef08c710959cbfca90e51608d979 SHA1 8a77820fc93d56766e0653a776419a59509e5e62 SHA256 e34969f3f290037e6297cc1752634e8fda356dd6f7849e2372103728a3f4a5e9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkl3oJkACgkQkKaRLQcq0GJ8uwCgrjcuBAiUUPGzax0i0DKbLwe5
-1+AAn35MLa6zHMDzZr3fo8V7vNN4Ggyw
-=rQZN
------END PGP SIGNATURE-----
+EBUILD italc-1.0.9.ebuild 2787 RMD160 e85e7a63c30368c572f08760ee6cce5cbc99c4e3 SHA1 0b1ab9e17aa6b37a8afc1aa882e98a19a3a122ce SHA256 c41b2f265b44d74bc5bbb7d391a2f8a1c755eed7105a5c0f002656b280053129
+MISC ChangeLog 2441 RMD160 01206aa3bac03f1d54d2421d79cc9968642f66fc SHA1 4ab8edd0cf48c85ac0e5cc5104e40745f2882e7b SHA256 3ec069e7bd02984ec2ae90d7769d9d7c835d53e4320d319c0bf428ae539c933f
+MISC metadata.xml 364 RMD160 61aa9b76595129fef33cf501a7ebf4de94b39471 SHA1 eec44c7c776987245f8ed88392a8f5eb68038300 SHA256 f52f405b550b4c8503a48b038739e8d7ce1c2c5ba2d6f69cafa2e1b5231aa262
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>