Also fix compilation problem with uclibc #199222

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

5 files changed, 47 insertions, 19 deletions

diff --git a/net-voip/yate/ChangeLog b/net-voip/yate/ChangeLog
index 287545efdc64..33b0af715fc9 100644
--- a/net-voip/yate/ChangeLog
+++ b/net-voip/yate/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-voip/yate
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/yate/ChangeLog,v 1.6 2009/02/06 14:49:47 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/yate/ChangeLog,v 1.7 2009/02/06 15:21:30 drizzt Exp $
+
+  06 Feb 2009; Timothy Redaelli <drizzt@gentoo.org>
+  files/yate-1.3.0-makefiles.patch, +files/yate-1.3.0-resolv.patch,
+  yate-1.3.0.ebuild:
+  Also fix compilation problem with uclibc #199222
 
 *yate-1.3.0 (06 Feb 2009)
 
diff --git a/net-voip/yate/Manifest b/net-voip/yate/Manifest
index 4af8e8b9ed14..93d50eaf0be3 100644
--- a/net-voip/yate/Manifest
+++ b/net-voip/yate/Manifest
@@ -2,19 +2,20 @@
 Hash: SHA1
 
 AUX yate-0.9.0-gtk2.diff 339 RMD160 c505b49856e7af958146faeb630059ccfc769156 SHA1 c97256bb5dd4686fe8c973c588077d91d2917ded SHA256 68d8b05dd084d2967d548e471208d39abc910a96fcd46b627cc9f1131d3cf5ee
-AUX yate-1.3.0-makefiles.patch 15135 RMD160 d09dea95a1f535e22ef0f4dbee12a9b7efe5145c SHA1 4bda5fa4b769effe5705b6e72c113b34b3e37926 SHA256 44679388fbe812cd156fb6a294ac41026f5d7fbf4e9750d0a23277f48f221d5b
+AUX yate-1.3.0-makefiles.patch 15050 RMD160 7c15e0fdd0fd2f4a4ad8f38eaca398193194fadf SHA1 1a6a489b4ea9e8ec54eea7c0814fa60abb1d8f99 SHA256 625823cea7cd5fea8160686668eaf68bbb220610a4fbc9f126a73fc7fdbe02bc
+AUX yate-1.3.0-resolv.patch 689 RMD160 23ebe8e8d34495c562e0a19c525a210b99dd66fb SHA1 5122a6c63280ed6b9af37a4a74727a6d251f9e30 SHA256 83b42c1da21ecb30383266de4869f63242226d719c1276d8d11050e78d5018d6
 AUX yate.confd 222 RMD160 85401118916877280166bc55bdcd76149b77c674 SHA1 184987b53db21f9ca233f9f6795b4981e2c67972 SHA256 8d203eeff915143502139cc570142a076b10f3fb2d816e8c83e3aa35a1da00f6
 AUX yate.rc6 502 RMD160 7fbdf20436e1267f4af6b0ce3e0ccf821304c49b SHA1 aa8845e816dcf4809b0f9d96ce812f10b2b7a042 SHA256 915866c65eeff5f69a8f724e65ccc4ccd17b19c6ab1751f98194c1bb0d6b360a
 DIST yate-1.2.0-1.tar.gz 1248848 RMD160 6a3d7f9247282bef89c18bff01efcbe31a73fa8d SHA1 6361b8ff4cd03cf4bf908022b99d3854f9d94a63 SHA256 9e58857408e98b957dc72e164a135c2de7ea9a221d214e6bab3ca4020f656273
 DIST yate-1.3.0-1.tar.gz 1294420 RMD160 d135f5f8bd3378a3e8d2d96b39ccb3aa4c6e77f6 SHA1 cb662e2495a445f91bdf396e6ae76bf3ad0c0995 SHA256 97f6e6011828c98caebf511d9bd9b74b8411add939df6dbe028eda85cf819f77
 EBUILD yate-1.2.0.ebuild 1604 RMD160 92421bb116750f3bd2d0e1d61ea1fc4b7e4083e0 SHA1 acd6e217709b0bbbf9f71c12f64a59abe8807274 SHA256 e2ecf924c7ef8378ada7b10828b1ae700dbaa9f08a6831bf302562714f610da0
