Merge branch 'master' of github.com:Rogentos/kogaion-desktop

20 files changed, 40 insertions, 56 deletions

diff --git a/x11-drivers/ati-userspace/ati-userspace-11.10.ebuild b/x11-drivers/ati-userspace/ati-userspace-11.10.ebuild
index 97f73d32..dec54b19 100644
--- a/x11-drivers/ati-userspace/ati-userspace-11.10.ebuild
+++ b/x11-drivers/ati-userspace/ati-userspace-11.10.ebuild
@@ -26,7 +26,7 @@ SLOT="1"
 RDEPEND="<=x11-base/xorg-server-1.10.99
 	!x11-drivers/ati-drivers:0
 	!x11-apps/ati-drivers-extra
-	>=app-admin/eselect-opengl-1.0.7
+	>=app-eselect/eselect-opengl-1.0.7
 	x11-apps/xauth
 	x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-drivers/ati-userspace/ati-userspace-11.11.ebuild b/x11-drivers/ati-userspace/ati-userspace-11.11.ebuild
index 14f897db..97d6c35e 100644
--- a/x11-drivers/ati-userspace/ati-userspace-11.11.ebuild
+++ b/x11-drivers/ati-userspace/ati-userspace-11.11.ebuild
@@ -26,7 +26,7 @@ SLOT="1"
 RDEPEND="<=x11-base/xorg-server-1.11.49
 	!x11-drivers/ati-drivers:0
 	!x11-apps/ati-drivers-extra
-	>=app-admin/eselect-opengl-1.0.7
+	>=app-eselect/eselect-opengl-1.0.7
 	x11-apps/xauth
 	x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-drivers/ati-userspace/ati-userspace-11.12.ebuild b/x11-drivers/ati-userspace/ati-userspace-11.12.ebuild
index 14f897db..97d6c35e 100644
--- a/x11-drivers/ati-userspace/ati-userspace-11.12.ebuild
+++ b/x11-drivers/ati-userspace/ati-userspace-11.12.ebuild
@@ -26,7 +26,7 @@ SLOT="1"
 RDEPEND="<=x11-base/xorg-server-1.11.49
 	!x11-drivers/ati-drivers:0
 	!x11-apps/ati-drivers-extra
-	>=app-admin/eselect-opengl-1.0.7
+	>=app-eselect/eselect-opengl-1.0.7
 	x11-apps/xauth
 	x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-drivers/ati-userspace/ati-userspace-11.6.ebuild b/x11-drivers/ati-userspace/ati-userspace-11.6.ebuild
index 94046c53..7060761f 100644
--- a/x11-drivers/ati-userspace/ati-userspace-11.6.ebuild
+++ b/x11-drivers/ati-userspace/ati-userspace-11.6.ebuild
@@ -26,7 +26,7 @@ SLOT="1"
 RDEPEND="<=x11-base/xorg-server-1.10.99
 	!x11-drivers/ati-drivers:0
 	!x11-apps/ati-drivers-extra
-	>=app-admin/eselect-opengl-1.0.7
+	>=app-eselect/eselect-opengl-1.0.7
 	x11-apps/xauth
 	x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-drivers/ati-userspace/ati-userspace-11.8.ebuild b/x11-drivers/ati-userspace/ati-userspace-11.8.ebuild
index f38ceffa..70be70a2 100644
--- a/x11-drivers/ati-userspace/ati-userspace-11.8.ebuild
+++ b/x11-drivers/ati-userspace/ati-userspace-11.8.ebuild
@@ -26,7 +26,7 @@ SLOT="1"
 RDEPEND="<=x11-base/xorg-server-1.10.99
 	!x11-drivers/ati-drivers:0
 	!x11-apps/ati-drivers-extra
-	>=app-admin/eselect-opengl-1.0.7
+	>=app-eselect/eselect-opengl-1.0.7
 	x11-apps/xauth
 	x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-drivers/ati-userspace/ati-userspace-11.9.ebuild b/x11-drivers/ati-userspace/ati-userspace-11.9.ebuild
index f38ceffa..70be70a2 100644
--- a/x11-drivers/ati-userspace/ati-userspace-11.9.ebuild
+++ b/x11-drivers/ati-userspace/ati-userspace-11.9.ebuild
@@ -26,7 +26,7 @@ SLOT="1"
 RDEPEND="<=x11-base/xorg-server-1.10.99
 	!x11-drivers/ati-drivers:0
 	!x11-apps/ati-drivers-extra
