clean old; tidy patching

(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)

5 files changed, 13 insertions, 154 deletions

diff --git a/games-sports/dustrac/ChangeLog b/games-sports/dustrac/ChangeLog
index 970edb3cc128..50fa58acd8ac 100644
--- a/games-sports/dustrac/ChangeLog
+++ b/games-sports/dustrac/ChangeLog
@@ -1,6 +1,12 @@
 # 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.6 2014/11/25 23:20:44 hasufell Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-sports/dustrac/ChangeLog,v 1.7 2015/01/26 22:10:14 mr_bones_ Exp $
+
+  26 Jan 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/dustrac-1.7.3-desktopfile.patch, -dustrac-1.7.2.ebuild,
+  -files/dustrac-1.6.3-cmake.patch, -files/dustrac-1.6.3-desktopfile.patch,
+  dustrac-1.7.3.ebuild, files/dustrac-1.7.3-cmake.patch:
+  clean old; tidy patching
 
   25 Nov 2014; Julian Ospald <hasufell@gentoo.org> metadata.xml:
   drop maintainership
diff --git a/games-sports/dustrac/dustrac-1.7.2.ebuild b/games-sports/dustrac/dustrac-1.7.2.ebuild
deleted file mode 100644
index e840a28e8fab..000000000000
--- a/games-sports/dustrac/dustrac-1.7.2.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.2.ebuild,v 1.1 2014/07/28 17:59:51 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.7.3.ebuild b/games-sports/dustrac/dustrac-1.7.3.ebuild
index b3e3743dd3f8..5b0a32fc120c 100644
--- a/games-sports/dustrac/dustrac-1.7.3.ebuild
+++ b/games-sports/dustrac/dustrac-1.7.3.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/dustrac/dustrac-1.7.3.ebuild,v 1.1 2014/08/24 16:24:11 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/dustrac/dustrac-1.7.3.ebuild,v 1.2 2015/01/26 22:10:14 mr_bones_ Exp $
 
 EAPI=5
-
 inherit eutils gnome2-utils cmake-utils games
 
 DESCRIPTION="Tile-based, cross-platform 2D racing game"
