summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2013-09-29 16:06:34 +0000
committerJulian Ospald <hasufell@gentoo.org>2013-09-29 16:06:34 +0000
commita083f5a1a7f840668a39177a882715e07a19ee4b (patch)
treea71d02457bea9f75489af93f90b3195fb71cb866 /net-voip/linphone
parentVersion bump. (diff)
downloadgentoo-2-a083f5a1a7f840668a39177a882715e07a19ee4b.tar.gz
gentoo-2-a083f5a1a7f840668a39177a882715e07a19ee4b.tar.bz2
gentoo-2-a083f5a1a7f840668a39177a882715e07a19ee4b.zip
fix automake-1.13 warnings wrt #468808
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Diffstat (limited to 'net-voip/linphone')
-rw-r--r--net-voip/linphone/ChangeLog6
-rw-r--r--net-voip/linphone/files/linphone-3.5.2-automake-1.13.patch19
-rw-r--r--net-voip/linphone/linphone-3.5.2.ebuild11
3 files changed, 32 insertions, 4 deletions
diff --git a/net-voip/linphone/ChangeLog b/net-voip/linphone/ChangeLog
index 16b0bb6baefd..dd47a5c9d9bb 100644
--- a/net-voip/linphone/ChangeLog
+++ b/net-voip/linphone/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-voip/linphone
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/ChangeLog,v 1.70 2013/03/06 13:20:30 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/ChangeLog,v 1.71 2013/09/29 16:06:34 hasufell Exp $
+
+ 29 Sep 2013; Julian Ospald <hasufell@gentoo.org> linphone-3.5.2.ebuild,
+ +files/linphone-3.5.2-automake-1.13.patch:
+ fix automake-1.13 warnings wrt #468808
06 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
linphone-3.1.1.ebuild, linphone-3.2.1-r2.ebuild, linphone-3.3.2.ebuild,
diff --git a/net-voip/linphone/files/linphone-3.5.2-automake-1.13.patch b/net-voip/linphone/files/linphone-3.5.2-automake-1.13.patch
new file mode 100644
index 000000000000..44d679c473a9
--- /dev/null
+++ b/net-voip/linphone/files/linphone-3.5.2-automake-1.13.patch
@@ -0,0 +1,19 @@
+Author: hasufell <hasufell@gentoo.org>
+Date: Sun Sep 29 17:41:02 2013 +0200
+
+ remove obsolete macro
+
+ AC_PROG_CC is already called anyway
+
+diff --git a/configure.ac b/configure.ac
+index 22bc235..81f6277 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -39,7 +39,6 @@ AC_ISC_POSIX
+ AC_PROG_CC
+ AC_PROG_CXX
+ AC_C_INLINE
+-AM_PROG_CC_STDC
+ AC_HEADER_STDC
+ AM_PROG_CC_C_O
+ AC_CHECK_PROGS(MD5SUM,[md5sum md5])
diff --git a/net-voip/linphone/linphone-3.5.2.ebuild b/net-voip/linphone/linphone-3.5.2.ebuild
index 0ab85713c04b..d803590b269b 100644
--- a/net-voip/linphone/linphone-3.5.2.ebuild
+++ b/net-voip/linphone/linphone-3.5.2.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/linphone-3.5.2.ebuild,v 1.2 2013/03/06 13:20:30 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/linphone-3.5.2.ebuild,v 1.3 2013/09/29 16:06:34 hasufell Exp $
-EAPI="4"
+EAPI=5
inherit autotools eutils multilib pax-utils versionator
@@ -51,10 +51,15 @@ pkg_setup() {
}
src_prepare() {
- epatch "${FILESDIR}"/${P}-nls.patch
+ epatch "${FILESDIR}"/${P}-nls.patch \
+ "${FILESDIR}"/${P}-automake-1.13.patch
# remove speex check, avoid bug when mediastreamer[-speex]
sed -i -e '/SPEEX/d' configure.ac || die "patching configure.ac failed"
+ # variable causes "command not found" warning and is not
+ # needed anyway
+ sed -i -e 's/$(ACLOCAL_MACOS_FLAGS)//' Makefile.am || die
+
# fix path to use lib64
sed -i -e "s:lib\(/liblinphone\):$(get_libdir)\1:" configure.ac \
|| die "patching configure.ac failed"