KEYWORDS ~amd64; -fPIC workaround to allow Gaim 0.78+ to build properly with SILC support.

5 files changed, 188 insertions, 2 deletions

diff --git a/net-im/silc-toolkit/ChangeLog b/net-im/silc-toolkit/ChangeLog
index cee74cf108ed..60de6bfb67ad 100644
--- a/net-im/silc-toolkit/ChangeLog
+++ b/net-im/silc-toolkit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/silc-toolkit
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-toolkit/ChangeLog,v 1.9 2004/06/01 02:45:57 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-toolkit/ChangeLog,v 1.10 2004/06/01 08:36:09 absinthe Exp $
+
+*silc-toolkit-0.9.12-r1 (01 Jun 2004)
+
+  01 Jun 2004; Dylan Carlson <absinthe@gentoo.org>
+  +files/silc-toolkit-0.9.12-r1-64bit_goodness.patch,
+  +silc-toolkit-0.9.12-r1.ebuild:
+  -fPIC workaround for amd64 so that Gaim will build with USE=silc.
 
   31 May 2004; Dylan Carlson <absinthe@gentoo.org> silc-toolkit-0.9.12.ebuild:
   Added ~amd64 to KEYWORDS.
diff --git a/net-im/silc-toolkit/Manifest b/net-im/silc-toolkit/Manifest
index 9a8d5abf504d..eb83288292e2 100644
--- a/net-im/silc-toolkit/Manifest
+++ b/net-im/silc-toolkit/Manifest
@@ -1,8 +1,11 @@
-MD5 b316a1739926b6086d8f51e39abbcd26 ChangeLog 1553
+MD5 98f91b17e72a5adae999250e094cafdd ChangeLog 1800
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 MD5 0a2d03d414183b3924d7453fa7ba3710 silc-toolkit-0.9.11.ebuild 1464
 MD5 c877734e78f4858e92d086d0bce1c480 silc-toolkit-0.9.11-r1.ebuild 2051
 MD5 c224d74d17b17719cb4768beffbcf4f6 silc-toolkit-0.9.12.ebuild 1477
+MD5 68f627345e29bbcf35a40468443492b3 silc-toolkit-0.9.12-r1.ebuild 1625
 MD5 f40b47266698753b0bc58c24ce9aac4e files/digest-silc-toolkit-0.9.11 73
 MD5 f40b47266698753b0bc58c24ce9aac4e files/digest-silc-toolkit-0.9.11-r1 73
 MD5 f5feddf04be28d35adc7b14360eac931 files/digest-silc-toolkit-0.9.12 73
