Version bump. Install .desktop file and icon (bug #438806, thanks to C.J. Wijtmans). Update license. Add dependencies on cabextract and unzip. Drop old.

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

5 files changed, 83 insertions, 23 deletions

diff --git a/app-emulation/winetricks/ChangeLog b/app-emulation/winetricks/ChangeLog
index 945abdc1b76c..c82c4c5d8b9d 100644
--- a/app-emulation/winetricks/ChangeLog
+++ b/app-emulation/winetricks/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-emulation/winetricks
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/ChangeLog,v 1.8 2012/09/14 20:24:24 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/ChangeLog,v 1.9 2012/10/19 05:50:00 tetromino Exp $
+
+*winetricks-916 (19 Oct 2012)
+
+  19 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -winetricks-909.ebuild, winetricks-913.ebuild, +winetricks-916.ebuild,
+  winetricks-99999999.ebuild:
+  Version bump. Install .desktop file and icon (bug #438806, thanks to C.J.
+  Wijtmans). Update license. Add dependencies on cabextract and unzip. Drop
+  old.
 
 *winetricks-913 (14 Sep 2012)
 
diff --git a/app-emulation/winetricks/Manifest b/app-emulation/winetricks/Manifest
index 9d34e5beca85..1ccad9a073b7 100644
--- a/app-emulation/winetricks/Manifest
+++ b/app-emulation/winetricks/Manifest
@@ -1,23 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST winetricks-909 613770 SHA256 037151c3681d7fff55a5069f607804741c6e97da625d37ffba03e003c35af4d7 SHA512 9eab8cd07fc301cbee0f50418b1aedd698b0733efd667de4f88811651aba5b54afd02e8e65dabaf00f6f9eedd0f4e1150c8828554e889920b9f99c95fd1d33ed WHIRLPOOL 9d45a143850b4e422d1ecc317a068b2a3f272af4ae860daa2f8c0b5b4a7c53f4562c18ac274b17185604802ff6a4b65132f6c326e5140273d4c0b800336f9b83
-DIST winetricks-909.1 3469 SHA256 f522f4c991194cbed1044182ca6fbbb7645cd4b98d9557ab7d073ace1af4738d SHA512 2c832a9cc4286f641aeed7a5a47131773b48dd0cf123798f753ffb24799dabca29986b2b740698fbe9efb8034ac874a18147c6bd645bea8e69fdb42f1437fdf2 WHIRLPOOL 0ccb982022189b4d2e134756cadbca3628c33e57be6879b07e84f99182ed5a201379413a32af5d689744b4d7527f6abf56aae7113f34401c4cbe62b902462424
 DIST winetricks-913 613886 SHA256 b7b9a53ca507cec75efbd263c5dad1aaa80f8751469a62d9e68ed44e58050d3c SHA512 a97cd8e79b1491170336964e73aed079d2a8f6ea7238eace1ca270c0dd531727f1f887fe1207f68f753d30b0a9ae727f26f918d327f851f0fa221e545cb952e8 WHIRLPOOL cd5c47f11040da2ee7d1e255a6162b60c45fef6fc4dd42ba434f3833a1b3f5e29158635f19e664e3c71925cfdcbd38ff818826ff5f74a1e17d7aed2579ebceba
 DIST winetricks-913.1 3469 SHA256 f522f4c991194cbed1044182ca6fbbb7645cd4b98d9557ab7d073ace1af4738d SHA512 2c832a9cc4286f641aeed7a5a47131773b48dd0cf123798f753ffb24799dabca29986b2b740698fbe9efb8034ac874a18147c6bd645bea8e69fdb42f1437fdf2 WHIRLPOOL 0ccb982022189b4d2e134756cadbca3628c33e57be6879b07e84f99182ed5a201379413a32af5d689744b4d7527f6abf56aae7113f34401c4cbe62b902462424
-EBUILD winetricks-909.ebuild 1124 SHA256 bfb50c223cad1a080c6b5f74b0202d1905a65709b7e68a78b3a7b24db65e1bc5 SHA512 9fa0f359e14fe9d2d03d70f8a6b31a61a77da7148d91d6da8be588b313c41d8d95a4aced732a91d2d9e3c3d6585ad5426fef3e30b47bb163e804624b227c6da1 WHIRLPOOL b16f515979aec8f17f858533a35e6d4a701f137ff0169f122882b1150177269a2503856340c3fc09f9e0c6958dd2a6d65037dd8c1558d5f66a1a2a34990fbfcd
-EBUILD winetricks-913.ebuild 1124 SHA256 f3cbf15a6aa06a6da7811cc59be3074fda42d2e31ccafdbf9328db96454c0770 SHA512 47f5c53cdff589063cc8e0f2148dc4a060db088eb647f069b92efc8ada1a9f81f70c004fb21c15575e284ef56abd1c236412786f9579bb6e5f3d1399c89be834 WHIRLPOOL 83f260fe0746ee90eb1f96c2d5d1520378d352b8c84caba31ff2a6a7947adb9788c2cb84f4c752862fccd34c24174d9ccb19231975cbf064e1e04834758c1cbe
-EBUILD winetricks-99999999.ebuild 1129 SHA256 2da252104a86c15bc0b1b85f449971b97211c88fd438e33eb489f06d495c7a4b SHA512 203c8dd1c8fdedc6be3941dca695b20074a7d5196ada8aabab5ab02e7a7f171dde8d1d165ae81aa8f52313816a0543747f62e10fc72c51eff0ac7d76c60ae5a3 WHIRLPOOL 93a7d473face67172ae7cd14307b66de2af7121a39693e4af68faf0e7f111f45c695a4fa22fa692f33824f14d08cdaa752b80b1a8af3bb878d0ea9b4969262d9
-MISC ChangeLog 1763 SHA256 ec8a6c0f5dcc7f29212be0709ec028bfa22e01170b3691f9e279b693bb24c5fe SHA512 2b3bb44bda0046eef5cc11106393a1dc5fd70e922a847dd6de97d5cfb5e29c75ec14b4d053bb26e2c55053a79cdc90d9dce78612d21372c26242bd76995f40d9 WHIRLPOOL 23ab7d0b8c70a7ddd40a1fb74f4e1202cd3d24f4c9a8b675e646d49cc9fa629fef27e6e6072588316fe4108bc6e931992f71b1472b398ac046a76fda6acdd660
+DIST winetricks-916 614298 SHA256 fcd988a4f097bf604e6a17b0e1a8fc8969daeef0deede23135229fcfdfedc2c2 SHA512 53644e69363921fef70cef7351e73ddbb84f86ccafccb450a247dd5b03fd4edcbc4130deb3749548af5db650568e17eb1189ee3f3e9449b4f0d98b06e2ab2bcb WHIRLPOOL 5c5749ec9cd037780679894fd93b1ea5192bd8589e44ad7853d3e7237ca9b425473ceb60f4ebb72bcb8aa3d70a5c5d54ebc120ee4bc7dbd697df4a5ba1c4391b
+DIST winetricks-916.1 3469 SHA256 f522f4c991194cbed1044182ca6fbbb7645cd4b98d9557ab7d073ace1af4738d SHA512 2c832a9cc4286f641aeed7a5a47131773b48dd0cf123798f753ffb24799dabca29986b2b740698fbe9efb8034ac874a18147c6bd645bea8e69fdb42f1437fdf2 WHIRLPOOL 0ccb982022189b4d2e134756cadbca3628c33e57be6879b07e84f99182ed5a201379413a32af5d689744b4d7527f6abf56aae7113f34401c4cbe62b902462424
+DIST winetricks-gentoo-2012.10.19.tar.bz2 6421 SHA256 e9c61f6e2c2ecc6238f2ce415d219d4bc2cae486115fd8b99814b9c3422ad061 SHA512 40771160d2fb6be78e48c3e6f326bc61c96e462c5f646c2a2e00902a2059ce850738d0d447e65d2aeaa198ddec0069c06f39974b8a2b1959c14741cbd3dbc018 WHIRLPOOL 19052e69b56ef9f64962c47262942eff7f33a09ad761f9020760e1449edbec1c767a36cdec049afd7d7d07a329531dcc16770c79d71c51c91e5173d66cea0852
+EBUILD winetricks-913.ebuild 1162 SHA256 ce499724a7a7032a1bf240b6c952d884109748baa38057c080c4b5a61903bbd9 SHA512 a3ba2756e553c1cc5eb12cbb313528403aeb7e95e1c4b56bf3b26b7d3b124380df0d4d8b11f2f11d12c6985cba96ca3fe127b6c2a686d1859a39ba1f5db3889f WHIRLPOOL fb753423905e939bfd8485a43d66b6a6d425dc074a67d05d656cef3913586cceffe7210ebb10aff1566368ed40f5fd03c75e0ce38f66dc84f96afcbfae2ed567
+EBUILD winetricks-916.ebuild 1586 SHA256 148807aadf0d05a35e03bfbe6c45e06ecd33e7a9e5210861f2758562c4a91d5f SHA512 2ea8cae3cd784963fab8499e33fea894cb032be5210025b209457de5510e3a32f77b4341ebdc2d38d83aa51cfcee66f895f4ae8131b3b433a32c51b3b749067a WHIRLPOOL f094ea37038e91db1b535d3f91934ab96352b778d9dbf54b9f355182fd873e578aeb652814a75cea03e5290a4f9eaa1bbcffdd3ee07f453a01f21be1e9ab338c
+EBUILD winetricks-99999999.ebuild 1591 SHA256 a51ac095005bbc503e8327212b1d99a062f0d75f43c0c99aa79cde270c20e391 SHA512 64d6e29da0426682da0e830d69c69a5fb3dbb5fa4171e08587ac6fed4becdd824c681bc1becef2c7f87cf515aff61f66948e743eefb5eba5fd6c2ebdf71f4917 WHIRLPOOL 3fc58eeb27df4e36d01732b56ed2d22cae08f02d7ef857a478bfaef5411158bdf81cf8a08250da42ac520516cefe83944de407ebf99f8114e046dde4d83b8872
+MISC ChangeLog 2116 SHA256 f4661528d7f393e90e93dc84b80dae869a2d812f4191dd0f76a1789d2be7e691 SHA512 61e44758080901d904e1c526e146f05c7c937169cda5541e55f38a268efd49b25dfcebbba8bcac52354eaa894ae22857d7a4d5b24cbd693816bc16a41f309bab WHIRLPOOL fa797e7f729f73f11973203fbd3e0d003da7dc4a0f414f6f79a3c1bdf193fbbadf69baf3b046c14a84b728ab3f011c9d474f51688103333ea35eba8fd3ddec5f
 MISC metadata.xml 238 SHA256 89eb94f543aa923d1627ce6ad4b70039815f7d01d795beb58a8f9a1c7de97252 SHA512 17e2bfa0f3b04f33b520be8ce9892a8c11fe027178a1315b2b48d3268296d4f017890bcdcc2a25f1dbd6acad78ef47924679aa5c87d4c3c66f65bf1b03bbeafc WHIRLPOOL 8ebb3ae5a0560a7cbccd13183d6d5fcb3a7afcf2ddbca0c7d224d0951f5223a6ac53c9f7bb7cce5583e257cf4b6a94b0e710c98bec00a57f042c3568ee4274f9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQU5J+AAoJEJ0WA1zPCt1hpXkH/3MmTQCNm7J8PTDpZjONvT5z
-jYcxDAkhm69nHsR2YGsh6bJ1OGhpu41jUHosrMmhptJxsVnYFQZMW8rWDFQ23RHJ
-JIFqSNa8YGD3dSBmGx8j3HaZydzEo8s55srbLko9IqU2Ao6pszYaCSgNtTH0K015
-F8C/V76r+dhhYuKntQfk2vnTLJYaawkfKMTRTMjfiNRh6onADiruyBw9VlPYdmqR
-Hr4FojuKTffrSxxZARc7mtM13nfxmXtgjTYWdf+TXOSqUg6YiobzCHujG/bs3rsI
-nTIpSg510hbwSnLC1lT93VBPnBrCSc3ZaYRA0uBdXqgtp8sFjOm2yoqS16zoJBE=
-=fnl9
+iQEcBAEBCAAGBQJQgOoKAAoJEJ0WA1zPCt1h3I4IAIvFnaNtY20EwJ0z461oAdiQ
+Gn6AK1Z752hIgp8nXKbQfoim7eFUSGMb5pbPO642CZmoWCooYUQNy/ajOfKTPqKe
+xn11XOQ+TZtgU5WbOmlp9yX6BKABzlYORUf1QNmU3M2N0UTgW2Q8Dc/+D7l6A4oo
+PN90nwx8w4x72eHFL8zOQ8YFrw3CQvHTsYM+rJYuIaLpZFHqEsOa7snvz8r3SlXJ
++KDShoA+L4+xYUrMEuCZ0yli5wPpxCIuubXpWGtG5Nos7FLHU7PXpedpP2fW1pW3
+knpNS6V7fHNtLkVWWUFq/tB57tcOHRoEFI/EkjXXZeviFIlFhlmeuCh6VRqJy54=
+=Q6Ov
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/winetricks/winetricks-913.ebuild b/app-emulation/winetricks/winetricks-913.ebuild
index 00410a317dc8..0ac4f275abf1 100644
--- a/app-emulation/winetricks/winetricks-913.ebuild
+++ b/app-emulation/winetricks/winetricks-913.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/winetricks-913.ebuild,v 1.1 2012/09/14 20:24:24 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/winetricks-913.ebuild,v 1.2 2012/10/19 05:50:00 tetromino Exp $
 
 EAPI=4
 
@@ -16,12 +16,14 @@ fi
 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"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="gtk kde"
 
 DEPEND=""
-RDEPEND="app-emulation/wine
+RDEPEND="app-arch/cabextract
+	app-arch/unzip
+	app-emulation/wine
 	gtk? ( gnome-extra/zenity )
 	kde? ( kde-base/kdialog )"
 
diff --git a/app-emulation/winetricks/winetricks-909.ebuild b/app-emulation/winetricks/winetricks-916.ebuild
index b457d887d4d3..ed83cbf84b90 100644
--- a/app-emulation/winetricks/winetricks-909.ebuild
+++ b/app-emulation/winetricks/winetricks-916.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/winetricks-909.ebuild,v 1.1 2012/09/08 06:24:28 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/winetricks-916.ebuild,v 1.1 2012/10/19 05:50:00 tetromino Exp $
 
 EAPI=4
 
+inherit gnome2-utils eutils
+
 if [[ ${PV} == "99999999" ]] ; then
 	ESVN_REPO_URI="http://winetricks.googlecode.com/svn/trunk"
 	inherit subversion
@@ -12,16 +14,21 @@ else
 		http://winetricks.googlecode.com/svn-history/r${PV}/trunk/src/winetricks.1 -> ${P}.1"
 	KEYWORDS="~amd64 ~x86"
 fi
+wtg=winetricks-gentoo-2012.10.19
+SRC_URI="${SRC_URI}
+	http://dev.gentoo.org/~tetromino/distfiles/wine/${wtg}.tar.bz2"
 
 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"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="gtk kde"
 
 DEPEND=""
-RDEPEND="app-emulation/wine
+RDEPEND="app-arch/cabextract
+	app-arch/unzip
+	app-emulation/wine
 	gtk? ( gnome-extra/zenity )
 	kde? ( kde-base/kdialog )"
 
@@ -35,10 +42,27 @@ src_unpack() {
 		cp "${DISTDIR}"/${P} src/${PN} || die
 		cp "${DISTDIR}"/${P}.1 src/${PN}.1 || die
 	fi
+	unpack ${wtg}.tar.bz2
 }
 
 src_install() {
 	cd src
 	dobin ${PN}
 	doman ${PN}.1
+	cd ../${wtg} || die
+	domenu winetricks.desktop
+	insinto /usr/share/icons/hicolor/scalable/apps
+	doins wine-winetricks.svg
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
 }
diff --git a/app-emulation/winetricks/winetricks-99999999.ebuild b/app-emulation/winetricks/winetricks-99999999.ebuild
index 649557da66c7..7c9a6ef492db 100644
--- a/app-emulation/winetricks/winetricks-99999999.ebuild
+++ b/app-emulation/winetricks/winetricks-99999999.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2012 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.3 2012/08/12 21:06:16 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/winetricks-99999999.ebuild,v 1.4 2012/10/19 05:50:00 tetromino Exp $
 
 EAPI=4
 
+inherit gnome2-utils eutils
+
 if [[ ${PV} == "99999999" ]] ; then
 	ESVN_REPO_URI="http://winetricks.googlecode.com/svn/trunk"
 	inherit subversion
@@ -12,16 +14,21 @@ else
 		http://winetricks.googlecode.com/svn-history/r${PV}/trunk/src/winetricks.1 -> ${P}.1"
 	KEYWORDS="~amd64 ~x86"
 fi
+wtg=winetricks-gentoo-2012.10.19
+SRC_URI="${SRC_URI}
+	http://dev.gentoo.org/~tetromino/distfiles/wine/${wtg}.tar.bz2"
 
 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"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="gtk kde"
 
 DEPEND=""
-RDEPEND="app-emulation/wine
+RDEPEND="app-arch/cabextract
+	app-arch/unzip
+	app-emulation/wine
 	gtk? ( gnome-extra/zenity )
 	kde? ( kde-base/kdialog )"
 
@@ -35,10 +42,27 @@ src_unpack() {
 		cp "${DISTDIR}"/${P} src/${PN} || die
 		cp "${DISTDIR}"/${P}.1 src/${PN}.1 || die
 	fi
+	unpack ${wtg}.tar.bz2
 }
 
 src_install() {
 	cd src
 	dobin ${PN}
 	doman ${PN}.1
+	cd ../${wtg} || die
+	domenu winetricks.desktop
+	insinto /usr/share/icons/hicolor/scalable/apps
+	doins wine-winetricks.svg
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
 }