Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 440932 - media-gfx/argyllcms-1.4.0 and media-gfx/dispcalgui-0.9.9.1 have a merge conflict on Gentoo stable
Summary: media-gfx/argyllcms-1.4.0 and media-gfx/dispcalgui-0.9.9.1 have a merge confl...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Marios Andreopoulos
URL:
Whiteboard:
Keywords: REGRESSION
: 445024 (view as bug list)
Depends on:
Blocks:
 
Reported: 2012-11-02 11:49 UTC by Richard Yao (RETIRED)
Modified: 2013-01-05 15:42 UTC (History)
4 users (show)

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


Attachments
media-gfx/argyllcms-1.4.0 failure log (build.log,31.39 KB, text/plain)
2012-11-02 11:51 UTC, Richard Yao (RETIRED)
Details
dispcalGUI 0.9.9.1 fixed ebuild (dispcalgui-0.9.9.1-r1.ebuild,2.17 KB, text/plain)
2012-11-02 14:41 UTC, Marios Andreopoulos
Details
dispcalGUI 1.1.0.0 fixed ebuild (dispcalgui-1.1.0.0-r1.ebuild,2.45 KB, text/plain)
2012-11-02 14:43 UTC, Marios Andreopoulos
Details
dispcalGUI 1.1.2.1 ebuild (dispcalgui-1.1.2.1-r1.ebuild,2.45 KB, text/plain)
2012-11-02 14:47 UTC, Marios Andreopoulos
Details
dispcalGUI 0.9.9.1 updated ebuild (dispcalgui-0.9.9.1-r1.ebuild,1.91 KB, text/plain)
2012-11-02 15:07 UTC, Marios Andreopoulos
Details
dispcalGUI 1.1.0.0 updated ebuild (dispcalgui-1.1.0.0-r1.ebuild,2.20 KB, text/plain)
2012-11-02 15:08 UTC, Marios Andreopoulos
Details
dispcalGUI 1.1.2.1 updated ebuild (dispcalgui-1.1.2.1.ebuild,2.20 KB, text/plain)
2012-11-02 15:09 UTC, Marios Andreopoulos
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Richard Yao (RETIRED) gentoo-dev 2012-11-02 11:49:50 UTC
Both media-gfx/argyllcms-1.4.0 and media-gfx/dispcalgui-0.9.9.1 install /lib/udev/rules.d/55-Argyll.rules. This results in a merge conflict on Gentoo stable.
Comment 1 Richard Yao (RETIRED) gentoo-dev 2012-11-02 11:51:53 UTC
Created attachment 328056 [details]
media-gfx/argyllcms-1.4.0 failure log
Comment 2 Markos Chandras (RETIRED) gentoo-dev 2012-11-02 12:36:59 UTC
Ugh that is ugly

Probably need to remove the file from dispcalgui in src_prepare or whatever. Let argyllcms install the udev rules instead.

Marios what do you think?
Comment 3 Marios Andreopoulos 2012-11-02 14:05:19 UTC
I am on it.

Since argyllcms is a dependency of dispcalgui and a diff between the 2 rules files doesn't show any differences, I think we can safely remove it from the dispcalgui ebuild.

I will attach fixed ebuilds for both stable and testing arches in a bit.



What is funny, is that on my computer, argyllcms installs its rules in /usr/lib/udev/rules.d while dispcalgui installs its rules in /lib/udev/rules.d.
Comment 4 Markos Chandras (RETIRED) gentoo-dev 2012-11-02 14:08:05 UTC
Maybe this is due to the recent udev.eclass changes?
Comment 5 Marios Andreopoulos 2012-11-02 14:36:06 UTC
> Maybe this is due to the recent udev.eclass changes?
I don't know but since we won't be installing any udev rules anymore, it doesn't matter I think.
Comment 6 Markos Chandras (RETIRED) gentoo-dev 2012-11-02 14:40:08 UTC
(In reply to comment #5)
> > Maybe this is due to the recent udev.eclass changes?
> I don't know but since we won't be installing any udev rules anymore, it
> doesn't matter I think.

Yes I think it does not matter either.
Comment 7 Marios Andreopoulos 2012-11-02 14:41:27 UTC
Created attachment 328090 [details]
dispcalGUI 0.9.9.1 fixed ebuild

This fix can be considered a hack. I use bash (sed) to enable a configuration option that could be passed to `setup.py install`.

Unfortunately my knowledge on this is limited and after a hour of searching, I gave up and turned to good old bash.

If anyone is interested in fixing it, the `setup.py install` command should be run with `--skip-instrument-configuration-files`.
Then my sed directive should be removed from the ebuild.
Comment 8 Marios Andreopoulos 2012-11-02 14:43:19 UTC
Created attachment 328092 [details]
dispcalGUI 1.1.0.0 fixed ebuild

The same "hack logic" as in the previous comment applies.

Please remove media-gfx/dispcalgui-1.0.7.7 from portage.
Comment 9 Markos Chandras (RETIRED) gentoo-dev 2012-11-02 14:46:46 UTC
Isn't this a bit dirty?

Wouldn't it be better to do something like this

src_install() {
    distutils_src_install
    # remove udev files
    rm ${D}/blabla
}

I don't mind either way just saying.
Comment 10 Marios Andreopoulos 2012-11-02 14:47:54 UTC
Created attachment 328094 [details]
dispcalGUI 1.1.2.1 ebuild

It is a chance to update dispcalgui to the latest version too.

It is the same ebuild as dispcalgui-1.1.0.0-r1 renamed.

As usual,
wget http://dispcalgui.hoech.net/download/dispcalGUI.tar.gz
mv dispcalGUI.tar.gz dispcalGUI-1.1.2.1.tar.gz

Thanks Richard for reporting and Markos for taking the time to submit and manage the ebuilds and distfiles in portage. :)
Comment 11 Marios Andreopoulos 2012-11-02 14:50:08 UTC
Let me check and I will post updated ebuilds if it works. ;)

