fixing the llabs issue for 0.3.1; bug 149122; thanks Ed Catmur for the patch

Package-Manager: portage-2.1.2_pre1-r3

4 files changed, 96 insertions, 11 deletions

diff --git a/sys-block/gparted/ChangeLog b/sys-block/gparted/ChangeLog
index a3acd23905fb..99d595a372cc 100644
--- a/sys-block/gparted/ChangeLog
+++ b/sys-block/gparted/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-block/gparted
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/gparted/ChangeLog,v 1.29 2006/09/15 20:10:11 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/gparted/ChangeLog,v 1.30 2006/09/26 13:28:06 blubb Exp $
+
+  26 Sep 2006; Simon Stelling <blubb@gentoo.org>
+  +files/gparted-0.3.1-llabs.patch, gparted-0.3.1.ebuild:
+  fixing the llabs issue for 0.3.1; bug 149122; thanks Ed Catmur for the patch
 
 *gparted-0.3.1 (15 Sep 2006)
 
diff --git a/sys-block/gparted/Manifest b/sys-block/gparted/Manifest
index 2a8aa1a9d9d3..9d685d4daa03 100644
--- a/sys-block/gparted/Manifest
+++ b/sys-block/gparted/Manifest
@@ -2,6 +2,10 @@ AUX gparted-0.2.5-llabs.patch 796 RMD160 e8f7ca03ed5b0754b67b2f72f78624b0320c83e
 MD5 5b6ce360acc20c55a6939cbebee57916 files/gparted-0.2.5-llabs.patch 796
 RMD160 e8f7ca03ed5b0754b67b2f72f78624b0320c83ed files/gparted-0.2.5-llabs.patch 796
 SHA256 951c69e36a652a4f91c22293758e52b2ba740973437f4caf50f61b3f16e94a0f files/gparted-0.2.5-llabs.patch 796
+AUX gparted-0.3.1-llabs.patch 2871 RMD160 077c82c19e860203e39544c2df41b1bd821d7f02 SHA1 9ee254f0b7405ee270d8881535119b73e11ff91d SHA256 fbbfa242a53978a360d44263870c22ee89dcfb30f7ce31196ca9a965d98e576b
+MD5 a47bef636f7a4d0f8ba38b73bacd389f files/gparted-0.3.1-llabs.patch 2871
+RMD160 077c82c19e860203e39544c2df41b1bd821d7f02 files/gparted-0.3.1-llabs.patch 2871
+SHA256 fbbfa242a53978a360d44263870c22ee89dcfb30f7ce31196ca9a965d98e576b files/gparted-0.3.1-llabs.patch 2871
 DIST gparted-0.2.4.tar.bz2 418636 RMD160 9c7f4051764909a05141685ca02d429aab9d93b8 SHA1 2193233067542f0789cd056540456bd912192a90 SHA256 aa4bc70c2415608282d8f97121539c93b1db5d2247940da6848c3191643b4794
 DIST gparted-0.2.5.tar.bz2 428869 RMD160 8af4543b333371603b96ff8ec5ea6c9e73b2ebad SHA1 3361750b239b679ae5e650098c06272570d188f5 SHA256 8bce06581c1e8f75c8133f790cba0d826119e228abd2dbb8c1499a70bc86beff
 DIST gparted-0.3.1.tar.bz2 466481 RMD160 09a5c26427c47216a9ef16ef4f56082caa65f78a SHA1 c3689f51b61cc3f41ebb0345c478da0df1346039 SHA256 648cbfe3ba536dca8c1d56f9fac946dac7c88cbfa8ec0db1aa7dee868c0f3150
@@ -13,14 +17,14 @@ EBUILD gparted-0.2.5.ebuild 912 RMD160 17025cfaceca3b9b724138a6027271fce8cee7b6
 MD5 7929b444037154b0200728d27edeb5e8 gparted-0.2.5.ebuild 912
 RMD160 17025cfaceca3b9b724138a6027271fce8cee7b6 gparted-0.2.5.ebuild 912
 SHA256 1b237a33c89f0e52f64fb841770e774f0a411a615072cbc697197f58306ec3a4 gparted-0.2.5.ebuild 912
