diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2014-02-13 23:20:13 +0100 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2014-02-13 23:20:13 +0100 |
| commit | 88d4221c866596ae74c44baa579fbf610b73aea0 (patch) | |
| tree | 853d6e093706d90a3af943dd4f17d8f157cd2add | |
| parent | Copied from emacs overlay. (diff) | |
| download | ulm-88d4221c866596ae74c44baa579fbf610b73aea0.tar.gz ulm-88d4221c866596ae74c44baa579fbf610b73aea0.tar.bz2 ulm-88d4221c866596ae74c44baa579fbf610b73aea0.zip | |
Switch to master branch. Merge some changes from Portage tree.
Package-Manager: portage-2.2.8-r1
| -rw-r--r-- | www-client/conkeror/ChangeLog | 4 | ||||
| -rw-r--r-- | www-client/conkeror/conkeror-9999.ebuild | 5 | ||||
| -rw-r--r-- | www-client/conkeror/files/conkeror.sh | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/www-client/conkeror/ChangeLog b/www-client/conkeror/ChangeLog index 172e6c9..1fd23c7 100644 --- a/www-client/conkeror/ChangeLog +++ b/www-client/conkeror/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 13 Feb 2014; Ulrich Müller <ulm@gentoo.org> conkeror-9999.ebuild, + files/conkeror.sh: + Switch to master branch. Merge some changes from Portage tree. + 21 Jan 2014; Ulrich Müller <ulm@gentoo.org> +conkeror-9999.ebuild, +files/conkeror.desktop, +files/conkeror.sh, +metadata.xml: Copied from Portage tree. Fixes for live ebuild contributed by diff --git a/www-client/conkeror/conkeror-9999.ebuild b/www-client/conkeror/conkeror-9999.ebuild index c9b543e..258a574 100644 --- a/www-client/conkeror/conkeror-9999.ebuild +++ b/www-client/conkeror/conkeror-9999.ebuild @@ -5,14 +5,13 @@ EAPI=5 EGIT_REPO_URI="git://repo.or.cz/conkeror.git" -EGIT_BRANCH="gecko26-downloads-fix" inherit eutils git-r3 toolchain-funcs fdo-mime DESCRIPTION="A Mozilla-based web browser whose design is inspired by GNU Emacs" HOMEPAGE="http://conkeror.org/" # conkeror.png is derived from http://commons.wikimedia.org/wiki/File:Conker.jpg -SRC_URI="http://dev.gentoo.org/~ulm/distfiles/conkeror.png" +SRC_URI="http://dev.gentoo.org/~ulm/distfiles/${PN}.png" # CC-BY-SA-3.0 for conkeror.png LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 ) CC-BY-SA-3.0" @@ -22,7 +21,7 @@ RDEPEND="|| ( >=www-client/firefox-5.0 >=www-client/firefox-bin-23.0 )" src_unpack() { git-r3_src_unpack - cp "${DISTDIR}/conkeror.png" . || die + cp "${DISTDIR}/${PN}.png" . || die } src_compile() { diff --git a/www-client/conkeror/files/conkeror.sh b/www-client/conkeror/files/conkeror.sh index e00077b..9b46d5b 100644 --- a/www-client/conkeror/files/conkeror.sh +++ b/www-client/conkeror/files/conkeror.sh @@ -4,6 +4,8 @@ for cmd in firefox firefox-bin; do xr=$(type -p ${cmd}) if [[ -n ${xr} ]]; then + : ${MOZ_PLUGIN_PATH:=/usr/lib/nsbrowser/plugins} #497070 + export MOZ_PLUGIN_PATH exec "${xr}" -app /usr/share/conkeror/application.ini "$@" fi done |