summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2009-03-25 12:49:02 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2009-03-25 12:49:02 +0000
commit8b19599e7103af53599929c8a6fc2ebcc62e2299 (patch)
treea6cc37413ecbcf82be894ae180ef14c875d5ba46 /x11-drivers
parentx11-drivers/xf86-video-nouveau: new snapshot (diff)
downloadsunrise-reviewed-8b19599e7103af53599929c8a6fc2ebcc62e2299.tar.gz
sunrise-reviewed-8b19599e7103af53599929c8a6fc2ebcc62e2299.tar.bz2
sunrise-reviewed-8b19599e7103af53599929c8a6fc2ebcc62e2299.zip
x11-drivers/xf86-video-nouveau: update dependencies once again for users which mix x11 and sunrise overlays
svn path=/sunrise/; revision=8144
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/xf86-video-nouveau/ChangeLog5
-rw-r--r--x11-drivers/xf86-video-nouveau/Manifest6
-rw-r--r--x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.20090325.ebuild7
-rw-r--r--x11-drivers/xf86-video-nouveau/xf86-video-nouveau-9999.ebuild7
4 files changed, 16 insertions, 9 deletions
diff --git a/x11-drivers/xf86-video-nouveau/ChangeLog b/x11-drivers/xf86-video-nouveau/ChangeLog
index 4d5d58f84..61c811c02 100644
--- a/x11-drivers/xf86-video-nouveau/ChangeLog
+++ b/x11-drivers/xf86-video-nouveau/ChangeLog
@@ -3,6 +3,11 @@
# $Header: $
25 Mar 2009; Chi-Thanh Christopher Nguyen (chithead)
+ <chithanh@cs.tu-berlin.de> xf86-video-nouveau-0.0.20090325.ebuild,
+ xf86-video-nouveau-9999.ebuild:
+ update dependencies once again for users which mix x11 and sunrise overlays
+
+ 25 Mar 2009; Chi-Thanh Christopher Nguyen (chithead)
<chithanh@cs.tu-berlin.de> -xf86-video-nouveau-0.0.20090318.ebuild,
+xf86-video-nouveau-0.0.20090325.ebuild:
new snapshot
diff --git a/x11-drivers/xf86-video-nouveau/Manifest b/x11-drivers/xf86-video-nouveau/Manifest
index e1be3e805..6ce707839 100644
--- a/x11-drivers/xf86-video-nouveau/Manifest
+++ b/x11-drivers/xf86-video-nouveau/Manifest
@@ -1,4 +1,4 @@
-EBUILD xf86-video-nouveau-0.0.20090325.ebuild 942 RMD160 f013bc954fb235ace19908c544fe9a7251e35f4d SHA1 564f26e1c356ca4c484ae07545b4f2e45fd180db SHA256 41a73aa8cd25c7df0c3ca4b726ae3386c199d5042d308722e14f728de99e5c22
-EBUILD xf86-video-nouveau-9999.ebuild 878 RMD160 cf3a70ac4977ab095ea6d4952c6e9a218c4e21c0 SHA1 b63fceeb8abda9a799e4b8626e0f4fa231f3b98d SHA256 0546796271a2b7bd96082b443939e04659e00f8e2e8acc434f5cb23a431bcde0
-MISC ChangeLog 3275 RMD160 cf0975e864dbc8ab188a9a080adee7691cc5030b SHA1 c9bd21189deaaf40245c122d827f80326d79b1b8 SHA256 76303bc58055e4d5cc47701bcdbdfe62973b49b032d7b70bd344d7539be83308
+EBUILD xf86-video-nouveau-0.0.20090325.ebuild 976 RMD160 c5b774f26eff91eecc88cabcec63ed80d60538a4 SHA1 367c00e8a99fd9d1fae31912b36fcb36bdbd3b19 SHA256 b23cdebf71cc03fa495dfae8350dcd74ca603dd1578e0508a14572c8b096f123
+EBUILD xf86-video-nouveau-9999.ebuild 912 RMD160 65d7384113cc7635206f4d2f0587611d991cd601 SHA1 a5380451ae19092116c21ec58b499a90620574ec SHA256 15a7cc4514089f9f16484d58dcd0e7c99d104738844157b8269549d8c518ee89
+MISC ChangeLog 3512 RMD160 0ee9e722491f8d47c2ab13a3279b39f863e2d940 SHA1 655834f416116cd9a0d3f33fbdb37f3d8c5e493b SHA256 38dfb77d12d953d61c991d3a2d5a7a8b00f96201e918c71c216b7114f615c1ab
MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.20090325.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.20090325.ebuild
index b6b9432da..3e2ef819d 100644
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.20090325.ebuild
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.20090325.ebuild
@@ -31,9 +31,10 @@ DEPEND="${COMMON_DEPEND}
x11-proto/xextproto
x11-proto/xf86driproto
x11-proto/xproto
- || ( x11-libs/libdrm_nouveau x11-libs/libdrm[video_cards_nouveau] )"
+ || ( x11-libs/libdrm_nouveau >=x11-libs/libdrm-9999 )"
# need x11-base/x11-drm until nouveau drm enters the kernel
RDEPEND="${COMMON_DEPEND}
- >=x11-base/x11-drm-20090320[video_cards_nv]"
-
+ || (
+ >=x11-base/x11-drm-20090320[video_cards_nv]
+ x11-base/x11-drm[video_cards_nouveau] )"
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-9999.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-9999.ebuild
index b92eb3ce7..e794dc15b 100644
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-9999.ebuild
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-9999.ebuild
@@ -30,9 +30,10 @@ DEPEND="${COMMON_DEPEND}
x11-proto/xextproto
x11-proto/xf86driproto
x11-proto/xproto
- || ( x11-libs/libdrm_nouveau x11-libs/libdrm[video_cards_nouveau] )"
+ || ( x11-libs/libdrm_nouveau >=x11-libs/libdrm-9999 )"
# need x11-base/x11-drm until nouveau drm enters the kernel
RDEPEND="${COMMON_DEPEND}
- >=x11-base/x11-drm-20090320[video_cards_nv]"
-
+ || (
+ >=x11-base/x11-drm-20090320[video_cards_nv]
+ x11-base/x11-drm[video_cards_nouveau] )"