make r2 use the new patch from r3

3 files changed, 32 insertions, 27 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index cadbc315dccf..7db880a0c0e2 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,10 +1,15 @@
 # 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.63 2003/04/17 12:25:13 brain Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.64 2003/04/17 12:30:38 danarmak Exp $
+
+  17 Apr 2003; Dan Armak <danarmak@gentoo.org> qt-3.1.2-r2.ebuild:
+  
+  Use the new qsocket patch from r3.
 
 *qt-3.1.2-r3 (17 Apr 2003)
   
-  17 Apr 2003; Michele Balistreri <brain@gentoo.org> qt-3.1.2-r3.ebuild
+  17 Apr 2003; Michele Balistreri <brain@gentoo.org> qt-3.1.2-r3.ebuild,
+  files/qt-3.1.2-r3-qsocket.diff:
   Cleaned the patch, now just the hunk which solve the issue is present,
   Some of the hunks removed reintroduced already fixed bugs. Therefore 
   this is a new revision
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 2ec82c47cb1d..ed2158a905d2 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,41 +1,41 @@
-MD5 e6d390607cbe6157cf83b2b301d1c8da ChangeLog 10613
+MD5 064ae2bf9e05b472f1805f0293d81c78 qt-3.1.2-r1.ebuild 5458
+MD5 75036b5b14c014e6334668f848b629ca qt-3.1.0-r2.ebuild 4420
+MD5 5394729938998a11a6f991d73e084b4e qt-3.1.2-r3.ebuild 5456
+MD5 87b793a8fe61c16797f603b2efaad6b1 qt-3.1.1.ebuild 4292
+MD5 ac90185d38d2ee1298794902f1feb681 qt-3.1.1-r1.ebuild 4347
 MD5 a8ec069d250a965a7c5708a2277eba72 qt-2.3.2-r1.ebuild 2289
-MD5 7d96c0cc105d4d61b811bf8ad9210b65 qt-3.0.5-r1.ebuild 3464
-MD5 7574a34ccd181870ea18bf3145310e37 qt-3.0.5-r2.ebuild 3975
 MD5 3cb12694a0de9edc2f6cd1f029150dc1 qt-3.0.5.ebuild 3547
 MD5 314c70433868712299daaf43019bbfbc qt-3.1.0-r1.ebuild 4385
-MD5 75036b5b14c014e6334668f848b629ca qt-3.1.0-r2.ebuild 4420
-MD5 3460c684ba5ed6273d81f6c520e204b7 qt-3.1.0-r3.ebuild 4840
+MD5 7574a34ccd181870ea18bf3145310e37 qt-3.0.5-r2.ebuild 3975
+MD5 27ef269326513dd886f223b8a40b5cf1 qt-3.1.2-r2.ebuild 5739
 MD5 967214749164332a1f541ec94301c121 qt-3.1.0.ebuild 4155
-MD5 ac90185d38d2ee1298794902f1feb681 qt-3.1.1-r1.ebuild 4347
-MD5 66b942151418494936c3b73e01e37d68 qt-3.1.1-r2.ebuild 4659
-MD5 87b793a8fe61c16797f603b2efaad6b1 qt-3.1.1.ebuild 4292
-MD5 064ae2bf9e05b472f1805f0293d81c78 qt-3.1.2-r1.ebuild 5458
+MD5 3460c684ba5ed6273d81f6c520e204b7 qt-3.1.0-r3.ebuild 4840
 MD5 975f7053e5e945e6e509206242c7cfab qt-3.1.2.ebuild 5375
-MD5 19d6f70e784f82a66517bd7feb9e35f7 qt-3.1.2-r2.ebuild 5733
-MD5 f68be24d5740ee8a764d0fe02de70ecf qt-3.1.2-r3.ebuild 5457
-MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16
+MD5 66b942151418494936c3b73e01e37d68 qt-3.1.1-r2.ebuild 4659
+MD5 e46f928e43e80dfcb91b9cf78c26d6e1 ChangeLog 10756
+MD5 7d96c0cc105d4d61b811bf8ad9210b65 qt-3.0.5-r1.ebuild 3464
 MD5 2d5b68b38185a30a28ffb2b652258cb8 files/45qt3 83
-MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
 MD5 7a287bc7609ad2420f70af6d4c58302f files/50qt2 63
-MD5 1da4214f7cf90d34592e0453f47b4758 files/designer.diff 380
-MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r1 65
 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 c6dc1b6fadcb4897d4c7b0a768c2d196 files/qt-3.1.2-r3-qsocket.diff 447
+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 72
 MD5 52e7df9b93f281c262716caac4cb7705 files/digest-qt-3.1.0-r1 72
 MD5 52e7df9b93f281c262716caac4cb7705 files/digest-qt-3.1.0-r2 72
 MD5 52e7df9b93f281c262716caac4cb7705 files/digest-qt-3.1.0-r3 72
-MD5 cfa73af7c2f2661be4ea9f3c9347db84 files/digest-qt-3.1.1 72
 MD5 cfa73af7c2f2661be4ea9f3c9347db84 files/digest-qt-3.1.1-r1 72
 MD5 cfa73af7c2f2661be4ea9f3c9347db84 files/digest-qt-3.1.1-r2 72
-MD5 4dd12d698f2ad7d14bd1ecf699b76fd7 files/digest-qt-3.1.2 636
-MD5 39f840d6723a7e898394bc84efb224a2 files/qt-3.1.0-minimized.diff 272
-MD5 e9b2e2fbde862abb62cdfa78e62a35b6 files/qt-3.1.2-qmlined.diff 320
-MD5 e4b92fbf81b7fc94c5d337e1675476d7 files/qt-x11-free-3.0.5-ko_input.patch 12682
-MD5 001400cb2710d783deb4380ca6056bc2 files/qsocket-3.1.2.diff 3136
 MD5 f197d87f2b33685cadba08c9cf2d08ee files/digest-qt-3.1.2-r1 72
 MD5 f197d87f2b33685cadba08c9cf2d08ee files/digest-qt-3.1.2-r2 72
-MD5 c6dc1b6fadcb4897d4c7b0a768c2d196 files/qt-3.1.2-r3-qsocket.diff 447
 MD5 f197d87f2b33685cadba08c9cf2d08ee files/digest-qt-3.1.2-r3 72
+MD5 1da4214f7cf90d34592e0453f47b4758 files/designer.diff 380
+MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
+MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16
+MD5 e9b2e2fbde862abb62cdfa78e62a35b6 files/qt-3.1.2-qmlined.diff 320
+MD5 e4b92fbf81b7fc94c5d337e1675476d7 files/qt-x11-free-3.0.5-ko_input.patch 12682
+MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r1 65
+MD5 39f840d6723a7e898394bc84efb224a2 files/qt-3.1.0-minimized.diff 272
diff --git a/x11-libs/qt/qt-3.1.2-r2.ebuild b/x11-libs/qt/qt-3.1.2-r2.ebuild
index be48ddfab35f..65ffae3fd8b5 100644
--- a/x11-libs/qt/qt-3.1.2-r2.ebuild
+++ b/x11-libs/qt/qt-3.1.2-r2.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-r2.ebuild,v 1.1 2003/04/15 10:51:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.1.2-r2.ebuild,v 1.2 2003/04/17 12:30:38 danarmak Exp $
 
 inherit eutils
 
@@ -57,7 +57,7 @@ src_unpack() {
 	
 	epatch ${FILESDIR}/designer.diff
 	epatch ${FILESDIR}/${P}-qmlined.diff
-	epatch ${FILESDIR}/qsocket-3.1.2.diff
+	epatch ${FILESDIR}/qt-3.1.2-r3-qsocket.diff
 	
 	cp configure configure.orig
 	sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure