From 0bc24b51281ddc4948d73c329b81d2b244d7438c Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Wed, 4 Jun 2014 13:26:35 +0000 Subject: Multilib support thanks to Christian Schmidt, bug #501098 Package-Manager: portage-2.2.10/cvs/Linux x86_64 --- media-video/rtmpdump/ChangeLog | 6 +++- media-video/rtmpdump/Manifest | 28 +++--------------- media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild | 27 ++++++++++++----- media-video/rtmpdump/rtmpdump-9999.ebuild | 34 +++++++++++++--------- 4 files changed, 50 insertions(+), 45 deletions(-) (limited to 'media-video/rtmpdump') diff --git a/media-video/rtmpdump/ChangeLog b/media-video/rtmpdump/ChangeLog index 35b66baa5097..5fe3ecfe6742 100644 --- a/media-video/rtmpdump/ChangeLog +++ b/media-video/rtmpdump/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/rtmpdump # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/ChangeLog,v 1.30 2014/01/19 10:29:23 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/ChangeLog,v 1.31 2014/06/04 13:26:30 lu_zero Exp $ + + 04 Jun 2014; Luca Barbato rtmpdump-2.4_p20131018.ebuild, + rtmpdump-9999.ebuild: + Multilib support thanks to Christian Schmidt, bug #501098 19 Jan 2014; Agostino Sarubbo rtmpdump-2.4_p20131018.ebuild: Stable for ppc64, wrt bug #496436 diff --git a/media-video/rtmpdump/Manifest b/media-video/rtmpdump/Manifest index a4010cefced4..e0760c6c658e 100644 --- a/media-video/rtmpdump/Manifest +++ b/media-video/rtmpdump/Manifest @@ -1,29 +1,9 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - DIST rtmpdump-2.3.tgz 125103 SHA256 ef38b7a99d82ce6912063d21063aeaf28185341b3df486e24bffce5354224b2c SHA512 d8240ba372a704231286b81bbf75716d8b76874840538c4e1527f7f8b6ca66eeaba6b03167fe6fab06bf80f20f07d89ecb84cc428b3196234174a43f3328ec2a WHIRLPOOL cb3503777b110c8566cdae3ba1df8e99c52377253c32e0fa728d2267f2bbb9595398fc7cd4f068e92119f7e55f0a95bbafe56cc8568edbd8bd62b5dd67a161c2 -DIST rtmpdump-2.4.tar.gz 134575 SHA256 51f54d37907f19bfa00219d57ec6e12d09458bb31360e8cf004883df745f094c +DIST rtmpdump-2.4.tar.gz 134575 SHA256 51f54d37907f19bfa00219d57ec6e12d09458bb31360e8cf004883df745f094c SHA512 6beeeb5ca27c3c4ad5452b62a9fd16cf23e1f537253c1a0b6015e72baa5115b61b33cf0734ffc8acfc65dd63039149eaff1eb122d5bdb639bea6397de515ef39 WHIRLPOOL 49f1723251694976a9f279ed8859c1448750a37cc7cccf6c0006950332a63fbf37ee39723318003f118d5b3879681173ef16c46b1e61cd6a4cca29c2eb6f7227 DIST rtmpdump-2.4_p20131018.tar.gz 142707 SHA256 57164e0c12f7cbff8e40b1e66cf6b889086387324851a115b427b8d2b3fff267 SHA512 78c2da880ece43af1d4257a14a22d95e9f1b9f474d85f97e879d9cfd2232c5a7f1c1a41fbb1af7e047700214a993eb33965dba41573389d5eebefd3f01a780fc WHIRLPOOL 80a8e9ed9eeca4ddab8c44ae6e937f0d271311e8f5ce74bb0b49fff69edc4bd302f257366f33cceb8ae089fabdd7ff2533937a833e79fcb575e3cf43c592327a EBUILD rtmpdump-2.3.ebuild 1979 SHA256 e74945816f7621936d1df5daf47e2396749445b0111a7d0d9605d12ef6ead364 SHA512 952aa5d96ad15404025acc27b8ec65304e0b7e9e8e7810d562e902cb782587320cdd51cd8cb1e7e1b6cdb8d62363d28f2539cd6ab560954aae137fa9c33e46cf WHIRLPOOL dac9c58377a30ed8f8ebc23d463e61647d04b0513e542d72cb3e36301491a8e7418fccf15b99f5d0a297ab51d0f3c65564c11809fe6ae07f9f929e25965c3296 EBUILD rtmpdump-2.4.ebuild 1947 SHA256 3107b61df38a79a5bb57b7ac7ea6c4db945aa8dde46f2a9384aa6e348aaa6824 SHA512 2d07bb26ac0b892d5014452a0161817081b0aab3850854b921af1ceb00b4c575e4bffb6cabae8b6d33573ef83615b2421f34179ffaca4465f830d58bd8b9156d WHIRLPOOL 42f5923fd059306f1523411e83c98b9408d254548ab204b9c82ac015c3b1ba8727f03823bdb323b6dcb35ad26252c9f6fbfab137e7d3002edf4e37ebe846976e -EBUILD rtmpdump-2.4_p20131018.ebuild 1975 SHA256 3e807bd9b6304f69ceb4461852fb663aced794d4a32cc87d31262c291f22a587 SHA512 eb07b84a0e40baa9a405f48f051d7ca2d30a52e93b551e36833709adf2419862b9aa0733c700a78ed85df94ae5a780e173059f1ba33473add2174e9dca33b8e5 WHIRLPOOL 800dc8fd497872e02311b0b4065ca84ce4dd99b21646c4f654c9c64b0731c33736e1c26137f2d75db66364c8e2bef1a2625b02c308c0bfd46df5533f9da35c33 -EBUILD rtmpdump-9999.ebuild 1862 SHA256 3a8942c939b07dc4d3def385c8120657cb5a4582d4db215b1e11ff98fa3d5f54 SHA512 df34889a21f52d55e7d284d6e0db51ace28c02cfde7aea7cedf15c02b99d9df7c258f8ce307b79c75b5284a3946d177ffe4c7e8ee7a8fbc36511bf4aa4be6461 WHIRLPOOL 063f7180a1269fb88b2c79a9c09c2a5b2f65c55f9f0ef2e12b940a4568e3e514a025d6e38d0db4fc91ea7f7f6a31f64f4adcd5d60daf8c56b27855c19802b70d -MISC ChangeLog 4737 SHA256 4064fbf5f1b129bab11efa5983c4087b1914f97a334e71df645c8dc1da0e49d5 SHA512 185cceea499fd1b39b33bd5466c3e8cdf6dfba2738c604ddbc843c2c48e0fa7a05c6e5b4ebe85366a2f5f5e0cedcca566f7c661d8a189f8c6b307e08baaea215 WHIRLPOOL 7ed19fa26dfa9c3cf2c88dc1f0df5cf17b996f07fd1d3ec5dc1618366e769b3e502223219a90662e6e961c057222a526537e30f125bad574a3ab1909842e03a3 +EBUILD rtmpdump-2.4_p20131018.ebuild 2232 SHA256 0c072190a0bd0565f5e2dd57a436c3aaaad0ee5a1ea6d6b4fee6b2a041e6c4d1 SHA512 ad3866546566dd3eeacba9b29f286ddcd583a11e704196c6062053cfffd93093264f889c33f84a75da5ab2075a6881468afbbea9b4a3c02bae6eda62c04b0836 WHIRLPOOL bdfac35c8ef3fc01743b3f537475a97f9312ec0ed420ac2eba1cf349aab8d4e9b725175fb7a09235e8627350f479009d6d10912bbbfd576e8b3d33e8d7b38209 +EBUILD rtmpdump-9999.ebuild 2110 SHA256 e93a5db287285940b1aa4ab2e0137f5bc808cad944b099b672c4ed02a151c3c5 SHA512 b67f9431f40b274473d65c47397f8bbe7be3c8a06b60046efd6e921683db8bbee5656ce9dfa1b06e95afa4b486bee46345aaf6ad2219e00f8b4be669eb1cea40 WHIRLPOOL 941f13146823c7ec7f2783cb1b6c785149b90150762a51b0d32d10f64c0572964caa377fa16107b1bda56ffc44abc68e46da44b4a227f6c4c7081e3b04a2123e +MISC ChangeLog 4906 SHA256 c48a888d5bc05128c83aecfe2971340757ee5ad676a9abe65e1189ed8ace7a4e SHA512 6fb81c32c9dc71fde49b83c29fdb37ab2289030983d7bbf52e465c3d114190276ae0904591f4f547c80bc86d6720dbae32842816ff4bb4731c4d9e4e446c2cec WHIRLPOOL 604291d38330e8bd82d1b76845333b64eda6f32e733c0884262b30ccc764a11638144984cd2fe0acff06ed9f3dfd3aaa2b8e0890d6f3810cf475e96120400211 MISC metadata.xml 451 SHA256 65260e5ca356283485990adad74d70c6593f402a90ed2ac5c307d45f4e98b1d0 SHA512 a572df2a005d5963e20c8dcb7d92506f611d76e14bc8155e0dd229d501a1bd6bcfcc4f970bd0291171c6fa87f44b090390a2d454dca57d3f235112b953785f7f WHIRLPOOL 387c1862131a9feca4ef18f69699f33a558c1d95a5b706d12b28cbb8dfbbe678f1ca3e61449197ff185cec8730ce56189c6a66f24bbc824fce7da19a7053e8d8 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iQIcBAEBCAAGBQJS26kEAAoJELp701BxlEWfOuQP+weD3661eaYY7iTlOUgrHnsA -KyflHPkFGWV2VDJkMEUOgsVT+S/sblHnWeOJ4jbJcXrl7lvUuLpcf3CTtEfDtDRg -ziBTSij6cru2Jz9uFXAEtD6NHoynivhglbLwL2E2/YIRp/kY2XX1otmrukJugTAo -5i8I4MvXf1Vo+F0YEFntwEqBqec6AVxOrBl1B+ojhLKSBG6BN65qf0/lFcab5JZ5 -lIJ629Do+oNG8SRcSe+RGSm0d8rfMaBcwTDAbwlrkA04+wdE4kQ/aI98BvNM9i/s -ZgsCtzz2oXhe+XAZLYi/IrF8rilEN5bdl5kWsYz2BAxwQwjkcyVxbUfps+dAw/3/ -pVHxstOFGEb1NLLH65r8hBs+u/0GSc5+tHGM1dB2RmHDgDKglgd2HWOCwq9h4HKw -9l+r56aZ/sE1xtvFMsMPzGZOnciYJKtr868VKk40f8HGmxFYkPvUvpbmJbfW08Ed -JPwK+ujeQx3kYmw3riTfcm3yne8resCf1Xj+XqXZVtTAkRVyB/oX4gM/gO+pSIOk -P7q7gjf1z8gC+rJsj451PmY73aP4AiUMJTj+nbRyRfeczViU2g8uo6Qh0mAjisfv -Qlt9g7wgFQHW9iXDQvVjH2rydZYhrMqgZwI+4cIjLeT1GfIernwBzDCUREsEiXfv -+ZG9np8HsBnxKWNty6E1 -=gvie ------END PGP SIGNATURE----- diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild index a466ce7a7e33..8e38dcd8f648 100644 --- a/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild +++ b/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild,v 1.6 2014/01/19 10:29:23 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild,v 1.7 2014/06/04 13:26:29 lu_zero Exp $ EAPI="4" -inherit multilib toolchain-funcs +inherit multilib toolchain-funcs multilib-minimal DESCRIPTION="Open source command-line RTMP client intended to stream audio or video flash content" HOMEPAGE="http://rtmpdump.mplayerhq.hu/" @@ -23,15 +23,20 @@ DEPEND="ssl? ( ) sys-libs/zlib" RDEPEND="${DEPEND}" -S="${WORKDIR}" pkg_setup() { - if ! use ssl && ( use gnutls || use polarssl ) ; then + if ! use ssl && ( use gnutls || use polarssl ) ; then ewarn "USE='gnutls polarssl' are ignored without USE='ssl'." ewarn "Please review the local USE flags for this package." fi } +src_unpack() { + mkdir -p "${S}" || die "Can't create source directory" + cd "${S}" + unpack "${A}" +} + src_prepare() { # fix Makefile ( bug #298535 , bug #318353 and bug #324513 ) sed -i 's/\$(MAKEFLAGS)//g' Makefile \ @@ -40,9 +45,10 @@ src_prepare() { -e 's:OPT:OPTS:' \ -e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \ || die "failed to fix Makefile" + multilib_copy_sources } -src_compile() { +multilib_src_compile() { if use ssl ; then if use gnutls ; then crypto="GNUTLS" @@ -54,13 +60,20 @@ src_compile() { fi #fix multilib-script support. Bug #327449 sed -i "/^libdir/s:lib$:$(get_libdir)$:" librtmp/Makefile + if ! multilib_build_binaries; then + cd librtmp + fi emake CC="$(tc-getCC)" LD="$(tc-getLD)" \ OPT="${CFLAGS}" XLDFLAGS="${LDFLAGS}" CRYPTO="${crypto}" SYS=posix } -src_install() { +multilib_src_install() { mkdir -p "${ED}"/${DESTTREE}/$(get_libdir) + if multilib_is_native_abi; then + dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html + else + cd librtmp + fi emake DESTDIR="${ED}" prefix="${DESTTREE}" mandir="${DESTTREE}/share/man" \ CRYPTO="${crypto}" install - dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html } diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild index f0565c3ba8c3..f8764271872f 100644 --- a/media-video/rtmpdump/rtmpdump-9999.ebuild +++ b/media-video/rtmpdump/rtmpdump-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/rtmpdump-9999.ebuild,v 1.4 2012/11/25 10:53:36 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/rtmpdump-9999.ebuild,v 1.5 2014/06/04 13:26:30 lu_zero Exp $ EAPI="4" -inherit git-2 multilib toolchain-funcs +inherit git-2 multilib toolchain-funcs multilib-minimal DESCRIPTION="Open source command-line RTMP client intended to stream audio or video flash content" HOMEPAGE="http://rtmpdump.mplayerhq.hu/" @@ -17,15 +17,15 @@ KEYWORDS="" IUSE="gnutls polarssl ssl" DEPEND="ssl? ( - gnutls? ( net-libs/gnutls ) - polarssl? ( !gnutls? ( >=net-libs/polarssl-0.14.0 ) ) - !gnutls? ( !polarssl? ( dev-libs/openssl ) ) + gnutls? ( net-libs/gnutls[${MULTILIB_USEDEP}] ) + polarssl? ( !gnutls? ( >=net-libs/polarssl-0.14.0[${MULTILIB_USEDEP}] ) ) + !gnutls? ( !polarssl? ( dev-libs/openssl[${MULTILIB_USEDEP}] ) ) ) - sys-libs/zlib" + sys-libs/zlib[${MULTILIB_USEDEP}]" RDEPEND="${DEPEND}" pkg_setup() { - if ! use ssl && ( use gnutls || use polarssl ) ; then + if ! use ssl && ( use gnutls || use polarssl ) ; then ewarn "USE='gnutls polarssl' are ignored without USE='ssl'." ewarn "Please review the local USE flags for this package." fi @@ -39,11 +39,12 @@ src_prepare() { -e 's:OPT:OPTS:' \ -e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \ || die "failed to fix Makefile" + multilib_copy_sources } -src_compile() { +multilib_src_compile() { if use ssl ; then - if use gnutls ; then + if use gnutls ; then crypto="GNUTLS" elif use polarssl ; then crypto="POLARSSL" @@ -53,13 +54,20 @@ src_compile() { fi #fix multilib-script support. Bug #327449 sed -i "/^libdir/s:lib$:$(get_libdir)$:" librtmp/Makefile + if ! multilib_build_binaries; then + cd librtmp + fi emake CC="$(tc-getCC)" LD="$(tc-getLD)" \ OPT="${CFLAGS}" XLDFLAGS="${LDFLAGS}" CRYPTO="${crypto}" SYS=posix } -src_install() { +multilib_src_install() { mkdir -p "${ED}"/${DESTTREE}/$(get_libdir) + if multilib_is_native_abi; then + dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html + else + cd librtmp + fi emake DESTDIR="${ED}" prefix="${DESTTREE}" mandir="${DESTTREE}/share/man" \ - CRYPTO="${crypto}" install - dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html + CRYPTO="${crypto}" install } -- cgit v1.2.3-65-gdbad