[media-libs/desurium-cef] [games-util/desurium*] new rc10, desurium-meta, minor updates

21 files changed, 107 insertions, 1424 deletions

diff --git a/games-util/desurium-meta/Manifest b/games-util/desurium-meta/Manifest
new file mode 100644
index 0000000..39eebfe
--- /dev/null
+++ b/games-util/desurium-meta/Manifest
@@ -0,0 +1,2 @@
+EBUILD desurium-meta-0.ebuild 1035 SHA256 dc891e5301b8afc48b2204bcb9b128a49a06074a683669a39cc9c9a9e336d197 SHA512 c3a7c8423862c8ff4c022fe004426c62d51d0d33158a150791d4c4ad491781e1edab58a3962301325d1a0a68d00b45b0009fdde894073f937c726c30a266564c WHIRLPOOL 84dcd04ecba0016a7f619101b07655acc6484919987d57d7053000a7bc5e1dd5d1ee62685fec6fe1b6833697728e75d75502e0ab5b81c94cdd7ba0f6d92221bc
+MISC metadata.xml 597 SHA256 ceb37f1e2ee59ed010c75d7755330a345956873343fc3f3108e2fa826446c8fe SHA512 71af46869c2606c03a3ca6165e75296ce92685d282f837053e00602d9903b9f892c4696e08c9300eb3c51a21dd266fcd01e0b1086c4e50e98fd49aac2ebb5b0b WHIRLPOOL 7c94eff24c906230bfd39e5e69f81076a609960d34a328e429031bcd9d6f03195b58d91f2fcb48a32a690a872bfef932a3104f55b484bf7b0bf73401851b818c
diff --git a/games-util/desurium-meta/desurium-meta-0.ebuild b/games-util/desurium-meta/desurium-meta-0.ebuild
new file mode 100644
index 0000000..91fea95
--- /dev/null
+++ b/games-util/desurium-meta/desurium-meta-0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+DESCRIPTION="Desurium game client and dependencies (meta)"
+HOMEPAGE="http://desura.com/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+32bit +games-deps"
+
+RDEPEND="
+	games-deps? (
+		dev-lang/mono[-minimal]
+		gnome-base/libglade
+		media-libs/libogg
+		media-libs/libpng:1.2
+		media-libs/libsdl[X,audio,joystick,opengl,video]
+		media-libs/libtheora
+		media-libs/libvorbis
+		media-libs/openal
+		media-libs/sdl-image[gif,jpeg,png,tiff]
+		media-libs/sdl-ttf[X]
+		virtual/ffmpeg[X,mp3,sdl,theora,truetype]
+		>=virtual/jre-1.6
+		amd64? ( 32bit? (
+			app-emulation/emul-linux-x86-gtklibs
+			app-emulation/emul-linux-x86-gtkmmlibs
+			app-emulation/emul-linux-x86-medialibs
+			app-emulation/emul-linux-x86-opengl
+			app-emulation/emul-linux-x86-sdl
+			app-emulation/emul-linux-x86-soundlibs
+			app-emulation/emul-linux-x86-xlibs[opengl]
+		) )
+	)
+	games-util/desurium[32bit?]
+	media-libs/desurium-cef"
diff --git a/games-util/desurium-meta/metadata.xml b/games-util/desurium-meta/metadata.xml
new file mode 100644
index 0000000..a64eabb
--- /dev/null
+++ b/games-util/desurium-meta/metadata.xml
@@ -0,0 +1,15 @@
+<pkgmetadata>
+  <herd>games</herd>
+  <maintainer>
+    <email>git@karolherbst.de</email>
+    <name>Karol Herbst</name>
+  </maintainer>
+  <longdescription lang="en">
+    Desura is a gaming client that allows users to one click download and install games and game modification.
+    For more information, visit http://www.moddb.com/groups/desura/forum/thread/open-sourcing-desura
+  </longdescription>
+  <use>
+    <flag name="32bit">add support for 32bit games in desurium</flag>
+    <flag name="games-deps">RUNTIME USE FLAG install known dependencies of games in desura</flag>
+  </use>
+</pkgmetadata>
diff --git a/games-util/desurium/Manifest b/games-util/desurium/Manifest
index 9d8c760..0f96778 100644
--- a/games-util/desurium/Manifest
+++ b/games-util/desurium/Manifest
@@ -1,12 +1,9 @@
 DIST breakpad-850.tar.gz 5493662 SHA256 81e9b6565073f7f21a96f3aebd989db738419361c9ac8183447d45374794dfbc SHA512 91c6f138687c2937536eb6f9deb4bd1081dfcf4eb8ae48ce4074eccae09c8abbee03310f635ca29aa01ab7218e6d66a2f724648682da7b125bcbf202bfe50eb3 WHIRLPOOL ea42a5dde762051572fe16dffdd96feb56c1d91e47bba1a6f2e9969911080777b079165d665b96872c3d926ca8a1b11c648963555b809a8a01bb253fb0a46488
 DIST cef-291.tar.gz 563020 SHA256 73932d96cd21b03e58f42bf1ea898740dc0490a38f6332e356c76fe02c04ef4d SHA512 1517f2f8cd32a0b62c85175028861600ebc643650494772a6b0730ed40d2bc103e0c673546940c2647467ef21a463610faf5996ed2541f8856a8ca4915ea065e WHIRLPOOL cdf824628dc76d11a0954c77f4a67e023cf3f523984d84c1590d633f59aa88c8e814aa8b15c83cb18129bdf9ae043f1b9d5db76b4714a937e47c8ce55bf48ae3
-DIST desurium-0.8.0_rc1.tar.gz 3681947 SHA256 3afdde6a8fd762cae950b529f96cd9366addd1bb0e7cba6c48b09413e75e7fb9 SHA512 837f15c6e6cf433e223f090b0decaa7f21f5d45c775826ebf782aac444f4e2f0deac86c757c6e4e9472225cd4f934103d188aeebf2b588619a8108db550759cd WHIRLPOOL 062c42432562b70c72f08a82176cfc2010b8ee4af986953824db7ba79c4f9ce0e29c0c521eb802e3b7fdb6c9ddaba43c19786f622139628238a8891849db83f8
-DIST desurium-0.8.0_rc2.tar.gz 3682037 SHA256 adda8f8cdea9b207eadf2f0d9cb4c677fb606106ec294d9db6d2e17d292ece12 SHA512 074ff475d0527bfeae25a4b03094cd74695bdade37a86e4f819b34696713639977374c1fb017a5eb83d167c80a36875c001e6ab31a7069db8ab2f0a112a60b01 WHIRLPOOL 5380895fdabde881be7016861602a1a7c1d764c4d316024e6fbc9ce521606ccd16fac620244a5f5043409db586195bf6f4066fc533575b408c988265cdc71d73
-DIST desurium-0.8.0_rc3.tar.gz 3682616 SHA256 dd60dea708e1eb06e193245f6befea80293033ae333b9c5d51244bce5db4ca91 SHA512 5f3c30bbdecf69a7468170f95248cb0b543c1241960ca02107fd16fdf70cca40af2eaf2e73a8fe7bca5001729f851cf96666eb50ebb85c529c9a45464fe9c11e WHIRLPOOL ec59f6b45b7d876e4dabae1d80f2357e8cfbb3cd4c23f09d316a0161d1a6c3a11f670bddc525f5a6b75e6f7c77b93a5a9ce2658b53f4ea8706dd1d7a0115cb47
-DIST desurium-0.8.0_rc4.tar.gz 3689640 SHA256 065520fb04742902c38efa18bcd6007efc9722994702becaa4e3224d33fd44fe SHA512 d17b5b4bf95a138f7d498ef1b1fa03e5fc3cc5ec56da4cddcbde985797473caf706983f217e6763e6fe8e331b7ea68a3a9f5bbf23c3052b6955ed625e40762b3 WHIRLPOOL dc9b35772a12ddae2e2ae1b5bc5b787a82670067c04b414c5b1ad42dc356a75f1e936499257965b1627b44535777350e1f29420e9c56fdb44d322fbd1c992a09
-DIST desurium-0.8.0_rc5.tar.gz 3667274 SHA256 47b4f82569db54b1861450c7e0f683b842bd7c2f28f677c76e48c8321d62c347 SHA512 7febd8c6d174e6796008e7c892b0fbdff65a65218cc1bb61d402f33a5fb9b76511382674fd96c978e8dd0d374d45ef56a86a3be9e15b8ba0ec69ad1051180706 WHIRLPOOL e89fd7924166028dc4f13650e3cebf67954e77b506bc1db8a03d601175c17b58b92d661de82692797b3c998a546b118e05e6c75b1d88f7ddf1cd2fd8d90ffbb6
-DIST desurium-0.8.0_rc6.tar.gz 3667796 SHA256 54d89b0199eddefd567076a9e50b9b84c2e6bc5132af911b88cf39869c89f222 SHA512 25b3f30157c3a7b7418d795e75b51cdafd56e529edc2a4cba300f91a5fe42de1f40d787093367f7d9dedeadbd38e6c322572c9d2d15f8d86f5b70e1823d27208 WHIRLPOOL 393f09f8244419dcb932abf474810bcd102150260f41f3ad4dfa51a3e3996b7208b2d80d38b74e8876977a1f1b3cb5802d12ff53452cdaf14357f3b1c091b744
-DIST desurium-0.8.0_rc7.tar.gz 3667952 SHA256 aa95af3e30dac965977bb27915db4b628c506ce1d067a870e83a806ef2e72a1a SHA512 94f78149316fab15dfb3c3c94fbfa764674898c86998b50412726dc51d8281bfb91345f3a68c669abebf4c358db66a83c4611a27ee2d8a22393ad0f8e0991b57 WHIRLPOOL f0acafa7a9622e1b383f660589cce5cd4d6d1f1c716073f62e2a6583716d88704ee15d4f34f0e3c0f25d8d96e68d9f0407849286457fa10a25e17fc81dab32d8
-DIST desurium-0.8.0_rc8.tar.gz 3668060 SHA256 92eb816aa486bd2d07770572ef4af9a1e6f129216f56fb768248f86474b35035 SHA512 c658ed5dd73ff9df70a2efaf0cbb02d3fdfb3954cd161f4e5eb7c06f3ea0a25e32b1a7517832dbab5d400610c84ab0c266434c4d164a1020e51065173b151083 WHIRLPOOL 989984656fd8823e29a9084be3b209e980fd577b702801d89eefc2055b44609beb4dcddb823ed6cf91d77c7da65d79b4cae6ea28c9f49c2591e1d9b929e8d146
+DIST desurium-0.8.0_rc10.tar.gz 3668334 SHA256 2e2b65417b433e81f4020a10d5ebf97098962826570c6cc4a0ec69d3bc6e0111 SHA512 08702d75a7205a4fd9f5afbc5686e731c12a79d7e43a7453271936fdf945cc71da9e5abf517897a447f31748ab1f41b4f9c7d9d89ee1c987f38ab4f01743069d WHIRLPOOL ae6f5e9c40dd8d738e36e2e57d035d448146723026c3d4ec7ae48215011d61f20ffe49d4e6259ca1d933e3c6b4be1cf0334f4c9df21443e2a7fcdefa45cec97b
 DIST desurium-0.8.0_rc9.tar.gz 3669424 SHA256 918a9f9df3624db873076144b6480a9affcffb48931e442c36d673324d22dcbc SHA512 9ec0d9903d16d9efbfe0e96f07d1182f6984122c265a8df2d2d21a779d02dffbd21d4a6d9cc2ea13a78d11be2b741c4603c3549ff1d4fc7febb3f573874dccd3 WHIRLPOOL b21ba33da04065ea966df17d80853e84c5af3ab2f0bcf8be4af3288c573069a8cfceb4c0b6f2611c8a6683f91dbf230cfd04138bc39583e7bf47524bb3228b75
 DIST wxWidgets-2.9.3.tar.bz2 17180968 SHA256 739c31a360b5c46b55904a7fb086f5cdfff0816efbc491d8263349210bf323b2 SHA512 f81d0b8f6b8964d2b98d630bdd14266fb69534eba6e613d2bb14451449097b84f98d841abc857cd3f0e228ec8bc300b1c1d01baa211be61babf04fcd1fe0bf91 WHIRLPOOL 5d6d74c17bb95a61af808e93809a83c7d0c28bae40f30fa8637f619476c5d5d4ce3d72946e134daa25eabb8dadbd54b9af0811167b5fc9de8176ac34659c279a
