Fix libX11 underlinking wrt #367855 by Michael Palimaka and Diego Elio Pettenò

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

4 files changed, 36 insertions, 21 deletions

diff --git a/media-sound/drumstick/ChangeLog b/media-sound/drumstick/ChangeLog
index 035ed7ce848e..5ba0b0ea06cc 100644
--- a/media-sound/drumstick/ChangeLog
+++ b/media-sound/drumstick/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/drumstick
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/drumstick/ChangeLog,v 1.13 2013/03/02 21:54:43 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/drumstick/ChangeLog,v 1.14 2013/12/03 07:40:56 ssuominen Exp $
+
+  03 Dec 2013; Samuli Suominen <ssuominen@gentoo.org>
+  +files/0.5.0-underlinking.patch, drumstick-0.5.0.ebuild:
+  Fix libX11 underlinking wrt #367855 by Michael Palimaka and Diego Elio Pettenò
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> drumstick-0.5.0.ebuild:
   Move Qt dependencies to the new category
diff --git a/media-sound/drumstick/Manifest b/media-sound/drumstick/Manifest
index 1b4c9b89b743..8fbf2bd4160c 100644
--- a/media-sound/drumstick/Manifest
+++ b/media-sound/drumstick/Manifest
@@ -2,26 +2,19 @@
 Hash: SHA256
 
 AUX 0.5.0-doc_automagicness.patch 743 SHA256 b6f66f77573c367dac672f50d9e4f14e576d47c4f10c7b24a28898b985914bfc SHA512 171913c74f329d468caafba723db7f6c531330013c20b3613e0320bc9336e639fa103e2010334f66d9b950721104aaf9bdc6cb2e4ed66162bab4bcbc3880d975 WHIRLPOOL 79c9765d6d7044a35f2d5a8c790a984cd2bbd7de36741022c19e1a31b557db238cf04571edb91e8504795f40d4a6b146451b5a1aa41117fa11e5df8768e2120a
-DIST drumstick-0.5.0.tar.bz2 200914 SHA256 5a12bcf2a26dac7f2a5c9507c662c4c85556881c64bb55365dceb437cf3652cd
-EBUILD drumstick-0.5.0.ebuild 1335 SHA256 85cd65702bc0de3bb0a21cedb09a288d1d58b3d055254cd74cdd940eb4d39369 SHA512 dfa13bf736af43956fd0897d23266d9c7d5a3dd9fe5aa54d2aa9a21b78fa99594984d61fc8be4a6bc33ecaa736ab87c803085233227806765b78b7dae53073b3 WHIRLPOOL 9addd35494a96a299a3f44d8efd1a74d4df7e1a12e5b0950776aac7285cb4314576eab7f2cec93d53eaabafe7b1d4d495d83368c22e29078ef7756a84c014e45
-MISC ChangeLog 1862 SHA256 a7eba11052d492ea452ce9e6f2621a8422b1315e26138308f8608237a5c7acf5 SHA512 8723250b8e303abe636ba8b94831f8ab258d7d7e333cc2bdef5dd390a74e516f8e3969e375f40cda0a6742ae5ca383e8ebb2f780bd61135079245fdb0b879cc1 WHIRLPOOL 5db680fac7947b94a514d56a8b543d36d4b232256ef69f2cfa4fb2dac850f875a6dfda461f707d3798a72bb8e25dd9275a8708d32522198004c75549a16679ca
+AUX 0.5.0-underlinking.patch 364 SHA256 ba25dac1e732fc4f86396f370d6d945954a511ad933073a603f0b5247021be88 SHA512 f4ed6333dcb162a16ac2679672cd9213934eb59fdff720a9ef0b6a269a798b0ef04c3218a77a127e6d3f4b662fa43d9d68d2d90073290c3049d95bdb05234cd3 WHIRLPOOL ca95eead80d5ec7c2552826c28a8da955d04c2dd22f6bb1da8708f06145074830a3683cb2cfce7efb92d53ff3fe8e713759a9647aab8a7cd6743aefac8cebabe
+DIST drumstick-0.5.0.tar.bz2 200914 SHA256 5a12bcf2a26dac7f2a5c9507c662c4c85556881c64bb55365dceb437cf3652cd SHA512 12078dbeae7166da210ccbbaee9d55b4c9e233fd317de72c20482466cd29987c976290efecd29cc28a5be6ed7e3b9fe95ddf1081d75222d9cf9d6aef13080a21 WHIRLPOOL 6d7b35259280aacf0ec414868068f136c39bb8e488848d110739481cbf6bb874cb46c95b98bc8f541185816ff81819494716e2706d9e6a59519bdc2e9520a425
+EBUILD drumstick-0.5.0.ebuild 1376 SHA256 fb7b310c5bfb654a6035def360df469c6ac25b27a302f06bbaa8e1f5a6eb21ea SHA512 7015db7e9190b74bfda71807fbec59fe855c1f5729b9ab1f031e65d19f6f281482485a6e69b88c6df2e5cd7bc702802a5597c8004d406c0edc417314b2202cc2 WHIRLPOOL 9007847d64c0a73015d33f50b9a1cb744d2e83032809f35018589301be82be5d536a57f59e4dc49d7c50de182e998ef62cee93dc42c535e90454eea96d139b60
+MISC ChangeLog 2059 SHA256 3df7579e9e8e2f4ca7e374afc0fd611bae7101004db7396ce27508e1633269c3 SHA512 9c19811bdc9913ac189a0490f9163b0587c816bba8a5b2029e055640284eb2ae0aa29effea0fc9702f1332eebf08ae6370a9e13ad3a0cecaacc61ebc2f1ae337 WHIRLPOOL a69c612a5777209ba1e7dffa8d8144f68faf0722456c79df3661add3c314f859d6deb6aa258dcfc10bf1fe53a0a247f72fbe56b0a62bc4b0742ddee0ce84591e
 MISC metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b SHA512 90f74979d228a35f81de50665ead63d228bc4f0d11f3def4832c9607f4242cbc4562db0a123bdcf2c4b6e0be78fc5565a65f75cdb53ed4c8d45544ebf74255dc WHIRLPOOL a90483bd4fa01ed5fa21bfe9f59c11b97c793146e3031eae342a3355c6dc2e4ef2b356af0bf711b5e16e16551c91d63ecdbb48e708df606017264e8bff5e9fe9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRMnUhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88KjUQAMuis/nzdSWK2KOslVp1+0C1
