Add a patch to detect boehm-gc version properly. #514140

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8551514

4 files changed, 41 insertions, 22 deletions

diff --git a/www-client/w3mmee/ChangeLog b/www-client/w3mmee/ChangeLog
index 0cecb3daf9e7..b44f178ef192 100644
--- a/www-client/w3mmee/ChangeLog
+++ b/www-client/w3mmee/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/w3mmee
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3mmee/ChangeLog,v 1.26 2013/10/03 07:47:44 naota Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3mmee/ChangeLog,v 1.27 2014/07/05 01:18:42 naota Exp $
+
+  05 Jul 2014; Naohiro Aota <naota@gentoo.org>
+  +files/w3mmee-0.3.2_p24-boehm-gc.patch, w3mmee-0.3.2_p24-r7.ebuild:
+  Add a patch to detect boehm-gc version properly. #514140
 
   03 Oct 2013; Naohiro Aota <naota@gentoo.org> w3mmee-0.3.2_p24-r7.ebuild:
   Patch XMakefile to respect AR. #483744
diff --git a/www-client/w3mmee/Manifest b/www-client/w3mmee/Manifest
index d4f49a985214..2b2761ec5016 100644
--- a/www-client/w3mmee/Manifest
+++ b/www-client/w3mmee/Manifest
@@ -1,29 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX w3mmee-0.3.2_p24-boehm-gc.patch 359 SHA256 826254489081f2642b84cd9e51ed0e73cc2db62e92de9c9ad7c96586a9822536 SHA512 e749a2a3b7694c9fc52fce037f23fa60bcab5fe11dd7b25cf32d7924219bb601096a7dd87914a0e8ca029d2be463e9ca2c16e6d95451ac792b5a50a586bd4d47 WHIRLPOOL 33c50b2e1b42447707f3ba3359d6812706a72d99bc15bc3caa0400e007cd97ee2890377a6573eacc7771005b7b93e308900990b1557f38a938b57a77fe125755
 AUX w3mmee-0.3.2_p24-glibc214.patch 906 SHA256 72c4a417b39d6fe7750aabb95b35ce59e34cab1babf1673e9bc793aa5479a3f1 SHA512 5c5a6d635832c49aee0663eaea1fd27492affc31ce571dd48a4ce1e21c63695a45cadc06b5c4fa4bb4548855842d59259552dbac1988b7f891639b5ed0d17aa3 WHIRLPOOL 22c479d6c653337342aab77986c21ff161b2b38dd9351943c2fdfb8530deff8f4a33481e3a7ca92a4f2aaa0345a938f0a2cf6019e042410cfbf57333512da797
 AUX w3mmee-0.3.2_p24-tinfo.patch 422 SHA256 cca3d6f38d4a3b968daa47564b2325097829697840c51d8a745256ef42f34a50 SHA512 4c7048dedbc90bf2624bfba8fbe0ae6e3dc5119e3cac8e1aa0706419cf660e038d23a20b98a358cf8d4b0360ead7edd1f30030dc349855744e0510ba229fbb22 WHIRLPOOL 3411dc3234461348594ca578051766b0d186157334999626d5fef2ba6369b23724ab6a8670a7c76ebea4a449af3a4aa47f808f03fec478ac95bf62b07d6a06b2
 AUX w3mmee-gcc44.patch 377 SHA256 0673e512ab07b8cd2d2034a73cea48f440ab3b92423432d9684b9a5167b581fd SHA512 07d8758ec667ada333dcfe95218b571814462809bb7f1bde46ae53eceb4edeed76ade9e11d471288807d5ea5d0ad7e7cfd195e3a35df765b8c14f8d9652e8f7e WHIRLPOOL 5dbe7e07bb5ef093eed3e3ea05b167247b53c67dd2741ac4da7784838484dd83a2c6da4f1f532692c18c1a23ee27343d7874481a7b32ee340e006e4d694d3c65
 AUX w3mmee-gcc45.patch 406 SHA256 67b57db72ba9d69e02e86521495c5550b4e1bd14c18ebfc5e42e5e7797435406 SHA512 337fafa1c9b317a8ce4554b4e8d8609537ba35121f7c214f7f5c1c2e1b70d476dd0474a69172f4162d92bc05215c1119ef391c81f4d11bbf544b3fe7a047f468 WHIRLPOOL 83cc99ba2935f0f04c7f58d45b15f01fa21df85515c566b946b1665e7a3b42837f7ba6f0b647386bdd5eb1cd07ae6f4ce4a6f1738ead283c5f4205edcface0cd
 AUX w3mmee-w3mman-gentoo.diff 1037 SHA256 fbba900cebcca79a7f7e2323e104a1d411bdc19cab80c273b98c3906a1053295 SHA512 238d5641c3c15242c5cab723f590f143103ec7da72922f076d4f73102c2d5a9e3f3a6b6367a79d4ecc337aae760023941635495f08e6d946634325736dd8b883 WHIRLPOOL ac30b58b9efcc2a6df0a95c0b838bc7a778b64804481ac67b5a15ff1a6c4385ce349b2ba63adcd4317cf7bff0509b1941baa6d6885703b246519691a40961c54
 DIST w3mmee-p24-22.tar.gz 690094 SHA256 1a905a30786568a2c607fd296ea7c13a03c6930d4b9fcb3d0e084c71e30aa665 SHA512 85d4d373a5a544f8c4fbc37e8344daaa5eae3ae007a0280c693aa8946c8cbf63f3fc92fb69c2597286921254e3234f29ee1b3f21e1c9d498b39a597a51e98761 WHIRLPOOL d4d3ba4ca690a2f41f2ce77292849fafbff320876b7e7df06ad599669d86b01762bd2036e8fcd7044545b5abd7345e02e0c172905f7306e073ac4cc98e1c9657