+EBUILD desurium-0.8.0_rc10-r1.ebuild 3533 SHA256 a66c7b2f1da4beb1a415e9eea0a19cd4a34d7990c6458c0f4ebeac968e848346 SHA512 e20d7b5129a0f7fa9e09aad967941b258a7afd76c4fd1af82dc9426211019cbe9ad3f5941b989d03584a18e30e296399d952faf293089f6fe494d6691ddad65c WHIRLPOOL 8498eaf339f26d3f67763ffac9172addb97a24d9cb079aec2f9b78c0c73d25f588d6a1dfe332ac1943087b1177c565fdedea6b43255a10232a231497e245f424
+EBUILD desurium-0.8.0_rc9.ebuild 3520 SHA256 7c5520f518e02d852318dedb6cd41435c45547767e481141b6b1a070a690717b SHA512 8af609b3f0a4a5b5452cda91a45e629140ba7d0de780f843d6977a6ae9516bb8189fa238bf5735810d1ef119fe02d73ab9929071b409c3538b5ef25777cbebaa WHIRLPOOL c426a302071124180cdd44c146afcd4e450305920051acf1dc61c39e0f265c068c4f30c72d011bb4eac8f0ef985a1a4ca1871ecc808c9a7ed8dd1a89f23feafa
+EBUILD desurium-9999.ebuild 3533 SHA256 a66c7b2f1da4beb1a415e9eea0a19cd4a34d7990c6458c0f4ebeac968e848346 SHA512 e20d7b5129a0f7fa9e09aad967941b258a7afd76c4fd1af82dc9426211019cbe9ad3f5941b989d03584a18e30e296399d952faf293089f6fe494d6691ddad65c WHIRLPOOL 8498eaf339f26d3f67763ffac9172addb97a24d9cb079aec2f9b78c0c73d25f588d6a1dfe332ac1943087b1177c565fdedea6b43255a10232a231497e245f424
+MISC metadata.xml 638 SHA256 70e326236628509449e924b99dfacd624a83decc9e3eab5a4cf72164d51f8181 SHA512 d5ad45a86528b98570ce0985a46763bc3a93b767f823f11c8d1b33b80e75cf48c95fd729419a768406d3cca90a15fe0f5a51636097628d3e6c8e2ead510e2eef WHIRLPOOL 609268c89cfe8f9e25b37fb985e15f5876685969d2ec0d4511f66861a420920e59a65b7f21ad346b995253617e82ae903b3f5da7b1ba507159838ceb4d64de9f
diff --git a/games-util/desurium/desurium-0.8.0_rc1.ebuild b/games-util/desurium/desurium-0.8.0_rc1.ebuild
deleted file mode 100644
index ab33ecd..0000000
--- a/games-util/desurium/desurium-0.8.0_rc1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-unset GIT_ECLASS
-
-GITHUB_MAINTAINER="lodle"
-GITHUB_PROJECT="Desurium"
-
-# tools versions
-BREAKPAD_ARC="breakpad-850.tar.gz"
-CEF_ARC="cef-291.tar.gz"
-WX_GTK_VER="2.9"
-
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="git://github.com/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}.git"
-	GIT_ECLASS="git-2"
-	SRC_URI=""
-	EGIT_NOUNPACK="true"
-else
-	DESURIUM_ARC="${P}.tar.gz"
-	SRC_URI="http://github.com/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/tarball/${PV} -> ${DESURIUM_ARC}"
-fi
-SRC_URI="${SRC_URI}
-	mirror://github/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/${BREAKPAD_ARC}
-	mirror://github/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/${CEF_ARC}"
-
-inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils wxwidgets games toolchain-funcs
-
-DESCRIPTION="Free software version of Desura game client"
-HOMEPAGE="https://github.com/lodle/Desurium"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+32bit debug tools"
-
-if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-# wxGTK-2.9.4.1 does not work!
-COMMON_DEPEND="
-	app-arch/bzip2
-	dev-db/sqlite
-	>=dev-libs/boost-1.47:=
-	dev-libs/openssl:0
-
-	|| ( <dev-libs/tinyxml-2.6.2-r2[-stl]
-	    >=dev-libs/tinyxml-2.6.2-r2
-	)
-
-	<dev-lang/v8-3.16.5:=
-	|| (
-		net-misc/curl[adns]
-		net-misc/curl[ares]
-	)
-	>=sys-devel/gcc-4.6
-	virtual/pkgconfig
-	x11-libs/gtk+:2
-	x11-libs/libnotify
-	=x11-libs/wxGTK-2.9.3.1[X]
-
-	amd64? ( 32bit? (
-		sys-devel/gcc[multilib]
-	) )"
-RDEPEND="media-libs/desurium-cef
-	x11-misc/xdg-user-dirs
-	x11-misc/xdg-utils
-	${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if [[ $(tc-getCC) =~ gcc ]]; then
-			if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 6 || $(gcc-major-version) -lt 4 ]] ; then
-				eerror "You need at least sys-devel/gcc-4.6.0"
-				die "You need at least sys-devel/gcc-4.6.0"
-			fi
-		fi
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		git-2_src_unpack
-	else
-		unpack ${DESURIUM_ARC}
-		S="${WORKDIR}/$(ls ${WORKDIR})"
-	fi
-}
-
-src_configure() {
-	# -DWITH_ARES=FALSE will use system curl, because we force curl[ares] to have ares support
-	local mycmakeargs=(
-		-DWITH_ARES=FALSE
-		-DFORCE_SYS_DEPS=TRUE
-		-DBUILD_CEF=FALSE
-		-BUILD_ONLY_CEF=FALSE
-		$(cmake-utils_use debug DEBUG)
-		$(cmake-utils_use 32bit 32BIT_SUPPORT)
-		$(cmake-utils_use tools BUILD_TOOLS)
-		-DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}"
-		-DBREAKPAD_URL="file://${DISTDIR}/${BREAKPAD_ARC}"
-		-DCEF_URL="file://${DISTDIR}/${CEF_ARC}"
-		-DBINDIR="${GAMES_BINDIR}"
-		-DDATADIR="${GAMES_DATADIR}"
-		-DRUNTIME_LIBDIR="$(games_get_libdir)"
-		-DDESKTOPDIR="/usr/share/applications"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	# even autotools does not respect AR properly sometimes
-	cmake-utils_src_compile AR=$(tc-getAR)
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newicon -s scalable "${S}/src/branding_${PN}/sources/desubot.svg" "${PN}.svg"
-	make_desktop_entry "${GAMES_BINDIR}/desura" "Desurium" "${PN}"
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-util/desurium/desurium-0.8.0_rc5.ebuild b/games-util/desurium/desurium-0.8.0_rc10-r1.ebuild
index 68bf808..ee65565 100644
--- a/games-util/desurium/desurium-0.8.0_rc5.ebuild
+++ b/games-util/desurium/desurium-0.8.0_rc10-r1.ebuild
@@ -14,11 +14,7 @@ GITHUB_PROJECT="Desurium"
 BREAKPAD_ARC="breakpad-850.tar.gz"
 CEF_ARC="cef-291.tar.gz"
 WX_ARC="wxWidgets-2.9.3.tar.bz2"
-
-if ! use bundled-wxgtk ; then
-	WX_GTK_VER="2.9"
-	WX_ECLASS="wxwidgets"
-fi
+WX_GTK_VER="2.9"
 
 if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="git://github.com/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}.git"
@@ -30,19 +26,19 @@ else
 	SRC_URI="http://github.com/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/tarball/${PV} -> ${DESURIUM_ARC}"
 fi
 SRC_URI="${SRC_URI}
-	mirror://github/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/${BREAKPAD_ARC}
-	mirror://github/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/${CEF_ARC}
+	mirror://sourceforge/desurium/${BREAKPAD_ARC}
+	mirror://sourceforge/desurium/${CEF_ARC}
 	bundled-wxgtk? (
 		ftp://ftp.wxwidgets.org/pub/2.9.3/${WX_ARC}
 	)"
 
-inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils ${WX_ECLASS} games toolchain-funcs
+inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils wxwidgets games toolchain-funcs
 
 DESCRIPTION="Free software version of Desura game client"
 HOMEPAGE="https://github.com/lodle/Desurium"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="+32bit +bundled-wxgtk debug tools"
+IUSE="+32bit +bundled-wxgtk debug test tools"
 
 if [[ ${PV} != 9999* ]]; then
 	KEYWORDS="~amd64 ~x86"
@@ -52,21 +48,22 @@ fi
 COMMON_DEPEND="app-arch/bzip2
 	dev-db/sqlite
 	>=dev-libs/boost-1.47:=
+	dev-libs/glib:2
 	dev-libs/openssl:0
 
 	|| ( <dev-libs/tinyxml-2.6.2-r2[-stl]
 	    >=dev-libs/tinyxml-2.6.2-r2
 	)
 
-	<dev-lang/v8-3.16.5:=
+	dev-lang/v8:=
 	|| (
 		net-misc/curl[adns]
 		net-misc/curl[ares]
 	)
 	>=sys-devel/gcc-4.6
-	virtual/pkgconfig
 	x11-libs/gtk+:2
 	x11-libs/libnotify
+	x11-libs/libXt
 	!bundled-wxgtk? (
 		=x11-libs/wxGTK-2.9.3.1[X]
 	)
@@ -74,11 +71,12 @@ COMMON_DEPEND="app-arch/bzip2
 	amd64? ( 32bit? (
 		sys-devel/gcc[multilib]
 	) )"
-RDEPEND="media-libs/desurium-cef
+RDEPEND=">=media-libs/desurium-cef-4
 	x11-misc/xdg-user-dirs
 	x11-misc/xdg-utils
 	${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
 
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != binary ]]; then
@@ -106,17 +104,21 @@ src_configure() {
 		-DWITH_ARES=FALSE
 		-DFORCE_SYS_DEPS=TRUE
 		-DBUILD_CEF=FALSE
+		$(cmake-utils_use test BUILD_TESTS)
 		-BUILD_ONLY_CEF=FALSE
 		$(cmake-utils_use debug DEBUG)
 		$(cmake-utils_use 32bit 32BIT_SUPPORT)
 		$(cmake-utils_use tools BUILD_TOOLS)
+		-DWITH_FLASH=FALSE
 		-DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}"
 		-DBREAKPAD_URL="file://${DISTDIR}/${BREAKPAD_ARC}"
 		-DCEF_URL="file://${DISTDIR}/${CEF_ARC}"
 		-DBINDIR="${GAMES_BINDIR}"
 		-DDATADIR="${GAMES_DATADIR}"
 		-DRUNTIME_LIBDIR="$(games_get_libdir)"
