clean old; tidy patching

Package-Manager: portage-2.2.14/cvs/Linux x86_64

6 files changed, 16 insertions, 182 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/Manifest b/games-sports/dustrac/Manifest
index bbb5e28253f5..b583bbad59a5 100644
--- a/games-sports/dustrac/Manifest
+++ b/games-sports/dustrac/Manifest
@@ -1,31 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX dustrac-1.6.3-cmake.patch 3576 SHA256 a95010263528175fac49d37685c03adf02977db12194a13295d5918af6152005 SHA512 4711a0b2cf52423d166a262ae11bd875f581e9f3a203e23b5294e377c2fb6391964beb3ceba8662cd42e2121eda1004a9c13ae93b98fde6e109d8cf96836d831 WHIRLPOOL 794affd4e3ed061b201ffb02bb54391fbeb6a6574213cf520315996f21236cb890702e5ad60139ae0a7d9687db58b31a84f20963ed576166c3e8d6b8679d1303
-AUX dustrac-1.6.3-desktopfile.patch 1039 SHA256 1629ff528295d4bceda2927cb0686b5c356c3a507e82c0bacf8cc8060bfbca3d SHA512 160fcfdc356e7a6b37b2652359011a4ea2b27cddf3612316f274d3442139c301dc164f5e73f1d40a0516dfd87eeb4e67b6060163d7724232eaf06239a4693852 WHIRLPOOL b7157c79e2fee71c0632536520d23bd536c735e78a8185f82a8421d00192af1aa0ec4df4565e972615575dbe4ea09314febd43e551603a3dd7308e74fafc2031
 AUX dustrac-1.7.3-cmake.patch 3516 SHA256 8393c8b31a770ce1e34c64988292a0e735b881426025a15d02cb6df36cc0c15e SHA512 de2962e2ae3660727f7e9ff9475b4886efae4d61c3c00304403da7e73e899406c3fc295f65d9ee48d14ba5a4c4e4a498714309fa423b2bc1ffd8edb00acc16b9 WHIRLPOOL e0f532451d0f90a63225ec0bf1bf94516ed3d3a6842e0ed35ba4146293182b703027af886d7fa8a7d549b86a20cd744605c6d81ab0a114453d67123d9a76ec54
-DIST dustrac-1.7.2.tar.gz 25825142 SHA256 368b03d1264e336d6dd6e84a1b60d9a149711cd08d93938bf059acc5ef15af7f SHA512 60fafec447cf7b68dfd67fc68a5f92a62d3a4ff553e03f1f685ecad251a47995a4cf84ef6ffa9dd821601f432a07999d3b8b97bb73f6861100846d6238003acd WHIRLPOOL f49dea4072b389e403392d2479d23118c4e6617b40858a57d21ac321c883d595625f385b64ae888db32afe04e2605ca05799bda58e3f810f4c652216aa7f19f9
+AUX dustrac-1.7.3-desktopfile.patch 1039 SHA256 1629ff528295d4bceda2927cb0686b5c356c3a507e82c0bacf8cc8060bfbca3d SHA512 160fcfdc356e7a6b37b2652359011a4ea2b27cddf3612316f274d3442139c301dc164f5e73f1d40a0516dfd87eeb4e67b6060163d7724232eaf06239a4693852 WHIRLPOOL b7157c79e2fee71c0632536520d23bd536c735e78a8185f82a8421d00192af1aa0ec4df4565e972615575dbe4ea09314febd43e551603a3dd7308e74fafc2031
 DIST dustrac-1.7.3.tar.gz 25824731 SHA256 1ab0f2575d85be68bdb4463346a6815b60c7e2c055a6759dd1025a7333ee722d SHA512 daade9e0cd3501167da5a0fddf51a6d352665fd6348ba4931640e7bbbdeda3a43e25c93bc9ba569a5e0388097c342bd6c9aaafc39d9ab1b328e6db1672657c06 WHIRLPOOL ccfa9e12300323e302b73e073f4b52ccee285697cd7725b5440bcdc4d96cdc95d610816a9cb0b4532472a3268ddd59625936daba4badc6d43519dd5bec01519b
