diff options
author | Rémi Cardona <remi@gentoo.org> | 2009-02-28 07:58:22 +0000 |
---|---|---|
committer | Rémi Cardona <remi@gentoo.org> | 2009-02-28 07:58:22 +0000 |
commit | 9bcb937c11d2be57eee6de777036e50828a52e0b (patch) | |
tree | e1aba89b329a78f132a0a23a4f5390fbc9403fef /x11-base | |
parent | mask games-action/parsec for removal (diff) | |
download | gentoo-2-9bcb937c11d2be57eee6de777036e50828a52e0b.tar.gz gentoo-2-9bcb937c11d2be57eee6de777036e50828a52e0b.tar.bz2 gentoo-2-9bcb937c11d2be57eee6de777036e50828a52e0b.zip |
remove x11-base/kdrive
Diffstat (limited to 'x11-base')
-rw-r--r-- | x11-base/kdrive/ChangeLog | 197 | ||||
-rw-r--r-- | x11-base/kdrive/Manifest | 9 | ||||
-rw-r--r-- | x11-base/kdrive/files/kdrive-4.3.0-r5-vga.patch | 11 | ||||
-rwxr-xr-x | x11-base/kdrive/files/startxkd | 25 | ||||
-rw-r--r-- | x11-base/kdrive/kdrive-4.3.0-r5.ebuild | 308 | ||||
-rw-r--r-- | x11-base/kdrive/metadata.xml | 12 |
6 files changed, 0 insertions, 562 deletions
diff --git a/x11-base/kdrive/ChangeLog b/x11-base/kdrive/ChangeLog deleted file mode 100644 index 0f1421611909..000000000000 --- a/x11-base/kdrive/ChangeLog +++ /dev/null @@ -1,197 +0,0 @@ -# ChangeLog for x11-base/kdrive -# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/kdrive/ChangeLog,v 1.48 2008/10/05 16:25:57 remi Exp $ - - 05 Oct 2008; Rémi Cardona <remi@gentoo.org> kdrive-4.3.0-r5.ebuild: - fix patching (fixes bug #232980) - - 05 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml: - add GLEP 56 USE flag desc from use.local.desc - - 14 Jul 2008; Donnie Berkholz <dberkholz@gentoo.org>; - +files/kdrive-4.3.0-r5-vga.patch, kdrive-4.3.0-r5.ebuild: - (#229647) Fix compilation by looking for sys/io.h instead of asm/io.h. - - 11 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>; - kdrive-4.3.0-r5.ebuild: - (#168044) Stop checking files in ROOT during src_compile(). We lose kernel - 2.2 support, oh no! - - 09 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>; - kdrive-4.3.0-r5.ebuild: - Fix quoting issues caught by latest repoman. - - 22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; - kdrive-4.3.0-r5.ebuild: - Change virtual/x11 refs to x11-base/xorg-server. - - 01 Dec 2006; Donnie Berkholz <dberkholz@gentoo.org>; metadata.xml: - Typo in herd. - - 07 Jul 2006; Donnie Berkholz <dberkholz@gentoo.org>; ChangeLog: - Update to my new email address. - - 24 Apr 2006; Donnie Berkholz <dberkholz@gentoo.org>; - -files/make-xv-configable.patch, -kdrive-6.6.1_pre20050820.ebuild: - Remove masked snapshot, build's broken. Use >=xorg-server-1.0.99.x with - USE=kdrive instead. - - 14 Mar 2006; Donnie Berkholz <dberkholz@gentoo.org>; - kdrive-6.6.1_pre20050820.ebuild: - Add a die after emake. - - 14 Feb 2006; Markus Rothe <corsair@gentoo.org> - kdrive-6.6.1_pre20050820.ebuild: - Added ~ppc64 - - 13 Feb 2006; Donnie Berkholz <dberkholz@gentoo.org>; - kdrive-4.3.0-r5.ebuild: - (#122523) Fix SRC_URI. - - 19 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org> - kdrive-6.6.1_pre20050820.ebuild: - Update kdrive's licenses. - - 25 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> - kdrive-6.6.1_pre20050820.ebuild: - Use bindnow-flags function instead of -Wl,-z,now. - - 09 Dec 2005; Donnie Berkholz <dberkholz@gentoo.org>; - +kdrive-4.3.0-r5.ebuild: - Automated script shouldn't have had this package as input, because it's not - all hard-masked. Restore old version. - - 09 Dec 2005; Donnie Berkholz <dberkholz@gentoo.org>; - -kdrive-4.3.0-r5.ebuild: - Pull old versions. - - 21 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>; - +files/make-xv-configable.patch, kdrive-6.6.1_pre20050820.ebuild: - Add minimal USE flag, which disables xv, composite, xrecord and xres. Make - static USE flag actually build static servers -- this still works for - neither Xati, Xephyr, Xepson, Xfake or Xi810 among kdrive servers nor Xglx. - - 21 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>; files/startxkd: - Fix up startxkd so it works better for me. - -*kdrive-6.6.1_pre20050820 (21 Aug 2005) - - 21 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>; +files/startxkd, - +kdrive-6.6.1_pre20050820.ebuild: - New snapshot of kdrive, a pack of tiny X servers. Perhaps the most - interesting part of this is Xglx, a server layered on top of OpenGL. It runs - on an OpenGL-enabled X server, similar to how Xnest works. Another - interesting new server is Xephyr, which is like Xnest but supports the - composite/damage extensions, also it can run at different bpp than the host, - e.g. 8bpp on a 24bpp host. The other included servers are: Xfbdev Xvesa - Xmach64 Xmga Xnvidia Xr128 Xsmi Xchips Xpm2 Xvia Xneomagic Xati Xfake Xi810 - Xepson. Xfake can be useful in combination with apps like luminocity. This - builds against the modular X framework, so you need to be using modular X to - use it. - - 06 Jul 2005; Donnie Berkholz <dberkholz@gentoo.org>; - kdrive-4.3.0-r5.ebuild: - (#74869) USE flag cleanup, from Diego Pettenò <flameeyes@gentoo.org>. - - 26 Nov 2004; Andrew Bevitt <cyfred@gentoo.org> kdrive-4.3.0-r5.ebuild: - Fixing bugs 65758 and 68531 -- this disables toshiba dpms support, unfortunately. - - 26 Nov 2004; Andrew Bevitt <cyfred@gentoo.org> kdrive-4.3.0-r5.ebuild: - Converted over to new linux-info eclass, bug #68455 - - 23 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - kdrive-4.3.0-r5.ebuild: - Change fs USE flag to font-server. - - 17 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - kdrive-4.3.0-r5.ebuild: - Add debug to IUSE, and uncomment the video card listing, IUSE_VIDEO_CARDS. - - 20 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; kdrive-4.3.0-r5.ebuild: - Update inherit to toolchain-funcs instead of gcc and x11 instead of xfree. - - 26 Jul 2004; Donnie Berkholz <dberkholz@gentoo.org>; kdrive-4.3.0-r5.ebuild: - /usr/src/linux needs ${ROOT}. - - 23 Jun 2004; Andrew Bevitt <cyfred@gentoo.org>; kdrive-4.3.0-r5.ebuild: - Reverting old kernel detection method for livecd, integrating koutput - - 12 Jun 2004; Andrew Bevitt <cyfred@gentoo.org>; kdrive-4.3.0-r5.ebuild: - Adding support for koutput in kernel tree - - 01 Jun 2004; Donnie Berkholz <dberkholz@gentoo.org>; kdrive-4.3.0-r5.ebuild: - Move inherit up, above uses of flag-o-matic. - - 11 Apr 2004; Donnie Berkholz <dberkholz@gentoo.org>; kdrive-4.3.0-r5.ebuild: - xorg-x11 compatibility update. - - 24 Mar 2004; Martin Holzer <mholzer@gentoo.org> kdrive-4.3.0-r5.ebuild: - now shows description. closes 45530 - - 19 Mar 2004; Donnie Berkholz <dberkholz@gentoo.org>; kdrive-4.3.0-r1.ebuild, - kdrive-4.3.0-r4.ebuild: - Pulling old revisions. - -*kdrive-4.3.0-r5 (19 Mar 2004) - - 19 Mar 2004; Donnie Berkholz <dberkholz@gentoo.org>; kdrive-4.3.0-r5.ebuild: - Removing PROVIDE=virtual/x11. This should be used for the libraries, not the - servers, because it's what other packages build against. Mark -r5 x86 also, - since only change from -r4 is the PROVIDE and that has no effect on stability. - - 24 Feb 2004; Donnie Berkholz <dberkholz@gentoo.org>; kdrive-4.3.0-r1.ebuild: - Change is_kernel check so it defaults to running kernel if /usr/src/linux - doesn't exist so it works on LiveCD. - - 15 Feb 2004; Donnie Berkholz <dberkholz@gentoo.org>; kdrive-4.3.0.ebuild: - Pulling old stable version, there's a newer one. - - 15 Feb 2004; Donnie Berkholz <dberkholz@gentoo.org>; kdrive-4.3.0-r2.ebuild: - Pulling broken version, not here for any real reason I can see. - -*kdrive-4.3.0-r4 (28 Jan 2004) - - 28 Jan 2004; Andrew Bevitt <cyfred@gentoo.org>; kdrive-4.3.0-r3.ebuild, - kdrive-4.3.0-r4.ebuild: - Updating to install man pages correctly. - -*kdrive-4.3.0-r3 (21 Jan 2004) - - 21 Jan 2004; Andrew Bevitt <cyfred@gentoo.org>; kdrive-4.3.0-r3.ebuild: - Updated version fixes support for building on systems without XFree86 - libraries, closes bug - -*kdrive-4.3.0-r2 (10 Nov 2003) - - 10 Nov 2003; Donnie Berkholz <dberkholz@gentoo.org>; kdrive-4.3.0-r2.ebuild: - Add missing include patch to close bug #32368 and allow kdrive to compile - without xfree installed. Remove LBX support, add support for speedo, type1, - truetype, cid fonts, font server and xv. Clean up code -- Change M to MANDIR, - move it to a global var, move vesa() to the bottom, re-tab things properly. - Change epatch to bulk patching. Allow -Os and -fomit-frame-pointer CFLAGS. Fix - issue if /usr/src/linux doesn't exist. Always install all KDrive man pages, - since documentation on it is so slim. - - 12 Oct 2003; Donnie Berkholz <dberkholz@gentoo.org>; kdrive-4.3.0-r1.ebuild: - Major reworking of ebuild, centered around removing repetitive statements. - Also smaller fixes. Moved to USE_EXPAND from local vcards variable. - -*kdrive-4.3.0-r1 (16 Sep 2003) - - 16 Sep 2003; Donnie Berkholz <dberkholz@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 <dberkholz@gentoo.org>; kdrive-4.3.0.ebuild: - Ebuild cleanup, disable type1 and truetype for now because they're useless in - the current setup. - - 18 Jul 2003; Donnie Berkholz <dberkholz@gentoo.org>; kdrive-4.3.0.ebuild: - Marked stable for x86. - -*kdrive-4.3.0 (07 Jul 2003) - - 07 Jul 2003; Donnie Berkholz <dberkholz@gentoo.org>; kdrive-4.3.0.ebuild: - Initial commit. Thanks to jjosegutierrez@terra.es for submitting an ebuild. - diff --git a/x11-base/kdrive/Manifest b/x11-base/kdrive/Manifest deleted file mode 100644 index bd464efb70f6..000000000000 --- a/x11-base/kdrive/Manifest +++ /dev/null @@ -1,9 +0,0 @@ -AUX kdrive-4.3.0-r5-vga.patch 307 RMD160 d204983ca3d6570ad5020465709764cca1187aec SHA1 79e81b50fed9e09e486f15bd6a531dfee4583807 SHA256 a28dcf6e5950ef17fc085d3114241a732119df21ef63e74e49265fffda2e2d8b -AUX startxkd 392 RMD160 47a4a44914e70e4b3858244fe20867892c5b37ed SHA1 6e9fe083440db983a41d58a70c0901f1b983d01a SHA256 539ec2ada482af363a1adb956aa1cb7a0fbbc8a2942dd7d82615bc2ab5b62c28 -DIST X430src-1.tgz 10993622 RMD160 46d4c1c99d9b6529912b05c9fa7ed0b7993e948b SHA1 3aaf219e8c2d3eb299f150bd4a2554a84a19354b SHA256 5276b045e154948fce7abba7d686406c65862d90b43b50f2546b33e38378f0d7 -DIST X430src-2.tgz 7962239 RMD160 d5081f5e1f1498b2def0ec6b562c4d873275a9e5 SHA1 0fd76324484d793498900655c15117f15c539000 SHA256 0afbf41d0f4bcaceb1381fc1882b80f62548845b85c83c3eb0f3a9ac7f7f96ef -DIST X430src-3.tgz 12366363 RMD160 fd585512ec26fec1c70d79954376e79c3d53248b SHA1 a11e619ba0b628d9e2e39e838379658b3b347f66 SHA256 19a830e3657851ad575ca895eb59932f1d90cd03735dec68f900dbc1bb6c3b7f -DIST kdrive-4.3.0-gentoo-0.5.tar.bz2 11257 RMD160 992605f87b3cefd527bd1969f8183f6f81c056b2 SHA1 3cf27afc87dfc62d76cfbfe7781b1d784bdb8e95 SHA256 451f2a2a4404be2bf4c411059b2cf9ee480d9fcabd8e785ccbeda73bf8c701f4 -EBUILD kdrive-4.3.0-r5.ebuild 10484 RMD160 013dae5bcbce0f9c31a59db9d1f040738cb74716 SHA1 09745432a252ec7a5d5dd8eb35ae715bc0e198eb SHA256 a1eb4015deaac8ecc908f4f935a76cd9946c4c1a14a0adc07cdc7e436716bef6 -MISC ChangeLog 8208 RMD160 765e1d8ce20c7b979a88593ce25f713f614759d0 SHA1 0ecaadb311c0b580f0f11b76b71f1437e6a24aba SHA256 4d50fecb465fb632a4deb818b408317eba537d6a3cc25a43bf5c950f00708b50 -MISC metadata.xml 494 RMD160 a32f797a3cf7c8f5259af77f85abfb46260bef84 SHA1 c57179d7d4dace03e422b783401aac311500c521 SHA256 bcb2c7e0448b0b55d7db7bed21c35d27a7d0e685b72aac2591f2e5ec32c56f2e diff --git a/x11-base/kdrive/files/kdrive-4.3.0-r5-vga.patch b/x11-base/kdrive/files/kdrive-4.3.0-r5-vga.patch deleted file mode 100644 index e54eeecfd2ef..000000000000 --- a/x11-base/kdrive/files/kdrive-4.3.0-r5-vga.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xc.orig/programs/Xserver/hw/kdrive/vga.c 2008-06-24 08:37:40 +0000 -+++ xc/programs/Xserver/hw/kdrive/vga.c 2008-06-24 08:40:23 +0000 -@@ -29,7 +29,7 @@ - #ifdef linux - #ifdef __i386__ - #define extern static --#include <asm/io.h> -+#include <sys/io.h> - #undef extern - - #define _VgaInb(r) inb(r) diff --git a/x11-base/kdrive/files/startxkd b/x11-base/kdrive/files/startxkd deleted file mode 100755 index 4906dee2fdd4..000000000000 --- a/x11-base/kdrive/files/startxkd +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -case $0 in - */*) - dir=`dirname $0`/ - ;; -esac - -server="Xvesa" -#server="Xfbdev" - -#screen="-screen 1024x768x16" -screen="-screen 1280x1024x16" - -rgb="-rgba rgb" - -mouse="-mouse /dev/input/mice,5" - -opts="-dpi 96 -nolisten tcp" - -#switchcmd="-switchCmd /usr/bin/touchpad" - -#fontpath="-fp /usr/share/fonts" -#fontpath="" - -exec ${dir}${server} $opts $rgb $screen $mouse $switchcmd $fontpath $* diff --git a/x11-base/kdrive/kdrive-4.3.0-r5.ebuild b/x11-base/kdrive/kdrive-4.3.0-r5.ebuild deleted file mode 100644 index ddbc8443d64e..000000000000 --- a/x11-base/kdrive/kdrive-4.3.0-r5.ebuild +++ /dev/null @@ -1,308 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/kdrive/kdrive-4.3.0-r5.ebuild,v 1.25 2008/10/05 16:25:57 remi Exp $ - -# If you don't want to build the Xvesa server, do this. -# VESA="no" emerge kdrive - -# 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). - -IUSE="ipv6 xinerama fbdev speedo type1 cjk truetype font-server xv debug" - -IUSE_VIDEO_CARDS="savage trident sis530 trio ts300 mach64 i810 igs" - -inherit eutils flag-o-matic toolchain-funcs x11 linux-info - -filter-flags "-funroll-loops" - -ALLOWED_FLAGS="-fstack-protector -march -mcpu -O -O1 -Os -O2 -O3 -pipe -fomit-frame-pointer" - -# 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.5" -MANDIR=${WORKDIR}/man -PATCH_DIR="${WORKDIR}/patch" -BASE_PV="${PV}" -MY_SV="${BASE_PV//\.}" -S="${WORKDIR}/xc" -SRC_PATH="ftp://ftp.xfree.org/pub/XFree86/${BASE_PV}/source" -HOMEPAGE="http://www.xfree.org" -SRC_URI="${SRC_PATH}/X${MY_SV}src-1.tgz - ${SRC_PATH}/X${MY_SV}src-2.tgz - ${SRC_PATH}/X${MY_SV}src-3.tgz - mirror://gentoo/${P}-gentoo-${PATCHVER}.tar.bz2" -LICENSE="X11" -SLOT="0" -KEYWORDS="x86 amd64" -# Need portage for USE_EXPAND -DEPEND=">=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 - >=sys-apps/portage-2.0.49-r13 - truetype? ( media-libs/freetype )" - -DESCRIPTION="Xfree86: famous and free X server. Tiny version (KDrive)" - -src_unpack() { - unpack ${A} - - ebegin "Setting up config/cf/host.def" - - # See linux.cf for MMX, 3DNOW and SSE autodetection. (spyderous) - - cd "${S}" - touch config/cf/host.def - echo "#define XVendorString \"Gentoo Linux (KDrive ${PV}, revision ${PR})\" -#define KDriveXServer YES -#define TinyXServer YES -#define BuildLBX NO -#define BuildDBE YES -#define KdriveServerExtraDefines -DPIXPRIV -#define BuildRandR YES -#define BuildXInputLib YES -#define BuildXTrueType NO -#define ServerXdmcpDefines -DXDMCP -#define BuildFonts NO" >>config/cf/host.def - - # We dont really want to spend twice as long compiling libraries - # if they exist of the system allready, so we check and change - # respectively here. - if [ "`best_version x11-base/xorg-server`" ] ; then - echo "#define BuildScreenSaverExt NO" >> config/cf/host.def - echo "#define BuildScreenSaverLibrary NO" >> config/cf/host.def - echo "#define SharedLibXss NO" >> config/cf/host.def - echo "#define BuildXextLib NO" >> config/cf/host.def - echo "#define BuildX11Lib NO" >> config/cf/host.def - echo "#define ProjectRoot /usr/X11R6" >> config/cf/host.def - # If the libs exist locally we do not need to build against - # kdrives personal libraries, dont patch to do this. - mv "${PATCH_DIR}"/0020* "${PATCH_DIR}"/excluded - else - echo "#define BuildScreenSaverExt YES" >> config/cf/host.def - echo "#define BuildScreenSaverLibrary YES" >> config/cf/host.def - echo "#define SharedLibXss YES" >> config/cf/host.def - echo "#define BuildXextLib YES" >> config/cf/host.def - echo "#define BuildX11Lib YES" >> config/cf/host.def - echo "#define ProjectRoot ${S}/usr/X11R6" >> config/cf/host.def - fi - - # 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 - - 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 - - echo "#define HasLinuxInput YES" >> config/cf/host.def - - 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 - - # 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 || [ "${ARCH}" != "x86" ] ; then - echo "#define XvesaServer NO" >> config/cf/host.def - else - echo "#define XvesaServer YES" >> config/cf/host.def - fi - - use fbdev && \ - echo "#define XfbdevServer YES" >> config/cf/host.def || \ - echo "#define XfbdevServer NO" >> config/cf/host.def - - use ipv6 && \ - echo "#define HasIPv6 YES" >> config/cf/host.def - - use xinerama && \ - echo "#define BuildXinerama YES" >> config/cf/host.def - - local KDRIVE_XF_SERVERS="Savage Trident Sis530 Trio TS300 Igs i810 mach64" - for i in ${KDRIVE_XF_SERVERS} ; do - # I wish it worked like this. (spyderous) - # if use video_cards_${i/[A-Z]/[a-z]} ; then - if use `echo video_cards_${i} | tr [:upper:] [:lower:]` ; then - echo "#define X${i}Server YES" >> config/cf/host.def - fi - done - - # Set up font support - use speedo && echo "#define BuildSpeedo YES" >> config/cf/host.def - use type1 && echo "#define BuildType1 YES" >> config/cf/host.def - use cjk && echo "#define BuildCID YES" >> config/cf/host.def - use truetype && echo "#define BuildXTrueType YES" >> config/cf/host.def \ - && echo "#define BuildFreeType YES" >> config/cf/host.def - use font-server && echo "#define FontServerAccess YES" >> config/cf/host.def - - # Video - use xv && echo "#define BuildXvExt YES" >> config/cf/host.def - - eend 0 - - # Bulk patching from all over - cd "${WORKDIR}" - EPATCH_SUFFIX="patch" epatch "${PATCH_DIR}" - - # We need to modify xmakefile after it has been created - if [ ! "`best_version x11-base/xorg-server`" ] ; then - ebegin "Creating fake X includes..." - MY_PROJROOT="${S}/usr/X11R6/include/" - MY_INCROOT="${S}/include" - MY_LIBROOT="${S}/lib" - MY_HERE="./" - - mkdir -p "${MY_PROJROOT}" - cd "${MY_INCROOT}" - for i in `ls ${MY_HERE}` ; do - ln -sf "${MY_INCROOT}"/${i} "${MY_PROJROOT}" - done - - cd "${MY_LIBROOT}" - for i in `ls ${MY_HERE}` ; do - ln -sf "${MY_LIBROOT}"/${i} "${MY_PROJROOT}" - done - - cd "${MY_PROJROOT}" && rm -f Imakefile Makefile - ln -sf "${MY_PROJROOT}"/extensions "${MY_PROJROOT}"/X11/extensions - ln -sf "${S}"/lib "${S}"/usr/X11R6/lib - - cd "${WORKDIR}" - eend 0 - fi - - # Fixing bugs #68531 and #65758 -- this will disable toshiba dpms support - sed '/#ifndef TOSHIBA_SMM/,/#endif/d' -i "${S}"/programs/Xserver/hw/kdrive/vesa/vesa.c - - # Workaround for vga.c not using the correct io.h include - epatch "${FILESDIR}/${PN}-4.3.0-r5-vga.patch" -} - -src_compile() { - - # If a user defines the MAKE_OPTS variable in /etc/make.conf instead of - # MAKEOPTS, they'll redefine an internal X11 Makefile variable and the - # X11 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 KDrive..." - emake World WORLDOPTS="" || die - - # This is dirty, we know, but there is no need to build man pages - # for a whole pile of nothing. As such we are just going to copy - # across the three needed man pages. - einfo "Making and installing man pages..." - mkdir -p "${MANDIR}" - MY_MAN_BASE="${S}/programs/Xserver/hw/kdrive" - - if ! use fbdev ; then - # We need to regenerate some makefiles for fbdev - echo "#define XfbdevServer YES" >> config/cf/host.def - cd "${S}"/programs && make Makefiles > /dev/null || die "Xfbdev Makefile regeneration error..." - fi - - # We have a complete set of makefiles so lets just build what we need - cd "${MY_MAN_BASE}" - emake DESTDIR="${MANDIR}" install.man || die "Kdrive man page install..." - emake DESTDIR="${MANDIR}" -C vesa install.man || die "Xvesa man page install..." - emake DESTDIR="${MANDIR}" -C fbdev install.man || die "Xfbdev man page install..." - -} - -src_install() { - - exeinto /usr/X11R6/bin - - # Install Xvesa - if [ -z "`vesa no`" ] ; then - doexe programs/Xserver/Xvesa - fperms 4711 /usr/X11R6/bin/Xvesa - fi - - # Install Xfbdev - if use fbdev ; then - doexe programs/Xserver/Xfbdev - fperms 4711 /usr/X11R6/bin/Xfbdev - fi - - # Install the other servers - local KDRIVE_SERVERS="savage trident sis530 trio ts300 igs i810 mach64" - for i in ${KDRIVE_SERVERS} ; do - if use video_cards_${i} ; then - doexe programs/Xserver/X${i} - fperms 4711 /usr/X11R6/bin/X${i} - fi - done - - # Install our startx script - doexe "${PATCH_DIR}"/startxkd - - # Install man pages - if [ "`best_version x11-base/xorg-server`" ] ; then - doman "${MANDIR}"/usr/X11R6/man/man1/X{kdrive,vesa,fbdev}.1x - else - doman "${MANDIR}"/"${S}"/usr/X11R6/man/man1/X{kdrive,vesa,fbdev}.1x - fi -} - -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." -} - -# For allowing Xvesa build to be disabled -vesa() { - has "$1" "${VESA}" -} diff --git a/x11-base/kdrive/metadata.xml b/x11-base/kdrive/metadata.xml deleted file mode 100644 index 051e27807931..000000000000 --- a/x11-base/kdrive/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>x11</herd> -<longdescription>Xfree86: famous and free X server. Tiny version (Kdrive).</longdescription> -<use> - <flag name='fbdev'>Enables framebuffer kdrive server</flag> - <flag name='font-server'>Enables font server support</flag> - <flag name='speedo'>Enables Speedo font support</flag> - <flag name='type1'>Enables Type1 font support</flag> -</use> -</pkgmetadata> |