Remove masked snapshot, build's broken. Use >=xorg-server-1.0.99.x with USE=kdrive instead.

Package-Manager: portage-2.1_pre9-r3

4 files changed, 15 insertions, 138 deletions

diff --git a/x11-base/kdrive/Manifest b/x11-base/kdrive/Manifest
index 82ed27f69963..e2a8b72e8a99 100644
--- a/x11-base/kdrive/Manifest
+++ b/x11-base/kdrive/Manifest
@@ -1,24 +1,24 @@
-MD5 00177b636ec7cfdec226ea104651375d ChangeLog 6953
-RMD160 03122c6b5876ca1d54a72590220a4aa59597bd8f ChangeLog 6953
-SHA256 ce5cb680c0586bd3c507830343233576bfcc7a1e11a457a6a3510e78ead90df3 ChangeLog 6953
-MD5 a6e0af618cce0a49bbda2a83d4704b53 files/digest-kdrive-4.3.0-r5 254
-RMD160 9a7a49ab6679a02502a914bf3193351ac9afe160 files/digest-kdrive-4.3.0-r5 254
-SHA256 1cc5033259440b97a7d172883359c6615e8c04bf79598e81d408896422d4cdb5 files/digest-kdrive-4.3.0-r5 254
-MD5 150e6b8975ca879186466f40884bd085 files/digest-kdrive-6.6.1_pre20050820 70
-RMD160 5578367b446a8fa7e5e448ccaec5718d7f64db65 files/digest-kdrive-6.6.1_pre20050820 70
-SHA256 8c3f2a618b750147e68493a5c86ae07adf4f49d1b02a2f4f54827a6569545b07 files/digest-kdrive-6.6.1_pre20050820 70
-MD5 69b96dd899a580d0ad5d2516108ee97c files/make-xv-configable.patch 611
-RMD160 4ff7a782135b3d999ee41bcb417874c1ea5f66e3 files/make-xv-configable.patch 611
-SHA256 9461a7eb2a6b41c8d83a6d9be4fe75290ee63495f3b751225841378add40fb38 files/make-xv-configable.patch 611
+AUX startxkd 392 RMD160 47a4a44914e70e4b3858244fe20867892c5b37ed SHA1 6e9fe083440db983a41d58a70c0901f1b983d01a SHA256 539ec2ada482af363a1adb956aa1cb7a0fbbc8a2942dd7d82615bc2ab5b62c28 size 392
 MD5 df59ec9c062d8c091f496ba8d57f054e files/startxkd 392
 RMD160 47a4a44914e70e4b3858244fe20867892c5b37ed files/startxkd 392
 SHA256 539ec2ada482af363a1adb956aa1cb7a0fbbc8a2942dd7d82615bc2ab5b62c28 files/startxkd 392
+DIST X430src-1.tgz 10993622 size 10993622
+DIST X430src-2.tgz 7962239 size 7962239
+DIST X430src-3.tgz 12366363 size 12366363
+DIST kdrive-4.3.0-gentoo-0.5.tar.bz2 11257 size 11257
+EBUILD kdrive-4.3.0-r5.ebuild 10508 RMD160 b0ab5a78a6ad312aa5d89c7275fde4242ac52b4d SHA1 fdc11e984c49290f3a82e50bf84aacb6074377b0 SHA256 b6f56bc55c49527ec88f058454b18441243148d3b345ab2c04b65e3873b384ec size 10508
 MD5 3b00ebb391649664c2648d41e371d876 kdrive-4.3.0-r5.ebuild 10508
 RMD160 b0ab5a78a6ad312aa5d89c7275fde4242ac52b4d kdrive-4.3.0-r5.ebuild 10508
 SHA256 b6f56bc55c49527ec88f058454b18441243148d3b345ab2c04b65e3873b384ec kdrive-4.3.0-r5.ebuild 10508
-MD5 63eb18695d83622acf3bc9dd7712d20a kdrive-6.6.1_pre20050820.ebuild 2386
-RMD160 10ad5196d9290200cc3380687800f1d5af88aaec kdrive-6.6.1_pre20050820.ebuild 2386
-SHA256 cacbf221aea912241df40eb96a9fa2701815025befffa94ca9afb520377373e0 kdrive-6.6.1_pre20050820.ebuild 2386
+MISC ChangeLog 7174 RMD160 af7af6c837165376c0010b691b94f7ecea80c640 SHA1 11711465446731c61c76424e8bbba9c01ffa8d55 SHA256 c26d6659f44bf8139529817761d36b4924080ff54c94d772249aa4e099ebbedf size 7174
+MD5 83eeb89a7b94d6df2ae4bd9e9525008e ChangeLog 7174
+RMD160 af7af6c837165376c0010b691b94f7ecea80c640 ChangeLog 7174
+SHA256 c26d6659f44bf8139529817761d36b4924080ff54c94d772249aa4e099ebbedf ChangeLog 7174
+MISC metadata.xml 249 RMD160 be163289d2f53d86d50f1581c32f5deda3170e5d SHA1 e84bb6aa39011191af1fe059c68b6d0ad1d7c468 SHA256 81426ccb51c7b3ca1e00827e40bc5e4b12eac62bc71cbd24aecfa1ec3014d027 size 249
 MD5 857cb50121a1ff814cb50eec928a7ed7 metadata.xml 249
 RMD160 be163289d2f53d86d50f1581c32f5deda3170e5d metadata.xml 249
 SHA256 81426ccb51c7b3ca1e00827e40bc5e4b12eac62bc71cbd24aecfa1ec3014d027 metadata.xml 249
