diff --git a/x11-drivers/xf86-video-ati/ChangeLog b/x11-drivers/xf86-video-ati/ChangeLog index 8556b0ac..76b6a8e6 100644 --- a/x11-drivers/xf86-video-ati/ChangeLog +++ b/x11-drivers/xf86-video-ati/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 07 Aug 2009; Mario Fetka + -xf86-video-ati-9999.ebuild, -xf86-video-ati-9999-r1.ebuild: + Update live ebuild + 30 Jul 2009; Mario Fetka +metadata.xml: Bump diff --git a/x11-drivers/xf86-video-ati/Manifest b/x11-drivers/xf86-video-ati/Manifest index f80b3b4a..ab050803 100644 --- a/x11-drivers/xf86-video-ati/Manifest +++ b/x11-drivers/xf86-video-ati/Manifest @@ -2,7 +2,6 @@ AUX old_hw_data/ati.xinf 2028 RMD160 0f57c7452bbf9d2d8d0a96f6f480b98e8a5c6d5f SH AUX old_hw_data/r128.xinf 2491 RMD160 02f5ae030596643bdc2ce4982ee47fdbdf656f95 SHA1 cee72fd687711845f4fc435cac00b715fc19b1d3 SHA256 d8f50f12b291d526353aa5d76c95137dafbff22bf47cbb751b686252d104279b AUX radeon.xinf 12504 RMD160 48b32c2d4acc1edff0e814a173ecce1b6026ba7c SHA1 1f4d98536d013d3ac6999781578d381bbd94023f SHA256 f23555826bfce07dfaafba60957e347e36fdb694c71bc3ad39d172e3863e7c96 AUX radeon_dri2_fix.patch 361 RMD160 27423de521f72981f5a1a4a24c0379adc31e9324 SHA1 7634358d6339a13f0340a466d3a39f0f33bdc885 SHA256 0c08a40aca33fcdd04968c7290cb3b5e8d7d7dc0e55b46491b7ea6f8c0a970b1 -EBUILD xf86-video-ati-9999-r1.ebuild 863 RMD160 3c923f5545d74763c26745ecf26706575d832871 SHA1 44520fdc06086cb2f1466a87adb6753bce646e58 SHA256 af0d8d7520bb11740a62f9ebdcb3aed2ba0b5f90c6daa077c3fdc0d768686575 -EBUILD xf86-video-ati-9999.ebuild 863 RMD160 3c923f5545d74763c26745ecf26706575d832871 SHA1 44520fdc06086cb2f1466a87adb6753bce646e58 SHA256 af0d8d7520bb11740a62f9ebdcb3aed2ba0b5f90c6daa077c3fdc0d768686575 -MISC ChangeLog 201 RMD160 8cee8bfca9bb28134237bc06c4f7bde23c4c6062 SHA1 47dbb851329f5b074de86aa4b3593225f74b64fa SHA256 9064798f78b06d0a9d48468cf3929853389bd974199280c939d39c3eef5cf91c +EBUILD xf86-video-ati-9999-r1.ebuild 935 RMD160 7f0057d1673fa14dad3409de82ad1109179e51d3 SHA1 e3d616259cb0ee48002553fa6b7fb20d4b751c51 SHA256 9e4ef90bf6792ce97bb5b676a1953714e643fa986bf264e5c0555f9b803e6020 +MISC ChangeLog 337 RMD160 149331079017144c8f93e3fc1eedd4cb63b3862a SHA1 08642c916c97efe74ed97b8ae0715fc0cc5742e7 SHA256 3a7c35399e9b1c72ccc3a2459f4e2f60483bbebb36b7ba1fc65de23d248fe84e MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-9999-r1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-9999-r1.ebuild index 521a3444..2849bc80 100644 --- a/x11-drivers/xf86-video-ati/xf86-video-ati-9999-r1.ebuild +++ b/x11-drivers/xf86-video-ati/xf86-video-ati-9999-r1.ebuild @@ -1,19 +1,20 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.192.ebuild,v 1.1 2007/05/21 05:25:33 dberkholz Exp $ -# Must be before x-modular eclass is inherited -SNAPSHOT="yes" +EAPI=2 +SNAPSHOT="yes" inherit x-modular DESCRIPTION="ATI video driver" KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" SRC_URI="" -IUSE="" +IUSE="kms" RDEPEND=">=x11-base/xorg-server-1.2[-minimal]" DEPEND="${RDEPEND} + kms? ( >=x11-base/xorg-server-1.7[-minimal] ) >=x11-libs/libdrm-2 >=x11-misc/util-macros-1.1.3 x11-proto/fontsproto @@ -27,9 +28,13 @@ DEPEND="${RDEPEND} x11-proto/xproto " -CONFIGURE_OPTIONS=" - --enable-dri - --enable-shave -" +PATCHES="${FILESDIR}/radeon_dri2_fix.patch" -PATCHES="${FILESDIR}/radeon_dri2_fix.patch" \ No newline at end of file +pkg_setup() { + CONFIGURE_OPTIONS=" + --enable-dri + --enable-shave + $(use_enable kms) + " + x-modular_pkg_setup +} diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild deleted file mode 100644 index 521a3444..00000000 --- a/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.192.ebuild,v 1.1 2007/05/21 05:25:33 dberkholz Exp $ - -# Must be before x-modular eclass is inherited -SNAPSHOT="yes" - -inherit x-modular - -DESCRIPTION="ATI video driver" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -SRC_URI="" -IUSE="" - -RDEPEND=">=x11-base/xorg-server-1.2[-minimal]" -DEPEND="${RDEPEND} - >=x11-libs/libdrm-2 - >=x11-misc/util-macros-1.1.3 - x11-proto/fontsproto - x11-proto/glproto - x11-proto/randrproto - x11-proto/videoproto - x11-proto/xextproto - x11-proto/xineramaproto - x11-proto/xf86driproto - x11-proto/xf86miscproto - x11-proto/xproto -" - -CONFIGURE_OPTIONS=" - --enable-dri - --enable-shave -" - -PATCHES="${FILESDIR}/radeon_dri2_fix.patch" \ No newline at end of file