6 files changed, 18 insertions, 113 deletions
diff --git a/games-util/antimicro/ChangeLog b/games-util/antimicro/ChangeLog
index 154fde7d6131..d3d20ce45e3c 100644
--- a/games-util/antimicro/ChangeLog
+++ b/games-util/antimicro/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-util/antimicro
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/antimicro/ChangeLog,v 1.10 2014/04/22 12:15:46 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/antimicro/ChangeLog,v 1.11 2014/05/27 18:11:24 hasufell Exp $
+
+*antimicro-2.3.3 (27 May 2014)
+
+  27 May 2014; Julian Ospald <hasufell@gentoo.org> -antimicro-1.0.ebuild,
+  -antimicro-2.0.ebuild, -antimicro-2.1.ebuild, +antimicro-2.3.3.ebuild,
+  -files/antimicro-1.2-desktopfile.patch,
+  -files/antimicro-2.0-desktopfile.patch:
+  version bump, rm old
 
 *antimicro-2.2 (22 Apr 2014)
 
diff --git a/games-util/antimicro/antimicro-1.0.ebuild b/games-util/antimicro/antimicro-1.0.ebuild
deleted file mode 100644
index fb2486bfef1e..000000000000
--- a/games-util/antimicro/antimicro-1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/antimicro/antimicro-1.0.ebuild,v 1.3 2013/08/28 11:14:57 ago Exp $
-
-EAPI=5
-inherit qt4-r2
-
-DESCRIPTION="Map keyboard and mouse buttons to gamepad buttons"
-HOMEPAGE="https://github.com/Ryochan7/antimicro"
-SRC_URI="https://github.com/Ryochan7/antimicro/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	media-libs/libsdl:0[joystick]
-	x11-libs/libX11
-	x11-libs/libXtst"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P}/src
-
-src_configure() {
-	eqmake4 INSTALL_PREFIX=/usr antimicro.pro
-}
-
-src_compile() {
-	emake
-	emake updateqm
-}
diff --git a/games-util/antimicro/antimicro-2.0.ebuild b/games-util/antimicro/antimicro-2.0.ebuild
deleted file mode 100644
index 0c1b810adb61..000000000000
--- a/games-util/antimicro/antimicro-2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/antimicro/antimicro-2.0.ebuild,v 1.1 2014/01/05 13:42:34 hasufell Exp $
-
-EAPI=5
-inherit eutils qmake-utils
-
-DESCRIPTION="Map keyboard and mouse buttons to gamepad buttons"
-HOMEPAGE="https://github.com/Ryochan7/antimicro"
-SRC_URI="https://github.com/Ryochan7/antimicro/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	media-libs/libsdl:0[joystick]
-	x11-libs/libX11
-	x11-libs/libXtst"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P}/src
-
-src_prepare() {
-	cd "${WORKDIR}/${P}" || die
-	epatch "${FILESDIR}"/${P}-desktopfile.patch
-}
-
-src_configure() {
-	eqmake4 INSTALL_PREFIX="${D%/}"/usr antimicro.pro
-}
-
-src_compile() {
-	emake
-	emake updateqm
-}
diff --git a/games-util/antimicro/antimicro-2.1.ebuild b/games-util/antimicro/antimicro-2.3.3.ebuild
index 538674659ce4..c3adc59f317b 100644
--- a/games-util/antimicro/antimicro-2.1.ebuild
+++ b/games-util/antimicro/antimicro-2.3.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/antimicro/antimicro-2.1.ebuild,v 1.1 2014/03/01 14:49:14 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/antimicro/antimicro-2.3.3.ebuild,v 1.1 2014/05/27 18:11:24 hasufell Exp $
 
 EAPI=5
-inherit eutils qmake-utils
+inherit eutils cmake-utils
 
 DESCRIPTION="Map keyboard and mouse buttons to gamepad buttons"
 HOMEPAGE="https://github.com/Ryochan7/antimicro"
@@ -16,18 +16,16 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	dev-qt/qtcore:4
 	dev-qt/qtgui:4
-	media-libs/libsdl:0[joystick]
+	media-libs/libsdl2[joystick]
 	x11-libs/libX11
 	x11-libs/libXtst"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P}/src
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 src_configure() {
-	eqmake4 INSTALL_PREFIX="${D%/}"/usr antimicro.pro
-}
+	local mycmakeargs=(
+		-DUSE_SDL_2=ON
+	)
 
-src_compile() {
-	emake
-	emake updateqm
+	cmake-utils_src_configure
 }
diff --git a/games-util/antimicro/files/antimicro-1.2-desktopfile.patch b/games-util/antimicro/files/antimicro-1.2-desktopfile.patch
deleted file mode 100644
index f000e911058c..000000000000
--- a/games-util/antimicro/files/antimicro-1.2-desktopfile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sat Dec 14 21:56:15 UTC 2013
-Subject: fix desktop file
-
---- a/other/antimicro.desktop
-+++ b/other/antimicro.desktop
-@@ -4,7 +4,7 @@
- Name[sr]=Анти-микро
- Comment[sr]=Користите џојстик или играћу тастатуру за управљање различитим програмима
- Name[fr]=AntiMicro
--Name[fr]=Utilisez une manette de jeu pour commander un logiciel
-+Comment[fr]=Utilisez une manette de jeu pour commander un logiciel
- Exec=antimicro
- Icon=antimicro
- StartupNotify=true
diff --git a/games-util/antimicro/files/antimicro-2.0-desktopfile.patch b/games-util/antimicro/files/antimicro-2.0-desktopfile.patch
deleted file mode 100644
index f000e911058c..000000000000
--- a/games-util/antimicro/files/antimicro-2.0-desktopfile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sat Dec 14 21:56:15 UTC 2013
-Subject: fix desktop file
-
---- a/other/antimicro.desktop
-+++ b/other/antimicro.desktop
-@@ -4,7 +4,7 @@
- Name[sr]=Анти-микро
- Comment[sr]=Користите џојстик или играћу тастатуру за управљање различитим програмима
- Name[fr]=AntiMicro
--Name[fr]=Utilisez une manette de jeu pour commander un logiciel
-+Comment[fr]=Utilisez une manette de jeu pour commander un logiciel
- Exec=antimicro
- Icon=antimicro
- StartupNotify=true