-JBr38P6bsj4ycd2AwzZqHO0cPZNjP4WLA3psYaOLm0yPR7DhhmBdVMPWn1053fcq
-AHMSGe6m57ZWdlcjpt5jGVmeYF5bAnJhHIF1uUfUlRzgAIrPsAblGPGlJjUiQgYK
-491KkqtigKIL1XIlJRR0EuQ5q1NtWQFWwiZ/jyJ9byxaDEAfa41ctbblTNadwUfM
-OjXUadGlBds/dObVN1mcUbtdPmB4lyNTHtmMAwi49ZuuA8NaZaSGY7xPUzGGqvaL
-eEwX1TxhvOB4mOu9apQJ11644o82n+qU7jCSasjAIj6AHCcn4h3i+NWlSn5BEOzk
-6DO8Xyoy0JBA6Y+BdGSlIh032v5U9/YMsKdKUZTdSg47w35m9+aMnJ8alhAzu3fr
-n/tifaP4XitDI/2wWfEeMYR03+CweIuk1q+AxiOX6ujjap83l6yaTEPSU8WQ+cn9
-pMEuqyM4YBquEddtvbq7q0unS2DYr9BuFn2MSseetrZnHv5LE8GO9LqJg5CcEXhB
-jdzdSNVnvDDCJDP0mxqIr5IGTr0esMhFFJq3UPCXBji4IZ3/ibxXLUS7U6mZi4lJ
-XlAAZbe83LRUJH3AscTtT5GIA9N1sfTFQCwFgeWvU40kQ19+o6BuvM+P3GYAGat8
-5LuymeW4W+Ktg2erfjkE
-=X0oF
+iQEcBAEBCAAGBQJSnYr9AAoJEEdUh39IaPFN1tAH/jRKedlD+UXc9IRy79XpvWhr
+XKdDaMVd5qw4SyNvt6t694VfYfFnsklwwi7gY8wIB+yayhKFOYTFiyO2VJlBCCyL
+E/Im3Fjh1RgE5ZmWofbKxAHFFGQwXXATNsUZgC5mkVel9bD/pSaPjA1rvKIowSRi
+9LMsMvgiWofnQBT2r4KhMX88NcCZdZMPihJLMcFa3JYDNokckkGskvVVuIzhtJSV
+Y3tA+50lvb43zBzRME2qDFSU1Szj3Fu8g0jDBDCqirAvJsHNz5H4MOFp6Ne/IUMz
+Mu/mbZSRFk3MY68DP3tHqZyh8OWJo7+A0MnXVK8eKDlfv3+iFYyHsH4N4th5Soo=
+=yp5u
 -----END PGP SIGNATURE-----
diff --git a/media-sound/drumstick/drumstick-0.5.0.ebuild b/media-sound/drumstick/drumstick-0.5.0.ebuild
index add770bd490e..e6758d2ddd00 100644
--- a/media-sound/drumstick/drumstick-0.5.0.ebuild
+++ b/media-sound/drumstick/drumstick-0.5.0.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/drumstick/drumstick-0.5.0.ebuild,v 1.7 2013/03/02 21:54:43 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/drumstick/drumstick-0.5.0.ebuild,v 1.8 2013/12/03 07:40:56 ssuominen Exp $
 
 EAPI=4
 
@@ -33,6 +33,7 @@ DOCS=( AUTHORS ChangeLog NEWS README TODO )
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-doc_automagicness.patch
+	"${FILESDIR}"/${PV}-underlinking.patch
 )
 
 src_prepare() {
diff --git a/media-sound/drumstick/files/0.5.0-underlinking.patch b/media-sound/drumstick/files/0.5.0-underlinking.patch
new file mode 100644
index 000000000000..1bb5ae7da3bf
--- /dev/null
+++ b/media-sound/drumstick/files/0.5.0-underlinking.patch
@@ -0,0 +1,17 @@
+--- utils/vpiano/CMakeLists.txt
++++ utils/vpiano/CMakeLists.txt
+@@ -1,3 +1,5 @@
++find_package(X11 REQUIRED)
++
+ SET(vpiano_forms_SRCS
+     vpianoabout.ui
+     connections.ui
+@@ -52,7 +54,7 @@
+ TARGET_LINK_LIBRARIES(drumstick-vpiano
+     ${QT_LIBRARIES} 
+     ${ALSA_LIBS} 
+-    ${QT_X11_X11_LIBRARY}
++    ${X11_X11_LIB}
+     drumstick-common
+     drumstick-alsa
+ )