Fix bug #135633.

Package-Manager: portage-2.1.2_pre1

5 files changed, 75 insertions, 5 deletions

diff --git a/x11-misc/xdiskusage/ChangeLog b/x11-misc/xdiskusage/ChangeLog
index 8f9ce008b988..e6a5edd00479 100644
--- a/x11-misc/xdiskusage/ChangeLog
+++ b/x11-misc/xdiskusage/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xdiskusage
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdiskusage/ChangeLog,v 1.12 2006/01/21 16:55:49 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdiskusage/ChangeLog,v 1.13 2006/09/21 12:14:51 nelchael Exp $
+
+  21 Sep 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/xdiskusage-1.48-amd64.patch, xdiskusage-1.48.ebuild:
+  Fix bug #135633.
 
   21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
   -xdiskusage-1.46.ebuild, xdiskusage-1.48.ebuild:
diff --git a/x11-misc/xdiskusage/Manifest b/x11-misc/xdiskusage/Manifest
index 67d8a032ab00..f9cb1eebb308 100644
--- a/x11-misc/xdiskusage/Manifest
+++ b/x11-misc/xdiskusage/Manifest
@@ -1,4 +1,30 @@
-MD5 38ba28b98adee0a1a4894b1f206713a8 ChangeLog 1341
-MD5 a59c5a641ce70122426e1b770900589c files/digest-xdiskusage-1.48 63
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX xdiskusage-1.48-amd64.patch 1146 RMD160 a459d3648732a3778af17a7b4ea5ef9a8aad9623 SHA1 5921f2788c084011ebc2e5a448c14cea4c118352 SHA256 8b53e4aa6e4ce51ea7a5cb93d07da20495054fe49454a0164c2c7b5dbfda13b1
+MD5 90a37406fe548607a7a57acacd50d31e files/xdiskusage-1.48-amd64.patch 1146
+RMD160 a459d3648732a3778af17a7b4ea5ef9a8aad9623 files/xdiskusage-1.48-amd64.patch 1146
+SHA256 8b53e4aa6e4ce51ea7a5cb93d07da20495054fe49454a0164c2c7b5dbfda13b1 files/xdiskusage-1.48-amd64.patch 1146
+DIST xdiskusage-1.48.tgz 37332 RMD160 a656484c71f74a2f0a8e703954bc212e9bd86cf5 SHA1 8069d521beec27004baa1f534559cdc7ff99e27f SHA256 7842aa42510bf52c367164d44a977915ad9f070864d5175157738f8d6894274b
+EBUILD xdiskusage-1.48.ebuild 840 RMD160 f45aa7264a8526ca3f3ef711a7ee12cc63735ce6 SHA1 63dc7a14977d1892f9932cf718bd48641167dcb9 SHA256 ee03a2dbbd9f440f3151664a7b9a6fc96f48c269b46b26bb28fb49ef184769c3
+MD5 8ce1c536b185b4fb14aeaf41da31841f xdiskusage-1.48.ebuild 840
+RMD160 f45aa7264a8526ca3f3ef711a7ee12cc63735ce6 xdiskusage-1.48.ebuild 840
+SHA256 ee03a2dbbd9f440f3151664a7b9a6fc96f48c269b46b26bb28fb49ef184769c3 xdiskusage-1.48.ebuild 840
+MISC ChangeLog 1476 RMD160 2a36ed5ffb87a375e6359de4ed2262e7a2156927 SHA1 bdd9acfac7038d09330452fbca51ac4327f4f888 SHA256 795886c782cbce6562ea5ebcef2ecf523b438303e39af321c9341bd3b3c72c7e
+MD5 1a005941562578b5b0b76928d2bd11dc ChangeLog 1476
+RMD160 2a36ed5ffb87a375e6359de4ed2262e7a2156927 ChangeLog 1476
+SHA256 795886c782cbce6562ea5ebcef2ecf523b438303e39af321c9341bd3b3c72c7e ChangeLog 1476
+MISC metadata.xml 296 RMD160 6100f1bfc4a6609214d880353a8ce2fc9c8f556a SHA1 da8caf98315361c34582768763f6f2f9177d2e49 SHA256 4c4f66846bf4fd5639138fd2c330d9ca635f1c8f56f464fe28d49b5a05e544dd
 MD5 396489b6f1da40e2868244e103f30ce2 metadata.xml 296
