mgorny 15/02/11 22:34:21
Modified: rtmpdump-2.4_p20131018.ebuild rtmpdump-9999.ebuild
ChangeLog
Log:
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.
(Portage version: 2.2.16/cvs/Linux x86_64, signed Manifest commit with key
EFB4464E!)
Revision Changes Path
1.10 media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild?rev=1.10&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild?rev=1.10&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild?r1=1.9&r2=1.10
Index: rtmpdump-2.4_p20131018.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rtmpdump-2.4_p20131018.ebuild 4 Jul 2014 19:29:19 -0000 1.9
+++ rtmpdump-2.4_p20131018.ebuild 11 Feb 2015 22:34:21 -0000 1.10
@@ -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 @@
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 @@
src_unpack() {
mkdir -p "${S}" || die "Can't create source directory"
- cd "${S}"
+ cd "${S}" || die
unpack ${A}
}
@@ -59,20 +59,20 @@
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
1.7 media-video/rtmpdump/rtmpdump-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/rtmpdump/rtmpdump-9999.ebuild?rev=1.7&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/rtmpdump/rtmpdump-9999.ebuild?rev=1.7&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/rtmpdump/rtmpdump-9999.ebuild?r1=1.6&r2=1.7
Index: rtmpdump-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/rtmpdump/rtmpdump-9999.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rtmpdump-9999.ebuild 18 Jun 2014 20:30:38 -0000 1.6
+++ rtmpdump-9999.ebuild 11 Feb 2015 22:34:21 -0000 1.7
@@ -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 @@
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 @@
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
1.35 media-video/rtmpdump/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/rtmpdump/ChangeLog?rev=1.35&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/rtmpdump/ChangeLog?rev=1.35&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/rtmpdump/ChangeLog?r1=1.34&r2=1.35
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/rtmpdump/ChangeLog,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ChangeLog 4 Jul 2014 19:29:19 -0000 1.34
+++ ChangeLog 11 Feb 2015 22:34:21 -0000 1.35
@@ -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 <[email protected]> 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 <[email protected]> rtmpdump-2.4_p20131018.ebuild:
Fix quoted ${A}.