-EBUILD gparted-0.3.1.ebuild 829 RMD160 88b95221b47e9d7221e5ee4771e049003db3d38f SHA1 c0b9aa855986f29389bfc04836a324fb75c140a9 SHA256 befbe80d863a2d0568b03913f76979cf2fd14908148ce0b4b7277df8c1d61000
-MD5 6eb7b6427d8db841450fb3682545acf7 gparted-0.3.1.ebuild 829
-RMD160 88b95221b47e9d7221e5ee4771e049003db3d38f gparted-0.3.1.ebuild 829
-SHA256 befbe80d863a2d0568b03913f76979cf2fd14908148ce0b4b7277df8c1d61000 gparted-0.3.1.ebuild 829
-MISC ChangeLog 3485 RMD160 fd40813a046696d299c1c94a7d4111dcd615451d SHA1 3bec4780acce467e6b589e4d4d9a666b338b48f2 SHA256 95a8857accc5e9b6123058d0609d026590cdce7b80282015f17fcbaab1a352f1
-MD5 bf7bed3a545b50d187aa7aea5d8ff3e6 ChangeLog 3485
-RMD160 fd40813a046696d299c1c94a7d4111dcd615451d ChangeLog 3485
-SHA256 95a8857accc5e9b6123058d0609d026590cdce7b80282015f17fcbaab1a352f1 ChangeLog 3485
+EBUILD gparted-0.3.1.ebuild 912 RMD160 d864acc9812ea7649b99108cdcb746f05881c8ff SHA1 142c7562a46e86551e171baf17d25583501c4327 SHA256 c90a4b9fe50e028f28634c014dcd04af13a05810ee570595c81abdf50b8dfbc5
+MD5 3c2f7873719cdeb182200855afeb3cd7 gparted-0.3.1.ebuild 912
+RMD160 d864acc9812ea7649b99108cdcb746f05881c8ff gparted-0.3.1.ebuild 912
+SHA256 c90a4b9fe50e028f28634c014dcd04af13a05810ee570595c81abdf50b8dfbc5 gparted-0.3.1.ebuild 912
+MISC ChangeLog 3672 RMD160 f22a7c26330ea69430b9046598fc6672646ff3d4 SHA1 8c22f15bc48b24be2942c706194dd7418d90cc12 SHA256 902070a8046fcd000857cd377ddd440fdb01625ef234755e4fbbc5912d685b1c
+MD5 6bfed2a498c9ea9a67235d53eb7412ba ChangeLog 3672
+RMD160 f22a7c26330ea69430b9046598fc6672646ff3d4 ChangeLog 3672
+SHA256 902070a8046fcd000857cd377ddd440fdb01625ef234755e4fbbc5912d685b1c ChangeLog 3672
 MISC metadata.xml 409 RMD160 0624d9437f6d54e879a2deed7aebfd096f7b7d75 SHA1 8c57a2534ef4240ccf648e19d7bab81ac1d3f97e SHA256 fbf0e4fee7f3136650a1bc05cf440f7de0eeec298e8c1edeab8ade16f567b8a0
 MD5 81476cef2aa1a3dee591c798fbdbe91c metadata.xml 409
 RMD160 0624d9437f6d54e879a2deed7aebfd096f7b7d75 metadata.xml 409
diff --git a/sys-block/gparted/files/gparted-0.3.1-llabs.patch b/sys-block/gparted/files/gparted-0.3.1-llabs.patch
new file mode 100644
index 000000000000..fddbc7dfe0e4
--- /dev/null
+++ b/sys-block/gparted/files/gparted-0.3.1-llabs.patch
@@ -0,0 +1,72 @@
+--- 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/gparted-0.3.1.ebuild b/sys-block/gparted/gparted-0.3.1.ebuild
index cbe90a5e0c00..048ff2a89f5e 100644
--- a/sys-block/gparted/gparted-0.3.1.ebuild
+++ b/sys-block/gparted/gparted-0.3.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 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.1 2006/09/15 20:10:11 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/gparted/gparted-0.3.1.ebuild,v 1.2 2006/09/26 13:28:06 blubb Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="Gnome Partition Editor"
 HOMEPAGE="http://gparted.sourceforge.net/"
@@ -27,3 +27,8 @@ RDEPEND=">=sys-apps/parted-1.7.1
 DEPEND="${RDEPEND}
 		>=dev-util/pkgconfig-0.12
 		>=dev-util/intltool-0.29"
+
+src_unpack() {
+	gnome2_src_unpack
+	epatch "${FILESDIR}"/${P}-llabs.patch
+}