version bump, rm old

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key BDEED020)

6 files changed, 15 insertions, 181 deletions

diff --git a/games-sports/dustrac/ChangeLog b/games-sports/dustrac/ChangeLog
index b92093c9a1dd..97b77ce86172 100644
--- a/games-sports/dustrac/ChangeLog
+++ b/games-sports/dustrac/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-sports/dustrac
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/dustrac/ChangeLog,v 1.4 2014/07/28 17:59:51 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/dustrac/ChangeLog,v 1.5 2014/08/24 16:24:11 hasufell Exp $
+
+*dustrac-1.7.3 (24 Aug 2014)
+
+  24 Aug 2014; Julian Ospald <hasufell@gentoo.org> -dustrac-1.6.2.ebuild,
+  -dustrac-1.6.3.ebuild, -dustrac-1.7.1.ebuild, +dustrac-1.7.3.ebuild,
+  -files/dustrac-1.6.2-cmake.patch, -files/dustrac-1.6.2-desktopfile.patch,
+  +files/dustrac-1.7.3-cmake.patch:
+  version bump, rm old
 
 *dustrac-1.7.2 (28 Jul 2014)
 
diff --git a/games-sports/dustrac/dustrac-1.6.2.ebuild b/games-sports/dustrac/dustrac-1.6.2.ebuild
deleted file mode 100644
index 6050448ffe98..000000000000
--- a/games-sports/dustrac/dustrac-1.6.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/dustrac/dustrac-1.6.2.ebuild,v 1.1 2013/12/26 13:53:52 hasufell Exp $
-
-EAPI=5
-
-inherit eutils gnome2-utils cmake-utils games
-
-DESCRIPTION="Tile-based, cross-platform 2D racing game"
-HOMEPAGE="http://dustrac.sourceforge.net/"
-SRC_URI="mirror://sourceforge/dustrac/${P}.tar.gz"
-
-LICENSE="GPL-3 CC-BY-NC-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	media-libs/libvorbis
-	media-libs/openal
-	virtual/opengl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cmake.patch \
-		"${FILESDIR}"/${P}-desktopfile.patch
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DGL30=ON
-		-DReleaseBuild=ON
-		-DDATA_PATH="${GAMES_DATADIR}/${PN}"
-		-DBIN_PATH="${GAMES_BINDIR}"
-		-DDOC_PATH=/usr/share/doc/${PF}
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	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-sports/dustrac/dustrac-1.7.1.ebuild b/games-sports/dustrac/dustrac-1.7.1.ebuild
deleted file mode 100644
index 011358e03f68..000000000000
--- a/games-sports/dustrac/dustrac-1.7.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/dustrac/dustrac-1.7.1.ebuild,v 1.1 2014/07/25 11:52:24 hasufell Exp $
-
-EAPI=5
-
-inherit eutils gnome2-utils cmake-utils games
-
-DESCRIPTION="Tile-based, cross-platform 2D racing game"
-HOMEPAGE="http://dustrac.sourceforge.net/"
-SRC_URI="mirror://sourceforge/dustrac/${P}.tar.gz"
-
-LICENSE="GPL-3 CC-BY-NC-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	media-libs/libvorbis
-	media-libs/openal
-	media-libs/mesa[gles2]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.6.3-cmake.patch \
-		"${FILESDIR}"/${PN}-1.6.3-desktopfile.patch
-}
-
-src_configure() {
-	# build failure without gles 2.0
-	local mycmakeargs=(
-		-DGLES=ON
-		-DGL30=ON
-		-DReleaseBuild=ON
-		-DDATA_PATH="${GAMES_DATADIR}/${PN}"
-		-DBIN_PATH="${GAMES_BINDIR}"
-		-DDOC_PATH=/usr/share/doc/${PF}
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	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-sports/dustrac/dustrac-1.6.3.ebuild b/games-sports/dustrac/dustrac-1.7.3.ebuild
index 6afadcaedaa0..b3e3743dd3f8 100644
--- a/games-sports/dustrac/dustrac-1.6.3.ebuild
+++ b/games-sports/dustrac/dustrac-1.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/dustrac/dustrac-1.6.3.ebuild,v 1.1 2014/01/26 23:15:10 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/dustrac/dustrac-1.7.3.ebuild,v 1.1 2014/08/24 16:24:11 hasufell Exp $
 
 EAPI=5
 
@@ -21,13 +21,13 @@ RDEPEND="
 	dev-qt/qtopengl:4
 	media-libs/libvorbis
 	media-libs/openal
-	media-libs/mesa[gles2]"
+	media-libs/mesa"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-cmake.patch \
-		"${FILESDIR}"/${P}-desktopfile.patch
+		"${FILESDIR}"/${PN}-1.6.3-desktopfile.patch
 }
 
 src_configure() {
diff --git a/games-sports/dustrac/files/dustrac-1.6.2-desktopfile.patch b/games-sports/dustrac/files/dustrac-1.6.2-desktopfile.patch
deleted file mode 100644
index a09edc194ecd..000000000000
--- a/games-sports/dustrac/files/dustrac-1.6.2-desktopfile.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Wed Dec 25 23:21:50 UTC 2013
-Subject: fix desktop files
-
---- dustrac-1.6.2/src/dustrac-editor.desktop.in
-+++ dustrac-1.6.2/src/dustrac-editor.desktop.in
-@@ -4,5 +4,5 @@
- Exec=dustrac-editor
- Icon=dustrac-editor
- Type=Application
--Categories=Game
-+Categories=Game;
- StartupNotify=true
---- dustrac-1.6.2/src/dustrac-editor.desktop.opt.in
-+++ dustrac-1.6.2/src/dustrac-editor.desktop.opt.in
-@@ -4,5 +4,5 @@
- Exec=/opt/dustrac/dustrac-editor
- Icon=dustrac-editor
- Type=Application
--Categories=Game
-+Categories=Game;
- StartupNotify=true
---- dustrac-1.6.2/src/dustrac-game.desktop.in
-+++ dustrac-1.6.2/src/dustrac-game.desktop.in
-@@ -4,5 +4,5 @@
- Exec=dustrac-game
- Icon=dustrac-game
- Type=Application
--Categories=Game
-+Categories=Game;
- StartupNotify=true
---- dustrac-1.6.2/src/dustrac-game.desktop.opt.in
-+++ dustrac-1.6.2/src/dustrac-game.desktop.opt.in
-@@ -4,5 +4,5 @@
- Exec=/opt/dustrac/dustrac-game
- Icon=dustrac-game
- Type=Application
--Categories=Game
-+Categories=Game;
- StartupNotify=true
diff --git a/games-sports/dustrac/files/dustrac-1.6.2-cmake.patch b/games-sports/dustrac/files/dustrac-1.7.3-cmake.patch
index 335fd46accf6..01c84ff008ac 100644
--- a/games-sports/dustrac/files/dustrac-1.6.2-cmake.patch
+++ b/games-sports/dustrac/files/dustrac-1.7.3-cmake.patch
@@ -5,9 +5,9 @@ Subject: respect flags, fix installation
 --- dustrac-1.6.2/CMakeLists.txt
 +++ dustrac-1.6.2/CMakeLists.txt
 @@ -43,7 +43,7 @@
+     include("InstallWindows.cmake")
  endif()
  
- set(CMAKE_VERBOSE_MAKEFILE OFF)
 -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -W -Wall -O3 -pedantic")
 +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -W -Wall")
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fomit-frame-pointer -finline-functions -ffast-math")
@@ -18,7 +18,7 @@ Subject: respect flags, fix installation
 @@ -128,16 +128,11 @@
  
  # Copy desktop file
- if(ReleaseBuild AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+ if(ReleaseBuild AND UNIX)
 -    set(DesktopFileSourcePath)
      if(USC)
 -        set(DesktopFileSourcePath ${CMAKE_SOURCE_DIR}/src/dustrac-game.desktop.opt.in)
@@ -39,7 +39,7 @@ Subject: respect flags, fix installation
 @@ -76,16 +76,11 @@
  
  # Copy desktop file
- if(ReleaseBuild AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+ if(ReleaseBuild AND UNIX)
 -    set(DesktopFileSourcePath)
      if(USC)
 -        set(DesktopFileSourcePath ${CMAKE_SOURCE_DIR}/src/dustrac-editor.desktop.opt.in)