Version bump with fixes for CJK fonts, wmp10, vcrun2005. Drop old.

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

3 files changed, 34 insertions, 27 deletions

diff --git a/app-emulation/winetricks/ChangeLog b/app-emulation/winetricks/ChangeLog
index 79da65510305..cab049813c9c 100644
--- a/app-emulation/winetricks/ChangeLog
+++ b/app-emulation/winetricks/ChangeLog
@@ -1,6 +1,12 @@
 # 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.25 2013/07/09 12:41:56 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/ChangeLog,v 1.26 2013/07/13 03:17:38 tetromino Exp $
+
+*winetricks-20130707 (13 Jul 2013)
+
+  13 Jul 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -winetricks-960.ebuild, +winetricks-20130707.ebuild:
+  Version bump with fixes for CJK fonts, wmp10, vcrun2005. Drop old.
 
   09 Jul 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
   winetricks-20130629.ebuild, winetricks-99999999.ebuild, metadata.xml:
diff --git a/app-emulation/winetricks/Manifest b/app-emulation/winetricks/Manifest
index db052dce1f26..94f175ebe199 100644
--- a/app-emulation/winetricks/Manifest
+++ b/app-emulation/winetricks/Manifest
@@ -2,22 +2,21 @@
 Hash: SHA256
 
 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-20130707.tar.gz 159044 SHA256 020b43f9d3f5aaf41dc5c2ffe72dd257862386fbebfa7b3827f6f18cb1dfd97c SHA512 6e7af997ad6a9852231049a572663c3f3da7fcc3c2ef5ccf3e6fd3f394b2f809f8582959ea201009519200da290a9a7e9b60f1a2c3f7ffa937012dabfc000117 WHIRLPOOL bce5ce3f0562c1598b875b970efa8d4ff05e558ad37ec62ed8b843cfb59afe3f64a4784eb493d48815035e06bd5665a144020bf5c058e99afafef13c81853aa5
 DIST winetricks-gentoo-2012.11.24.tar.bz2 6398 SHA256 dded8c294cc5c2e71e4a5d1531ab165178cf3d2d1d890d0656368c2e499bfeb9 SHA512 59c93b73f3a7b2d11aefcde2ff66659ff1de21ad4b5f232f4b60572f3a48b15a6c49f369b1696862bf1b33fde190bf5598945e9536fb41ddec42d8def4d2be2a WHIRLPOOL 268da9e06712a678fbbcfff8eac1fca364b5e46f0a9c48a591eb88f03260b1a55f203eb2908bfe1f0a534b77c866127ff6f7049b0e43fe8abeaaa26fe55de75b
 EBUILD winetricks-20130629.ebuild 1953 SHA256 ea89014048139190ddf5383bd7849ca70ca8fa12fff0c665e8c52fe8aca3f7dc SHA512 764b274abdb721707d86bafd23533e67e6bbfff2846afa27f9d671ddef8c03b64304d97dba442d0b95e604beab23a4b4e5e6fb8be585d7ef30c14e6712039bc8 WHIRLPOOL 129eb4ada6b7dd9f826c8594c5f4b4f8b61957fa5be7e54068ee8583989f3d914894b2b370bb2d6d5fa05b414067be1aecc5b0a2d39eaff35a8bdcf362e0b2d5
-EBUILD winetricks-960.ebuild 1988 SHA256 10382f19eb2480facbeaf6014cf3ee45c72320e09696d9614badb63ca405290e SHA512 c27aaf48372b8dca4da37599399537971256894c7157ad7f372c068f43a0f51da523311a47466e65434df1c8a6ea4c253b5a06d09fd9bf3a998b179f4fdfbb68 WHIRLPOOL 19474994568395ef18a69dc7f74663e1d7f22d1da02bfc5964155f5d98f8a28ecd6089d7c7fa5e958645f9568376f8f7047d9ff92439aa08ea75b20bcbd35a0a
+EBUILD winetricks-20130707.ebuild 1953 SHA256 112a9f44053e321fb36211d30dbda299ee64d5a1dbd6b8ce0dd5ac6d85145d2b SHA512 819448cd66231d0b8c704cec827bbddae2a1d4c151e89a4bfc06fe30db3d38f7819f89473954af3a6ac8eff1b024e49ae7031fae2b0a2707c57df72f8bc0c9a2 WHIRLPOOL b02e635f1a0b9df98901b2b16c6f517cf1ab36d49a5ec238b14c5fc66a6b21759859f3c404d7d2efd3a44bcb9b3977791d658728e6208f79cd839a547833b46b
 EBUILD winetricks-99999999.ebuild 1954 SHA256 6dea475ea7063107db021cce551e4e160b76bc0b357823f957142bfef42c8080 SHA512 1fe7007919d3d4511e141da4c8bef0d0bb25e635159a47da79dae57c8a1ac997880039b01a73e95bdadce56c72614a994fec7bb63b213d28630f05485819bc04 WHIRLPOOL 22324b6c6a67b9391f0719a0f445436dd608bc3ee2f9d7a8d1e83f2c1eff6778d772df4b18b8b9b41d09a92a53fed4ed15a6ea3d7377888398cceb403c7a76c1