-	>=app-admin/eselect-opengl-1.0.7
+	>=app-eselect/eselect-opengl-1.0.7
 	x11-apps/xauth
 	x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-drivers/ati-userspace/ati-userspace-12.1-r1.ebuild b/x11-drivers/ati-userspace/ati-userspace-12.1-r1.ebuild
index 3993df43..4f079e54 100644
--- a/x11-drivers/ati-userspace/ati-userspace-12.1-r1.ebuild
+++ b/x11-drivers/ati-userspace/ati-userspace-12.1-r1.ebuild
@@ -26,8 +26,8 @@ SLOT="1"
 RDEPEND="<=x11-base/xorg-server-1.11.49
 	!x11-drivers/ati-drivers:0
 	!x11-apps/ati-drivers-extra
-	>=app-admin/eselect-opengl-1.0.7
-	app-admin/eselect-opencl
+	>=app-eselect/eselect-opengl-1.0.7
+	app-eselect/eselect-opencl
 	x11-apps/xauth
 	x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-drivers/ati-userspace/ati-userspace-12.10.ebuild b/x11-drivers/ati-userspace/ati-userspace-12.10.ebuild
index e27131b3..08601cf6 100644
--- a/x11-drivers/ati-userspace/ati-userspace-12.10.ebuild
+++ b/x11-drivers/ati-userspace/ati-userspace-12.10.ebuild
@@ -22,8 +22,8 @@ RESTRICT="bindist"
 RDEPEND="<=x11-base/xorg-server-1.12.49[-minimal]
 	!x11-drivers/ati-drivers:0
 	!x11-apps/ati-drivers-extra
-	>=app-admin/eselect-opengl-1.0.7
-	app-admin/eselect-opencl
+	>=app-eselect/eselect-opengl-1.0.7
+	app-eselect/eselect-opencl
 	sys-power/acpid
 	x11-apps/xauth
 	x11-libs/libX11
diff --git a/x11-drivers/ati-userspace/ati-userspace-12.2.ebuild b/x11-drivers/ati-userspace/ati-userspace-12.2.ebuild
index e0460995..8e7a6b65 100644
--- a/x11-drivers/ati-userspace/ati-userspace-12.2.ebuild
+++ b/x11-drivers/ati-userspace/ati-userspace-12.2.ebuild
@@ -26,8 +26,8 @@ SLOT="1"
 RDEPEND="<=x11-base/xorg-server-1.11.49[-minimal]
 	!x11-drivers/ati-drivers:0
 	!x11-apps/ati-drivers-extra
-	>=app-admin/eselect-opengl-1.0.7
-	app-admin/eselect-opencl
+	>=app-eselect/eselect-opengl-1.0.7
+	app-eselect/eselect-opencl
 	x11-apps/xauth
 	x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-drivers/ati-userspace/ati-userspace-12.3.ebuild b/x11-drivers/ati-userspace/ati-userspace-12.3.ebuild
index 7d0cf802..9c8bcd71 100644
--- a/x11-drivers/ati-userspace/ati-userspace-12.3.ebuild
+++ b/x11-drivers/ati-userspace/ati-userspace-12.3.ebuild
@@ -26,8 +26,8 @@ SLOT="1"
 RDEPEND="<=x11-base/xorg-server-1.11.49[-minimal]
 	!x11-drivers/ati-drivers:0
 	!x11-apps/ati-drivers-extra
-	>=app-admin/eselect-opengl-1.0.7
-	app-admin/eselect-opencl
+	>=app-eselect/eselect-opengl-1.0.7
+	app-eselect/eselect-opencl
 	x11-apps/xauth
 	x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-drivers/ati-userspace/ati-userspace-12.4.ebuild b/x11-drivers/ati-userspace/ati-userspace-12.4.ebuild
index 7d0cf802..9c8bcd71 100644
--- a/x11-drivers/ati-userspace/ati-userspace-12.4.ebuild
+++ b/x11-drivers/ati-userspace/ati-userspace-12.4.ebuild
@@ -26,8 +26,8 @@ SLOT="1"
 RDEPEND="<=x11-base/xorg-server-1.11.49[-minimal]
 	!x11-drivers/ati-drivers:0
 	!x11-apps/ati-drivers-extra
-	>=app-admin/eselect-opengl-1.0.7
-	app-admin/eselect-opencl
+	>=app-eselect/eselect-opengl-1.0.7
+	app-eselect/eselect-opencl
 	x11-apps/xauth
 	x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-drivers/ati-userspace/ati-userspace-12.6.ebuild b/x11-drivers/ati-userspace/ati-userspace-12.6.ebuild
