Closing #23098

14 files changed, 29 insertions, 20 deletions

diff --git a/net-im/sim/ChangeLog b/net-im/sim/ChangeLog
index 260fdf808616..0bc2d98eda31 100644
--- a/net-im/sim/ChangeLog
+++ b/net-im/sim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/sim
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/sim/ChangeLog,v 1.10 2003/06/17 09:39:08 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/ChangeLog,v 1.11 2003/06/30 11:07:37 aliz Exp $
+
+*sim-0.8.2-r2 (30 Jun 2003)
+
+  30 Jun 2003; Daniel Ahlberg <aliz@gentoo.org> sim-0.8.2-r2.ebuild :
+  Removed sim-patches from SRC_URI since it's changing and causes digest mismatchs. Instead I've
+  put all patches in files/. Closing #23098.
 
 *sim-0.8.2-r1 (17 Jun 2003)
 
diff --git a/net-im/sim/Manifest b/net-im/sim/Manifest
index c2f57b07d1a8..16665f9aa8b4 100644
--- a/net-im/sim/Manifest
+++ b/net-im/sim/Manifest
@@ -1,16 +1,27 @@
+MD5 1fff7236f32bf9a1b9bd73700f87b3c9 ChangeLog 1817
+MD5 74241b37cf657161fef9bcc5082ba561 sim-0.6.ebuild 706
+MD5 53217e45091b828cdef52bdcd4c1a82a sim-0.7.ebuild 989
+MD5 2137c77593a8928734d0e2f3ce92d8ba sim-0.8.1.ebuild 1127
+MD5 96fd57c86859b7b6f053350397994251 sim-0.8.ebuild 1168
+MD5 d4f0ce46a29dc251438b46f48cd62114 sim-0.8.2.ebuild 1254
+MD5 745db06dc5dc751507af0be7aaa5ce2f sim-0.8.2-r2.ebuild 1358
+MD5 70f338fa515789e891aee9725c524201 files/digest-sim-0.8.2 62
 MD5 b48c0b16be6c9e590da0440cc946e90d files/digest-sim-0.6 60
 MD5 224e22f4b01fda60c071163ea009d91d files/digest-sim-0.7 60
 MD5 5119360311ee2e0d4deb5980ee5d7cda files/digest-sim-0.8 60
 MD5 e39c7c8c9d2fe41315e3aeb07d586631 files/digest-sim-0.8.1 62
 MD5 aa747a199a1399a0948ece6df1836e44 files/sim-0.8-nostl.diff 1311
 MD5 0f0af3c4d6d9ba7bba0e22fa6a5278b9 files/sim-0.8.1-nostl.diff 863
-MD5 70f338fa515789e891aee9725c524201 files/digest-sim-0.8.2 62
 MD5 0f0af3c4d6d9ba7bba0e22fa6a5278b9 files/sim-0.8.2-nostl.diff 863
 MD5 dfa0b89b8e450d16fb631e4f99a385fd files/digest-sim-0.8.2-r1 123
