(#109926) No need to specify xkb path anymore, it's wrong now as well.

Package-Manager: portage-2.0.53_rc5

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index dab0f11c59bdd3c432f0afdd78d9bc29bbaceca2..823066d0bd689570cffeac5b7c49e8b41de9314b 100644 (file)
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.61 2005/10/20 06:58:07 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.62 2005/10/20 18:31:47 spyderous Exp $
+
+*xorg-server-0.99.2-r1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xorg-server-0.99.2-r1.ebuild:
+  (#109926) No need to specify xkb path anymore, it's wrong now as well.
 
 *xorg-server-0.99.2 (20 Oct 2005)
 

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index c42dbe72dd2172f3c2baac3d11f0519bbbddd011..e1916103a6c9574a58683d9f266d7d8e34c337dd 100644 (file)
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,6 +1,8 @@
-MD5 4121144f469717d818fee9ac4efb3cf2 ChangeLog 12408
+MD5 d75b92099879471a57211a97f0dcdabf ChangeLog 12608
 MD5 ac79344c93d0172934f99d972e3e0d44 files/digest-xorg-server-0.99.1_p20051013-r1 149
 MD5 fa409bf97af76a1505f16b5f0e95a413 files/digest-xorg-server-0.99.2 139
+MD5 fa409bf97af76a1505f16b5f0e95a413 files/digest-xorg-server-0.99.2-r1 139
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 MD5 5b0226a58ebab24e029853a708d78991 xorg-server-0.99.1_p20051013-r1.ebuild 4058
+MD5 385e55b8d0614a90ef28af7cc8c37e6a xorg-server-0.99.2-r1.ebuild 3962
 MD5 4a10149f1978928ccb6fc093c24c70fe xorg-server-0.99.2.ebuild 4004

diff --git a/x11-base/xorg-server/files/digest-xorg-server-0.99.2-r1 b/x11-base/xorg-server/files/digest-xorg-server-0.99.2-r1
new file mode 100644 (file)
index 0000000..c39e981
--- /dev/null
+++ b/x11-base/xorg-server/files/digest-xorg-server-0.99.2-r1
@@ -0,0 +1,2 @@
+MD5 0df27701df0924d17ddf41185efa8ce1 MesaLib-6.3.2.tar.bz2 3012145
+MD5 8467f86e0832a5c532b30387c82d1e49 xorg-server-0.99.2.tar.bz2 5714097

diff --git a/x11-base/xorg-server/xorg-server-0.99.2-r1.ebuild b/x11-base/xorg-server/xorg-server-0.99.2-r1.ebuild
new file mode 100644 (file)
index 0000000..43b29b6
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-0.99.2-r1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-0.99.2-r1.ebuild,v 1.1 2005/10/20 18:31:47 spyderous Exp $
+
+# Must be before x-modular eclass is inherited
+# Hack to make sure autoreconf gets run
+#SNAPSHOT="yes"
+
+inherit flag-o-matic x-modular multilib
+
+OPENGL_DIR="xorg-x11"
+
+MESA_PN="Mesa"
+MESA_PV="6.3.2"
+MESA_P="${MESA_PN}-${MESA_PV}"
+MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
+
+#PATCHES="${FILESDIR}/link-xtrap-into-xprint.patch"
+
+SRC_URI="${SRC_URI}
+       mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2"
+DESCRIPTION="X.Org X servers"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
+IUSE="dri ipv6 minimal xprint"
+RDEPEND="x11-libs/libXfont
+       x11-libs/xtrans
+       x11-libs/libXau
+       x11-libs/libXext
+       x11-libs/libX11
+       x11-libs/libxkbfile
+       x11-libs/libXdmcp
+       x11-libs/libXmu
+       x11-libs/libXrender
+       x11-libs/libXi
+       media-libs/freetype
+       >=media-libs/mesa-6
+       media-fonts/font-misc-misc
+       media-fonts/font-cursor-misc
+       x11-misc/xbitmaps
+       x11-misc/xkbdata
+       x11-apps/iceauth
+       x11-apps/rgb
+       x11-apps/xauth
+       x11-apps/xinit
+       app-admin/eselect-opengl
+       x11-libs/libXaw
+       x11-libs/libXpm
+       x11-libs/libXxf86misc
+       x11-libs/libXxf86vm
+       !minimal? ( x11-libs/libdmx
+               x11-libs/libXtst
+               x11-libs/libXres )
+       x11-libs/libxkbui"
+       # Xres is dmx-dependent, xkbui is xorgcfg-dependent
+       # Xaw is dmx- and xorgcfg-dependent
+       # Xpm is dmx- and xorgcfg-dependent, pulls in Xt
+       # Xxf86misc and Xxf86vm are xorgcfg-dependent
+DEPEND="${RDEPEND}
+       x11-proto/randrproto
+       x11-proto/renderproto
+       x11-proto/fixesproto
+       x11-proto/damageproto
+       x11-proto/xextproto
+       x11-proto/xproto
+       x11-proto/xf86dgaproto
+       x11-proto/xf86miscproto
+       x11-proto/xf86rushproto
+       x11-proto/xf86vidmodeproto
+       x11-proto/xf86bigfontproto
+       x11-proto/compositeproto
+       x11-proto/recordproto
+       x11-proto/resourceproto
+       x11-proto/videoproto
+       x11-proto/scrnsaverproto
+       x11-proto/evieext
+       x11-proto/trapproto
+       >=x11-proto/xineramaproto-1.1-r1
+       x11-proto/fontsproto
+       >=x11-proto/kbproto-1.0-r1
+       x11-proto/inputproto
+       x11-proto/bigreqsproto
+       x11-proto/xcmiscproto
+       >=x11-proto/glproto-1.4.1_pre20051013
+       !minimal? ( x11-proto/dmxproto )
+       dri? ( x11-proto/xf86driproto
+               x11-libs/libdrm )
+       xprint? ( x11-proto/printproto
+               x11-apps/mkfontdir
+               x11-apps/mkfontscale )"
+
+pkg_setup() {
+       # localstatedir is used for the log location; we need to override the default
+       # from ebuild.sh
+       # sysconfdir is used for the xorg.conf location; same applies
+       CONFIGURE_OPTIONS="
+               $(use_enable ipv6)
+               $(use_enable !minimal dmx)
+               $(use_enable !minimal xvfb)
+               $(use_enable !minimal xnest)
+               $(use_enable dri)
+               $(use_enable xprint)
+               --enable-xcsecurity
+               --with-mesa-source=${WORKDIR}/${MESA_P}
+               --enable-xorg
+               --enable-xtrap
+               --enable-xevie
+               --sysconfdir=/etc/X11
+               --localstatedir=/var
+               --disable-static
+               --with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1"
+}
+
+src_install() {
+       x-modular_src_install
+
+       dynamic_libgl_install
+
+       dosym Xorg /usr/bin/X
+       fperms 4711 /usr/bin/Xorg
+}
+
+pkg_postinst() {
+       switch_opengl_implem
+}
+
+pkg_postrm() {
+       # Get rid of module dir to ensure opengl-update works properly
+       if ! has_version x11-base/xorg-server; then
+               if [ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]; then
+                       rm -rf ${ROOT}/usr/$(get_libdir)/xorg/modules
+               fi
+       fi
+}
+
+dynamic_libgl_install() {
+       # next section is to setup the dynamic libGL stuff
+       ebegin "Moving GL files for dynamic switching"
+               dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
+               local x=""
+               for x in ${D}/usr/$(get_libdir)/xorg/modules/libglx*; do
+                       if [ -f ${x} -o -L ${x} ]; then
+                               mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
+                       fi
+               done
+       eend 0
+}
+
+switch_opengl_implem() {
+               # Switch to the xorg implementation.
+               # Use new opengl-update that will not reset user selected
+               # OpenGL interface ...
+               echo
+               eselect opengl set --use-old ${OPENGL_DIR}
+}