Patch out failures on memory leak tests. Calling gc() does not guarantee that memory will be freed. Bug #284316.

Package-Manager: portage-2.2_rc50/cvs/Linux x86_64

4 files changed, 25 insertions, 14 deletions

diff --git a/dev-java/cglib/ChangeLog b/dev-java/cglib/ChangeLog
index b1f9dfbfbd78..873f5b6dffab 100644
--- a/dev-java/cglib/ChangeLog
+++ b/dev-java/cglib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/cglib
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/ChangeLog,v 1.45 2009/10/15 08:12:16 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/ChangeLog,v 1.46 2009/11/20 10:51:33 caster Exp $
+
+  20 Nov 2009; Vlastimil Babka <caster@gentoo.org> cglib-2.2.ebuild,
+  +files/cglib-2.2-no-leak-test.patch:
+  Patch out failures on memory leak tests. Calling gc() does not guarantee
+  that memory will be freed. Bug #284316.
 
   15 Oct 2009; Markus Meier <maekke@gentoo.org> cglib-2.2.ebuild:
   amd64/x86 stable, bug #284316
diff --git a/dev-java/cglib/Manifest b/dev-java/cglib/Manifest
index 174b548c1ae5..268154629843 100644
--- a/dev-java/cglib/Manifest
+++ b/dev-java/cglib/Manifest
@@ -1,21 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX cglib-2.0.2-asm-1.4.3.patch 721 RMD160 3fe4b4b08f5a02efc1acbc43924fcc2c4dbf075c SHA1 c70c0ee78da474d92087aef4ff8d3287423aa724 SHA256 06997a5c61860cc5426ad0f7783447fd4f980692c21a321c533d54d87281f73a
 AUX cglib-2.2-build.patch 2269 RMD160 4730c8c0bd1b98c9d373d8a96581ad35e0973032 SHA1 3000a6d09c7899943bba4ea2a97baa1a7bb58bc4 SHA256 0528b998d5a276ed4daff1001e7b3178596af23bf72c84b53a693a1d437e6d35
+AUX cglib-2.2-no-leak-test.patch 296 RMD160 b2bbc9370a6ff9c15c63d079c412fc6d8f0a09eb SHA1 9c104b8ad678a76a0b5405e0fd4cfedda6b74c30 SHA256 128e0f94ab0881be8a57c42890ae602115adcc188be425be2ea4977690114a22
 AUX words.txt 509 RMD160 6dcd18dad1faa1a01436009095b1a2061992ff5f SHA1 145309917ee66d34e7ebe0a347a3e9a15ad48979 SHA256 6503d53d13bb738f22b04fb611eef0d858db29f12a1e53613cccab7c1a759b2c
 DIST cglib-src-2.0.2.jar 445834 RMD160 7f0e63ee69c090465db906288b87ff541fd00691 SHA1 414985d703e1adc433bea5188e10015d40450423 SHA256 91644a03487a9a0161a54e0c3644c34c44e507557dcf4b8b97a60dd91e67cd1c
 DIST cglib-src-2.1_3.jar 1610524 RMD160 9341441cb931f8494c5a0917db1b526ae06a6511 SHA1 9f1bb4dcdd99bacc166a917a3fa6489ba54c3c38 SHA256 652c7533f5c6d4bf66ba13871f70133e9ffdca648e49354cff7f39824282739e
 DIST cglib-src-2.2.jar 1520971 RMD160 dadda8b80b36c729e9869f503c6560ca7f555d4e SHA1 e608c738fe37f78101cb84406f2afae31d45bc6f SHA256 762e0214f0d31f224e712a7a5b4768c16ad24741ba98fc2e94715ae390d07fcb
 EBUILD cglib-2.0.2-r2.ebuild 1330 RMD160 c03b0dd3d0b00e8de59773e4951386b32421f21e SHA1 c8e502a253473e3a028ddd815cac9bf3da581c8a SHA256 33ee5fe8f3ab45847fe213248c99608332ea2b1d60930ee278ea1d3047de2d2b
 EBUILD cglib-2.1.3.ebuild 1354 RMD160 355bbed43be2af56dd7f6059b1edd40a27e16b97 SHA1 2fddf50796201f55a4c9fb465772c8aa10f9e93d SHA256 2ca806cf18cc17f86986499ba18ddabf4da130c45e4b6ad3ec8b463b7c0aa66f
