add patch to fix linking issue, fixes bug #518382

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 54 insertions, 21 deletions

diff --git a/media-sound/a2jmidid/ChangeLog b/media-sound/a2jmidid/ChangeLog
index 4c345e487dd6..150880e9b454 100644
--- a/media-sound/a2jmidid/ChangeLog
+++ b/media-sound/a2jmidid/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/a2jmidid
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/a2jmidid/ChangeLog,v 1.13 2015/01/03 14:46:28 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/a2jmidid/ChangeLog,v 1.14 2015/05/04 06:43:17 idella4 Exp $
+
+  04 May 2015; Ian Delaney <idella4@gentoo.org> +files/a2jmidid-link.patch,
+  a2jmidid-8-r1.ebuild:
+  add patch to fix linking issue, fixes bug #518382
 
 *a2jmidid-8-r1 (03 Jan 2015)
 
diff --git a/media-sound/a2jmidid/Manifest b/media-sound/a2jmidid/Manifest
index 43fa8c9a6451..7e5aff6ea5f4 100644
--- a/media-sound/a2jmidid/Manifest
+++ b/media-sound/a2jmidid/Manifest
@@ -1,27 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX a2jmidid-link.patch 981 SHA256 75116fa26ecb62d63bc06dff2919a17041463484a3011819a2f3845b4174bdf2 SHA512 63e9d127ce6aab4e075cdfdf33835dfd3d96fead9c0383231ffa0aa731d339e487857e6fd8e085c2a4e520de6a739adae42be930d062b8b05a6e739ad5625175 WHIRLPOOL c6ba28a927378f0679203552a3ceae8ee42511643fb1b95f15e337456ce26a574ecf5d09303699f4eafe187b14bcd2b15842ee3fb97447deeb8d4c1ae4e1fc5c
 DIST a2jmidid-8.tar.bz2 162764 SHA256 2a9635f62aabc59edb54ada07048dd47e896b90caff94bcee710d3582606f55f SHA512 6182a295462ae587461ca395d85c956523bfecd113d031d0ae8a9f304fc3d41f6a5097b3a1a9fc06bd0eef7fe08a4b3c116a3361ff9e63468c3e40b736215592 WHIRLPOOL 04408b6eb3460a522da6009e142fa113fd95c20efbce6c1fcca30a2966478950fc3d5c061694bb533fd5f3261f2d26f22b507bff5fb73050f2fb57a23c6c8936
-EBUILD a2jmidid-8-r1.ebuild 983 SHA256 93a5836179e6062add63a671bb06d0ab388d7bb014d1059a8db8176df63aa0e0 SHA512 93a398c452af334754c7b37a0863198b1352416422b2a9f2c374d76b692f470015da2eec4dde3dd4d4685ee22a9b01de9efcae19c4c4cae69d2e54ff2ae97c72 WHIRLPOOL 547ebea54260fa9f382cbdc2454d09f40eaf8cdee934e2229ec25ad13eaf05b70be34a5064953ebd800a685d14e21412bf2d8975f04852248fe0132c49d147b7
+EBUILD a2jmidid-8-r1.ebuild 1063 SHA256 5b6df22fd45461c2e7e5a779a3b45ff73ee6ee97bff7e9632f1487e9e353f59d SHA512 0babeec5be647436c169731abd2820aaa5a6e6d507dd2760bd0557abcd657daf637cc2e37445d88fa55489559d0c1fcaae010426c6c3095e27be8dbc2b931f9d WHIRLPOOL 6ab8d07bc1a88a62d3acbc4f29b8e1c20d5db761c79df7d4b94251c4bbadeb768aa6c2b430a8c9153431f04263fedc1fc37469b9f35becbabdb380f8f50ad60f
 EBUILD a2jmidid-8.ebuild 990 SHA256 5c3457565ac23e1590c999120b2eefdbbbba58af8d36e600c3f5eaa661db6127 SHA512 66741fce7db874d1680bca0a0f63036b394e8de152826fb6be8e622801369d9e048a7d0b101705b4641c9e9ada0ae60139351e3014dc331343a917b168bca941 WHIRLPOOL 838fb28de5ca4ef74342453e541777d18b0afb035072db86a2fad2ea9dfec245c8187a34a4d9f7a62b2e2dc5d23bd344463cf5356a7e3dfa68a5c5b85fce1aad
-MISC ChangeLog 1886 SHA256 f778c49eefdfc04a5de11035d032a19c2398099df9aaf0c7a19272357060f437 SHA512 027dd4fa5c015341a035cd8ca351b8f1a7dc9b46d2fbcfca4af29d5bb1003296f479755eec9467612018a5086f30bf7f1f775c98667beab52091b552a525f744 WHIRLPOOL 8aab0341fd833a5860dbcb8233ad76b3b9e23f158860036c2df1ce69b87416f1a042e54b589cbc0207994bb262a47612242dd9c99d29188e1f6638f4e9bf3bc0
+MISC ChangeLog 2040 SHA256 5c335cd0f90cf81a0f3f9e2b7ccd431ec7d666bcde0e7a980338564a1f776768 SHA512 d41cbebacabfb2ee47a67f014ac47c2831a939353e241e4b190567062d567dd0206cce13f10b31fcecaa50da0bf4091805be1f288acec6abd153bbf6b8cb5b15 WHIRLPOOL a9b3d7224b2a0ef046444ae7fc67a60bb64357a0037c7081580e4081e715d7c5fb06a93e781fd8c4e61928f5bb7f480e4a1716c082941660702dd58e71cecba8
 MISC metadata.xml 382 SHA256 564e16b1c168c1b170a32891889611cf992fd476843e14961f962664c619e9d4 SHA512 345f651394e89c41c7ee81285cc81f28b6145f1db7d0fc7ba32ead49b81c6f145ebc753be3f5a40b8a2e9047e546b36a55076d9313207546bca5a8d50a331e5d WHIRLPOOL 14d30031829ec2aebfa49efc5f64db801d371cc35f4e3677a1ed4cde710e9fceb82f5748357996024903f9326973aaff97845ce197ec60b32b5e064d7a85091c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUqADFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOaZ4P/3rpTrJ7ppxUuBe6zX8MMsPm
