diff options
| author |   Donnie Berkholz <dberkholz@gentoo.org> | 2004-11-01 18:54:10 +0000 |
|---|---|---|
| committer | Donnie Berkholz <dberkholz@gentoo.org> | 2004-11-01 18:54:10 +0000 |
| commit | d1522a5da3665a46b11b0c9b38e3285257032912 (patch) | |
| tree | 13057f4b00db808f81d198fd0cf74f703f6ddfc2 /x11-base | |
| parent | Marked ~ppc64; bug #63683 (diff) | |
| download | historical-d1522a5da3665a46b11b0c9b38e3285257032912.tar.gz historical-d1522a5da3665a46b11b0c9b38e3285257032912.tar.bz2 historical-d1522a5da3665a46b11b0c9b38e3285257032912.zip | |
Add blocker on app-text/dgs, since they install the same libs. Need to confirm compilation of its deps, however.
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-x11/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-base/xorg-x11/Manifest | 4 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild | 5 |
3 files changed, 12 insertions, 4 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index d62182fc30d9..94c62b46beed 100644 --- a/x11-base/xorg-x11/ChangeLog +++ b/x11-base/xorg-x11/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-base/xorg-x11 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.183 2004/10/29 15:57:06 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.184 2004/11/01 18:54:10 spyderous Exp $ + + 01 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>; + xorg-x11-6.8.0-r2.ebuild: + Add blocker on app-text/dgs, since they install the same libs. Need to + confirm compilation of its deps, however. 29 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.8.0-r2.ebuild: diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest index 10ad116b1a29..e12095ff8d26 100644 --- a/x11-base/xorg-x11/Manifest +++ b/x11-base/xorg-x11/Manifest @@ -1,8 +1,8 @@ -MD5 044f07645d885a635a6fe770fbd5c622 ChangeLog 39501 +MD5 2a4d271fc8a273df7adb2dcce4e3c3c1 ChangeLog 39702 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230 MD5 9215e5f10589329a5056f366aa6820e8 xorg-x11-6.7.0-r2.ebuild 38086 MD5 59449d8b0ac475d3c5a4caa98b9238bb xorg-x11-6.8.0-r1.ebuild 41332 -MD5 1e6394a17d0bf2702dcccd0adb5c31d8 xorg-x11-6.8.0-r2.ebuild 44618 +MD5 aa6a0fafae49f18d5d47667c98522413 xorg-x11-6.8.0-r2.ebuild 44770 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r2 904 MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r1 908 MD5 4948d68fce0cc80c309f112474e37303 files/digest-xorg-x11-6.8.0-r2 906 diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild index d06e2e5c6a73..a2ac78e7ec9f 100644 --- a/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild +++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild,v 1.38 2004/10/29 15:57:06 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild,v 1.39 2004/11/01 18:54:10 spyderous Exp $ # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory # voodoo3 cards. @@ -105,7 +105,10 @@ DEPEND=">=sys-libs/ncurses-5.1 !virtual/x11" # x11-libs/xft -- blocked because of interference with xorg's +# app-text/dgs overlaps libdps.{a,so} libdpstk.{a,so} libpsres.{a,so} +# need to test X's libs w/ imagemagick, graphicsmagick and gtkDPS RDEPEND=" + !app-text/dgs >=sys-libs/zlib-1.1.3-r2 >=sys-devel/flex-2.5.4a-r5 >=dev-libs/expat-1.95.3 |