-MISC ChangeLog 5524 SHA256 6aac6baae7bc8c28e10f87a2ddb37a718c74798093e63f19a9b60523f6524c39 SHA512 799b50e88c4e38dcd098e2ed637dad7a24491dafa26c462ca4b6d3da3aae6b8ccfd8e529ee1bc1f9fb770570e1f457426e7551804b776e1b300a587a6add0aef WHIRLPOOL ea295e1fc214f7066f051209c3b06ba41d35ffea3e0ff9776cd2e9da1eacf0c596da05f922a9eadd67b26756b0891a79099f7133aeb1f2fc529e5da1f56d5256
+MISC ChangeLog 5744 SHA256 12c3162907edb7cf3071b7c94e3b1c5848398403b3b1fad20241917825073e35 SHA512 affc6cc0718f07d48299a984319f447a540472dcd7ac114a17cb5eaf1a2f57591d52f03c858a7975c0f3067b15c5fcbfad9af342b6c1fe1c423f7d2d4ea2c909 WHIRLPOOL f75b11b5d527025114c995f84e6a1f9866a2c61051281441ea6ca9ce209e2f87c98558d9b0a4cac7f2726e486edade024781a397596cc94a5baa3c36c60a702b
 MISC metadata.xml 352 SHA256 2053c7fa6dc44c98e9e1d66861bbf5c96b1116931a97b39a21547127d1b655ec SHA512 1e39d4b4c4756ff6bf0dbfdb9cd42cee1e4a355e700db0ed6abd9a4e89da72b8f20c878be2ac5f5038b9b5670f830ddfde938a3a03e522576375a532adeb26fe WHIRLPOOL 116a258ec836b0e552f304eb98b51da0474e0cde262bc1921b5ff9bb817393a650f845b456a2fdf6f6de73c5354777d45ce0483ace31661e1a461ec926b7776c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR3AUVAAoJEJ0WA1zPCt1hrtIIAJ7AuEuOaEtxs7a7MB71zdER
-gy9Hb7AE6JKDjfh2RVHxoBEkhG0fLLm3TlDKbU8oEVA35cCaHIbkmVafhatuIvDi
-38X7Syf6xAcJV7c+lEuaZdXQEs6QqdqBfZSp2nBeo4Ez2F49WDa0yz7b9AYicqKO
-vwVlZ7kUwCQWMdhJN3J8Q/28Wk80BoscT32JmubT+UBqXpOsSQUqFVlySAyVmozK
-UFsmXu7mBh7mtP84FsxX/aLb7ft91mrZlw3OkMRz1O/amo+YFVqCaDUk0/q3A6Zz
-LMlGxzaTA0XTgZC5QUO6QjpLUcg4FsaMebGWhcfpBAjE6gY5TVwW/jhbsUWQhGE=
-=45uS
+iQEcBAEBCAAGBQJR4MbTAAoJEJ0WA1zPCt1ht8QH/09O0dL8I6I5/SPgxiuf/O4Y
+R9PubeJ/AWGV7hJJ2s0y3ANCg7S68Gtb+Gj1bPILnTgEqfNhSf5slHOOLHsApqBO
+x50pMWmp5rHgJhGQ1RNhMLLvjWIMCcOc2btAfht+3Acok8uti4vJn73qYOzAe/Mv
+emZ1j3eM0BEodor5B4Y5cuHtLzbwwdiqLGgEZ4Sa8feyeFUr8eePVe7XYA/uzcmX
+vFmnhpqiF+XQGTcAFbYJGL1T1XFzRfXQHIox73ay+D55S6qgWs6Sxxt6okN44zIb
+4SZGa9OYM3y1v3Dx0X6ZnTg7mXZOoRFZcHIm2q4L80hgtl22/gtQFWvlGtZLmF4=
+=gxOj
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/winetricks/winetricks-960.ebuild b/app-emulation/winetricks/winetricks-20130707.ebuild
index 7ab24e075b42..f34109621fee 100644
--- a/app-emulation/winetricks/winetricks-960.ebuild
+++ b/app-emulation/winetricks/winetricks-20130707.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-960.ebuild,v 1.1 2013/06/15 03:58:20 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/winetricks-20130707.ebuild,v 1.1 2013/07/13 03:17:38 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
@@ -24,39 +23,42 @@ HOMEPAGE="http://code.google.com/p/winetricks/ http://wiki.winehq.org/winetricks
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-IUSE="gtk kde"
+IUSE="gtk kde rar"
 
 DEPEND=""
 RDEPEND="app-arch/cabextract
+	app-arch/p7zip
 	app-arch/unzip
 	app-emulation/wine
+	net-misc/wget
+	x11-misc/xdg-utils
 	gtk? ( gnome-extra/zenity )
-	kde? ( kde-base/kdialog )"
+	kde? ( kde-base/kdialog )
+	rar? ( app-arch/unrar )"
 
 # Uses non-standard "Wine" category, which is provided by app-emulation/wine; #451552
 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
+		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