-		-DDESKTOPDIR="/usr/share/applications"
+		-DINSTALL_DESKTOP_FILE=FALSE
+		-DDESKTOP_EXE=desura
+		-DDESKTOP_ICON=desurium
 		$(cmake-utils_use bundled-wxgtk FORCE_BUNDLED_WXGTK)
 		$(use bundled-wxgtk && echo -DWXWIDGET_URL="file://${DISTDIR}/${WX_ARC}")
 	)
@@ -132,7 +134,7 @@ src_install() {
 	cmake-utils_src_install
 
 	newicon -s scalable "${S}/src/branding_${PN}/sources/desubot.svg" "${PN}.svg"
-	make_desktop_entry "${GAMES_BINDIR}/desura" "Desurium" "${PN}"
+	domenu "${BUILD_DIR}/desura.desktop"
 
 	prepgamesdirs
 }
diff --git a/games-util/desurium/desurium-0.8.0_rc2.ebuild b/games-util/desurium/desurium-0.8.0_rc2.ebuild
deleted file mode 100644
index 81f18ee..0000000
--- a/games-util/desurium/desurium-0.8.0_rc2.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-unset GIT_ECLASS
-
-GITHUB_MAINTAINER="lodle"
-GITHUB_PROJECT="Desurium"
-
-# tools versions
-BREAKPAD_ARC="breakpad-850.tar.gz"
-CEF_ARC="cef-291.tar.gz"
-WX_ARC="wxWidgets-2.9.3.tar.bz2"
-WX_GTK_VER="2.9"
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="git://github.com/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}.git"
-	GIT_ECLASS="git-2"
-	SRC_URI=""
-	EGIT_NOUNPACK="true"
-else
-	DESURIUM_ARC="${P}.tar.gz"
-	SRC_URI="http://github.com/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/tarball/${PV} -> ${DESURIUM_ARC}"
-fi
-SRC_URI="${SRC_URI}
-	mirror://github/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/${BREAKPAD_ARC}
-	mirror://github/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/${CEF_ARC}"
-
-inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils wxwidgets games toolchain-funcs
-
-DESCRIPTION="Free software version of Desura game client"
-HOMEPAGE="https://github.com/lodle/Desurium"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+32bit debug tools"
-
-if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-# wxGTK-2.9.4.1 does not work!
-COMMON_DEPEND="app-arch/bzip2
-	dev-db/sqlite
-	>=dev-libs/boost-1.47:=
-	dev-libs/openssl:0
-
-	|| ( <dev-libs/tinyxml-2.6.2-r2[-stl]
-	    >=dev-libs/tinyxml-2.6.2-r2
-	)
-
-	<dev-lang/v8-3.16.5:=
-	|| (
-		net-misc/curl[adns]
-		net-misc/curl[ares]
-	)
-	>=sys-devel/gcc-4.6
-	virtual/pkgconfig
-	x11-libs/gtk+:2
-	x11-libs/libnotify
-	=x11-libs/wxGTK-2.9.3.1[X]
-
-	amd64? ( 32bit? (
-		sys-devel/gcc[multilib]
-	) )"
-RDEPEND="media-libs/desurium-cef
-	x11-misc/xdg-user-dirs
-	x11-misc/xdg-utils
-	${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if [[ $(tc-getCC) =~ gcc ]]; then
-			if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 6 || $(gcc-major-version) -lt 4 ]] ; then
-				eerror "You need at least sys-devel/gcc-4.6.0"
-				die "You need at least sys-devel/gcc-4.6.0"
-			fi
-		fi
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		git-2_src_unpack
-	else
-		unpack ${DESURIUM_ARC}
-		S="${WORKDIR}/$(ls ${WORKDIR})"
-	fi
-}
-
-src_configure() {
-	# -DWITH_ARES=FALSE will use system curl, because we force curl[ares] to have ares support
-	local mycmakeargs=(
-		-DWITH_ARES=FALSE
-		-DFORCE_SYS_DEPS=TRUE
-		-DBUILD_CEF=FALSE
-		-BUILD_ONLY_CEF=FALSE
-		$(cmake-utils_use debug DEBUG)
-		$(cmake-utils_use 32bit 32BIT_SUPPORT)
-		$(cmake-utils_use tools BUILD_TOOLS)
-		-DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}"
-		-DBREAKPAD_URL="file://${DISTDIR}/${BREAKPAD_ARC}"
-		-DCEF_URL="file://${DISTDIR}/${CEF_ARC}"
-		-DBINDIR="${GAMES_BINDIR}"
-		-DDATADIR="${GAMES_DATADIR}"
-		-DRUNTIME_LIBDIR="$(games_get_libdir)"
-		-DDESKTOPDIR="/usr/share/applications"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	# even autotools does not respect AR properly sometimes
-	cmake-utils_src_compile AR=$(tc-getAR)
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newicon -s scalable "${S}/src/branding_${PN}/sources/desubot.svg" "${PN}.svg"
-	make_desktop_entry "${GAMES_BINDIR}/desura" "Desurium" "${PN}"
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-util/desurium/desurium-0.8.0_rc3.ebuild b/games-util/desurium/desurium-0.8.0_rc3.ebuild
deleted file mode 100644
index 81f18ee..0000000
--- a/games-util/desurium/desurium-0.8.0_rc3.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-unset GIT_ECLASS
-
-GITHUB_MAINTAINER="lodle"
-GITHUB_PROJECT="Desurium"
-
-# tools versions
-BREAKPAD_ARC="breakpad-850.tar.gz"
-CEF_ARC="cef-291.tar.gz"
-WX_ARC="wxWidgets-2.9.3.tar.bz2"
-WX_GTK_VER="2.9"
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="git://github.com/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}.git"
-	GIT_ECLASS="git-2"
-	SRC_URI=""
-	EGIT_NOUNPACK="true"
-else
-	DESURIUM_ARC="${P}.tar.gz"
-	SRC_URI="http://github.com/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/tarball/${PV} -> ${DESURIUM_ARC}"
-fi
-SRC_URI="${SRC_URI}
-	mirror://github/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/${BREAKPAD_ARC}
-	mirror://github/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/${CEF_ARC}"
-
-inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils wxwidgets games toolchain-funcs
-
-DESCRIPTION="Free software version of Desura game client"
-HOMEPAGE="https://github.com/lodle/Desurium"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+32bit debug tools"
-
-if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-# wxGTK-2.9.4.1 does not work!
-COMMON_DEPEND="app-arch/bzip2
-	dev-db/sqlite
-	>=dev-libs/boost-1.47:=
-	dev-libs/openssl:0
-
-	|| ( <dev-libs/tinyxml-2.6.2-r2[-stl]
-	    >=dev-libs/tinyxml-2.6.2-r2
-	)
-
-	<dev-lang/v8-3.16.5:=
-	|| (
-		net-misc/curl[adns]
-		net-misc/curl[ares]
-	)
-	>=sys-devel/gcc-4.6
-	virtual/pkgconfig
-	x11-libs/gtk+:2
-	x11-libs/libnotify
-	=x11-libs/wxGTK-2.9.3.1[X]
-
-	amd64? ( 32bit? (
-		sys-devel/gcc[multilib]
-	) )"
-RDEPEND="media-libs/desurium-cef
-	x11-misc/xdg-user-dirs
-	x11-misc/xdg-utils
-	${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if [[ $(tc-getCC) =~ gcc ]]; then
-			if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 6 || $(gcc-major-version) -lt 4 ]] ; then
-				eerror "You need at least sys-devel/gcc-4.6.0"
-				die "You need at least sys-devel/gcc-4.6.0"
-			fi
-		fi
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		git-2_src_unpack
-	else
-		unpack ${DESURIUM_ARC}
-		S="${WORKDIR}/$(ls ${WORKDIR})"
-	fi
-}
-
-src_configure() {
-	# -DWITH_ARES=FALSE will use system curl, because we force curl[ares] to have ares support
-	local mycmakeargs=(
-		-DWITH_ARES=FALSE
-		-DFORCE_SYS_DEPS=TRUE
-		-DBUILD_CEF=FALSE
-		-BUILD_ONLY_CEF=FALSE
-		$(cmake-utils_use debug DEBUG)
-		$(cmake-utils_use 32bit 32BIT_SUPPORT)
-		$(cmake-utils_use tools BUILD_TOOLS)
-		-DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}"
-		-DBREAKPAD_URL="file://${DISTDIR}/${BREAKPAD_ARC}"
-		-DCEF_URL="file://${DISTDIR}/${CEF_ARC}"
-		-DBINDIR="${GAMES_BINDIR}"
-		-DDATADIR="${GAMES_DATADIR}"
-		-DRUNTIME_LIBDIR="$(games_get_libdir)"
-		-DDESKTOPDIR="/usr/share/applications"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	# even autotools does not respect AR properly sometimes
-	cmake-utils_src_compile AR=$(tc-getAR)
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newicon -s scalable "${S}/src/branding_${PN}/sources/desubot.svg" "${PN}.svg"
-	make_desktop_entry "${GAMES_BINDIR}/desura" "Desurium" "${PN}"
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-util/desurium/desurium-0.8.0_rc4.ebuild b/games-util/desurium/desurium-0.8.0_rc4.ebuild
deleted file mode 100644
index 81f18ee..0000000
--- a/games-util/desurium/desurium-0.8.0_rc4.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-unset GIT_ECLASS
-
-GITHUB_MAINTAINER="lodle"
-GITHUB_PROJECT="Desurium"
-
-# tools versions
-BREAKPAD_ARC="breakpad-850.tar.gz"
-CEF_ARC="cef-291.tar.gz"
-WX_ARC="wxWidgets-2.9.3.tar.bz2"
-WX_GTK_VER="2.9"
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="git://github.com/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}.git"
-	GIT_ECLASS="git-2"
-	SRC_URI=""
-	EGIT_NOUNPACK="true"
-else
-	DESURIUM_ARC="${P}.tar.gz"
-	SRC_URI="http://github.com/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/tarball/${PV} -> ${DESURIUM_ARC}"
-fi
-SRC_URI="${SRC_URI}
-	mirror://github/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/${BREAKPAD_ARC}
-	mirror://github/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/${CEF_ARC}"
-
-inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils wxwidgets games toolchain-funcs
-
-DESCRIPTION="Free software version of Desura game client"
-HOMEPAGE="https://github.com/lodle/Desurium"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+32bit debug tools"
-
-if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-# wxGTK-2.9.4.1 does not work!
-COMMON_DEPEND="app-arch/bzip2
-	dev-db/sqlite
-	>=dev-libs/boost-1.47:=
-	dev-libs/openssl:0
-
-	|| ( <dev-libs/tinyxml-2.6.2-r2[-stl]
-	    >=dev-libs/tinyxml-2.6.2-r2
-	)
-
-	<dev-lang/v8-3.16.5:=
-	|| (
-		net-misc/curl[adns]
-		net-misc/curl[ares]
-	)
-	>=sys-devel/gcc-4.6
-	virtual/pkgconfig
-	x11-libs/gtk+:2
-	x11-libs/libnotify
-	=x11-libs/wxGTK-2.9.3.1[X]
-
-	amd64? ( 32bit? (
-		sys-devel/gcc[multilib]
-	) )"
-RDEPEND="media-libs/desurium-cef
-	x11-misc/xdg-user-dirs
-	x11-misc/xdg-utils
-	${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if [[ $(tc-getCC) =~ gcc ]]; then
-			if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 6 || $(gcc-major-version) -lt 4 ]] ; then
-				eerror "You need at least sys-devel/gcc-4.6.0"
-				die "You need at least sys-devel/gcc-4.6.0"
-			fi
-		fi
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		git-2_src_unpack
-	else
-		unpack ${DESURIUM_ARC}
-		S="${WORKDIR}/$(ls ${WORKDIR})"
-	fi
-}
-
-src_configure() {
-	# -DWITH_ARES=FALSE will use system curl, because we force curl[ares] to have ares support
-	local mycmakeargs=(
-		-DWITH_ARES=FALSE
-		-DFORCE_SYS_DEPS=TRUE
-		-DBUILD_CEF=FALSE
-		-BUILD_ONLY_CEF=FALSE
-		$(cmake-utils_use debug DEBUG)
-		$(cmake-utils_use 32bit 32BIT_SUPPORT)
-		$(cmake-utils_use tools BUILD_TOOLS)
-		-DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}"
-		-DBREAKPAD_URL="file://${DISTDIR}/${BREAKPAD_ARC}"
-		-DCEF_URL="file://${DISTDIR}/${CEF_ARC}"
-		-DBINDIR="${GAMES_BINDIR}"
-		-DDATADIR="${GAMES_DATADIR}"
-		-DRUNTIME_LIBDIR="$(games_get_libdir)"
-		-DDESKTOPDIR="/usr/share/applications"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	# even autotools does not respect AR properly sometimes
-	cmake-utils_src_compile AR=$(tc-getAR)
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newicon -s scalable "${S}/src/branding_${PN}/sources/desubot.svg" "${PN}.svg"
-	make_desktop_entry "${GAMES_BINDIR}/desura" "Desurium" "${PN}"
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-util/desurium/desurium-0.8.0_rc6.ebuild b/games-util/desurium/desurium-0.8.0_rc6.ebuild
deleted file mode 100644
index dd293ec..0000000
--- a/games-util/desurium/desurium-0.8.0_rc6.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-unset GIT_ECLASS
-unset WX_ECLASS
-
-GITHUB_MAINTAINER="lodle"
-GITHUB_PROJECT="Desurium"
-
-# tools versions
-BREAKPAD_ARC="breakpad-850.tar.gz"
-CEF_ARC="cef-291.tar.gz"
-WX_ARC="wxWidgets-2.9.3.tar.bz2"
-
-if ! use bundled-wxgtk ; then
-	WX_GTK_VER="2.9"
-	WX_ECLASS="wxwidgets"
-fi
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="git://github.com/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}.git"
-	GIT_ECLASS="git-2"
-	SRC_URI=""
-	EGIT_NOUNPACK="true"
-else
-	DESURIUM_ARC="${P}.tar.gz"
-	SRC_URI="http://github.com/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/tarball/${PV} -> ${DESURIUM_ARC}"
-fi
-SRC_URI="${SRC_URI}
-	mirror://github/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/${BREAKPAD_ARC}
-	mirror://github/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/${CEF_ARC}
-	bundled-wxgtk? (
-		ftp://ftp.wxwidgets.org/pub/2.9.3/${WX_ARC}
-	)"
-
-inherit cmake-utils eutils flag-o-matic ${GIT_ECLASS} gnome2-utils ${WX_ECLASS} games toolchain-funcs
-
-DESCRIPTION="Free software version of Desura game client"
-HOMEPAGE="https://github.com/lodle/Desurium"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+32bit +bundled-wxgtk debug tools"
-
-if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-# wxGTK-2.9.4.1 does not work!
-COMMON_DEPEND="app-arch/bzip2
-	dev-db/sqlite
-	>=dev-libs/boost-1.47:=
-	dev-libs/glib:2
-	dev-libs/openssl:0
-
-	|| ( <dev-libs/tinyxml-2.6.2-r2[-stl]
-	    >=dev-libs/tinyxml-2.6.2-r2
-	)
-
-	<dev-lang/v8-3.16.5:=
-	|| (
-		net-misc/curl[adns]
-		net-misc/curl[ares]
-	)
-	>=sys-devel/gcc-4.6
-	virtual/pkgconfig
-	x11-libs/gtk+:2
-	x11-libs/libnotify
-	x11-libs/libXt
-	!bundled-wxgtk? (
-		=x11-libs/wxGTK-2.9.3.1[X]
-	)
-
-	amd64? ( 32bit? (
-		sys-devel/gcc[multilib]
-	) )"
-RDEPEND="
-	x86? (
-		www-plugins/adobe-flash[32bit]
-	)
-	amd64? (
-		www-plugins/adobe-flash[64bit]
-	)
-	>=media-libs/desurium-cef-3
-	x11-misc/xdg-user-dirs
-	x11-misc/xdg-utils
-	${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if [[ $(tc-getCC) =~ gcc ]]; then
-			if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 6 || $(gcc-major-version) -lt 4 ]] ; then
-				eerror "You need at least sys-devel/gcc-4.6.0"
-				die "You need at least sys-devel/gcc-4.6.0"
-			fi
-		fi
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		git-2_src_unpack
-	else
-		unpack ${DESURIUM_ARC}
-		S="${WORKDIR}/$(ls ${WORKDIR})"
-	fi
-}
-
-src_configure() {
-	# on some systems -Wl,--as-needed breaks the flashplayer
-	filter-ldflags -Wl,--as-needed
-
-	# -DWITH_ARES=FALSE will use system curl, because we force curl[ares] to have ares support
-	local mycmakeargs=(
-		-DWITH_ARES=FALSE
-		-DFORCE_SYS_DEPS=TRUE
-		-DBUILD_CEF=FALSE
-		-BUILD_ONLY_CEF=FALSE
-		$(cmake-utils_use debug DEBUG)
-		$(cmake-utils_use 32bit 32BIT_SUPPORT)
-		$(cmake-utils_use tools BUILD_TOOLS)
-		-DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}"
-		-DBREAKPAD_URL="file://${DISTDIR}/${BREAKPAD_ARC}"
-		-DCEF_URL="file://${DISTDIR}/${CEF_ARC}"
-		-DBINDIR="${GAMES_BINDIR}"
-		-DDATADIR="${GAMES_DATADIR}"
-		-DRUNTIME_LIBDIR="$(games_get_libdir)"
-		-DDESKTOPDIR="/usr/share/applications"
-		$(cmake-utils_use bundled-wxgtk FORCE_BUNDLED_WXGTK)
-		$(use bundled-wxgtk && echo -DWXWIDGET_URL="file://${DISTDIR}/${WX_ARC}")
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	# even autotools does not respect AR properly sometimes
-	cmake-utils_src_compile AR=$(tc-getAR)
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newicon -s scalable "${S}/src/branding_${PN}/sources/desubot.svg" "${PN}.svg"
-	make_desktop_entry "${GAMES_BINDIR}/desura" "Desurium" "${PN}"
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-util/desurium/desurium-0.8.0_rc7.ebuild b/games-util/desurium/desurium-0.8.0_rc7.ebuild
deleted file mode 100644
index 7c8a41b..0000000
--- a/games-util/desurium/desurium-0.8.0_rc7.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-unset GIT_ECLASS
-unset WX_ECLASS
-
-GITHUB_MAINTAINER="lodle"
-GITHUB_PROJECT="Desurium"
-
-# tools versions
-BREAKPAD_ARC="breakpad-850.tar.gz"
-CEF_ARC="cef-291.tar.gz"
-WX_ARC="wxWidgets-2.9.3.tar.bz2"
-
-if ! use bundled-wxgtk ; then
-	WX_GTK_VER="2.9"
-	WX_ECLASS="wxwidgets"
-fi
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="git://github.com/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}.git"
-	GIT_ECLASS="git-2"
-	SRC_URI=""
-	EGIT_NOUNPACK="true"
-else
-	DESURIUM_ARC="${P}.tar.gz"
-	SRC_URI="http://github.com/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/tarball/${PV} -> ${DESURIUM_ARC}"
-fi
-SRC_URI="${SRC_URI}
-	mirror://github/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/${BREAKPAD_ARC}
-	mirror://github/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/${CEF_ARC}
-	bundled-wxgtk? (
-		ftp://ftp.wxwidgets.org/pub/2.9.3/${WX_ARC}
-	)"
-
-inherit cmake-utils eutils flag-o-matic ${GIT_ECLASS} gnome2-utils ${WX_ECLASS} games toolchain-funcs
-
-DESCRIPTION="Free software version of Desura game client"
-HOMEPAGE="https://github.com/lodle/Desurium"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+32bit +bundled-wxgtk debug tools"
-
-if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-# wxGTK-2.9.4.1 does not work!
-COMMON_DEPEND="app-arch/bzip2
-	dev-db/sqlite
-	>=dev-libs/boost-1.47:=
-	dev-libs/glib:2
-	dev-libs/openssl:0
-
-	|| ( <dev-libs/tinyxml-2.6.2-r2[-stl]
-	    >=dev-libs/tinyxml-2.6.2-r2
-	)
-
-	<dev-lang/v8-3.16.5:=
-	|| (
-		net-misc/curl[adns]
-		net-misc/curl[ares]
-	)
-	>=sys-devel/gcc-4.6
-	virtual/pkgconfig
-	x11-libs/gtk+:2
-	x11-libs/libnotify
-	x11-libs/libXt
-	!bundled-wxgtk? (
-		=x11-libs/wxGTK-2.9.3.1[X]
-	)
-
-	amd64? ( 32bit? (
-		sys-devel/gcc[multilib]
-	) )"
-RDEPEND="
-	x86? (
-		www-plugins/adobe-flash[32bit]
-	)
-	amd64? (
-		www-plugins/adobe-flash[64bit]
-	)
-	>=media-libs/desurium-cef-4
-	x11-misc/xdg-user-dirs
-	x11-misc/xdg-utils
-	${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if [[ $(tc-getCC) =~ gcc ]]; then
-			if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 6 || $(gcc-major-version) -lt 4 ]] ; then
-				eerror "You need at least sys-devel/gcc-4.6.0"
-				die "You need at least sys-devel/gcc-4.6.0"
-			fi
-		fi
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		git-2_src_unpack
-	else
-		unpack ${DESURIUM_ARC}
-		S="${WORKDIR}/$(ls ${WORKDIR})"
-	fi
-}
-
-src_configure() {
-	# on some systems -Wl,--as-needed breaks the flashplayer
-	filter-ldflags -Wl,--as-needed
-
-	# -DWITH_ARES=FALSE will use system curl, because we force curl[ares] to have ares support
-	local mycmakeargs=(
-		-DWITH_ARES=FALSE
-		-DFORCE_SYS_DEPS=TRUE
-		-DBUILD_CEF=FALSE
-		-BUILD_ONLY_CEF=FALSE
-		$(cmake-utils_use debug DEBUG)
-		$(cmake-utils_use 32bit 32BIT_SUPPORT)
-		$(cmake-utils_use tools BUILD_TOOLS)
-		-DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}"
-		-DBREAKPAD_URL="file://${DISTDIR}/${BREAKPAD_ARC}"
-		-DCEF_URL="file://${DISTDIR}/${CEF_ARC}"
-		-DBINDIR="${GAMES_BINDIR}"
-		-DDATADIR="${GAMES_DATADIR}"
-		-DRUNTIME_LIBDIR="$(games_get_libdir)"
-		-DDESKTOPDIR="/usr/share/applications"
-		$(cmake-utils_use bundled-wxgtk FORCE_BUNDLED_WXGTK)
-		$(use bundled-wxgtk && echo -DWXWIDGET_URL="file://${DISTDIR}/${WX_ARC}")
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	# even autotools does not respect AR properly sometimes
-	cmake-utils_src_compile AR=$(tc-getAR)
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newicon -s scalable "${S}/src/branding_${PN}/sources/desubot.svg" "${PN}.svg"
-	make_desktop_entry "${GAMES_BINDIR}/desura" "Desurium" "${PN}"
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-util/desurium/desurium-0.8.0_rc8.ebuild b/games-util/desurium/desurium-0.8.0_rc8.ebuild
deleted file mode 100644
index 940faf4..0000000
--- a/games-util/desurium/desurium-0.8.0_rc8.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-unset GIT_ECLASS
-unset WX_ECLASS
-
-GITHUB_MAINTAINER="lodle"
-GITHUB_PROJECT="Desurium"
-
-# tools versions
-BREAKPAD_ARC="breakpad-850.tar.gz"
-CEF_ARC="cef-291.tar.gz"
-WX_ARC="wxWidgets-2.9.3.tar.bz2"
-
-if ! use bundled-wxgtk ; then
-	WX_GTK_VER="2.9"
-	WX_ECLASS="wxwidgets"
-fi
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="git://github.com/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}.git"
-	GIT_ECLASS="git-2"
-	SRC_URI=""
-	EGIT_NOUNPACK="true"
-else
-	DESURIUM_ARC="${P}.tar.gz"
-	SRC_URI="http://github.com/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/tarball/${PV} -> ${DESURIUM_ARC}"
-fi
-SRC_URI="${SRC_URI}
-	mirror://github/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/${BREAKPAD_ARC}
-	mirror://github/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/${CEF_ARC}
-	bundled-wxgtk? (
-		ftp://ftp.wxwidgets.org/pub/2.9.3/${WX_ARC}
-	)"
-
-inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils ${WX_ECLASS} games toolchain-funcs
-
-DESCRIPTION="Free software version of Desura game client"
-HOMEPAGE="https://github.com/lodle/Desurium"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+32bit +bundled-wxgtk debug tools"
-
-if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-# wxGTK-2.9.4.1 does not work!
-COMMON_DEPEND="app-arch/bzip2
-	dev-db/sqlite
-	>=dev-libs/boost-1.47:=
-	dev-libs/glib:2
-	dev-libs/openssl:0
-
-	|| ( <dev-libs/tinyxml-2.6.2-r2[-stl]
-	    >=dev-libs/tinyxml-2.6.2-r2
-	)
-
-	<dev-lang/v8-3.16.5:=
-	|| (
-		net-misc/curl[adns]
-		net-misc/curl[ares]
-	)
-	>=sys-devel/gcc-4.6
-	virtual/pkgconfig
-	x11-libs/gtk+:2
-	x11-libs/libnotify
-	x11-libs/libXt
-	!bundled-wxgtk? (
-		=x11-libs/wxGTK-2.9.3.1[X]
-	)
-
-	amd64? ( 32bit? (
-		sys-devel/gcc[multilib]
-	) )"
-RDEPEND="
-	x86? (
-		www-plugins/adobe-flash[32bit]
-	)
-	amd64? (
-		www-plugins/adobe-flash[64bit]
-	)
-	>=media-libs/desurium-cef-4
-	x11-misc/xdg-user-dirs
-	x11-misc/xdg-utils
-	${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if [[ $(tc-getCC) =~ gcc ]]; then
-			if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 6 || $(gcc-major-version) -lt 4 ]] ; then
-				eerror "You need at least sys-devel/gcc-4.6.0"
-				die "You need at least sys-devel/gcc-4.6.0"
-			fi
-		fi
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		git-2_src_unpack
-	else
-		unpack ${DESURIUM_ARC}
-		S="${WORKDIR}/$(ls ${WORKDIR})"
-	fi
-}
-
-src_configure() {
-	# -DWITH_ARES=FALSE will use system curl, because we force curl[ares] to have ares support
-	local mycmakeargs=(
-		-DWITH_ARES=FALSE
-		-DFORCE_SYS_DEPS=TRUE
-		-DBUILD_CEF=FALSE
-		-BUILD_ONLY_CEF=FALSE
-		$(cmake-utils_use debug DEBUG)
-		$(cmake-utils_use 32bit 32BIT_SUPPORT)
-		$(cmake-utils_use tools BUILD_TOOLS)
-		-DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}"
-		-DBREAKPAD_URL="file://${DISTDIR}/${BREAKPAD_ARC}"
-		-DCEF_URL="file://${DISTDIR}/${CEF_ARC}"
-		-DBINDIR="${GAMES_BINDIR}"
-		-DDATADIR="${GAMES_DATADIR}"
-		-DRUNTIME_LIBDIR="$(games_get_libdir)"
-		-DDESKTOPDIR="/usr/share/applications"
-		$(cmake-utils_use bundled-wxgtk FORCE_BUNDLED_WXGTK)
-		$(use bundled-wxgtk && echo -DWXWIDGET_URL="file://${DISTDIR}/${WX_ARC}")
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	# even autotools does not respect AR properly sometimes
-	cmake-utils_src_compile AR=$(tc-getAR)
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newicon -s scalable "${S}/src/branding_${PN}/sources/desubot.svg" "${PN}.svg"
-	make_desktop_entry "${GAMES_BINDIR}/desura" "Desurium" "${PN}"
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-util/desurium/desurium-0.8.0_rc9.ebuild b/games-util/desurium/desurium-0.8.0_rc9.ebuild
index 91cfcfd..29010c7 100644
--- a/games-util/desurium/desurium-0.8.0_rc9.ebuild
+++ b/games-util/desurium/desurium-0.8.0_rc9.ebuild
@@ -14,11 +14,7 @@ GITHUB_PROJECT="Desurium"
 BREAKPAD_ARC="breakpad-850.tar.gz"
 CEF_ARC="cef-291.tar.gz"
 WX_ARC="wxWidgets-2.9.3.tar.bz2"
-
-if ! use bundled-wxgtk ; then
-	WX_GTK_VER="2.9"
-	WX_ECLASS="wxwidgets"
-fi
+WX_GTK_VER="2.9"
 
 if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="git://github.com/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}.git"
@@ -30,19 +26,19 @@ else
 	SRC_URI="http://github.com/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/tarball/${PV} -> ${DESURIUM_ARC}"
 fi
 SRC_URI="${SRC_URI}
-	mirror://github/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/${BREAKPAD_ARC}
-	mirror://github/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/${CEF_ARC}
+	mirror://sourceforge/desurium/${BREAKPAD_ARC}
+	mirror://sourceforge/desurium/${CEF_ARC}
 	bundled-wxgtk? (
 		ftp://ftp.wxwidgets.org/pub/2.9.3/${WX_ARC}
 	)"
 
-inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils ${WX_ECLASS} games toolchain-funcs
+inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils wxwidgets games toolchain-funcs
 
 DESCRIPTION="Free software version of Desura game client"
 HOMEPAGE="https://github.com/lodle/Desurium"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="+32bit +bundled-wxgtk debug tools"
+IUSE="+32bit +bundled-wxgtk debug test tools"
 
 if [[ ${PV} != 9999* ]]; then
 	KEYWORDS="~amd64 ~x86"
@@ -65,7 +61,6 @@ COMMON_DEPEND="app-arch/bzip2
 		net-misc/curl[ares]
 	)
 	>=sys-devel/gcc-4.6