-EBUILD w3mmee-0.3.2_p24-r7.ebuild 3763 SHA256 b6019f373bbcb16d685193d5b5e9be67aedb8e465640b052cad8e9aa9bd811fd SHA512 b859a1d2390b9f87d168479ed84ccf2356304b0c0df99a5830671740199afde213ac07f5ae1473c8396936095bb061fd4b88ced7211f593ffcc1e174163c0dcf WHIRLPOOL 54cbf44998b8d227a460206fedfd7be780b1a173dc3c2b9faebfdae012eda3a89c6e6b16af8bf5309f157003b1c268d525d586c885714547569ed23579792961
-MISC ChangeLog 5828 SHA256 e58c05ddf82c967abd35820150bcaa77030badcb07d09e25f7cadc05115a97b4 SHA512 e865a0e2ef83967e27e03beba47e8fa4bf4cb2eeead3b6411d30516d2307d057bb8b82586922bc9607cf5c30b6648fff8723a24de0884a97aae66b9bc3e4eefd WHIRLPOOL 024c07b766d8810fdc4dbc17499b651424bc489a24888635b1e49bcf54b8ddc3402464f587b21c9d4a5aea0e0c9116c2e4e867238c96406cadffc74325485e2d
+EBUILD w3mmee-0.3.2_p24-r7.ebuild 3801 SHA256 2a0ed5bfad20ed3b84780a97643f3c7bceaa8f9352a67c5c60976d40a32b66d3 SHA512 c653f69e6a0252abf9d41ebdeb0ce8b69d4fe3ca97cef9a130bcef59703af809db8a3e17b83f7ad0c32c2e3c33ff412c8cf8c8a25101dd41dd755d9728c5d6f8 WHIRLPOOL 64f2433a5f1592ae1b30582d1e58d529e9f1865bccb608a1c804c20c284482a8c33d627a0eb6471d3e710ed3cdb9ac8ffb4cbbebc29a2bae5917d1a33097cea2
+MISC ChangeLog 6005 SHA256 81d4f5113c556481a6f2d96be747a99c54a3e2d366d45f1202c16b0931130108 SHA512 a8719e388034ed248248652ebadc35ebda51fbeb69be3ff66058bed3b2e9da8bd410f77840f3d9455065736dc1fe0286c3d464367e348c81ac24f957d0fcaf7e WHIRLPOOL 61f6de9d55d667650bfa69edf7cb7cfe9c87fede8f0a80b51682729cdc6e506f64824bfa026c480c011cefb2f297d3038b07fc76924cc231c419df462fa47824
 MISC metadata.xml 156 SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 SHA512 e46682afa9f674a8685beb29de6485f750484180d86f8980a3c5c220861f38495ac6f4ceda7cf21c317c640d0d218af3ea9bc1a406b207124c1ffb4bcc99628b WHIRLPOOL 347b826ae650374a01eb144ef127dea2fb96c8646b9a1e4b142bce523822988c4597bc2980cc29dcbfeabc1e44ba70136ddea73f1837d4c6ef7d5e3e9d1d1268
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJSTSEmAAoJEDYO1FT4VRUUPWIP/j/noRvMRaJYjySIndzP5130
-zKQcqQRgBAYoHY5wFk3RTqqbstRn7QgjAatnirGVxCL8L2ggYGH4RQs7gw9MbDr1
-LzxIGBlE7PTY1uWEeIaHZZkrT96omj6Her8y+ubruDz/nepE7S8niu2DCf38tm7+
-6QaHEcnfX6Y5C8yItVh9sFGRYRwL1Le4s+l2LtOtaQc5Ug7C574d/PGSdqRQacVd
-5y18aJUc8QV3WrJNUk9xIFaT5y3tW0T+rpkGbi82WNislCZig73m77iEcqp3h7q9
-jMDkgWaU3kikp4Kswil0VWOJ6OlNsRqG86l7sn6aXqfIUhCB17Tm7yVlCmo5vZxb
-PfQSaJCtuSFTXLNgPokKxO+YLbIuNox45CYumYGcMCOJIi2sYP9hGy4QVR+Gibnx
-Qhdhgi11/MTsnTl1ez56LPYWes4DdaI89wD5ZCd71T8kGsi39oERSbjgrOMU1nNU
-W6VoiqlM7PiG3HcxeMLy1NyvJHT9v5nyxPyVatamuMJivSO2RQBWjrmD3kd28nz3
-efTCKzBXX5Oc9oikbdMpUk9mHMvxMThc6GketoKpwUvtrhvdvTctFr1mC9w6VB6O
-LCY2oCk+MxC+riuNrCVrW0X0EY2l0ZcW7D6jOyCc7MDczQoU4ascM0+zfgm+NIVZ
-1DCJmhtJ1bqBiYdEhZ3K
-=D7sF
+iQIcBAEBCAAGBQJTt1JzAAoJEDYO1FT4VRUUaggQAIVsx8l7e3A4EcnPqlOO3LpP
+aZTw1edg2zEBSUG+Lxc18711sp9Q1Rc442wKZE11YWq6JnyHs6tQn3viMIrnftuO
+0pN+z0Z5NBwrArsx/8iVb6fDRm4S+4efikA4FR0fBWxGum6KI3Ru3sOkCJSkRTZ1
+/kyMLiYN34rsQfWWNxiqYNh6/f6ZwM56xW7wx01owAxooE1yXnv9kMNs+JpiYENL
+JnXuifkieH7MK09IjvMXaLWCxvVlN6VrlI0+ukGGRAoiOR2rdIO+jya66FltjB+/
+yMYt6MSGViR21kr9W5ZNsNCvvmuCyKJ51UzRYVtclt/lax0XV1RL9nF1jkxZKvKY
+upEfCvc/K78/BK1y40FyvSoEZxF1C2KazciL0i115DX+gRbcLdX/Je/qhNRfM83w
+nWvhjQ0BeXIpgGGrHr4wXFQLr3yg7618dPyWln0ih99VZqqcEJK4VrzW131l+PiJ
+Vbqjwv6MGj72ENq06pueRyuuRRGg5JzgcJ6YB36/mAFOfzmQjAH7PU4AuSrH8asv
+KWHnPVJam6JZbO6PElFKRjQ17rL2N8Psje76YQA8enpdYd3MyAht2Huc4mLOmQ0E
+nwmkXLgfga+a0TyKZ79+kTwcVbDas1vfL82VU+2YWm3/8SdBh+lbbgjn/W1vsb7L
+MwwYTeUHcVsjkXGi9y0x
+=7dty
 -----END PGP SIGNATURE-----
