[SM-Commit] GIT changes to devel-xorg-modular grimoire by Andraž 'ruskie' Levstik (153a2159caca0f437e575ab5855a70edacdf8d1e)

Andraž 'ruskie' Levstik scm at sourcemage.org
Fri Aug 29 13:55:03 EDT 2008


GIT changes to devel-xorg-modular grimoire by Andraž 'ruskie' Levstik <ruskie at codemages.net>:

 display/xdirectfb/DEPENDS            |    2 
 display/xdirectfb/HISTORY            |    3 
 x11-libs/xfree86-4.3/DEPENDS         |    2 
 x11-libs/xfree86-4.3/HISTORY         |    3 
 x11-libs/xfree86-devel/DEPENDS       |    2 
 x11-libs/xfree86-devel/HISTORY       |    3 
 x11-libs/xfree86/DEPENDS             |    2 
 x11-libs/xfree86/HISTORY             |    3 
 x11-libs/xorg-profile/BUILD          |    1 
 x11-libs/xorg-profile/CONFLICTS      |    6 
 x11-libs/xorg-profile/DEPENDS        |  390 -----------------------------------
 x11-libs/xorg-profile/DETAILS        |   22 -
 x11-libs/xorg-profile/HISTORY        |   19 -
 x11-libs/xorg-profile/INSTALL        |    1 
 x11-libs/xorg-profile/PRE_BUILD      |    1 
 x11-libs/xorg-profile/UP_TRIGGERS    |   18 -
 x11-libs/xorg/DEPENDS                |    2 
 x11-libs/xorg/HISTORY                |    3 
 xorg-xserver/xorg-server/HISTORY     |    3 
 xorg-xserver/xorg-server/UP_TRIGGERS |  249 +++++++++++++---------
 20 files changed, 170 insertions(+), 565 deletions(-)

New commits:
commit 153a2159caca0f437e575ab5855a70edacdf8d1e
Author: Andraž 'ruskie' Levstik <ruskie at codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie at codemages.net>

    x11-libs/xorg-profile: removed since deprecation is now to xorg-server with stable sorcery

commit 4b8a905c1d68a72928238a420f6c796e7ca16eb9
Author: Andraž 'ruskie' Levstik <ruskie at codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie at codemages.net>

    xorg-server: updated UP_TRIGGERS for migration from xorg-profile

commit 9d87895b2f4babebac2dcf6e651dad0c6bbfdb9e
Author: Andraž 'ruskie' Levstik <ruskie at codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie at codemages.net>

    x11-libs/xorg: updated to deprecate into xorg-server

commit 9042f85791f988a73feb7923aa37af7aa8860b09
Author: Andraž 'ruskie' Levstik <ruskie at codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie at codemages.net>

    x11-libs/xfree86: updated to deprecate into xorg-server

commit e44fceee4791c96349c39cc27037ee927e5054fa
Author: Andraž 'ruskie' Levstik <ruskie at codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie at codemages.net>

    x11-libs/xfree86-devel: updated to deprecate into xorg-server

commit a46391adafb20afbafe8d65b277440991b4df4d1
Author: Andraž 'ruskie' Levstik <ruskie at codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie at codemages.net>

    x11-libs/xfree86-4.3: updated to deprecate into xorg-server

commit 5ddfc7c1530036d7f7f6c6025235d603d39fe2fc
Author: Andraž 'ruskie' Levstik <ruskie at codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie at codemages.net>

    display/xdirectfb: updated to deprecate into xorg-server

diff --git a/display/xdirectfb/DEPENDS b/display/xdirectfb/DEPENDS
index 11b0f0b..8a3e79b 100755
--- a/display/xdirectfb/DEPENDS
+++ b/display/xdirectfb/DEPENDS
@@ -1 +1 @@
-depends  xorg-profile
+depends  xorg-server
diff --git a/display/xdirectfb/HISTORY b/display/xdirectfb/HISTORY
index e608c71..5ad6e73 100644
--- a/display/xdirectfb/HISTORY
+++ b/display/xdirectfb/HISTORY
@@ -1,3 +1,6 @@
+2008-08-29 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DEPENDS: xorg-profile -> xorg-server
+
 2008-03-17 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: xorg -> xorg-profile
 
