From a2219917735019d5bf907d25053d54d7abc9de4a Mon Sep 17 00:00:00 2001 From: Tim Harder Date: Mon, 28 Nov 2011 02:04:25 +0000 Subject: [PATCH] Fix autotools-utils usage (bug #392185). Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64 --- media-sound/bristol/ChangeLog | 5 ++++- media-sound/bristol/Manifest | 18 +++++++++--------- media-sound/bristol/bristol-0.60.9.ebuild | 19 ++++++++++--------- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/media-sound/bristol/ChangeLog b/media-sound/bristol/ChangeLog index e8c6509be75c..81aa902cd26c 100644 --- a/media-sound/bristol/ChangeLog +++ b/media-sound/bristol/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-sound/bristol # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/bristol/ChangeLog,v 1.10 2011/11/27 06:05:02 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/bristol/ChangeLog,v 1.11 2011/11/28 02:04:25 radhermit Exp $ + + 28 Nov 2011; Tim Harder bristol-0.60.9.ebuild: + Fix autotools-utils usage (bug #392185). 27 Nov 2011; Tim Harder bristol-0.60.9.ebuild: Ignore currently installed versions (bug #390731 by suchtmonster). diff --git a/media-sound/bristol/Manifest b/media-sound/bristol/Manifest index a9b0da289884..9c3fb5d6b3eb 100644 --- a/media-sound/bristol/Manifest +++ b/media-sound/bristol/Manifest @@ -3,17 +3,17 @@ Hash: SHA512 AUX bristol-0.60.9-cflags.patch 553 RMD160 3d1cf412332ff3bd2a2b36a89d8088eada80d0fc SHA1 b28136d4935d9e3ff81305d7900e5dc59e9e0080 SHA256 1ea85c533865fe71147b7438b9e96a032d12309d06e0886bd6bf6fa8eb55eef0 DIST bristol-0.60.9.tar.gz 4323706 RMD160 c0e339ea363e7bf58b3f7217c9343ed76abbd878 SHA1 ff3163347d68ca35f0040076f1d1e4ba4cd7f3e9 SHA256 0f3e67a18ffeaadd0600facdb4e10437c855fd078ce26292f6f905aa96cd6cf6 -EBUILD bristol-0.60.9.ebuild 1131 RMD160 0e2b8329f7c025b962e3411e814e5907d286a6eb SHA1 253500eceaec4c004bae03fe70e46725badcdb84 SHA256 bbf250f830d78a4767515d3f4fd1e4d7d36e8870ea13fb3aa0b87481823087a4 -MISC ChangeLog 1881 RMD160 69f1e3b7fa942034ec1fddab18b0a7de74424ce1 SHA1 514c943b99baa55872c5d430edab5de3e9d804d8 SHA256 310720f0ed1c8131a11925a2ee47b370bd84458c9e87a6d9cf484647b2c86136 +EBUILD bristol-0.60.9.ebuild 1135 RMD160 c9c34b9785dc7566e276e71d17a89f30ddf66625 SHA1 f5437edb388403ff7ceaf685d49991ecca48c369 SHA256 216efaa4358a79c8006a137b82dedbf9f962befb47957669530e1f6170e1a81b +MISC ChangeLog 1997 RMD160 195e456228811a796c85d44d8ce68c9b2676eaeb SHA1 2ebbaf9921c4cb1671b023fab563e2816226f7d1 SHA256 bfccde169897cff6ba712462bbb873a20f553e76cb18d37764de828ced0412db MISC metadata.xml 426 RMD160 fb74ca8dcc43bc8f18a1aec06ece5e52d4a88c79 SHA1 0d0da5f955d037c7d2b51d6654e0ae780f3e43b3 SHA256 791aae49a8691dcd05c8d810785eb32b98e8fbae8689b1c66b32d3d838fd5ea5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBCgAGBQJO0dMUAAoJEEqz6FtPBkyjDkIH/iLP19viQ/bWj5goJTtcinYc -FveN5Z/5hyArzrxaZWvL1cUd4N1Sc2/dQj37ZMB5Jm2OYFAfqC3KMP0JdhjHBX18 -BhrrVtg30nHgLlqpf55ltTEj3qd3uNUAsH11K8v3Se1ahe3gf5wHti3l3tBKgMC5 -6OZSXsLNwggi+IbV/0g9Mb5RRPDR3ohpHfFUUY0m6YddGnbMQqhVJ9bH6ygSifY2 -E/ezamy9m6gwWB4St5qK6pKbYFnt4rI1HOfTCDl1kMCGyuEyfIquqXAZC+xMJE7V -x9xawxWt1/pkdT35dojxNRLSgbj24ue4AwSs4+3msN6muLrRZun2Woiy2CYn1Xg= -=bwgW +iQEcBAEBCgAGBQJO0uwvAAoJEEqz6FtPBkyj+DsIAJ1T5nePqZlKOLG4JVbQFe1B +0ADnFXyXmEzEJNbh2dULyGdd+bmg92xThUOrELVtFAx4p3EWg3BMUsZU0A7dhlsI +/iR8Hk1ffalayTNgb/PMhs5s8erfwDYxeLkfA6EVime5udBnf1vcrh59xUZGg7bp +wq5e8lOVWOTrpZca9B2oCXMadGjofxJqxD5vzacE8Gh2wt2GtRs7kCmYAewYC6Ke +/IIiETmEvQwdfTHJlQR3FCpU5thbkWKopilxLWMb61eHBRjUWRHpA2IoGbvPtAdj +c37lV5Jw3DDX4g/NpjbSSoPaNPdfGHf5Zi4lUix+rr5HPEmMcPgvoLaZ5usrpn0= +=kd9N -----END PGP SIGNATURE----- diff --git a/media-sound/bristol/bristol-0.60.9.ebuild b/media-sound/bristol/bristol-0.60.9.ebuild index af1da81eedca..b63f999c2916 100644 --- a/media-sound/bristol/bristol-0.60.9.ebuild +++ b/media-sound/bristol/bristol-0.60.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/bristol/bristol-0.60.9.ebuild,v 1.3 2011/11/27 06:05:02 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/bristol/bristol-0.60.9.ebuild,v 1.4 2011/11/28 02:04:25 radhermit Exp $ EAPI="4" @@ -27,18 +27,19 @@ DEPEND="${RDEPEND} DOCS=( AUTHORS ChangeLog HOWTO NEWS README ) -AUTOTOOLS_IN_SOURCE_BUILD=1 +PATCHES=( "${FILESDIR}"/${P}-cflags.patch ) src_prepare() { - epatch "${FILESDIR}"/${P}-cflags.patch + autotools-utils_src_prepare eautoreconf } src_configure() { - econf \ - --disable-version-check \ - $(use_enable alsa) \ - $(use_enable oss) \ - $(use_enable static-libs static) -# $(use_enable osc liblo) + myeconfargs=( + --disable-version-check + $(use_enable alsa) + $(use_enable oss) + #$(use_enable osc liblo) + ) + autotools-utils_src_configure } -- 2.26.2