-MD5 52b49f77569e5eb9c70c5670c821d870 xdiskusage-1.48.ebuild 752
+RMD160 6100f1bfc4a6609214d880353a8ce2fc9c8f556a metadata.xml 296
+SHA256 4c4f66846bf4fd5639138fd2c330d9ca635f1c8f56f464fe28d49b5a05e544dd metadata.xml 296
+MD5 a76c2d840f2a9b994fca3b25b3cdf6b8 files/digest-xdiskusage-1.48 235
+RMD160 f8201683d1cf9b0b1b3bb8055b8e4e5be0bd51cb files/digest-xdiskusage-1.48 235
+SHA256 d377e1a8154ed73d7ac025f7aedc7831f09ca8ca16b6d8a0f633713882382184 files/digest-xdiskusage-1.48 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFEoJEgo/w9rxVVVERAusUAKCHKfWa8kEOSD94W2rt0ZslY8siWwCgqgpt
+dAY6mWpJ2iVCD+PgD54XXZA=
+=diSr
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/xdiskusage/files/digest-xdiskusage-1.48 b/x11-misc/xdiskusage/files/digest-xdiskusage-1.48
index be37ec87535b..21d8b796fa80 100644
--- a/x11-misc/xdiskusage/files/digest-xdiskusage-1.48
+++ b/x11-misc/xdiskusage/files/digest-xdiskusage-1.48
@@ -1 +1,3 @@
 MD5 a902aa9d73761ade98256c3cd5c1f533 xdiskusage-1.48.tgz 37332
+RMD160 a656484c71f74a2f0a8e703954bc212e9bd86cf5 xdiskusage-1.48.tgz 37332
+SHA256 7842aa42510bf52c367164d44a977915ad9f070864d5175157738f8d6894274b xdiskusage-1.48.tgz 37332
diff --git a/x11-misc/xdiskusage/files/xdiskusage-1.48-amd64.patch b/x11-misc/xdiskusage/files/xdiskusage-1.48-amd64.patch
new file mode 100644
index 000000000000..632861b8e0a9
--- /dev/null
+++ b/x11-misc/xdiskusage/files/xdiskusage-1.48-amd64.patch
@@ -0,0 +1,29 @@
+--- xdiskusage-1.48.original/xdiskusage.C	2006-09-21 12:03:32.000000000 +0000
++++ xdiskusage-1.48/xdiskusage.C	2006-09-21 12:10:17.000000000 +0000
+@@ -510,7 +510,7 @@
+     ulong size = strtoul(buffer, &p, 10);
+     if (!isspace(*p) || p == buffer) {
+       if (!*p || *p=='#') continue; // ignore blank lines or comments (?)
+-      fl_alert("%s:%d: does not look like du output: %s", path, line_no, p);
++      fl_alert("%s:%d: does not look like du output: %s", path, (int)line_no, p);
+       cancelled = 1;
+       continue;
+     }
+@@ -988,7 +988,7 @@
+ void OutputWindow::sort_cb(Fl_Widget* o, void*v) {
+   OutputWindow* d = (OutputWindow*)(o->window());
+   int (*compare)(const Node*, const Node*);
+-  switch ((int)v) {
++  switch ((long int)v) {
+   case 's': compare = largestfirst; break;
+   case 'r': compare = smallestfirst; break;
+   case 'a': compare = alphabetical; break;
+@@ -1001,7 +1001,7 @@
+ 
+ void OutputWindow::columns_cb(Fl_Widget* o, void*v) {
+   OutputWindow* d = (OutputWindow*)(o->window());
+-  int n = (int)v;
++  int n = (long int)v;
+   ::ncols = n;
+   if (n == d->ncols) return;
+   if (d->current_depth > d->root_depth+n-1) {
diff --git a/x11-misc/xdiskusage/xdiskusage-1.48.ebuild b/x11-misc/xdiskusage/xdiskusage-1.48.ebuild
index 97b8f40cae92..8422aa7192c3 100644
--- a/x11-misc/xdiskusage/xdiskusage-1.48.ebuild
+++ b/x11-misc/xdiskusage/xdiskusage-1.48.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdiskusage/xdiskusage-1.48.ebuild,v 1.4 2006/01/21 16:55:49 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdiskusage/xdiskusage-1.48.ebuild,v 1.5 2006/09/21 12:14:51 nelchael Exp $
+
+inherit eutils
 
 DESCRIPTION="front end to xdu for viewing disk usage graphically under X11"
 SRC_URI="http://xdiskusage.sourceforge.net/${P}.tgz"
@@ -14,6 +16,13 @@ IUSE=""
 DEPEND="x11-libs/fltk
 	virtual/glut"
 
+src_unpack() {
+
+	unpack ${A}
+	epatch "${FILESDIR}/${P}-amd64.patch"
+
+}
+
 src_compile() {
 	econf || die "configure failed"