diff options
| author |   Donnie Berkholz <dberkholz@gentoo.org> | 2010-12-27 05:05:25 +0000 |
|---|---|---|
| committer | Donnie Berkholz <dberkholz@gentoo.org> | 2010-12-27 05:05:25 +0000 |
| commit | f3e74153661f185bd53e08c0d1e1a7953580ab95 (patch) | |
| tree | d87b74c79e6b2b6572edb39044e3ca002aa89855 | |
| parent | Add support for easy handling of orc dependencies in the eclass. This way the... (diff) | |
| download | gentoo-2-f3e74153661f185bd53e08c0d1e1a7953580ab95.tar.gz gentoo-2-f3e74153661f185bd53e08c0d1e1a7953580ab95.tar.bz2 gentoo-2-f3e74153661f185bd53e08c0d1e1a7953580ab95.zip | |
(#349798) Pull in xinit 1.3. Do it in RDEPEND instead of PDEPEND so that files moving around between packages don't run into conflicts.
(Portage version: 2.1.9.26/cvs/Linux x86_64)
| -rw-r--r-- | x11-base/xorg-server/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.9.2.902.ebuild | 6 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.9.2.ebuild | 6 |
3 files changed, 12 insertions, 7 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index 73e11662e660..aea6950e36ff 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.553 2010/12/25 20:13:59 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.554 2010/12/27 05:05:25 dberkholz Exp $ + + 27 Dec 2010; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.9.2.ebuild, xorg-server-1.9.2.902.ebuild: + (#349798) Pull in xinit 1.3. Do it in RDEPEND instead of PDEPEND so that + files moving around between packages don't run into conflicts. 25 Dec 2010; Christian Faulhammer <fauli@gentoo.org> xorg-server-1.9.2.ebuild: diff --git a/x11-base/xorg-server/xorg-server-1.9.2.902.ebuild b/x11-base/xorg-server/xorg-server-1.9.2.902.ebuild index f22e6ff7d990..3ac70f0d8d35 100644 --- a/x11-base/xorg-server/xorg-server-1.9.2.902.ebuild +++ b/x11-base/xorg-server/xorg-server-1.9.2.902.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.9.2.902.ebuild,v 1.1 2010/12/05 11:32:35 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.9.2.902.ebuild,v 1.2 2010/12/27 05:05:25 dberkholz Exp $ EAPI=3 # They generate the configure.ac with wrong version of util-macros @@ -90,10 +90,10 @@ DEPEND="${RDEPEND} >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.3 >=x11-libs/libdrm-2.4.20 - )" + ) + >=x11-apps/xinit-1.3" PDEPEND=" - >=x11-apps/xinit-1.2.1-r1 xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" EPATCH_FORCE="yes" diff --git a/x11-base/xorg-server/xorg-server-1.9.2.ebuild b/x11-base/xorg-server/xorg-server-1.9.2.ebuild index 45e5fd175fee..573bd8b6a027 100644 --- a/x11-base/xorg-server/xorg-server-1.9.2.ebuild +++ b/x11-base/xorg-server/xorg-server-1.9.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.9.2.ebuild,v 1.5 2010/12/25 20:13:59 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.9.2.ebuild,v 1.6 2010/12/27 05:05:25 dberkholz Exp $ EAPI=3 # They generate the configure.ac with wrong version of util-macros @@ -90,10 +90,10 @@ DEPEND="${RDEPEND} >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.3 >=x11-libs/libdrm-2.4.20 - )" + ) + >=x11-apps/xinit-1.3" PDEPEND=" - >=x11-apps/xinit-1.2.1-r1 xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" EPATCH_FORCE="yes" |