Added an update from Keith Packard's CVS as well as a startxkd script that works decently. KDrive is under heavy work so look forward to some new stuff in the not-too-distant future.

4 files changed, 405 insertions, 2 deletions

diff --git a/x11-base/kdrive/ChangeLog b/x11-base/kdrive/ChangeLog
index dd9408d49799..fc3ad92e34bb 100644
--- a/x11-base/kdrive/ChangeLog
+++ b/x11-base/kdrive/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-base/kdrive
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/kdrive/ChangeLog,v 1.4 2003/09/16 05:56:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/kdrive/ChangeLog,v 1.5 2003/09/16 09:25:28 spyderous Exp $
+
+*kdrive-4.3.0-r1 (16 Sep 2003)
+
+  16 Sep 2003; Donnie Berkholz <spyderous@gentoo.org>; kdrive-4.3.0-r1.ebuild:
+  Added an update from Keith Packard's CVS as well as a startxkd script that
+  works decently. KDrive is under heavy work so look forward to some new stuff
+  in the not-too-distant future.
 
   16 Sep 2003; Donnie Berkholz <spyderous@gentoo.org>; kdrive-4.3.0.ebuild:
   Ebuild cleanup, disable type1 and truetype for now because they're useless in
diff --git a/x11-base/kdrive/Manifest b/x11-base/kdrive/Manifest
index 45ba2a7623ae..904b33d0cacc 100644
--- a/x11-base/kdrive/Manifest
+++ b/x11-base/kdrive/Manifest
@@ -1,4 +1,6 @@
-MD5 5b1f43f8818cfde2ba146de63946eea4 ChangeLog 679
+MD5 32bb70dc583c8432586574654bdad9a0 ChangeLog 980
+MD5 07a758227500fdb2c60f7d9629508ef0 kdrive-4.3.0-r1.ebuild 9865
 MD5 dfb36dc591c29412ab1e1c8716c8d837 kdrive-4.3.0.ebuild 10183
 MD5 a1c3090581323032b75d0416d74ced9e metadata.xml 251
 MD5 c1fefd05eb62aac375b37a764c0be440 files/digest-kdrive-4.3.0 253
