Version bump with updates for Adobe Flash, .NET, psdk2003, etc. Switch to upstream packaged tarballs instead of svn checkouts. Drop old.

Package-Manager: portage-2.2.0_alpha185/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 37 insertions, 40 deletions

diff --git a/app-emulation/winetricks/ChangeLog b/app-emulation/winetricks/ChangeLog
index 7afb15fe92d4..95c92138d663 100644
--- a/app-emulation/winetricks/ChangeLog
+++ b/app-emulation/winetricks/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/winetricks
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/ChangeLog,v 1.22 2013/06/15 03:58:20 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/ChangeLog,v 1.23 2013/06/30 02:29:59 tetromino Exp $
+
+*winetricks-20130629 (30 Jun 2013)
+
+  30 Jun 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -winetricks-954.ebuild, +winetricks-20130629.ebuild,
+  winetricks-99999999.ebuild:
+  Version bump with updates for Adobe Flash, .NET, psdk2003, etc. Switch to
+  upstream packaged tarballs instead of svn checkouts. Drop old.
 
 *winetricks-960 (15 Jun 2013)
 
diff --git a/app-emulation/winetricks/Manifest b/app-emulation/winetricks/Manifest
index b9e1480b49aa..d388675dfe94 100644
--- a/app-emulation/winetricks/Manifest
+++ b/app-emulation/winetricks/Manifest
@@ -1,24 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST winetricks-954 618478 SHA256 3719df10729ee73fe82684dadcc4b513cd387fdb4bf869b0cbdfb3e2d1528f1a SHA512 b73f5bfb3d925cbd761061bb7a2632b412ab99410709c1240382561927cf07092147efecba8ff8d69fb9644c1bc55c3875297c60ef2c14d02544f537bf8b6a3d WHIRLPOOL c3893c6ef222247161795056d510b398d4efe32c0766725a2e56fa0c192e365c93eac90b6a304a5afca3f6035c6b51b6fbcdba70ced5662d550f29b4001be98c
-DIST winetricks-954.1 3469 SHA256 f522f4c991194cbed1044182ca6fbbb7645cd4b98d9557ab7d073ace1af4738d SHA512 2c832a9cc4286f641aeed7a5a47131773b48dd0cf123798f753ffb24799dabca29986b2b740698fbe9efb8034ac874a18147c6bd645bea8e69fdb42f1437fdf2 WHIRLPOOL 0ccb982022189b4d2e134756cadbca3628c33e57be6879b07e84f99182ed5a201379413a32af5d689744b4d7527f6abf56aae7113f34401c4cbe62b902462424
+DIST winetricks-20130629.tar.gz 158364 SHA256 4ded5b85b0827da78ea19fef66af88441e00db7e4ec3c165448384671ebc0205 SHA512 098653646756aa62e847adecf3308e36aa8a4d54ecb9903e5fd8a6e607fa7825d6a9d6868f0c69549ab2b399a320e64b36e006d73da5fbd2b0b7fa5731ae4ffa WHIRLPOOL e6407bf8a2a215edff406ada01135aa83949678cfa5318e6cfd91b17078dd0318fa59a026e392a570c70709ef7e4d2727385a05e2716740bc45403be73041537
 DIST winetricks-960 619092 SHA256 71303e5a7fb5e13b11f3be7168e8a470427241a6538dc21a621188f068af8a36 SHA512 901b5a6e1d9dfce1e95a1b1a5d2240724988f15c3ca73b0a5a36ecbc24a889075f1c2df91f889ca510cd6cc8e9f6c05de1537b27ed81f62b92af6a343191e0fe WHIRLPOOL 0d17fe704016ab6be478473bbc4fa01a0e688268f60cf61e628a77b6f1e95a36fa025d60291434387ecd3c89830f7f9a9a8f71e35ff85da68d0fb59624488af3
 DIST winetricks-960.1 3469 SHA256 f522f4c991194cbed1044182ca6fbbb7645cd4b98d9557ab7d073ace1af4738d SHA512 2c832a9cc4286f641aeed7a5a47131773b48dd0cf123798f753ffb24799dabca29986b2b740698fbe9efb8034ac874a18147c6bd645bea8e69fdb42f1437fdf2 WHIRLPOOL 0ccb982022189b4d2e134756cadbca3628c33e57be6879b07e84f99182ed5a201379413a32af5d689744b4d7527f6abf56aae7113f34401c4cbe62b902462424
 DIST winetricks-gentoo-2012.11.24.tar.bz2 6398 SHA256 dded8c294cc5c2e71e4a5d1531ab165178cf3d2d1d890d0656368c2e499bfeb9 SHA512 59c93b73f3a7b2d11aefcde2ff66659ff1de21ad4b5f232f4b60572f3a48b15a6c49f369b1696862bf1b33fde190bf5598945e9536fb41ddec42d8def4d2be2a WHIRLPOOL 268da9e06712a678fbbcfff8eac1fca364b5e46f0a9c48a591eb88f03260b1a55f203eb2908bfe1f0a534b77c866127ff6f7049b0e43fe8abeaaa26fe55de75b
