Fix build failure in stable 0.8-r1 (backported cython tweak). Thanks to Yury Gavrilovich. Pull missing 'memset()' declaration on new glibc.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

5 files changed, 38 insertions, 10 deletions

diff --git a/media-sound/xmms2/ChangeLog b/media-sound/xmms2/ChangeLog
index a9cf8f93d441..5ba8fefdc198 100644
--- a/media-sound/xmms2/ChangeLog
+++ b/media-sound/xmms2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/xmms2
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/ChangeLog,v 1.34 2013/08/05 19:41:46 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/ChangeLog,v 1.35 2013/11/22 13:10:47 slyfox Exp $
+
+  22 Nov 2013; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/xmms2-0.8-memset.patch, xmms2-0.8-r1.ebuild, xmms2-0.8-r2.ebuild:
+  Fix build failure in stable 0.8-r1 (backported cython tweak). Thanks to Yury
+  Gavrilovich. Pull missing 'memset()' declaration on new glibc.
 
 *xmms2-0.8-r2 (05 Aug 2013)
 
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 32e808c5f5b5..bc2c1166c838 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -8,19 +8,20 @@ AUX xmms2-0.8-cython-0.19.1.patch 1726 SHA256 be06ffe3ffa6d78381e0b81426ae192493
 AUX xmms2-0.8-ffmpeg-0.11.patch 638 SHA256 3fccbf6d730f56a88fb570715b424759b7d2767aa0fc51053a75dbf34606947f SHA512 5b54c9284577f57da5b1ab6f51f620fe20a2815cc38dfca2437aaac9424917ddbba2d174576d619d36c18ec5ffa194dcff7333e1e68c27bf8abe48f3c6a464a7 WHIRLPOOL de4e6337292d115cf127ae9aecaed5e4bbb840dbf30eb577a75db95df43e648ba7e5f835ca8a4924c890473df0cb52308319262802dc6c97213053542f23c3cb
 AUX xmms2-0.8-libav-9-p2.patch 1823 SHA256 107b2c23e71bf06c8d304808cb97fed44776c57d7a0b3600652ea610c162a290 SHA512 fef46159dc8d40ee05d091076e78f5ffa8d1c93ee2e476110fa96f4f52f79c05c5177192828258ab6e4ec75118ea382458546325692110c819a5fed3cf2c198c WHIRLPOOL cf57cd221c0963212d2699f23dd965db7d77d6aaccde44cadc3f6149f29ef43a152ba672900be0c475614b19416713c5b35e3478fd6fd33c38b0e1e543a0c2df
 AUX xmms2-0.8-libav-9.patch 526 SHA256 43bcee24cb163524519d8abc07b2729e20628ef9d25ed21cadae6f6d653baff5 SHA512 2a6218fb8a27c89321c08025c110425ed1deae0f498bca9a9b306f2848c605a964aef05adcb1f3fd006786fda0b88d8a6d701c4fc8834cb7fb0fe561d8f9e5fb WHIRLPOOL 0c06b8bd2fbab37054bc3063f97ec4f8812c9ad324e9655eca8c398c2e58fc13628ffe751328efa17fd4f953b3ced177f4040a406e8c096010b1290d145dd2b4
+AUX xmms2-0.8-memset.patch 685 SHA256 dd85003c15c4ff0e122422b154d4a8fa5f3371ae3673b23a89c77848e43d47d0 SHA512 aa45c8f4e04e7b5edae131ac60baad265d2fdbc6297fc2595d2caedc0205956ae551408ea208daec857d1cb44a1698c663f8fc6dcb16d3f1a998b12380a562e4 WHIRLPOOL 78c4df892814ee857fff81b8c3357c83f932521a5f17c86999dc066e13a7dd7bd406f9521be5dd133ec93e851e7d34cbd5e30a446169543c57011137ead2f42e
 AUX xmms2-0.8DrO_o-waflib-fix-perl.patch 1649 SHA256 bea1cb2c5fe499e385851a2cc7900658266187e821f505a65d4d27393967f44b SHA512 5c7161245199381af80ca1e24edbe0da27f2f11e76a13f504e0051a8de4369d25075781d80c80f4246d21afb508306897331ecc9f5f3c32d0ade24921a829ba7 WHIRLPOOL 9bb58587dcc5588e0cd5fcb3beb95e563654106880f8e42a01d1b01d1f71e40d96a9084eea86239d03b671d2efa67dd8fab27c55f1043798e39d803eaaf2a43e
 DIST xmms2-0.7DrNo.tar.bz2 1519973 SHA256 59c58d9380e6b002920a8dc75f0fd4629ab175b82f29b6637f7816fdc9832b2c SHA512 e991c0c5d598ccfd868b81ae932255352bd3be014f86e05f1fa782d240b7ce059054cad746cf52c8c383058feba1fdf5675c43ec6495955c06b6e5e9f949ca01 WHIRLPOOL 691446c7cd5b5fd5bcde88561cfe7102d58d5d2a863a340181863703b9369f024937eb12d00983ba2d650268823759663bebc25b3c035103ee710ea1620a9a8a
 DIST xmms2-0.8DrO_o.tar.bz2 1670726 SHA256 c77e41e7bd5788889d5a2f78331ca8c748b8721bd2e59f36c36ad4c7cae8694a SHA512 478103d80264c0cb32912e828f74d0f5b2f10fe310f530a87ebecda7ca547a69e238cd572788f90bda29494494160d459fa6d1356b4fb87c7a8f0bf02e3b75f8 WHIRLPOOL 741dd85b8c065eea799675588a8d4c389c47fa3dcf129a9fd799bb5da0ffcb1eeffa45cfaca40af7c505908818b5e7960c1a54e947f53358edeb43841f2eaa5c
 EBUILD xmms2-0.7-r2.ebuild 6239 SHA256 d5c60070e23e70ef42bcff960304a3c99e7f911de2c98c9936a89b84974babcb SHA512 35cdfc50f79cc6c0d27912aeec3f81fa08c5a64b85918024da9ed40ac320d50576ee27c7968a2e725595995f9ad7175f701a2a58f15628dd9b3d0306694b53de WHIRLPOOL 0a651b9933c874673df635e5f9f70c49c027ee6efe5d5aab9c7930ee34e83c06d82941eea78634cd3729b7ef6995be089a825958aba65b9effe8003808de1277
 EBUILD xmms2-0.7-r3.ebuild 6475 SHA256 dfc21331365b7a6047f189eea1ca17b3212c9d8f079b0c3b6beab2b1b44526f5 SHA512 e80749311fb6a25adf8acdeeff5c4f4742c608d177a490191da33ec7669a4c78f07d735af1f9af5567ef699dea94781a60c4dc31878a4ae9f5a5dce5f0c55e1c WHIRLPOOL 61928d8dc09d520905da68bd6756d598240430cd96c0cc88d6db17e7e0fac3947ebb1f37dbed3ef4561f235e68c0276eaa6f059dfa9599b493b8bbfe6294db3b