+MD5 f5feddf04be28d35adc7b14360eac931 files/digest-silc-toolkit-0.9.12-r1 73
+MD5 6c8639c61522d4e5e7ee452088000fc3 files/silc-toolkit-0.9.12-r1-64bit_goodness.patch 4563
diff --git a/net-im/silc-toolkit/files/digest-silc-toolkit-0.9.12-r1 b/net-im/silc-toolkit/files/digest-silc-toolkit-0.9.12-r1
new file mode 100644
index 000000000000..e96a95d05314
--- /dev/null
+++ b/net-im/silc-toolkit/files/digest-silc-toolkit-0.9.12-r1
@@ -0,0 +1 @@
+MD5 f859d51fcd5284cc1bdaad0cf33a8e6a silc-toolkit-0.9.12.tar.bz2 2547108
diff --git a/net-im/silc-toolkit/files/silc-toolkit-0.9.12-r1-64bit_goodness.patch b/net-im/silc-toolkit/files/silc-toolkit-0.9.12-r1-64bit_goodness.patch
new file mode 100644
index 000000000000..ab31aae19959
--- /dev/null
+++ b/net-im/silc-toolkit/files/silc-toolkit-0.9.12-r1-64bit_goodness.patch
@@ -0,0 +1,108 @@
+diff -ur silc-toolkit-0.9.12/configure silc-toolkit-0.9.12-new/configure
+--- silc-toolkit-0.9.12/configure	2004-02-29 10:09:59.000000000 -0500
++++ silc-toolkit-0.9.12-new/configure	2004-06-01 02:41:13.767084624 -0400
+@@ -28626,7 +28626,7 @@
+ fi
+ 
+ if test x$has_threads = xtrue; then
+-  CFLAGS="$CFLAGS -D_REENTRANT"
++  CFLAGS="$CFLAGS -D_REENTRANT -fPIC"
+ 
+   # XXX possibly incomplete
+   case "${target}" in
+diff -ur silc-toolkit-0.9.12/configure.in silc-toolkit-0.9.12-new/configure.in
+--- silc-toolkit-0.9.12/configure.in	2004-02-29 10:09:51.000000000 -0500
++++ silc-toolkit-0.9.12-new/configure.in	2004-06-01 02:41:00.907039648 -0400
+@@ -971,7 +971,7 @@
+ 
+ AM_CONDITIONAL(SILC_THREADS, test x$has_threads = xtrue)
+ if test x$has_threads = xtrue; then
+-  CFLAGS="$CFLAGS -D_REENTRANT"
++  CFLAGS="$CFLAGS -D_REENTRANT -fPIC"
+ 
+   # XXX possibly incomplete
+   case "${target}" in
+diff -ur silc-toolkit-0.9.12/lib/silccore/tests/Makefile silc-toolkit-0.9.12-new/lib/silccore/tests/Makefile
+--- silc-toolkit-0.9.12/lib/silccore/tests/Makefile	2004-02-29 10:10:41.000000000 -0500
++++ silc-toolkit-0.9.12-new/lib/silccore/tests/Makefile	2004-06-01 02:40:28.864910792 -0400
+@@ -139,7 +139,7 @@
+ AWK = gawk
+ CC = gcc
+ CCDEPMODE = depmode=gcc3
+-CFLAGS =  -g -O2 -Wall -finline-functions -D_REENTRANT
++CFLAGS =  -g -O2 -Wall -finline-functions -D_REENTRANT -fPIC
+ CPP = gcc -E
+ CPPFLAGS = 
+ CXX = g++
+diff -ur silc-toolkit-0.9.12/lib/silccrypt/tests/Makefile silc-toolkit-0.9.12-new/lib/silccrypt/tests/Makefile
+--- silc-toolkit-0.9.12/lib/silccrypt/tests/Makefile	2004-02-29 10:10:41.000000000 -0500
++++ silc-toolkit-0.9.12-new/lib/silccrypt/tests/Makefile	2004-06-01 02:40:35.138956992 -0400
+@@ -171,7 +171,7 @@
+ AWK = gawk
+ CC = gcc
+ CCDEPMODE = depmode=gcc3
+-CFLAGS =  -g -O2 -Wall -finline-functions -D_REENTRANT
++CFLAGS =  -g -O2 -Wall -finline-functions -D_REENTRANT -fPIC
+ CPP = gcc -E
+ CPPFLAGS = 
+ CXX = g++
+diff -ur silc-toolkit-0.9.12/lib/silcmath/mpi/configure silc-toolkit-0.9.12-new/lib/silcmath/mpi/configure
+--- silc-toolkit-0.9.12/lib/silcmath/mpi/configure	2004-02-24 09:39:41.000000000 -0500
++++ silc-toolkit-0.9.12-new/lib/silcmath/mpi/configure	2004-06-01 02:40:17.731603312 -0400
+@@ -2778,7 +2778,7 @@
+   echo "Using assembler optimization if possible."
+ fi
+ 
+-CFLAGS="$CFLAGS -D_REENTRANT"
++CFLAGS="$CFLAGS -D_REENTRANT -fPIC"
+ 
+ # Put here any platform specific stuff
+ #
+diff -ur silc-toolkit-0.9.12/lib/silcmath/mpi/configure.in silc-toolkit-0.9.12-new/lib/silcmath/mpi/configure.in
+--- silc-toolkit-0.9.12/lib/silcmath/mpi/configure.in	2004-02-24 09:39:12.000000000 -0500
++++ silc-toolkit-0.9.12-new/lib/silcmath/mpi/configure.in	2004-06-01 02:40:08.013080752 -0400
+@@ -78,7 +78,7 @@
+   echo "Using assembler optimization if possible."
+ fi
+ 
+-CFLAGS="$CFLAGS -D_REENTRANT"
++CFLAGS="$CFLAGS -D_REENTRANT -fPIC"
+ 
+ # Put here any platform specific stuff
+ #
+diff -ur silc-toolkit-0.9.12/lib/silcsftp/tests/Makefile silc-toolkit-0.9.12-new/lib/silcsftp/tests/Makefile
+--- silc-toolkit-0.9.12/lib/silcsftp/tests/Makefile	2004-02-29 10:10:42.000000000 -0500
++++ silc-toolkit-0.9.12-new/lib/silcsftp/tests/Makefile	2004-06-01 02:40:48.443934328 -0400
+@@ -144,7 +144,7 @@
+ AWK = gawk
+ CC = gcc
+ CCDEPMODE = depmode=gcc3
+-CFLAGS =  -g -O2 -Wall -finline-functions -D_REENTRANT
++CFLAGS =  -g -O2 -Wall -finline-functions -D_REENTRANT -fPIC
+ CPP = gcc -E
+ CPPFLAGS = 
+ CXX = g++
+diff -ur silc-toolkit-0.9.12/lib/silcutil/tests/Makefile silc-toolkit-0.9.12-new/lib/silcutil/tests/Makefile
+--- silc-toolkit-0.9.12/lib/silcutil/tests/Makefile	2004-02-29 10:10:42.000000000 -0500
++++ silc-toolkit-0.9.12-new/lib/silcutil/tests/Makefile	2004-06-01 02:40:39.118352032 -0400
+@@ -139,7 +139,7 @@
+ AWK = gawk
+ CC = gcc
+ CCDEPMODE = depmode=gcc3
+-CFLAGS =  -g -O2 -Wall -finline-functions -D_REENTRANT
++CFLAGS =  -g -O2 -Wall -finline-functions -D_REENTRANT -fPIC
+ CPP = gcc -E
+ CPPFLAGS = 
+ CXX = g++
+diff -ur silc-toolkit-0.9.12/tutorial/Makefile.defines_int silc-toolkit-0.9.12-new/tutorial/Makefile.defines_int
+--- silc-toolkit-0.9.12/tutorial/Makefile.defines_int	2004-02-29 10:10:43.000000000 -0500
++++ silc-toolkit-0.9.12-new/tutorial/Makefile.defines_int	2004-06-01 02:40:54.267049080 -0400
+@@ -18,7 +18,7 @@
+ silc_install_prefix=/usr/local/silc
+ SILC_COMMON_LIBS=  -ldl -lpthread -L$(silc_install_prefix)/lib \
+ 	-L/usr/local/silc/lib -lsilc -lsilcclient -lsilc
+-SILC_CFLAGS= -g -O2 -Wall -finline-functions -D_REENTRANT
++SILC_CFLAGS= -g -O2 -Wall -finline-functions -D_REENTRANT -fPIC
+ CC=gcc
+ LIBTOOL = $(SHELL) $(top_builddir)/libtool
+ LN_S = ln -s  
diff --git a/net-im/silc-toolkit/silc-toolkit-0.9.12-r1.ebuild b/net-im/silc-toolkit/silc-toolkit-0.9.12-r1.ebuild
new file mode 100644
index 000000000000..b6482ff9d6fc
--- /dev/null
+++ b/net-im/silc-toolkit/silc-toolkit-0.9.12-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-toolkit/silc-toolkit-0.9.12-r1.ebuild,v 1.1 2004/06/01 08:36:09 absinthe Exp $
+
+IUSE="client server debug ipv6"
+
+DESCRIPTION="Software development toolkit which provides full SILC protocol implementation for application developers."
+HOMEPAGE="http://silcnet.org"
+SRC_URI="http://silcnet.org/download/toolkit/sources/silc-toolkit-${PV}.tar.bz2"
+KEYWORDS="~amd64"
+LICENSE="GPL-2"
+
+SLOT="0"
+
+DEPEND="virtual/glibc
+		!net-im/silc-client"
+RDEPEND="virtual/glibc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Fix for amd64
+	[ "${ARCH}" = "amd64" ] && epatch ${FILESDIR}/${P}-64bit_goodness.patch
+}
+
+src_compile() {
+	local myconf
+
+	myconf="--prefix=${D}/usr \
+		--datadir=${D}/usr/share/silc \
+		--mandir=${D}/usr/man \
+		--includedir=${D}/usr/include/${PN} \
+		--sysconfdir=${D}/usr/share/silc/etc \
+		--with-etcdir=${D}/etc/silc \
+		--with-simdir=${D}/usr/share/silc/modules \
+		--with-docdir=${D}/usr/share/doc/${P} \
+		--with-logsdir=${D}/var/log/silc"
+
+	# Fix for amd64
+	[ "${ARCH}" = "amd64" ] && append-flags -fPIC
+
+	if [ "${DEBUG}" ]
+	then
+		einfo "debugging"
+		myconf="${myconf} --enable-debug"
+	fi
+
+	use client \
+		&& myconf="${myconf}" \
+		|| myconf="${myconf} --without-irssi"
+
+	use ipv6 \
+		&& myconf="${myconf} --enable-ipv6"
+
+	use server \
+		&& myconf="${myconf}" \
+		|| myconf="${myconf} --without-silcd"
+
+	econf ${myconf} || die "./configure failed"
+	make || die "make failed"
+}
+
+src_install() {
+	make install
+	mv ${D}/usr/tutorial ${D}/usr/share/doc/${P}
+}