Make util-linux conditional to GNU userland, added note for FBSD.

Package-Manager: portage-2.0.52-r1

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 33c60bd5543def6f17e062853c3e042261a98779..a1221da8d2e220baea771b39c727592614a8a37f 100644 (file)
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.459 2005/09/20 02:33:07 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.460 2005/09/20 19:17:04 flameeyes Exp $
+
+  20 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  xorg-x11-6.8.2-r4.ebuild, xorg-x11-6.8.2-r5.ebuild,
+  xorg-x11-6.8.99.15-r2.ebuild:
+  Make util-linux conditional to GNU userland, added note for FBSD.
 
 *xorg-x11-6.8.2-r5 (20 Sep 2005)
 

diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 0f4c4d67980baa89c5d7450f1ececac4e1028a03..aac0ace10cc4864ab64f342c76a232f6b7b6835a 100644 (file)
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,8 +1,18 @@
-MD5 b58fe65648243ee3c61f01c5172cd476 ChangeLog 105658
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ba8a769f285a4f6b4553e5ddc2333b39 ChangeLog 105862
+MD5 8b7e30f8aca6bdbcafc69a23cf246048 xorg-x11-6.8.2-r4.ebuild 55037
+MD5 c9227e42d07c07b32d7c36619cc27be9 xorg-x11-6.8.99.15-r2.ebuild 54186
+MD5 68fe01596ae2d2745869c7c01286ed8a xorg-x11-6.8.2-r5.ebuild 55147
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
-MD5 7163b6f5e269b758e46c815f5826e27d xorg-x11-6.8.2-r4.ebuild 54930
-MD5 ca91a4c8966a993874e66f38661287be xorg-x11-6.8.2-r5.ebuild 55044
-MD5 27897cdfc343030027601359d6497bdb xorg-x11-6.8.99.15-r2.ebuild 54079
 MD5 84ed1084819731e2acef3610f0b6b30a files/digest-xorg-x11-6.8.2-r4 506
-MD5 d7bb70cf2729013f1cab4c8a750a087a files/digest-xorg-x11-6.8.2-r5 504
 MD5 a9b1f5a0e1935eca37b3e2bedfdec90a files/digest-xorg-x11-6.8.99.15-r2 518
+MD5 d7bb70cf2729013f1cab4c8a750a087a files/digest-xorg-x11-6.8.2-r5 504
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDMGBYj5H05b2HAEkRAhasAJ0RMtV0JvEUAxG79AHkotqjdSWZ7wCeN9F8
+iTnO4997QOjEnUSuifI11Io=
+=ksJ+
+-----END PGP SIGNATURE-----

diff --git a/x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild
index 485dbdeee0e4445efb16a160f69d9141c61e6953..17fc8a13b6b634ebc8ba043d974d966d85a93a06 100644 (file)
--- a/x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.2-r4.ebuild,v 1.2 2005/09/19 16:34:55 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild,v 1.3 2005/09/20 19:17:04 flameeyes Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -87,13 +87,14 @@ DEPEND=">=sys-libs/ncurses-5.1
        opengl? ( >=x11-base/opengl-update-2.2.0 )
        !nocxx? ( >=x11-misc/ttmkfdir-3.0.9-r2 )
        >=sys-apps/sed-4
-       sys-apps/util-linux
+       userland_GNU? ( sys-apps/util-linux )
        dev-lang/perl
        media-libs/libpng
        !<=app-emulation/emul-linux-x86-xlibs-1.2-r3
        !virtual/xft
        !virtual/x11"
 # x11-libs/xft -- blocked because of interference with xorg's
+# FBSDTODO: need to check that X is not pulled in before freebsd-ubin for 'col' presence
 
 RDEPEND="
                >=sys-libs/zlib-1.1.3-r2

diff --git a/x11-base/xorg-x11/xorg-x11-6.8.2-r5.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.2-r5.ebuild
index a84f67d8a91136a9f1189aa4afd9f9c02c4ea435..6056eea064e4c867e964b4d4c92c0cd13f1452db 100644 (file)
--- a/x11-base/xorg-x11/xorg-x11-6.8.2-r5.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.2-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.2-r5.ebuild,v 1.1 2005/09/20 02:33:07 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r5.ebuild,v 1.2 2005/09/20 19:17:04 flameeyes Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -87,13 +87,14 @@ DEPEND=">=sys-libs/ncurses-5.1
        opengl? ( >=x11-base/opengl-update-2.2.0 )
        !nocxx? ( >=x11-misc/ttmkfdir-3.0.9-r2 )
        >=sys-apps/sed-4
-       sys-apps/util-linux
+       userland_GNU? ( sys-apps/util-linux )
        dev-lang/perl
        media-libs/libpng
        !<=app-emulation/emul-linux-x86-xlibs-1.2-r3
        !virtual/xft
        !virtual/x11"
 # x11-libs/xft -- blocked because of interference with xorg's
+# FBSDTODO: need to check that X is not pulled in before freebsd-ubin for 'col' presence
 
 RDEPEND="
                >=sys-libs/zlib-1.1.3-r2

diff --git a/x11-base/xorg-x11/xorg-x11-6.8.99.15-r2.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.99.15-r2.ebuild
index 21ddccb01c2acfac4bc838ce826e6d824812827b..da979d6903e2f106a421c44fe7c6b349205cbd6d 100644 (file)
--- a/x11-base/xorg-x11/xorg-x11-6.8.99.15-r2.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.99.15-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.99.15-r2.ebuild,v 1.2 2005/09/19 16:34:55 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.99.15-r2.ebuild,v 1.3 2005/09/20 19:17:04 flameeyes Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -89,13 +89,14 @@ DEPEND=">=sys-libs/ncurses-5.1
        opengl? ( >=x11-base/opengl-update-2.2.0 )
        !nocxx? ( >=x11-misc/ttmkfdir-3.0.9-r2 )
        >=sys-apps/sed-4
-       sys-apps/util-linux
+       userland_GNU? ( sys-apps/util-linux )
        dev-lang/perl
        media-libs/libpng
        !<=app-emulation/emul-linux-x86-xlibs-1.2-r3
        !virtual/xft
        !virtual/x11"
 # x11-libs/xft -- blocked because of interference with xorg's
+# FBSDTODO: need to check that X is not pulled in before freebsd-ubin for 'col' presence
 
 RDEPEND="
                >=sys-libs/zlib-1.1.3-r2