diff --git a/x11-libs/xfree86-4.3/DEPENDS b/x11-libs/xfree86-4.3/DEPENDS
index 11b0f0b..8a3e79b 100755
--- a/x11-libs/xfree86-4.3/DEPENDS
+++ b/x11-libs/xfree86-4.3/DEPENDS
@@ -1 +1 @@
-depends  xorg-profile
+depends  xorg-server
diff --git a/x11-libs/xfree86-4.3/HISTORY b/x11-libs/xfree86-4.3/HISTORY
index 7d5e160..3683ec9 100644
--- a/x11-libs/xfree86-4.3/HISTORY
+++ b/x11-libs/xfree86-4.3/HISTORY
@@ -1,3 +1,6 @@
+2008-08-29 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DEPENDS: xorg-profile -> xorg-server
+
 2008-03-17 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: xorg -> xorg-profile
 
diff --git a/x11-libs/xfree86-devel/DEPENDS b/x11-libs/xfree86-devel/DEPENDS
index 11b0f0b..8a3e79b 100755
--- a/x11-libs/xfree86-devel/DEPENDS
+++ b/x11-libs/xfree86-devel/DEPENDS
@@ -1 +1 @@
-depends  xorg-profile
+depends  xorg-server
diff --git a/x11-libs/xfree86-devel/HISTORY b/x11-libs/xfree86-devel/HISTORY
index 38a4236..2b182d1 100644
--- a/x11-libs/xfree86-devel/HISTORY
+++ b/x11-libs/xfree86-devel/HISTORY
@@ -1,3 +1,6 @@
+2008-08-29 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DEPENDS: xorg-profile -> xorg-server
+
 2008-03-17 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: xorg -> xorg-profile
 
diff --git a/x11-libs/xfree86/DEPENDS b/x11-libs/xfree86/DEPENDS
index 11b0f0b..8a3e79b 100755
--- a/x11-libs/xfree86/DEPENDS
+++ b/x11-libs/xfree86/DEPENDS
@@ -1 +1 @@
-depends  xorg-profile
+depends  xorg-server
diff --git a/x11-libs/xfree86/HISTORY b/x11-libs/xfree86/HISTORY
index 7785845..537ddef 100644
--- a/x11-libs/xfree86/HISTORY
+++ b/x11-libs/xfree86/HISTORY
@@ -1,3 +1,6 @@
+2008-08-29 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DEPENDS: xorg-profile -> xorg-server
+
 2008-03-17 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: xorg -> xorg-profile
 
