fix bug 139638

Package-Manager: portage-3808-svn

4 files changed, 49 insertions, 15 deletions

diff --git a/sys-block/gparted/ChangeLog b/sys-block/gparted/ChangeLog
index 023bdb4dbabb..fd2c5c62feb6 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.25 2006/05/25 21:19:00 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/gparted/ChangeLog,v 1.26 2006/07/12 09:58:56 blubb Exp $
+
+  12 Jul 2006; Simon Stelling <blubb@gentoo.org>
+  +files/gparted-0.2.5-llabs.patch, gparted-0.2.5.ebuild:
+  fix bug 139638
 
 *gparted-0.2.5 (25 May 2006)
 
diff --git a/sys-block/gparted/Manifest b/sys-block/gparted/Manifest
index a61961447de6..78cedc80755a 100644
--- a/sys-block/gparted/Manifest
+++ b/sys-block/gparted/Manifest
@@ -1,18 +1,22 @@
-DIST gparted-0.2.4.tar.bz2 418636 RMD160 9c7f4051764909a05141685ca02d429aab9d93b8 SHA256 aa4bc70c2415608282d8f97121539c93b1db5d2247940da6848c3191643b4794 size 418636
-DIST gparted-0.2.5.tar.bz2 428869 RMD160 8af4543b333371603b96ff8ec5ea6c9e73b2ebad SHA256 8bce06581c1e8f75c8133f790cba0d826119e228abd2dbb8c1499a70bc86beff size 428869
-EBUILD gparted-0.2.4.ebuild 828 RMD160 8508f3334664563c84b55878085666ba8399fb5c SHA1 24ba7806385e593a6c507cb401b461437e05167d SHA256 b2a46a57505b76a504b884cdd1c7b02c0639c2137a0db6d1b69d16808a07f0eb size 828
+AUX gparted-0.2.5-llabs.patch 796 RMD160 e8f7ca03ed5b0754b67b2f72f78624b0320c83ed SHA1 c28b1b56cc4ef37343325207b69d8dc00d615fb8 SHA256 951c69e36a652a4f91c22293758e52b2ba740973437f4caf50f61b3f16e94a0f
+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
+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
+EBUILD gparted-0.2.4.ebuild 828 RMD160 8508f3334664563c84b55878085666ba8399fb5c SHA1 24ba7806385e593a6c507cb401b461437e05167d SHA256 b2a46a57505b76a504b884cdd1c7b02c0639c2137a0db6d1b69d16808a07f0eb
 MD5 68f5c27cb04fed8e831751705356fe7b gparted-0.2.4.ebuild 828
 RMD160 8508f3334664563c84b55878085666ba8399fb5c gparted-0.2.4.ebuild 828
 SHA256 b2a46a57505b76a504b884cdd1c7b02c0639c2137a0db6d1b69d16808a07f0eb gparted-0.2.4.ebuild 828
