A 2nd diff between my 2nd modified ebuild, and the new, slightly broken intree ebuild

opera-diff2 (text/plain), 2.72 KB, created by Kyle Elbert on 2008-06-24 16:20:31 UTC

3c3                                                                            
< # $Header: 
/var/cvsroot/gentoo-x86/www-client/opera/opera-9.50-r1.ebuild,v 1.3 
2008/06/24 00:38:48 jer Exp $                                                  
---                                                                             
> # $Header: 
/var/cvsroot/gentoo-x86/www-client/opera/opera-9.50.ebuild,v 1.7 
2008/06/13 15:34:40 ken69267 Exp $                                                
14c14                                                                           
< KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"                                         
---                                                                             
> KEYWORDS="amd64 ppc x86 ~x86-fbsd"                                            
18c18                                                                           
< IUSE="elibc_FreeBSD gnome ia32 qt-static spell"                               
---                                                                             
> IUSE="elibc_FreeBSD gnome qt-static spell ia32"                               
31,32c31,35                                                                     
<       amd64? (                                                                
<               ia32? ( 
${O_URI}linux${O_FTP}i386/shared/${P}.gcc4-shared-qt3.i386.tar.bz2 )                                                                    
---                                                                             
>       amd64? (                                                                
>               ia32? (
>                               qt-static? ( 
${O_URI}linux${O_FTP}i386/${P}.gcc4-qt4.i386.tar.bz2 )
>                               !qt-static? ( 
${O_URI}linux${O_FTP}i386/shared/${P}.gcc4-shared-qt3.i386.tar.bz2 )
>                        )
60,63c63,70
<       !qt-static? ( =x11-libs/qt-3* )
<       amd64? ( =x11-libs/qt-3*
<                        ia32? ( app-emulation/emul-linux-x86-qtlibs )
<       )
---
>       x86? (
>               !qt-static? ( =x11-libs/qt-3* )
>               )
>       amd64? (
>                       !ia32? ( =x11-libs/qt-3* )
>                       ia32? (
>                               !qt-static? ( 
app-emulation/emul-linux-x86-qtlibs )
>                               )
69,75c76
<       if use amd64; then
<               if use ia32; then
<                       
S="${WORKDIR}/${P}-${O_SUFF}.gcc4-shared-qt3.i386"
<               else
<                       
S="${WORKDIR}/${P}-${O_SUFF}.gcc4-shared-qt3.x86_64"
<               fi
<       fi
---
>       use amd64 && 
S="${WORKDIR}/${P}-${O_SUFF}.gcc4-shared-qt3.x86_64"
78c79
<       if use x86; then
---
>       if use x86 || use ia32; then