Update to eapi4. Bump to the latest release, fixes crash for me when installing dontn...

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

diff --git a/app-emulation/winetricks/ChangeLog b/app-emulation/winetricks/ChangeLog
index 7875e09da89ec4c798f621ddc62929bb686fb4b2..22206d3f0564cbdc1461612661b7093c03d241e2 100644 (file)
--- a/app-emulation/winetricks/ChangeLog
+++ b/app-emulation/winetricks/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/winetricks
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/ChangeLog,v 1.2 2011/07/05 21:29:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/ChangeLog,v 1.3 2011/09/22 12:48:28 scarabeus Exp $
+
+*winetricks-696 (22 Sep 2011)
+
+  22 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> -winetricks-185.ebuild,
+  -winetricks-672.ebuild, +winetricks-696.ebuild, winetricks-99999999.ebuild:
+  Update to eapi4. Bump to the latest release, fixes crash for me when
+  installing dontnet stuff, remove older.
 
 *winetricks-99999999 (05 Jul 2011)
 *winetricks-672 (05 Jul 2011)

diff --git a/app-emulation/winetricks/Manifest b/app-emulation/winetricks/Manifest
index 6be5e0464501fe044d62b1ae5631adc357ba01a2..aeafcd4b6dbfcdb6cab01394f1080290ad36d36c 100644 (file)
--- a/app-emulation/winetricks/Manifest
+++ b/app-emulation/winetricks/Manifest
@@ -1,18 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
-DIST winetricks-185 409346 RMD160 66bcfd4477748dafde08d2038b9246b193672915 SHA1 af4bc2a3bd93f19c01147bc15e154e39110ddeea SHA256 35699575da054318ff8b6d1914fd337556cb3488bc73aa2fe98309a6b0904e07
-DIST winetricks-672 576145 RMD160 006941182101f2800d7ad65ffba26f24c8518487 SHA1 191e6178123cb7103aba3176bed279f0fa359215 SHA256 617ba88ff0c728f79f457351f4041f21b5d7c18285c86722f44e6d5730fbd1bb
-DIST winetricks-672.1 3469 RMD160 fcd6970b3badb9895ceec2de92de84c04d181062 SHA1 a8c45e5a33e2aee025e4527b3a9d8eebb4e4e3d4 SHA256 f522f4c991194cbed1044182ca6fbbb7645cd4b98d9557ab7d073ace1af4738d
-EBUILD winetricks-185.ebuild 648 RMD160 6d30313c64904e230b5dd29ff80032b224acd113 SHA1 4044fbfa038eb5c4aa02cd5d4e3813e054fc5542 SHA256 f07090138e33d6e38740ea6c3fb6190c02c7a66357c3e91abf3d09c853945fa9
-EBUILD winetricks-672.ebuild 1121 RMD160 52dd0fdd4ae58015179dc22ab11f4c8fb124ed07 SHA1 31469b287a6559597f540be1fdba42926e3ee738 SHA256 7cfec3e048dd8b9634e7318c474f349f0ab99ef4aa7ab94efd3a436049f766d3
-EBUILD winetricks-99999999.ebuild 1126 RMD160 074f1dffc977db88356bbfb4684201140b4b570a SHA1 0d243423ace91fbcfc044ff9fcec4b9f7f2d9898 SHA256 c861a505f1bd04ccc968b6a43a47139cf95c3073c698ce403d7067764008c7c3
-MISC ChangeLog 591 RMD160 2c908eacf18b2cffe5976f4344c2323a05b20189 SHA1 7a4a2bb45dab5079f2e7b0c032a420b3b793b3fc SHA256 c943fa95f9d0a16e11a1be20b92ab1e636f3497b1a4df04df08972e3b553708b
+DIST winetricks-696 587948 RMD160 32f240a19ac29308531a1a0cf1e8fb018aca6693 SHA1 a28fb5f17aa60996f8d3ae4b9ca0745bc6d176ab SHA256 47de6401b79b92a8f334e836f2daab343338ef7b0d5027f473f4e2c1cbe9e3f0
+DIST winetricks-696.1 3469 RMD160 fcd6970b3badb9895ceec2de92de84c04d181062 SHA1 a8c45e5a33e2aee025e4527b3a9d8eebb4e4e3d4 SHA256 f522f4c991194cbed1044182ca6fbbb7645cd4b98d9557ab7d073ace1af4738d
+EBUILD winetricks-696.ebuild 1124 RMD160 72f22770b0d05691d482c5dfe1067606da130368 SHA1 6fe320b70e4bef98e9de1619169604363c237292 SHA256 d3ba7807c447d1e2e90b13548a35d11ab5dacae2c01092be84847dc067a9210a
+EBUILD winetricks-99999999.ebuild 1129 RMD160 cb350caeffb2624effead4eae9dd3b606fba67b7 SHA1 45144bc01e8d25fece4bea05a5327b07474b710d SHA256 879fb5595cd15647dfcfbb68497e905e67464281817343ac0fa741674d2a2fb2
+MISC ChangeLog 896 RMD160 a7eca6507dc815fd77e11a2c9aae25f86c076afd SHA1 bf76a71cca388cdff2d3551c96a235b8c9801872 SHA256 4d67a6271ab1e4e66d6e2ffdd8bb4197b9018c74674257fa37afe82245f0d50c
 MISC metadata.xml 157 RMD160 b892a0c64131e9d8668b2aac5920c256bf64b0b1 SHA1 64f437370b4a6e795b5eb37d4f5a4c45d9159551 SHA256 4bc5b7df954a173f1b0a30195797200b7a638f25f3442f2a97ce9a6f0cd7ccdc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk4TglEACgkQaC/OocHi7JaUSgEAicjw6kz5WzwgjsJ8MQN2+yil
