Bug 239365 – www-client/opera-9.60_pre2440: drop unneeded sed scripts

• Product: Gentoo Linux
• Status: RESOLVED FIXED

[Description Pacho Ramos 2008-10-02 19:24:44 UTC]

This comes from: http://bugs.gentoo.org/show_bug.cgi?id=204294#c16

The attached diff drop some sed scripts and other unneeded stuff now:
1. All old stuff is commented and not erased, this way, is something if needed in the future before final 9.6 release, it can be readded easily
2. Only the following sed is needed:
	sed -i 	-e "s:config_dir=\"/etc\":config_dir=\"${D}/etc/\":g" \
 		-e "s:\(str_localdirplugin=\).*$:\1/opt/opera/lib/opera/plugins:" \
		-e 's:#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\):\1:' \
		-e 's:#\(OPERA_FORCE_JAVA_ENABLED=\):\1:' \
 		install.sh || die "sed failed"

3. One of the patched I sent for desktop must be modified a bit because now sed is not modifying all paths, it's a trivial change, simply add ${S} in some parts of the patch (I attach the patch to be used now)

4. All icons installation stuff is now handled by new patches, then, there is no need of installing them "manually" from ebuild. Same about "make_desktop_entry"

5. In gnome, Comment should be used instead of GenericName, for this, I add:
use gnome && sed -i -e s:"GenericName\[":"Comment\[": "${D}"/usr/share/applications/opera.desktop

I know that this is ugly, then, if you can contact upstream, I would suggest upstream to simply include "Comment" entries to opera's desktop file, info can be the same that the one being used for GenericName (they can see that k3b desktop file does this for the same problem)

Regards! :-)

Reproducible: Always

[Comment 1 Pacho Ramos 2008-10-02 19:25:07 UTC]

Created attachment 167017 [details, diff]
opera-gentoo1.patch

This is the new patch

[Comment 2 Pacho Ramos 2008-10-02 19:25:29 UTC]

To replace current opera-gentoo.patch

[Comment 3 Pacho Ramos 2008-10-02 19:25:51 UTC]

Created attachment 167019 [details]
opera.ebuild.diff

This is the diff against current ebuild

[Comment 4 Jeroen Roovers (RETIRED) 2008-10-02 20:00:26 UTC]

Thanks.

[Comment 5 Jeroen Roovers (RETIRED) 2008-10-06 19:01:43 UTC]

I applied the patches to www-client/opera-9.60_pre2440 and the latest www-client/opera-9.60_pre2444. I am still slightly worried about the `test -e /etc/gentoo-release' check in the install.sh patch, though. It isn't ROOT aware and since it's a Gentoo specific patch, it shouldn't be needed anyway (there's no way upstream would adopt it as is anyway).

[Comment 6 Pacho Ramos 2008-10-07 08:51:43 UTC]

(In reply to comment #5)
> I applied the patches to www-client/opera-9.60_pre2440 and the latest
> www-client/opera-9.60_pre2444. I am still slightly worried about the `test -e
> /etc/gentoo-release' check in the install.sh patch, though. It isn't ROOT aware

sorry but, what do you mean by "root aware" (english is not my main language, if you could explain it me a bit more would be nice) Thanks

> and since it's a Gentoo specific patch, it shouldn't be needed anyway (there's
> no way upstream would adopt it as is anyway).
> 

What should be done for being accepted by upstream? 

[Comment 7 Jeroen Roovers (RETIRED) 2008-11-06 20:03:35 UTC]

(In reply to comment #6)
> sorry but, what do you mean by "root aware" (english is not my main language,
> if you could explain it me a bit more would be nice) Thanks

It isn't aware of the ROOT variable that defines where to retrieve information from. From make.conf(5):

       ROOT = [path]
              Use ROOT to specify the target root filesystem  to  be  used
              for  merging  packages  or ebuilds.  All RDEPEND and PDEPEND
              will be installed into ROOT while all DEPEND will  be  still
              be installed into /.  Typically, you should set this setting
              in the environment rather  than  in  /etc/make.conf  itself.
              It’s commonly used for creating new build images.  Make sure
              you use an absolute path.
              Defaults to /.

> > and since it's a Gentoo specific patch, it shouldn't be needed anyway (there's
> > no way upstream would adopt it as is anyway).
> > 
> 
> What should be done for being accepted by upstream? 

Installing the icons should probably be an option to the install.sh script. If it really were an OS based decision, then the script should depend on something like sys-apps/lsb-release, but then that would be Opera Inc.'s choice. Since the gentoo function was added anyway, checking for /etc/gentoo-release should be redundant.

I haven't had any complaints so far, so I guess this bug is fixed. Thank you very much for the work!

[Comment 8 Pacho Ramos 2008-11-06 21:50:54 UTC]

OK, thanks for explanation :-)