Add pax marking for linphone, bug #365353, thank Nikoli for report. Drop unused.

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

3 files changed, 24 insertions, 39 deletions

diff --git a/net-voip/linphone/ChangeLog b/net-voip/linphone/ChangeLog
index 6e2dff8a0636..94b7f71c23d9 100644
--- a/net-voip/linphone/ChangeLog
+++ b/net-voip/linphone/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-voip/linphone
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/ChangeLog,v 1.59 2011/05/14 09:35:40 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/ChangeLog,v 1.60 2011/05/24 08:08:28 pva Exp $
+
+*linphone-3.4.3-r1 (24 May 2011)
+
+  24 May 2011; Peter Volkov <pva@gentoo.org> -linphone-3.3.1.ebuild,
+  +linphone-3.4.3-r1.ebuild:
+  Add pax marking for linphone, bug #365353, thank Nikoli for report. Drop
+  unused.
 
   14 May 2011; Thomas Kahle <tomka@gentoo.org> linphone-3.4.3.ebuild:
   x86 stable per bug 363311
diff --git a/net-voip/linphone/Manifest b/net-voip/linphone/Manifest
index 6eb9fc5d2112..491c2a13573e 100644
--- a/net-voip/linphone/Manifest
+++ b/net-voip/linphone/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 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
@@ -11,20 +8,12 @@ AUX linphone-3.2.99.1-external-mediastreamer.patch 3596 RMD160 7c50fd52c204d48c3
 AUX linphone-3.4.3-nls.patch 343 RMD160 d8b7de46ffbfe0811beec94fdc1ae4f76a7a88b7 SHA1 fa18f7c1507a5e3176bfcfa2edc377ccca39f0b8 SHA256 703b4871cdada5631183a00013adc1871dc75994adf757202288495027ac08c5
 DIST linphone-3.1.1.tar.gz 7809388 RMD160 a2c1bb3c96bb95cabbe605de463af2993ae3e9ff SHA1 820fad3d273975cc8493d3dabf7959ef59fe7c4d SHA256 d4f4cbf9da3c0437a9f2e181eea611adbefc6b4a7073cf8d8f3ac0fe795c8eff
 DIST linphone-3.2.1.tar.gz 7906185 RMD160 8ed4b172dc2b9ad90d8bf4da82dbbc8b16e6b169 SHA1 ff5434372465ccfd059de1a26f4712f30f5f9ed7 SHA256 b34bf066e07895b4d7b51a4a64e2a7524ab1cb755c996ef208293228c7bc4e69
-DIST linphone-3.3.1.tar.gz 8153522 RMD160 31085a57fb5b19f34e0dc3df2f09f758c90eb1a3 SHA1 dab388c3684ac36c25bd091372fec7a411047ed0 SHA256 ffce61947ea9fa5489dc61398e91472fbdd193a6d59eb8a28fa635b9fa8e3ff8
 DIST linphone-3.3.2.tar.gz 8262999 RMD160 6971485c28a9cf73fb225b058692664c7ea29bc7 SHA1 607ac1eb2c02ff73d1f4db5a5b3257434014b3e1 SHA256 a7ab17c91af41362b6667963d88b92b26db9a378df71f4e2d1e64bb18dc69d5e
 DIST linphone-3.4.3.tar.gz 8174839 RMD160 accdf93e641609600ec38b77d2f554111fa3d24c SHA1 cb44672a742124a1141551c8a37875b656c088d4 SHA256 92e7a0a01f2bb53bfaa4d7de4972e63ad528731154c36e05a9b6ba097e296692
 EBUILD linphone-3.1.1.ebuild 3143 RMD160 44ede17982e7be057fe10dee54ad697acdf68dff SHA1 3153312e2de33d282bc90cb396b0c914c390e6fa SHA256 418435dbe82659645a064abf08aaab8ebbb176b7ffde05a447da6c437367ed54
 EBUILD linphone-3.2.1-r2.ebuild 3169 RMD160 a1d06769642450910d9f46ab4b61306bb39e35d9 SHA1 54c60340c98a3c6674437cf1ee9e61c062a60b4b SHA256 1248446533a616f67ef18ac55ae3d7ccb14c44742fe6319ca94157a5c02a6852
-EBUILD linphone-3.3.1.ebuild 3132 RMD160 314efe58b57f3d600928faae316ec0c26bb8ce74 SHA1 d33df30f5d29b14184f68ee51ff879063e9debf9 SHA256 ba64ded7cd71a4eb95e8679c5c2517d5d27fd5d430553ba6bc5957a296a4b904
 EBUILD linphone-3.3.2.ebuild 3296 RMD160 25327e9231d78a3cd8327ab1fcc7aa004bd1f704 SHA1 51d49166237aebd13093a6e58ab2e56de247dc57 SHA256 3d857219b7e3a7bb0b88afe76cd54cd065dc02aef4ecc3fd0de959126828a3b9
