old

Package-Manager: portage-2.2.0_alpha67/cvs/Linux x86_64

diff --git a/x11-misc/xdiskusage/ChangeLog b/x11-misc/xdiskusage/ChangeLog
index ede2a97e80722ae75ab8e6a0db4ff0834885986e..f6da673b8e4c57b1c6cb49ab87d94f4cfb7b2b92 100644 (file)
--- a/x11-misc/xdiskusage/ChangeLog
+++ b/x11-misc/xdiskusage/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xdiskusage
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdiskusage/ChangeLog,v 1.21 2011/03/28 13:31:25 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdiskusage/ChangeLog,v 1.22 2011/10/16 19:44:36 ssuominen Exp $
+
+  16 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -xdiskusage-1.48.ebuild,
+  -files/xdiskusage-1.48-amd64.patch:
+  old
 
   28 Mar 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   xdiskusage-1.48_p20100606.ebuild:

diff --git a/x11-misc/xdiskusage/Manifest b/x11-misc/xdiskusage/Manifest
index a021f024d94d8d788ae6b7caf2d31da584c16ff3..00f0d6f7cb7dade2790d95100de1fb33e72f3331 100644 (file)
--- a/x11-misc/xdiskusage/Manifest
+++ b/x11-misc/xdiskusage/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX xdiskusage-1.48-amd64.patch 1146 RMD160 a459d3648732a3778af17a7b4ea5ef9a8aad9623 SHA1 5921f2788c084011ebc2e5a448c14cea4c118352 SHA256 8b53e4aa6e4ce51ea7a5cb93d07da20495054fe49454a0164c2c7b5dbfda13b1
-DIST xdiskusage-1.48.tgz 37332 RMD160 a656484c71f74a2f0a8e703954bc212e9bd86cf5 SHA1 8069d521beec27004baa1f534559cdc7ff99e27f SHA256 7842aa42510bf52c367164d44a977915ad9f070864d5175157738f8d6894274b
 DIST xdiskusage-1.48_p20100606.tar.xz 18036 RMD160 ae21a15ea1690718daf3348aac7f8a2a928a3527 SHA1 672495dd7c3e3352b7696f74ff5ed954444cce64 SHA256 3e67d3b6ace87781c29c83648b7741b5d8400db965745e65a035f92d456e2eb8
-EBUILD xdiskusage-1.48.ebuild 825 RMD160 79b950236a4793bf9ca507b551a021bc2354b8d4 SHA1 660e6d6e192f5264643b80508b7698f99825c21f SHA256 a95e61f4e143aeae489e276a39b62545be6eb6537a31b746619ce886040bc032
 EBUILD xdiskusage-1.48_p20100606.ebuild 852 RMD160 4302ef396e5ad8614b28fc60ecbf0070eb5a9309 SHA1 646a56b8c4bdceb650e95314b58442be0086896f SHA256 7d89b39212c9da148b73dcacfcc68fefe4eaf34792b0206d338e21c16f914cd7
-MISC ChangeLog 2478 RMD160 10ea64d0b172cc0c1e996ff2494aa278d3d3014d SHA1 c481c3c6a580e1dadaabfe51fedca2a1dd877e27 SHA256 45be6211ea7911745251109cccbb1a7beede33d34f7dff38c4f6bb824e584a67
+MISC ChangeLog 2601 RMD160 b5114397a28b34bec72a3441a59007f1cf1fc9a9 SHA1 2d3f9b5cadd2b1893b41eacfa9b3bdd0aa016e6a SHA256 a6d77fe2ce0404ee6c704ede880b5638796f7dd57843d94a16615c57be9ff953
 MISC metadata.xml 296 RMD160 6100f1bfc4a6609214d880353a8ce2fc9c8f556a SHA1 da8caf98315361c34582768763f6f2f9177d2e49 SHA256 4c4f66846bf4fd5639138fd2c330d9ca635f1c8f56f464fe28d49b5a05e544dd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk2Qja8ACgkQuUQtlDBCeQKx8QCfRREyOrwUFs/t9Cmg+E4vPveV
-RTgAn1lXLhIseyB2+KAr+QL0g6hjoV5z
-=aIhy
+iQEcBAEBAgAGBQJOmzQZAAoJEEdUh39IaPFNiicH/jNN8Q2qZHek5axGURg5ul9/
+PvSPVL63KWW9lEa30EMC272HqZ23V5zRn0m3UN2UEt2bVCAXx0UzmNJo7ZbllWcr
+DhH5GeGq2arS6UNm0vZFprLzExzcxo/Z8KgFWTIEHjwnx99DQ9EikEVkF6ihijQV
+9VFT44YPy4SmVcJGB1Ra6wUMDOX16wbyH667ouq0HybTrZenrK0EL8+bdTQgkOmS
+ogJ1/L7s1wLwaKZXCjYJEw8Xu8VQMZvbsq+IyRQyvRW3KgFXguCy5pmveKTRKJZR
+3ylGkrQLmfzla+Lkhk7nk8YUgigItXj3oHSwMQl5F87mr+fPv4IMD/ya9vfKmTg=
+=ADqG
 -----END PGP SIGNATURE-----

diff --git a/x11-misc/xdiskusage/files/xdiskusage-1.48-amd64.patch b/x11-misc/xdiskusage/files/xdiskusage-1.48-amd64.patch
deleted file mode 100644 (file)
index 632861b..0000000
--- a/x11-misc/xdiskusage/files/xdiskusage-1.48-amd64.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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
deleted file mode 100644 (file)
index fe12cb6..0000000
--- a/x11-misc/xdiskusage/xdiskusage-1.48.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2011 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.11 2011/03/20 20:04:02 ssuominen Exp $
-
-EAPI=1
-inherit eutils
-
-DESCRIPTION="front end to xdu for viewing disk usage graphically under X11"
-HOMEPAGE="http://xdiskusage.sourceforge.net/"
-SRC_URI="http://xdiskusage.sourceforge.net/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/fltk:1"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-       unpack ${A}
-       epatch "${FILESDIR}"/${P}-amd64.patch
-}
-
-src_compile() {
-       econf
-
-       emake -j1 \
-               CXXFLAGS="$CXXFLAGS `fltk-config --cxxflags`" \
-               LDLIBS="`fltk-config --ldflags`" || die
-}
-
-src_install() {
-       dobin xdiskusage || die
-       doman xdiskusage.1
-       dodoc README
-}