-	virtual/pkgconfig
 	x11-libs/gtk+:2
 	x11-libs/libnotify
 	x11-libs/libXt
@@ -80,7 +75,8 @@ RDEPEND=">=media-libs/desurium-cef-4
 	x11-misc/xdg-user-dirs
 	x11-misc/xdg-utils
 	${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
 
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != binary ]]; then
@@ -108,6 +104,7 @@ src_configure() {
 		-DWITH_ARES=FALSE
 		-DFORCE_SYS_DEPS=TRUE
 		-DBUILD_CEF=FALSE
+		$(cmake-utils_use test BUILD_TESTS)
 		-BUILD_ONLY_CEF=FALSE
 		$(cmake-utils_use debug DEBUG)
 		$(cmake-utils_use 32bit 32BIT_SUPPORT)
diff --git a/games-util/desurium/desurium-9999.ebuild b/games-util/desurium/desurium-9999.ebuild
index 5d4ce2e..ee65565 100644
--- a/games-util/desurium/desurium-9999.ebuild
+++ b/games-util/desurium/desurium-9999.ebuild
@@ -14,11 +14,7 @@ GITHUB_PROJECT="Desurium"
 BREAKPAD_ARC="breakpad-850.tar.gz"
 CEF_ARC="cef-291.tar.gz"
 WX_ARC="wxWidgets-2.9.3.tar.bz2"
-
-if ! use bundled-wxgtk ; then
-	WX_GTK_VER="2.9"
-	WX_ECLASS="wxwidgets"
-fi
+WX_GTK_VER="2.9"
 
 if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="git://github.com/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}.git"
@@ -30,19 +26,19 @@ else
 	SRC_URI="http://github.com/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/tarball/${PV} -> ${DESURIUM_ARC}"
 fi
 SRC_URI="${SRC_URI}
-	mirror://github/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/${BREAKPAD_ARC}
-	mirror://github/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/${CEF_ARC}
+	mirror://sourceforge/desurium/${BREAKPAD_ARC}
+	mirror://sourceforge/desurium/${CEF_ARC}
 	bundled-wxgtk? (
 		ftp://ftp.wxwidgets.org/pub/2.9.3/${WX_ARC}
 	)"
 
-inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils ${WX_ECLASS} games toolchain-funcs
+inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils wxwidgets games toolchain-funcs
 
 DESCRIPTION="Free software version of Desura game client"
 HOMEPAGE="https://github.com/lodle/Desurium"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="+32bit +bundled-wxgtk debug tools"
+IUSE="+32bit +bundled-wxgtk debug test tools"
 
 if [[ ${PV} != 9999* ]]; then
 	KEYWORDS="~amd64 ~x86"
@@ -65,7 +61,6 @@ COMMON_DEPEND="app-arch/bzip2
 		net-misc/curl[ares]
 	)
 	>=sys-devel/gcc-4.6
