stable amd64, bug #215392. cleaning old revisions.

(Portage version: 2.1.5_rc5)

8 files changed, 12 insertions, 214 deletions

diff --git a/sys-block/gparted/ChangeLog b/sys-block/gparted/ChangeLog
index c4da12a61051..a4a019cc7bcb 100644
--- a/sys-block/gparted/ChangeLog
+++ b/sys-block/gparted/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-block/gparted
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/gparted/ChangeLog,v 1.46 2008/04/03 14:51:52 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/gparted/ChangeLog,v 1.47 2008/04/19 22:49:28 eva Exp $
+
+  19 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/gparted-0.2.5-llabs.patch, -files/gparted-0.3.1-llabs.patch,
+  -files/gparted-0.3.3-device-reload-crash.patch, -gparted-0.3.1.ebuild,
+  -gparted-0.3.3.ebuild, -gparted-0.3.3-r1.ebuild:
+  cleaning old revisions.
+
+  19 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org> gparted-0.3.5.ebuild:
+  stable amd64, bug #215392
 
   03 Apr 2008; Brent Baude <ranger@gentoo.org> gparted-0.3.5.ebuild:
   stable ppc, bug 215392
diff --git a/sys-block/gparted/files/gparted-0.2.5-llabs.patch b/sys-block/gparted/files/gparted-0.2.5-llabs.patch
deleted file mode 100644
index f8622a46f689..000000000000
--- a/sys-block/gparted/files/gparted-0.2.5-llabs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/OperationResizeMove.cc.bak	2006-07-08 00:09:58.000000000 -0400
-+++ src/OperationResizeMove.cc	2006-07-08 00:09:30.000000000 -0400
-@@ -46,7 +46,7 @@
- {
- 	//FIXME:make messages more informative by specifying shrink/grow instead of resize. 
- 	//if startsector has changed we consider it a move
--	Sector diff = std::abs( partition_new .sector_start - partition_original .sector_start ) ;
-+	Sector diff = llabs( partition_new .sector_start - partition_original .sector_start ) ;
- 	if ( diff ) 
- 	{
- 		if ( diff > 0 )
-@@ -60,7 +60,7 @@
- 	}
- 			
- 	//check if size has changed
--	diff = std::abs( partition_original .get_length() - partition_new .get_length() ) ;
-+	diff = llabs( partition_original .get_length() - partition_new .get_length() ) ;
- 	if ( diff )
- 	{
- 		if ( description .empty() ) 
diff --git a/sys-block/gparted/files/gparted-0.3.1-llabs.patch b/sys-block/gparted/files/gparted-0.3.1-llabs.patch
deleted file mode 100644
index fddbc7dfe0e4..000000000000
--- a/sys-block/gparted/files/gparted-0.3.1-llabs.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- src/GParted_Core.cc	2006/09/25 21:49:32	1.1
-+++ src/GParted_Core.cc	2006/09/25 22:03:31
-@@ -1604,7 +1604,7 @@ bool GParted_Core::copy_filesystem( cons
- 
- 	while ( succes &&
- 		timer .elapsed() <= smallest_time && 
--		std::abs( done ) + N <= length && 
-+		llabs( done ) + N <= length && 
- 		optimal_blocksize * 2 < N )
- 	{
- 		if ( done != 0 ) 
-@@ -1648,7 +1648,7 @@ bool GParted_Core::copy_filesystem( cons
- 		      	    	    dst_device,
- 		      	    	    src_start + ( dst_start > src_start ? 0 : done ),
- 		      	    	    dst_start + ( dst_start > src_start ? 0 : done ),
--		      	    	    length - std::abs( done ), 
-+		      	    	    length - llabs( done ), 
- 		      	    	    optimal_blocksize,
- 		      	    	    operationdetail,
- 			    	    readonly,
-@@ -1822,7 +1822,7 @@ bool GParted_Core::copy_blocks( const Gl
- 	if ( lp_device_src && lp_device_dst && ped_device_open( lp_device_src ) && ped_device_open( lp_device_dst ) )
- 	{
- 		Glib::ustring error_message ;
--		buf = static_cast<char *>( malloc( std::abs( blocksize ) * 512 ) ) ;
-+		buf = static_cast<char *>( malloc( llabs( blocksize ) * 512 ) ) ;
- 		if ( buf )
- 		{
- 			ped_device_sync( lp_device_dst ) ;
-@@ -1843,7 +1843,7 @@ bool GParted_Core::copy_blocks( const Gl
- 			operationdetail .get_last_child() .add_child( OperationDetail( "", STATUS_NONE ) ) ;
- 			
- 			Glib::Timer timer_progress_timeout, timer_total ;
--			while( succes && std::abs( done ) < length )
-+			while( succes && llabs( done ) < length )
- 			{
- 				succes = copy_block( lp_device_src,
- 						     lp_device_dst,
-@@ -1858,7 +1858,7 @@ bool GParted_Core::copy_blocks( const Gl
- 				if ( timer_progress_timeout .elapsed() >= 0.5 )
- 				{
- 					set_progress_info( length,
--							   std::abs( done + blocksize ),
-+							   llabs( done + blocksize ),
- 							   timer_total,
- 							   operationdetail .get_last_child() .get_last_child(),
- 							   readonly ) ;
-@@ -1877,13 +1877,13 @@ bool GParted_Core::copy_blocks( const Gl
- 
- 		//final description
- 		operationdetail .get_last_child() .get_last_child() .set_description( 
--			String::ucompose( readonly ? _("%1 of %2 read") : _("%1 of %2 copied"), std::abs( done ), length ), FONT_ITALIC ) ;
-+			String::ucompose( readonly ? _("%1 of %2 read") : _("%1 of %2 copied"), llabs( done ), length ), FONT_ITALIC ) ;
- 		
- 		if ( ! succes && ! error_message .empty() )
- 			operationdetail .get_last_child() .add_child( 
- 				OperationDetail( error_message, STATUS_NONE, FONT_ITALIC ) ) ;
- 		
--		total_done += std::abs( done ) ;
-+		total_done += llabs( done ) ;
- 	
- 		//close and destroy the devices..
- 		ped_device_close( lp_device_src ) ;
-@@ -1912,7 +1912,7 @@ bool GParted_Core::copy_block( PedDevice
- 
- 	if ( blocksize < 0 )
- 	{
--		blocksize = std::abs( blocksize ) ;
-+		blocksize = llabs( blocksize ) ;
- 		offset_src -= ( blocksize -1 ) ;
- 		offset_dst -= ( blocksize -1 ) ;
- 	}
diff --git a/sys-block/gparted/files/gparted-0.3.3-device-reload-crash.patch b/sys-block/gparted/files/gparted-0.3.3-device-reload-crash.patch
deleted file mode 100644
index b9e5c1b560f1..000000000000
--- a/sys-block/gparted/files/gparted-0.3.3-device-reload-crash.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ur gparted-0.3.3.orig/src/Win_GParted.cc gparted-0.3.3/src/Win_GParted.cc
---- gparted-0.3.3.orig/src/Win_GParted.cc	2006-12-01 18:14:23.000000000 +0500
-+++ gparted-0.3.3/src/Win_GParted.cc	2007-11-04 11:46:32.000000000 +0500
-@@ -916,8 +916,13 @@
- 
- void Win_GParted::combo_devices_changed()
- {
-+	unsigned int old_current_device = current_device;
- 	//set new current device
- 	current_device = combo_devices .get_active_row_number() ;
-+	if ( current_device == (unsigned int) -1 )
-+		current_device = old_current_device;
-+	if ( current_device >= devices .size() )
-+		current_device = 0 ;
- 	set_title( String::ucompose( _("%1 - GParted"), devices[ current_device ] .get_path() ) );
- 	
- 	//refresh label_device_info
diff --git a/sys-block/gparted/gparted-0.3.1.ebuild b/sys-block/gparted/gparted-0.3.1.ebuild
deleted file mode 100644
index 98d188e6e39d..000000000000
--- a/sys-block/gparted/gparted-0.3.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/gparted/gparted-0.3.1.ebuild,v 1.6 2007/02/23 17:53:19 dang Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Gnome Partition Editor"
-HOMEPAGE="http://gparted.sourceforge.net/"
-
-SRC_URI="mirror://sourceforge/gparted/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="fat hfs jfs ntfs reiserfs reiser4 xfs"
-
-RDEPEND="~sys-apps/parted-1.7.1
-		>=dev-cpp/gtkmm-2.8.0
-		fat? ( sys-fs/dosfstools )
-		ntfs? ( sys-fs/ntfsprogs )
-		hfs? ( sys-fs/hfsutils )
-		jfs? ( sys-fs/jfsutils )
-		reiserfs? ( sys-fs/reiserfsprogs )
-		reiser4? ( sys-fs/reiser4progs )
-		xfs? ( sys-fs/xfsprogs sys-fs/xfsdump )"
-
-DEPEND="${RDEPEND}
-		>=dev-util/pkgconfig-0.12
-		>=dev-util/intltool-0.29"
-
-src_unpack() {
-	gnome2_src_unpack
-	epatch "${FILESDIR}"/${P}-llabs.patch
-}
diff --git a/sys-block/gparted/gparted-0.3.3-r1.ebuild b/sys-block/gparted/gparted-0.3.3-r1.ebuild
deleted file mode 100644
index 0e8ad80bc7e1..000000000000
--- a/sys-block/gparted/gparted-0.3.3-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/gparted/gparted-0.3.3-r1.ebuild,v 1.1 2008/01/14 00:02:55 eva Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Gnome Partition Editor"
-HOMEPAGE="http://gparted.sourceforge.net/"
-
-SRC_URI="mirror://sourceforge/gparted/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="fat hfs jfs ntfs reiserfs reiser4 xfs"
-
-common_depends=">=sys-apps/parted-1.7.1
-		>=dev-cpp/gtkmm-2.8.0"
-
-RDEPEND="${common_depends}
-		fat? ( sys-fs/dosfstools )
-		ntfs? ( sys-fs/ntfsprogs )
-		hfs? ( sys-fs/hfsutils )
-		jfs? ( sys-fs/jfsutils )
-		reiserfs? ( sys-fs/reiserfsprogs )
-		reiser4? ( sys-fs/reiser4progs )
-		xfs? ( sys-fs/xfsprogs sys-fs/xfsdump )"
-
-DEPEND="${common_depends}
-		>=dev-util/pkgconfig-0.12
-		>=dev-util/intltool-0.29"
-
-src_unpack() {
-	gnome2_src_unpack
-
-	epatch "${FILESDIR}/${P}-device-reload-crash.patch"
-}
diff --git a/sys-block/gparted/gparted-0.3.3.ebuild b/sys-block/gparted/gparted-0.3.3.ebuild
deleted file mode 100644
index 8c402e144bfe..000000000000
--- a/sys-block/gparted/gparted-0.3.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/gparted/gparted-0.3.3.ebuild,v 1.7 2007/09/21 07:17:26 mr_bones_ Exp $
-
-inherit gnome2
-
-DESCRIPTION="Gnome Partition Editor"
-HOMEPAGE="http://gparted.sourceforge.net/"
-
-SRC_URI="mirror://sourceforge/gparted/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="fat hfs jfs ntfs reiserfs reiser4 xfs"
-
-common_depends=">=sys-apps/parted-1.7.1
-		>=dev-cpp/gtkmm-2.8.0"
-
-RDEPEND="${common_depends}
-		fat? ( sys-fs/dosfstools )
-		ntfs? ( sys-fs/ntfsprogs )
-		hfs? ( sys-fs/hfsutils )
-		jfs? ( sys-fs/jfsutils )
-		reiserfs? ( sys-fs/reiserfsprogs )
-		reiser4? ( sys-fs/reiser4progs )
-		xfs? ( sys-fs/xfsprogs sys-fs/xfsdump )"
-
-DEPEND="${common_depends}
-		>=dev-util/pkgconfig-0.12
-		>=dev-util/intltool-0.29"
diff --git a/sys-block/gparted/gparted-0.3.5.ebuild b/sys-block/gparted/gparted-0.3.5.ebuild
index 06eb2d218ea8..db68637fef2a 100644
--- a/sys-block/gparted/gparted-0.3.5.ebuild
+++ b/sys-block/gparted/gparted-0.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/gparted/gparted-0.3.5.ebuild,v 1.4 2008/04/03 14:51:52 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/gparted/gparted-0.3.5.ebuild,v 1.5 2008/04/19 22:49:28 eva Exp $
 
 inherit eutils gnome2
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/gparted/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~sparc x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="fat hfs jfs ntfs reiserfs reiser4 xfs"
 
 common_depends=">=sys-apps/parted-1.7.1