diff --git a/x11-libs/xorg-profile/BUILD b/x11-libs/xorg-profile/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/x11-libs/xorg-profile/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/x11-libs/xorg-profile/CONFLICTS b/x11-libs/xorg-profile/CONFLICTS
deleted file mode 100755
index aeefda6..0000000
--- a/x11-libs/xorg-profile/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts  xfree86        y
-conflicts  xfree86-4.3    y
-conflicts  xfree86-devel  y
-conflicts  xfree86-libs   y
-conflicts  xdirectfb      y
-conflicts  xorg           y
diff --git a/x11-libs/xorg-profile/DEPENDS b/x11-libs/xorg-profile/DEPENDS
deleted file mode 100755
index 4a546c9..0000000
--- a/x11-libs/xorg-profile/DEPENDS
+++ /dev/null
@@ -1,390 +0,0 @@
-depends  font-alias           &&
-depends  font-util            &&
-depends  xf86-input-keyboard  &&
-depends  xf86-input-mouse     &&
-depends  xorg-data-profile    &&
-depends  xorg-libs            &&
-depends  xorg-server          &&
-depends  xorg-utils           &&
-
-#
-# Input drivers
-#
-optional_depends  'linuxwacom'  \
-                  ''  \
-                  ''  \
-                  'for linuxwacom Xorg and Kernel Wacom Drivers'  &&
-
-optional_depends  'xf86-input-acecad'  \
-                  ''  \
-                  ''  \
-                  'for acecad is an Xorg input driver for Acecad Flair devices'  &&
-
-optional_depends  'xf86-input-aiptek'  \
-                  ''  \
-                  ''  \
-                  'for aiptek is an Xorg input driver for Aiptek HyperPen USB-based tablet devices'  &&
-
-optional_depends  'xf86-input-calcomp'  \
-                  ''  \
-                  ''  \
-                  'for Xorg input driver for Calcomp devices'  &&
-
-optional_depends  'xf86-input-citron'  \
-                  ''  \
-                  ''  \
-                  'for Xorg input driver for Citron Infrared Touch (CiTouch) devices'  &&
-
-optional_depends  'xf86-input-digitaledge'  \
-                  ''  \
-                  ''  \
-                  'for Xorg input driver for DigitalEdge tablet devices'  &&
-
-optional_depends  'xf86-input-dmc'  \
-                  ''  \
-                  ''  \
-                  'for Xorg input driver for DMC FIT10-controller'  &&
-
-optional_depends  'xf86-input-dynapro'  \
-                  ''  \
-                  ''  \
-                  'for Xorg input driver for Dynapro devices'  &&
-
-optional_depends  'xf86-input-elo2300'  \
-                  ''  \
-                  ''  \
-                  'for elo2300 driver'  &&
-
-optional_depends  'xf86-input-elographics'  \
-                  ''  \
-                  ''  \
-                  'for elographics is an Xorg input driver for Elographics touchscreen devices'  &&
-
-optional_depends  'xf86-input-evdev'  \
-                  ''  \
-                  ''  \
-                  'for evdev is an Xorg input driver for Linux generic event devices.'  &&
-
-optional_depends  'xf86-input-fpit'  \
-                  ''  \
-                  ''  \
-                  'for fpit is an Xorg input driver for Fujitsu Stylistic Tablet PCs.'  &&
-
-optional_depends  'xf86-input-hyperpen'  \
-                  ''  \
-                  ''  \
-                  'for Xorg input driver for Aiptek HyperPen RS232-based tablet devices'  &&
-
-optional_depends  'xf86-input-jamstudio'  \
-                  ''  \
-                  ''  \
-                  'for js_x is an Xorg input driver for JamStudio devices'  &&
-
-optional_depends  'xf86-input-joystick'  \
-                  ''  \
-                  ''  \
-                  'for joystick is an Xorg input driver for Joysticks'  &&
-
-optional_depends  'xf86-input-magellan'  \
-                  ''  \
-                  ''  \
-                  'for Xorg input driver for Logitech Magellan trackball devices'  &&
-
-optional_depends  'xf86-input-magictouch'  \
-                  ''  \
-                  ''  \
-                  'for Xorg input driver for MagicTouch RS232-based touchscreen'  &&
-
-optional_depends  'xf86-input-microtouch'  \
-                  ''  \
-                  ''  \
-                  'for Xorg input driver for MicroTouch touchscreen'  &&
-
-optional_depends  'xf86-input-mutouch'  \
-                  ''  \
-                  ''  \
-                  'for Xorg input driver for Microtouch devices'  &&
-
-optional_depends  'xf86-input-palmax'  \
-                  ''  \
-                  ''  \
-                  'for palmax is an Xorg input driver for the Palmax PD1000/PD1100'  &&
-
-optional_depends  'xf86-input-penmount'  \
-                  ''  \
-                  ''  \
-                  'for Xorg input driver for PenMount devices'  &&
-
-optional_depends  'xf86-input-spaceorb'  \
-                  ''  \
-                  ''  \
-                  'for Xorg input driver for SpaceOrb trackball devices'  &&
-
-optional_depends  'xf86-input-summa'  \
-                  ''  \
-                  ''  \
-                  'for Xorg input driver for Summa tablet devices'  &&
-
-optional_depends  'xf86-input-tek4957'  \
-                  ''  \
-                  ''  \
-                  'for tek4957 is an Xorg input driver for the Tektronix 4957 tablet.'  &&
-
-optional_depends  'xf86-input-ur98'  \
-                  ''  \
-                  ''  \
-                  'for UR-98 is an Xorg input driver for the Union Reality UR-F98 headtracker.'  &&
-
-optional_depends  'xf86-input-vmmouse'  \
-                  ''  \
-                  ''  \
-                  'for vmmouse is an XFree86 input driver for mice.'  &&
-
-optional_depends  'xf86-input-void'  \
-                  ''  \
-                  ''  \
-                  'for void is an dummy/null Xorg input driver.'  &&
-
-#
-# Video drivers
-#
-
-optional_depends  'xf86-video-apm'  \
-                  ''  \
-                  ''  \
-                  'for apm is an Xorg driver for Alliance ProMotion video cards.'  &&
-
-optional_depends  'xf86-video-ark'  \
-                  ''  \
-                  ''  \
-                  'for the X.Org video dirver for ARK video cards'  &&
-
-optional_depends  'xf86-video-ast'  \
-                  ''  \
-                  ''  \
-                  'for AST Technology AST2000 video driver for Xorg'  &&
-
-optional_depends  'xf86-video-ati'  \
-                  ''  \
-                  ''  \
-                  'for ati is an Xorg wrapper driver for ATI video cards.'  &&
-
-optional_depends  'xf86-video-chips'  \
-                  ''  \
-                  ''  \
-                  'for chips is an Xorg driver for Chips and Technologies video processors.'  &&
-
-optional_depends  'xf86-video-cirrus'  \
-                  ''  \
-                  ''  \
-                  'for cirrus is an Xorg driver for Cirrus Logic video chips.'  &&
-
-optional_depends  'xf86-video-cyrix'  \
-                  ''  \
-                  ''  \
-                  'for cyrix is an Xorg driver for the Cyrix MediaGX'  &&
-
-optional_depends  'xf86-video-dummy'  \
-                  ''  \
-                  ''  \
-                  'for the X.Org dummy video driver'  &&
-
-optional_depends  'xf86-video-fbdev'  \
-                  ''  \
-                  ''  \
-                  'for fbdev is an Xorg driver for framebuffer devices.'  &&
-
-optional_depends  'xf86-video-glint'  \
-                  ''  \
-                  ''  \
-                  'for glint is an Xorg driver for 3Dlabs & Texas Instruments GLINT/Permediabased video cards.'  &&
-
-optional_depends  'xf86-video-i128'  \
-                  ''  \
-                  ''  \
-                  'for i128 is an XFree86 driver for Number 9 I128 video cards.'  &&
-
-optional_depends  'xf86-video-i740'  \
-                  ''  \
-                  ''  \
-                  'for i740 is an Xorg driver for Intel i740 video cards.'  &&
-
-optional_depends  'xf86-video-impact'  \
-                  ''  \
-                  ''  \
-                  'for Xorg driver for Impact And ImpactSR graphic cards'  &&
-
-optional_depends  'xf86-video-imstt'  \
-                  ''  \
-                  ''  \
-                  'for imstt is an Xorg driver for Integrated Micro Solutions Twin Turbo 128 video chips.'  &&
-
-optional_depends  'xf86-video-intel'  \
-                  ''  \
-                  ''  \
-                  'for Xorg driver for Intel integrated graphics chipsets'  &&
-
-optional_depends  'xf86-video-mga'  \
-                  ''  \
-                  ''  \
-                  'for mga is an Xorg driver for Matrox video cards.'  &&
-
-optional_depends  'xf86-video-neomagic'  \
-                  ''  \
-                  ''  \
-                  'for neomagic is an Xorg driver for the Neomagic graphics chipsets found in many laptop computers.'  &&
-
-optional_depends  'xf86-video-newport'  \
-                  ''  \
-                  ''  \
-                  'for the X.Org video driver for Newport based cards'  &&
-
-optional_depends  'xf86-video-nouveau'  \
-                  ''  \
-                  ''  \
-                  'for The new nVidia driver for X under development'  &&
-
-optional_depends  'xf86-video-nsc'  \
-                  ''  \
-                  ''  \
-                  'for the X.Org video driver for NSC Geode based cards'  &&
-
-optional_depends  'xf86-video-nv'  \
-                  ''  \
-                  ''  \
-                  'for nv is an Xorg driver for NVIDIA video cards.'  &&
-
-optional_depends  'xf86-video-openchrome'  \
-                  ''  \
-                  ''  \
-                  'for '  &&
-
-optional_depends  'xf86-video-radeonhd'  \
-                  ''  \
-                  ''  \
-                  'for This driver support the r500 and r600 radeon chips'  &&
-
-optional_depends  'xf86-video-rendition'  \
-                  ''  \
-                  ''  \
-                  'for rendition is an XFree86 driver for Rendition/Micron based video cards.'  &&
-
-optional_depends  'xf86-video-s3'  \
-                  ''  \
-                  ''  \
-                  'for Xorg driver for S3 graphic chipsets'  &&
-
-optional_depends  'xf86-video-s3virge'  \
-                  ''  \
-                  ''  \
-                  'for s3virge is an Xorg driver for S3 based video cards.'  &&
-
-optional_depends  'xf86-video-savage'  \
-                  ''  \
-                  ''  \
-                  'for savage is an Xorg driver for the S3 Savage family video accelerator chips.'  &&
-
-optional_depends  'xf86-video-siliconmotion'  \
-                  ''  \
-                  ''  \
-                  'for siliconmotion is an Xorg driver for Silicon Motion based video cards.'  &&
-
-optional_depends  'xf86-video-sis'  \
-                  ''  \
-                  ''  \
-                  'for sis is an Xorg driver for SiS (Silicon Integrated Systems) and XGI video chips.'  &&
-
-optional_depends  'xf86-video-sisusb'  \
-                  ''  \
-                  ''  \
-                  'for sisusb is an Xorg driver for SiS (Silicon Integrated Systems) video chips that are connected via a Net2280-based USB dongle.'  &&
-
-optional_depends  'xf86-video-sunbw2'  \
-                  ''  \
-                  ''  \
-                  'for sunbw2 is an Xorg driver for Sun BW2 video cards.'  &&
-
-optional_depends  'xf86-video-suncg14'  \
-                  ''  \
-                  ''  \
-                  'for Xorg driver for Sun CG14 video cards'  &&
-
-optional_depends  'xf86-video-suncg3'  \
-                  ''  \
-                  ''  \
-                  'for Xorg driver for Sun CG3 video cards'  &&
-
-optional_depends  'xf86-video-suncg6'  \
-                  ''  \
-                  ''  \
-                  'for Xorg driver for Sun GX and Turbo GX (also known as cgsix) video cards'  &&
-
-optional_depends  'xf86-video-sunffb'  \
-                  ''  \
-                  ''  \
-                  'for Xorg driver for Sun Creator, Creator 3D and Elite 3D video cards'  &&
-
-optional_depends  'xf86-video-sunleo'  \
-                  ''  \
-                  ''  \
-                  'for leo is an Xorg driver for Sun Leo (ZX) video cards.'  &&
-
-optional_depends  'xf86-video-suntcx'  \
-                  ''  \
-                  ''  \
-                  'for suntcx is an Xorg driver for Sun TCX video cards.'  &&
-
-optional_depends  'xf86-video-tdfx'  \
-                  ''  \
-                  ''  \
-                  'for tdfx is an Xorg driver for 3Dfx video cards.'  &&
-
-optional_depends  'xf86-video-tga'  \
-                  ''  \
-                  ''  \
-                  'for Xorg video driver for DEC 21030 (aka TGA)'  &&
-
-optional_depends  'xf86-video-trident'  \
-                  ''  \
-                  ''  \
-                  'for Xorg driver for Trident video cards'  &&
-
-optional_depends  'xf86-video-tseng'  \
-                  ''  \
-                  ''  \
-                  'for Xorg driver for Tseng Labs video cards'  &&
-
-optional_depends  'xf86-video-v4l'  \
-                  ''  \
-                  ''  \
-                  'for v4l is an Xorg driver for video4linux cards.'  &&
-
-optional_depends  'xf86-video-vesa'  \
-                  ''  \
-                  ''  \
-                  'for vesa is an Xorg driver for generic VESA video cards.'  &&
-
-optional_depends  'xf86-video-vga'  \
-                  ''  \
-                  ''  \
-                  'for vga is an Xorg driver for generic VGA video cards.'  &&
-
-optional_depends  'xf86-video-via'  \
-                  ''  \
-                  ''  \
-                  'for via is an Xorg driver for VIA chipsets with onboard unichrome graphics.'  &&
-
-optional_depends  'xf86-video-vmware'  \
-                  ''  \
-                  ''  \
-                  'for vmware is an Xorg driver for VMware virtual video cards.'  &&
-
-optional_depends  'xf86-video-voodoo'  \
-                  ''  \
-                  ''  \
-                  'for voodoo is an XFree86 driver for Voodoo 1 and Voodoo 2 series video adapters.'  &&
-
-optional_depends  'xf86-video-wsfb'  \
-                  ''  \
-                  ''  \
-                  'for Xorg driver for OpenBSD and NetBSD wsdisplay framebuffer devices'
diff --git a/x11-libs/xorg-profile/DETAILS b/x11-libs/xorg-profile/DETAILS
deleted file mode 100755
index fd79dc5..0000000
--- a/x11-libs/xorg-profile/DETAILS
+++ /dev/null
@@ -1,22 +0,0 @@
-           SPELL=xorg-profile
-         VERSION=7.3.0
-      LICENSE[0]=GPL
-        WEB_SITE=http://xorg.freedesktop.org/
-        KEYWORDS="x11 libs"
-         ENTERED=20040407
-           SHORT="X.Org is an Open Source version of the X Window System"
-cat << EOF
-The XOrg Foundation, (a.k.a. X.org) has changed to an Open Source model to
-maintain the official Public Implementation of X11.
-
-The XOrg Foundation invites anyone who has an interest to join in. Anyone
-may create and work on a branch in the repository. See XOrgRepository for
-more information about the XOrg Foundation repository.
-
-The repository consists of an imported XFree86 tree that is very close to
-their 4.4 release. Just before its 4.4 release, XFree86 adopted a new
-licensing scheme incompatible with the GPL. For this reason, we have
-recreated its tree as closely as possible without importing files affected
-by the new license. Our tree is being referred to as simply "XOrg", and a
-public release will be made shortly.
-EOF
diff --git a/x11-libs/xorg-profile/HISTORY b/x11-libs/xorg-profile/HISTORY
deleted file mode 100644
index 73a0c23..0000000
--- a/x11-libs/xorg-profile/HISTORY
+++ /dev/null
@@ -1,19 +0,0 @@
-2008-03-17 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Actually rename SPELL to xorg-profile
-	* DEPENDS: Don't depend on deprecated xf86-video-i810
-	  Don't depend on any fonts, xorg-server does that for us
-	* UP_TRIGGERS: Fix missing 'do' after for
-	  provider x11_libs_provider are variables, not commands
-	  Not sure what I was thinking...the providers will be gone for this
-	  so we cannot query them via `gaze provides`, instead just check
-	  the spells specifically and then check what depends on them.
-
-2008-03-16 Eric Sandall <sandalle at sourcemage.org>
-	* DEPENDS: Depends on xorg-data-profile
-	* CONFLICTS: Auto-onflicts with xorg
-	* UP_TRIGGERS: Recast all spells still using monolithic X providers
-
-2007-10-25 Eric Sandall <sandalle at sourcemage.org>
-	* Changed to modular X.org profile spell from monolithic X.org
-	  Optionally depends on all drivers
-
diff --git a/x11-libs/xorg-profile/INSTALL b/x11-libs/xorg-profile/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/x11-libs/xorg-profile/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/x11-libs/xorg-profile/PRE_BUILD b/x11-libs/xorg-profile/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/x11-libs/xorg-profile/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/x11-libs/xorg-profile/UP_TRIGGERS b/x11-libs/xorg-profile/UP_TRIGGERS
deleted file mode 100755
index 102d0b6..0000000
--- a/x11-libs/xorg-profile/UP_TRIGGERS
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Go through each provider monolithic X spells provided
-#
-for provider in xorg xfree86{,-devel,-libs,-4.3} xdirectfb
-do
-  for spell in $(gaze depends $provider 1 | cut -d: -f1)
-  do
-    #
-    # Recast each spell still using monolithic X, if it's installed
-    # See http://bugs.sourcemage.org/show_bug.cgi?id=14373 for the issue
-    # with Sorcery not switching out a no longer available provider
-    #
-    if spell_ok $spell
-    then
-      up_trigger $spell cast_self
-    fi
-  done  # Finished spell loop
-done  # Finished provider loop
diff --git a/x11-libs/xorg/DEPENDS b/x11-libs/xorg/DEPENDS
index 11b0f0b..8a3e79b 100755
--- a/x11-libs/xorg/DEPENDS
+++ b/x11-libs/xorg/DEPENDS
@@ -1 +1 @@
-depends  xorg-profile
+depends  xorg-server
diff --git a/x11-libs/xorg/HISTORY b/x11-libs/xorg/HISTORY
index d868562..39a3853 100644
--- a/x11-libs/xorg/HISTORY
+++ b/x11-libs/xorg/HISTORY
@@ -1,3 +1,6 @@
+2008-08-29 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DEPENDS: xorg-profile -> xorg-server
+
 2008-03-17 Eric Sandall <sandalle at sourcemage.org>
 	* Deprecated in favour of xorg-profile
 