-ZyFkQYSW4JgrltNgKo00uPP1pqOmC5W33wk8q+Rigd/92ysWOiHCHRNDdOJt73WQ
-g/bvbJcQhKihxs0oHIUuP+chobAKVNpzwNOyNdP1NuUOP9LGhdKYvhS/s+vOVKqs
-rToGmtQSV4mgDK4ckj+YvApbI/Rzrq4ultm+ZWhsHqeWYgMl85frv8jAjBdFiZXH
-H5DpWeVM86qxbMbMkW3rRP7qb6RCqo6yXBcKxw58Ow9VtYy4S3ogDj3NLpTtUaQn
-T4V0zZJn4xaIK3DP15G3Ov1hmEg3BCsde9Wluaao0y1Pb0eQ+2KBoYGSmb0uf/7U
-jiSF9SpWVgJ21IHz+aYZ1m86bpk7oefuxV5f+zi0jQVdVMMT7UyhuORSNKV61RQ4
-fJM0256DWrsbHEDZBDwqYnOXFnH4zW40TOR36GjcvpkbALb+QGEuxcc4r0Ut+Ud8
-imJi60aKs8b1JBVoGzXvhPvBJwta+6sij9ZcU4BXVrPnD2KdiptWT5DCegzMXso7
-5R5yZzH8W3QiXaJ69JyqYLiVPfLX1mCytFKXnamg+AHrlMwImuooPB7bkdyy/Zy+
-mbR4q52IyOXA/6R9iRv2CZpDAIxMA5YnK+WAPtBTBmrys1aSOIpP6o99TUxTfiMG
-jZOD5KbXtowQ6pyIJSFl
-=RYKn
+iKYEAREIAGYFAlVHFRRfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldDdDQUM1OUY0ODkzMERBREU1NUQ1RjJBRkIy
+OEVDMjEzQjgwNzJCMEQACgkQso7CE7gHKw1E/gCeJ06l3gy9U+eddqg0DYflpjcs
+GTgAoM7LM9lCUn3K39pL6V1U69XGExlb
+=02E1
 -----END PGP SIGNATURE-----
diff --git a/media-sound/a2jmidid/a2jmidid-8-r1.ebuild b/media-sound/a2jmidid/a2jmidid-8-r1.ebuild
index 93c83c9a6ae6..bc27d5385f05 100644
--- a/media-sound/a2jmidid/a2jmidid-8-r1.ebuild
+++ b/media-sound/a2jmidid/a2jmidid-8-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/a2jmidid/a2jmidid-8-r1.ebuild,v 1.1 2015/01/03 14:46:28 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/a2jmidid/a2jmidid-8-r1.ebuild,v 1.2 2015/05/04 06:43:17 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE='threads(+)'
 NO_WAF_LIBDIR=1
 
-inherit python-single-r1 toolchain-funcs waf-utils
+inherit python-single-r1 toolchain-funcs waf-utils eutils
 
 DESCRIPTION="Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system"
 HOMEPAGE="http://home.gna.org/a2jmidid/"
@@ -27,6 +27,11 @@ DEPEND="${RDEPEND}
 
 DOCS=(AUTHORS README NEWS internals.txt)
 
+src_prepare() {
+	# Bug 518382
+	epatch "${FILESDIR}"/${PN}-link.patch
+}
+
 src_configure() {
 	if use dbus ; then
 		waf-utils_src_configure
diff --git a/media-sound/a2jmidid/files/a2jmidid-link.patch b/media-sound/a2jmidid/files/a2jmidid-link.patch
new file mode 100644
index 000000000000..8b41f6ec1a41
--- /dev/null
+++ b/media-sound/a2jmidid/files/a2jmidid-link.patch
@@ -0,0 +1,33 @@
+From 7f82da7eb2f540a94db23331be98d42a58ddc269 Mon Sep 17 00:00:00 2001
+From: Nedko Arnaudov <nedko@arnaudov.name>
+Date: Tue, 10 Jul 2012 07:25:12 +0300
+Subject: [PATCH] properly fix pthread linking. Patch by Orcan. sr#2934
+
+---
+ wscript | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/wscript b/wscript
+index 36710e2..66a532a 100644
+--- a/wscript
++++ b/wscript
+@@ -66,7 +66,8 @@ def configure(conf):
+     else:
+         conf.env['DBUS_ENABLED'] = False
+ 
+     conf.env['LIB_DL'] = ['dl']
++    conf.env['LIB_PTHREAD'] = ['pthread']
+ 
+     #conf.check_header('expat.h', mandatory=True)
+     #conf.env['LIB_EXPAT'] = ['expat']
+@@ -152,7 +153,7 @@ def build(bld):
+ 
+     prog.includes = '.' # make waf dependency tracking work
+     prog.target = 'a2jmidid'
+-    prog.uselib = 'ALSA JACK DL'
++    prog.uselib = 'ALSA JACK DL PTHREAD'
+     if bld.env()['DBUS_ENABLED']:
+         prog.uselib += " DBUS-1"
+     prog = bld.create_obj('cc', 'program')
+-- 
+2.3.3.GIT