QA: drop useflag and epatch that does not apply at all (upstream obviously included it in git so it is in next release anyway).

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

4 files changed, 17 insertions, 14 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 5c58dfe2d26a..072397bc3ca2 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.359 2011/04/30 06:26:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.360 2011/05/01 15:00:23 scarabeus Exp $
+
+  01 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> wine-1.3.18.ebuild,
+  wine-9999.ebuild:
+  QA: drop useflag and epatch that does not apply at all (upstream obviously
+  included it in git so it is in next release anyway).
 
   30 Apr 2011; Mike Frysinger <vapier@gentoo.org> wine-1.2.ebuild,
   wine-1.2.1.ebuild, wine-1.2.2.ebuild, wine-1.2.3.ebuild, wine-1.3.0.ebuild,
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 987ca6ff0790..fb749e1b1723 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX wine-1.1.15-configure-host.patch 314 RMD160 1c8d09d5265a23b1931eba949a614eaeff251ac7 SHA1 af887b963cf154e8bcf1e9b8b19731bbdda5f487 SHA256 c281217f6e221a6235485918750907b02aa1e40fa68e45133cc4c14ebb40bfe9
 AUX wine-1.1.15-winegcc.patch 1556 RMD160 ca7e0df0a45507e7d31ed81c5712111b83ed9bfa SHA1 4b155fe7cb5e831b7f92757d52aa1ab12569b232 SHA256 dbd89db561d7583faf317d795b8c11231575d885e21c6414add39079604dbd0d
@@ -56,7 +56,7 @@ EBUILD wine-1.3.14.ebuild 6014 RMD160 550b03f39535f3892698e12d9398a5e109dbc751 S
 EBUILD wine-1.3.15.ebuild 6014 RMD160 1f2b1abaa6a82a7f45210baee76fa0c4e4f7d669 SHA1 048d2dd3dcd388fc77e8bab36a3b852a062ffa8f SHA256 850fe22c7374692798f9c9bedece02b9b178130cf306e99895d05b2f9de128af
 EBUILD wine-1.3.16.ebuild 6014 RMD160 55a0b71a9d67ca4e439ee469f2f0e1df35d144f7 SHA1 44cc92bcec91ac5937af32efd405390a232c6d5a SHA256 b72153fdb5b0bd2d702870177496bc8cd6fbde7f9fe39c3803944e9e100b4169
 EBUILD wine-1.3.17.ebuild 6014 RMD160 21220445f51f47c583cf9675c2b5028f2a5d5cb9 SHA1 1b253a941f4f45dea44ca20d93557f45de4b3aec SHA256 4d8b6c59e479ab896af8e9f4216cac68ef2914285ca25f24446d22e7e762c351
-EBUILD wine-1.3.18.ebuild 6014 RMD160 6cbeec393023f63fb0ca791be1df4fc420b52ae0 SHA1 1a572aacb7dd4648a251c67c10abef1da6695d92 SHA256 05231dd140cf72d3837b5ddbfb118ca3e191eeb47fc5954138206ec729e7aaba
+EBUILD wine-1.3.18.ebuild 5938 RMD160 af41e0cef6a7ea75c8a83c5d1ad41b9791b65d01 SHA1 fbb52b0ce40f51c0a3d2df0b90e68bcfdf86b1fe SHA256 e62ce6fa2bc67d64f281a4fe522db8c455d31ffa243cca28570eb431e0726b76
 EBUILD wine-1.3.2.ebuild 5768 RMD160 973bd9ad577964bbc9da7ed909a66068c326a02f SHA1 4400d39a63f95bca9245d7d78bdf2896f2a9c2bc SHA256 5e16c3fef8bc7d80db1b27782fb50bf421f3dd9c6473f40755bed121745ad1ce
 EBUILD wine-1.3.3.ebuild 5767 RMD160 90c344c1c1b1dcbae1dda9ece96749f5d50ca716 SHA1 c454b8d67646b71a8eb8b98aa7352827a17dc3e9 SHA256 223e4e7dca05e8b0ab6b92c27e80e3742e2f49d5a476d4916c85ee0535779cf7
 EBUILD wine-1.3.4.ebuild 5767 RMD160 1588b859fb375590944be5a2ffad278ca2cecd87 SHA1 45c03347d2fb2af1b7a8b3da24aabcbf3b576b5d SHA256 5edc212373ece364d843431f16672f4d538b0aa48b35afc290e598dea3109a57