+MD5 4722092beea0eb065c87c753070bc74b files/digest-kdrive-4.3.0-r1 254
diff --git a/x11-base/kdrive/files/digest-kdrive-4.3.0-r1 b/x11-base/kdrive/files/digest-kdrive-4.3.0-r1
new file mode 100644
index 000000000000..64d30c787084
--- /dev/null
+++ b/x11-base/kdrive/files/digest-kdrive-4.3.0-r1
@@ -0,0 +1,4 @@
+MD5 4f241a4f867363f40efa2b00dca292af X430src-1.tgz 10993622
+MD5 844c2ee908d21dbf8911fd13115bf8b4 X430src-2.tgz 7962239
+MD5 b82a0443e1b7bf860e4343e6b6766cb6 X430src-3.tgz 12366363
+MD5 a6287f603ee1cb53c35c145ebcf399f0 kdrive-4.3.0-gentoo-0.2.tar.bz2 10656
diff --git a/x11-base/kdrive/kdrive-4.3.0-r1.ebuild b/x11-base/kdrive/kdrive-4.3.0-r1.ebuild
new file mode 100644
index 000000000000..9b503c45a784
--- /dev/null
+++ b/x11-base/kdrive/kdrive-4.3.0-r1.ebuild
@@ -0,0 +1,390 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/kdrive/kdrive-4.3.0-r1.ebuild,v 1.1 2003/09/16 09:25:28 spyderous Exp $
+
+# If you don't want to build the Xvesa server, do this.
+# VESA="no" emerge kdrive
+
+# Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
+# that only we only strip stuff that are safe to strip ...
+RESTRICT="nostrip"
+
+IUSE="ipv6 xinerama fbdev"
+
+# VIDEO_CARDS="savage trident sis trio ts300 mach64 i810 igs"
+
+filter-flags "-funroll-loops"
+
+ALLOWED_FLAGS="-fstack-protector -march -mcpu -O -O1 -O2 -O3 -pipe"
+
+# Recently there has been a lot of stability problem in Gentoo-land.  Many
+# things can be the cause to this, but I believe that it is due to gcc3
+# still having issues with optimizations, or with it not filtering bad
+# combinations (protecting the user maybe from themselves) yet.
+#
+# This can clearly be seen in large builds like glibc, where too aggressive
+# CFLAGS cause the tests to fail miserbly.
+#
+# Quote from Nick Jones <carpaski@gentoo.org>, who in my opinion
+# knows what he is talking about:
+#
+#   People really shouldn't force code-specific options on... It's a
+#   bad idea. The -march options aren't just to look pretty. They enable
+#   options that are sensible (and include sse,mmx,3dnow when apropriate).
+#
+# The next command strips CFLAGS and CXXFLAGS from nearly all flags.  If
+# you do not like it, comment it, but do not bugreport if you run into
+# problems.
+#
+# <azarah@gentoo.org> (13 Oct 2002)
+strip-flags
+
+# Are we using a snapshot ?
+USE_SNAPSHOT="no"
+PATCHVER="0.2"
+
+PATCHDIR="${WORKDIR}/patch"
+BASE_PV="${PV}"
+MY_SV="${BASE_PV//\.}"
+S="${WORKDIR}/xc"
+SRC_PATH0="ftp://ftp.xfree.org/pub/XFree86/${BASE_PV}/source"
+SRC_PATH1="ftp://ftp1.sourceforge.net/pub/mirrors/XFree86/${BASE_PV}/source"
+HOMEPAGE="http://www.xfree.org"
+
+SRC_URI="${SRC_PATH0}/X${MY_SV}src-1.tgz
+	${SRC_PATH0}/X${MY_SV}src-2.tgz
+	${SRC_PATH0}/X${MY_SV}src-3.tgz
+	${SRC_PATH1}/X${MY_SV}src-1.tgz
+	${SRC_PATH1}/X${MY_SV}src-2.tgz
+	${SRC_PATH1}/X${MY_SV}src-3.tgz
+	mirror://gentoo/${P}-gentoo-${PATCHVER}.tar.bz2"
+
+LICENSE="X11"
+SLOT="0"
+KEYWORDS="x86"
+
+DEPEND=">=sys-apps/baselayout-1.8.3
+	>=sys-libs/ncurses-5.1
+	>=sys-libs/zlib-1.1.3-r2
+	>=sys-devel/flex-2.5.4a-r5
+	>=dev-libs/expat-1.95.3
+	>=sys-apps/sed-4
+	dev-lang/perl
+	media-libs/libpng
+	pam? ( >=sys-libs/pam-0.75 )"
+
+PROVIDE="virtual/x11"
+
+#inherit needs to happen *after* DEPEND has been defined to have "newdepend"
+#do the right thing. Otherwise RDEPEND doesn't get set properly.
+inherit eutils flag-o-matic gcc xfree
+
+DESCRIPTION="Xfree86: famous and free X server. Tiny version (Kdrive)"
+
+vesa() {
+	has "$1" "${VESA}"
+}
+
+src_unpack() {
+
+	# Unpack and patch source
+	unpack ${A}
+	# Update from Keith Packard's CVS repo, www.keithp.com
+	epatch ${PATCHDIR}/kdrive-keithp-CVS-20030707.patch
+	# XFree86 patch
+	epatch ${PATCHDIR}/XFree86-4.2.99.1-kdrive-posix-sigaction.patch
+
+	ebegin "Setting up config/cf/host.def"
+	cd ${S}
+	touch config/cf/host.def
+	echo "#define XVendorString \"Gentoo Linux (TinyX ${PV}, revision ${PR})\"
+#define KDriveXServer YES
+#define TinyXServer YES
+#define ProjectRoot /usr/X11R6
+#define BuildLBX YES
+#define BuildDBE YES
+#define KdriveServerExtraDefines -DPIXPRIV
+#define BuildRandR                 YES
+#define BuildXInputLib             YES
+#define BuildXTrueType             NO
+#define BuildScreenSaverExt        YES
+#define BuildScreenSaverLibrary    YES
+#define SharedLibXss               YES
+#define ServerXdmcpDefines         -DXDMCP
+#define BuildFonts                 NO" >>config/cf/host.def
+
+	# As far as I know, you can't use Xwrapper for multiple X servers,
+	# so we have to suid Xfbdev and Xvesa. mharris (redhat) also does
+	# this.
+	echo "#define InstallXserverSetUID YES" >> config/cf/host.def
+	echo "#define BuildServersOnly YES" >> config/cf/host.def
+
+	# Bug #12775 .. fails with -Os.
+	replace-flags "-Os" "-O2"
+
+	if [ "`gcc-version`" != "2.95" ]
+	then
+		# Should fix bug #4189.  gcc-3.x have problems with -march=pentium4
+		# and -march=athlon-tbird
+		replace-flags "-march=pentium4" "-march=pentium3"
+		replace-flags "-march=athlon-tbird" "-march=athlon"
+
+		# Without this, modules breaks with gcc3
+		if [ "`gcc-version`" = "3.1" ]
+		then
+			append-flags "-fno-merge-constants"
+			append-flags "-fno-merge-constants"
+		fi
+	fi
+
+	if [ "`uname -r | cut -d. -f1,2`" != "2.2" ]
+	then
+		echo "#define HasLinuxInput YES" >> config/cf/host.def
+	fi
+
+	echo "#define OptimizedCDebugFlags ${CFLAGS}" >> config/cf/host.def
+	echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS}" >> config/cf/host.def
+	if use debug
+	then
+		echo "#define XFree86Devel	YES" >> config/cf/host.def
+		echo "#define DoLoadableServer	NO" >>config/cf/host.def
+	else
+		# use less ram .. got this from Spider's makeedit.eclass :)
+		echo "#define GccWarningOptions -Wno-return-type -w" \
+			>> config/cf/host.def
+	fi
+
+	if [ "${ARCH}" = "x86" ] && false # Let X decide this
+	then
+		# optimize for architecture
+		if use mmx
+		then
+			echo "#define HasMMXSupport	YES" >> config/cf/host.def
+		else
+			echo "#define HasMMXSupport	NO" >> config/cf/host.def
+		fi
+		if use mmx && use 3dnow
+		then
+			echo "#define Has3DNowSupport YES" >> config/cf/host.def
+		else
+			echo "#define Has3DNowSupport NO" >> config/cf/host.def
+		fi
+		if use mmx && use sse
+		then
+			echo "#define HasKatmaiSupport YES" >> config/cf/host.def
+		else
+			echo "#define HasKatmaiSupport NO" >> config/cf/host.def
+		fi
+
+	fi
+
+	# Xvesa isn't available on non-x86, non-gcc platforms.
+	# See http://lists.debian.org/debian-x/2000/debian-x-200012/msg00029.html
+
+	if vesa no
+	then
+		echo "#define XvesaServer NO" >> config/cf/host.def
+	else
+		if [ "${ARCH}" != "x86" ]
+		then
+			echo "#define XvesaServer NO" >> config/cf/host.def
+		else
+			echo "#define XvesaServer YES" >> config/cf/host.def
+		fi
+	fi
+
+	if use fbdev
+	then
+		echo "#define XfbdevServer YES" >> config/cf/host.def
+	else
+		echo "#define XfbdevServer NO" >> config/cf/host.def
+	fi
+
+	if use ipv6
+	then
+		echo "#define HasIPv6 YES" >> config/cf/host.def
+	fi
+
+	if use xinerama
+	then
+		echo "#define BuildXinerama YES" >> config/cf/host.def
+		# Don't know if this is necessary. Probably.
+		echo "#define BuildXineramaLibrary YES" >> config/cf/host.def
+	fi
+
+	# By default, this will build a server with no support for scalable
+	# fonts (but support for built-in ``fixed'' and ``cursor'' fonts, and
+	# normal support for bitmap fonts and font-server provided fonts).
+
+#	if use video_cards_savage
+	if vcards savage
+	then
+		echo "#define XSavageServer YES" >> config/cf/host.def
+	fi
+
+#	if use video_cards_trident
+	if vcards trident
+	then
+		echo "#define XTridentServer YES" >> config/cf/host.def
+	fi
+
+#	if use video_cards_sis
+	if vcards sis
+	then
+		echo "#define XSis530Server YES" >> config/cf/host.def
+	fi
+
+#	if use video_cards_trio
+	if vcards trio
+	then
+		echo "#define XTrioServer YES" >> config/cf/host.def
+	fi
+
+#	if use video_cards_ts300
+	if vcards ts300
+	then
+		echo "#define XTS300Server YES" >> config/cf/host.def
+	fi
+
+#	if use video_cards_igs
+	if vcards igs
+	then
+		echo "#define XIgsServer YES" >> config/cf/host.def
+	fi
+
+#	if use video_cards_i810
+	if vcards i810
+	then
+		echo "#define Xi810Server YES" >> config/cf/host.def
+	fi
+
+#	if use video_cards_mach64
+	if vcards mach64
+	then
+		echo "#define Xmach64Server YES" >> config/cf/host.def
+	fi
+
+	eend 0
+}
+
+src_compile() {
+
+	# Set MAKEOPTS to have proper -j? option ..
+	get_number_of_jobs
+
+	# If a user defines the MAKE_OPTS variable in /etc/make.conf instead of
+	# MAKEOPTS, they'll redefine an internal XFree86 Makefile variable and the
+	# xfree build will silently die. This is tricky to track down, so I'm
+	# adding a preemptive fix for this issue by making sure that MAKE_OPTS is
+	# unset. (drobbins, 08 Mar 2003)
+	unset MAKE_OPTS
+
+	einfo "Building XFree86..."
+	emake World || die
+
+# Build man
+	ebegin "Making and installing man pages..."
+	local M=${WORKDIR}/man
+	mkdir ${M}
+	make install.man DESTDIR=${M} || die
+	eend 0
+
+}
+
+src_install() {
+
+	exeinto /usr/X11R6/bin
+
+	if [ -z "`vesa no`" ]
+	then
+		doexe programs/Xserver/Xvesa
+		fperms 4755 /usr/X11R6/bin/Xvesa
+	fi
+
+	if use fbdev
+	then
+		doexe programs/Xserver/Xfbdev
+		fperms 4755 /usr/X11R6/bin/Xfbdev
+	fi
+
+#	if use video_cards_savage
+	if vcards savage
+	then
+		doexe programs/Xserver/Xsavage
+		fperms 4755 /usr/X11R6/bin/Xsavage
+	fi
+
+#	if use video_cards_trident
+	if vcards trident
+	then
+		doexe programs/Xserver/Xtrident
+		fperms 4755 /usr/X11R6/bin/Xtrident
+	fi
+
+#	if use video_cards_sis
+	if vcards sis
+	then
+		doexe programs/Xserver/Xsis530
+		fperms 4755 /usr/X11R6/bin/Xsis530
+	fi
+
+#	if use video_cards_trio
+	if vcards trio
+	then
+		doexe programs/Xserver/Xtrio
+		fperms 4755 /usr/X11R6/bin/Xtrio
+	fi
+
+#	if use video_cards_ts300
+	if vcards ts300
+	then
+		doexe programs/Xserver/Xts300
+		fperms 4755 /usr/X11R6/bin/Xts300
+	fi
+
+#	if use video_cards_igs
+	if vcards igs
+	then
+		doexe programs/Xserver/Xigs
+		fperms 4755 /usr/X11R6/bin/Xigs
+	fi
+
+#	if use video_cards_i810
+	if vcards i810
+	then
+		doexe programs/Xserver/Xi810
+		fperms 4755 /usr/X11R6/bin/Xi810
+	fi
+
+#	if use video_cards_mach64
+	if vcards mach64
+	then
+		doexe programs/Xserver/Xmach64
+		fperms 4755 /usr/X11R6/bin/Xmach64
+	fi
+
+# We also need to install our startx script.
+	exeinto /usr/X11R6/bin
+	doexe ${PATCHDIR}/startxkd
+
+	local M=${WORKDIR}/man
+	if use fbdev
+	then
+		doman -x11 ${M}/usr/X11R6/man/man1/Xfbdev.1x
+	fi
+	if [ -z "`vesa no`" ]
+	then
+		doman -x11 ${M}/usr/X11R6/man/man1/Xvesa.1x
+	fi
+	doman -x11 ${M}/usr/X11R6/man/man1/Xkdrive.1x
+
+}
+
+pkg_postinst() {
+
+	einfo "You may edit /usr/X11R6/bin/startxkd to your preferences."
+	einfo "Xvesa is the default."
+	einfo "Or you can use something like:"
+	einfo "\"xinit -- /usr/X11R6/bin/Xvesa :0 -screen 1280x1024x16 -nolisten tcp\"."
+	einfo "Your ~/.xinitrc will be used if you use xinit."
+}