+EBUILD linphone-3.4.3-r1.ebuild 2841 RMD160 c40a2332df774c94e02097e47785029c0773c028 SHA1 46ec3188875a3cdb85d3204e2a016c7c5e767eea SHA256 53e660e45c7389e64aed253e50de9ffa3797e9678b93dd06e78451126b76604a
 EBUILD linphone-3.4.3.ebuild 2792 RMD160 338d2b423c2541d58cadf2b250b3240ba23d3346 SHA1 e3a3bbb054dfc5c1fcf846ccf49f2067cb036bb8 SHA256 47826d0a23fcab7bc1c1a5c4e126050465341119e657df51f8a50e4ace6983e7
-MISC ChangeLog 15159 RMD160 eeb2cf67810d2868e5bd36a8ed80a30928128776 SHA1 4f2ffd55acf79da205f1291270af4fd945b160c6 SHA256 636292aedc6131d1b9314a9b10ef8911fb1e91d5eb353322eed15e3cf3b4675c
+MISC ChangeLog 15375 RMD160 45ac1feeb70784805c62065cfc3d06d5b121d694 SHA1 ddd94549db0ea4fc91b6a3245cde62d6a1e1ded5 SHA256 14704c371baad294c5194e307b93042efd251ed5d485b672dae9d5f5b7c86ef6
 MISC metadata.xml 335 RMD160 0e09a4bd66327fe8397d95c19df4fa884886444b SHA1 b7056729ec82619f4edc4dfe90c5c53ec780f638 SHA256 008f606df7bbbc280b1a0b4a31a7b653858c7ccfe3c99f476547c037189f7fdf
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk3OTB8ACgkQodBTJSDyo6568gD8CgLQtQXUX10afZofY6afUXww
-l5LLNVCYUsu/5bB5tMUA/01rDqsUKJIysdpVp0xHd7AU5nwzqtLqT5Kdx7p4ES11
-=dL8o
------END PGP SIGNATURE-----
diff --git a/net-voip/linphone/linphone-3.3.1.ebuild b/net-voip/linphone/linphone-3.4.3-r1.ebuild
index 164740447ce3..e8eb00b95233 100644
--- a/net-voip/linphone/linphone-3.3.1.ebuild
+++ b/net-voip/linphone/linphone-3.4.3-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/linphone-3.3.1.ebuild,v 1.1 2010/06/07 14:49:11 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/linphone-3.4.3-r1.ebuild,v 1.1 2011/05/24 08:08:28 pva Exp $
 
-EAPI="3"
+EAPI="4"
 
-inherit eutils autotools multilib versionator
+inherit eutils autotools multilib versionator pax-utils
 
 DESCRIPTION="Video softphone based on the SIP protocol"
 HOMEPAGE="http://www.linphone.org/"
@@ -13,12 +13,13 @@ SRC_URI="http://download.savannah.nongnu.org/releases-noredirect/${PN}/$(get_ver
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~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.4.0[video?]
+RDEPEND=">=media-libs/mediastreamer-2.7.3[video?,ipv6?]
 	>=net-libs/libeXosip-3.0.2
 	>=net-libs/libosip-3.0.0
-	>=net-libs/ortp-0.16.2
+	>=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 )
@@ -33,13 +34,6 @@ DEPEND="${RDEPEND}
 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."
@@ -51,19 +45,16 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.2.99.1-external-mediastreamer.patch
-	epatch "${FILESDIR}"/${PN}-3.2.1-nls.patch
-
+	epatch "${FILESDIR}"/${PN}-3.4.3-nls.patch
 	# remove speex check, avoid bug when mediastreamer[-speex]
-	sed -i -e '/SPEEX/d' configure.in || die "patching configure.in failed"
+	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.in \
-		|| die "patching configure.in failed"
+	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"
-	# and references in Makefile.am
 	sed -i -e "s:oRTP::;s:mediastreamer2::" Makefile.am \
 		|| die "patching Makefile.am failed"
 
@@ -84,7 +75,6 @@ src_configure() {
 		--enable-external-ortp \
 		--enable-external-mediastreamer \
 		--disable-truespeech \
-		--disable-dependency-tracking \
 		$(use_enable doc manual) \
 		$(use_enable gtk gtk_ui) \
 		$(use_enable ipv6) \
@@ -94,8 +84,7 @@ src_configure() {
 }
 
 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 "${ED}/usr/share/pixmaps/"{linphone/linphone2.png,linphone2.png} || die
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS BUGS ChangeLog NEWS README README.arm TODO
+	pax-mark m "${ED}usr/bin/linphone"
 }