Don't apply both 237 and 240 when using gcc 3.3, better safe than sorry.

Package-Manager: portage-2.1_rc4

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index c028f593fb460f87b3dc080b9c583d9b4c0e0a55..bea836316dc791c69aa140f21e7e2393810ea5d4 100644 (file)
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.362 2006/06/07 19:25:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.363 2006/06/07 20:54:29 flameeyes Exp $
+
+  07 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
+  xine-lib-1.1.2_pre20060328-r11.ebuild:
+  Don't apply both 237 and 240 when using gcc 3.3, better safe than sorry.
 
   07 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
   xine-lib-1.1.2_pre20060606.ebuild:

diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 9681c33d9410741b7f2402eb605978cbe900782d..b02dc6e085fed85ec09e1c0d3c0ea5a1d4fe301d 100644 (file)
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -12,10 +12,10 @@ EBUILD xine-lib-1.1.1-r3.ebuild 7232 RMD160 6a7024dedd3646e054cbe2731af58eed8013
 MD5 578712f99de216da48aefcc69567dcf1 xine-lib-1.1.1-r3.ebuild 7232
 RMD160 6a7024dedd3646e054cbe2731af58eed8013e9bd xine-lib-1.1.1-r3.ebuild 7232
 SHA256 1a281ed1ce771661ae909ecfe5de3e83e8fe5be6b93ed1ebc07b59227301cc25 xine-lib-1.1.1-r3.ebuild 7232
-EBUILD xine-lib-1.1.2_pre20060328-r11.ebuild 7413 RMD160 839cb18c815b2415a9019d51c86181e401837a84 SHA1 ad8d98b39aa83d55f3489507a867790978d3fb92 SHA256 c828232801174bff9646211ef4881e53b344865b99b5901a782c983ab2033247
-MD5 4b91045bd8a4adf4f25901eeac7891ca xine-lib-1.1.2_pre20060328-r11.ebuild 7413
-RMD160 839cb18c815b2415a9019d51c86181e401837a84 xine-lib-1.1.2_pre20060328-r11.ebuild 7413
-SHA256 c828232801174bff9646211ef4881e53b344865b99b5901a782c983ab2033247 xine-lib-1.1.2_pre20060328-r11.ebuild 7413
+EBUILD xine-lib-1.1.2_pre20060328-r11.ebuild 7541 RMD160 db9007a6ed06df494459497fcb596867713a45b1 SHA1 c21988d0d6735da6f34d4d169851e3ee608ad117 SHA256 57f60bf081fbbce6ccd654bcefd1781d8b0b54a81d214685fbc5846235d67902
+MD5 f27fdb3af7029f61f6ea0ea20517bfd0 xine-lib-1.1.2_pre20060328-r11.ebuild 7541
+RMD160 db9007a6ed06df494459497fcb596867713a45b1 xine-lib-1.1.2_pre20060328-r11.ebuild 7541
+SHA256 57f60bf081fbbce6ccd654bcefd1781d8b0b54a81d214685fbc5846235d67902 xine-lib-1.1.2_pre20060328-r11.ebuild 7541
 EBUILD xine-lib-1.1.2_pre20060328-r9.ebuild 7407 RMD160 83b13a9259130e561393405d494af52777f8b377 SHA1 79b2d38e00913935d3a6c398f010bc50a46cabd8 SHA256 61bcc856a900fe0c1bbbc9e561d35fe7fd610c9141a534301a58b58cd4a35a63
 MD5 b4b3e1fbb76fef104d82fbfd365f3054 xine-lib-1.1.2_pre20060328-r9.ebuild 7407
 RMD160 83b13a9259130e561393405d494af52777f8b377 xine-lib-1.1.2_pre20060328-r9.ebuild 7407