(In reply to comment #9)
> Isn't this a bit dirty?
> 
> Wouldn't it be better to do something like this
> 
> src_install() {
>     distutils_src_install
>     # remove udev files
>     rm ${D}/blabla
> }
> 
> I don't mind either way just saying.
Comment 12 Marios Andreopoulos 2012-11-02 15:07:01 UTC
Created attachment 328098 [details]
dispcalGUI 0.9.9.1 updated ebuild

This version removes udev files as you suggested instead of sed'ing setup.py.
Comment 13 Marios Andreopoulos 2012-11-02 15:08:04 UTC
Created attachment 328100 [details]
dispcalGUI 1.1.0.0 updated ebuild
Comment 14 Marios Andreopoulos 2012-11-02 15:09:33 UTC
Created attachment 328102 [details]
dispcalGUI 1.1.2.1 updated ebuild

Hope everything is alright now. Thanks!
Comment 15 Markos Chandras (RETIRED) gentoo-dev 2012-11-02 22:16:01 UTC
Fixed the following problems as well
  ebuild.minorsyn               9
   media-gfx/dispcalgui/dispcalgui-0.9.9.1.ebuild: Ebuild contains leading spaces on line: 52
   media-gfx/dispcalgui/dispcalgui-0.9.9.1.ebuild: Ebuild contains leading spaces on line: 54
   media-gfx/dispcalgui/dispcalgui-0.9.9.1.ebuild: Unquoted Variable on line: 54
   media-gfx/dispcalgui/dispcalgui-1.1.0.0.ebuild: Ebuild contains leading spaces on line: 59
   media-gfx/dispcalgui/dispcalgui-1.1.0.0.ebuild: Ebuild contains leading spaces on line: 61
   media-gfx/dispcalgui/dispcalgui-1.1.0.0.ebuild: Unquoted Variable on line: 61
   media-gfx/dispcalgui/dispcalgui-1.1.2.1.ebuild: Ebuild contains leading spaces on line: 59
   media-gfx/dispcalgui/dispcalgui-1.1.2.1.ebuild: Ebuild contains leading spaces on line: 61
   media-gfx/dispcalgui/dispcalgui-1.1.2.1.ebuild: Unquoted Variable on line: 6

(you should have seen them if you used "repoman full") ;-)

Also added || die to the 'rm' command in src_install



+*dispcalgui-1.1.2.1 (02 Nov 2012)
+
+  02 Nov 2012; Markos Chandras <hwoarang@gentoo.org> +dispcalgui-1.1.2.1.ebuild,
+  -dispcalgui-1.0.7.7.ebuild, dispcalgui-0.9.9.1.ebuild,
+  dispcalgui-1.1.0.0.ebuild:
+  Version bump. Fix old ebuilds to not install udev rules in order to avoid
+  collisions with media-gfx/argyllcms. Thanks to Marios Andreopoulos
+  <opensource@andmarios.com>. Bug #440932. Remove old
+
Comment 16 Marios Andreopoulos 2012-11-02 23:24:18 UTC
Thanks! I will use repoman from now on.

(In reply to comment #15)
> Fixed the following problems as well
>   ebuild.minorsyn               9
>... 
> (you should have seen them if you used "repoman full") ;-)
> 
> Also added || die to the 'rm' command in src_install
>...
>
Comment 17 Homer 2012-11-28 05:46:42 UTC
*** Bug 445024 has been marked as a duplicate of this bug. ***
Comment 18 Francesco Riosa 2013-01-05 12:48:12 UTC
in dispcalgui-1.1.2.9 the rule is called 45-Argyll.rules not 55-Argyll.rules and the build now fail
Comment 19 Markos Chandras (RETIRED) gentoo-dev 2013-01-05 15:42:54 UTC
(In reply to comment #18)
> in dispcalgui-1.1.2.9 the rule is called 45-Argyll.rules not 55-Argyll.rules
> and the build now fail

Please do NOT reply to closed bugs. Search bugzilla for open bugs (such as 449302) or open a new one