summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-04-06 20:34:22 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-04-06 20:34:22 +0000
commit0b9a85a3e0511c2bd9b6979d9724804961b73ada (patch)
tree91a2066b3d84287c39a52607ae8ba8db934e2e68 /www-client
parentAdd a patch for ARM and keyword wrt bug #410973. (diff)
downloadgentoo-2-0b9a85a3e0511c2bd9b6979d9724804961b73ada.tar.gz
gentoo-2-0b9a85a3e0511c2bd9b6979d9724804961b73ada.tar.bz2
gentoo-2-0b9a85a3e0511c2bd9b6979d9724804961b73ada.zip
Only apply x-scheme-handler/https; to MimeType -line of the desktop file when USE="ssl" is set.
(Portage version: 2.2.0_alpha99/cvs/Linux x86_64)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/links/ChangeLog6
-rw-r--r--www-client/links/links-2.5.ebuild8
2 files changed, 10 insertions, 4 deletions
diff --git a/www-client/links/ChangeLog b/www-client/links/ChangeLog
index ae9b39a61706..7447a2f8476f 100644
--- a/www-client/links/ChangeLog
+++ b/www-client/links/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-client/links
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.164 2012/04/02 12:32:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.165 2012/04/06 20:34:22 ssuominen Exp $
+
+ 06 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> links-2.5.ebuild:
+ Only apply x-scheme-handler/https; to MimeType -line of the desktop file when
+ USE="ssl" is set.
02 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> -links-2.4-r2.ebuild:
old
diff --git a/www-client/links/links-2.5.ebuild b/www-client/links/links-2.5.ebuild
index a6c50409aec2..0c39fb2b8da4 100644
--- a/www-client/links/links-2.5.ebuild
+++ b/www-client/links/links-2.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.5.ebuild,v 1.12 2012/03/31 18:04:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.5.ebuild,v 1.13 2012/04/06 20:34:22 ssuominen Exp $
EAPI=4
inherit autotools eutils fdo-mime
@@ -103,8 +103,10 @@ src_install() {
if use X; then
newicon Links_logo.png ${PN}.png
make_desktop_entry "${PN} -g" Links ${PN} 'Network;WebBrowser'
- echo 'MimeType=x-scheme-handler/http;x-scheme-handler/https;' \
- >> "${ED}"usr/share/applications/*.desktop
+ local d="${ED}"/usr/share/applications
+ echo 'MimeType=x-scheme-handler/http;' >> "${d}"/*.desktop
+ use ssl && sed -i -e 's:x-scheme-handler/http;:&x-scheme-handler/https;:' \
+ "${d}"/*.desktop
fi
dohtml doc/links_cal/*