-EBUILD dustrac-1.7.2.ebuild 1310 SHA256 3239df7115ea22314d92ea16d1c81485c626a907b4c8a1ae55d70b4337898938 SHA512 c7d194ae9278a0a3d420fe7f66c58113fcb5a7675d8c2c4ca4e065aac857a8c38e9e0954fd9683b1b59a4e5c3d5f5008e80880019d237851cc27e961e7517a3d WHIRLPOOL 3fae9dbf0cbd55f65220dcfb02f871aec80229b3600e96ca4863eadc4908ad3fd205441570177438264910661a16ec013963b6f1d76edb256716a9a3fc4926e7
-EBUILD dustrac-1.7.3.ebuild 1296 SHA256 e213095fbfbca1824265bedd5a13c615f1d5865aa77106ecf66707973f74fd9d SHA512 7126b0c42c66578a47197377fa40ea847288e014508f5642839f8d4d97e6e56808ce1bca852cf7666958ecd2b3e95ebd876b19a368241417600d37acb632d3da WHIRLPOOL 6c98d3b73ba22bbbaeb0aa00e79a099fc9f0fd0b755ce2f99cfa3f9a13c8a5d83f7b8875300f5979c608aaea3783051aad397380e6095cfa1b18775e161a741e
-MISC ChangeLog 1264 SHA256 27a7b4d10ff2641621154d022b2ff07d1104b0dda5f5664d5bbc55fb705588e6 SHA512 e68ad4f8f326c32ae23c54d1a6f322684f62c8127dd98d33c1e87afd4271d773fd73273f07ad1c38f00383af58aeb7ceef483dacba6f7fb694a2dce0f5029a77 WHIRLPOOL e5b04ddbb65e7c789554d6ad24f92316ab55eb68dea501b4ac51028cab01ff57ada34de4d75069c22d0cb9b22e84e339eabd54369e363dcaf0c68047dde5b0f1
+EBUILD dustrac-1.7.3.ebuild 1293 SHA256 a89d9319c4662bc7c4c8f418d60226185067d09ca94867fea2313e0993dcffec SHA512 6cd98967fd070b22674d67f3e234397b834281703b23808cf7c6cfaa2361501d884f0ece73b304d39a4d9c98d93d919671a7d6056bccadf3fac6bb1130743b72 WHIRLPOOL 4f26c2ff4d2f932c357dff8a79570c169ed88772b4326a958cb7eac66d22545fff550a5f24c12ad42e7410a90b543bc8ccb2f78d6d9f3b7699f81af094516480
+MISC ChangeLog 1546 SHA256 aae124870901115bf60e72c7781e4b3a2a11173b88434048ed8aaaa7ed346b44 SHA512 fb86a67e35d7bcd5455378dbc8c8a17f470fe1be604e120fb00d9f807ee47e99c12e284ef86933113ea4ec2516be12ff12748504c84b14c74c5b745e55c3db6e WHIRLPOOL 49973e87684150170020b1aabb877359ab9c44ae846c81eefa5bf597d872de35c7d8a972a91c1b49e3df91f470e3370c17189593507a6a42a92fbe241fd94087
 MISC metadata.xml 588 SHA256 2b82ba4a293f88bd051dba58a6645ab356e927de1885fc866233cb9e5a7b2c45 SHA512 061751925bd00f50225168ef23f1b3ebbaae9a0bd071207407db2fb227fdebedf7e2ab36c89d80109b92d4686ecee70bc5c17c5702fd3dceccda920abbb37555 WHIRLPOOL 046d707009bd186428f0ff3689872df2f23d86519ffe866082e91a3f8db0aa83bee0e03332673df4b26f341ef325966722730b6c13804251ec638a77528b8bd5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQJ8BAEBCABmBQJUdQ7NXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
-MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgGd0QAM0GkdeisBE+Zgs4adrwyBOz
-ysMsZ58PSVz8HCgAa4xP+qIMmp/+Sl330vjoh6fhMXUFmdloHf8wLrS2dQoEzaLC
-cktsa2xfBfpf5zIjLHQcipHjpyEtki0BycZkPgewX9U0QxXO6uunSwJDX95LCQPX
-k3C5pbU3VNKNDfMN4XncYcfxFuPNqWgVQMdkOsE2Pk/A6Q709mQsCz3SisK/9NF1
-s/EzRs4dTL9p3FmAmt3pnvxaAKfY2DpC1W4ijsntADYK21kNQP2w1aF4pEKSgJFk
-wLf4lgHlNzVQYXytH2A3wHOn9OXEp/wCaqtl7WN2qwF4WL3DrU2bRbHdd1qxWASK
-3WiQFeLC4aPQI1R+REwRzQ+HAOEX8RgeV0hDGJCq8B0GR8hHMr5rUvqUC8Y+hA58
-N7SRI5DjWU/gljq7Ot5pIrG83bIIZsFbv2lY4Nmqs9mkmPz/q8pywQm9tmqS4cIk
-DyvdzaNYwJA/9pkmkLYwLr34UkEpLq60pJgdlCHNmrIoj+ZXfuvI2k1baSnR5QmG
-4bAJeczTrkN0qYCFm5b0De52KpMpeCPKEJ+BSlESylDI7QMB6eqTc8M+J1/uAl9P
-iXXM8C4B8JGbbzgnBvXyi+Fh9rj0/2DG71PWKTf2PIhlCJW6gNu1LpCdNEb/G0kq
-jgutfyT4UOLKGdP4GKr5
-=R5O3
------END PGP SIGNATURE-----
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