diff --git a/www-client/w3mmee/files/w3mmee-0.3.2_p24-boehm-gc.patch b/www-client/w3mmee/files/w3mmee-0.3.2_p24-boehm-gc.patch
new file mode 100644
index 000000000000..81e6a6dea0f3
--- /dev/null
+++ b/www-client/w3mmee/files/w3mmee-0.3.2_p24-boehm-gc.patch
@@ -0,0 +1,13 @@
+diff --git a/configure b/configure
+index 32afb35..3be66fd 100755
+--- a/configure
++++ b/configure
+@@ -1503,7 +1503,7 @@ if [ -n "$gclib" -a -n "$gcinclude" ]; then
+ #include <gc.h>
+ main()
+ {
+-  extern unsigned GC_version;
++  unsigned GC_version = GC_get_version();
+   printf("%d%02d%03d\n",(GC_version>>16)&0xff,(GC_version>>8)&0xff,GC_version&0xff);
+ }
+ EOF
diff --git a/www-client/w3mmee/w3mmee-0.3.2_p24-r7.ebuild b/www-client/w3mmee/w3mmee-0.3.2_p24-r7.ebuild
index a6eeb040cc6c..41dc634ab6b6 100644
--- a/www-client/w3mmee/w3mmee-0.3.2_p24-r7.ebuild
+++ b/www-client/w3mmee/w3mmee-0.3.2_p24-r7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3mmee/w3mmee-0.3.2_p24-r7.ebuild,v 1.11 2013/10/03 07:47:44 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3mmee/w3mmee-0.3.2_p24-r7.ebuild,v 1.12 2014/07/05 01:18:42 naota Exp $
 
 inherit alternatives eutils toolchain-funcs multilib
 
@@ -19,7 +19,7 @@ KEYWORDS="amd64 ppc x86"
 
 DEPEND=">=sys-libs/ncurses-5.2-r3
 	>=sys-libs/zlib-1.1.3-r2
-	>=dev-libs/boehm-gc-6.2
+	>=dev-libs/boehm-gc-7.2
 	dev-lang/perl
 	>=dev-libs/libmoe-1.5.3
 	imlib? ( >=media-libs/imlib-1.9.8
@@ -37,7 +37,8 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-w3mman-gentoo.diff \
 		"${FILESDIR}"/${PN}-gcc4{4,5}.patch \
 		"${FILESDIR}"/${P}-glibc214.patch \
-		"${FILESDIR}"/${P}-tinfo.patch
+		"${FILESDIR}"/${P}-tinfo.patch \
+		"${FILESDIR}"/${P}-boehm-gc.patch
 	sed -ie "/^AR=/s:ar:$(tc-getAR):" XMakefile || die
 }