@@ -26,8 +25,9 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-cmake.patch \
-		"${FILESDIR}"/${PN}-1.6.3-desktopfile.patch
+	epatch \
+		"${FILESDIR}"/${P}-cmake.patch \
+		"${FILESDIR}"/${P}-desktopfile.patch
 }
 
 src_configure() {
diff --git a/games-sports/dustrac/files/dustrac-1.6.3-cmake.patch b/games-sports/dustrac/files/dustrac-1.6.3-cmake.patch
deleted file mode 100644
index 335fd46accf6..000000000000
--- a/games-sports/dustrac/files/dustrac-1.6.3-cmake.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Wed Dec 25 22:55:09 UTC 2013
-Subject: respect flags, fix installation
-
---- dustrac-1.6.2/CMakeLists.txt
-+++ dustrac-1.6.2/CMakeLists.txt
-@@ -43,7 +43,7 @@
- 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")
- 
- set(GAME_BINARY_NAME "dustrac-game")
---- dustrac-1.6.2/src/game/CMakeLists.txt
-+++ dustrac-1.6.2/src/game/CMakeLists.txt
-@@ -128,16 +128,11 @@
- 
- # Copy desktop file
- if(ReleaseBuild AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux")
--    set(DesktopFileSourcePath)
-     if(USC)
--        set(DesktopFileSourcePath ${CMAKE_SOURCE_DIR}/src/dustrac-game.desktop.opt.in)
-+        configure_file(${CMAKE_SOURCE_DIR}/src/dustrac-game.desktop.opt.in ${CMAKE_BINARY_DIR}/src/dustrac-game.desktop)
-     else()
--        set(DesktopFileSourcePath ${CMAKE_SOURCE_DIR}/src/dustrac-game.desktop.in)
-+        configure_file(${CMAKE_SOURCE_DIR}/src/dustrac-game.desktop.in ${CMAKE_BINARY_DIR}/src/dustrac-game.desktop)
-     endif()
--    add_custom_target(desktop-file-game ALL
--        COMMAND cmake -E copy ${DesktopFileSourcePath}
--            ${CMAKE_BINARY_DIR}/dustrac-game.desktop
--    DEPENDS ${GAME_BINARY_NAME})
- endif()
- 
- # Resource compilation for MinGW
---- dustrac-1.6.2/src/editor/CMakeLists.txt
-+++ dustrac-1.6.2/src/editor/CMakeLists.txt
-@@ -76,16 +76,11 @@
- 
- # Copy desktop file
- if(ReleaseBuild AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux")
--    set(DesktopFileSourcePath)
-     if(USC)
--        set(DesktopFileSourcePath ${CMAKE_SOURCE_DIR}/src/dustrac-editor.desktop.opt.in)
-+        configure_file(${CMAKE_SOURCE_DIR}/src/dustrac-editor.desktop.opt.in ${CMAKE_BINARY_DIR}/src/dustrac-editor.desktop)
-     else()
--        set(DesktopFileSourcePath ${CMAKE_SOURCE_DIR}/src/dustrac-editor.desktop.in)
-+        configure_file(${CMAKE_SOURCE_DIR}/src/dustrac-editor.desktop.in ${CMAKE_BINARY_DIR}/src/dustrac-editor.desktop)
-     endif()
--    add_custom_target(desktop-file-editor ALL
--        COMMAND cmake -E copy ${DesktopFileSourcePath}
--            ${CMAKE_BINARY_DIR}/dustrac-editor.desktop
--    DEPENDS ${EDITOR_BINARY_NAME})
- endif()
- 
- # Add the executable
---- dustrac-1.6.2/InstallLinux.cmake
-+++ dustrac-1.6.2/InstallLinux.cmake
-@@ -58,7 +58,7 @@
-     install(FILES data/fonts.conf DESTINATION ${DATA_PATH})
-     install(FILES data/meshes.conf DESTINATION ${DATA_PATH})
-     install(FILES data/textures.conf DESTINATION ${DATA_PATH})
--    install(FILES AUTHORS CHANGELOG COPYING README DESTINATION ${DOC_PATH})
-+    install(FILES AUTHORS CHANGELOG README DESTINATION ${DOC_PATH})
-     install(DIRECTORY data/images DESTINATION ${DATA_PATH} FILES_MATCHING PATTERN "*.jpg")
-     install(DIRECTORY data/images DESTINATION ${DATA_PATH} FILES_MATCHING PATTERN "*.png")
-     install(DIRECTORY data/levels DESTINATION ${DATA_PATH} FILES_MATCHING PATTERN "*.trk")
-@@ -69,8 +69,8 @@
- 
-     if(ReleaseBuild)
-         # Install .desktop files
--        install(FILES dustrac-game.desktop DESTINATION share/applications)
--        install(FILES dustrac-editor.desktop DESTINATION share/applications)
-+        install(FILES ${CMAKE_BINARY_DIR}/src/dustrac-game.desktop DESTINATION share/applications)
-+        install(FILES ${CMAKE_BINARY_DIR}/src/dustrac-editor.desktop DESTINATION share/applications)
- 
-         # Install icons
-         install(FILES data/icons/dustrac-game.png DESTINATION share/pixmaps)
diff --git a/games-sports/dustrac/files/dustrac-1.6.3-desktopfile.patch b/games-sports/dustrac/files/dustrac-1.7.3-desktopfile.patch
index a09edc194ecd..a09edc194ecd 100644
--- a/games-sports/dustrac/files/dustrac-1.6.3-desktopfile.patch
+++ b/games-sports/dustrac/files/dustrac-1.7.3-desktopfile.patch