-EBUILD xmms2-0.8-r1.ebuild 7053 SHA256 f151be69f7e1a936ca1de850b6ec5488b09f5783473d82af48e91116b1e19538 SHA512 a9545222a59a88b78a1737dcd764cff98efe6d0e456b3f7909b1e16db65ad13595dd0e0aac0264a84b63db925145452832f50fc91fc9a6cbf754c3aa68e8a742 WHIRLPOOL ba5b0cdd134918f70ee11136a1bdbadbfcfcb91d80dd5425e6ec6d7f67ef87e893a84d2a6c44e46943bc547e7edfd984cc11edc74120facfd3b7bec26c56701a
-EBUILD xmms2-0.8-r2.ebuild 7103 SHA256 838c121fbac81a4e66d55249fe1113190139e11b74147cd09be695c0a220edf4 SHA512 34cc99abb06c9412acfcec5879c226dc23c128c6f3a650f8f72572bd705d2bde0b8e377c6a4c5d8260790c0b16a691119e553550a0f82544252e61786abfcc68 WHIRLPOOL d91e8fab0fc7c124b7d10b22c20635c35c226f8d3eeedd421f473549eb31fc3e06e418ecadf4d070a8e0fa0e79205775f23113acb49e9538200f04193274c14c
-MISC ChangeLog 6131 SHA256 8db6901429730b3679c7c129e3186350678b3d394ac9546ba0297e5731bc876d SHA512 1265ae9eeb8bf186df1fc1f0440e542e054f6fb097e1bc41a42182625b29a136cfdae864f64a62c5b88924e8adaa52782e20b97035fd4049512ef950628772cd WHIRLPOOL 28115a1ccdfc9b7b122af66faff3457742212b48e003e32e6c4032c8a664e897974aca802f9353eec45228c69d37cafe1c14bf2dd8eccb5bef0e1fb74f46e725
+EBUILD xmms2-0.8-r1.ebuild 7140 SHA256 2f186635f0900cb1c979a409a6f4a772caed1aa8b58486be8acd6b1031bf4330 SHA512 562f1f2e4414da4e4a4f18ab9ef640b13b86c1e94e953e0442a7cab21f24aff3fba3e41d19e573f7f79a21cdf5f058eba2fc6ef38b69804c1060711e1213e262 WHIRLPOOL 2d7dbbd4b846f7291ea77a43d9f56c7ca6a025261c2dcc087a41a144e24e7394ee720911f7bb66ece43e837d9b64e7e81633cc01508cc52c2384aa48bfe17d56
+EBUILD xmms2-0.8-r2.ebuild 7143 SHA256 27d4238553d8aec3f549ffac381d893ada6aed36ab1a658d0c2a9b2b57005d2a SHA512 1e79d7ca2f49cef66b6e50e4d4e238ef7ea54741f8c270279846e929b043579e71c6b65e9c470247e3d6fab298e2b4e569e617bcdc6ae363e2327065fc233def WHIRLPOOL efa8a8274089b265429d33becf7319bc5adb752605d5541943f9dbc68b635713fc5811c2b6bf8a0fa2fa9c0e0dab4d0abf7ce279c34c316465d4816491bd8bc6
+MISC ChangeLog 6405 SHA256 59e618c8cb68d74b28abf373e1be515046943f82bc0a1426dd9e0d067ac25f49 SHA512 13f2823d900322188866bc39effdfefccb3b6fc752eebd031d4034f15bd520c128b2464e2b3dbc8f460ddfd309a96d2ca4f91855f0403d9d1cf6103d7f63007f WHIRLPOOL 1a327b9e6be7e89ca3756fc284c2ccf04802439cccf53500f12da60def7c04760eedb0f87139f9a2eb660480e7e0b691980bda4ff4be1519e652184212cee913
 MISC metadata.xml 2435 SHA256 f7fb6c7694bf849149c7f3f3f2aec711543d994f782b95dd75ca1759bcc1e22a SHA512 a10a9821af91f0935adb73a0c7c315178c92f8821aede4d0da3a5ea1348280d02006027c32298fcdaefbe2e888c3416881fdd65800e12e340caf73d2ae0326f4 WHIRLPOOL 1e128aaf2c232dc22ed7b02777840f2a480039dfae65e36e586ae42785295639d4ee6798061c13bf2ce085b318ae8a84327f49dd560414a248ff2993a3736fe5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlH//00ACgkQcaHudmEf86qv+gCfVRE1ZH+dbEdWn0CC7VARdKu0
