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

(Portage version: 2.2.0_alpha137/cvs/Linux x86_64)

4 files changed, 69 insertions, 10 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/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
 }