summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2013-08-16 18:58:05 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2013-08-16 18:58:05 +0000
commit2c352dfa22ac8508ca354f77b61a9aa17f6379d2 (patch)
treec02104e0c62eb6cf472527272d0e140a1e381c19 /x11-base
parentnew revision featuring migrated libdv (diff)
downloadhistorical-2c352dfa22ac8508ca354f77b61a9aa17f6379d2.tar.gz
historical-2c352dfa22ac8508ca354f77b61a9aa17f6379d2.tar.bz2
historical-2c352dfa22ac8508ca354f77b61a9aa17f6379d2.zip
allow neomagic back in, bug #434468.
Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-drivers/ChangeLog6
-rw-r--r--x11-base/xorg-drivers/Manifest4
-rw-r--r--x11-base/xorg-drivers/xorg-drivers-1.14.ebuild5
3 files changed, 10 insertions, 5 deletions
diff --git a/x11-base/xorg-drivers/ChangeLog b/x11-base/xorg-drivers/ChangeLog
index 422c16ec2e0e..82b7a6644bdd 100644
--- a/x11-base/xorg-drivers/ChangeLog
+++ b/x11-base/xorg-drivers/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-base/xorg-drivers
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-drivers/ChangeLog,v 1.98 2013/08/07 13:54:04 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-drivers/ChangeLog,v 1.99 2013/08/16 18:58:02 chithanh Exp $
+
+ 16 Aug 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ xorg-drivers-1.14.ebuild:
+ allow neomagic back in, bug #434468.
07 Aug 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
xorg-drivers-1.14.ebuild:
diff --git a/x11-base/xorg-drivers/Manifest b/x11-base/xorg-drivers/Manifest
index bef2a013b375..232cc460fde3 100644
--- a/x11-base/xorg-drivers/Manifest
+++ b/x11-base/xorg-drivers/Manifest
@@ -2,7 +2,7 @@ EBUILD xorg-drivers-1.10.ebuild 5926 SHA256 d5145c69b615a162be930d9e7e0f994069bf
EBUILD xorg-drivers-1.11.ebuild 5926 SHA256 5707d633d828239f4c852dafa470a72f54ea9b70ef8f73029eb73be687678f84 SHA512 571d61602d6eb1ac53f5aa08c5212840c631cb719a24806695dc99f79d8a5deadbd6f5d699bedeeaed9a32760fd5ca5d76290473e8fdb7cfdc05571cd889f196 WHIRLPOOL c15dfe72250a661dbc5d797c3a9bcb769308a63eb45244b16eee234a9f0cf7d8095849c7f6c3da4e951bc1e488d646de0540cb8b28924076ec231415b41bfec7
EBUILD xorg-drivers-1.12.ebuild 5841 SHA256 1319cc44a98575d85be0e7e0566701315e03c84331dc0146c36e981abe9ae851 SHA512 2518421f5618278928d414c406a41f54798db5e6826b565fa1290b994f846a43d08de70f9ed34c859e666611f37abeb81a78e624d7ad25598118f92b14015b2d WHIRLPOOL c004917f07c052570b611feae80bde0f58f296e295371f640b7794b731aaa32e3807093ecc93c30326a47a6aa441b82af3dedf4b4456b91fcb17be59f31a1397
EBUILD xorg-drivers-1.13.ebuild 6132 SHA256 58ebbf0b3dfe9e395d18b20e7feb284d2e4156efad9ef4a552a8cbdd9fafd0e0 SHA512 489b695147b032f79bd3e0ea393ded8d73e01e17e6998750b223c147836015948470b6401c59a19cbb185fffd58f9500dad7659829fb602669a7199ce5eb372c WHIRLPOOL 5bc31b1e0305a232216acd7b06e9516530ceb20ea2ef71d0301ce6c5727f250ee3b262e89d09be29fed5223e44e312a339619aa476b8396b7d607cb9f02f0afc
-EBUILD xorg-drivers-1.14.ebuild 6030 SHA256 4fb09b5789f93566ab93853f6961d742c1d9c7bcc7a0ef4922c8a5b76f2895b5 SHA512 9db00e526939c7931ebcea0e273350404feb3341746847846518f44c5f1de5493e3bb86040b5a81e300e49c2c1b7c74f778c65fa715f393653b8b1b3288f53c0 WHIRLPOOL 9348ed63ba32d42a6dcf42242d25eedde4ee6ee53206cd1bcebdbe6511070984954f8d441c1f81a2f6f3c46ba076a02b6bf5dbac902cf85f0b0f46ba9d44913a
+EBUILD xorg-drivers-1.14.ebuild 6074 SHA256 e21dfb95fa9c782c69792a886352e78f03c02a530fb04a94b41e83a7ccd4d985 SHA512 7edeb8af106d3594548e5d2475d4c6aa2b4e7339809d1196b1bb51c6c2fe4864e3735ff7e7df5541bbe6b5a3195ea4678c227a1f4b91db8395c0430549e6c90d WHIRLPOOL f23a8890cb41dd7f23312b658b6e63d318ad551e50da51cedcc64a2c8e6cae6a37c31d08f88bd4d6fced04bf4daf845fb27333b357729ba4d23153540443dbf9
EBUILD xorg-drivers-1.9.ebuild 5735 SHA256 b546a6815826a31d0c794bbc3413321cd79b662f29868543703adf3d9170aa0c SHA512 1cbfec3f30735ae752692b58816e8b0a50c6f170e7acda2f10c958d977d6d7b3785ccaaa97af0dbd72a2281e1b93f44f9aadbf5050669c25afa3fcdb266664e9 WHIRLPOOL 9921387c13a1804f8ab274300e1c39b908ce03264dc45b0a7b831cad231a334d5259467d40624defac6de54d72c694ef76af8bc7f93242a0383290145896e16f
-MISC ChangeLog 12909 SHA256 d14bc6df4d685b3cefd67f5a87d050fd9a0394bff1c93046df77da43b4a12d27 SHA512 790fba2e666058490a4c1a7df8b3d2da49569c6f23e51cb610b10ded0ae1514e17436f61aef7960af168d257b72add619e22cb8de99f078ca47d67da01097725 WHIRLPOOL 0b76bb7558e8cac4e62e93a78a62ff32579d86f653568b09a9b5e6943bc823ed4fa660217b8dfcb0cc5a23ae492b08876160b5ce74982bedca9e600244480ab8
+MISC ChangeLog 13046 SHA256 d9ce2162046da0b7b2e591470b6e09de81946972096de1526f6a040185f61c5d SHA512 f4de751781fe3ea3d5e9f88f6584b5fabf2fdf0741ca6df5d28408ce87c5c63cff87e1c023cab7fe8bdf02f174b9b1b9cadb466cddc81e66a8490591e9caa88f WHIRLPOOL 44f0deac019f78c6a184cb989041a376f32ae2d45fec2c5d6426599e8cb05189b00b1d403cd036b9b0b51eb9bea231925ab77041403668c4d51775c42506db7c
MISC metadata.xml 157 SHA256 bc6a4a3d5e32f9329039b242036828256c9f2c33862bc1d606d4ac8427032fdc SHA512 e30223e19870c9ee1cb96dbff14df3b5287e3d21a415f52723ef2f9d4968cc4ad865b76b0078e84aa03f8933d4930f36455dbf62c372bbc17be8bdf6d7410bf7 WHIRLPOOL a22bf55ae1b68446b851f6b2bdf9cc6bb8244acc787aaabb472cde13e36e64293741b80c52569f1e59e4fb4962f6f738eca8be09bddf732c2454f9ab07ac11d4
diff --git a/x11-base/xorg-drivers/xorg-drivers-1.14.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.14.ebuild
index cc33087e0cfd..63f2f3dcb02b 100644
--- a/x11-base/xorg-drivers/xorg-drivers-1.14.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-1.14.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-drivers/xorg-drivers-1.14.ebuild,v 1.3 2013/08/07 13:54:04 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-drivers/xorg-drivers-1.14.ebuild,v 1.4 2013/08/16 18:58:02 chithanh Exp $
EAPI=5
@@ -46,6 +46,7 @@ IUSE_VIDEO_CARDS="
video_cards_mach64
video_cards_mga
video_cards_modesetting
+ video_cards_neomagic
video_cards_nouveau
video_cards_nv
video_cards_omap
@@ -114,6 +115,7 @@ PDEPEND="
video_cards_mach64? ( x11-drivers/xf86-video-mach64 )
video_cards_mga? ( x11-drivers/xf86-video-mga )
video_cards_modesetting? ( x11-drivers/xf86-video-modesetting )
+ video_cards_neomagic? ( x11-drivers/xf86-video-neomagic )
video_cards_nouveau? ( x11-drivers/xf86-video-nouveau )
video_cards_nv? ( x11-drivers/xf86-video-nv )
video_cards_omap? ( x11-drivers/xf86-video-omap )
@@ -152,7 +154,6 @@ PDEPEND="
!x11-drivers/xf86-video-nsc
!x11-drivers/xf86-video-sunbw2
!<=x11-drivers/xf86-video-ark-0.7.5
- !<=x11-drivers/xf86-video-neomagic-1.2.7
!<=x11-drivers/xf86-video-newport-0.2.4
!<=x11-drivers/xf86-video-s3-0.6.5
!<=x11-drivers/xf86-video-sis-0.10.7