-EBUILD winetricks-954.ebuild 1988 SHA256 574276c8aa413bef3b1d327b444084f8af28e8c831da219b7a0a7cd3808baf1e SHA512 f32fc28141d692db34b044ff87af6845a20c8aab13caecad46933b4b17cf0a53eabf3890c50ee3983da4a0fde780fcc84022c1d22986d3a95b718a0364cfcead WHIRLPOOL b90def9a7e2aeca380b7059b02aa9d20be09163152761c595f0e9190e3f713f53e6c373a00009694d95d80018ff465fc08ff861f0864ae49cfdcdefe12e3c940
+EBUILD winetricks-20130629.ebuild 1764 SHA256 b7843767aa441788113473c0fc150c4e81dcbe9771129fcfc3aed72121b3447d SHA512 67b3cb7aee9651478d7dc8aca3ae314feed72d0e53e03ae0005a3475bcc13b272b372784b1198dc233ddc13abf9254b0883a990cd6ea46955c2160196340c94c WHIRLPOOL d8d25407a7dbd532ce85bb76d611e6e9a743384c2def1e3b012d010fc8c276137f1fe94258e296040f2dec505c95a6de53c4e6e37c605d6eb0cd71c3bc35b49d
 EBUILD winetricks-960.ebuild 1988 SHA256 10382f19eb2480facbeaf6014cf3ee45c72320e09696d9614badb63ca405290e SHA512 c27aaf48372b8dca4da37599399537971256894c7157ad7f372c068f43a0f51da523311a47466e65434df1c8a6ea4c253b5a06d09fd9bf3a998b179f4fdfbb68 WHIRLPOOL 19474994568395ef18a69dc7f74663e1d7f22d1da02bfc5964155f5d98f8a28ecd6089d7c7fa5e958645f9568376f8f7047d9ff92439aa08ea75b20bcbd35a0a