-MD5 74241b37cf657161fef9bcc5082ba561 sim-0.6.ebuild 706
-MD5 53217e45091b828cdef52bdcd4c1a82a sim-0.7.ebuild 989
-MD5 2137c77593a8928734d0e2f3ce92d8ba sim-0.8.1.ebuild 1127
-MD5 96fd57c86859b7b6f053350397994251 sim-0.8.ebuild 1168
-MD5 1fff7236f32bf9a1b9bd73700f87b3c9 ChangeLog 1817
-MD5 d4f0ce46a29dc251438b46f48cd62114 sim-0.8.2.ebuild 1254
-MD5 42f095e600bfdb4cf7071c6b4ffc9a5e sim-0.8.2-r1.ebuild 1476
+MD5 70f338fa515789e891aee9725c524201 files/digest-sim-0.8.2-r2 62
+MD5 da8c0f34a2c7586803652577ac261c13 files/0.8.2-patches/04_all_sound-on-away-NA.patch.bz2 345
+MD5 aae51140277191824b16071fb8dbf017 files/0.8.2-patches/06_all_win-icon-click.patch.bz2 421
+MD5 9e8c9ffa22e05b97c83165e772ebd162 files/0.8.2-patches/07_all_yy-buffer-state.patch.bz2 643
+MD5 649b0ae5cd7d3a20bdbd28fe9c88e6de files/0.8.2-patches/08_all_french.patch.bz2 542
+MD5 f152e6bc91ae7b0bfa82d775ab6bc25a files/0.8.2-patches/10_all_qt31x.patch.bz2 310
+MD5 1b20b2acc5b59c939447d10df84a12d9 files/0.8.2-patches/02_all_login-dlg.patch.bz2 588
+MD5 e301309991e320839eec48d2b7817000 files/0.8.2-patches/05_all_undread-messages.patch.bz2 617
+MD5 bc442c0532d819cd9bc9a8e7f727dbfa files/0.8.2-patches/09_all_typos.patch.bz2 706
+MD5 5ce4135f4fcea0c9c21ba7c24a713c52 files/0.8.2-patches/01_all_focus-on-sent.patch.bz2 330
+MD5 ef8efa3cadbc09aec7a15207f8917234 files/0.8.2-patches/03_all_send-to-ICQ-away.patch.bz2 463
diff --git a/net-im/sim/files/0.8.2-patches/01_all_focus-on-sent.patch.bz2 b/net-im/sim/files/0.8.2-patches/01_all_focus-on-sent.patch.bz2
new file mode 100644
index 000000000000..65b4092069df
--- /dev/null
+++ b/net-im/sim/files/0.8.2-patches/01_all_focus-on-sent.patch.bz2
diff --git a/net-im/sim/files/0.8.2-patches/02_all_login-dlg.patch.bz2 b/net-im/sim/files/0.8.2-patches/02_all_login-dlg.patch.bz2
new file mode 100644
index 000000000000..c400d3b8873c
--- /dev/null
+++ b/net-im/sim/files/0.8.2-patches/02_all_login-dlg.patch.bz2
diff --git a/net-im/sim/files/0.8.2-patches/03_all_send-to-ICQ-away.patch.bz2 b/net-im/sim/files/0.8.2-patches/03_all_send-to-ICQ-away.patch.bz2
new file mode 100644
index 000000000000..c0e2c484f954
--- /dev/null
+++ b/net-im/sim/files/0.8.2-patches/03_all_send-to-ICQ-away.patch.bz2
diff --git a/net-im/sim/files/0.8.2-patches/04_all_sound-on-away-NA.patch.bz2 b/net-im/sim/files/0.8.2-patches/04_all_sound-on-away-NA.patch.bz2
new file mode 100644
index 000000000000..a82f97d05c0c
--- /dev/null
+++ b/net-im/sim/files/0.8.2-patches/04_all_sound-on-away-NA.patch.bz2
diff --git a/net-im/sim/files/0.8.2-patches/05_all_undread-messages.patch.bz2 b/net-im/sim/files/0.8.2-patches/05_all_undread-messages.patch.bz2
new file mode 100644
index 000000000000..f995130f9436
--- /dev/null
+++ b/net-im/sim/files/0.8.2-patches/05_all_undread-messages.patch.bz2
diff --git a/net-im/sim/files/0.8.2-patches/06_all_win-icon-click.patch.bz2 b/net-im/sim/files/0.8.2-patches/06_all_win-icon-click.patch.bz2
new file mode 100644
index 000000000000..d572b3161751
--- /dev/null
+++ b/net-im/sim/files/0.8.2-patches/06_all_win-icon-click.patch.bz2
diff --git a/net-im/sim/files/0.8.2-patches/07_all_yy-buffer-state.patch.bz2 b/net-im/sim/files/0.8.2-patches/07_all_yy-buffer-state.patch.bz2
new file mode 100644
index 000000000000..885c83789671
--- /dev/null
+++ b/net-im/sim/files/0.8.2-patches/07_all_yy-buffer-state.patch.bz2
diff --git a/net-im/sim/files/0.8.2-patches/08_all_french.patch.bz2 b/net-im/sim/files/0.8.2-patches/08_all_french.patch.bz2
new file mode 100644
index 000000000000..355b19dc0d19
--- /dev/null
+++ b/net-im/sim/files/0.8.2-patches/08_all_french.patch.bz2
diff --git a/net-im/sim/files/0.8.2-patches/09_all_typos.patch.bz2 b/net-im/sim/files/0.8.2-patches/09_all_typos.patch.bz2
new file mode 100644
index 000000000000..7b097f27a0a0
--- /dev/null
+++ b/net-im/sim/files/0.8.2-patches/09_all_typos.patch.bz2
diff --git a/net-im/sim/files/0.8.2-patches/10_all_qt31x.patch.bz2 b/net-im/sim/files/0.8.2-patches/10_all_qt31x.patch.bz2
new file mode 100644
index 000000000000..4345670820f4
--- /dev/null
+++ b/net-im/sim/files/0.8.2-patches/10_all_qt31x.patch.bz2
diff --git a/net-im/sim/files/digest-sim-0.8.2-r1 b/net-im/sim/files/digest-sim-0.8.2-r2
index dcdcd4174582..ffad95f829cc 100644
--- a/net-im/sim/files/digest-sim-0.8.2-r1
+++ b/net-im/sim/files/digest-sim-0.8.2-r2
@@ -1,2 +1 @@
 MD5 c04ecb5569746df71dd330d71eed89f0 sim-0.8.2.tar.gz 1759017
-MD5 c50af3c1253eeb5e3126a1b6d7679675 sim-patches.tar.gz 2984
diff --git a/net-im/sim/sim-0.8.2-r1.ebuild b/net-im/sim/sim-0.8.2-r2.ebuild
index f7817683350f..df96d4bd2824 100644
--- a/net-im/sim/sim-0.8.2-r1.ebuild
+++ b/net-im/sim/sim-0.8.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/net-im/sim/sim-0.8.2-r1.ebuild,v 1.1 2003/06/17 09:39:08 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.8.2-r2.ebuild,v 1.1 2003/06/30 11:07:37 aliz Exp $
 
 IUSE="ssl kde"
 [ -n "`use kde`" ] && inherit kde-base eutils
@@ -8,8 +8,7 @@ IUSE="ssl kde"
 
 LICENSE="GPL-2"
 DESCRIPTION="An ICQ v8 Client. Supports File Transfer, Chat, Server-Side Contactlist, ..."
-SRC_URI="mirror://sourceforge/sim-icq/${P}.tar.gz
-	http://debian.thermoman.de/misc/sim-patches.tar.gz"
+SRC_URI="mirror://sourceforge/sim-icq/${P}.tar.gz"
 HOMEPAGE="http://sim-icq.sourceforge.net"
 KEYWORDS="~x86 ~ppc"
 SLOT="0"
@@ -21,15 +20,9 @@ src_unpack() {
 	unpack ${A} ; cd ${S}
 
 	epatch ${FILESDIR}/${P}-nostl.diff
-
-	for a in ${WORKDIR}/sim-patches/*; do
-		epatch ${a}
-	done
+	epatch ${FILESDIR}/${PV}-patches
 }
 
-
-PATCHES="${FILESDIR}/${P}-nostl.diff"
-
 src_compile() {
 	if [ -n "`use ssl`" ]; then
 		myconf="$myconf --enable-openssl"