+MD5 a6e0af618cce0a49bbda2a83d4704b53 files/digest-kdrive-4.3.0-r5 254
+RMD160 9a7a49ab6679a02502a914bf3193351ac9afe160 files/digest-kdrive-4.3.0-r5 254
+SHA256 1cc5033259440b97a7d172883359c6615e8c04bf79598e81d408896422d4cdb5 files/digest-kdrive-4.3.0-r5 254
+size 254 files/digest-kdrive-4.3.0-r5 254
diff --git a/x11-base/kdrive/files/digest-kdrive-6.6.1_pre20050820 b/x11-base/kdrive/files/digest-kdrive-6.6.1_pre20050820
deleted file mode 100644
index 72b30cc7c2fa..000000000000
--- a/x11-base/kdrive/files/digest-kdrive-6.6.1_pre20050820
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9ace6fab2a706bb03790bdd2a21cfd32 xserver-20050820.tar.bz2 1815884
diff --git a/x11-base/kdrive/files/make-xv-configable.patch b/x11-base/kdrive/files/make-xv-configable.patch
deleted file mode 100644
index 0f29c6fd02a9..000000000000
--- a/x11-base/kdrive/files/make-xv-configable.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://bugs.freedesktop.org/show_bug.cgi?id=4166
-
-diff -urN xserver.orig/hw/kdrive/i810/Makefile.am xserver/hw/kdrive/i810/Makefile.am
---- xserver.orig/hw/kdrive/i810/Makefile.am	2005-08-14 20:19:34.000000000 -0700
-+++ xserver/hw/kdrive/i810/Makefile.am	2005-08-20 20:52:47.000000000 -0700
-@@ -6,18 +6,22 @@
- 
- noinst_LIBRARIES = libi810.a
- 
-+if XV
-+XV_SOURCES = i810_video.c
-+endif
-+
- if TSLIB
- TSLIB_FLAG = -lts
- endif
- 
- libi810_a_SOURCES = 		\
- 	i810_cursor.c	\
--	i810_video.c	\
- 	i810draw.c	\
- 	i810draw.h	\
- 	i810_reg.h	\
- 	i810.c		\
--	i810.h
-+	i810.h \
-+	$(XV_SOURCES)
- 
- Xi810_SOURCES = \
- 	i810stub.c
diff --git a/x11-base/kdrive/kdrive-6.6.1_pre20050820.ebuild b/x11-base/kdrive/kdrive-6.6.1_pre20050820.ebuild
deleted file mode 100644
index fece3b6b416e..000000000000
--- a/x11-base/kdrive/kdrive-6.6.1_pre20050820.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/kdrive/kdrive-6.6.1_pre20050820.ebuild,v 1.7 2006/03/14 21:49:45 spyderous Exp $
-
-SNAPSHOT="yes"
-
-inherit flag-o-matic x-modular
-
-PATCHES="${FILESDIR}/make-xv-configable.patch"
-
-MY_PN="xserver"
-MY_P="${MY_PN}-${PV##*pre}"
-SRC_URI="http://dev.gentoo.org/~spyderous/overlay/distfiles/${MY_P}.tar.bz2"
-HOMEPAGE="http://xserver.freedesktop.org/wiki/Software/Xserver"
-DESCRIPTION="Experimental X11 implementations"
-KEYWORDS="~ppc64 ~x86"
-IUSE="ipv6 static minimal"
-RDEPEND="x11-libs/libXdmcp
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXfont
-	x11-libs/xtrans
-	x11-libs/libXau
-	x11-libs/libXrender
-	>=media-libs/glitz-0.4.3
-	media-libs/freetype"
-DEPEND="${RDEPEND}
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/fixesproto
-	x11-proto/damageproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/compositeproto
-	x11-proto/resourceproto
-	x11-proto/recordproto"
-LICENSE="${LICENSE} GLX SGI-B-1.1 MIT"
-
-# Strip off the version
-S="${WORKDIR}/${MY_P%%-[0-9]*}"
-
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_enable ipv6)
-		$(use_enable !minimal xv)
-		$(use_enable !minimal composite)
-		$(use_enable !minimal xrecord)
-		$(use_enable !minimal xres)
-		--enable-xglserver
-		--enable-xglxserver
-		--disable-xeglserver
-		--with-fontpath=/usr/share/fonts/misc,/usr/share/fonts/100dpi,/usr/share/fonts/75dpi"
-	# Probably need to --enable-egl in glitz for this
-	#	--enable-xeglserver
-
-	append-ldflags $(bindnow-flags)
-}
-
-src_compile() {
-	x-modular_src_configure
-
-	# Has to be after configure, or configure dies
-	if use static; then
-		append-ldflags -all-static
-	fi
-
-	# Yes, we do need the LDFLAGS here in addition to the above append.
-	emake LDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	x-modular_src_install
-
-	ebegin "Making X servers suid"
-		find ${D}${XDIR}/bin -name 'X*' \
-			| sed -e "s:${D}::g" \
-			| xargs fperms u+s
-	eend 0
-
-	# Install our startx script
-	exeinto ${XDIR}/bin
-	doexe ${FILESDIR}/startxkd
-}
-
-pkg_postinst() {
-	x-modular_pkg_postinst
-
-	einfo "You may edit ${XDIR}/bin/startxkd to your preferences."
-	einfo "Xvesa is the default."
-	einfo "Or you can use something like:"
-	einfo "\"xinit -- ${XDIR}/bin/Xvesa :0 -screen 1280x1024x16 -nolisten tcp\"."
-	einfo "Your ~/.xinitrc will be used if you use xinit."
-}