From 4fb09abcb2bfd338c66f29d42eb47695097a420a Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Sat, 19 Jan 2013 22:31:02 +0000
Subject: Version bump, drop old. Silence QA messages about Wine category in
 .desktop file (bug #451552, thanks to Ilya Gordeev and Michael Palimaka).

(Portage version: 2.2.0_alpha154/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
---
 app-emulation/winetricks/ChangeLog                 | 10 ++-
 app-emulation/winetricks/winetricks-927.ebuild     | 79 ---------------------
 app-emulation/winetricks/winetricks-931.ebuild     |  5 +-
 app-emulation/winetricks/winetricks-935.ebuild     | 82 ++++++++++++++++++++++
 .../winetricks/winetricks-99999999.ebuild          |  7 +-
 5 files changed, 100 insertions(+), 83 deletions(-)
 delete mode 100644 app-emulation/winetricks/winetricks-927.ebuild
 create mode 100644 app-emulation/winetricks/winetricks-935.ebuild

(limited to 'app-emulation/winetricks')

diff --git a/app-emulation/winetricks/ChangeLog b/app-emulation/winetricks/ChangeLog
index 7e807d435ef6..8233109e22de 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.14 2013/01/06 02:58:24 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/ChangeLog,v 1.15 2013/01/19 22:31:02 tetromino Exp $
+
+*winetricks-935 (19 Jan 2013)
+
+  19 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -winetricks-927.ebuild, winetricks-931.ebuild, +winetricks-935.ebuild,
+  winetricks-99999999.ebuild:
+  Version bump, drop old. Silence QA messages about Wine category in .desktop
+  file (bug #451552, thanks to Ilya Gordeev and Michael Palimaka).
 
 *winetricks-931 (06 Jan 2013)
 
diff --git a/app-emulation/winetricks/winetricks-927.ebuild b/app-emulation/winetricks/winetricks-927.ebuild
deleted file mode 100644
index b29b7e83963d..000000000000
--- a/app-emulation/winetricks/winetricks-927.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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-927.ebuild,v 1.1 2012/12/08 05:11:12 tetromino Exp $
-
-EAPI=4
-
-inherit gnome2-utils eutils
-
-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"
-	KEYWORDS="~amd64 ~x86"
-fi
-wtg=winetricks-gentoo-2012.11.24
-SRC_URI="${SRC_URI}
-	gtk? ( http://dev.gentoo.org/~tetromino/distfiles/wine/${wtg}.tar.bz2 )
-	kde? ( 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+"
-SLOT="0"
-IUSE="gtk kde"
-
-DEPEND=""
-RDEPEND="app-arch/cabextract
-	app-arch/unzip
-	app-emulation/wine
-	gtk? ( gnome-extra/zenity )
-	kde? ( kde-base/kdialog )"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	if [[ ${PV} == "99999999" ]] ; then
-		subversion_src_unpack
-	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
-	fi
-}
-
-src_install() {
-	cd src
-	dobin ${PN}
-	doman ${PN}.1
-	if use gtk || use kde; then
-		cd ../${wtg} || die
-		domenu winetricks.desktop
-		insinto /usr/share/icons/hicolor/scalable/apps
-		doins wine-winetricks.svg
-	fi
-}
-
-pkg_preinst() {
-	if use gtk || use kde; then
-		gnome2_icon_savelist
-	fi
-}
-
-pkg_postinst() {
-	if use gtk || use kde; then
-		gnome2_icon_cache_update
-	fi
-}
-
-pkg_postrm() {
-	if use gtk || use kde; then
-		gnome2_icon_cache_update
-	fi
-}
diff --git a/app-emulation/winetricks/winetricks-931.ebuild b/app-emulation/winetricks/winetricks-931.ebuild
index 360460c77465..18b4e9fdd59f 100644
--- a/app-emulation/winetricks/winetricks-931.ebuild
+++ b/app-emulation/winetricks/winetricks-931.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-931.ebuild,v 1.1 2013/01/06 02:58:24 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/winetricks-931.ebuild,v 1.2 2013/01/19 22:31:02 tetromino Exp $
 
 EAPI=4
 
@@ -33,6 +33,9 @@ RDEPEND="app-arch/cabextract
 	gtk? ( gnome-extra/zenity )
 	kde? ( kde-base/kdialog )"
 
+# Uses non-standard "Wine" category, which is provided by app-emulation/wine; #451552
+QA_DESKTOP_FILE="usr/share/applications/winetricks.desktop"
+
 S="${WORKDIR}"
 
 src_unpack() {
diff --git a/app-emulation/winetricks/winetricks-935.ebuild b/app-emulation/winetricks/winetricks-935.ebuild
new file mode 100644
index 000000000000..db6737e7fe8b
--- /dev/null
+++ b/app-emulation/winetricks/winetricks-935.ebuild
@@ -0,0 +1,82 @@
+# 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-935.ebuild,v 1.1 2013/01/19 22:31:02 tetromino Exp $
+
+EAPI=4
+
+inherit gnome2-utils eutils
+
+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"
+	KEYWORDS="~amd64 ~x86"
+fi
+wtg=winetricks-gentoo-2012.11.24
+SRC_URI="${SRC_URI}
+	gtk? ( http://dev.gentoo.org/~tetromino/distfiles/wine/${wtg}.tar.bz2 )
+	kde? ( 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+"
+SLOT="0"
+IUSE="gtk kde"
+
+DEPEND=""
+RDEPEND="app-arch/cabextract
+	app-arch/unzip
+	app-emulation/wine
+	gtk? ( gnome-extra/zenity )
+	kde? ( kde-base/kdialog )"
+
+# Uses non-standard "Wine" category, which is provided by app-emulation/wine; #451552
+QA_DESKTOP_FILE="usr/share/applications/winetricks.desktop"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	if [[ ${PV} == "99999999" ]] ; then
+		subversion_src_unpack
+	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
+	fi
+}
+
+src_install() {
+	cd src
+	dobin ${PN}
+	doman ${PN}.1
+	if use gtk || use kde; then
+		cd ../${wtg} || die
+		domenu winetricks.desktop
+		insinto /usr/share/icons/hicolor/scalable/apps
+		doins wine-winetricks.svg
+	fi
+}
+
+pkg_preinst() {
+	if use gtk || use kde; then
+		gnome2_icon_savelist
+	fi
+}
+
+pkg_postinst() {
+	if use gtk || use kde; then
+		gnome2_icon_cache_update
+	fi
+}
+
+pkg_postrm() {
+	if use gtk || use kde; then
+		gnome2_icon_cache_update
+	fi
+}
diff --git a/app-emulation/winetricks/winetricks-99999999.ebuild b/app-emulation/winetricks/winetricks-99999999.ebuild
index ece559fc7af6..cc6ba5cb2fbc 100644
--- a/app-emulation/winetricks/winetricks-99999999.ebuild
+++ b/app-emulation/winetricks/winetricks-99999999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.6 2012/11/24 23:08:31 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/winetricks-99999999.ebuild,v 1.7 2013/01/19 22:31:02 tetromino Exp $
 
 EAPI=4
 
@@ -33,6 +33,9 @@ RDEPEND="app-arch/cabextract
 	gtk? ( gnome-extra/zenity )
 	kde? ( kde-base/kdialog )"
 
+# Uses non-standard "Wine" category, which is provided by app-emulation/wine; #451552
+QA_DESKTOP_FILE="usr/share/applications/winetricks.desktop"
+
 S="${WORKDIR}"
 
 src_unpack() {
-- 
cgit v1.2.3-65-gdbad