-EBUILD gparted-0.2.5.ebuild 830 RMD160 90b001a24493a6adfd6218795698b5c158fc23c1 SHA1 c12d9e56520f618a15a930b229e964480a6d9a11 SHA256 dd66d0e6b8548fd520112ae3641de96e77d894eddd5bb8faef338adf6c0a94d7 size 830
-MD5 2f617c7175157b3289bca333fce9bf65 gparted-0.2.5.ebuild 830
-RMD160 90b001a24493a6adfd6218795698b5c158fc23c1 gparted-0.2.5.ebuild 830
-SHA256 dd66d0e6b8548fd520112ae3641de96e77d894eddd5bb8faef338adf6c0a94d7 gparted-0.2.5.ebuild 830
-MISC ChangeLog 3019 RMD160 9acff9148afd19e73c13f453afc797baacf8fc07 SHA1 320dc31c465810154bf62a6460e3e72f7a651f33 SHA256 a9e3a16208da15a160d7bcfc167ce24f7ef663a98b04c72bf7b0ed068001e8d0 size 3019
-MD5 0c05243e992de043aa5d7f75353e0ef4 ChangeLog 3019
-RMD160 9acff9148afd19e73c13f453afc797baacf8fc07 ChangeLog 3019
-SHA256 a9e3a16208da15a160d7bcfc167ce24f7ef663a98b04c72bf7b0ed068001e8d0 ChangeLog 3019
-MISC metadata.xml 409 RMD160 0624d9437f6d54e879a2deed7aebfd096f7b7d75 SHA1 8c57a2534ef4240ccf648e19d7bab81ac1d3f97e SHA256 fbf0e4fee7f3136650a1bc05cf440f7de0eeec298e8c1edeab8ade16f567b8a0 size 409
+EBUILD gparted-0.2.5.ebuild 912 RMD160 eaf705b7805239e9f4ba13cf2da9fd34db41b7a9 SHA1 3b0ef8266ef03b45e0f5a70ac8550af32302fd78 SHA256 fa4496498158de9edcd79a405d709ff67ecaa69100bff075b23164f0bd2bf0f0
+MD5 f50381ad5634aaf1b2c84ddac607fb83 gparted-0.2.5.ebuild 912
+RMD160 eaf705b7805239e9f4ba13cf2da9fd34db41b7a9 gparted-0.2.5.ebuild 912
+SHA256 fa4496498158de9edcd79a405d709ff67ecaa69100bff075b23164f0bd2bf0f0 gparted-0.2.5.ebuild 912
+MISC ChangeLog 3144 RMD160 82f77533a2ac47764a652493d21f3e3a9cefcc82 SHA1 3f4dbe6f0011e04291f691a94e4dccf02057291e SHA256 8c72e9c9b3f106cdd92a21c8cc1cf6c34a9bb831e5fb3e6de3bc31a91bf05f5d
+MD5 de103d2d1801cf4a2475d752f96a789d ChangeLog 3144
+RMD160 82f77533a2ac47764a652493d21f3e3a9cefcc82 ChangeLog 3144
+SHA256 8c72e9c9b3f106cdd92a21c8cc1cf6c34a9bb831e5fb3e6de3bc31a91bf05f5d ChangeLog 3144
+MISC metadata.xml 409 RMD160 0624d9437f6d54e879a2deed7aebfd096f7b7d75 SHA1 8c57a2534ef4240ccf648e19d7bab81ac1d3f97e SHA256 fbf0e4fee7f3136650a1bc05cf440f7de0eeec298e8c1edeab8ade16f567b8a0
 MD5 81476cef2aa1a3dee591c798fbdbe91c metadata.xml 409
 RMD160 0624d9437f6d54e879a2deed7aebfd096f7b7d75 metadata.xml 409
 SHA256 fbf0e4fee7f3136650a1bc05cf440f7de0eeec298e8c1edeab8ade16f567b8a0 metadata.xml 409
diff --git a/sys-block/gparted/files/gparted-0.2.5-llabs.patch b/sys-block/gparted/files/gparted-0.2.5-llabs.patch
new file mode 100644
index 000000000000..f8622a46f689
--- /dev/null
+++ b/sys-block/gparted/files/gparted-0.2.5-llabs.patch
@@ -0,0 +1,20 @@
+--- 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/gparted-0.2.5.ebuild b/sys-block/gparted/gparted-0.2.5.ebuild
index 962b7c58c9ec..8882cb1f424e 100644
--- a/sys-block/gparted/gparted-0.2.5.ebuild
+++ b/sys-block/gparted/gparted-0.2.5.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.2.5.ebuild,v 1.1 2006/05/25 21:19:00 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/gparted/gparted-0.2.5.ebuild,v 1.2 2006/07/12 09:58:56 blubb Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="Gnome Partition Editor"
 HOMEPAGE="http://gparted.sourceforge.net/"
@@ -27,3 +27,9 @@ RDEPEND=">=sys-apps/parted-1.6.25
 DEPEND="${RDEPEND}
 		>=dev-util/pkgconfig-0.12
 		>=dev-util/intltool-0.29"
+
+src_unpack() {
+	gnome2_src_unpack
+
+	epatch ${FILESDIR}/${P}-llabs.patch
+}