Fix to add -fPIC to EXTRAFLAGS from upstream Subversion. Fix also building with --as-needed, and mark it stable on amd64 wrt #185055 and #191573. There are more problems in build system, not fixed here today.

(Portage version: 2.1.3.17)

3 files changed, 44 insertions, 4 deletions

diff --git a/net-misc/italc/ChangeLog b/net-misc/italc/ChangeLog
index ec4ade1a9f3d..1e8554d40177 100644
--- a/net-misc/italc/ChangeLog
+++ b/net-misc/italc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/italc
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/italc/ChangeLog,v 1.6 2007/10/22 21:32:22 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/italc/ChangeLog,v 1.7 2007/11/03 17:19:51 drac Exp $
+
+  03 Nov 2007; Samuli Suominen <drac@gentoo.org>
+  +files/italc-1.0.3-fpic-asneeded.patch, italc-1.0.3.ebuild:
+  Fix to add -fPIC to EXTRAFLAGS from upstream Subversion. Fix also building
+  with --as-needed, and mark it stable on amd64 wrt #185055 and #191573. There
+  are more problems in build system, not fixed here today.
 
   22 Oct 2007; Markus Ullmann <jokey@gentoo.org> italc-1.0.3.ebuild:
   Remove bogus wx dependency as mentioned in bug #195720
diff --git a/net-misc/italc/files/italc-1.0.3-fpic-asneeded.patch b/net-misc/italc/files/italc-1.0.3-fpic-asneeded.patch
new file mode 100644
index 000000000000..23e3876a07dd
--- /dev/null
+++ b/net-misc/italc/files/italc-1.0.3-fpic-asneeded.patch
@@ -0,0 +1,24 @@
+diff -ur italc-1.0.3.orig/configure.in italc-1.0.3/configure.in
+--- italc-1.0.3.orig/configure.in	2007-06-04 14:34:19.000000000 +0300
++++ italc-1.0.3/configure.in	2007-11-03 19:06:06.000000000 +0200
+@@ -25,7 +25,7 @@
+ AC_PROG_LIBTOOL
+ 
+ 
+-EXTRAFLAGS="-g0 -O2 -Wall"
++EXTRAFLAGS="-fPIC -Wall"
+ #-floop-optimize2 -fomit-frame-pointer"
+ 
+ if test "x`$CC --version|head -1|cut -d\  -f3|cut -d. -f1`" = "x4" ; then
+diff -ur italc-1.0.3.orig/setup/Makefile.am italc-1.0.3/setup/Makefile.am
+--- italc-1.0.3.orig/setup/Makefile.am	2007-05-11 17:35:44.000000000 +0300
++++ italc-1.0.3/setup/Makefile.am	2007-11-03 19:05:45.000000000 +0200
+@@ -62,7 +62,7 @@
+ 	$(WINDRES) -o $@ $<
+ PLATFORM_LDADD = setup_win_resources.o -L../lib/ -litalc_core
+ else
+-PLATFORM_LDADD = ../lib/libitalc_core-static.a
++PLATFORM_LDADD = -L../lib/ -litalc_core
+ endif
+ 
+ setup_LDADD = $(QT_LDADD) $(QT_LIB_GUI) $(LIBSSL_LDADD) -ljpeg $(PLATFORM_LDADD)
diff --git a/net-misc/italc/italc-1.0.3.ebuild b/net-misc/italc/italc-1.0.3.ebuild
index 02b1e972067c..a72593ac32f3 100644
--- a/net-misc/italc/italc-1.0.3.ebuild
+++ b/net-misc/italc/italc-1.0.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 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.3 2007/10/22 21:32:22 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/italc/italc-1.0.3.ebuild,v 1.4 2007/11/03 17:19:51 drac Exp $
 
-inherit qt4 eutils autotools
+inherit autotools qt4 eutils autotools
 
 DESCRIPTION="Intelligent Teaching And Learning with Computers (iTALC) supports working with computers in school"
 HOMEPAGE="http://italc.sourceforge.net/"
@@ -10,7 +10,7 @@ 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"
 
@@ -35,6 +35,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
+	eautoreconf
+}
+
 src_compile() {
 	econf \
 		"--with-qtdir=${ROOT}/usr" \