Apply patch to compile on current lib versions. Bug #103034 by Daniel Link <stagger at gmx.net>.

(Portage version: 2.0.51.22-r2)

4 files changed, 69 insertions, 8 deletions

diff --git a/net-im/silky/ChangeLog b/net-im/silky/ChangeLog
index 2477bfd1a256..079c8507fe71 100644
--- a/net-im/silky/ChangeLog
+++ b/net-im/silky/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/silky
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silky/ChangeLog,v 1.15 2005/05/01 17:22:02 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silky/ChangeLog,v 1.16 2005/08/20 14:38:06 ticho Exp $
+
+  20 Aug 2005; Andrej Kacian <ticho@gentoo.org>
+  +files/silky-0.5.4-getopt.patch, silky-0.5.4.ebuild:
+  Apply patch to compile on current lib versions. Bug #103034 by Daniel Link
+  <stagger at gmx.net>.
 
   01 May 2005; Michael Hanselmann <hansmi@gentoo.org> silky-0.5.4.ebuild:
   Stable on ppc.
diff --git a/net-im/silky/Manifest b/net-im/silky/Manifest
index 6b363e20efd3..960e02a20b1f 100644
--- a/net-im/silky/Manifest
+++ b/net-im/silky/Manifest
@@ -1,8 +1,9 @@
-MD5 b9fdb558af0dc40960d563eb57947c0f metadata.xml 221
-MD5 16075041be504ec047871dfff0bf92db ChangeLog 1958
-MD5 6d1f626cefd6e273bf77537e8d0f03e1 silky-0.5.2.ebuild 914
+MD5 41925d09c54c77c14eff71f0c6ca7f67 silky-0.5.4.ebuild 916
 MD5 95d2f6925cd1116a28c6321d776ae382 silky-0.5.1.ebuild 914
-MD5 f04074a3bef29e8e6a52bcdff807d541 silky-0.5.4.ebuild 800
+MD5 6d1f626cefd6e273bf77537e8d0f03e1 silky-0.5.2.ebuild 914
+MD5 16075041be504ec047871dfff0bf92db ChangeLog 1958
+MD5 b9fdb558af0dc40960d563eb57947c0f metadata.xml 221
+MD5 503565a71edccf299762fa80d5242be0 files/digest-silky-0.5.1 63
 MD5 900486724c3fdb64a030bf3ac331fa2c files/digest-silky-0.5.2 63
 MD5 64b0ff9aabc431d9800b93cfcb98002a files/digest-silky-0.5.4 63
-MD5 503565a71edccf299762fa80d5242be0 files/digest-silky-0.5.1 63
+MD5 799fd743b2b48bc4967bf8909af1bc05 files/silky-0.5.4-getopt.patch 1931
diff --git a/net-im/silky/files/silky-0.5.4-getopt.patch b/net-im/silky/files/silky-0.5.4-getopt.patch
new file mode 100644
index 000000000000..8c3abf660e2a
--- /dev/null
+++ b/net-im/silky/files/silky-0.5.4-getopt.patch
@@ -0,0 +1,48 @@
+diff -ur silky-0.5.4/configure silky-0.5.4-new/configure
+--- silky-0.5.4/configure	2005-03-19 16:56:47.000000000 +0100
++++ silky-0.5.4-new/configure	2005-08-20 16:34:52.000000000 +0200
+@@ -26624,20 +26624,20 @@
+         echo "$as_me:$LINENO: checking for silc" >&5
+ echo $ECHO_N "checking for silc... $ECHO_C" >&6
+ 
+-        if $PKG_CONFIG --exists "silc" ; then
++        if $PKG_CONFIG --exists "silcclient" ; then
+             echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+             succeeded=yes
+ 
+             echo "$as_me:$LINENO: checking SILC_CFLAGS" >&5
+ echo $ECHO_N "checking SILC_CFLAGS... $ECHO_C" >&6
+-            SILC_CFLAGS=`$PKG_CONFIG --cflags "silc"`
++            SILC_CFLAGS=`$PKG_CONFIG --cflags "silcclient"`
+             echo "$as_me:$LINENO: result: $SILC_CFLAGS" >&5
+ echo "${ECHO_T}$SILC_CFLAGS" >&6
+ 
+             echo "$as_me:$LINENO: checking SILC_LIBS" >&5
+ echo $ECHO_N "checking SILC_LIBS... $ECHO_C" >&6
+-            SILC_LIBS=`$PKG_CONFIG --libs "silc"`
++            SILC_LIBS=`$PKG_CONFIG --libs "silcclient"`
+             echo "$as_me:$LINENO: result: $SILC_LIBS" >&5
+ echo "${ECHO_T}$SILC_LIBS" >&6
+         else
+@@ -26645,7 +26645,7 @@
+             SILC_LIBS=""
+             ## If we have a custom action on failure, don't print errors, but
+             ## do set a variable so people can do so.
+-            SILC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "silc"`
++            SILC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "silcclient"`
+ 
+         fi
+ 
+Only in silky-0.5.4-new: configure.in
+diff -ur silky-0.5.4/src/main.c silky-0.5.4-new/src/main.c
+--- silky-0.5.4/src/main.c	2005-03-19 09:18:03.000000000 +0100
++++ silky-0.5.4-new/src/main.c	2005-08-20 16:25:12.000000000 +0200
+@@ -25,6 +25,7 @@
+ #include <glib.h>
+ #include <glade/glade.h>
+ #include <gtk/gtk.h>
++#include <getopt.h>
+ #include <silcincludes.h>
+ #include <silcclient.h>
+ 
diff --git a/net-im/silky/silky-0.5.4.ebuild b/net-im/silky/silky-0.5.4.ebuild
index 8ccb71f766c3..a650e7479fa2 100644
--- a/net-im/silky/silky-0.5.4.ebuild
+++ b/net-im/silky/silky-0.5.4.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silky/silky-0.5.4.ebuild,v 1.3 2005/05/01 17:22:02 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silky/silky-0.5.4.ebuild,v 1.4 2005/08/20 14:38:06 ticho Exp $
 
-IUSE=""
+inherit eutils
 
 DESCRIPTION="Simple and easy to use GTK+ based os-independent SILC client."
 HOMEPAGE="http://silky.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 KEYWORDS="x86 ppc ~sparc"
 LICENSE="GPL-2"
+IUSE=""
 
 SLOT="0"
 
@@ -23,6 +24,12 @@ DEPEND="virtual/libc
 	app-misc/mime-types
 	>=net-im/silc-toolkit-0.9.12-r2"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-getopt.patch || die "epatch failed"
+}
+
 src_compile() {
 	econf || die "econf failed"
 	emake || die "emake failed"