From cf68b0a876532262bde742322d76d16cf937d8bb Mon Sep 17 00:00:00 2001 From: Tony Vroon Date: Tue, 3 Jan 2012 13:07:36 +0000 Subject: [PATCH] Install shared library to correct location (multilib-aware) and simplify versioning now that 1.6.2 is no longer in the tree. Patch by Jaco Kroon closes bug #396413. Package-Manager: portage-2.1.10.44/cvs/Linux x86_64 --- net-misc/asterisk-g729/ChangeLog | 12 ++++- net-misc/asterisk-g729/Manifest | 10 ++--- ...ld => asterisk-g729-1.8.4.3.1.5-r1.ebuild} | 45 ++++++------------- 3 files changed, 28 insertions(+), 39 deletions(-) rename net-misc/asterisk-g729/{asterisk-g729-1.8.4.3.1.5.ebuild => asterisk-g729-1.8.4.3.1.5-r1.ebuild} (88%) diff --git a/net-misc/asterisk-g729/ChangeLog b/net-misc/asterisk-g729/ChangeLog index 9d4d6c6f855a..8a3105c0ba02 100644 --- a/net-misc/asterisk-g729/ChangeLog +++ b/net-misc/asterisk-g729/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-misc/asterisk-g729 -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-g729/ChangeLog,v 1.1 2011/09/02 13:00:51 chainsaw Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-g729/ChangeLog,v 1.2 2012/01/03 13:07:36 chainsaw Exp $ + +*asterisk-g729-1.8.4.3.1.5-r1 (03 Jan 2012) + + 03 Jan 2012; Tony Vroon + -asterisk-g729-1.8.4.3.1.5.ebuild, +asterisk-g729-1.8.4.3.1.5-r1.ebuild: + Install shared library to correct location (multilib-aware) and simplify + versioning now that 1.6.2 is no longer in the tree. Patch by Jaco Kroon + closes bug #396413. *asterisk-g729-1.8.4.3.1.5 (02 Sep 2011) diff --git a/net-misc/asterisk-g729/Manifest b/net-misc/asterisk-g729/Manifest index 7a38cf20fbdc..962450ce4029 100644 --- a/net-misc/asterisk-g729/Manifest +++ b/net-misc/asterisk-g729/Manifest @@ -30,13 +30,13 @@ DIST codec_g729a-1.8.4_3.1.5-pentium4m_32.tar.gz 408839 RMD160 9a201613bf6d9c70e DIST codec_g729a-1.8.4_3.1.5-pentium_m_32.tar.gz 412950 RMD160 d24e8ef0624c2c74ee4e121609fc0016a8706cd5 SHA1 17a108d31a47540ca04425bc7a911ac190e64db3 SHA256 9a8a94ec14977dcb060d5a910e500ada175c63f872a2784f436e355dd76ca86f DIST codec_g729a-1.8.4_3.1.5-prescott_32.tar.gz 411062 RMD160 5c17d3721a5652def5fea89fe06db1c9bb02e23f SHA1 a46ae9294406ae2e5ebd26bc1e03cb7ccb24a223 SHA256 719ce410b658b14bae6c08923420b819f23aae948a079ea1cec60b5bbb775d9b DIST collect-g729-stats.sh 4857 RMD160 7241876ac8f1a778507b3f655820adebd871a0b1 SHA1 2a87944f1d2535ad867d93dd1eec95267d386b56 SHA256 901aeac3b3b5e11d8ef983820d1761cb5404a9240c9500f59e670ced2966c074 -EBUILD asterisk-g729-1.8.4.3.1.5.ebuild 6139 RMD160 b82218dd5b3164b70cd343163c8ace646e71f7c2 SHA1 c1c0615b5f2db67f218c03fea9a389b2ca9d8a0a SHA256 96103a3e1ac5cf8baa92a48a29e7a9e17e6dc2225ab82e052b52c603d279b6db -MISC ChangeLog 501 RMD160 e2524cd87920ceb915229b8dc28dc9e5b440f70f SHA1 aeae4caa3ee7bb3e2a66fc74fbc0cfe6b3252de5 SHA256 d2f5a6ca66d157586904b00ad2116de709861b906f5477325611de44e75706a1 +EBUILD asterisk-g729-1.8.4.3.1.5-r1.ebuild 5812 RMD160 db0c0b31f621237deb5c5c2194bede236fc9db3f SHA1 6c4723befb4875a25e6e660f864c857524c7e888 SHA256 82343588db74d3a7e8eb00730da5f61d843221ab5d76a04130c7106d1193a0bc +MISC ChangeLog 841 RMD160 eecb79f2a82053735ae694dcb2a0715ba7d7ab7e SHA1 96fe9bf77a66df4bd8272f0355be39968a0f5432 SHA256 85173e1b279af9316ccf3746aecac07678fbc4e0ac1fec68b5cc677181736f4b MISC metadata.xml 257 RMD160 310ad9c194b37abe9bb814131148f5cc78c77625 SHA1 9f8b9263984b3fca531dcd3c859b0f0945d9920f SHA256 ad64812c2b7c47f6071002a0d7614aff3d4ba8349958093745d0a637b265d23b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk5g04sACgkQp5vW4rUFj5o99ACfcqZwHu0V4rQ9H0PJxxYFEChT -EtUAn2RkYhnu6iP5ue35SFa1L5C0EE7h -=gwu8 +iEYEARECAAYFAk8C/bYACgkQp5vW4rUFj5qYLACguonAAI1tBA2WOJklsZo9pmFQ +mG8An14wgFC52s1qlBqAKRuVUIF7TBft +=hltX -----END PGP SIGNATURE----- diff --git a/net-misc/asterisk-g729/asterisk-g729-1.8.4.3.1.5.ebuild b/net-misc/asterisk-g729/asterisk-g729-1.8.4.3.1.5-r1.ebuild similarity index 88% rename from net-misc/asterisk-g729/asterisk-g729-1.8.4.3.1.5.ebuild rename to net-misc/asterisk-g729/asterisk-g729-1.8.4.3.1.5-r1.ebuild index 8807e76a1ead..a600691a41dd 100644 --- a/net-misc/asterisk-g729/asterisk-g729-1.8.4.3.1.5.ebuild +++ b/net-misc/asterisk-g729/asterisk-g729-1.8.4.3.1.5-r1.ebuild @@ -1,41 +1,19 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-g729/asterisk-g729-1.8.4.3.1.5.ebuild,v 1.1 2011/09/02 13:00:51 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-g729/asterisk-g729-1.8.4.3.1.5-r1.ebuild,v 1.1 2012/01/03 13:07:36 chainsaw Exp $ EAPI="4" -inherit versionator +inherit versionator multilib DESCRIPTION="G.729 codec and supporting files for asterisk" HOMEPAGE="http://store.digium.com/productview.php?product_code=G729CODEC" BENCH_PV=1.0.8 -PV_C=($(get_version_components)) - -case ${PV_C[1]} in - 4) - AST_PV=1.4 - MY_PV=$(replace_version_separator 2 _) - ;; - 6) - AST_DPV=1.6.${PV_C[2]} - case ${PV_C[2]} in - 0|1) - AST_PV=1.6.${PV_C[2]} - MY_PV=$(replace_version_separator 3 _) - ;; - 2) - AST_PV=1.6.${PV_C[2]}.${PV_C[3]} - MY_PV=$(replace_version_separator 4 _) - ;; - esac - ;; - 8) - AST_DPV=1.8 - AST_PV=1.8.${PV_C[2]} - MY_PV=$(replace_version_separator 3 _) - ;; -esac + +AST_DPV=1.8.7 +AST_PV=1.8.7 +MY_PV=$(replace_version_separator 3 _) SRC_URI="x86? ( http://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-athlon_32.tar.gz @@ -86,9 +64,12 @@ QA_DT_HASH_x86="usr/lib/codec_g729a.so usr/sbin/benchg729" QA_EXECSTACK="usr/sbin/benchg729 usr/sbin/asthostid usr/sbin/astregister" -S=${WORKDIR} +S="${WORKDIR}" src_prepare() { + local binsuffix + local b + if use x86; then binsuffix=x86_32 elif use amd64; then @@ -130,8 +111,8 @@ src_install() { dodoc codec_g729a-${MY_PV}-${variant}_${size}/LICENSE dodoc codec_g729a-${MY_PV}-${variant}_${size}/README - insinto /usr/lib/asterisk/modules/ - dolib.so codec_g729a-${MY_PV}-${variant}_${size}/codec_g729a.so + insinto usr/$(get_libdir)/asterisk/modules/ + doins "codec_g729a-${MY_PV}-${variant}_${size}/codec_g729a.so" } pkg_postinst() { -- 2.26.2