index 2637daac..6296ae5f 100644
--- a/x11-drivers/ati-userspace/ati-userspace-12.6.ebuild
+++ b/x11-drivers/ati-userspace/ati-userspace-12.6.ebuild
@@ -27,8 +27,8 @@ RESTRICT="bindist"
 RDEPEND="<=x11-base/xorg-server-1.12.49[-minimal]
 	!x11-drivers/ati-drivers:0
 	!x11-apps/ati-drivers-extra
-	>=app-admin/eselect-opengl-1.0.7
-	app-admin/eselect-opencl
+	>=app-eselect/eselect-opengl-1.0.7
+	app-eselect/eselect-opencl
 	x11-apps/xauth
 	x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-drivers/ati-userspace/ati-userspace-12.6_beta_pre897.ebuild b/x11-drivers/ati-userspace/ati-userspace-12.6_beta_pre897.ebuild
index 97cf89c6..7500a882 100644
--- a/x11-drivers/ati-userspace/ati-userspace-12.6_beta_pre897.ebuild
+++ b/x11-drivers/ati-userspace/ati-userspace-12.6_beta_pre897.ebuild
@@ -28,8 +28,8 @@ RESTRICT="bindist"
 RDEPEND="<=x11-base/xorg-server-1.12.49[-minimal]
 	!x11-drivers/ati-drivers:0
 	!x11-apps/ati-drivers-extra
-	>=app-admin/eselect-opengl-1.0.7
-	app-admin/eselect-opencl
+	>=app-eselect/eselect-opengl-1.0.7
+	app-eselect/eselect-opencl
 	x11-apps/xauth
 	x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-drivers/ati-userspace/ati-userspace-12.8.ebuild b/x11-drivers/ati-userspace/ati-userspace-12.8.ebuild
index ab6501fc..c3a78943 100644
--- a/x11-drivers/ati-userspace/ati-userspace-12.8.ebuild
+++ b/x11-drivers/ati-userspace/ati-userspace-12.8.ebuild
@@ -27,8 +27,8 @@ RESTRICT="bindist"
 RDEPEND="<=x11-base/xorg-server-1.12.49[-minimal]
 	!x11-drivers/ati-drivers:0
 	!x11-apps/ati-drivers-extra
-	>=app-admin/eselect-opengl-1.0.7
-	app-admin/eselect-opencl
+	>=app-eselect/eselect-opengl-1.0.7
+	app-eselect/eselect-opencl
 	x11-apps/xauth
 	x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-drivers/ati-userspace/ati-userspace-13.1.ebuild b/x11-drivers/ati-userspace/ati-userspace-13.1.ebuild
index ee860be4..d11ed452 100644
--- a/x11-drivers/ati-userspace/ati-userspace-13.1.ebuild
+++ b/x11-drivers/ati-userspace/ati-userspace-13.1.ebuild
@@ -24,8 +24,8 @@ RESTRICT="bindist"
 RDEPEND="<=x11-base/xorg-server-1.13.49[-minimal]
 	!x11-drivers/ati-drivers:0
 	!x11-apps/ati-drivers-extra
-	>=app-admin/eselect-opengl-1.0.7
-	app-admin/eselect-opencl
+	>=app-eselect/eselect-opengl-1.0.7
+	app-eselect/eselect-opencl
 	sys-power/acpid
 	x11-apps/xauth
 	x11-libs/libX11
diff --git a/x11-drivers/ati-userspace/ati-userspace-13.12.ebuild b/x11-drivers/ati-userspace/ati-userspace-13.12.ebuild
index e469d09d..a0014f9b 100644
--- a/x11-drivers/ati-userspace/ati-userspace-13.12.ebuild
+++ b/x11-drivers/ati-userspace/ati-userspace-13.12.ebuild
@@ -27,8 +27,8 @@ RESTRICT="bindist test"
 RDEPEND="<=x11-base/xorg-server-1.14.49[-minimal]
 	!x11-drivers/ati-drivers:0
 	!x11-apps/ati-drivers-extra
-	>=app-admin/eselect-opengl-1.0.7
-	app-admin/eselect-opencl
+	>=app-eselect/eselect-opengl-1.0.7
+	app-eselect/eselect-opencl
 	sys-power/acpid
 	x11-apps/xauth
 	x11-libs/libX11