@@ -65,13 +65,13 @@ EBUILD wine-1.3.6.ebuild 5868 RMD160 715189105e7a20edda409c260b0686c10f488ba8 SH
 EBUILD wine-1.3.7.ebuild 5868 RMD160 66c1339f479e9fec7c2e4a21863f0b057389d9d3 SHA1 85e1b77a7ebdf0782d756db760d77710c26b56ce SHA256 95ba8a95614b3d3f5ee1db9de6e07b758465ad3a9ca15cc0df6a1bcd6287fec0
 EBUILD wine-1.3.8.ebuild 5868 RMD160 d09c25bf01d964476b2f98cc54ef725e32300bb9 SHA1 4402fa9f5717b41c82282cb40b5a544f6480dc8c SHA256 68236afc593f12d8398f75e1dd46409b379159e9058e039850855e3062605a72
 EBUILD wine-1.3.9.ebuild 5868 RMD160 d5057cbec1b35507067b815fce9dc7485d56366b SHA1 eec3167766af13e5a95767189ed618dc3a892b8d SHA256 9b127ca62c8cd22d42306b7621313e815d4dfd0f3fde33207a09e72778d41720
-EBUILD wine-9999.ebuild 6013 RMD160 a29f646943cebfaa941024d7238933109256d076 SHA1 7ca0d3ef10a1f849a2cc0e8a78f8d0a96e46308e SHA256 73dc77ab70079b218f9a395acee735add061d8214f2a4a9c99c7f97ceee5b44c
-MISC ChangeLog 69545 RMD160 be165b3eaf8025b5c4edaa81b09c221dd635f94d SHA1 b47b3284b822c74920cb2646bf294aa63bd79986 SHA256 a0d20c7fad368ae6d65d98dd20d26fcb6fc769280427e77844dc0723dbd31ae0
+EBUILD wine-9999.ebuild 5937 RMD160 bb95e9d8df34497cdd03e9fab42449b760964c4f SHA1 94ab0a86a1060df5a68d494ae138826c71b4bb61 SHA256 82791a1b4ea2e38342d4d038391c8d312889cc29235c2464a81f5c347e326cd7
+MISC ChangeLog 69776 RMD160 608a2483e7c0033b6e5a9a5241bddb3ad866aa12 SHA1 a4aa87307af599b3b59b088347695dda2cdcabff SHA256 5f2af5ff1d565d96554f146a3dec12187b0ddb1f1c71839cd563a67370dda78d
 MISC metadata.xml 1631 RMD160 cd71f09aba508f443a0cb7ee51e64771a7631cf5 SHA1 e959f456fa558bd8301388b5d405e2d703143877 SHA256 a626ea25bf251a0963d821d7e7a706e4dc3599d9821d4c15d91a7a71aed34586
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF0EAREIAAYFAk27q2MACgkQaC/OocHi7Jb5ngD3b9aByQf3asdatf/lMwNj2Uob
-b9bfZJ+cY2ekcL3NFgD/TuuX6qgkTMorxI1/M61SWyAc3G0f2dCedwVoNLTVfTs=
-=PeTp
+iEYEARECAAYFAk29dVUACgkQHB6c3gNBRYfstACgsvjNfB3kA96lw07xMnbwCJs2
+RskAnRs0X5VcSdSs6yEcbwZ92N0HNITu
+=OzLq
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.3.18.ebuild b/app-emulation/wine/wine-1.3.18.ebuild
index 9ee414b93ab8..3cd09023cfc7 100644
--- a/app-emulation/wine/wine-1.3.18.ebuild
+++ b/app-emulation/wine/wine-1.3.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.18.ebuild,v 1.2 2011/04/30 06:26:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.18.ebuild,v 1.3 2011/05/01 15:00:23 scarabeus Exp $
 
 EAPI="2"
 
@@ -33,7 +33,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm gstreamer hal jack jpeg lcms ldap mousewarp mp3 nas ncurses nls openal +opengl +oss +perl png pulseaudio samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm gstreamer hal jack jpeg lcms ldap mp3 nas ncurses nls openal +opengl +oss +perl png pulseaudio samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
 RESTRICT="test" #72375
 
 MLIB_DEPS="amd64? (
@@ -114,7 +114,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	use mousewarp && epatch "${FILESDIR}"/${PN}-1.3.16-mouse-warp.patch
 	if use pulseaudio ; then
 		EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"`
 		eautoreconf
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 5b79b3a7e48c..5382428fdf6d 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.76 2011/04/30 06:26:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.77 2011/05/01 15:00:23 scarabeus Exp $
 
 EAPI="2"
 
@@ -33,7 +33,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm gstreamer hal jack jpeg lcms ldap mousewarp mp3 nas ncurses nls openal +opengl +oss +perl png pulseaudio samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm gstreamer hal jack jpeg lcms ldap mp3 nas ncurses nls openal +opengl +oss +perl png pulseaudio samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
 RESTRICT="test" #72375
 
 MLIB_DEPS="amd64? (
@@ -114,7 +114,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	use mousewarp && epatch "${FILESDIR}"/${PN}-1.3.16-mouse-warp.patch
 	if use pulseaudio ; then
 		EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"`
 		eautoreconf