Version bump (bug #532226, thanks to jospezial), adds controlspy, qdvd, setupapi, updspapi, vcrun2012. Change live ebuild from svn to git (bug #540662, thanks to Bob Wya and NP-Hardass). Drop old.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)

3 files changed, 27 insertions, 18 deletions

diff --git a/app-emulation/winetricks/ChangeLog b/app-emulation/winetricks/ChangeLog
index 1ad3ada8f759..eb28c27b9a21 100644
--- a/app-emulation/winetricks/ChangeLog
+++ b/app-emulation/winetricks/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-emulation/winetricks
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/ChangeLog,v 1.27 2014/03/05 07:02:37 tetromino Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/ChangeLog,v 1.28 2015/03/07 22:22:23 tetromino Exp $
+
+*winetricks-20141130 (07 Mar 2015)
+
+  07 Mar 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -winetricks-20130707.ebuild, +winetricks-20141130.ebuild,
+  winetricks-99999999.ebuild:
+  Version bump (bug #532226, thanks to jospezial), adds controlspy, qdvd,
+  setupapi, updspapi, vcrun2012. Change live ebuild from svn to git (bug
+  #540662, thanks to Bob Wya and NP-Hardass). Drop old.
 
 *winetricks-20140302 (05 Mar 2014)
 
diff --git a/app-emulation/winetricks/winetricks-20130707.ebuild b/app-emulation/winetricks/winetricks-20141130.ebuild
index f34109621fee..6a564d4f67e8 100644
--- a/app-emulation/winetricks/winetricks-20130707.ebuild
+++ b/app-emulation/winetricks/winetricks-20141130.ebuild
@@ -1,17 +1,19 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/winetricks-20130707.ebuild,v 1.1 2013/07/13 03:17:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/winetricks-20141130.ebuild,v 1.1 2015/03/07 22:22:23 tetromino Exp $
 
 EAPI=5
 
 inherit gnome2-utils eutils
 
 if [[ ${PV} == "99999999" ]] ; then
-	ESVN_REPO_URI="http://winetricks.googlecode.com/svn/trunk"
-	inherit subversion
+	EGIT_REPO_URI="https://code.google.com/p/winetricks/"
+	inherit git-r3
+	SRC_URI=""
 else
 	SRC_URI="http://winetricks.org/download/releases/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}"
 fi
 wtg=winetricks-gentoo-2012.11.24
 SRC_URI="${SRC_URI}
@@ -42,11 +44,9 @@ QA_DESKTOP_FILE="usr/share/applications/winetricks.desktop"
 # Tests require network access and run wine, which is unreliable from a portage environment
 RESTRICT="test"
 
-S="${WORKDIR}"
-
 src_unpack() {
 	if [[ ${PV} == "99999999" ]] ; then
-		subversion_src_unpack
+		git-r3_src_unpack
 		if use gtk || use kde; then
 			unpack ${wtg}.tar.bz2
 		fi
@@ -58,7 +58,7 @@ src_unpack() {
 src_install() {
 	default
 	if use gtk || use kde; then
-		cd ${wtg} || die
+		cd "${WORKDIR}/${wtg}" || die
 		domenu winetricks.desktop
 		insinto /usr/share/icons/hicolor/scalable/apps
 		doins wine-winetricks.svg
diff --git a/app-emulation/winetricks/winetricks-99999999.ebuild b/app-emulation/winetricks/winetricks-99999999.ebuild
index 2b17407c633e..b9aaa8ce7f52 100644
--- a/app-emulation/winetricks/winetricks-99999999.ebuild
+++ b/app-emulation/winetricks/winetricks-99999999.ebuild
@@ -1,17 +1,19 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/winetricks-99999999.ebuild,v 1.11 2013/07/09 12:41:56 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/winetricks-99999999.ebuild,v 1.12 2015/03/07 22:22:23 tetromino Exp $
 
 EAPI=5
 
 inherit gnome2-utils eutils
 
 if [[ ${PV} == "99999999" ]] ; then
-	ESVN_REPO_URI="http://winetricks.googlecode.com/svn/trunk"
-	inherit subversion
+	EGIT_REPO_URI="https://code.google.com/p/winetricks/"
+	inherit git-r3
+	SRC_URI=""
 else
 	SRC_URI="http://winetricks.org/download/releases/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}"
 fi
 wtg=winetricks-gentoo-2012.11.24
 SRC_URI="${SRC_URI}
@@ -42,11 +44,9 @@ QA_DESKTOP_FILE="usr/share/applications/winetricks.desktop"
 # Tests require network access and run wine, which is unreliable from a portage environment
 RESTRICT="test"
 
-S="${WORKDIR}"
-
 src_unpack() {
 	if [[ ${PV} == "99999999" ]] ; then
-		subversion_src_unpack
+		git-r3_src_unpack
 		if use gtk || use kde; then
 			unpack ${wtg}.tar.bz2
 		fi
@@ -58,7 +58,7 @@ src_unpack() {
 src_install() {
 	default
 	if use gtk || use kde; then
-		cd ${wtg} || die
+		cd "${WORKDIR}/${wtg}" || die
 		domenu winetricks.desktop
 		insinto /usr/share/icons/hicolor/scalable/apps
 		doins wine-winetricks.svg