-EBUILD cglib-2.2.ebuild 1450 RMD160 b24e85675cdc84304e8bcee5415a0dcd99efa2d3 SHA1 a979e527321cbf949843924ef40a0b223bc53aa3 SHA256 ae7df2ac24f3bdfca9ccad02913fb8aa96060c7b96a287e2002fb40f0b769205
-MISC ChangeLog 6517 RMD160 292e55caf82f1eb15b874c4d06ff3631e683b0c5 SHA1 0cbb10151f2333605601a5dafc3d37542c9534ca SHA256 49b519c354b8a82692cad6435ecbfa8a5aafe381b957e0d016ae126681e38fed
+EBUILD cglib-2.2.ebuild 1616 RMD160 8f6b57a2d4c8e288e1d025c05987796dd418c8c2 SHA1 6954eaf4d086d947e53c401bfb7c3c4345d2ece9 SHA256 f4af9799114838debbc774f285e28dad3dcf4dc70616cbdb104056faea6901fc
+MISC ChangeLog 6743 RMD160 513a3833d7906782ff4c1b5cf2b51d7a490332e5 SHA1 d0da7bbbf7ee85114750db76ba0738aa27bd600d SHA256 87569321711d6f3b911c9d97851311d324683f83ac12f02cf98debcee146f2e4
 MISC metadata.xml 350 RMD160 c14c634175d8f1c82e457ffc403744b777926f8b SHA1 bc4e48c65f4ad0493076bf0719362f8cce1cef65 SHA256 1364c70f5978d4b5277c64fec94ba77ca7da6d41a3bf851ad90e49b93f3f8ec8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrW2X8ACgkQkKaRLQcq0GIVYQCgl5ebkJeGxjWpGdS0axRHELLH
-4i4An01tWPmJqaMsYqCxsQa7uJ2AfbK2
-=bPow
------END PGP SIGNATURE-----
diff --git a/dev-java/cglib/cglib-2.2.ebuild b/dev-java/cglib/cglib-2.2.ebuild
index 58e2a0548e4b..5c3566c7f138 100644
--- a/dev-java/cglib/cglib-2.2.ebuild
+++ b/dev-java/cglib/cglib-2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/cglib-2.2.ebuild,v 1.2 2009/10/15 08:12:16 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/cglib-2.2.ebuild,v 1.3 2009/11/20 10:51:33 caster Exp $
 
 EAPI="2"
 JAVA_PKG_IUSE="test doc examples source"
@@ -27,6 +27,10 @@ S=${WORKDIR}
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-build.patch"
+	# mem leak tests fail on ppc #284316
+	# assuming gc() guarantees to free all memory is wrong, so don't make them fail
+	epatch "${FILESDIR}/${P}-no-leak-test.patch"
+
 	cp "${FILESDIR}/words.txt" "${S}/src/test/net/sf/cglib/util/"
 }
 
diff --git a/dev-java/cglib/files/cglib-2.2-no-leak-test.patch b/dev-java/cglib/files/cglib-2.2-no-leak-test.patch
new file mode 100644
index 000000000000..416672a5498e
--- /dev/null
+++ b/dev-java/cglib/files/cglib-2.2-no-leak-test.patch
@@ -0,0 +1,11 @@
+--- src/test/net/sf/cglib/CodeGenTestCase.java.orig	2009-11-20 11:49:04.000000000 +0100
++++ src/test/net/sf/cglib/CodeGenTestCase.java	2009-11-20 11:49:18.000000000 +0100
+@@ -135,7 +135,7 @@
+           
+         }
+         
+-        return true;
++        return false;
+         
+         
+     }