fix patch by removnig a bad hunk which wasn't necessary anyway. can be unmasked into ~ profiles again.

4 files changed, 11 insertions, 14 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 38ae1d268af7..93f3b10b2742 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.60 2003/04/13 06:52:35 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.61 2003/04/13 10:52:36 danarmak Exp $
+
+  13 Apr 2003; Dan Armak <danarmak@gentoo.org> files/qsocket-3.1.2.diff:
+  Fix the patch - make it apply by removing the hunk that refers to the cvs
+  header.
 
 *qt-3.1.2-r1 (13 Apr 2003)
 
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 00fda12c09ee..0fda74f68e0d 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,4 +1,4 @@
-MD5 01e12956b70eff00fd536341870543b5 qt-3.1.2-r1.ebuild 5417
+MD5 7cb13a30543692fc2c1365754f2a0d93 qt-3.1.2-r1.ebuild 5461
 MD5 75036b5b14c014e6334668f848b629ca qt-3.1.0-r2.ebuild 4420
 MD5 87b793a8fe61c16797f603b2efaad6b1 qt-3.1.1.ebuild 4292
 MD5 ac90185d38d2ee1298794902f1feb681 qt-3.1.1-r1.ebuild 4347
@@ -10,7 +10,7 @@ MD5 967214749164332a1f541ec94301c121 qt-3.1.0.ebuild 4155
 MD5 3460c684ba5ed6273d81f6c520e204b7 qt-3.1.0-r3.ebuild 4840
 MD5 975f7053e5e945e6e509206242c7cfab qt-3.1.2.ebuild 5375
 MD5 66b942151418494936c3b73e01e37d68 qt-3.1.1-r2.ebuild 4659
-MD5 f949a80fb355dcb78abaa2dff51fb106 ChangeLog 9908
+MD5 4eacd9bf3dddf4200b3eca445bf75ce5 ChangeLog 10069
 MD5 7d96c0cc105d4d61b811bf8ad9210b65 qt-3.0.5-r1.ebuild 3464
 MD5 2d5b68b38185a30a28ffb2b652258cb8 files/45qt3 83
 MD5 7a287bc7609ad2420f70af6d4c58302f files/50qt2 63
@@ -18,7 +18,7 @@ MD5 039be350d1dc4bbb9e271df7b236d495 files/digest-qt-3.0.5 143
 MD5 52e7df9b93f281c262716caac4cb7705 files/digest-qt-3.1.0 72
 MD5 cfa73af7c2f2661be4ea9f3c9347db84 files/digest-qt-3.1.1 72
 MD5 4dd12d698f2ad7d14bd1ecf699b76fd7 files/digest-qt-3.1.2 636
-MD5 c1db57c3d85cf46262360fbf0b0b6b53 files/qsocket-3.1.2.diff 3408
+MD5 001400cb2710d783deb4380ca6056bc2 files/qsocket-3.1.2.diff 3136
 MD5 c6950a8321f9ecb0be7e49c778dd8297 files/digest-qt-3.0.5-r1 147
 MD5 c8a8d41028d22397dcc86041f1856a79 files/digest-qt-3.0.5-r2 71
 MD5 52e7df9b93f281c262716caac4cb7705 files/digest-qt-3.1.0-r1 72
diff --git a/x11-libs/qt/files/qsocket-3.1.2.diff b/x11-libs/qt/files/qsocket-3.1.2.diff
index fc8713d16fc9..a255a637c85e 100644
--- a/x11-libs/qt/files/qsocket-3.1.2.diff
+++ b/x11-libs/qt/files/qsocket-3.1.2.diff
@@ -1,12 +1,5 @@
 --- src/network/qsocket.cpp.orig	2003-02-24 09:30:06.000000000 +0100
 +++ src/network/qsocket.cpp	2002-12-09 10:40:38.000000000 +0100
-@@ -1,5 +1,5 @@
- /****************************************************************************
--** $Id: qsocket-3.1.2.diff,v 1.1 2003/04/12 23:20:25 brain Exp $
-+** $Id: qsocket-3.1.2.diff,v 1.1 2003/04/12 23:20:25 brain Exp $
- **
- ** Implementation of QSocket class.
- **
 @@ -112,9 +112,7 @@
  public:
      QSocketPrivate();
diff --git a/x11-libs/qt/qt-3.1.2-r1.ebuild b/x11-libs/qt/qt-3.1.2-r1.ebuild
index 05df82c46ae2..304d9351a743 100644
--- a/x11-libs/qt/qt-3.1.2-r1.ebuild
+++ b/x11-libs/qt/qt-3.1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.1.2-r1.ebuild,v 1.2 2003/04/13 06:52:35 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.1.2-r1.ebuild,v 1.3 2003/04/13 10:52:36 danarmak Exp $
 
 inherit eutils
 
@@ -13,8 +13,8 @@ SLOT="3"
 LICENSE="QPL-1.0"
 
 # WARNING: do not give this ebuild keywords that >=kdelibs-3.1.1, >=kdebase-3.1.1-r1 don't have
-KEYWORDS="-x86 -ppc -sparc" # alpha removed temporarily as I wasn't sure about the special
-# alpha stuff in src_unpack
+KEYWORDS="~x86 ~ppc ~sparc" # alpha removed temporarily as I wasn't sure about the special
+			    # alpha stuff in src_unpack; alpha ppl please readd. --danarmak
 
 SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2"