227339 2008-06-15 23:10 0000 www-client/opera-9.50 doesn't have an option for amd64 users to install the 32 bit version 2009-12-06 17:25:50 0000 1 1 1 Unclassified Gentoo Linux Applications unspecified All Linux RESOLVED FIXED InCVS P2 normal --- 1 g2g591+gentoobugzilla@gmail.com jer@gentoo.org amd64@gentoo.org david@watzke.cz g2g591+gentoobugzilla@gmail.com g2g591+gentoobugzilla@gmail.com 2008-06-15 23:10:56 0000 After installing opera-9.50 I discovered that it was 64 bit and couldn't use the 32 bit java plugin. Opera should have an option that will allow amd64 users to install the 32 bit version. I plan on coming up with a modified ebuild that will implement a useflag to do this within the next 1-3 days. Reproducible: Always g2g591+gentoobugzilla@gmail.com 2008-06-15 23:38:52 0000 Created an attachment (id=157011) An opera ebuild that adds the emul-x86 useflag to install the 32 bit version instead jer@gentoo.org 2008-06-15 23:48:24 0000 Hi amd64. How do you like it? And is there an existing USE flag that we could reuse? g2g591+gentoobugzilla@gmail.com 2008-06-16 00:00:02 0000 Created an attachment (id=157015) A diff between My modified ebuild and the intree ebuild g2g591+gentoobugzilla@gmail.com 2008-06-16 00:04:08 0000 I can't seem to find any existing flags to reuse, probably because most packages like this just use a -bin package for this purpose, but, as Opera is already binary..... g2g591+gentoobugzilla@gmail.com 2008-06-19 20:23:47 0000 sooo, Is this use-flag based solution OK, or is creating an emul-linux-x86- package more appropriate? jer@gentoo.org 2008-06-23 01:19:31 0000 Please unmask and test =www-client/opera-9.50-r1 - it introduces the ia32 USE flag which can be used to install the 32-bit binaries instead of the 64-bit ones. david@watzke.cz 2008-06-24 00:10:23 0000 nice but it's missing the app-emulation/emul-linux-x86-qtlibs dependency jer@gentoo.org 2008-06-24 00:42:31 0000 (In reply to comment #7) > nice but it's missing the app-emulation/emul-linux-x86-qtlibs dependency Index: opera-9.50-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.50-r1.ebuild,v retrieving revision 1.2 diff -u -B -r1.2 opera-9.50-r1.ebuild --- opera-9.50-r1.ebuild 23 Jun 2008 04:53:29 -0000 1.2 +++ opera-9.50-r1.ebuild 24 Jun 2008 00:36:16 -0000 @@ -58,7 +58,9 @@ x11-libs/libSM x11-libs/libICE !qt-static? ( =x11-libs/qt-3* ) - amd64? ( =x11-libs/qt-3* ) + amd64? ( =x11-libs/qt-3* + ia32? ( app-emulation/emul-linux-x86-qtlibs ) + ) ppc? ( =x11-libs/qt-3* ) spell? ( app-text/aspell ) x86-fbsd? ( =x11-libs/qt-3* =virtual/libstdc++-3* )" That should do it. david@watzke.cz 2008-06-24 09:34:25 0000 (In reply to comment #8) > That should do it. but 64bit Qt is not needed for 32bit Opera... maybe there should be something like amd64? ( !ia32? ( =x11-libs/qt-3* ) ia32? ( app-emulation/emul-linux-x86-qtlibs ) ) g2g591+gentoobugzilla@gmail.com 2008-06-24 16:03:36 0000 hmm, you guys broke the qt-static for amd64 when using the ia32 useflag.... so you can't use have 32 bit and have static qt... (I really don't care to download 32 bit qt JUST for opera) g2g591+gentoobugzilla@gmail.com 2008-06-24 16:20:31 0000 Created an attachment (id=158291) A 2nd diff between my 2nd modified ebuild, and the new, slightly broken intree ebuild g2g591+gentoobugzilla@gmail.com 2008-06-24 16:21:13 0000 Created an attachment (id=158293) My 2nd modified ebuild, that fixes the qt dependancy, and hte static-qt useflag jer@gentoo.org 2008-06-24 20:43:31 0000 (In reply to comment #11) > Created an attachment (id=158291) [edit] > A 2nd diff between my 2nd modified ebuild, and the new, slightly broken intree > ebuild Please use diff -u next time. This hurts my eyes. :( jer@gentoo.org 2008-06-24 20:48:06 0000 (In reply to comment #11) > Created an attachment (id=158291) [edit] > A 2nd diff between my 2nd modified ebuild, and the new, slightly broken intree > ebuild Also, your diff appears to move many bits of whitespace around. It's hard to see which non-trivial changes you're suggesting there. Could you please provide a diff -u against the opera-9.50-r1.ebuild that is currently in the tree, without any of those whitespace changes? jer@gentoo.org 2008-06-25 16:12:15 0000 There's a 9.51_pre2052 in the tree now which Opera calls 9.51 RC1. I have added the ia32 USE flag which allows you to install a qt3-static x86 build. I will fix 9.50-r1 as soon as I find the time. g2g591+gentoobugzilla@gmail.com 2008-06-27 01:35:47 0000 Created an attachment (id=158569) My 2nd diff, fixed (diff -u) sorry about the whitespace g2g591+gentoobugzilla@gmail.com 2008-06-30 03:22:08 0000 (In reply to comment #15) > There's a 9.51_pre2052 in the tree now which Opera calls 9.51 RC1. I have added > the ia32 USE flag which allows you to install a qt3-static x86 build. I will > fix 9.50-r1 as soon as I find the time. > why can't you give people a choice as to wether to install a qt3-static x86 build, or an x86 build that uses emul-linux-x86-qtlibs? My ebuild does this fine (now that I corrected that emul-linux-x86-qtlibs optional dependancy) . g2g591+gentoobugzilla@gmail.com 2008-07-01 15:54:20 0000 ok, aparently portage (and paludis) don't allow nested dependancies the way I have my 2nd ebuild setup. if there is a way to "rearrange" it so that both ia32 and qt-static work I'm ready to hear it. jer@gentoo.org 2008-07-01 16:19:58 0000 I am sure we'll get that to work as well. jer@gentoo.org 2008-07-03 22:54:10 0000 I have added www-client/opera-9.51 to the tree. The amd64 options now include ALL x86 options through the ia32, qt-static and qt3-static USE flags. I would like you to test a few combinations and see if they please you, and then report back on this bug with solid criticism. :) urcindalo@gmail.com 2008-07-10 11:50:33 0000 The ia32 USE flag is disabled on AMD64 for opera-9.51, even if present in /etc/portage/package.use, since I upgraded to the new /usr/portage/profiles/default/linux/amd64/2008.0/desktop profile All I want is to have JAVA back, so I don't mind if instead of installing 32-bit opera I can do something else. Thanks. g2g591+gentoobugzilla@gmail.com 2008-07-10 14:52:20 0000 add www-client/opera -ia32 to /etc/portage/profile/package.use.mask for now, until someone fixes it in-tree in reply to comment #21) > The ia32 USE flag is disabled on AMD64 for opera-9.51, even if present in > /etc/portage/package.use, since I upgraded to the new > /usr/portage/profiles/default/linux/amd64/2008.0/desktop profile > > All I want is to have JAVA back, so I don't mind if instead of installing > 32-bit opera I can do something else. > > Thanks. > tanderson@gentoo.org 2008-07-10 18:00:22 0000 Fixed again. jer@gentoo.org 2008-10-15 16:42:46 0000 Um. I think this is fixed. 157011 2008-06-15 23:38 0000 An opera ebuild that adds the emul-x86 useflag to install the 32 bit version instead opera-9.50-r1.ebuild text/plain IyBDb3B5cmlnaHQgMTk5OS0yMDA4IEdlbnRvbyBGb3VuZGF0aW9uCiMgRGlzdHJpYnV0ZWQgdW5k ZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2MgojICRIZWFk ZXI6IC92YXIvY3Zzcm9vdC9nZW50b28teDg2L3d3dy1jbGllbnQvb3BlcmEvb3BlcmEtOS41MC5l YnVpbGQsdiAxLjcgMjAwOC8wNi8xMyAxNTozNDo0MCBrZW42OTI2NyBFeHAgJAoKR0NPTkZfREVC VUc9Im5vIgoKaW5oZXJpdCBldXRpbHMgZ25vbWUyCgpERVNDUklQVElPTj0iQSBzdGFuZGFyZHMt Y29tcGxpYW50IGdyYXBoaWNhbCBXZWIgYnJvd3NlciIKSE9NRVBBR0U9Imh0dHA6Ly93d3cub3Bl cmEuY29tLyIKClNMT1Q9IjAiCkxJQ0VOU0U9Ik9QRVJBLTkuMCIKS0VZV09SRFM9ImFtZDY0IHBw YyB4ODYgfng4Ni1mYnNkIgoKUkVTVFJJQ1Q9InN0cmlwIHRlc3QiCgpJVVNFPSJlbGliY19GcmVl QlNEIGdub21lIHF0LXN0YXRpYyBzcGVsbCBlbXVsLXg4NiIKTVlfTElOR1VBUz0iYmUgYmcgY3Mg ZGEgZGUgZWwgZW4gZW4tR0IgZXMtRVMgZXMtTEEgZmkgZnIgZnItQ0EgZnkgaGkKaHIgaHUgaXQg amEga2Ega28gbHQgbWsgbmIgbmwgbm4gcGwgcHQgcHQtQlIgcnUgc3YgdHIgemgtQ04gemgtVFci Cgpmb3IgTVlfTElOR1VBIGluICR7TVlfTElOR1VBU307IGRvCglJVVNFPSIke0lVU0V9IGxpbmd1 YXNfJHtNWV9MSU5HVUEvLS9ffSIKZG9uZQoKT19VUkk9Im1pcnJvcjovL29wZXJhLyIKT19GVFA9 Ii85NTAvZmluYWwvZW4vIgpPX1NVRkY9IjIwNDIiCgpTUkNfVVJJPSIKCWFtZDY0PyAoIAoJCWVt dWwteDg2PyAoCgkJCQlxdC1zdGF0aWM/ICggJHtPX1VSSX1saW51eCR7T19GVFB9aTM4Ni8ke1B9 LmdjYzQtcXQ0LmkzODYudGFyLmJ6MiApCgkJCQkhcXQtc3RhdGljPyAoICR7T19VUkl9bGludXgk e09fRlRQfWkzODYvc2hhcmVkLyR7UH0uZ2NjNC1zaGFyZWQtcXQzLmkzODYudGFyLmJ6MiApCgkJ CSApCgkJIWVtdWwteDg2PyAoICR7T19VUkl9bGludXgke09fRlRQfXg4Nl82NC8ke1B9LmdjYzQt c2hhcmVkLXF0My54ODZfNjQudGFyLmJ6MiApCgkpCglwcGM/ICggJHtPX1VSSX1saW51eCR7T19G VFB9cHBjL3NoYXJlZC8ke1B9LmdjYzQtc2hhcmVkLXF0My5wcGMudGFyLmJ6MiApCgl4ODYtZmJz ZD8gKCAke09fVVJJfXVuaXgvZnJlZWJzZCR7T19GVFB9c2hhcmVkLyR7UH0tZnJlZWJzZDUtc2hh cmVkLXF0My5pMzg2LnRhci5iejIgKQoJcXQtc3RhdGljPyAoCgkJeDg2PyAoICR7T19VUkl9bGlu dXgke09fRlRQfWkzODYvJHtQfS5nY2M0LXF0NC5pMzg2LnRhci5iejIgKQoJKQoJIXF0LXN0YXRp Yz8gKAoJCXg4Nj8gKCAke09fVVJJfWxpbnV4JHtPX0ZUUH1pMzg2L3NoYXJlZC8ke1B9LmdjYzQt c2hhcmVkLXF0My5pMzg2LnRhci5iejIgKQoJKQoJIgoKREVQRU5EPSI+PXN5cy1hcHBzL3NlZC00 IgoKUkRFUEVORD0ibWVkaWEtbGlicy9saWJleGlmCgltZWRpYS1saWJzL2pwZWcKCT49bWVkaWEt bGlicy9mb250Y29uZmlnLTIuMS45NC1yMQoJeDExLWxpYnMvbGliWHJhbmRyCgl4MTEtbGlicy9s aWJYcAoJeDExLWxpYnMvbGliWG11Cgl4MTEtbGlicy9saWJYaQoJeDExLWxpYnMvbGliWGZ0Cgl4 MTEtbGlicy9saWJYZXh0Cgl4MTEtbGlicy9saWJYY3Vyc29yCgl4MTEtbGlicy9saWJYMTEKCXgx MS1saWJzL2xpYlNNCgl4MTEtbGlicy9saWJJQ0UKCSFxdC1zdGF0aWM/ICggPXgxMS1saWJzL3F0 LTMqICkKCWFtZDY0PyAoID14MTEtbGlicy9xdC0zKiApCglwcGM/ICggPXgxMS1saWJzL3F0LTMq ICkKCXNwZWxsPyAoIGFwcC10ZXh0L2FzcGVsbCApCgl4ODYtZmJzZD8gKCA9eDExLWxpYnMvcXQt MyogPXZpcnR1YWwvbGlic3RkYysrLTMqICkiCgpwa2dfc2V0dXAoKSB7Cgl1c2UgYW1kNjQgJiYg Uz0iJHtXT1JLRElSfS8ke1B9LSR7T19TVUZGfS5nY2M0LXNoYXJlZC1xdDMueDg2XzY0IgoJdXNl IHBwYyAmJiBTPSIke1dPUktESVJ9LyR7UH0tJHtPX1NVRkZ9LmdjYzQtc2hhcmVkLXF0My5wcGMi Cgl1c2UgeDg2LWZic2QgJiYgUz0iJHtXT1JLRElSfS8ke1B9LSR7T19TVUZGfS1mcmVlYnNkNS1z aGFyZWQtcXQzLmkzODYiCglpZiB1c2UgeDg2IHx8IHVzZSBlbXVsLXg4NjsgdGhlbgoJCWlmIHVz ZSBxdC1zdGF0aWM7IHRoZW4KCQkJUz0iJHtXT1JLRElSfS8ke1B9LSR7T19TVUZGfS5nY2M0LXF0 NC5pMzg2IgoJCWVsc2UKCQkJUz0iJHtXT1JLRElSfS8ke1B9LSR7T19TVUZGfS5nY2M0LXNoYXJl ZC1xdDMuaTM4NiIKCQlmaQoJZmkKfQoKc3JjX3VucGFjaygpIHsKCXVucGFjayAke0F9CgljZCAi JHtTfSIKCgllcGF0Y2ggIiR7RklMRVNESVJ9LyR7UE59LTkuMDAtaW5zdGFsbC5wYXRjaCIKCgkj IGJ1ZyAjMTgxMzAwOgoJdXNlIGVsaWJjX0ZyZWVCU0QgfHwgZXBhdGNoICIke0ZJTEVTRElSfS8k e1BOfS05LjUwLXBsdWdpbnBhdGgucGF0Y2giCgl1c2UgZWxpYmNfRnJlZUJTRCAmJiBlcGF0Y2gg IiR7RklMRVNESVJ9LyR7UE59LTkuNTAtcGx1Z2lucGF0aC1mYnNkLnBhdGNoIgoKCXNlZCAtaSAt ZSAiczpjb25maWdfZGlyPVwiL2V0Y1wiOmNvbmZpZ19kaXI9XCIke0R9L2V0Yy9cIjpnIiBcCgkJ LWUgInM6L3Vzci9zaGFyZS9hcHBsbms6JHtEfS91c3Ivc2hhcmUvYXBwbG5rOmciIFwKCQktZSAi czovdXNyL3NoYXJlL3BpeG1hcHM6JHtEfS91c3Ivc2hhcmUvcGl4bWFwczpnIiBcCgkJLWUgInM6 L3Vzci9zaGFyZS9pY29uczoke0R9L3Vzci9zaGFyZS9pY29uczpnIiBcCgkJLWUgInM6L2V0Yy9Y MTE6JHtEfS9ldGMvWDExOmciIFwKCQktZSAiczovdXNyL3NoYXJlL2dub21lOiR7RH0vdXNyL3No YXJlL2dub21lOmciIFwKCQktZSAiczovb3B0L2dub21lL3NoYXJlOiR7RH0vb3B0L2dub21lL3No YXJlOmciIFwKCQktZSAnczojXChPUEVSQV9GT1JDRV9KQVZBX0VOQUJMRUQ9XCk6XDE6JyBcCgkJ LWUgJ3M6I1woZXhwb3J0IExEX1BSRUxPQUQgT1BFUkFfRk9SQ0VfSkFWQV9FTkFCTEVEXCk6XDE6 JyBcCgkJLWUgJ3M6cmVhZCBzdHJfYW5zd2VyOnJldHVybiAwOicgXAoJCS1lICJzOi9vcHQva2Rl OiR7RH0vdXNyL2tkZToiIFwKCQktZSAiczpcKHN0cl9sb2NhbGRpcnBsdWdpbj1cKS4qJDpcMS9v cHQvb3BlcmEvbGliL29wZXJhL3BsdWdpbnM6IiBcCgkJaW5zdGFsbC5zaCB8fCBkaWUgInNlZCBm YWlsZWQiCgp9CgpzcmNfY29tcGlsZSgpIHsKCSMgVGhpcyB3b3JrYXJvdW5kIGlzIHNhZGx5IG5l ZWRlZCBiZWNhdXNlIGdub21lMi5lY2xhc3MgZG9lc24ndCBjaGVjawoJIyB3aGV0aGVyIGEgY29u ZmlndXJlIHNjcmlwdCBvciBNYWtlZmlsZSBleGlzdHMuCgl0cnVlCn0KCnNyY19pbnN0YWxsKCkg ewoJIyBQcmVwYXJlIGluc3RhbGxhdGlvbiBkaXJlY3RvcmllcyBmb3IgT3BlcmEncyBpbnN0YWxs ZXIgc2NyaXB0LgoJZG9kaXIgL2V0YwoKCSMgT3BlcmEncyBuYXRpdmUgaW5zdGFsbGVyLgoJLi9p bnN0YWxsLnNoIC0tcHJlZml4PSIke0R9Ii9vcHQvb3BlcmEgfHwgZGllICJpbnN0YWxsLnNoIGZh aWxlZCIKCgllaW5mbyAiSXQgaXMgc2FmZSB0byBpZ25vcmUgd2FybmluZ3MgYWJvdXQgZmFpbGVk IGNoZWNrc3VtcyIKCWVpbmZvICJhbmQgYWJvdXQgZmlsZXMgdGhhdCB3b3VsZCBiZSBpZ25vcmVk IC4uLiIKCWVpbmZvICJDb21wbGV0aW5nIHRoZSBpbnN0YWxsYXRpb24gd2hlcmUgaW5zdGFsbC5z aCBhYmFuZG9uZWQgdXMgLi4uIgoKCSMgamF2YSB3b3JrYXJvdW5kCglzZWQgLWkgLWUgJ3M6TERf UFJFTE9BRD0iJHtPUEVSQV9KQVZBX0RJUn0vbGliYXd0LnNvIjpMRF9QUkVMT0FEPSIkTERfUFJF TE9BRCJcOiIke09QRVJBX0pBVkFfRElSfS9saWJhd3Quc28iOicgIiR7RH0iL29wdC9vcGVyYS9i aW4vb3BlcmEKCglkb3NlZCAvb3B0L29wZXJhL2Jpbi9vcGVyYQoJZG9zZWQgL29wdC9vcGVyYS9z aGFyZS9vcGVyYS9qYXZhL29wZXJhLnBvbGljeQoKCSMgSW5zdGFsbCB0aGUgaWNvbnMKCWluc2lu dG8gL3Vzci9zaGFyZS9waXhtYXBzCglkb2lucyB1c3Ivc2hhcmUvcGl4bWFwcy9vcGVyYS54cG0K Cglsb2NhbCByZXMKCWZvciByZXMgaW4gMTZ4MTYgMjJ4MjIgMzJ4MzIgNDh4NDggOyBkbwoJCWlu c2ludG8gL3Vzci9zaGFyZS9pY29ucy9oaWNvbG9yLyR7cmVzfS9hcHBzCgkJZG9pbnMgdXNyL3No YXJlL2ljb25zL2hpY29sb3IvJHtyZXN9L2FwcHMvb3BlcmEucG5nCglkb25lCgoJIyBJbnN0YWxs IHRoZSBtZW51IGVudHJ5CgltYWtlX2Rlc2t0b3BfZW50cnkgb3BlcmEgT3BlcmEgL3Vzci9zaGFy ZS9waXhtYXBzL29wZXJhLnhwbSAnTmV0d29yaztXZWJCcm93c2VyO0VtYWlsO0ZpbGVUcmFuc2Zl cjtJUkNDbGllbnQnCgoJIyBJbnN0YWxsIGEgc3ltbGluayAvdXNyL2Jpbi9vcGVyYQoJZG9kaXIg L3Vzci9iaW4KCWRvc3ltIC9vcHQvb3BlcmEvYmluL29wZXJhIC91c3IvYmluL29wZXJhCgoJIyBm aXggcGx1Z2luIHBhdGgKCWVjaG8gIlBsdWdpbiBQYXRoPS9vcHQvb3BlcmEvbGliL29wZXJhL3Bs dWdpbnMiID4+ICIke0R9Ii9ldGMvb3BlcmE2cmMKCgkjIGVuYWJsZSBzcGVsbGNoZWNrCglpZiB1 c2Ugc3BlbGw7IHRoZW4KCQlpZiB1c2UgcXQtc3RhdGljOyB0aGVuCgkJCURJUj0ke1B9LjEKCQll bHNlCgkJCXVzZSBzcGFyYyAmJiBESVI9JHtQfS4yIHx8IERJUj0ke1B9LjUKCQlmaQoJCWVjaG8g IlNwZWxsIENoZWNrIEVuZ2luZT0vb3B0L29wZXJhL2xpYi9vcGVyYS8ke0RJUn0vc3BlbGxjaGVj ay5zbyIgPj4gIiR7RH0iL29wdC9vcGVyYS9zaGFyZS9vcGVyYS9pbmkvc3BlbGxjaGVjay5pbmkK CWZpCgoJZG9kaXIgL2V0Yy9yZXZkZXAtcmVidWlsZAoJZWNobyAnU0VBUkNIX0RJUlNfTUFTSz0i L29wdC9vcGVyYS9saWIvb3BlcmEvcGx1Z2lucyInID4gIiR7RH0iL2V0Yy9yZXZkZXAtcmVidWls ZC85MG9wZXJhCgoJIyBDaGFuZ2UgbGliei5zby4zIHRvIGxpYnouc28uMSBmb3IgZ2VudG9vL2Zy ZWVic2QKCWlmIHVzZSBlbGliY19GcmVlQlNEOyB0aGVuCgkJc2NhbmVsZiAtcVIgLU4gbGliei5z by4zIC1GICIjTiIgIiR7RH0iL29wdC8ke1BOfS8gfCBcCgkJd2hpbGUgcmVhZCBpOyBkbwoJCQlp ZiBbWyAkKHN0cmluZ3MgIiRpIiB8IGZncmVwIC1jIGxpYnouc28uMykgLW5lIDEgXV07CgkJCXRo ZW4KCQkJCWV4cG9ydCBTQU5JVFlfQ0hFQ0tfTElCWl9GQUlMRUQ9MQoJCQkJYnJlYWsKCQkJZmkK CQkJc2VkIC1pIC1lICdzL2xpYnpcLnNvXC4zL2xpYnouc28uMS9nJyAiJGkiCgkJZG9uZQoJCVtb ICIkU0FOSVRZX0NIRUNLX0xJQlpfRkFJTEVEIiA9ICIxIiBdXSAmJiBkaWUgImZhaWxlZCB0byBj aGFuZ2UgbGliei5zby4zIHRvIGxpYnouc28uMSIKCWZpCgoJIyBBZGQgdGhlIE9wZXJhIG1hbiBk aXIgdG8gTUFOUEFUSDoKCWluc2ludG8gL2V0Yy9lbnYuZAoJZWNobyAnTUFOUEFUSD0iL29wdC9v cGVyYS9zaGFyZS9tYW4iJyA+PiAiJHtEfSIvZXRjL2Vudi5kLzkwb3BlcmEKCgkjIFJlbW92ZSB1 bndhbnRlZCBMSU5HVUFTOgoJbG9jYWwgTElOR1VBCglsb2NhbCBMTkdESVI9IiR7RH0vb3B0L29w ZXJhL3NoYXJlL29wZXJhL2xvY2FsZSIKCWVpbmZvICJLZWVwaW5nIHRoZXNlIGxvY2FsZXM6ICR7 TElOR1VBU30uIgoJZm9yIExJTkdVQSBpbiAke01ZX0xJTkdVQVN9OyBkbwoJCWlmICEgdXNlIGxp bmd1YXNfJHtMSU5HVUEvLS9ffTsgdGhlbgoJCQlMSU5HVUE9JChmaW5kICIke0xOR0RJUn0iIC1t YXhkZXB0aCAxIC10eXBlIGQgLWluYW1lICR7TElOR1VBL18vLX0pCgkJCXJtIC1yICIke0xJTkdV QX0iCgkJZmkKCWRvbmUKfQoKcGtnX3Bvc3RpbnN0KCkgewoJdXNlIGdub21lICYmIGdub21lMl9w a2dfcG9zdGluc3QKCgllbG9nICJUbyBjaGFuZ2UgdGhlIFVJIGxhbmd1YWdlLCBjaG9vc2UgW1Rv b2xzXSAtPiBbUHJlZmVyZW5jZXNdLCBvcGVuIHRoZSIKCWVsb2cgIltHZW5lcmFsXSB0YWIsIGNs aWNrIG9uIFtEZXRhaWxzLi4uXSB0aGVuIFtDaG9vc2UuLi5dIGFuZCBwb2ludCB0aGUiCgllbG9n ICJmaWxlIGNob29zZXIgYXQgL29wdC9vcGVyYS9zaGFyZS9vcGVyYS9sb2NhbGUvLCB0aGVuIGVu dGVyIHRoZSIKCWVsb2cgImRpcmVjdG9yeSBmb3IgdGhlIGxhbmd1YWdlIHlvdSB3YW50IGFuZCBb T3Blbl0gdGhlIC5sbmcgZmlsZS4iCgllbG9nCgllbG9nICJUbyB1c2UgdGhlIHNwZWxsY2hlY2tl ciAoVVNFPXNwZWxsKSBmb3Igbm9uLUVuZ2xpc2ggc2ltcGx5IGRvIgoJZWxvZyAiJCBlbWVyZ2Ug YXBwLWRpY3RzL2FzcGVsbC1beW91ciBsYW5ndWFnZV0uIgoKCWlmIHVzZSBlbGliY19GcmVlQlNE OyB0aGVuCgkJZWxvZwoJCWVsb2cgIlRvIGltcHJvdmUgc2hhcmVkIG1lbW9yeSB1c2FnZSBwbGVh c2Ugc2V0OiIKCQllbG9nICIkIHN5c2N0bCBrZXJuLmlwYy5zaG1fYWxsb3dfcmVtb3ZlZD0xIgoJ ZmkKCgllbG9nICJUaGUgT3BlcmEgYmV0YXMgbWF5IHN0aWxsIGhhdmUgaXNzdWVzIHdpdGggcGx1 Z2lucywgbm90YWJseSIKCWVsb2cgIm5ldC13d3cvbmV0c2NhcGUtZmxhc2guIFNlZSBhbHNvIGh0 dHBzOi8vYnVncy5nZW50b28ub3JnLzE5ODE2MiIKfQoKcGtnX3Bvc3RybSgpIHsKCXVzZSBnbm9t ZSAmJiBnbm9tZTJfcGtnX3Bvc3RybQp9Cg== 157015 2008-06-16 00:00 0000 A diff between My modified ebuild and the intree ebuild opera-diff text/plain MThjMTgKPCBJVVNFPSJlbGliY19GcmVlQlNEIGdub21lIHF0LXN0YXRpYyBzcGVsbCIKLS0tCj4g SVVTRT0iZWxpYmNfRnJlZUJTRCBnbm9tZSBxdC1zdGF0aWMgc3BlbGwgZW11bC14ODYiCjMxYzMx LDM3CjwgCWFtZDY0PyAoICR7T19VUkl9bGludXgke09fRlRQfXg4Nl82NC8ke1B9LmdjYzQtc2hh cmVkLXF0My54ODZfNjQudGFyLmJ6MiApCi0tLQo+IAlhbWQ2ND8gKCAKPiAJCWVtdWwteDg2PyAo Cj4gCQkJCXF0LXN0YXRpYz8gKCAke09fVVJJfWxpbnV4JHtPX0ZUUH1pMzg2LyR7UH0uZ2NjNC1x dDQuaTM4Ni50YXIuYnoyICkKPiAJCQkJIXF0LXN0YXRpYz8gKCAke09fVVJJfWxpbnV4JHtPX0ZU UH1pMzg2L3NoYXJlZC8ke1B9LmdjYzQtc2hhcmVkLXF0My5pMzg2LnRhci5iejIgKQo+IAkJCSAp Cj4gCQkhZW11bC14ODY/ICggJHtPX1VSSX1saW51eCR7T19GVFB9eDg2XzY0LyR7UH0uZ2NjNC1z aGFyZWQtcXQzLng4Nl82NC50YXIuYnoyICkKPiAJKQo2N2M3Mwo8IAlpZiB1c2UgeDg2OyB0aGVu Ci0tLQo+IAlpZiB1c2UgeDg2IHx8IHVzZSBlbXVsLXg4NjsgdGhlbgo= 158291 2008-06-24 16:20 0000 A 2nd diff between my 2nd modified ebuild, and the new, slightly broken intree ebuild opera-diff2 text/plain M2MzICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIAo8ICMgJEhlYWRlcjogCi92YXIvY3Zzcm9vdC9nZW50b28t eDg2L3d3dy1jbGllbnQvb3BlcmEvb3BlcmEtOS41MC1yMS5lYnVpbGQsdiAxLjMgCjIwMDgvMDYv MjQgMDA6Mzg6NDggamVyIEV4cCAkICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAKLS0tICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKPiAjICRIZWFkZXI6IAovdmFy L2N2c3Jvb3QvZ2VudG9vLXg4Ni93d3ctY2xpZW50L29wZXJhL29wZXJhLTkuNTAuZWJ1aWxkLHYg MS43IAoyMDA4LzA2LzEzIDE1OjM0OjQwIGtlbjY5MjY3IEV4cCAkICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCjE0YzE0ICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCjwg S0VZV09SRFM9In5hbWQ2NCB+cHBjIH54ODYgfng4Ni1mYnNkIiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgCi0tLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCj4gS0VZV09SRFM9 ImFtZDY0IHBwYyB4ODYgfng4Ni1mYnNkIiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgCjE4YzE4ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCjwgSVVTRT0iZWxpYmNfRnJlZUJT RCBnbm9tZSBpYTMyIHF0LXN0YXRpYyBzcGVsbCIgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgCi0tLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgCj4gSVVTRT0iZWxpYmNfRnJlZUJTRCBnbm9tZSBx dC1zdGF0aWMgc3BlbGwgaWEzMiIgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCjMxLDMy YzMxLDM1ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgCjwgICAgICAgYW1kNjQ/ICggICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCjwgICAgICAgICAgICAg ICBpYTMyPyAoIAoke09fVVJJfWxpbnV4JHtPX0ZUUH1pMzg2L3NoYXJlZC8ke1B9LmdjYzQtc2hh cmVkLXF0My5pMzg2LnRhci5iejIgKSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCi0tLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Cj4gICAgICAgYW1kNjQ/ICggICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgCj4gICAgICAgICAgICAgICBpYTMyPyAoCj4gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgcXQtc3RhdGljPyAoIAoke09fVVJJfWxpbnV4JHtPX0ZU UH1pMzg2LyR7UH0uZ2NjNC1xdDQuaTM4Ni50YXIuYnoyICkKPiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAhcXQtc3RhdGljPyAoIAoke09fVVJJfWxpbnV4JHtPX0ZUUH1pMzg2L3NoYXJl ZC8ke1B9LmdjYzQtc2hhcmVkLXF0My5pMzg2LnRhci5iejIgKQo+ICAgICAgICAgICAgICAgICAg ICAgICAgKQo2MCw2M2M2Myw3MAo8ICAgICAgICFxdC1zdGF0aWM/ICggPXgxMS1saWJzL3F0LTMq ICkKPCAgICAgICBhbWQ2ND8gKCA9eDExLWxpYnMvcXQtMyoKPCAgICAgICAgICAgICAgICAgICAg ICAgIGlhMzI/ICggYXBwLWVtdWxhdGlvbi9lbXVsLWxpbnV4LXg4Ni1xdGxpYnMgKQo8ICAgICAg ICkKLS0tCj4gICAgICAgeDg2PyAoCj4gICAgICAgICAgICAgICAhcXQtc3RhdGljPyAoID14MTEt bGlicy9xdC0zKiApCj4gICAgICAgICAgICAgICApCj4gICAgICAgYW1kNjQ/ICgKPiAgICAgICAg ICAgICAgICAgICAgICAgIWlhMzI/ICggPXgxMS1saWJzL3F0LTMqICkKPiAgICAgICAgICAgICAg ICAgICAgICAgaWEzMj8gKAo+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICFxdC1zdGF0 aWM/ICggCmFwcC1lbXVsYXRpb24vZW11bC1saW51eC14ODYtcXRsaWJzICkKPiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICApCjY5LDc1Yzc2CjwgICAgICAgaWYgdXNlIGFtZDY0OyB0aGVu CjwgICAgICAgICAgICAgICBpZiB1c2UgaWEzMjsgdGhlbgo8ICAgICAgICAgICAgICAgICAgICAg ICAKUz0iJHtXT1JLRElSfS8ke1B9LSR7T19TVUZGfS5nY2M0LXNoYXJlZC1xdDMuaTM4NiIKPCAg ICAgICAgICAgICAgIGVsc2UKPCAgICAgICAgICAgICAgICAgICAgICAgClM9IiR7V09SS0RJUn0v JHtQfS0ke09fU1VGRn0uZ2NjNC1zaGFyZWQtcXQzLng4Nl82NCIKPCAgICAgICAgICAgICAgIGZp CjwgICAgICAgZmkKLS0tCj4gICAgICAgdXNlIGFtZDY0ICYmIApTPSIke1dPUktESVJ9LyR7UH0t JHtPX1NVRkZ9LmdjYzQtc2hhcmVkLXF0My54ODZfNjQiCjc4Yzc5CjwgICAgICAgaWYgdXNlIHg4 NjsgdGhlbgotLS0KPiAgICAgICBpZiB1c2UgeDg2IHx8IHVzZSBpYTMyOyB0aGVuCgo= 158293 2008-06-24 16:21 0000 My 2nd modified ebuild, that fixes the qt dependancy, and hte static-qt useflag opera-9.50-r2.ebuild text/plain IyBDb3B5cmlnaHQgMTk5OS0yMDA4IEdlbnRvbyBGb3VuZGF0aW9uCiMgRGlzdHJpYnV0ZWQgdW5k ZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2MgojICRIZWFk ZXI6IC92YXIvY3Zzcm9vdC9nZW50b28teDg2L3d3dy1jbGllbnQvb3BlcmEvb3BlcmEtOS41MC5l YnVpbGQsdiAxLjcgMjAwOC8wNi8xMyAxNTozNDo0MCBrZW42OTI2NyBFeHAgJAoKR0NPTkZfREVC VUc9Im5vIgoKaW5oZXJpdCBldXRpbHMgZ25vbWUyCgpERVNDUklQVElPTj0iQSBzdGFuZGFyZHMt Y29tcGxpYW50IGdyYXBoaWNhbCBXZWIgYnJvd3NlciIKSE9NRVBBR0U9Imh0dHA6Ly93d3cub3Bl cmEuY29tLyIKClNMT1Q9IjAiCkxJQ0VOU0U9Ik9QRVJBLTkuMCIKS0VZV09SRFM9ImFtZDY0IHBw YyB4ODYgfng4Ni1mYnNkIgoKUkVTVFJJQ1Q9InN0cmlwIHRlc3QiCgpJVVNFPSJlbGliY19GcmVl QlNEIGdub21lIHF0LXN0YXRpYyBzcGVsbCBpYTMyIgpNWV9MSU5HVUFTPSJiZSBiZyBjcyBkYSBk ZSBlbCBlbiBlbi1HQiBlcy1FUyBlcy1MQSBmaSBmciBmci1DQSBmeSBoaQpociBodSBpdCBqYSBr YSBrbyBsdCBtayBuYiBubCBubiBwbCBwdCBwdC1CUiBydSBzdiB0ciB6aC1DTiB6aC1UVyIKCmZv ciBNWV9MSU5HVUEgaW4gJHtNWV9MSU5HVUFTfTsgZG8KCUlVU0U9IiR7SVVTRX0gbGluZ3Vhc18k e01ZX0xJTkdVQS8tL199Igpkb25lCgpPX1VSST0ibWlycm9yOi8vb3BlcmEvIgpPX0ZUUD0iLzk1 MC9maW5hbC9lbi8iCk9fU1VGRj0iMjA0MiIKClNSQ19VUkk9IgoJYW1kNjQ/ICggCgkJaWEzMj8g KAoJCQkJcXQtc3RhdGljPyAoICR7T19VUkl9bGludXgke09fRlRQfWkzODYvJHtQfS5nY2M0LXF0 NC5pMzg2LnRhci5iejIgKQoJCQkJIXF0LXN0YXRpYz8gKCAke09fVVJJfWxpbnV4JHtPX0ZUUH1p Mzg2L3NoYXJlZC8ke1B9LmdjYzQtc2hhcmVkLXF0My5pMzg2LnRhci5iejIgKQoJCQkgKQoJCSFp YTMyPyAoICR7T19VUkl9bGludXgke09fRlRQfXg4Nl82NC8ke1B9LmdjYzQtc2hhcmVkLXF0My54 ODZfNjQudGFyLmJ6MiApCgkpCglwcGM/ICggJHtPX1VSSX1saW51eCR7T19GVFB9cHBjL3NoYXJl ZC8ke1B9LmdjYzQtc2hhcmVkLXF0My5wcGMudGFyLmJ6MiApCgl4ODYtZmJzZD8gKCAke09fVVJJ fXVuaXgvZnJlZWJzZCR7T19GVFB9c2hhcmVkLyR7UH0tZnJlZWJzZDUtc2hhcmVkLXF0My5pMzg2 LnRhci5iejIgKQoJcXQtc3RhdGljPyAoCgkJeDg2PyAoICR7T19VUkl9bGludXgke09fRlRQfWkz ODYvJHtQfS5nY2M0LXF0NC5pMzg2LnRhci5iejIgKQoJKQoJIXF0LXN0YXRpYz8gKAoJCXg4Nj8g KCAke09fVVJJfWxpbnV4JHtPX0ZUUH1pMzg2L3NoYXJlZC8ke1B9LmdjYzQtc2hhcmVkLXF0My5p Mzg2LnRhci5iejIgKQoJKQoJIgoKREVQRU5EPSI+PXN5cy1hcHBzL3NlZC00IgoKUkRFUEVORD0i bWVkaWEtbGlicy9saWJleGlmCgltZWRpYS1saWJzL2pwZWcKCT49bWVkaWEtbGlicy9mb250Y29u ZmlnLTIuMS45NC1yMQoJeDExLWxpYnMvbGliWHJhbmRyCgl4MTEtbGlicy9saWJYcAoJeDExLWxp YnMvbGliWG11Cgl4MTEtbGlicy9saWJYaQoJeDExLWxpYnMvbGliWGZ0Cgl4MTEtbGlicy9saWJY ZXh0Cgl4MTEtbGlicy9saWJYY3Vyc29yCgl4MTEtbGlicy9saWJYMTEKCXgxMS1saWJzL2xpYlNN Cgl4MTEtbGlicy9saWJJQ0UKCXg4Nj8gKAkKCQkhcXQtc3RhdGljPyAoID14MTEtbGlicy9xdC0z KiApCgkJKQoJYW1kNjQ/ICgKCQkJIWlhMzI/ICggPXgxMS1saWJzL3F0LTMqICkKCQkJaWEzMj8g KCAKCQkJCSFxdC1zdGF0aWM/ICggYXBwLWVtdWxhdGlvbi9lbXVsLWxpbnV4LXg4Ni1xdGxpYnMg KQoJCQkJKQoJcHBjPyAoID14MTEtbGlicy9xdC0zKiApCglzcGVsbD8gKCBhcHAtdGV4dC9hc3Bl bGwgKQoJeDg2LWZic2Q/ICggPXgxMS1saWJzL3F0LTMqID12aXJ0dWFsL2xpYnN0ZGMrKy0zKiAp IgoKcGtnX3NldHVwKCkgewoJdXNlIGFtZDY0ICYmIFM9IiR7V09SS0RJUn0vJHtQfS0ke09fU1VG Rn0uZ2NjNC1zaGFyZWQtcXQzLng4Nl82NCIKCXVzZSBwcGMgJiYgUz0iJHtXT1JLRElSfS8ke1B9 LSR7T19TVUZGfS5nY2M0LXNoYXJlZC1xdDMucHBjIgoJdXNlIHg4Ni1mYnNkICYmIFM9IiR7V09S S0RJUn0vJHtQfS0ke09fU1VGRn0tZnJlZWJzZDUtc2hhcmVkLXF0My5pMzg2IgoJaWYgdXNlIHg4 NiB8fCB1c2UgaWEzMjsgdGhlbgoJCWlmIHVzZSBxdC1zdGF0aWM7IHRoZW4KCQkJUz0iJHtXT1JL RElSfS8ke1B9LSR7T19TVUZGfS5nY2M0LXF0NC5pMzg2IgoJCWVsc2UKCQkJUz0iJHtXT1JLRElS fS8ke1B9LSR7T19TVUZGfS5nY2M0LXNoYXJlZC1xdDMuaTM4NiIKCQlmaQoJZmkKfQoKc3JjX3Vu cGFjaygpIHsKCXVucGFjayAke0F9CgljZCAiJHtTfSIKCgllcGF0Y2ggIiR7RklMRVNESVJ9LyR7 UE59LTkuMDAtaW5zdGFsbC5wYXRjaCIKCgkjIGJ1ZyAjMTgxMzAwOgoJdXNlIGVsaWJjX0ZyZWVC U0QgfHwgZXBhdGNoICIke0ZJTEVTRElSfS8ke1BOfS05LjUwLXBsdWdpbnBhdGgucGF0Y2giCgl1 c2UgZWxpYmNfRnJlZUJTRCAmJiBlcGF0Y2ggIiR7RklMRVNESVJ9LyR7UE59LTkuNTAtcGx1Z2lu cGF0aC1mYnNkLnBhdGNoIgoKCXNlZCAtaSAtZSAiczpjb25maWdfZGlyPVwiL2V0Y1wiOmNvbmZp Z19kaXI9XCIke0R9L2V0Yy9cIjpnIiBcCgkJLWUgInM6L3Vzci9zaGFyZS9hcHBsbms6JHtEfS91 c3Ivc2hhcmUvYXBwbG5rOmciIFwKCQktZSAiczovdXNyL3NoYXJlL3BpeG1hcHM6JHtEfS91c3Iv c2hhcmUvcGl4bWFwczpnIiBcCgkJLWUgInM6L3Vzci9zaGFyZS9pY29uczoke0R9L3Vzci9zaGFy ZS9pY29uczpnIiBcCgkJLWUgInM6L2V0Yy9YMTE6JHtEfS9ldGMvWDExOmciIFwKCQktZSAiczov dXNyL3NoYXJlL2dub21lOiR7RH0vdXNyL3NoYXJlL2dub21lOmciIFwKCQktZSAiczovb3B0L2du b21lL3NoYXJlOiR7RH0vb3B0L2dub21lL3NoYXJlOmciIFwKCQktZSAnczojXChPUEVSQV9GT1JD RV9KQVZBX0VOQUJMRUQ9XCk6XDE6JyBcCgkJLWUgJ3M6I1woZXhwb3J0IExEX1BSRUxPQUQgT1BF UkFfRk9SQ0VfSkFWQV9FTkFCTEVEXCk6XDE6JyBcCgkJLWUgJ3M6cmVhZCBzdHJfYW5zd2VyOnJl dHVybiAwOicgXAoJCS1lICJzOi9vcHQva2RlOiR7RH0vdXNyL2tkZToiIFwKCQktZSAiczpcKHN0 cl9sb2NhbGRpcnBsdWdpbj1cKS4qJDpcMS9vcHQvb3BlcmEvbGliL29wZXJhL3BsdWdpbnM6IiBc CgkJaW5zdGFsbC5zaCB8fCBkaWUgInNlZCBmYWlsZWQiCgp9CgpzcmNfY29tcGlsZSgpIHsKCSMg VGhpcyB3b3JrYXJvdW5kIGlzIHNhZGx5IG5lZWRlZCBiZWNhdXNlIGdub21lMi5lY2xhc3MgZG9l c24ndCBjaGVjawoJIyB3aGV0aGVyIGEgY29uZmlndXJlIHNjcmlwdCBvciBNYWtlZmlsZSBleGlz dHMuCgl0cnVlCn0KCnNyY19pbnN0YWxsKCkgewoJIyBQcmVwYXJlIGluc3RhbGxhdGlvbiBkaXJl Y3RvcmllcyBmb3IgT3BlcmEncyBpbnN0YWxsZXIgc2NyaXB0LgoJZG9kaXIgL2V0YwoKCSMgT3Bl cmEncyBuYXRpdmUgaW5zdGFsbGVyLgoJLi9pbnN0YWxsLnNoIC0tcHJlZml4PSIke0R9Ii9vcHQv b3BlcmEgfHwgZGllICJpbnN0YWxsLnNoIGZhaWxlZCIKCgllaW5mbyAiSXQgaXMgc2FmZSB0byBp Z25vcmUgd2FybmluZ3MgYWJvdXQgZmFpbGVkIGNoZWNrc3VtcyIKCWVpbmZvICJhbmQgYWJvdXQg ZmlsZXMgdGhhdCB3b3VsZCBiZSBpZ25vcmVkIC4uLiIKCWVpbmZvICJDb21wbGV0aW5nIHRoZSBp bnN0YWxsYXRpb24gd2hlcmUgaW5zdGFsbC5zaCBhYmFuZG9uZWQgdXMgLi4uIgoKCSMgamF2YSB3 b3JrYXJvdW5kCglzZWQgLWkgLWUgJ3M6TERfUFJFTE9BRD0iJHtPUEVSQV9KQVZBX0RJUn0vbGli YXd0LnNvIjpMRF9QUkVMT0FEPSIkTERfUFJFTE9BRCJcOiIke09QRVJBX0pBVkFfRElSfS9saWJh d3Quc28iOicgIiR7RH0iL29wdC9vcGVyYS9iaW4vb3BlcmEKCglkb3NlZCAvb3B0L29wZXJhL2Jp bi9vcGVyYQoJZG9zZWQgL29wdC9vcGVyYS9zaGFyZS9vcGVyYS9qYXZhL29wZXJhLnBvbGljeQoK CSMgSW5zdGFsbCB0aGUgaWNvbnMKCWluc2ludG8gL3Vzci9zaGFyZS9waXhtYXBzCglkb2lucyB1 c3Ivc2hhcmUvcGl4bWFwcy9vcGVyYS54cG0KCglsb2NhbCByZXMKCWZvciByZXMgaW4gMTZ4MTYg MjJ4MjIgMzJ4MzIgNDh4NDggOyBkbwoJCWluc2ludG8gL3Vzci9zaGFyZS9pY29ucy9oaWNvbG9y LyR7cmVzfS9hcHBzCgkJZG9pbnMgdXNyL3NoYXJlL2ljb25zL2hpY29sb3IvJHtyZXN9L2FwcHMv b3BlcmEucG5nCglkb25lCgoJIyBJbnN0YWxsIHRoZSBtZW51IGVudHJ5CgltYWtlX2Rlc2t0b3Bf ZW50cnkgb3BlcmEgT3BlcmEgL3Vzci9zaGFyZS9waXhtYXBzL29wZXJhLnhwbSAnTmV0d29yaztX ZWJCcm93c2VyO0VtYWlsO0ZpbGVUcmFuc2ZlcjtJUkNDbGllbnQnCgoJIyBJbnN0YWxsIGEgc3lt bGluayAvdXNyL2Jpbi9vcGVyYQoJZG9kaXIgL3Vzci9iaW4KCWRvc3ltIC9vcHQvb3BlcmEvYmlu L29wZXJhIC91c3IvYmluL29wZXJhCgoJIyBmaXggcGx1Z2luIHBhdGgKCWVjaG8gIlBsdWdpbiBQ YXRoPS9vcHQvb3BlcmEvbGliL29wZXJhL3BsdWdpbnMiID4+ICIke0R9Ii9ldGMvb3BlcmE2cmMK CgkjIGVuYWJsZSBzcGVsbGNoZWNrCglpZiB1c2Ugc3BlbGw7IHRoZW4KCQlpZiB1c2UgcXQtc3Rh dGljOyB0aGVuCgkJCURJUj0ke1B9LjEKCQllbHNlCgkJCXVzZSBzcGFyYyAmJiBESVI9JHtQfS4y IHx8IERJUj0ke1B9LjUKCQlmaQoJCWVjaG8gIlNwZWxsIENoZWNrIEVuZ2luZT0vb3B0L29wZXJh L2xpYi9vcGVyYS8ke0RJUn0vc3BlbGxjaGVjay5zbyIgPj4gIiR7RH0iL29wdC9vcGVyYS9zaGFy ZS9vcGVyYS9pbmkvc3BlbGxjaGVjay5pbmkKCWZpCgoJZG9kaXIgL2V0Yy9yZXZkZXAtcmVidWls ZAoJZWNobyAnU0VBUkNIX0RJUlNfTUFTSz0iL29wdC9vcGVyYS9saWIvb3BlcmEvcGx1Z2lucyIn ID4gIiR7RH0iL2V0Yy9yZXZkZXAtcmVidWlsZC85MG9wZXJhCgoJIyBDaGFuZ2UgbGliei5zby4z IHRvIGxpYnouc28uMSBmb3IgZ2VudG9vL2ZyZWVic2QKCWlmIHVzZSBlbGliY19GcmVlQlNEOyB0 aGVuCgkJc2NhbmVsZiAtcVIgLU4gbGliei5zby4zIC1GICIjTiIgIiR7RH0iL29wdC8ke1BOfS8g fCBcCgkJd2hpbGUgcmVhZCBpOyBkbwoJCQlpZiBbWyAkKHN0cmluZ3MgIiRpIiB8IGZncmVwIC1j IGxpYnouc28uMykgLW5lIDEgXV07CgkJCXRoZW4KCQkJCWV4cG9ydCBTQU5JVFlfQ0hFQ0tfTElC Wl9GQUlMRUQ9MQoJCQkJYnJlYWsKCQkJZmkKCQkJc2VkIC1pIC1lICdzL2xpYnpcLnNvXC4zL2xp Ynouc28uMS9nJyAiJGkiCgkJZG9uZQoJCVtbICIkU0FOSVRZX0NIRUNLX0xJQlpfRkFJTEVEIiA9 ICIxIiBdXSAmJiBkaWUgImZhaWxlZCB0byBjaGFuZ2UgbGliei5zby4zIHRvIGxpYnouc28uMSIK CWZpCgoJIyBBZGQgdGhlIE9wZXJhIG1hbiBkaXIgdG8gTUFOUEFUSDoKCWluc2ludG8gL2V0Yy9l bnYuZAoJZWNobyAnTUFOUEFUSD0iL29wdC9vcGVyYS9zaGFyZS9tYW4iJyA+PiAiJHtEfSIvZXRj L2Vudi5kLzkwb3BlcmEKCgkjIFJlbW92ZSB1bndhbnRlZCBMSU5HVUFTOgoJbG9jYWwgTElOR1VB Cglsb2NhbCBMTkdESVI9IiR7RH0vb3B0L29wZXJhL3NoYXJlL29wZXJhL2xvY2FsZSIKCWVpbmZv ICJLZWVwaW5nIHRoZXNlIGxvY2FsZXM6ICR7TElOR1VBU30uIgoJZm9yIExJTkdVQSBpbiAke01Z X0xJTkdVQVN9OyBkbwoJCWlmICEgdXNlIGxpbmd1YXNfJHtMSU5HVUEvLS9ffTsgdGhlbgoJCQlM SU5HVUE9JChmaW5kICIke0xOR0RJUn0iIC1tYXhkZXB0aCAxIC10eXBlIGQgLWluYW1lICR7TElO R1VBL18vLX0pCgkJCXJtIC1yICIke0xJTkdVQX0iCgkJZmkKCWRvbmUKfQoKcGtnX3Bvc3RpbnN0 KCkgewoJdXNlIGdub21lICYmIGdub21lMl9wa2dfcG9zdGluc3QKCgllbG9nICJUbyBjaGFuZ2Ug dGhlIFVJIGxhbmd1YWdlLCBjaG9vc2UgW1Rvb2xzXSAtPiBbUHJlZmVyZW5jZXNdLCBvcGVuIHRo ZSIKCWVsb2cgIltHZW5lcmFsXSB0YWIsIGNsaWNrIG9uIFtEZXRhaWxzLi4uXSB0aGVuIFtDaG9v c2UuLi5dIGFuZCBwb2ludCB0aGUiCgllbG9nICJmaWxlIGNob29zZXIgYXQgL29wdC9vcGVyYS9z aGFyZS9vcGVyYS9sb2NhbGUvLCB0aGVuIGVudGVyIHRoZSIKCWVsb2cgImRpcmVjdG9yeSBmb3Ig dGhlIGxhbmd1YWdlIHlvdSB3YW50IGFuZCBbT3Blbl0gdGhlIC5sbmcgZmlsZS4iCgllbG9nCgll bG9nICJUbyB1c2UgdGhlIHNwZWxsY2hlY2tlciAoVVNFPXNwZWxsKSBmb3Igbm9uLUVuZ2xpc2gg c2ltcGx5IGRvIgoJZWxvZyAiJCBlbWVyZ2UgYXBwLWRpY3RzL2FzcGVsbC1beW91ciBsYW5ndWFn ZV0uIgoKCWlmIHVzZSBlbGliY19GcmVlQlNEOyB0aGVuCgkJZWxvZwoJCWVsb2cgIlRvIGltcHJv dmUgc2hhcmVkIG1lbW9yeSB1c2FnZSBwbGVhc2Ugc2V0OiIKCQllbG9nICIkIHN5c2N0bCBrZXJu LmlwYy5zaG1fYWxsb3dfcmVtb3ZlZD0xIgoJZmkKCgllbG9nICJUaGUgT3BlcmEgYmV0YXMgbWF5 IHN0aWxsIGhhdmUgaXNzdWVzIHdpdGggcGx1Z2lucywgbm90YWJseSIKCWVsb2cgIm5ldC13d3cv bmV0c2NhcGUtZmxhc2guIFNlZSBhbHNvIGh0dHBzOi8vYnVncy5nZW50b28ub3JnLzE5ODE2MiIK fQoKcGtnX3Bvc3RybSgpIHsKCXVzZSBnbm9tZSAmJiBnbm9tZTJfcGtnX3Bvc3RybQp9Cg== 158569 2008-06-27 01:35 0000 My 2nd diff, fixed (diff -u) opera-diff2 text/plain LS0tIG9wZXJhLTkuNTAtcjIuZWJ1aWxkCTIwMDgtMDYtMjQgMTE6MTc6NDEuMDAwMDAwMDAwIC0w NTAwCisrKyAvdXNyL3BvcnRhZ2Uvd3d3LWNsaWVudC9vcGVyYS9vcGVyYS05LjUwLXIxLmVidWls ZAkyMDA4LTA2LTIzIDE5OjM5OjI3LjAwMDAwMDAwMCAtMDUwMApAQCAtMSw2ICsxLDYgQEAKICMg Q29weXJpZ2h0IDE5OTktMjAwOCBHZW50b28gRm91bmRhdGlvbgogIyBEaXN0cmlidXRlZCB1bmRl ciB0aGUgdGVybXMgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIHYyCi0jICRIZWFk ZXI6IC92YXIvY3Zzcm9vdC9nZW50b28teDg2L3d3dy1jbGllbnQvb3BlcmEvb3BlcmEtOS41MC5l YnVpbGQsdiAxLjcgMjAwOC8wNi8xMyAxNTozNDo0MCBrZW42OTI2NyBFeHAgJAorIyAkSGVhZGVy OiAvdmFyL2N2c3Jvb3QvZ2VudG9vLXg4Ni93d3ctY2xpZW50L29wZXJhL29wZXJhLTkuNTAtcjEu ZWJ1aWxkLHYgMS4zIDIwMDgvMDYvMjQgMDA6Mzg6NDggamVyIEV4cCAkCiAKIEdDT05GX0RFQlVH PSJubyIKIApAQCAtMTEsMTEgKzExLDExIEBACiAKIFNMT1Q9IjAiCiBMSUNFTlNFPSJPUEVSQS05 LjAiCi1LRVlXT1JEUz0iYW1kNjQgcHBjIHg4NiB+eDg2LWZic2QiCitLRVlXT1JEUz0ifmFtZDY0 IH5wcGMgfng4NiB+eDg2LWZic2QiCiAKIFJFU1RSSUNUPSJzdHJpcCB0ZXN0IgogCi1JVVNFPSJl bGliY19GcmVlQlNEIGdub21lIHF0LXN0YXRpYyBzcGVsbCBpYTMyIgorSVVTRT0iZWxpYmNfRnJl ZUJTRCBnbm9tZSBpYTMyIHF0LXN0YXRpYyBzcGVsbCIKIE1ZX0xJTkdVQVM9ImJlIGJnIGNzIGRh IGRlIGVsIGVuIGVuLUdCIGVzLUVTIGVzLUxBIGZpIGZyIGZyLUNBIGZ5IGhpCiBociBodSBpdCBq YSBrYSBrbyBsdCBtayBuYiBubCBubiBwbCBwdCBwdC1CUiBydSBzdiB0ciB6aC1DTiB6aC1UVyIK IApAQCAtMjgsMTEgKzI4LDggQEAKIE9fU1VGRj0iMjA0MiIKIAogU1JDX1VSST0iCi0JYW1kNjQ/ ICggCi0JCWlhMzI/ICgKLQkJCQlxdC1zdGF0aWM/ICggJHtPX1VSSX1saW51eCR7T19GVFB9aTM4 Ni8ke1B9LmdjYzQtcXQ0LmkzODYudGFyLmJ6MiApCi0JCQkJIXF0LXN0YXRpYz8gKCAke09fVVJJ fWxpbnV4JHtPX0ZUUH1pMzg2L3NoYXJlZC8ke1B9LmdjYzQtc2hhcmVkLXF0My5pMzg2LnRhci5i ejIgKQotCQkJICkKKwlhbWQ2ND8gKAorCQlpYTMyPyAoICR7T19VUkl9bGludXgke09fRlRQfWkz ODYvc2hhcmVkLyR7UH0uZ2NjNC1zaGFyZWQtcXQzLmkzODYudGFyLmJ6MiApCiAJCSFpYTMyPyAo ICR7T19VUkl9bGludXgke09fRlRQfXg4Nl82NC8ke1B9LmdjYzQtc2hhcmVkLXF0My54ODZfNjQu dGFyLmJ6MiApCiAJKQogCXBwYz8gKCAke09fVVJJfWxpbnV4JHtPX0ZUUH1wcGMvc2hhcmVkLyR7 UH0uZ2NjNC1zaGFyZWQtcXQzLnBwYy50YXIuYnoyICkKQEAgLTYwLDIzICs1NywyNSBAQAogCXgx MS1saWJzL2xpYlgxMQogCXgxMS1saWJzL2xpYlNNCiAJeDExLWxpYnMvbGliSUNFCi0JeDg2PyAo CQotCQkhcXQtc3RhdGljPyAoID14MTEtbGlicy9xdC0zKiApCi0JCSkKLQlhbWQ2ND8gKAotCQkJ IWlhMzI/ICggPXgxMS1saWJzL3F0LTMqICkKLQkJCWlhMzI/ICggCi0JCQkJIXF0LXN0YXRpYz8g KCBhcHAtZW11bGF0aW9uL2VtdWwtbGludXgteDg2LXF0bGlicyApCi0JCQkJKQorCSFxdC1zdGF0 aWM/ICggPXgxMS1saWJzL3F0LTMqICkKKwlhbWQ2ND8gKCA9eDExLWxpYnMvcXQtMyoKKwkJCSBp YTMyPyAoIGFwcC1lbXVsYXRpb24vZW11bC1saW51eC14ODYtcXRsaWJzICkKKwkpCiAJcHBjPyAo ID14MTEtbGlicy9xdC0zKiApCiAJc3BlbGw/ICggYXBwLXRleHQvYXNwZWxsICkKIAl4ODYtZmJz ZD8gKCA9eDExLWxpYnMvcXQtMyogPXZpcnR1YWwvbGlic3RkYysrLTMqICkiCiAKIHBrZ19zZXR1 cCgpIHsKLQl1c2UgYW1kNjQgJiYgUz0iJHtXT1JLRElSfS8ke1B9LSR7T19TVUZGfS5nY2M0LXNo YXJlZC1xdDMueDg2XzY0IgorCWlmIHVzZSBhbWQ2NDsgdGhlbgorCQlpZiB1c2UgaWEzMjsgdGhl bgorCQkJUz0iJHtXT1JLRElSfS8ke1B9LSR7T19TVUZGfS5nY2M0LXNoYXJlZC1xdDMuaTM4NiIK KwkJZWxzZQorCQkJUz0iJHtXT1JLRElSfS8ke1B9LSR7T19TVUZGfS5nY2M0LXNoYXJlZC1xdDMu eDg2XzY0IgorCQlmaQorCWZpCiAJdXNlIHBwYyAmJiBTPSIke1dPUktESVJ9LyR7UH0tJHtPX1NV RkZ9LmdjYzQtc2hhcmVkLXF0My5wcGMiCiAJdXNlIHg4Ni1mYnNkICYmIFM9IiR7V09SS0RJUn0v JHtQfS0ke09fU1VGRn0tZnJlZWJzZDUtc2hhcmVkLXF0My5pMzg2IgotCWlmIHVzZSB4ODYgfHwg dXNlIGlhMzI7IHRoZW4KKwlpZiB1c2UgeDg2OyB0aGVuCiAJCWlmIHVzZSBxdC1zdGF0aWM7IHRo ZW4KIAkJCVM9IiR7V09SS0RJUn0vJHtQfS0ke09fU1VGRn0uZ2NjNC1xdDQuaTM4NiIKIAkJZWxz ZQo=