diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2011-05-01 12:04:01 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2011-05-01 12:04:01 +0000 |
| commit | 83dc8e7d0789075199b93639fc76d0a1a28fd138 (patch) | |
| tree | b3b7f1f26befc8ed73a55e04ae26fa44ae432fde /media-sound/ardour | |
| parent | ppc/ppc64 stable wrt #365323 (diff) | |
| download | historical-83dc8e7d0789075199b93639fc76d0a1a28fd138.tar.gz historical-83dc8e7d0789075199b93639fc76d0a1a28fd138.tar.bz2 historical-83dc8e7d0789075199b93639fc76d0a1a28fd138.zip | |
Conditionally apply the gcc-4.6 patch (bug #365437).
Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64
Diffstat (limited to 'media-sound/ardour')
| -rw-r--r-- | media-sound/ardour/ChangeLog | 5 | ||||
| -rw-r--r-- | media-sound/ardour/Manifest | 18 | ||||
| -rw-r--r-- | media-sound/ardour/ardour-2.8.11-r1.ebuild | 9 |
3 files changed, 19 insertions, 13 deletions
diff --git a/media-sound/ardour/ChangeLog b/media-sound/ardour/ChangeLog index f9735a7c5864..dffa98b797c5 100644 --- a/media-sound/ardour/ChangeLog +++ b/media-sound/ardour/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-sound/ardour # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.93 2011/04/30 19:53:52 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.94 2011/05/01 12:04:01 radhermit Exp $ + + 01 May 2011; Tim Harder <radhermit@gentoo.org> ardour-2.8.11-r1.ebuild: + Conditionally apply the gcc-4.6 patch (bug #365437). *ardour-2.8.11-r1 (30 Apr 2011) diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest index 3e9bf9d81d2d..34953494dbce 100644 --- a/media-sound/ardour/Manifest +++ b/media-sound/ardour/Manifest @@ -7,17 +7,17 @@ AUX ardour-2.8.11-ldpath.patch 1374 RMD160 8fd64a2b9ada4199c4a54725010160a371d60 AUX ardour-2.8.11-syslibs.patch 3855 RMD160 38cc2928697d2d3b55a1fa725d401571fc78a0ff SHA1 0eface5e152ecc4913b0e1d28fb22f0804c2919c SHA256 2d528d26fec29288ccb130eadda8816c781b921d922b7d948791b407623154ef AUX ardour-2.8.11-type.patch 311 RMD160 a9305313e02f26be3433396b10c9f58d92bb9133 SHA1 8d23326758377229df2194a3e1cb8ea84477c2c9 SHA256 53dc7f5066cfe51c3a390e0c902d6d4590b07d49a20630be105e20c10fece24d DIST ardour-2.8.11.tar.bz2 3322518 RMD160 e3567d1f5b8d0eb230b86951b7b8653b4344bff8 SHA1 e04f0d9aacd929565386f8027807d881bdf8fca6 SHA256 6a743f42b795bb66179dd467c9b8e417e99d38fa915159155dd582709b563b73 -EBUILD ardour-2.8.11-r1.ebuild 2042 RMD160 21afb48db78075075da7f4bf6efb5d36af1265c3 SHA1 6b4fde9a46274d4f9bb031c892830568f8a376a2 SHA256 abf4d65196e596b30dcf4e18ec7049ff9111203ab80be04270a7dd9e830fa5e6 -MISC ChangeLog 14914 RMD160 eb13ebcad4f31960b66e1210c24fe7212b21e7d9 SHA1 48e8475434c921c72693fbde539dab4096a3e41b SHA256 b2d6878fca1d5afa29a272781b666775bb7720680039185e55e5f6a65eedb010 +EBUILD ardour-2.8.11-r1.ebuild 2127 RMD160 00ac467793bffa1ac520e500e4de92bde6d97c41 SHA1 80f76ce509c52ffa53dd3f77d600aa772fb25d4d SHA256 733ae402de100f396095288f2f4634bc378e6300298bb92b57b0565da4e7c715 +MISC ChangeLog 15044 RMD160 85d128b4f22440e0671b64cb273756cdf6fae62e SHA1 08ba6ae4d5040780c84cad11cc065ee3d2b146ea SHA256 7bc013050fc32968f462c229734a4b5a4462bbe06753e54af0a97baba9cda8f7 MISC metadata.xml 234 RMD160 afe6939b1787409c4946aa2fad554d1eb9edfc66 SHA1 91fd230154e1eb9712e8345f24cf3595a247b3a0 SHA256 20428aad08fee2f7a7507f1b456c7ee3ebccd0eba59b90bd70d78b972d2b0799 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQEcBAEBAgAGBQJNvGjaAAoJEEqz6FtPBkyjOzkIAKv4ESfaKuJaUbwn4TfbEGLZ -sH0AzWz1SWoFZLARffwnIKJ35/IyfuRSqTcU25KoKOaB1CP5X38iKXbc4hGnMsMh -HCEOn6WLDUcfi7lKH2DpJYUpCpaE7Kyl1HdwAvBcmFPk9Q/OC7/T2y67iGcsXp5j -bcIMCiYjuH11NavxX56EhoG02LZYf3TCqL+aC8K/byR9BCxUFkO9D1SnA9vfexWV -/yNLPeLj1jrO9TNgDeiMobKgOImQzkPyWZud8mQuyUGGmlZK7eYI7d/H0gQ6bARY -nK7/ju3RZbFtXMKRRGKCZx1GLoiQqG+aywQ/JSYIP+GFhrLBPgJV44QgmpTXSQo= -=kVyJ +iQEcBAEBAgAGBQJNvUxFAAoJEEqz6FtPBkyjcQMH/RMJpoZ4nPzLqmTArfG3CLly +lIp7268Bz9Q7yqlPlOC2+Iy2FW+UGyFvPJEawkEI62U0GTnjSIefsPclVGG1PAy+ +iHrjnrDNxUqL+iL9ePInZUQMeaSVn428au/kjoIZXDnkkiFdrct6B/WkO/Jks3jq +mJHQgSNsnM2tPhXn1rZVR/UZiylK9cC9NtANqUhyIrePcH/zP4KHJG2pGQkb/TjF +8FAex72PtIEv6Ot88N5BjgdIQqGqft/FuburZzf/xy/sgmrlHHjGHAxZVKAjX/7j +8U5uR7DPHDpIm6z1kDesg9AAt/LOqIAS6Pb7xB1IGumJbsupAFLDmA4pzzVqjZI= +=ZqMh -----END PGP SIGNATURE----- diff --git a/media-sound/ardour/ardour-2.8.11-r1.ebuild b/media-sound/ardour/ardour-2.8.11-r1.ebuild index e1e1d2671cc6..f75398ff9935 100644 --- a/media-sound/ardour/ardour-2.8.11-r1.ebuild +++ b/media-sound/ardour/ardour-2.8.11-r1.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/ardour/ardour-2.8.11-r1.ebuild,v 1.1 2011/04/30 19:53:52 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-2.8.11-r1.ebuild,v 1.2 2011/05/01 12:04:01 radhermit Exp $ EAPI=4 @@ -53,8 +53,11 @@ src_prepare() { epatch "${FILESDIR}"/${P}-flags.patch \ "${FILESDIR}"/${P}-syslibs.patch \ "${FILESDIR}"/${P}-type.patch \ - "${FILESDIR}"/${P}-ldpath.patch \ - "${FILESDIR}"/${P}-gcc46.patch + "${FILESDIR}"/${P}-ldpath.patch + + if [[ ($(gcc-major-version) -eq 4 && $(gcc-minor-version) -ge 6) ]]; then + epatch "${FILESDIR}"/${P}-gcc46.patch + fi } src_compile() { |