diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-04-17 11:28:32 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-04-17 11:28:32 +0000 |
| commit | 1749baaa8085fad03877f2ac87c527f77550cb60 (patch) | |
| tree | f113db564a9f08cc567c1c801cc012421888b38a /app-text | |
| parent | Run relevant test phases only. (diff) | |
| download | gentoo-2-1749baaa8085fad03877f2ac87c527f77550cb60.tar.gz gentoo-2-1749baaa8085fad03877f2ac87c527f77550cb60.tar.bz2 gentoo-2-1749baaa8085fad03877f2ac87c527f77550cb60.zip | |
Remove net-libs/xulrunner from alternative || ( ) dependency wrt #403415
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/acroread/ChangeLog | 5 | ||||
| -rw-r--r-- | app-text/acroread/acroread-9.5.1.ebuild | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/app-text/acroread/ChangeLog b/app-text/acroread/ChangeLog index 7f562a6ee556..16f51f6d9e1c 100644 --- a/app-text/acroread/ChangeLog +++ b/app-text/acroread/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-text/acroread # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.182 2012/04/14 01:03:39 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.183 2012/04/17 11:28:32 ssuominen Exp $ + + 17 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> acroread-9.5.1.ebuild: + Remove net-libs/xulrunner from alternative || ( ) dependency wrt #403415 14 Apr 2012; Andreas K. Huettel <dilfridge@gentoo.org> -acroread-9.4.7.ebuild: diff --git a/app-text/acroread/acroread-9.5.1.ebuild b/app-text/acroread/acroread-9.5.1.ebuild index f680be3495fe..4330104aa9d3 100644 --- a/app-text/acroread/acroread-9.5.1.ebuild +++ b/app-text/acroread/acroread-9.5.1.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/app-text/acroread/acroread-9.5.1.ebuild,v 1.3 2012/04/13 09:09:32 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-9.5.1.ebuild,v 1.4 2012/04/17 11:28:32 ssuominen Exp $ EAPI=4 @@ -43,8 +43,7 @@ RDEPEND="media-libs/fontconfig cups? ( net-print/cups ) x86? ( x11-libs/gtk+:2 net-dns/libidn ldap? ( net-nds/openldap ) - !minimal? ( || ( net-libs/xulrunner - www-client/firefox + !minimal? ( || ( www-client/firefox www-client/seamonkey ) ) ) amd64? ( app-emulation/emul-linux-x86-gtklibs app-emulation/emul-linux-x86-baselibs ) linguas_zh_CN? ( media-fonts/acroread-asianfonts[linguas_zh_CN] ) @@ -221,7 +220,7 @@ src_install() { # We need to set a MOZILLA_COMP_PATH for seamonkey and firefox since # they don't install a configuration file for libgtkembedmoz.so - # detection in /etc/gre.d/ like xulrunner does. + # detection in /etc/gre.d/ like xulrunner did. if ! use minimal ; then if use x86 ; then for lib in /opt/seamonkey /usr/lib/seamonkey /usr/lib/mozilla-firefox ; do |