diff options
| author |   Luca Barbato <lu_zero@gentoo.org> | 2013-12-30 14:36:38 +0000 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-12-30 14:36:38 +0000 |
| commit | 75411518cde061acdfdb45505151570469c6c204 (patch) | |
| tree | 14e341de768de59ecf1f46d8a233f526614f2619 /media-video | |
| parent | Drop old (diff) | |
| download | gentoo-2-75411518cde061acdfdb45505151570469c6c204.tar.gz gentoo-2-75411518cde061acdfdb45505151570469c6c204.tar.bz2 gentoo-2-75411518cde061acdfdb45505151570469c6c204.zip | |
Multilib support update
(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/libav/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/libav/libav-0.8.9-r1.ebuild | 30 |
2 files changed, 17 insertions, 18 deletions
diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog index 4d09ed1c38f5..b070e54eb86e 100644 --- a/media-video/libav/ChangeLog +++ b/media-video/libav/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-video/libav # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.174 2013/12/20 02:43:08 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.175 2013/12/30 14:36:38 lu_zero Exp $ + + 30 Dec 2013; Luca Barbato <lu_zero@gentoo.org> libav-0.8.9-r1.ebuild: + Multilib support update 20 Dec 2013; Patrick Lauer <patrick@gentoo.org> libav-10_alpha1.ebuild: Whitespace diff --git a/media-video/libav/libav-0.8.9-r1.ebuild b/media-video/libav/libav-0.8.9-r1.ebuild index 1d336699a84e..41bcf3bb17e7 100644 --- a/media-video/libav/libav-0.8.9-r1.ebuild +++ b/media-video/libav/libav-0.8.9-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.9-r1.ebuild,v 1.1 2013/11/03 14:56:42 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.9-r1.ebuild,v 1.2 2013/12/30 14:36:38 lu_zero Exp $ EAPI=5 @@ -269,8 +269,7 @@ multilib_src_configure() { fi fi - cd "${S}" - ./configure \ + "${S}"/configure \ --prefix="${EPREFIX}"/usr \ --libdir="${EPREFIX}"/usr/$(get_libdir) \ --shlibdir="${EPREFIX}"/usr/$(get_libdir) \ @@ -284,7 +283,7 @@ multilib_src_configure() { MAKEOPTS+=" V=1" } -src_compile() { +multilib_src_compile() { emake if use qt-faststart; then @@ -295,20 +294,17 @@ src_compile() { multilib_src_install() { emake DESTDIR="${D}" install-libs - rm -f "${ED}"/usr/$(get_libdir)/*.so -} - -src_install() { - emake DESTDIR="${D}" install install-man - - dodoc Changelog README INSTALL doc/*.txt - use doc && dodoc doc/*.html - - use qt-faststart && dobin tools/qt-faststart + if multilib_is_native_abi; then + emake DESTDIR="${D}" install install-man + use qt-faststart && dobin tools/qt-faststart - for i in $(usex sdl avplay "") $(usex network avserver "") avprobe; do - dosym ${i} /usr/bin/${i/av/ff} - done + for i in $(usex sdl avplay "") $(usex network avserver "") avprobe; do + dosym ${i} /usr/bin/${i/av/ff} + done + cd "${S}" + dodoc Changelog README INSTALL doc/*.txt + use doc && dodoc doc/*.html + fi } pkg_postinst() { |