-EBUILD yate-1.3.0.ebuild 1726 RMD160 23a7035bfbd59232724c3b5b2452c3b38c285daa SHA1 47dd48a462f8087347fe3f909f6111a802774e27 SHA256 2ea182ff722ecd34b19984e53fb5e3439e438301abe9eb5154cc9ff7a7c94bd1
-MISC ChangeLog 1177 RMD160 388c4b4069a32213e11ef50ac5f3146f3a674190 SHA1 8773e88ec641d42618b833a982369b70719ce850 SHA256 69d3ffccded82885989cc81c57b653a790852d55f58502f2c8e8c9371690bafa
+EBUILD yate-1.3.0.ebuild 1796 RMD160 7ec633354ca6fc7f836ce11955fb364314a7cfcf SHA1 c61599861a10ff25bd838b65915f60f8f2d1da89 SHA256 a47fb7d46707f3911848a67e73de0f8773178e07cb0d697b1f7f36daf30b9e75
+MISC ChangeLog 1370 RMD160 1e98ca624e3b0f482d2f9f315fd3be8785216e82 SHA1 8e8b49c02887ee3e99b509999923e2f19f611e81 SHA256 6cb6269095414cbdcbd297f6a0b5f624056b3615f472f9cca49f9760364fbcde
 MISC metadata.xml 377 RMD160 9afffc528d59eb5b01521d3738c507d037ec3839 SHA1 618baad7d7963e69e5c3f8228f73117784dcf1d0 SHA256 c163a0ccb5a30ad2a834443db1d4e3104e4d7bfe41eaa3b3d27565be04c19295
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkmMThUACgkQl4DfQEcjpw3O0ACfY+uAjX3uy0kSZ9IMH4iawhaX
-Z5YAoJrUv74VU73ihY48xLrvUKg4tBKe
-=0d5x
+iEYEARECAAYFAkmMVYUACgkQl4DfQEcjpw23FACeOFxXA1LhOrntsNjnyjzJd2GA
+OeoAn2ppbzkLDJ0cBGV6/SMOmhNfEPfo
+=f1pr
 -----END PGP SIGNATURE-----
diff --git a/net-voip/yate/files/yate-1.3.0-makefiles.patch b/net-voip/yate/files/yate-1.3.0-makefiles.patch
index 05e16f7d9be0..ecf3aa7827fb 100644
--- a/net-voip/yate/files/yate-1.3.0-makefiles.patch
+++ b/net-voip/yate/files/yate-1.3.0-makefiles.patch
@@ -64,8 +64,6 @@ diff -ur --exclude Makefile yate.orig/clients/Makefile.in yate/clients/Makefile.
  
  $(GTKCLIENT):
  	$(MAKE) -C ../contrib/gtk2
-Only in yate: config.log
-Only in yate: config.status
 diff -ur --exclude Makefile yate.orig/contrib/gtk2/Makefile.in yate/contrib/gtk2/Makefile.in
 --- yate.orig/contrib/gtk2/Makefile.in	2009-02-06 14:54:30.457004060 +0100
 +++ yate/contrib/gtk2/Makefile.in	2009-02-06 15:17:15.993003394 +0100
@@ -89,7 +87,6 @@ diff -ur --exclude Makefile yate.orig/contrib/gtk2/Makefile.in yate/contrib/gtk2
  SOURCES = gtk2client.cpp
  OBJECTS = $(SOURCES:.cpp=.o)
  
-Only in yate/contrib/gtk2: Makefile.in.orig
 diff -ur --exclude Makefile yate.orig/contrib/ilbc/Makefile.in yate/contrib/ilbc/Makefile.in
 --- yate.orig/contrib/ilbc/Makefile.in	2009-02-06 14:54:30.457004060 +0100
 +++ yate/contrib/ilbc/Makefile.in	2009-02-06 15:08:35.465004588 +0100
@@ -117,7 +114,7 @@ diff -ur --exclude Makefile yate.orig/contrib/yiax/Makefile.in yate/contrib/yiax
  DEFS :=
  INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@
 -CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
-+CXFLAGS += @MODULE_CPPFLAGS@ @INLINE_FLAGS@
++CXXFLAGS += @MODULE_CPPFLAGS@ @INLINE_FLAGS@
  LDFLAGS:= -L../.. -lyate
  INCFILES := @top_srcdir@/yateclass.h @srcdir@/yateiax.h
  
@@ -316,7 +313,7 @@ diff -ur --exclude Makefile yate.orig/modules/Makefile.in yate/modules/Makefile.
  
  .PHONY: install
  install: all do-install
-@@ -169,80 +169,80 @@
+@@ -169,80 +169,84 @@
  	$(LINK) -shared -o $@ $^
  
  %.yate: @srcdir@/%.cpp $(MKDEPS) $(INCFILES)