diff --git a/xorg-xserver/xorg-server/HISTORY b/xorg-xserver/xorg-server/HISTORY
index de1f990..d51ccaa 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,6 @@
+2008-08-29 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* UP_TRIGGERS: re-added with migration magic as well
+
 2008-08-28 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* UP_TRIGGERS: disabled for now, not needed
 
diff --git a/xorg-xserver/xorg-server/UP_TRIGGERS b/xorg-xserver/xorg-server/UP_TRIGGERS
old mode 100644
new mode 100755
index 37fb5df..e5ceef2
--- a/xorg-xserver/xorg-server/UP_TRIGGERS
+++ b/xorg-xserver/xorg-server/UP_TRIGGERS
@@ -1,108 +1,153 @@
-# this makes ABI changes automatically cast those that depend on openssl via an up_trigger
+#
+# Go through each provider monolithic X spells provided
+#
+local provider
+local spell
 
-if ! spell_ok $SPELL  ||
-   [[ $(installed_version $SPELL) != 1.4 ]]
-then
-  local each  &&
-
-  for each in linuxwacom \
-              xf86-video-i128 \
-              xf86-input-acecad \
-              xf86-video-i740 \
-              xf86-input-aiptek \
-              xf86-video-i810 \
-              xf86-input-calcomp \
-              xf86-video-impact \
-              xf86-input-citron \
-              xf86-video-imstt \
-              xf86-input-digitaledge \
-              xf86-video-intel \
-              xf86-input-dmc \
-              xf86-video-mga \
-              xf86-input-dynapro \
-              xf86-video-neomagic \
-              xf86-input-elo2300 \
-              xf86-video-newport \
-              xf86-input-elographics \
-              xf86-video-nouveau \
-              xf86-input-evdev \
-              xf86-video-nsc \
-              xf86-input-fpit \
-              xf86-video-nv \
-              xf86-input-hyperpen \
-              xf86-video-openchrome \
-              xf86-input-jamstudio \
-              xf86-video-radeonhd \
-              xf86-input-joystick \
-              xf86-video-rendition \
-              xf86-input-keyboard \
-              xf86-video-s3 \
-              xf86-input-magellan \
-              xf86-video-s3virge \
-              xf86-input-magictouch \
-              xf86-video-savage \
-              xf86-input-microtouch \
-              xf86-video-siliconmotion \
-              xf86-input-mouse \
-              xf86-video-sisusb \
-              xf86-input-mutouch \
-              xf86-video-sis \
-              xf86-input-palmax \
-              xf86-video-sunbw2 \
-              xf86-input-penmount \
-              xf86-video-suncg14 \
-              xf86-input-spaceorb \
-              xf86-video-suncg3 \
-              xf86-input-summa \
-              xf86-video-suncg6 \
-              xf86-input-tek4957 \
-              xf86-video-sunffb \
-              xf86-input-ur98 \
-              xf86-video-sunleo \
-              xf86-input-vmmouse \
-              xf86-video-suntcx \
-              xf86-input-void \
-              xf86-video-tdfx \
-              xf86-video-apm \
-              xf86-video-tga \
-              xf86-video-ark \
-              xf86-video-trident \
-              xf86-video-ast \
-              xf86-video-tseng \
-              xf86-video-ati \
-              xf86-video-v4l \
-              xf86-video-chips \
-              xf86-video-vesa \
-              xf86-video-cirrus \
-              xf86-video-vga \
-              xf86-video-cyrix \
-              xf86-video-via \
-              xf86-video-dummy \
-              xf86-video-vmware \
-              xf86-video-fbdev \
-              xf86-video-voodoo \
-              xf86-video-glint \
-              xf86-video-wsfb \
-              mesalib
+for provider in xorg xfree86{,-devel,-libs,-4.3} xdirectfb
+do
+  for spell in $(gaze depends $provider 1 | cut -d: -f1)
   do
