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
commit65b9678179916dd8a5f9189f94b42db54d1370d1 (patch)
treecc080720458139fd807c305832930cf3520c0125 /www-client
parentAdd a patch for ARM and keyword wrt bug #410973. (diff)
downloadhistorical-65b9678179916dd8a5f9189f94b42db54d1370d1.tar.gz
historical-65b9678179916dd8a5f9189f94b42db54d1370d1.tar.bz2
historical-65b9678179916dd8a5f9189f94b42db54d1370d1.zip
Only apply x-scheme-handler/https; to MimeType -line of the desktop file when USE="ssl" is set.
Package-Manager: portage-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/Manifest18
-rw-r--r--www-client/links/links-2.5.ebuild8
3 files changed, 19 insertions, 13 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/Manifest b/www-client/links/Manifest
index 854b4bb4b399..e954c9d34b69 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -3,17 +3,17 @@ Hash: SHA1
DIST links-2.5.tar.bz2 3849259 RMD160 ec0c2fbf239289d757fd12526495bdcb3c08a588 SHA1 fe4bc37be8aebd9196c35ffef724435cea94349c SHA256 f5c7f23f31d71d073b7b6ad2f123f3f93b07b787912b7b01b4fff565349295f2
DIST links2_2.5-1.debian.tar.gz 20869 RMD160 997338fd263a9519f105d24ced17caba65181caf SHA1 82a2f23c12dca937c29e8f4cd83b7527a7e374e8 SHA256 28fb3fe213b3ba2a2274353a810bcd23d4fd39d949d8cb608c3a366f09651b7e
-EBUILD links-2.5.ebuild 3262 RMD160 09b0004ac452ad8449882cdeeb3714d73f3a47ae SHA1 1a4b02215c300766453942723b2e55e1b097bdea SHA256 b0a589f3486bf1a284ef18198ab2394bdf5ac23d79d8fedebb2c17f3603e7d28
-MISC ChangeLog 32151 RMD160 ac70276f91664496fd6c767c155c86f162cd6330 SHA1 78851adcc5a276c536db909abfa180b2bdeea4f8 SHA256 bb4bbfd9e552a23faa8eb2d63d5ced9ed4b6515804d7880ec7033460a2dfc8e0
+EBUILD links-2.5.ebuild 3352 RMD160 e5a88418045af2f898b0e0bc8edc8fe16d133d90 SHA1 4dde689c120577388b94be32a171756bfe1a33de SHA256 211ff99c3ca734e46362ad747ddcdc5cc646dfe65438e150aafdad1b1b9a3fcc
+MISC ChangeLog 32324 RMD160 f4519feda338e6fdcb17ae3da36a2f5280ff3d1f SHA1 9a75a713ad25d1508717bd35b8cfa4fb9f95b472 SHA256 4f5cf6817f5d884f1bcc4567b1fe725079500c0e26ee31704cd86955eac0a975
MISC metadata.xml 342 RMD160 f48da44e2ff7ef33505a66744713dde872654bf5 SHA1 09f4631fef863d70a152eec29c2455243413c9ee SHA256 264e605d3878a9b815b642d43c413afd628f1945e9a875fc31eaf7e2cef0a085
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQEcBAEBAgAGBQJPeZxEAAoJEEdUh39IaPFNRvIH/0MiHh6sEZR2RARfxVeaoAla
-WLbdChHCd07BosqlaMAm5kyhIdTL0Pmq+BE4iY/8KoJ00aRvRhYIJ43uGof3Z5qo
-FcoDS4xpgplYA75OO0JZkDFeDtS/DIg9HrxUy+ZjSyXJJ+SSnPBUibbB4nXV5moN
-16Ria+zraxWa7qMeYy79DkSR5mY12byWwS69/GHxz+LjuGgtvKloPhksz/9PJDPE
-wzNfMcninEiFw+NpD1lCeOBNk8WaU6XsgqIGKl3p+AHc7V4zkoJhhNFmVkioj/a7
-Yiu2ue79ORkmm0NGOIBI4+XwAI+yhBCyL+mXWht2Ghu5OC6BkAb2EcRiBRI2Sjs=
-=LKz9
+iQEcBAEBAgAGBQJPf1MwAAoJEEdUh39IaPFNL/8IAIJPfx+t8HF2yX0rGv0seJ1k
+gHOhgiSrdqfGDR/ao8wAcu6Kouj9G4z0GeRCMmA+kCJ6n4qqW+gndlhtNKbMh9x4
+eCS13/5fG4QLPXr58ktGbXpRpFQ2yz4igPkvBw6cGGKnBzzCfHACEVsBjI6vO7RV
+ENMlIosPRZGi110FhWiEo/CnSEAcBsdyqYWB2KRjpqeO3+QvBxsF6JUrOCCfOiEZ
+fe+uci9k6u1ZUfNFhSMK7k+KMz3tl3e7emgE8xrn5ojdFFXd9b5gwIKavpCyA53J
+5UWNDiJmNS/EaLQY6TPEe9Jxackou18S5ZPQaqvvT9VSDX2VX9+m7iFqoFmftJQ=
+=ToMD
-----END PGP SIGNATURE-----
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/*