From bdd5e596e739eb12bb90c8144a66c67dbcd98f8d Mon Sep 17 00:00:00 2001
From: lxnay <lxnay@d7aec97c-591d-0410-af39-a8856400b30a>
Date: Fri, 17 Nov 2006 12:29:01 +0000
Subject: [PATCH] new beryl-wrapper

git-svn-id: http://svn.sabayonlinux.org/overlay@342 d7aec97c-591d-0410-af39-a8856400b30a
---
 x11-misc/beryl-wrapper/Manifest               | 27 +++++++---
 .../beryl-wrapper/beryl-wrapper-1.4.ebuild    |  4 +-
 .../beryl-wrapper/beryl-wrapper-1.5.ebuild    | 35 +++++++++++++
 .../files/{ => 1.4}/beryl-wrapper             |  0
 .../beryl-wrapper/files/1.5/beryl-wrapper     | 49 +++++++++++++++++++
 5 files changed, 105 insertions(+), 10 deletions(-)
 create mode 100644 x11-misc/beryl-wrapper/beryl-wrapper-1.5.ebuild
 rename x11-misc/beryl-wrapper/files/{ => 1.4}/beryl-wrapper (100%)
 create mode 100755 x11-misc/beryl-wrapper/files/1.5/beryl-wrapper

diff --git a/x11-misc/beryl-wrapper/Manifest b/x11-misc/beryl-wrapper/Manifest
index 3d2f5c411..46d0d65ac 100644
--- a/x11-misc/beryl-wrapper/Manifest
+++ b/x11-misc/beryl-wrapper/Manifest
@@ -1,11 +1,22 @@
-AUX beryl-wrapper 1297 RMD160 0591b3fe7527ad02e40342d9c14a55c2e01e5289 SHA1 a2a7b21363764fefaa282216007a7902e6525f6e SHA256 4dab20a490afc5abb08f5dbcf217c9257e4740077a8626bd859278b1f357347d
-MD5 ed0ad2542c56bc5bc87b70e1a26d1e42 files/beryl-wrapper 1297
-RMD160 0591b3fe7527ad02e40342d9c14a55c2e01e5289 files/beryl-wrapper 1297
-SHA256 4dab20a490afc5abb08f5dbcf217c9257e4740077a8626bd859278b1f357347d files/beryl-wrapper 1297
-EBUILD beryl-wrapper-1.4.ebuild 542 RMD160 26989190fdd79fb64143b53f05e1bb5206d061d1 SHA1 2da248cd3655ff0c1d2d790c765a4bc8bb60fbc6 SHA256 c847de8d9bc622c0aac0e8f3f25065509ad8f78760ebc2f600de074b43d55327
-MD5 c00e191146173e2649ec06886ef96f86 beryl-wrapper-1.4.ebuild 542
-RMD160 26989190fdd79fb64143b53f05e1bb5206d061d1 beryl-wrapper-1.4.ebuild 542
-SHA256 c847de8d9bc622c0aac0e8f3f25065509ad8f78760ebc2f600de074b43d55327 beryl-wrapper-1.4.ebuild 542
+AUX 1.4/beryl-wrapper 1297 RMD160 0591b3fe7527ad02e40342d9c14a55c2e01e5289 SHA1 a2a7b21363764fefaa282216007a7902e6525f6e SHA256 4dab20a490afc5abb08f5dbcf217c9257e4740077a8626bd859278b1f357347d
+MD5 ed0ad2542c56bc5bc87b70e1a26d1e42 files/1.4/beryl-wrapper 1297
+RMD160 0591b3fe7527ad02e40342d9c14a55c2e01e5289 files/1.4/beryl-wrapper 1297
+SHA256 4dab20a490afc5abb08f5dbcf217c9257e4740077a8626bd859278b1f357347d files/1.4/beryl-wrapper 1297
+AUX 1.5/beryl-wrapper 1269 RMD160 3febe98d0da4ff3f87807b8f26b5acca235ef40d SHA1 ba3fc0d1db9cf3604137f6b6b7880918e1eca546 SHA256 41ac2a3fd6d77e2fecd61f64820bbd7c58a4848acbd656594313d05511729c94
+MD5 37e7bd603cebcd982069637e3bb02af1 files/1.5/beryl-wrapper 1269
+RMD160 3febe98d0da4ff3f87807b8f26b5acca235ef40d files/1.5/beryl-wrapper 1269
+SHA256 41ac2a3fd6d77e2fecd61f64820bbd7c58a4848acbd656594313d05511729c94 files/1.5/beryl-wrapper 1269
+EBUILD beryl-wrapper-1.4.ebuild 551 RMD160 926daa5b047ed84d17c263db5a829d596035216e SHA1 2da400ab1df9d0845f16659795f2e5f542bfc4e2 SHA256 5c1ba11a3dc4bcf5dfb5360b6b65222cd1358057fe193eedc53d6a82b10c35a3
+MD5 48658015215bc9b7282d79faf1c43d1c beryl-wrapper-1.4.ebuild 551
+RMD160 926daa5b047ed84d17c263db5a829d596035216e beryl-wrapper-1.4.ebuild 551
+SHA256 5c1ba11a3dc4bcf5dfb5360b6b65222cd1358057fe193eedc53d6a82b10c35a3 beryl-wrapper-1.4.ebuild 551
+EBUILD beryl-wrapper-1.5.ebuild 551 RMD160 77fd4417cc5412b756d2f14c7b59aafe7378e8ab SHA1 3923872be2370e941fb7caf47d8018ee677fc141 SHA256 52d1c4172ec90a96174a0f3a68e70473d2caa20723d943ece1beb1d2df4f80ca
+MD5 e962047ebcb2ff68cfae73c8195af464 beryl-wrapper-1.5.ebuild 551
+RMD160 77fd4417cc5412b756d2f14c7b59aafe7378e8ab beryl-wrapper-1.5.ebuild 551
+SHA256 52d1c4172ec90a96174a0f3a68e70473d2caa20723d943ece1beb1d2df4f80ca beryl-wrapper-1.5.ebuild 551
 MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-beryl-wrapper-1.4 1
 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-beryl-wrapper-1.4 1
 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-beryl-wrapper-1.4 1
+MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-beryl-wrapper-1.5 1
+RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-beryl-wrapper-1.5 1
+SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-beryl-wrapper-1.5 1
diff --git a/x11-misc/beryl-wrapper/beryl-wrapper-1.4.ebuild b/x11-misc/beryl-wrapper/beryl-wrapper-1.4.ebuild
index 2c9e148c9..142ce371c 100644
--- a/x11-misc/beryl-wrapper/beryl-wrapper-1.4.ebuild
+++ b/x11-misc/beryl-wrapper/beryl-wrapper-1.4.ebuild
@@ -14,7 +14,7 @@ IUSE=""
 
 DEPEND=">=x11-base/xorg-x11-7.1
 	x11-misc/beryl-manager
-	x11-wm/beryl-core"
+	<=x11-wm/beryl-0.1.1"
 
 
 RDEPEND=""
@@ -22,7 +22,7 @@ RDEPEND=""
 src_unpack () {
 
         cd ${WORKDIR}
-        cp ${FILESDIR}/beryl-wrapper . -p
+        cp ${FILESDIR}/${PV}/beryl-wrapper . -p
 
 }
 
diff --git a/x11-misc/beryl-wrapper/beryl-wrapper-1.5.ebuild b/x11-misc/beryl-wrapper/beryl-wrapper-1.5.ebuild
new file mode 100644
index 000000000..ed270a54b
--- /dev/null
+++ b/x11-misc/beryl-wrapper/beryl-wrapper-1.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2004-2006 SabayonLinux
+# Distributed under the terms of the GNU General Public License v2
+# $Header:
+
+inherit eutils versionator
+
+DESCRIPTION="Beryl and Emerald loader"
+HOMEPAGE="http://www.sabayonlinux.org/"
+SRC_URI=""
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 amd64 ppc"
+IUSE=""
+
+DEPEND=">=x11-base/xorg-x11-7.1
+	x11-misc/beryl-manager
+	>=x11-wm/beryl-0.1.2"
+
+
+RDEPEND=""
+
+src_unpack () {
+
+        cd ${WORKDIR}
+        cp ${FILESDIR}/${PV}/beryl-wrapper . -p
+
+}
+
+src_install () {
+
+	cd ${WORKDIR}
+	exeinto /usr/bin/
+	doexe beryl-wrapper
+
+}
diff --git a/x11-misc/beryl-wrapper/files/beryl-wrapper b/x11-misc/beryl-wrapper/files/1.4/beryl-wrapper
similarity index 100%
rename from x11-misc/beryl-wrapper/files/beryl-wrapper
rename to x11-misc/beryl-wrapper/files/1.4/beryl-wrapper
diff --git a/x11-misc/beryl-wrapper/files/1.5/beryl-wrapper b/x11-misc/beryl-wrapper/files/1.5/beryl-wrapper
new file mode 100755
index 000000000..71feb6c10
--- /dev/null
+++ b/x11-misc/beryl-wrapper/files/1.5/beryl-wrapper
@@ -0,0 +1,49 @@
+#!/bin/sh
+cmd=0
+if [ -z "$1" ]; then
+  cmd=1
+else
+  if [ "$1" = "e16" ]; then
+    cmd=0
+  elif [ "$1" = "fluxbox" ]; then
+    cmd=0
+  elif [ "$1" = "gnome" ]; then
+    cmd=0
+  else
+    cmd=1
+  fi
+fi
+
+processes=$(ps auxf)
+xgl_running=$(echo $processes | grep Xgl)
+acceleration_enabled=$(glxinfo | grep "direct rendering" | grep -i "yes")
+
+# Choose the WM
+if [ -e /usr/bin/aquamarine ];then
+  if [ "$1" != "gnome" ] && [ "$1" != "xfce" ]; then
+    window_decor="aquamarine --replace"
+  else
+    window_decor="emerald --replace"
+  fi
+else
+  window_decor="emerald --replace"
+fi
+
+# Start Beryl
+if [ -n "$acceleration_enabled" ] || [ -n "$xgl_running" ]; then
+  if [ "$cmd" = "1" ]; then
+    if [ -n "$xgl_running" ]; then
+      $window_decor & beryl-xgl --replace
+      # workaround for SHIFT+BACKSPACE bug in XGL
+      xmodmap -e "keycode 22 = BackSpace BackSpace Terminate_Server"
+      xmodmap -e "keycode 113 = Mode_switch"
+      xmodmap -e "add mode4 = Super_L"
+      xmodmap -e "add mode4 = Super_R"
+    else
+      $window_decor & beryl --strict-binding --indirect-rendering --replace
+    fi
+  fi
+else
+   # Notify the funny thing
+   dcop knotify default notify DRI_status 'Direct Rendering' 'OpenGL acceleration is disabled. 3D Desktop cannot be loaded.' '' '' 2 0
+fi