-	virtual/pkgconfig
 	x11-libs/gtk+:2
 	x11-libs/libnotify
 	x11-libs/libXt
@@ -80,7 +75,8 @@ RDEPEND=">=media-libs/desurium-cef-4
 	x11-misc/xdg-user-dirs
 	x11-misc/xdg-utils
 	${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
 
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != binary ]]; then
@@ -108,6 +104,7 @@ src_configure() {
 		-DWITH_ARES=FALSE
 		-DFORCE_SYS_DEPS=TRUE
 		-DBUILD_CEF=FALSE
+		$(cmake-utils_use test BUILD_TESTS)
 		-BUILD_ONLY_CEF=FALSE
 		$(cmake-utils_use debug DEBUG)
 		$(cmake-utils_use 32bit 32BIT_SUPPORT)
@@ -119,8 +116,7 @@ src_configure() {
 		-DBINDIR="${GAMES_BINDIR}"
 		-DDATADIR="${GAMES_DATADIR}"
 		-DRUNTIME_LIBDIR="$(games_get_libdir)"
-		-DDESKTOPDIR="/usr/share/applications"
-		-DINSTALL_DESKTOP_FILE=TRUE
+		-DINSTALL_DESKTOP_FILE=FALSE
 		-DDESKTOP_EXE=desura
 		-DDESKTOP_ICON=desurium
 		$(cmake-utils_use bundled-wxgtk FORCE_BUNDLED_WXGTK)
@@ -138,6 +134,7 @@ src_install() {
 	cmake-utils_src_install
 
 	newicon -s scalable "${S}/src/branding_${PN}/sources/desubot.svg" "${PN}.svg"
+	domenu "${BUILD_DIR}/desura.desktop"
 
 	prepgamesdirs
 }
diff --git a/media-libs/desurium-cef/Manifest b/media-libs/desurium-cef/Manifest
index 97b11d6..8b44284 100644
--- a/media-libs/desurium-cef/Manifest
+++ b/media-libs/desurium-cef/Manifest
@@ -1,8 +1,9 @@
 DIST cef-291.tar.gz 563020 SHA256 73932d96cd21b03e58f42bf1ea898740dc0490a38f6332e356c76fe02c04ef4d SHA512 1517f2f8cd32a0b62c85175028861600ebc643650494772a6b0730ed40d2bc103e0c673546940c2647467ef21a463610faf5996ed2541f8856a8ca4915ea065e WHIRLPOOL cdf824628dc76d11a0954c77f4a67e023cf3f523984d84c1590d633f59aa88c8e814aa8b15c83cb18129bdf9ae043f1b9d5db76b4714a937e47c8ce55bf48ae3
 DIST chromium-15.0.876.0.tar.bz2 151099673 SHA256 ce9dd404e2583bef9a207584587a430f5d1ef5ee4653fbfdaf6f2305e569f96e SHA512 9d0083c9c08254ea6f66aba31abbbf55513d4721275c643906aa30be9f910667cf5e997e773e328691b5f87f5cd7483847705f4cccccede6d6202f0e6880e65e WHIRLPOOL 16bafa5863004d5136f6fd0105f4406ac047dce46ec83e1f57526d37bbf062fcfd875e53bd0e3ad60ab32fab7b5f3d550c1b7714e3a8c7858c847e3944d0f53a
 DIST depot_tools-145556-2.tar.gz 951374 SHA256 fa14014aa77c1d951e6aa667981c8c7842c683db0a24b7b6a36a645db447b1d8 SHA512 0d2255b5884cf4f0d7ffcd5ab2ad56290574b0f53499f5dc77c4217ca6ad4115286d612a83df45c917e0bf9284394551af1a1c7e9f6b3442edc9d9245f4be86f WHIRLPOOL c94fcf7d048f094fcefe3fbf4db7e14dda0bbbad9c32211066648c58436025e9680b24d1fed329a54196e7d54395c789781a1bd706897f422989cc4c14b0d253
-DIST desurium-0.8.0_rc1.tar.gz 3681947 SHA256 3afdde6a8fd762cae950b529f96cd9366addd1bb0e7cba6c48b09413e75e7fb9 SHA512 837f15c6e6cf433e223f090b0decaa7f21f5d45c775826ebf782aac444f4e2f0deac86c757c6e4e9472225cd4f934103d188aeebf2b588619a8108db550759cd WHIRLPOOL 062c42432562b70c72f08a82176cfc2010b8ee4af986953824db7ba79c4f9ce0e29c0c521eb802e3b7fdb6c9ddaba43c19786f622139628238a8891849db83f8
-DIST desurium-0.8.0_rc5.tar.gz 3667274 SHA256 47b4f82569db54b1861450c7e0f683b842bd7c2f28f677c76e48c8321d62c347 SHA512 7febd8c6d174e6796008e7c892b0fbdff65a65218cc1bb61d402f33a5fb9b76511382674fd96c978e8dd0d374d45ef56a86a3be9e15b8ba0ec69ad1051180706 WHIRLPOOL e89fd7924166028dc4f13650e3cebf67954e77b506bc1db8a03d601175c17b58b92d661de82692797b3c998a546b118e05e6c75b1d88f7ddf1cd2fd8d90ffbb6
-DIST desurium-0.8.0_rc6.tar.gz 3667796 SHA256 54d89b0199eddefd567076a9e50b9b84c2e6bc5132af911b88cf39869c89f222 SHA512 25b3f30157c3a7b7418d795e75b51cdafd56e529edc2a4cba300f91a5fe42de1f40d787093367f7d9dedeadbd38e6c322572c9d2d15f8d86f5b70e1823d27208 WHIRLPOOL 393f09f8244419dcb932abf474810bcd102150260f41f3ad4dfa51a3e3996b7208b2d80d38b74e8876977a1f1b3cb5802d12ff53452cdaf14357f3b1c091b744
 DIST desurium-0.8.0_rc7.tar.gz 3667952 SHA256 aa95af3e30dac965977bb27915db4b628c506ce1d067a870e83a806ef2e72a1a SHA512 94f78149316fab15dfb3c3c94fbfa764674898c86998b50412726dc51d8281bfb91345f3a68c669abebf4c358db66a83c4611a27ee2d8a22393ad0f8e0991b57 WHIRLPOOL f0acafa7a9622e1b383f660589cce5cd4d6d1f1c716073f62e2a6583716d88704ee15d4f34f0e3c0f25d8d96e68d9f0407849286457fa10a25e17fc81dab32d8
 DIST desurium-0.8.0_rc9.tar.gz 3669424 SHA256 918a9f9df3624db873076144b6480a9affcffb48931e442c36d673324d22dcbc SHA512 9ec0d9903d16d9efbfe0e96f07d1182f6984122c265a8df2d2d21a779d02dffbd21d4a6d9cc2ea13a78d11be2b741c4603c3549ff1d4fc7febb3f573874dccd3 WHIRLPOOL b21ba33da04065ea966df17d80853e84c5af3ab2f0bcf8be4af3288c573069a8cfceb4c0b6f2611c8a6683f91dbf230cfd04138bc39583e7bf47524bb3228b75
+EBUILD desurium-cef-4.ebuild 2340 SHA256 a369cdc30c27b691a0a0a91d2b02de83a387da9da8cbef2b493ac32f2e42ca2f SHA512 af5d6bc98800d558fc501f335f4ea01e2fe21e6291fc1ad94dc330eb301b26534ff9a55e9e454b0c7923f8e8817c3754d31c7cd497dab34e7948f868b6efdd0b WHIRLPOOL cb23e6ca9dc063cc7b3bfdbd3ccfd39363c9093866a0c058a3757cbca90593c33e8b36a1d028523b0d9cbf67d6cac73022feaddf59dfbae5f2c7388789ac2230
+EBUILD desurium-cef-5.ebuild 2373 SHA256 c51605a0abd9c4f9d6c46e519bd7517587adbf5826a26a3469750b8c77a56e80 SHA512 fa70d45179e41c82759d33174977cc780c749f75fa638af815dde31e3b4cfdf71fb04784289b1d3b00ea70e45a787d1f98f99e324dc3dec205d5a65e6f0844f4 WHIRLPOOL 8ff8a4701d068ccc8ea93ac59c3d97f6d6231eccfac067e5c31a617855583e2bfc1af670936495520f043204dc0037679eb15895a989e71bbc0c3ad04575bc3b
+EBUILD desurium-cef-9999.ebuild 2461 SHA256 edf18c2ebf93e3c3de68adbd81bb38c9fe5284e6439ffb599a44a141c5b3cee9 SHA512 5f4ac9dd17c04cded084f4f43076d121e1470292f0653542e04eb6d8c12196d1f6c4556b11019deec8cdb4ffa772e496a4e367d6148ed5be1a93b5a7e6c9f590 WHIRLPOOL 152e81aec0515d8fb7fa9f401d28499eeee6c306506b35a4999cadaa48c6cdbe5a16e3477fe93c231ad30b46ffafd1f48734574da351803e5d4e35bea8428da6
+MISC metadata.xml 272 SHA256 a185a2f67e3cc28dbda09e5b941578639c72deae6863713890c439f934f86aa2 SHA512 6ed778e22e572563e6ec556f7925c645b2c0e94e907d1d7b89e0f1c8c2f33ad15156af9c1903c1b1e7447a0b760b31e252957534e5eebd10b877fb7cbf856806 WHIRLPOOL 60a9c2f53bdf6ce8a295f188fb8730100b4bba90f2212d7a1e9e59fca1229e56c9a3f16567a605ba8dd71c928788154e32b4b8b663727d0795bc25b80d50db2e
diff --git a/media-libs/desurium-cef/desurium-cef-1.ebuild b/media-libs/desurium-cef/desurium-cef-1.ebuild
deleted file mode 100644
index dd223cd..0000000
--- a/media-libs/desurium-cef/desurium-cef-1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_6 python2_7 )
-
-unset GIT_ECLASS
-
-GITHUB_MAINTAINER="lodle"
-GITHUB_PROJECT="Desurium"
-DESURIUM_VERSION="0.8.0_rc1"
-
-# tools versions
-CEF_ARC="cef-291.tar.gz"
-CHROMIUM_ARC="chromium-15.0.876.0.tar.bz2"
-DEPOT_TOOLS_ARC="depot_tools-145556-2.tar.gz"
-WX_GTK_VER="2.9"
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="git://github.com/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}.git"
-	GIT_ECLASS="git-2"
-	SRC_URI=""
-	EGIT_NOUNPACK="true"
-else
-	DESURIUM_ARC="desurium-${DESURIUM_VERSION}.tar.gz"
-	SRC_URI="http://github.com/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/tarball/${DESURIUM_VERSION} -> ${DESURIUM_ARC}"
-fi
-SRC_URI="${SRC_URI}
-	mirror://github/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/${CEF_ARC}
-	http://commondatastorage.googleapis.com/chromium-browser-official/${CHROMIUM_ARC}
-	mirror://github/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/${DEPOT_TOOLS_ARC}"
-
-inherit check-reqs cmake-utils eutils ${GIT_ECLASS} python-any-r1 wxwidgets games
-
-CHECKREQS_DISK_BUILD="3G"
-
-DESCRIPTION="highly patched CEF by desurium."
-HOMEPAGE="https://github.com/lodle/Desurium"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-# wxGTK-2.9.4.1 does not work!
-COMMON_DEPEND="
-	app-arch/bzip2
-	dev-libs/dbus-glib
-	dev-libs/libevent
-	dev-libs/libxml2
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/flac
-	media-libs/libpng:0
-	media-libs/libwebp
-	media-libs/speex
-	sys-apps/dbus
-	sys-libs/zlib
-	virtual/jpeg
-	=x11-libs/wxGTK-2.9.3.1[X]"
-
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="
-	dev-lang/yasm
-	dev-util/gperf
-	${COMMON_DEPEND}
-	${PYTHON_DEPS}"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	games_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		git-2_src_unpack
-	else
-		unpack ${DESURIUM_ARC}
-		S="${WORKDIR}/$(ls ${WORKDIR})"
-	fi
-}
-
-src_configure() {
-	# -DWITH_ARES=FALSE will use system curl, because we force curl[ares] to have ares support
-	local mycmakeargs=(
-		-DFORCE_SYS_DEPS=TRUE
-		-DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}"
-		-DCEF_URL="file://${DISTDIR}/${CEF_ARC}"
-		-DCHROMIUM_URL="file://${DISTDIR}/${CHROMIUM_ARC}"
-		-DDEPOT_TOOLS_URL="file://${DISTDIR}/${DEPOT_TOOLS_ARC}"
-		-DBUILD_ONLY_CEF=TRUE
-		-DRUNTIME_LIBDIR="$(games_get_libdir)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	prepgamesdirs
-}
diff --git a/media-libs/desurium-cef/desurium-cef-2.ebuild b/media-libs/desurium-cef/desurium-cef-2.ebuild
deleted file mode 100644
index cb32c32..0000000
--- a/media-libs/desurium-cef/desurium-cef-2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_6 python2_7 )
-
-unset GIT_ECLASS
-
-GITHUB_MAINTAINER="lodle"
-GITHUB_PROJECT="Desurium"
-DESURIUM_VERSION="0.8.0_rc5"
-
-# tools versions
-CEF_ARC="cef-291.tar.gz"
-CHROMIUM_ARC="chromium-15.0.876.0.tar.bz2"
-DEPOT_TOOLS_ARC="depot_tools-145556-2.tar.gz"
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="git://github.com/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}.git"
-	GIT_ECLASS="git-2"
-	SRC_URI=""
-	EGIT_NOUNPACK="true"
-else
-	DESURIUM_ARC="desurium-${DESURIUM_VERSION}.tar.gz"
-	SRC_URI="http://github.com/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/tarball/${DESURIUM_VERSION} -> ${DESURIUM_ARC}"
-fi
-SRC_URI="${SRC_URI}
-	mirror://github/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/${CEF_ARC}
-	http://commondatastorage.googleapis.com/chromium-browser-official/${CHROMIUM_ARC}
-	mirror://github/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/${DEPOT_TOOLS_ARC}"
-
-inherit check-reqs cmake-utils eutils ${GIT_ECLASS} python-any-r1 games
-
-CHECKREQS_DISK_BUILD="3G"
-
-DESCRIPTION="highly patched CEF by desurium."
-HOMEPAGE="https://github.com/lodle/Desurium"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-# wxGTK-2.9.4.1 does not work!
-COMMON_DEPEND="
-	app-arch/bzip2
-	dev-libs/dbus-glib
-	dev-libs/libevent
-	dev-libs/libxml2
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/flac
-	media-libs/libpng:0
-	media-libs/libwebp
-	media-libs/speex
-	sys-apps/dbus
-	sys-libs/zlib
-	virtual/jpeg"
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="
-	dev-lang/yasm
-	dev-util/gperf
-	${COMMON_DEPEND}
-	${PYTHON_DEPS}"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	games_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		git-2_src_unpack
-	else
-		unpack ${DESURIUM_ARC}
-		S="${WORKDIR}/$(ls ${WORKDIR})"
-	fi
-}
-
-src_configure() {
-	# -DWITH_ARES=FALSE will use system curl, because we force curl[ares] to have ares support
-	local mycmakeargs=(
-		-DFORCE_SYS_DEPS=TRUE
-		-DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}"
-		-DCEF_URL="file://${DISTDIR}/${CEF_ARC}"
-		-DCHROMIUM_URL="file://${DISTDIR}/${CHROMIUM_ARC}"
-		-DDEPOT_TOOLS_URL="file://${DISTDIR}/${DEPOT_TOOLS_ARC}"
-		-DBUILD_ONLY_CEF=TRUE
-		-DRUNTIME_LIBDIR="$(games_get_libdir)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	prepgamesdirs
-}
diff --git a/media-libs/desurium-cef/desurium-cef-3.ebuild b/media-libs/desurium-cef/desurium-cef-3.ebuild
deleted file mode 100644
index a3d0940..0000000
--- a/media-libs/desurium-cef/desurium-cef-3.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_6 python2_7 )
-
-unset GIT_ECLASS
-
-GITHUB_MAINTAINER="lodle"
-GITHUB_PROJECT="Desurium"
-DESURIUM_VERSION="0.8.0_rc6"
-
-# tools versions
-CEF_ARC="cef-291.tar.gz"
-CHROMIUM_ARC="chromium-15.0.876.0.tar.bz2"
-DEPOT_TOOLS_ARC="depot_tools-145556-2.tar.gz"
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="git://github.com/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}.git"
-	GIT_ECLASS="git-2"
-	SRC_URI=""
-	EGIT_NOUNPACK="true"
-else
-	DESURIUM_ARC="desurium-${DESURIUM_VERSION}.tar.gz"
-	SRC_URI="http://github.com/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/tarball/${DESURIUM_VERSION} -> ${DESURIUM_ARC}"
-fi
-SRC_URI="${SRC_URI}
-	mirror://github/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/${CEF_ARC}
-	http://commondatastorage.googleapis.com/chromium-browser-official/${CHROMIUM_ARC}
-	mirror://github/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/${DEPOT_TOOLS_ARC}"
-
-inherit check-reqs cmake-utils eutils ${GIT_ECLASS} python-any-r1 games
-
-CHECKREQS_DISK_BUILD="3G"
-
-DESCRIPTION="highly patched CEF by desurium."
-HOMEPAGE="https://github.com/lodle/Desurium"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-# wxGTK-2.9.4.1 does not work!
-COMMON_DEPEND="
-	app-arch/bzip2
-	dev-libs/dbus-glib
-	dev-libs/libevent
-	dev-libs/libxml2
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/flac
-	media-libs/libpng:0
-	media-libs/libwebp
-	media-libs/speex
-	sys-apps/dbus
-	sys-libs/zlib
-	virtual/jpeg"
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="
-	dev-lang/yasm
-	dev-util/gperf
-	${COMMON_DEPEND}
-	${PYTHON_DEPS}"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	games_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		git-2_src_unpack
-	else
-		unpack ${DESURIUM_ARC}
-		S="${WORKDIR}/$(ls ${WORKDIR})"
-	fi
-}
-
-src_configure() {
-	# -DWITH_ARES=FALSE will use system curl, because we force curl[ares] to have ares support
-	local mycmakeargs=(
-		-DFORCE_SYS_DEPS=TRUE
-		-DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}"
-		-DCEF_URL="file://${DISTDIR}/${CEF_ARC}"
-		-DCHROMIUM_URL="file://${DISTDIR}/${CHROMIUM_ARC}"
-		-DDEPOT_TOOLS_URL="file://${DISTDIR}/${DEPOT_TOOLS_ARC}"
-		-DBUILD_ONLY_CEF=TRUE
-		-DRUNTIME_LIBDIR="$(games_get_libdir)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	prepgamesdirs
-}
diff --git a/media-libs/desurium-cef/desurium-cef-4.ebuild b/media-libs/desurium-cef/desurium-cef-4.ebuild
index 9ed127b..e0668b6 100644
--- a/media-libs/desurium-cef/desurium-cef-4.ebuild
+++ b/media-libs/desurium-cef/desurium-cef-4.ebuild
@@ -27,9 +27,9 @@ else
 	SRC_URI="http://github.com/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/tarball/${DESURIUM_VERSION} -> ${DESURIUM_ARC}"
 fi
 SRC_URI="${SRC_URI}