-Vu8AnRs5B4w5WtqCIUL9pv3OVN5ExBYM
-=bWDK
+iEYEAREIAAYFAlKPVywACgkQcaHudmEf86ql8wCfcswDkULJ0+Z5pVeh4WR/C6pj
+WNwAn3WKUoxKRlt0R49tEVA5ilmzppQB
+=dWiE
 -----END PGP SIGNATURE-----
diff --git a/media-sound/xmms2/files/xmms2-0.8-memset.patch b/media-sound/xmms2/files/xmms2-0.8-memset.patch
new file mode 100644
index 000000000000..6f8377d9f928
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8-memset.patch
@@ -0,0 +1,19 @@
+commit 00f4736bbb8ebc88a08e24e98d384b43d5afbbe4
+Author: Raphaël Bois <virtualdust@gmail.com>
+Date:   Sun Feb 12 16:39:46 2012 +0100
+
+    OTHER: fix erroneous sizeof usage
+
+diff --git a/src/plugins/daap/daap_md5.c b/src/plugins/daap/daap_md5.c
+index d4d8d74..69c84a5 100644
+--- a/src/plugins/daap/daap_md5.c
++++ b/src/plugins/daap/daap_md5.c
+@@ -191,7 +191,7 @@ OpenDaap_MD5Final (MD5_CTX *ctx,
+ 	MD5Transform (ctx->buf, (guint32 *) ctx->in, ctx->version);
+ 	byteReverse ((unsigned char *) ctx->buf, 4);
+ 	memcpy (digest, ctx->buf, 16);
+-	memset (ctx, 0, sizeof (ctx));     /* In case it's sensitive */
++	memset (ctx, 0, sizeof (*ctx));     /* In case it's sensitive */
+ 
+ 	return;
+ }
diff --git a/media-sound/xmms2/xmms2-0.8-r1.ebuild b/media-sound/xmms2/xmms2-0.8-r1.ebuild
index 8cac9b681311..b629ffad3e54 100644
--- a/media-sound/xmms2/xmms2-0.8-r1.ebuild
+++ b/media-sound/xmms2/xmms2-0.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/xmms2-0.8-r1.ebuild,v 1.13 2013/01/18 08:05:25 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/xmms2-0.8-r1.ebuild,v 1.14 2013/11/22 13:10:47 slyfox Exp $
 
 EAPI=3
 
@@ -110,6 +110,8 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}"-ffmpeg-0.11.patch #443256
 	epatch "${FILESDIR}/${P}"-libav-9-p2.patch #443256
 	epatch "${FILESDIR}/${P}"-libav-9.patch #443256
+	epatch "${FILESDIR}/${P}"-cython-0.19.1.patch
+	epatch "${FILESDIR}/${P}"-memset.patch
 
 	if has_version dev-libs/libcdio-paranoia; then
 		sed -i -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' src/plugins/cdda/cdda.c || die
diff --git a/media-sound/xmms2/xmms2-0.8-r2.ebuild b/media-sound/xmms2/xmms2-0.8-r2.ebuild
index 00a8da7d9d58..481407354773 100644
--- a/media-sound/xmms2/xmms2-0.8-r2.ebuild
+++ b/media-sound/xmms2/xmms2-0.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/xmms2-0.8-r2.ebuild,v 1.1 2013/08/05 19:41:46 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/xmms2-0.8-r2.ebuild,v 1.2 2013/11/22 13:10:47 slyfox Exp $
 
 EAPI=3
 
@@ -111,6 +111,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}"-libav-9-p2.patch #443256
 	epatch "${FILESDIR}/${P}"-libav-9.patch #443256
 	epatch "${FILESDIR}/${P}"-cython-0.19.1.patch
+	epatch "${FILESDIR}/${P}"-memset.patch
 
 	if has_version dev-libs/libcdio-paranoia; then
 		sed -i -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' src/plugins/cdda/cdda.c || die