Fix multilib deps. Move zlib into "ssl?" since it is used only along with SSL. Add missing ||die. Bug #501098, https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/13 by Michael Mair-Keimberger.

Package-Manager: portage-2.2.16/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 50 insertions, 32 deletions

diff --git a/media-video/rtmpdump/ChangeLog b/media-video/rtmpdump/ChangeLog
index ad34c3a54b5e..9b69650291c6 100644
--- a/media-video/rtmpdump/ChangeLog
+++ b/media-video/rtmpdump/ChangeLog
@@ -1,6 +1,12 @@
 # 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.34 2014/07/04 19:29:19 jer Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/ChangeLog,v 1.35 2015/02/11 22:34:21 mgorny Exp $
+
+  11 Feb 2015; Michał Górny <mgorny@gentoo.org> rtmpdump-2.4_p20131018.ebuild,
+  rtmpdump-9999.ebuild:
+  Fix multilib deps. Move zlib into "ssl?" since it is used only along with SSL.
+  Add missing ||die. Bug #501098, https://github.com/gentoo/gentoo-portage-
+  rsync-mirror/pull/13 by Michael Mair-Keimberger.
 
   04 Jul 2014; Jeroen Roovers <jer@gentoo.org> rtmpdump-2.4_p20131018.ebuild:
   Fix quoted ${A}.
diff --git a/media-video/rtmpdump/Manifest b/media-video/rtmpdump/Manifest
index 53fc80df5d94..6b7eae88cc97 100644
--- a/media-video/rtmpdump/Manifest
+++ b/media-video/rtmpdump/Manifest
@@ -6,14 +6,26 @@ DIST rtmpdump-2.4.tar.gz 134575 SHA256 51f54d37907f19bfa00219d57ec6e12d09458bb31
 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 2225 SHA256 3dcb3e6a861dc4b97d424f23b377db42103739a42dc8126ccec78e4dcc6d87c9 SHA512 4d12c6be807dfe4ac4baab38094ffafe3d35d28958d4dc507ee4b535c4d2df63e23b47abf0659e8616d985f84c572239ca65da93db6b94feac0e56898f2b2235 WHIRLPOOL 9bdbadbc51730ec20828a0bc2eb17c3ea97ab24d620bf14f70f7cfb36f273f95822b9d0b6364db9e06017ef5841d6a5a616bedb3195d4695a7419b1cd0cb53dc
