Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 303663 - [qting-edge] PyQt4-4.7.1_pre2010020{4,5} fails to merge (dodoc ChangeLog and/or USE=phonon)
Summary: [qting-edge] PyQt4-4.7.1_pre2010020{4,5} fails to merge (dodoc ChangeLog and/...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: [OLD] Unspecified (show other bugs)
Hardware: All Linux
: High normal (vote)
Assignee: Qt Bug Alias
URL: http://github.com/gentoo-qt/qting-edg...
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-02-06 01:26 UTC by Ai Locke Shinseiko (Wizzleby)
Modified: 2010-02-07 20:08 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments
Patch to fix PyQt4-4.7.1_pre20100204.ebuild (PyQt4-4.7.1_pre20100204.ebuild.patch,600 bytes, patch)
2010-02-06 01:27 UTC, Ai Locke Shinseiko (Wizzleby)
Details | Diff
patch to fix PyQt4-4.7.1_pre20100205.ebuild (PyQt4-4.7.1_pre20100205.ebuild.patch,600 bytes, patch)
2010-02-06 01:29 UTC, Ai Locke Shinseiko (Wizzleby)
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Ai Locke Shinseiko (Wizzleby) 2010-02-06 01:26:44 UTC
This affects PyQt4-4.7.1_pre2010020{4,5} from qting-edge overlay:
regardless of USE flags, these packages fail to merge, dying at src_install because ChangeLog cannot be located. Removing ChangeLog from dodoc fixes this.

regardless of USE flags, PyQt4-4.7.1_pre20100205 fails to merge in src_prepare because PyQt4-4.7-fix-phonon-check.patch will not apply.

With USE=phonon, merge of PyQt4-4.7.1_pre20100204 fails in src_compile because of undefined phonon references. The culprit in this case is actually PyQt4-4.7-fix-phonon-check.patch as well. 

It changes 
check_module("phonon", "Phonon/VideoWidget",
to 
check_module("phonon", "phonon/videowidget.h",

I am unsure as to the reason for breakage, but leaving out the patch allows these versions to build with USE=phonon, and applying the patch causes breakage.
Comment 1 Ai Locke Shinseiko (Wizzleby) 2010-02-06 01:27:39 UTC
Created attachment 218609 [details, diff]
Patch to fix PyQt4-4.7.1_pre20100204.ebuild
Comment 2 Ai Locke Shinseiko (Wizzleby) 2010-02-06 01:29:20 UTC
Created attachment 218611 [details, diff]
patch to fix PyQt4-4.7.1_pre20100205.ebuild

this patch and the preceding one are the differences between the overlay versions (does not merge) and my local versions (works with USE=phonon, does not attempt to install absentee ChangeLog)
Comment 3 Markos Chandras (RETIRED) gentoo-dev 2010-02-07 12:24:35 UTC
This has been fixed a couple of days ago ( commit 3bd81f51736df8af7086cd7d12a198896e199c06 )

Try rebuild those packages 

Thanks
Comment 4 Ai Locke Shinseiko (Wizzleby) 2010-02-07 20:08:52 UTC
(In reply to comment #3)
> This has been fixed a couple of days ago ( commit
> 3bd81f51736df8af7086cd7d12a198896e199c06 )
> 
> Try rebuild those packages 
> 
> Thanks
> 

yup, the committed fix works.
I noticed it and rebuild the day that the fix-phonon-patch was deleted from the overlay. It does indeed rebuild and install properly now.