Make linphone.desktop validateable, bug #307865, thank Rion for report.

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

4 files changed, 126 insertions, 2 deletions

diff --git a/net-voip/linphone/ChangeLog b/net-voip/linphone/ChangeLog
index 04eed175f88b..a3ccf57d6fdb 100644
--- a/net-voip/linphone/ChangeLog
+++ b/net-voip/linphone/ChangeLog
@@ -1,6 +1,12 @@
 # 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.41 2010/02/18 18:57:38 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/ChangeLog,v 1.42 2010/03/18 06:04:09 pva Exp $
+
+*linphone-3.2.1-r1 (18 Mar 2010)
+
+  18 Mar 2010; Peter Volkov <pva@gentoo.org> +linphone-3.2.1-r1.ebuild,
+  +files/linphone-3.2.1-linphone.desktop.patch:
+  Make linphone.desktop validateable, bug #307865, thank Rion for report.
 
 *linphone-3.2.1 (18 Feb 2010)
 
diff --git a/net-voip/linphone/Manifest b/net-voip/linphone/Manifest
index c4495f3c2939..99488d6f4350 100644
--- a/net-voip/linphone/Manifest
+++ b/net-voip/linphone/Manifest
@@ -1,6 +1,7 @@
 AUX linphone-3.1.0-nls.patch 638 RMD160 ad4d07589cfaa2ecee6d9c53805728a53bbb211f SHA1 4ecaf5669d79ef1a73d9b3b3a57ef1e4b4f2ea80 SHA256 1877610ef4e763ecbce2e80cc3d8305df1d57c8f85fde5cb618a79ae769f44fc
 AUX linphone-3.1.1-external-mstreamer.patch 3480 RMD160 792cc66ccc779848ccb180e3d520ecf84dede8b5 SHA1 2ef2e5ac8a6dfe8a853b1d750ff402c13b3a39ee SHA256 c0799270a91357ff319763ed649fee938ede52f908b782a655bcc11baaf058ce
 AUX linphone-3.2.1-external-mediastreamer.patch 3591 RMD160 8fefd2f6de05ec7c1c96db857ef179dcafb346bd SHA1 dbcc45c4792a093651ed83f92022369e4c2687bd SHA256 884dc152cd3aaf6cbbeecb8fd0e0ff9522d834171e724deee87145b2966f87d5
+AUX linphone-3.2.1-linphone.desktop.patch 395 RMD160 2ae8271d7e5bf996a722cc31a51ab4786862476b SHA1 97d3f455108959563dfc2b165b61e33138bb6da1 SHA256 016fc455b710a6d1d5781fb2a6f9d820beb0519b821c122830f831d922799272
 AUX linphone-3.2.1-log-window-crash.patch 514 RMD160 2190f6023f4d97883316b3ff0aeb679a49fc7d2c SHA1 e7e5be8dae19ac9b16608daa9a205777e8905c76 SHA256 f0faa9d90aed4ea06fee608bc06785a757b8e6c25dea7ae6abdd954466a9759c
 AUX linphone-3.2.1-nls.patch 426 RMD160 19c1292f26fc7d36846d115ef5423635c4d8c828 SHA1 48c2ee4547e2e6db065856a5f7563fc45fd5f9a0 SHA256 e35323e1166fcf826ac9c4e53db62fb522846a7b0316353edffc1fb74fd43758
 DIST linphone-3.1.1.tar.gz 7809388 RMD160 a2c1bb3c96bb95cabbe605de463af2993ae3e9ff SHA1 820fad3d273975cc8493d3dabf7959ef59fe7c4d SHA256 d4f4cbf9da3c0437a9f2e181eea611adbefc6b4a7073cf8d8f3ac0fe795c8eff
@@ -8,6 +9,7 @@ DIST linphone-3.1.2.tar.gz 7732132 RMD160 21738be63d1cda9a710d22aaac647c7b6a0a45
 DIST linphone-3.2.1.tar.gz 7906185 RMD160 8ed4b172dc2b9ad90d8bf4da82dbbc8b16e6b169 SHA1 ff5434372465ccfd059de1a26f4712f30f5f9ed7 SHA256 b34bf066e07895b4d7b51a4a64e2a7524ab1cb755c996ef208293228c7bc4e69
 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 3052 RMD160 ddb31957e14e224a0e4fd81507f0826767bda0bd SHA1 1a48956d44b8dade509715c1ed3d45a4bf5c9ecf SHA256 b3f27df83bc9db2216c63559329ea5cefed6f829e01e77478efc3aad560a9aed
 EBUILD linphone-3.2.1.ebuild 2999 RMD160 bf83c752b2c40cfd4f751027d2737f9ae52fe4c5 SHA1 2042ec53f17950dc98b00ce9e0265fbd15462876 SHA256 262fa944c70d066efda49851448ebadc73f335c4fded97a203a90c988db19be8
-MISC ChangeLog 12619 RMD160 16d952690dd58defdae674d9d70b6daa356c827f SHA1 21e4d43bc376121f67f67de079bfeff1980be592 SHA256 510c404df2bb2cb2b2591b110268ede5fd367d1f16c3ac0758c323d5b18b8c73
+MISC ChangeLog 12848 RMD160 03c9dce364e45f9f46bc87078ae3e6b56a1b10c1 SHA1 d83a34d5905bf1e6a4d6b0e21ab6be2364584e6d SHA256 f7b38635cd120b0261f9aa0088f7a738ffc6121daa149dae22c4bcda509fe43e
 MISC metadata.xml 335 RMD160 0e09a4bd66327fe8397d95c19df4fa884886444b SHA1 b7056729ec82619f4edc4dfe90c5c53ec780f638 SHA256 008f606df7bbbc280b1a0b4a31a7b653858c7ccfe3c99f476547c037189f7fdf
diff --git a/net-voip/linphone/files/linphone-3.2.1-linphone.desktop.patch b/net-voip/linphone/files/linphone-3.2.1-linphone.desktop.patch
new file mode 100644
index 000000000000..d3fb35d29cf0
--- /dev/null
+++ b/net-voip/linphone/files/linphone-3.2.1-linphone.desktop.patch
@@ -0,0 +1,14 @@
+=== modified file 'share/linphone.desktop'
+--- share/linphone.desktop	2010-03-18 05:59:30 +0000
++++ share/linphone.desktop	2010-03-18 05:58:45 +0000
+@@ -5,6 +5,6 @@
+ Comment[de]=Linphone ist ein web-phone.
+ Type=Application
+ Exec=linphone-3
+-Icon=linphone/linphone2.png
++Icon=linphone2
+ Terminal=false
+-Categories=Application;Network;
+\ No newline at end of file
++Categories=Network;Telephony;
+
diff --git a/net-voip/linphone/linphone-3.2.1-r1.ebuild b/net-voip/linphone/linphone-3.2.1-r1.ebuild
new file mode 100644
index 000000000000..4b5e49aa0128
--- /dev/null
+++ b/net-voip/linphone/linphone-3.2.1-r1.ebuild
@@ -0,0 +1,102 @@
+# 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-r1.ebuild,v 1.1 2010/03/18 06:04:09 pva Exp $
+
+EAPI="2"
+
+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"
+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=/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
+}