-yBkBBXnYDeheNFZUqmYA/jJgGKdO3CEI0QwRiGBXBs5ME3p7F8YtBvyq+ldETQk5
-=Wkjx
+iQIcBAEBAgAGBQJOey58AAoJEOSiRoyO7jvoAkkP/ibwq5iEA/AU9b770dqc07u3
+HmpMC3hVfb55YNzsniiC9qf3Xp5TCqaBa4LgA6/Yoaq4aBamwqCeMA6BHo3Kqx9G
+0v9AJsSTrAhYcI7zSeQ8QDLgfeWCCTuzVy5r4jgpqb9TwFoD1RDzmG2q2rGVMUgT
+tFV90cg3YDH2rXAkZNOH+8OhUuIxf2tpZEfT+Umxac/qGeFON3a4N1htJw/mdeY2
+w/260IRo275PhMAdPcva+BRl4V3mvZ4a23l6wbAvtdQKnQgTsWkCLKWgF9JAaFJ8
+P7e3Zn76tatvGg8yfwjXQ5XWkolsI/tAfPCxBQqCms2R4SxKHfQ0Ffx0PmaBDoxV
+UJ3VoNKvxyRucvBCCnqgNJIx4C1WOjdzwBfCYSsqcJ6D8ezIjqTx18Nya7InigY8
+DBCfNlwzMNXpL4YWK8bp2DP4UtYkMzhe1Cbt7KSsVXomSbXXHPSBM9M2Yqf9cCv4
+vyr4XULvxLTEJ2uFTpyFVhSTp65zR5Z30BMxAAKRgqhimwoMscDoVjGbyHIpZtB+
+tmqG3+YykEKY+mAgi3iF2cF691d8VYqew8xL4OtEE7/uSCPOEMyBE3pOKbhp+KeF
+HL5Asb7K2sGz/r7fYNdm4o7ozozia8FRYvrKVL1mMeizMgEj5j/NbSeThj3nTmxA
+A2bPWEsmya6zUiPy+sHr
+=HW7K
 -----END PGP SIGNATURE-----

diff --git a/app-emulation/winetricks/winetricks-185.ebuild b/app-emulation/winetricks/winetricks-185.ebuild
deleted file mode 100644 (file)
index 5fd1876..0000000
--- a/app-emulation/winetricks/winetricks-185.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/winetricks-185.ebuild,v 1.1 2011/03/01 02:35:56 vapier Exp $
-
-EAPI="2"
-
-DESCRIPTION="easy way to install DLLs needed to work around problems in Wine"
-HOMEPAGE="http://code.google.com/p/winetricks/ http://wiki.winehq.org/winetricks"
-SRC_URI="http://winetricks.googlecode.com/svn-history/r${PV}/trunk/src/winetricks-alpha -> ${P}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_unpack() {
-       cp "${DISTDIR}"/${P} ${PN} || die
-}
-
-src_install() {
-       dobin ${PN} || die
-}

diff --git a/app-emulation/winetricks/winetricks-672.ebuild b/app-emulation/winetricks/winetricks-696.ebuild
similarity index 90%
rename from app-emulation/winetricks/winetricks-672.ebuild
rename to app-emulation/winetricks/winetricks-696.ebuild
index f14df0f4638214af35a06fd88d5c77927daceb3f..8cd817464c928364cb51f7298702ba5df79c2d8b 100644 (file)
--- a/app-emulation/winetricks/winetricks-672.ebuild
+++ b/app-emulation/winetricks/winetricks-696.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/winetricks-672.ebuild,v 1.1 2011/07/05 21:29:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/winetricks-696.ebuild,v 1.1 2011/09/22 12:48:28 scarabeus Exp $
 
-EAPI="2"
+EAPI=4
 
 if [[ ${PV} == "99999999" ]] ; then
        ESVN_REPO_URI="http://winetricks.googlecode.com/svn/trunk"
@@ -25,6 +25,8 @@ RDEPEND="app-emulation/wine
        gtk? ( gnome-extra/zenity )
        kde? ( kde-base/kdialog )"
 
+S="${WORKDIR}"
+
 src_unpack() {
        if [[ ${PV} == "99999999" ]] ; then
                subversion_src_unpack
@@ -37,6 +39,6 @@ src_unpack() {
 
 src_install() {
        cd src
-       dobin ${PN} || die
-       doman ${PN}.1 || die
+       dobin ${PN}
+       doman ${PN}.1
 }

diff --git a/app-emulation/winetricks/winetricks-99999999.ebuild b/app-emulation/winetricks/winetricks-99999999.ebuild
index 203b88561578a573593a89ae856562f82ec7caa8..5825a09f2de166cc4f12e589ef6861c264a6fb52 100644 (file)
--- a/app-emulation/winetricks/winetricks-99999999.ebuild
+++ b/app-emulation/winetricks/winetricks-99999999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 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.1 2011/07/05 21:29:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/winetricks-99999999.ebuild,v 1.2 2011/09/22 12:48:28 scarabeus Exp $
 
-EAPI="2"
+EAPI=4
 
 if [[ ${PV} == "99999999" ]] ; then
        ESVN_REPO_URI="http://winetricks.googlecode.com/svn/trunk"
@@ -25,6 +25,8 @@ RDEPEND="app-emulation/wine
        gtk? ( gnome-extra/zenity )
        kde? ( kde-base/kdialog )"
 
+S="${WORKDIR}"
+
 src_unpack() {
        if [[ ${PV} == "99999999" ]] ; then
                subversion_src_unpack
@@ -37,6 +39,6 @@ src_unpack() {
 
 src_install() {
        cd src
-       dobin ${PN} || die
-       doman ${PN}.1 || die
+       dobin ${PN}
+       doman ${PN}.1
 }