-EBUILD winetricks-99999999.ebuild 1993 SHA256 111435cc6719661f970f42a8b7af434e6ad9ef01e3b5bb426123c861e3c91349 SHA512 19ad9bc02732b4ba0c183c5c4ea6268baf29de99cd35b31dc64aed2d3168a5b5e27ac97b4e421345a1945d15a749964e291d13dc7fe2331068b61b3f82a01eca WHIRLPOOL 59402a0643ea2a8dc0d6d640aeed8fc29c86866f73351e1bf72281af0c7be78bd3ec7a9f769d6fdf07e0932aa193b926026981c923e21c3fe9cefb36b139de54
-MISC ChangeLog 4739 SHA256 70d24c0826907fbcd2ce7170edf310e5c0e01817976d49e032c3665a2ee81c48 SHA512 a5995b8a58051fd43b5b2680e572411e863f612d4e6ead07e4d21f4f5a6863fca0d7ae3abe7d1d75d25277535fbd810c53eeb03d34004a042988a5fb98c4bd44 WHIRLPOOL 6d685b3f413e1d811d1e01556dba34e4bd9e3b267e320613ba5878ac5665239e7516f81aaae4a449810e2d6675ba11c51b8c4296dd3c7d546771ccbe9e299ec2
+EBUILD winetricks-99999999.ebuild 1764 SHA256 ab9232d3fbfb36e92db344ba62d6b962d5fa0ef5ba33345aeae1e114b1178d1e SHA512 d667c9ac99cf443eef38e914219fc881cfdd4c6542641c2fdb7f7b1e9ff5e3f6c33dab64b62bc6e88f0d636708e3044a8827b8a763c59b608d89cff40339bf16 WHIRLPOOL b8ce46ea04afcace9563328bc78408bb35595b3bd0b55df40620311f0a9cd1511c1fab8e20ee51fa61fae6d91132420d0baa6e2b0324048021d5ae51b836a31b
+MISC ChangeLog 5061 SHA256 f99f99a97d6023080aa54791a2933f74aef3c589f6ea3055e617b40f4c7e5e6b SHA512 5e4f70bc8b54e5ab7467c02a0e130df6036a36f41ab42dd7ff9fbb3431a402a05a9195112df4b034422064893cdab931269a8ea33e9ed8d517b0ba5becddb251 WHIRLPOOL 917434bd7a6a560da44b7d67bb23e5284e0e51ca66f7e17cb53582fd637bb25673469366c982f3c0b11f61c83c41373511c73465e7620c014aed9b04b6d2b81c
 MISC metadata.xml 238 SHA256 89eb94f543aa923d1627ce6ad4b70039815f7d01d795beb58a8f9a1c7de97252 SHA512 17e2bfa0f3b04f33b520be8ce9892a8c11fe027178a1315b2b48d3268296d4f017890bcdcc2a25f1dbd6acad78ef47924679aa5c87d4c3c66f65bf1b03bbeafc WHIRLPOOL 8ebb3ae5a0560a7cbccd13183d6d5fcb3a7afcf2ddbca0c7d224d0951f5223a6ac53c9f7bb7cce5583e257cf4b6a94b0e710c98bec00a57f042c3568ee4274f9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRu+ZeAAoJEJ0WA1zPCt1h4fIIAJLTWfdR4Els+dC5y8ML2IxR
-FamboXbsWgb+EUjawpA/N8AnjSkFMQSAZOUWH858/tSVlx4ekK2dhLinKq79hWCB
-1dIiz4cd2fVobQwXjgRQbirwmOw760Ol7Wlq7p/YrisDIJ/BrOQ1P3rvKyd/drIt
-pwWCihBeDyti6N47Zo16SA2hyamM/iTsy8dIbKELfY8DxYrRfHyKYfAlUqV9Etoe
-LfWWHa8dsZDyLaajSd2n/cfgijK0av6x8FJKcMSWMvCn6JWY54+aL3Nquhm6s4w/
-PEpam0ouLI6dBHJIfJI2SFUhox1qk+SfaEZ9Qg0t6FeMT4xpGld+ujaetjalSao=
-=9lzy
+iQEcBAEBCAAGBQJRz5goAAoJEJ0WA1zPCt1h5sQIAKeiD4A5whpwRj85qWD+bYLw
+7F72Nk48L21JYvznhRM0TrURY81Y2fIiP0wEpgOjO13vZ7tBr3nl2K/Oc/AKg63e
+iN2bPObp6h/Nff+acfbmxAxzzEf91KNHhZTn8uGoaZlRu7qL7lvrK2532W8iZm7y
+q5pZM7g0jbgCqtxzarnBYO43xJxlJ5fqfekecKZ22wbk+120TcghGsUQrkR9T6XR
+OM8GvEDVXmvDef4e4fb8yjfrGMbcsQ0nBtX+Fbk/j10lpv1ZC16QVZCdN6CWawFr
+mxlQCC8YnmOfv7CsimZTcGhmLLWRUIbTbPj5+s0x2OSwTduu5+SatnENh1A4sg4=
+=VtKT
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/winetricks/winetricks-954.ebuild b/app-emulation/winetricks/winetricks-20130629.ebuild
index ca1d21c11ccd..d2b94f068577 100644
--- a/app-emulation/winetricks/winetricks-954.ebuild
+++ b/app-emulation/winetricks/winetricks-20130629.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/winetricks-954.ebuild,v 1.1 2013/05/26 04:29:30 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/winetricks-20130629.ebuild,v 1.1 2013/06/30 02:29:59 tetromino Exp $
 