@@ -24,10 +24,10 @@ EBUILD xine-lib-1.1.2_pre20060606.ebuild 7646 RMD160 be0451d14df56b77d387be22724
 MD5 9add35e52cd4538a70c156da3cd791b4 xine-lib-1.1.2_pre20060606.ebuild 7646
 RMD160 be0451d14df56b77d387be22724d4f4f2ecb143b xine-lib-1.1.2_pre20060606.ebuild 7646
 SHA256 174201f0c819ba9755dea3b40e5581f0711cd6741898edb73c6237632d36593c xine-lib-1.1.2_pre20060606.ebuild 7646
-MISC ChangeLog 32820 RMD160 d3dc66a79d2b9d20082187ba57971b394a6836f0 SHA1 4a15babfdb5b6fbd22c41414b8ecdf10ba64d8a5 SHA256 3ad9f0050701417678ac3c6282b64cc4184e7e090cf9b3f99b2299721b68faf1
-MD5 626c6ceead66ca208249246e4168f6fc ChangeLog 32820
-RMD160 d3dc66a79d2b9d20082187ba57971b394a6836f0 ChangeLog 32820
-SHA256 3ad9f0050701417678ac3c6282b64cc4184e7e090cf9b3f99b2299721b68faf1 ChangeLog 32820
+MISC ChangeLog 32990 RMD160 4e37796008a171e86eec01d7174a4c534802def3 SHA1 747f96162c05e7cc712403af50bce6cd91f505ce SHA256 209fa6b3d200e9f94f1411a5de215b375726e678206d437e9ab3777e503b1766
+MD5 5441612c56eabc8fbedc71fc4feec2e7 ChangeLog 32990
+RMD160 4e37796008a171e86eec01d7174a4c534802def3 ChangeLog 32990
+SHA256 209fa6b3d200e9f94f1411a5de215b375726e678206d437e9ab3777e503b1766 ChangeLog 32990
 MISC metadata.xml 330 RMD160 19830d3a2049c3ad75c580173d0436d7ec9dc8f2 SHA1 6e47671ad5629f45f8bba068ae87a7b27b4c9750 SHA256 b36ce82ff9c321a5ed63eded0c3a191e78752cd38220b86bd8639a0d70ac9d92
 MD5 40462be9f1caff6326630fc3b93e7105 metadata.xml 330
 RMD160 19830d3a2049c3ad75c580173d0436d7ec9dc8f2 metadata.xml 330
@@ -47,7 +47,7 @@ SHA256 3cefb741c82eb3fabd124fb34d4264b1189ff53afa8f9ef3d809d5232394dd85 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEhygjAiZjviIA2XgRAizjAKCjtzwfyS3VfhHTvExgE8l4S3J6bACg5juV
-7yTDmH0C+JWjvGgGOG8lcOk=
-=WRiP
+iD8DBQFEhz0MAiZjviIA2XgRAifSAJ43CAEb+6VE/QfrwNqto2X/C/N9WACgqo58
+zCWLbFYe1eEkrDzANxUzjTA=
+=Rvix
 -----END PGP SIGNATURE-----

diff --git a/media-libs/xine-lib/xine-lib-1.1.2_pre20060328-r11.ebuild b/media-libs/xine-lib/xine-lib-1.1.2_pre20060328-r11.ebuild
index eef893cd448d2cc1cf0d664bd4adc63171002a55..3a6bb042f3bb7985332856a6383c95d9b30f28e9 100644 (file)
--- a/media-libs/xine-lib/xine-lib-1.1.2_pre20060328-r11.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.2_pre20060328-r11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.2_pre20060328-r11.ebuild,v 1.4 2006/06/07 13:54:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.2_pre20060328-r11.ebuild,v 1.5 2006/06/07 20:54:29 flameeyes Exp $
 
 inherit eutils flag-o-matic toolchain-funcs libtool autotools
 
@@ -95,6 +95,9 @@ src_unpack() {
        unpack ${A}
        cd "${S}"
 
+       [[ -z $(test-flags -fvisibility=hidden) ]] && \
+               export EPATCH_EXCLUDE="237_all_visibility.patch 240_all_constplugins.patch"
+
        EPATCH_SUFFIX="patch" epatch ${WORKDIR}/patches
 
        # ffmpeg doesn'g use libtool, so the condition for PIC code