diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2012-04-17 13:04:54 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2012-04-17 13:04:54 +0000 |
| commit | fc5fb434b135016cc2348135a82f1c5b68357975 (patch) | |
| tree | 664a4d95915ec11415ef68a20f188ebc3507cc2e /www-client | |
| parent | Change xfwm4_compact theme installation directory wrt #412331 by José Romild... (diff) | |
| download | gentoo-2-fc5fb434b135016cc2348135a82f1c5b68357975.tar.gz gentoo-2-fc5fb434b135016cc2348135a82f1c5b68357975.tar.bz2 gentoo-2-fc5fb434b135016cc2348135a82f1c5b68357975.zip | |
Re-add xulrunner dependency to the stable version, as it doesn't work with firefox. Re-add minimum version requirement for the unstable version.
(Portage version: 2.1.10.56/cvs/Linux x86_64)
Diffstat (limited to 'www-client')
| -rw-r--r-- | www-client/conkeror/ChangeLog | 7 | ||||
| -rw-r--r-- | www-client/conkeror/conkeror-0.9.4-r1.ebuild | 6 | ||||
| -rw-r--r-- | www-client/conkeror/conkeror-1.0_pre20120223.ebuild | 6 |
3 files changed, 12 insertions, 7 deletions
diff --git a/www-client/conkeror/ChangeLog b/www-client/conkeror/ChangeLog index bcb2db4a6d12..335cf0e4f42c 100644 --- a/www-client/conkeror/ChangeLog +++ b/www-client/conkeror/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-client/conkeror # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/ChangeLog,v 1.26 2012/04/17 11:10:50 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/ChangeLog,v 1.27 2012/04/17 13:04:54 ulm Exp $ + + 17 Apr 2012; Ulrich Müller <ulm@gentoo.org> conkeror-0.9.4-r1.ebuild, + conkeror-1.0_pre20120223.ebuild: + Re-add xulrunner dependency to the stable version, as it doesn't work with + firefox. Re-add minimum version requirement for the unstable version. 17 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> conkeror-0.9.4-r1.ebuild, conkeror-1.0_pre20120223.ebuild: diff --git a/www-client/conkeror/conkeror-0.9.4-r1.ebuild b/www-client/conkeror/conkeror-0.9.4-r1.ebuild index 7c178326a5f8..4be5f2b0a151 100644 --- a/www-client/conkeror/conkeror-0.9.4-r1.ebuild +++ b/www-client/conkeror/conkeror-0.9.4-r1.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/conkeror/conkeror-0.9.4-r1.ebuild,v 1.4 2012/04/17 11:10:50 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/conkeror-0.9.4-r1.ebuild,v 1.5 2012/04/17 13:04:54 ulm Exp $ EAPI=4 @@ -20,9 +20,9 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" IUSE="" DEPEND="" -RDEPEND="|| ( www-client/firefox www-client/firefox-bin )" +RDEPEND=">=net-libs/xulrunner-1.9.1" -S=${WORKDIR}/${PN} +S="${WORKDIR}/${PN}" src_unpack() { unpack ${P}.tar.gz diff --git a/www-client/conkeror/conkeror-1.0_pre20120223.ebuild b/www-client/conkeror/conkeror-1.0_pre20120223.ebuild index 67e942bc1dd3..bacced4e2e52 100644 --- a/www-client/conkeror/conkeror-1.0_pre20120223.ebuild +++ b/www-client/conkeror/conkeror-1.0_pre20120223.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/conkeror/conkeror-1.0_pre20120223.ebuild,v 1.2 2012/04/17 11:10:50 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/conkeror/conkeror-1.0_pre20120223.ebuild,v 1.3 2012/04/17 13:04:54 ulm Exp $ EAPI=4 @@ -20,9 +20,9 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="" DEPEND="" -RDEPEND="|| ( www-client/firefox www-client/firefox-bin )" +RDEPEND="|| ( >=www-client/firefox-5.0 >=www-client/firefox-bin-5.0 )" -S=${WORKDIR}/${PN} +S="${WORKDIR}/${PN}" src_unpack() { unpack ${P}.tar.gz |