@@ -381,7 +378,7 @@ diff -ur --exclude Makefile yate.orig/modules/Makefile.in yate/modules/Makefile.
  
  ilbccodec.yate: ../contrib/ilbc/libilbc.a
 -ilbccodec.yate: LOCALLIBS = ../contrib/ilbc/libilbc.a
-+ilbccodec.yate: LOCALLIBS += ../contrib/ilbc/libilbc.a
++ilbccodec.yate: LOCALLIBS += ../contrib/ilbc/libilbc.a -lm
  ilbccodec.yate: LOCALFLAGS = @ILBC_INC@
  
 -gsmcodec.yate: LOCALLIBS = -lgsm
@@ -415,10 +412,13 @@ diff -ur --exclude Makefile yate.orig/modules/Makefile.in yate/modules/Makefile.
  rmanager.yate: LOCALFLAGS = $(COREDUMP_INC)
 -rmanager.yate: LOCALLIBS = $(COREDUMP_LIB)
 +rmanager.yate: LOCALLIBS += $(COREDUMP_LIB)
++
++analyzer.yate: LOCALLIBS += -lm
++tonegen.yate: LOCALLIBS += -lm
++yradius.yate: LOCALLIBS += -lm
  
  ../libyatess7.so:
  	$(MAKE) -C ../contrib/yss7
-Only in yate: run
 diff -ur --exclude Makefile yate.orig/test/Makefile.in yate/test/Makefile.in
 --- yate.orig/test/Makefile.in	2009-02-06 14:54:30.497003971 +0100
 +++ yate/test/Makefile.in	2009-02-06 15:03:14.912003374 +0100
@@ -442,6 +442,3 @@ diff -ur --exclude Makefile yate.orig/test/Makefile.in yate/test/Makefile.in
  COMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CFLAGS)
  LINK = $(CXX) $(LDFLAGS)
  MODLINK = $(CXX) $(MODFLAGS) $(MODSTRIP) $(LDFLAGS)
-Only in yate: yate-config
-Only in yate: yate.pc
-Only in yate: yateversn.h
diff --git a/net-voip/yate/files/yate-1.3.0-resolv.patch b/net-voip/yate/files/yate-1.3.0-resolv.patch
new file mode 100644
index 000000000000..203db9ec4c18
--- /dev/null
+++ b/net-voip/yate/files/yate-1.3.0-resolv.patch
@@ -0,0 +1,22 @@
+--- ../yate.orig/configure.in	2009-02-06 15:55:22.000000000 +0100
++++ ../yate/configure.in	2009-02-06 16:04:36.000000000 +0100
+@@ -182,14 +182,17 @@
+ 
+ # Checks for optional libraries.
+ 
++SAVE_LIBS="$LIBS"
++LIBS=-lresolv
+ HAVE_RESOLV=no
+-AC_MSG_CHECKING([for resolver library])
++AC_MSG_CHECKING([for resolver library (with dn_skipname)])
+ AC_LANG_SAVE
+ AC_LANG_C
+ AC_TRY_LINK([#include <netinet/in.h>
+ #include <arpa/nameser.h>
+-#include <resolv.h>],[res_init();],[HAVE_RESOLV=yes],[HAVE_RESOLV=no])
++#include <resolv.h>],[res_init(); dn_skipname(NULL, NULL);],[HAVE_RESOLV=yes],[HAVE_RESOLV=no])
+ AC_LANG_RESTORE
++LIBS="$SAVE_LIBS"
+ AC_MSG_RESULT([$HAVE_RESOLV])
+ AC_SUBST(HAVE_RESOLV)
+ 
diff --git a/net-voip/yate/yate-1.3.0.ebuild b/net-voip/yate/yate-1.3.0.ebuild
index cae8863b134a..32cdbdd18a0b 100644
--- a/net-voip/yate/yate-1.3.0.ebuild
+++ b/net-voip/yate/yate-1.3.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/yate/yate-1.3.0.ebuild,v 1.1 2009/02/06 14:49:47 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/yate/yate-1.3.0.ebuild,v 1.2 2009/02/06 15:21:30 drizzt Exp $
 
 IUSE="doc gsm gtk h323 ilbc postgres zaptel"
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="YATE - Yet Another Telephony Engine"
 HOMEPAGE="http://yate.null.ro/"
@@ -36,6 +36,9 @@ src_unpack() {
 
 	# fix makefiles for custom CFLAGS/LDFLAGS
 	epatch "${FILESDIR}"/${P}-makefiles.patch
+	epatch "${FILESDIR}"/${P}-resolv.patch #199222
+
+	eautoconf
 }
 
 src_compile() {