diff --git a/x11-drivers/ati-userspace/ati-userspace-13.4.ebuild b/x11-drivers/ati-userspace/ati-userspace-13.4.ebuild
index 82d348e4..83360820 100644
--- a/x11-drivers/ati-userspace/ati-userspace-13.4.ebuild
+++ b/x11-drivers/ati-userspace/ati-userspace-13.4.ebuild
@@ -29,8 +29,8 @@ RESTRICT="bindist test"
 RDEPEND="<=x11-base/xorg-server-1.13.49[-minimal]
 	!x11-drivers/ati-drivers:0
 	!x11-apps/ati-drivers-extra
-	>=app-admin/eselect-opengl-1.0.7
-	app-admin/eselect-opencl
+	>=app-eselect/eselect-opengl-1.0.7
+	app-eselect/eselect-opencl
 	sys-power/acpid
 	x11-apps/xauth
 	x11-libs/libX11
diff --git a/x11-drivers/ati-userspace/ati-userspace-13.9.ebuild b/x11-drivers/ati-userspace/ati-userspace-13.9.ebuild
index bc8229dc..48c7a900 100644
--- a/x11-drivers/ati-userspace/ati-userspace-13.9.ebuild
+++ b/x11-drivers/ati-userspace/ati-userspace-13.9.ebuild
@@ -25,8 +25,8 @@ RESTRICT="bindist test"
 RDEPEND="<=x11-base/xorg-server-1.14.49[-minimal]
 	!x11-drivers/ati-drivers:0
 	!x11-apps/ati-drivers-extra
-	>=app-admin/eselect-opengl-1.0.7
-	app-admin/eselect-opencl
+	>=app-eselect/eselect-opengl-1.0.7
+	app-eselect/eselect-opencl
 	sys-power/acpid
 	x11-apps/xauth
 	x11-libs/libX11
diff --git a/x11-drivers/ati-userspace/ati-userspace-14.12-r3.ebuild b/x11-drivers/ati-userspace/ati-userspace-14.12-r3.ebuild
index 3b069987..92586d0e 100644
--- a/x11-drivers/ati-userspace/ati-userspace-14.12-r3.ebuild
+++ b/x11-drivers/ati-userspace/ati-userspace-14.12-r3.ebuild
@@ -25,33 +25,17 @@ RESTRICT="bindist test"
 
 RDEPEND="
 	<=x11-base/xorg-server-1.16.49[-minimal]
-	>=app-admin/eselect-opengl-1.0.7
-	app-admin/eselect-opencl
+	>=app-eselect/eselect-opengl-1.0.7
+	app-eselect/eselect-opencl
 	sys-power/acpid
 	x11-apps/xauth
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	virtual/glu
+	virtual/glu[${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXinerama[${MULTILIB_USEDEP}]
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	x11-libs/libXrender[${MULTILIB_USEDEP}]
 	!x11-libs/xvba-video
-	abi_x86_32? (
-			|| (
-				virtual/glu[abi_x86_32]
-				app-emulation/emul-linux-x86-opengl
-			)
-			|| (
-				(
-					x11-libs/libX11[abi_x86_32]
-					x11-libs/libXext[abi_x86_32]
-					x11-libs/libXinerama[abi_x86_32]
-					x11-libs/libXrandr[abi_x86_32]
-					x11-libs/libXrender[abi_x86_32]
-				)
-				app-emulation/emul-linux-x86-xlibs
-			)
-	)
 "
 
 DEPEND="${RDEPEND}
diff --git a/x11-drivers/ati-userspace/ati-userspace-14.4.ebuild b/x11-drivers/ati-userspace/ati-userspace-14.4.ebuild
index 2462ee97..bfcd84bf 100644
--- a/x11-drivers/ati-userspace/ati-userspace-14.4.ebuild
+++ b/x11-drivers/ati-userspace/ati-userspace-14.4.ebuild
@@ -25,8 +25,8 @@ RESTRICT="bindist test"
 RDEPEND="<=x11-base/xorg-server-1.14.49[-minimal]
 	!x11-drivers/ati-drivers:0
 	!x11-apps/ati-drivers-extra
-	>=app-admin/eselect-opengl-1.0.7
-	app-admin/eselect-opencl
+	>=app-eselect/eselect-opengl-1.0.7
+	app-eselect/eselect-opencl
 	sys-power/acpid
 	x11-apps/xauth
 	x11-libs/libX11