From 0e0de2f89802a811ee18923dbb7efd744168b117 Mon Sep 17 00:00:00 2001 From: Tim Harder Date: Mon, 28 Nov 2011 03:26:54 +0000 Subject: [PATCH] Fix autotools-utils usage (bug #392147). Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64 --- media-libs/libfame/ChangeLog | 5 ++++- media-libs/libfame/Manifest | 18 +++++++++--------- media-libs/libfame/libfame-0.9.1-r1.ebuild | 22 ++++++++++------------ 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/media-libs/libfame/ChangeLog b/media-libs/libfame/ChangeLog index 79218b62f500..cf4e293a1c98 100644 --- a/media-libs/libfame/ChangeLog +++ b/media-libs/libfame/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/libfame # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/ChangeLog,v 1.55 2011/11/27 04:05:21 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/ChangeLog,v 1.56 2011/11/28 03:26:54 radhermit Exp $ + + 28 Nov 2011; Tim Harder libfame-0.9.1-r1.ebuild: + Fix autotools-utils usage (bug #392147). 27 Nov 2011; Tim Harder libfame-0.9.1-r1.ebuild: Build in the source tree. diff --git a/media-libs/libfame/Manifest b/media-libs/libfame/Manifest index a0c304c63d5d..e0fb768ec6dc 100644 --- a/media-libs/libfame/Manifest +++ b/media-libs/libfame/Manifest @@ -4,17 +4,17 @@ Hash: SHA512 AUX libfame-0.9.1-gcc43.patch 1190 RMD160 d0ff369d2a4ef99f544f248589eecb0b08c9a996 SHA1 4b52f798b94d29762c74f186cbd95d391212a407 SHA256 383799415714250e2cfd4ff2ab8ff94ce30939ad198c54e15d4179d60f8a5083 DIST libfame-0.9.1.tar.gz 296837 RMD160 04a31af52159619676fc4214d768e7ae3394687f SHA1 2b3c04f8be5ab715cda2bb6aef847e7d2d4709ee SHA256 7b2c5b883db98e99476ae07bbf4f3aa91615e74a4d7fc918cb79154dd4fc08e1 DIST libfame-patches-2.tar.bz2 5324 RMD160 9447a9d2c4aa09c8c984bef3d8a9e08ecbde81cc SHA1 2e112412abe6bd7dea1c31cfe196042deed8ecc3 SHA256 abe183ef106198c0023de087a4597a5ef3b2784a456b14509c2c235d50d56a9e -EBUILD libfame-0.9.1-r1.ebuild 978 RMD160 b3f416d74e132fd6eea690029e6acc01adfbe25e SHA1 fd5501687bb5469be5102630d0947f5c448b60e1 SHA256 6684f98abb1bb8f455ed81e1c6aef6ab438ae75e9ecb828003c75fbfbc0ea441 -MISC ChangeLog 6421 RMD160 a06b71309e02933a43f1870a244d6cb3220e9992 SHA1 4308c928fc1ec318ad1342f65c2dba728bc524aa SHA256 0f7e6928a9c0dd06661d4c7d1c2585918685fe1015df4401bdea69b39e780e64 +EBUILD libfame-0.9.1-r1.ebuild 978 RMD160 ca692a34244ea9d57dc83a3f03f5a3c5f6465c66 SHA1 ddef6fcf90beb39582ee4767457927860124cd55 SHA256 bebe444c7531747523902ff46e513287e93a156d3d8bfbc0e74cf5a27cbbc712 +MISC ChangeLog 6539 RMD160 fa768dafa04f5b7dc0eac71da06ad6f0a14be2f8 SHA1 8e0eee78116ad556b31fe5b940552a3f4156cf6c SHA256 7ecf702ff5b7f5450b217d9f08976ffeaa0c8280d48183633ff29fc3561af169 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBCgAGBQJO0bcGAAoJEEqz6FtPBkyjPhwIAKC+7OOWBs/D4w2FKT66CPDh -YacX+dZt2vmodN7VB9SMyNH1K6lNPUQxdW6CtYXBvsOO40Iyg0gm4K+EjaG0w1/8 -IfGXYz5O2W+IT11e11FFkBV9m0/yA9K6sOLyuG6VeOZyhKQ00UUC8rgDPNHNvZf7 -WaAzYRo6hXpV51DVEIYGRpixaPcFhBWGyP2Lvb2HRqilZiCSTN7aDqu0ryLrkCOZ -zG7N8MlUJvuSIS0uRW/oWqH6IwDXQIpwiaUaK5HoM0A0ZChl9PaAVX33L/O/5JOC -I89w1x+/rvcfEokZ0OMHJen0RmgrVkjzEOgYCxvGazl5+dxf+SfQnSqPbehW2VE= -=tioh +iQEcBAEBCgAGBQJO0v+EAAoJEEqz6FtPBkyjjUEIAKqPJN+x950hYv5VRNpjE/NE +o8BIXJ1ZI4qRAKbKczfoM++82ZgbwOBI3G0JIMndB6XDfXmYHz/88Janef6gx+qf +MzAVDFqCd6HtqoO0QxSFL9kGQ/Tlh4ZvHtkDCQDq5IKAOvcgim5Kuz5EUc+vk4/k +u/VPKs/xDdR6pdPRdSp+T0cb5kmao7Imp1fz9GmOwY1BQ0a9gvSJUdT2TnWMJEu0 +i8JnLrw2pT2S3xQNHXDg/x4Tr+btBjIPHQlIgv4EWwKMw+qA+iGGkPLu4mJE9Wrn +A90+QuUGI0It+7Cf4qF59s5Rr9ffLPmBwjRPrsGT0KJ2OBeXcgGIZ4pUMDCG7Lo= +=WIjy -----END PGP SIGNATURE----- diff --git a/media-libs/libfame/libfame-0.9.1-r1.ebuild b/media-libs/libfame/libfame-0.9.1-r1.ebuild index 6a68ec811071..fa95d69590f4 100644 --- a/media-libs/libfame/libfame-0.9.1-r1.ebuild +++ b/media-libs/libfame/libfame-0.9.1-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/libfame-0.9.1-r1.ebuild,v 1.29 2011/11/27 04:05:21 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/libfame-0.9.1-r1.ebuild,v 1.30 2011/11/28 03:26:54 radhermit Exp $ EAPI=4 -inherit eutils autotools-utils +inherit autotools-utils PATCHLEVEL="2" DESCRIPTION="MPEG-1 and MPEG-4 video encoding library" @@ -17,23 +17,21 @@ SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86" IUSE="mmx static-libs" -AUTOTOOLS_IN_SOURCE_BUILD=1 +PATCHES=( "${FILESDIR}"/${P}-gcc43.patch ) + +DOCS=( AUTHORS BUGS CHANGES README TODO ) src_prepare() { EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/${PV} # Do not add -march=i586, bug #41770. sed -i -e 's:-march=i[345]86 ::g' configure - epatch "${FILESDIR}/${P}-gcc43.patch" + autotools-utils_src_prepare } src_configure() { - econf \ - $(use_enable mmx) \ - $(use_enable static-libs static) -} - -src_install() { - default - remove_libtool_files + local myeconfargs=( + $(use_enable mmx) + ) + autotools-utils_src_configure } -- 2.26.2