-EBUILD rtmpdump-9999.ebuild 2144 SHA256 c612f3748d311d181a586c159d08672d509bf10b98160ed88ba81de81c6dea3e SHA512 300ac599e78c2c4011be7d70effb7a33ceceae8d3423388d3343895e2f3c113e4c346d38d1269363651b2b57a69f922ec95f427de0ad714894083e795864f27c WHIRLPOOL 0f195e19e1114508b8d671d0d92f06c4c615d8e014fdf858e1e7a0ae285d97dea5ca5f205eb458867583405438e9fcd8ebf2791309332ac97500ed461810dac0
-MISC ChangeLog 5272 SHA256 c574fb6eee785faeaf1fc2a8af8f16d01d0ca8bbdefbbc419311734cd9727126 SHA512 a6cbc8b87dd75d55bffd3a032b1f23481e910030c15b2b1c978be40605386a4682a82ff3085b0b025a4fd7e374945f6db05725450f8801114c04e6323366bc91 WHIRLPOOL 2e9973122cd6057d73818b61373e1afae20b4b89cc14e3bdd54623e248fad7bf14437502f8c0b4aa52ac9c1fc712478c3a3b0a227055673b26c1ac7dcff0b34f
+EBUILD rtmpdump-2.4_p20131018.ebuild 2379 SHA256 04a8720f6f59ec28e25485a6f2f499de3ee5b6104dc4345425c50f4e9c470591 SHA512 0fd3c6378566929a5553752314d31057f7840f797d62e16be45c7d01998b56f60dada57cc1de5b716032d15460ec91f82f5b9c490f22096cc11bac79f840e1ed WHIRLPOOL cb4e4597eb79dbd68f55238ec79886440be2c10dcae96a27aa06cc5530b4418a13b2a378b177a13782291cf45bdd636fa25dc23945e92880d9bae6d9ef080144
+EBUILD rtmpdump-9999.ebuild 2172 SHA256 877cbc5dcea07efe9a631c2f1dbbd6a1e2f31756eaf8ebcac5c11b92ffcaed28 SHA512 9486a8e3d04d65773cae440c5dce0160a7185067e62071aa70d8084dc729f9881152efeac92e3dae64e633a93dded9d93c1c05d6d71359fd12d14608c74761b9 WHIRLPOOL b2f22b78b959a6ce13b583ad965e869baecf9b06d2f9910c68c9c95bbfe47861eaadc93824179402fbac8eed81cc61a64ac24011430656bee0bb16baedce0370
+MISC ChangeLog 5589 SHA256 d8f2b2175e8a76705cacb47ec9eacc525c533cb1eb22608e3507da6963ed8b63 SHA512 3a1bef890ec59d0c9b24eb899664231128233c4753f26a8d94ee29f196eddfcc60f94e6100004971355c8fedcd59bf4cd237b00a89a718c6b463f719e7041974 WHIRLPOOL 69db0cede0cc8b10d30e0002c5dbaedd8ce98e7aeb329084a841721a2b3579f2e0f4d5453ca9ee2acf2a5ae605ece3aa1bb4e35ebdf3e0da815380e8f6297357
 MISC metadata.xml 451 SHA256 65260e5ca356283485990adad74d70c6593f402a90ed2ac5c307d45f4e98b1d0 SHA512 a572df2a005d5963e20c8dcb7d92506f611d76e14bc8155e0dd229d501a1bd6bcfcc4f970bd0291171c6fa87f44b090390a2d454dca57d3f235112b953785f7f WHIRLPOOL 387c1862131a9feca4ef18f69699f33a558c1d95a5b706d12b28cbb8dfbbe678f1ca3e61449197ff185cec8730ce56189c6a66f24bbc824fce7da19a7053e8d8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlO3AJAACgkQVWmRsqeSphM3XQCfZOk1hyOpkhh2ACCIhfGEmhxm
-bq4AmwSIaoGq8vM10KI3fHv6nfJS2jCu
-=X1ws
+iQJ8BAEBCABmBQJU29jyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO2EIP/3B6cKTBdlsrqq0a7FXypOdz
+z9CbfaRSeC372mDAFJlLxsXFeRafroUai7qvb518OfjKkNnyaGsqoNxWcPafg91b
+VjxDNGC7ILH9CsnR6B2Iq5cRqNEc2w6d/qglY9cBzqIeEmQt3APe73bO2DwoVWJm
+luLZ4z4pNnNJ9uAduvBemPzMnDEWjY8kGWZYC4F7w3kOd1+CmvmH/MkqLH9qOp/m
+k1mwqSdt+FbeUwDsF1CL0/Tgz0dZ3VcqNgAVbPSObk34qf8UVHpbhDrscyRR9Wt3
+FIbIPDMBvtomoBufaOsgdsPP9/SjPqnT4HVIrca5/PuU2rYAuajusswerviAZPHd
+dTr+tfP9bIoovXQt8G0bGvy0azdJTvisCKN+7OxHU+myrNr2w8MVtUqfA0li88D5
+PrtMn373Jz0J0kYvzwOqqOLqCStBRrgCYs3oo8+Y+Nhn1ZmZT8wSAbIfcwqZ6dxh
+ok00WR/t6/BRUv3W81f0PkOlZRv8zLOiDgrn3JCBAJSdKWJlfceAbJrH8O9DhcMJ
+YdsToTLJwFF8ZGMheasiN4rS+nS3pvXxpE0VWtJy6oFIMRPAS4xhedpNpxlVeMCB
+SZepFGM8vyw+W3jS9FWQsdYNopaUkrEJMKbzZWFR+z0X57Xa2EYqIqBhr26nBAyZ
+vtdsfQAHLetxJDzw/Fh8
+=KYNk
 -----END PGP SIGNATURE-----
diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild
index 76726532f0d2..2f1b4affe5f4 100644
--- a/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.9 2014/07/04 19:29:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild,v 1.10 2015/02/11 22:34:21 mgorny Exp $
 
 EAPI="4"
 
@@ -17,15 +17,15 @@ KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux
 IUSE="gnutls polarssl ssl"
 
 DEPEND="ssl? (
-		gnutls? ( net-libs/gnutls )
-		polarssl? ( !gnutls? ( >=net-libs/polarssl-0.14.0 ) )
-		!gnutls? ( !polarssl? ( dev-libs/openssl ) )
-	)
-	sys-libs/zlib"
+		gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
+		polarssl? ( !gnutls? ( >=net-libs/polarssl-1.3.4[${MULTILIB_USEDEP}] ) )
+		!gnutls? ( !polarssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) )
+		>=sys-libs/zlib-1.2.8-r1[${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
@@ -33,7 +33,7 @@ pkg_setup() {
 
 src_unpack() {
 	mkdir -p "${S}" || die "Can't create source directory"
-	cd "${S}"
+	cd "${S}" || die
 	unpack ${A}
 }
 
@@ -59,20 +59,20 @@ multilib_src_compile() {
 		fi
 	fi
 	#fix multilib-script support. Bug #327449
-	sed -i "/^libdir/s:lib$:$(get_libdir)$:" librtmp/Makefile
-	if ! multilib_build_binaries; then
-		cd librtmp
+	sed -i "/^libdir/s:lib$:$(get_libdir)$:" librtmp/Makefile || die
+	if ! multilib_is_native_abi; then
+		cd librtmp || die
 	fi
 	emake CC="$(tc-getCC)" LD="$(tc-getLD)" \
 		OPT="${CFLAGS}" XLDFLAGS="${LDFLAGS}" CRYPTO="${crypto}" SYS=posix
 }
 
 multilib_src_install() {
-	mkdir -p "${ED}"/${DESTTREE}/$(get_libdir)
+	mkdir -p "${ED}"/${DESTTREE}/$(get_libdir) || die
 	if multilib_is_native_abi; then
 		dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html
 	else
-		cd librtmp
+		cd librtmp || die
 	fi
 	emake DESTDIR="${ED}" prefix="${DESTTREE}" mandir="${DESTTREE}/share/man" \
 	CRYPTO="${crypto}" install
diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index b413e6b0dce7..a47e4ff7a2a3 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.6 2014/06/18 20:30:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/rtmpdump-9999.ebuild,v 1.7 2015/02/11 22:34:21 mgorny Exp $
 
 EAPI="4"
 
@@ -20,12 +20,12 @@ DEPEND="ssl? (
 		gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
 		polarssl? ( !gnutls? ( >=net-libs/polarssl-1.3.4[${MULTILIB_USEDEP}] ) )
 		!gnutls? ( !polarssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) )
-	)
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
+		>=sys-libs/zlib-1.2.8-r1[${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
@@ -53,20 +53,20 @@ multilib_src_compile() {
 		fi
 	fi
 	#fix multilib-script support. Bug #327449
-	sed -i "/^libdir/s:lib$:$(get_libdir)$:" librtmp/Makefile
-	if ! multilib_build_binaries; then
-		cd librtmp
+	sed -i "/^libdir/s:lib$:$(get_libdir)$:" librtmp/Makefile || die
+	if ! multilib_is_native_abi; then
+		cd librtmp || die
 	fi
 	emake CC="$(tc-getCC)" LD="$(tc-getLD)" \
 		OPT="${CFLAGS}" XLDFLAGS="${LDFLAGS}" CRYPTO="${crypto}" SYS=posix
 }
 
 multilib_src_install() {
-	mkdir -p "${ED}"/${DESTTREE}/$(get_libdir)
+	mkdir -p "${ED}"/${DESTTREE}/$(get_libdir) || die
 	if multilib_is_native_abi; then
 		dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html
 	else
-		cd librtmp
+		cd librtmp || die
 	fi
 	emake DESTDIR="${ED}" prefix="${DESTTREE}" mandir="${DESTTREE}/share/man" \
 		CRYPTO="${crypto}" install