-    if spell_ok $each
+    #
+    # Recast each spell still using monolithic X, if it's installed
+    # See http://bugs.sourcemage.org/show_bug.cgi?id=14373 for the issue
+    # with Sorcery not switching out a no longer available provider
+    #
+    if spell_ok $spell
     then
-      up_trigger $each cast_self
+      up_trigger $spell cast_self
     fi
-  done
+  done  # Finished spell loop
+done  # Finished provider loop
 
-  for each in xkbutils \
-              xkbcomp \
-              xkbprint \
-              xkbevd \
-              libxkbui \
-              libxkbfile \
-              xkeyboard-config \
-              setxkbmap
-  do
-    if spell_ok $each
-    then
-      up_trigger $each check_self
-    fi
-  done
+# modifying this a bit
+unset provider spell
+
+local provider
+local spell
+
+if spell_ok $SPELL  &&
+   [[ $(installed_version $SPELL) == 1.3.0.0 ]] &&
+   [[ $(installed_version $SPELL) == 1.2.99.903 ]] &&
+   [[ $(installed_version $SPELL) == 1.2.99.902 ]] &&
+   [[ $(installed_version $SPELL) == 1.2.0 ]] &&
+   [[ $(installed_version $SPELL) == 1.1.99.903 ]] &&
+   [[ $(installed_version $SPELL) == 1.1.99.902 ]] &&
+   [[ $(installed_version $SPELL) == 1.1.1 ]] &&
+   [[ $(installed_version $SPELL) == 1.0.1 ]] &&
+   [[ $(installed_version $SPELL) == 1.0.0 ]] &&
+   [[ $(installed_version $SPELL) == 0.99.4 ]]
+then
+  for spell in linuxwacom \
+               xf86-input-synaptics \
+               synaptics \
+               xf86-video-i128 \
+               xf86-input-acecad \
+               xf86-video-i740 \
+               xf86-input-aiptek \
+               xf86-video-i810 \
+               xf86-input-calcomp \
+               xf86-video-impact \
+               xf86-input-citron \
+               xf86-video-imstt \
+               xf86-input-digitaledge \
+               xf86-video-intel \
+               xf86-input-dmc \
+               xf86-video-mga \
+               xf86-input-dynapro \
+               xf86-video-neomagic \
+               xf86-input-elo2300 \
+               xf86-video-newport \
+               xf86-input-elographics \
+               xf86-video-nouveau \
+               xf86-input-evdev \
+               xf86-video-nsc \
+               xf86-input-fpit \
+               xf86-video-nv \
+               xf86-input-hyperpen \
+               xf86-video-openchrome \
+               xf86-input-jamstudio \
+               xf86-video-radeonhd \
+               xf86-input-joystick \
+               xf86-video-rendition \
+               xf86-input-keyboard \
+               xf86-video-s3 \
+               xf86-input-magellan \
+               xf86-video-s3virge \
+               xf86-input-magictouch \
+               xf86-video-savage \
+               xf86-input-microtouch \
+               xf86-video-siliconmotion \
+               xf86-input-mouse \
+               xf86-video-sisusb \
+               xf86-input-mutouch \
+               xf86-video-sis \
+               xf86-input-palmax \
+               xf86-video-sunbw2 \
+               xf86-input-penmount \
+               xf86-video-suncg14 \
+               xf86-input-spaceorb \
+               xf86-video-suncg3 \
+               xf86-input-summa \
+               xf86-video-suncg6 \
+               xf86-input-tek4957 \
+               xf86-video-sunffb \
+               xf86-input-ur98 \
+               xf86-video-sunleo \
+               xf86-input-vmmouse \
+               xf86-video-suntcx \
+               xf86-input-void \
+               xf86-video-tdfx \
+               xf86-video-apm \
+               xf86-video-tga \
+               xf86-video-ark \
+               xf86-video-trident \
+               xf86-video-ast \
+               xf86-video-tseng \
+               xf86-video-ati \
+               xf86-video-v4l \
+               xf86-video-chips \
+               xf86-video-vesa \
+               xf86-video-cirrus \
+               xf86-video-vga \
+               xf86-video-cyrix \
+               xf86-video-via \
+               xf86-video-dummy \
+               xf86-video-vmware \
+               xf86-video-fbdev \
+               xf86-video-voodoo \
+               xf86-video-glint \
+               xf86-video-wsfb \
+               xf86-video-geode \
+               xf86-input-diamondtouch \
+               mesalib
+do
+  if spell_ok $spell
+  then
+    up_trigger $spell check_self
+  fi
+done
+fi
+
+# this still seems to be a good idea overall
+unset provider spell
+
+local provider
+local spell
+
+if spell_ok $SPELL  &&
+for spell in xkbutils \
+             xkbcomp \
+             xkbprint \
+             xkbevd \
+             libxkbui \
+             libxkbfile \
+             xkeyboard-config \
+             setxkbmap
+do
+  if spell_ok $spell
+  then
+    up_trigger $spell check_self
+  fi
+done
 fi



More information about the SM-Commit mailing list