diff options
| -rw-r--r-- | net-voip/linphone/ChangeLog | 7 | ||||
| -rw-r--r-- | net-voip/linphone/files/linphone-3.4.3-nls.patch | 14 | ||||
| -rw-r--r-- | net-voip/linphone/linphone-3.4.3-r1.ebuild | 92 | ||||
| -rw-r--r-- | net-voip/linphone/linphone-3.6.1.ebuild | 17 |
4 files changed, 16 insertions, 114 deletions
diff --git a/net-voip/linphone/ChangeLog b/net-voip/linphone/ChangeLog index 5026461bf4d4..4e6c4c9b5396 100644 --- a/net-voip/linphone/ChangeLog +++ b/net-voip/linphone/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-voip/linphone # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/ChangeLog,v 1.79 2015/04/28 08:01:48 bircoph Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/ChangeLog,v 1.80 2015/04/28 08:20:02 bircoph Exp $ + + 28 Apr 2015; Andrew Savchenko <bircoph@gentoo.org> -linphone-3.4.3-r1.ebuild, + linphone-3.6.1.ebuild, -files/linphone-3.4.3-nls.patch: + Fix dependencies on mediastreamer, bugs 504268, 519798. + Remove old version. 28 Apr 2015; Andrew Savchenko <bircoph@gentoo.org> linphone-3.5.2.ebuild: Linphone-3.5 works only with mediastreamer-2.8, bug 545196. diff --git a/net-voip/linphone/files/linphone-3.4.3-nls.patch b/net-voip/linphone/files/linphone-3.4.3-nls.patch deleted file mode 100644 index 302ea6f44862..000000000000 --- a/net-voip/linphone/files/linphone-3.4.3-nls.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- configure.ac 2011-02-11 13:24:11.000000000 +0300 -+++ configure.ac 2011-03-01 12:39:43.061643811 +0300 -@@ -69,7 +69,10 @@ - AC_SUBST(GUI_FLAGS) - - dnl localization tools --IT_PROG_INTLTOOL([0.40], [no-xml]) -+AM_NLS -+if test "$USE_NLS" != "no"; then -+ IT_PROG_INTLTOOL([0.40], [no-xml]) -+fi - - dnl Initialize libtool - AC_LIBTOOL_WIN32_DLL diff --git a/net-voip/linphone/linphone-3.4.3-r1.ebuild b/net-voip/linphone/linphone-3.4.3-r1.ebuild deleted file mode 100644 index 954ec36dcaea..000000000000 --- a/net-voip/linphone/linphone-3.4.3-r1.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# 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.4.3-r1.ebuild,v 1.9 2013/10/14 12:31:05 pinkbyte Exp $ - -EAPI="4" - -inherit eutils autotools multilib versionator pax-utils - -DESCRIPTION="Video softphone based on the SIP protocol" -HOMEPAGE="http://www.linphone.org/" -SRC_URI="mirror://nongnu/${PN}/$(get_version_component_range 1-2).x/sources/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~x86-macos" -# TODO: run-time test for ipv6: does it need mediastreamer[ipv6]? -IUSE="doc gtk ipv6 ncurses nls video" - -RDEPEND="<media-libs/mediastreamer-2.8[video?,ipv6?] - >=net-libs/libeXosip-3.0.2 - >=net-libs/libosip-3.0.0 - <net-libs/libosip-4 - <net-libs/libeXosip-4 - >=net-libs/ortp-0.16.3 - gtk? ( dev-libs/glib:2 - >=gnome-base/libglade-2.4.0:2.0 - >=x11-libs/gtk+-2.4.0:2 ) - ncurses? ( sys-libs/readline - sys-libs/ncurses )" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-text/sgmltools-lite ) - nls? ( dev-util/intltool - sys-devel/gettext )" - -IUSE_LINGUAS=" fr it de ja es pl cs nl sv pt_BR hu ru zh_CN" -IUSE="${IUSE} ${IUSE_LINGUAS// / linguas_}" - -pkg_setup() { - if ! use gtk && ! use ncurses ; then - ewarn "gtk and ncurses are disabled." - ewarn "At least one of these use flags are needed to get a front-end." - ewarn "Only liblinphone is going to be installed." - fi - - strip-linguas ${IUSE_LINGUAS} -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-3.4.3-nls.patch - # remove speex check, avoid bug when mediastreamer[-speex] - sed -i -e '/SPEEX/d' configure.ac || die "patching configure.ac failed" - - # fix path to use lib64 - sed -i -e "s:lib\(/liblinphone\):$(get_libdir)\1:" configure.ac \ - || die "patching configure.ac failed" - - # removing bundled libs dir prevent them to be reconf - rm -rf mediastreamer2 oRTP || die "should not die" - sed -i -e "s:oRTP::;s:mediastreamer2::" Makefile.am \ - || die "patching Makefile.am failed" - - # make sure to use host libtool version - rm -f m4/libtool.m4 m4/lt*.m4 #282268 - eautoreconf -} - -src_configure() { - # strict: we don't want -Werror - # external-ortp,external-mediastreamer: prefer external libs - # truespeech: seems not used, TODO: ask in ml - # rsvp: breaking the build (not maintained anymore) --disable = --enable - # alsa, artsc and portaudio are used for bundled mediastreamer - econf \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --disable-strict \ - --enable-external-ortp \ - --enable-external-mediastreamer \ - --disable-truespeech \ - $(use_enable doc manual) \ - $(use_enable gtk gtk_ui) \ - $(use_enable ipv6) \ - $(use_enable ncurses console_ui) \ - $(use_enable nls) \ - $(use_enable video) -} - -src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS BUGS ChangeLog NEWS README README.arm TODO - pax-mark m "${ED}usr/bin/linphone" -} diff --git a/net-voip/linphone/linphone-3.6.1.ebuild b/net-voip/linphone/linphone-3.6.1.ebuild index 139878eb9fdf..2eafa5fd92c2 100644 --- a/net-voip/linphone/linphone-3.6.1.ebuild +++ b/net-voip/linphone/linphone-3.6.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/linphone-3.6.1.ebuild,v 1.1 2013/10/09 18:58:15 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/linphone-3.6.1.ebuild,v 1.2 2015/04/28 08:20:02 bircoph Exp $ EAPI=5 @@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86" IUSE="assistant doc gsm-nonstandard gtk ipv6 libnotify ncurses nls sqlite ssl tools upnp video" RDEPEND=" - >=media-libs/mediastreamer-2.9.0[video?,ipv6?] + >=media-libs/mediastreamer-2.9.0[ipv6?,upnp?,video?] >=net-libs/libeXosip-4.0.0 >=net-libs/libosip-4.0.0 >=net-libs/ortp-0.22.0 @@ -30,19 +30,22 @@ RDEPEND=" assistant? ( >=net-libs/libsoup-2.26 ) libnotify? ( x11-libs/libnotify ) ) - gsm-nonstandard? ( >=media-libs/mediastreamer-2.8.2[gsm] ) + gsm-nonstandard? ( >=media-libs/mediastreamer-2.9.0[gsm] ) ncurses? ( - sys-libs/readline + sys-libs/readline:0 sys-libs/ncurses ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0 ) tools? ( dev-libs/libxml2 ) - upnp? ( net-libs/libupnp )" + upnp? ( net-libs/libupnp ) + video? ( >=media-libs/mediastreamer-2.9.0[v4l] ) +" DEPEND="${RDEPEND} virtual/pkgconfig doc? ( app-text/sgmltools-lite ) - nls? ( dev-util/intltool )" + nls? ( dev-util/intltool ) +" IUSE_LINGUAS=" fr it de he ja es pl cs nl sr sv pt_BR hu ru zh_CN" IUSE="${IUSE}${IUSE_LINGUAS// / linguas_}" |