-EAPI=4
+EAPI=5
 
 inherit gnome2-utils eutils
 
@@ -10,8 +10,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	ESVN_REPO_URI="http://winetricks.googlecode.com/svn/trunk"
 	inherit subversion
 else
-	SRC_URI="http://winetricks.googlecode.com/svn-history/r${PV}/trunk/src/winetricks -> ${P}
-		http://winetricks.googlecode.com/svn-history/r${PV}/trunk/src/winetricks.1 -> ${P}.1"
+	SRC_URI="http://winetricks.org/download/releases/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 wtg=winetricks-gentoo-2012.11.24
@@ -41,22 +40,18 @@ S="${WORKDIR}"
 src_unpack() {
 	if [[ ${PV} == "99999999" ]] ; then
 		subversion_src_unpack
+		if use gtk || use kde; then
+			unpack ${wtg}.tar.bz2
+		fi
 	else
-		mkdir src
-		cp "${DISTDIR}"/${P} src/${PN} || die
-		cp "${DISTDIR}"/${P}.1 src/${PN}.1 || die
-	fi
-	if use gtk || use kde; then
-		unpack ${wtg}.tar.bz2
+		default
 	fi
 }
 
 src_install() {
-	cd src
-	dobin ${PN}
-	doman ${PN}.1
+	default
 	if use gtk || use kde; then
-		cd ../${wtg} || die
+		cd ${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 7f6bc275e667..8a3aa2fac294 100644
--- a/app-emulation/winetricks/winetricks-99999999.ebuild
+++ b/app-emulation/winetricks/winetricks-99999999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.8 2013/06/15 03:58:20 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/winetricks-99999999.ebuild,v 1.9 2013/06/30 02:29:59 tetromino Exp $
 
 EAPI=5
 
@@ -10,8 +10,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	ESVN_REPO_URI="http://winetricks.googlecode.com/svn/trunk"
 	inherit subversion
 else
-	SRC_URI="http://winetricks.googlecode.com/svn-history/r${PV}/trunk/src/winetricks -> ${P}
-		http://winetricks.googlecode.com/svn-history/r${PV}/trunk/src/winetricks.1 -> ${P}.1"
+	SRC_URI="http://winetricks.org/download/releases/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 wtg=winetricks-gentoo-2012.11.24
@@ -41,22 +40,18 @@ S="${WORKDIR}"
 src_unpack() {
 	if [[ ${PV} == "99999999" ]] ; then
 		subversion_src_unpack
+		if use gtk || use kde; then
+			unpack ${wtg}.tar.bz2
+		fi
 	else
-		mkdir src
-		cp "${DISTDIR}"/${P} src/${PN} || die
-		cp "${DISTDIR}"/${P}.1 src/${PN}.1 || die
-	fi
-	if use gtk || use kde; then
-		unpack ${wtg}.tar.bz2
+		default
 	fi
 }
 
 src_install() {
-	cd src
-	dobin ${PN}
-	doman ${PN}.1
+	default
 	if use gtk || use kde; then
-		cd ../${wtg} || die
+		cd ${wtg} || die
 		domenu winetricks.desktop
 		insinto /usr/share/icons/hicolor/scalable/apps
 		doins wine-winetricks.svg