-	mirror://github/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/${CEF_ARC}
+	mirror://sourceforge/desurium/${CEF_ARC}
 	http://commondatastorage.googleapis.com/chromium-browser-official/${CHROMIUM_ARC}
-	mirror://github/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/${DEPOT_TOOLS_ARC}"
+	mirror://sourceforge/desurium/${DEPOT_TOOLS_ARC}"
 
 inherit check-reqs cmake-utils eutils ${GIT_ECLASS} python-any-r1 games
 
diff --git a/media-libs/desurium-cef/desurium-cef-5.ebuild b/media-libs/desurium-cef/desurium-cef-5.ebuild
index f781239..bd9754c 100644
--- a/media-libs/desurium-cef/desurium-cef-5.ebuild
+++ b/media-libs/desurium-cef/desurium-cef-5.ebuild
@@ -27,9 +27,9 @@ else
 	SRC_URI="http://github.com/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/tarball/${DESURIUM_VERSION} -> ${DESURIUM_ARC}"
 fi
 SRC_URI="${SRC_URI}
-	mirror://github/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/${CEF_ARC}
+	mirror://sourceforge/desurium/${CEF_ARC}
 	http://commondatastorage.googleapis.com/chromium-browser-official/${CHROMIUM_ARC}
-	mirror://github/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/${DEPOT_TOOLS_ARC}"
+	mirror://sourceforge/desurium/${DEPOT_TOOLS_ARC}"
 
 inherit check-reqs cmake-utils eutils ${GIT_ECLASS} python-any-r1 games
 
diff --git a/media-libs/desurium-cef/desurium-cef-9999.ebuild b/media-libs/desurium-cef/desurium-cef-9999.ebuild
index 04b4b8a..d332624 100644
--- a/media-libs/desurium-cef/desurium-cef-9999.ebuild
+++ b/media-libs/desurium-cef/desurium-cef-9999.ebuild
@@ -27,9 +27,9 @@ else
 	SRC_URI="http://github.com/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/tarball/${DESURIUM_VERSION} -> ${DESURIUM_ARC}"
 fi
 SRC_URI="${SRC_URI}
-	mirror://github/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/${CEF_ARC}
+	mirror://sourceforge/desurium/${CEF_ARC}
 	http://commondatastorage.googleapis.com/chromium-browser-official/${CHROMIUM_ARC}
-	mirror://github/${GITHUB_MAINTAINER}/${GITHUB_PROJECT}/${DEPOT_TOOLS_ARC}"
+	mirror://sourceforge/desurium/${DEPOT_TOOLS_ARC}"
 
 inherit check-reqs cmake-utils eutils ${GIT_ECLASS} toolchain-funcs python-any-r1 games