Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 563312 - [qt overlay] dev-qt/qt-creator-9999 src_unpack doesn't call git-r3_src_unpack
Summary: [qt overlay] dev-qt/qt-creator-9999 src_unpack doesn't call git-r3_src_unpack
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Davide Pesavento
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2015-10-17 12:42 UTC by Ben Kohler
Modified: 2015-10-18 01:53 UTC (History)
2 users (show)

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


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Ben Kohler gentoo-dev 2015-10-17 12:42:38 UTC
There is conditional code in all qt-creator ebuilds to inherit git-r3 for *9999 live ebuilds, but the (relatively recently added) src_unpack function does not have special code for *9999 versions.  

The "default" call there calls the PM-default unpack for all versions, and since qt-creator-9999.ebuild has SRC_URI="", nothing at all gets unpacked.  9999 versions need to call git-r3_src_unpack rather than default.

I believe this patch should give the intended result:

--- qt-creator-9999.ebuild      2015-10-17 06:40:55.614668181 -0500
+++ qt-creator-9999.ebuild.new  2015-10-17 06:57:03.168163412 -0500
@@ -85,8 +85,12 @@
                eerror "GCC version 4.7 or later is required to build Qt Creator"
                die "GCC >= 4.7 required"
        fi
-
-       default
+
+       if [[ ${PV} == *9999 ]]; then
+               git-r3_src_unpack
+       else
+               default
+       fi
 }
 
 src_prepare() {
Comment 1 Davide Pesavento (RETIRED) gentoo-dev 2015-10-17 14:15:54 UTC
...therefore this matters only for -9999 in qt overlay.
Comment 2 Ben Kohler gentoo-dev 2015-10-17 14:23:52 UTC
I didn't mean to blow it out of proportion, but if you only make the change in qt overlay then it's going to be undone again next time you "dev-qt/qt-creator: sync with gentoo.git"

I assumed you want to keep all ebuild in sync so the change would be done in tree as well
Comment 3 Ben Kohler gentoo-dev 2015-10-17 14:28:23 UTC
But I have no problem with the summary change-- only 9999::qt is broken, but the change will probably be applied to all ebuilds with the shared 9999 conditional code
Comment 4 Davide Pesavento (RETIRED) gentoo-dev 2015-10-17 16:06:55 UTC
(In reply to Ben Kohler from comment #2)
> I didn't mean to blow it out of proportion, but if you only make the change
> in qt overlay then it's going to be undone again next time you
> "dev-qt/qt-creator: sync with gentoo.git"

"sync" doesn't mean "blindly copy"... it's more like a two-way merge :)

> I assumed you want to keep all ebuild in sync so the change would be done in
> tree as well

correct
Comment 5 Davide Pesavento (RETIRED) gentoo-dev 2015-10-18 01:53:55 UTC
Fixed in 3.5.1 and 9999