Finally fix bug #307865 (install icon to correct location).

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 111 insertions, 2 deletions

diff --git a/net-voip/linphone/ChangeLog b/net-voip/linphone/ChangeLog
index 8d81589f6d1a..23dca48de0f2 100644
--- a/net-voip/linphone/ChangeLog
+++ b/net-voip/linphone/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-voip/linphone
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/ChangeLog,v 1.43 2010/03/21 12:16:20 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/ChangeLog,v 1.44 2010/03/26 10:33:50 pva Exp $
+
+*linphone-3.2.1-r2 (26 Mar 2010)
+
+  26 Mar 2010; Peter Volkov <pva@gentoo.org> +linphone-3.2.1-r2.ebuild:
+  Finally fix bug #307865 (install icon to correct location).
 
   21 Mar 2010; Fabian Groffen <grobian@gentoo.org> linphone-3.2.1-r1.ebuild:
   Bumped to EAPI=3 for Prefix changes, marked ~ppc-macos and ~x86-macos, bug
diff --git a/net-voip/linphone/Manifest b/net-voip/linphone/Manifest
index 63e62db02446..09adb5ffa394 100644
--- a/net-voip/linphone/Manifest
+++ b/net-voip/linphone/Manifest
@@ -10,6 +10,7 @@ DIST linphone-3.2.1.tar.gz 7906185 RMD160 8ed4b172dc2b9ad90d8bf4da82dbbc8b16e6b1
 EBUILD linphone-3.1.1.ebuild 3143 RMD160 44ede17982e7be057fe10dee54ad697acdf68dff SHA1 3153312e2de33d282bc90cb396b0c914c390e6fa SHA256 418435dbe82659645a064abf08aaab8ebbb176b7ffde05a447da6c437367ed54
 EBUILD linphone-3.1.2.ebuild 2956 RMD160 ebb73e3e427fab649496aa2053f2c390f6643bb3 SHA1 0d9c70011ce130a88d81954d8fc103446464dca7 SHA256 1fcb722e87656eb524998e64915e18e0d8026a3a73485f6c265cc6d55b868956
 EBUILD linphone-3.2.1-r1.ebuild 3090 RMD160 736b8590992a2f618ec73f681902bfe63cebc7af SHA1 86fd47fa7d477de3a15316c596cb587fa7a3a2bc SHA256 b6a9752f2c61da606d54630844ce0e00337b1f1b0eb534592a5544413aaceda1
+EBUILD linphone-3.2.1-r2.ebuild 3168 RMD160 b408e39451a21918e8f098b17ce93f949afe4707 SHA1 4b7543b810aa0c259d235edc4c9fd1829a0cd825 SHA256 286ac0fb5efdc83dfdb0e3cc1ced2ab28ebcdde2fe83ee96d2728e063bc5314d
 EBUILD linphone-3.2.1.ebuild 2999 RMD160 bf83c752b2c40cfd4f751027d2737f9ae52fe4c5 SHA1 2042ec53f17950dc98b00ce9e0265fbd15462876 SHA256 262fa944c70d066efda49851448ebadc73f335c4fded97a203a90c988db19be8
-MISC ChangeLog 13017 RMD160 bdff1045a10627e3d449a2c96dec52636bde9af4 SHA1 1b0931906b4ca2187e4045d63662e20fbc461cef SHA256 4fe1d020a1c751d9ab6dd47e82927fae4220f666f1769b8d441b3fae89c4fe35
+MISC ChangeLog 13182 RMD160 d57f3a6c9e4d88076a7301d0e849bf132eaac471 SHA1 60d45b13c2c059c27f4ee55a8b116c2cb9a3eeea SHA256 1e61a0b5ac05adf0d71b649ac4d0ebd6335a07e93d0f024ddf371026ba998f12
 MISC metadata.xml 335 RMD160 0e09a4bd66327fe8397d95c19df4fa884886444b SHA1 b7056729ec82619f4edc4dfe90c5c53ec780f638 SHA256 008f606df7bbbc280b1a0b4a31a7b653858c7ccfe3c99f476547c037189f7fdf
diff --git a/net-voip/linphone/linphone-3.2.1-r2.ebuild b/net-voip/linphone/linphone-3.2.1-r2.ebuild
new file mode 100644
index 000000000000..fd7af9659f92
--- /dev/null
+++ b/net-voip/linphone/linphone-3.2.1-r2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/linphone-3.2.1-r2.ebuild,v 1.1 2010/03/26 10:33:50 pva Exp $
+
+EAPI="3"
+
+inherit eutils autotools multilib
+
+DESCRIPTION="Video softphone based on the SIP protocol"
+HOMEPAGE="http://www.linphone.org/"
+SRC_URI="http://download.savannah.nongnu.org/releases/${PN}/stable/sources/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x86-macos"
+IUSE="doc gtk ipv6 ncurses nls video"
+
+RDEPEND=">=media-libs/mediastreamer-2.3.0[video?]
+	>=net-libs/libeXosip-3.0.2
+	>=net-libs/libosip-3.0.0
+	>=net-libs/ortp-0.16.1
+	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}
+	dev-util/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_}"
+
+# TODO:
+# update ortp ?
+# update mediastreamer ?
+
+# TODO:
+# run-time test for ipv6 : does it need mediastreamer[ipv6] ?
+
+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}"/${P}-external-mediastreamer.patch
+	epatch "${FILESDIR}"/${P}-nls.patch
+	epatch "${FILESDIR}"/${P}-log-window-crash.patch
+	epatch "${FILESDIR}"/${P}-linphone.desktop.patch
+
+	# remove speex check, avoid bug when mediastreamer[-speex]
+	sed -i -e '/SPEEX/d' configure.in || die "patching configure.in failed"
+
+	# fix path to use lib64
+	sed -i -e "s:lib\(/liblinphone\):$(get_libdir)\1:" configure.in \
+		|| die "patching configure.in failed"
+
+	# removing bundled libs dir prevent them to be reconf
+	rm -rf mediastreamer2 oRTP || die "should not die"
+	# and references in Makefile.am
+	sed -i -e "s:oRTP::" -e "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 \
+		--disable-dependency-tracking \
+		$(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 || die "emake install failed"
+	dosym linphone-3 /usr/bin/linphone || die
+	dodoc AUTHORS BUGS ChangeLog NEWS README README.arm TODO || die
+	cp "${D}/usr/share/pixmaps/"{linphone/linphone2.png,linphone2.png} || die
+}