diff options
| author |   Joshua Baergen <joshuabaergen@gentoo.org> | 2006-02-14 02:51:14 +0000 |
|---|---|---|
| committer | Joshua Baergen <joshuabaergen@gentoo.org> | 2006-02-14 02:51:14 +0000 |
| commit | 49ef8e337371a4c78a9d8fbf42fa6247126b8fc5 (patch) | |
| tree | c87903a77e2e924cc160dcce3df11abfb4a31d41 | |
| parent | Fixed changes (diff) | |
| download | gentoo-2-49ef8e337371a4c78a9d8fbf42fa6247126b8fc5.tar.gz gentoo-2-49ef8e337371a4c78a9d8fbf42fa6247126b8fc5.tar.bz2 gentoo-2-49ef8e337371a4c78a9d8fbf42fa6247126b8fc5.zip | |
Fix dependencies for modular X (bug #122652, Ulrich Mueller).
(Portage version: 2.1_pre4-r1)
| -rw-r--r-- | app-text/pspresent/ChangeLog | 8 | ||||
| -rw-r--r-- | app-text/pspresent/pspresent-1.1.ebuild | 11 | ||||
| -rw-r--r-- | app-text/pspresent/pspresent-1.2.ebuild | 11 |
3 files changed, 22 insertions, 8 deletions
diff --git a/app-text/pspresent/ChangeLog b/app-text/pspresent/ChangeLog index e63edd952422..8ec72d68ecaf 100644 --- a/app-text/pspresent/ChangeLog +++ b/app-text/pspresent/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/pspresent -# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/pspresent/ChangeLog,v 1.13 2005/07/16 16:14:22 josejx Exp $ +# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/pspresent/ChangeLog,v 1.14 2006/02/14 02:51:14 joshuabaergen Exp $ + + 14 Feb 2006; Joshua Baergen <joshuabaergen@gentoo.org> + pspresent-1.1.ebuild, pspresent-1.2.ebuild: + Fix dependencies for modular X (bug #122652, Ulrich Mueller). 16 Jul 2005; Joseph Jezak <josejx@gentoo.org> pspresent-1.2.ebuild: Marked ppc stable for bug #99217. diff --git a/app-text/pspresent/pspresent-1.1.ebuild b/app-text/pspresent/pspresent-1.1.ebuild index 79d5fb778dd7..9fbcf0116438 100644 --- a/app-text/pspresent/pspresent-1.1.ebuild +++ b/app-text/pspresent/pspresent-1.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/pspresent/pspresent-1.1.ebuild,v 1.9 2005/01/01 16:31:11 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/pspresent/pspresent-1.1.ebuild,v 1.10 2006/02/14 02:51:14 joshuabaergen Exp $ IUSE="xinerama" @@ -9,9 +9,14 @@ SRC_URI="http://www.cse.unsw.edu.au/~matthewc/pspresent/${P}.tar.gz" HOMEPAGE="http://www.cse.unsw.edu.au/~matthewc/pspresent/" RDEPEND="virtual/libc - virtual/x11 + || ( ( x11-libs/libX11 + xinerama? ( x11-libs/libXinerama ) ) + virtual/x11 ) virtual/ghostscript" DEPEND="${RDEPEND} + || ( ( x11-proto/xproto + xinerama? ( x11-proto/xineramaproto ) ) + virtual/x11 ) >=sys-apps/sed-4" PROVIDE="virtual/psviewer" diff --git a/app-text/pspresent/pspresent-1.2.ebuild b/app-text/pspresent/pspresent-1.2.ebuild index 374d6d21b8f5..2a82fe2d8fef 100644 --- a/app-text/pspresent/pspresent-1.2.ebuild +++ b/app-text/pspresent/pspresent-1.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/pspresent/pspresent-1.2.ebuild,v 1.5 2005/07/16 16:14:22 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/pspresent/pspresent-1.2.ebuild,v 1.6 2006/02/14 02:51:14 joshuabaergen Exp $ IUSE="xinerama" @@ -9,9 +9,14 @@ SRC_URI="http://www.cse.unsw.edu.au/~matthewc/pspresent/${P}.tar.gz" HOMEPAGE="http://www.cse.unsw.edu.au/~matthewc/pspresent/" RDEPEND="virtual/libc - virtual/x11 + || ( ( x11-libs/libX11 + xinerama? ( x11-libs/libXinerama ) ) + virtual/x11 ) virtual/ghostscript" DEPEND="${RDEPEND} + || ( ( x11-proto/xproto + xinerama? ( x11-proto/xineramaproto ) ) + virtual/x11 ) >=sys-apps/sed-4" PROVIDE="virtual/psviewer" |