From c30e4327d4c39c291892d056a51fcb0b473aa0ac Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20H=C3=BCttel?= Date: Tue, 27 Dec 2011 12:23:55 +0000 Subject: [PATCH] Fix test build problem, bug 393099 Package-Manager: portage-2.1.10.41/cvs/Linux x86_64 --- kde-base/kscd/ChangeLog | 6 +++- kde-base/kscd/Manifest | 33 ++++++++++--------- .../kscd/files/kscd-4.7.3-underlinking.patch | 18 ++++++++++ kde-base/kscd/kscd-4.7.3.ebuild | 5 ++- kde-base/kscd/kscd-4.7.4.ebuild | 5 ++- 5 files changed, 44 insertions(+), 23 deletions(-) create mode 100644 kde-base/kscd/files/kscd-4.7.3-underlinking.patch diff --git a/kde-base/kscd/ChangeLog b/kde-base/kscd/ChangeLog index 97662a03fa81..c14612072deb 100644 --- a/kde-base/kscd/ChangeLog +++ b/kde-base/kscd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kscd # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/ChangeLog,v 1.198 2011/12/18 19:46:32 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/ChangeLog,v 1.199 2011/12/27 12:23:55 dilfridge Exp $ + + 27 Dec 2011; Andreas K. Huettel kscd-4.7.3.ebuild, + +files/kscd-4.7.3-underlinking.patch, kscd-4.7.4.ebuild: + Fix test build problem, bug 393099 18 Dec 2011; Andreas K. Huettel -kscd-4.6.5.ebuild: Drop KDE 4.6.5 diff --git a/kde-base/kscd/Manifest b/kde-base/kscd/Manifest index 0856766ad783..71a01f0864bc 100644 --- a/kde-base/kscd/Manifest +++ b/kde-base/kscd/Manifest @@ -1,28 +1,29 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 +AUX kscd-4.7.3-underlinking.patch 434 RMD160 9f03c759f32410be149318d61b0831b33b66c55e SHA1 b7501750b60ebc82988fec6ebd829c22ac9acf5e SHA256 1641244e7a55fe163b043fd52f5a641e97cdea181bef99e3ddaa166f9caf8a8e DIST kdemultimedia-4.6.3.tar.bz2 1611668 RMD160 8824bda18a1f1051dea366a0ff0d6191068476dd SHA1 d5bde19156b65e9b56e0e6de800efc0efe117632 SHA256 b3a6732dead0558610b4b40d3ce28c4b7b5da8869a63436180eacb3aacec533b DIST kdemultimedia-4.7.3.tar.bz2 1644497 RMD160 de9d9f9341d91bf0d56fa9468c0441226cb6aba2 SHA1 4db44494e6a2ef886e3513b6a2eb4e526741a6ff SHA256 ad96332218b82c4466debcb165061d87051a917e0321bdc34e4024da9c8c30b1 DIST kdemultimedia-4.7.4.tar.bz2 1644450 RMD160 c180dfed17735bfef4303802dd8065ed308cdd6a SHA1 e0001afac38e35e3ab7b919d79f74cd57e3c18dd SHA256 c1236ed17f575ff793869e5ade024f892ae36aba27a00edafb3495806fb81b28 EBUILD kscd-4.6.3.ebuild 640 RMD160 16e44755e66d65bd856cb483ca84ab409e53d227 SHA1 5f942a02d633dc25828ec79a332a94733a9536c9 SHA256 218ca3f8e8f564af54e1812642701456dfab4be5feb4ac01727cc0fa33586af9 -EBUILD kscd-4.7.3.ebuild 673 RMD160 8a3b8306644ab60c69aea19281aee13bdcf44785 SHA1 e837800f3a57e9db02ec33e803e3b9b74b34d31d SHA256 2a59b3111328d7a3ace7a95550b00f76e2fef436fdf3ce36d9aefb4353f979c7 -EBUILD kscd-4.7.4.ebuild 673 RMD160 10faad878b0cde0298fd6ee8106a44d454a90f23 SHA1 730b8e2e2be85c8f21b14971d40f9dbed85df854 SHA256 3ac084521fe89b09e7a321e6016ebda4b8e5f75b3590f0d536fa144c995be2af -MISC ChangeLog 23216 RMD160 2272ce4332c4cd17d0029a3332f41c19d283859d SHA1 1c1ed8678ee829a26862e9f2330325e1889f974d SHA256 f6838aab9387b4cbd53e75b494644c5934395b72b3ad77895a663ad76e7231a9 +EBUILD kscd-4.7.3.ebuild 702 RMD160 14d9053628926d72dda5faba11e0723538bca0ee SHA1 94dc05291a389e0beb11b5b9ddf780aea0a0f01c SHA256 9cece7bf6696c6cc0eec193b4068f5346a4e41430f331766358abcb3768929bf +EBUILD kscd-4.7.4.ebuild 704 RMD160 6510bca8486991c39f19ed888b1d0cb01a44291a SHA1 cee3917a3e5185a3eef4815659aa1bdbd51b51ce SHA256 d4be28046b0412cd0d7e899f9963e001eda9df88c915f33259b4daddc41b4223 +MISC ChangeLog 23389 RMD160 5c3a920a0b3e37d5db98c000d784c22f6c913da1 SHA1 55869d3767d34bc35413d4cd0d41c5336a522d61 SHA256 24e1b4861779ab66face40281bfdd260a548581950eed7bd258ecb8c3f016af6 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCgAGBQJO7kN6AAoJENwGBM22xffeM+8P/10gs7FTYKJo5rBi6Y4KSW5c -jX9wGK6vg+9NA1ML/Y9k/zmiEH8ET5SpjSnB6MJtogutXtrmy0Sb0uBEKCAprPMF -+zcrRD2HSSGUq+HNPROmaW3fczR6A6c3PN0FGoM7+ot+2NYezJIXpnUFN9aZ06mC -EWGJW/fAqpentOEOOaRPeXpqCFTYPv5wAntXSMZalrrIjLqcV3uCOlPRAO7v3ct/ -DiPc+foKJ3KjnAHpa0FQLff8X+5HABPJgGzRlSjfxIFZvO2ZhQLYqFc0qApiy8Id -W1VEz6o07ZpZANeMtEMKICMM/BZh8ZtN8qXa4Po/ZIpiUeokg+8C3VDBUrJy60kq -jVXNGjS9p9NezYhDjxmpiEbQCZNsEBI5xKuBWhvFQCoqeAUXBX1y4am2ztiYOfiB -RayvGa2Mkjc0ctvCZ+UBo0x+nXODE+Z4WtRlgRvo1+V+nM0FNdumasQzYODZFd3o -zHwecLlMOagAAc2aNX2seCSwNU/uzuOeyAUVZMAdSbEK3hWlZaQbrcdTIblxwJAO -epS0RFCyBF2kWh0Yl1aqsEpuAVSsj0KuOea8DHVMtcFWf75qQlHaXb4hiKhYdU+Y -J5byqUyvq1J1D1uRg0yvwiXApmZoBZwbXjLd09B6z3pjiPPnKwm7DgKrelggMTOW -+Oqhb5S8iH3/99L4wVA2 -=Lwmh +iQIcBAEBCgAGBQJO+blbAAoJEEb+UGWnxTyHp0sP/3RI7G+u2E28Y0npfh1jaBlT +iq6PNwMnnJWNA6XAxURfxc20AulIb3CbzOJojLGvSdJWFeE4k3hCmea7IGPmFZAd +cN/6WWSG9Q8ROcK4IcVMOsphlx/35bpMo0WTQkN/LfK1gOyCY4YX8cg06NpARXcA +N02lYaD+S5+bbU3PKJP2cxG1np21jV1TEOkqlcwbahQsLHUQqcxSkIMrT+VUxOIq +K33R2wD/IUKaQdONwwvb0wfATSsc7KE5cYQIcrplAbb2UEoQ1mVMTShZtnz4B3zD +Vu/pbbr+RssqfzoiEcle7gLcNc1PqHwwSHg1yiZqMGP6yGryI88Tq2MwjHNWCM3e +u7Wk/MVnbXKv+Ne4YlyMoriU8zwlmuyEUaeFUS4R4AXN6EpRZmgixDFaviQCRtuE +fLciP49jD31ecov70JA5DfEBs2R7wcKvhYyJly6YD7/3EqFf8CHKKrEA54pMpKPD +EpOlLu/+ShD707PWz0z1YrCa96Ai6lZsWVHkRnv1dxx4QArQkAvxj2UWr53RZrjg +aDDvksAT4HkwPLCEnDfahBXpI7arRNMuajXGn3IsRWs/Zk9ooLFQBw36RlT3cZKH +sUs0EFDMmObpFYbSbfoNUCH3CauleDdqB4yqsWpREyj3rDFdkc0Zjdo35Kk50hgE +6X0SLy+wk9U5g+Wkzm6y +=ZW3q -----END PGP SIGNATURE----- diff --git a/kde-base/kscd/files/kscd-4.7.3-underlinking.patch b/kde-base/kscd/files/kscd-4.7.3-underlinking.patch new file mode 100644 index 000000000000..0b0baf5404a8 --- /dev/null +++ b/kde-base/kscd/files/kscd-4.7.3-underlinking.patch @@ -0,0 +1,18 @@ +--- kscd/tests/CMakeLists.txt ++++ kscd/tests/CMakeLists.txt +@@ -16,6 +16,7 @@ + + # libraries needed for HWControler tests + target_link_libraries(HWControler_test ++ ${KDE4_KDECORE_LIBS} + ${KDE4_SOLID_LIBS} + ${KDE4_PHONON_LIBS} + ${QT_QTTEST_LIBRARY} +@@ -26,6 +27,7 @@ + + # libraries needed for AudioCD tests + target_link_libraries(AudioCD_test ++ ${KDE4_KDECORE_LIBS} + ${KDE4_SOLID_LIBS} + ${KDE4_PHONON_LIBS} + ${QT_QTTEST_LIBRARY} diff --git a/kde-base/kscd/kscd-4.7.3.ebuild b/kde-base/kscd/kscd-4.7.3.ebuild index 7f7d92bfa9dc..b8e9cb8b86e9 100644 --- a/kde-base/kscd/kscd-4.7.3.ebuild +++ b/kde-base/kscd/kscd-4.7.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/kscd-4.7.3.ebuild,v 1.4 2011/12/07 22:13:55 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/kscd-4.7.3.ebuild,v 1.5 2011/12/27 12:23:55 dilfridge Exp $ EAPI=4 @@ -19,8 +19,7 @@ DEPEND=" " RDEPEND="${DEPEND}" -RESTRICT="test" -# bug 393099 +PATCHES=( "${FILESDIR}/${PN}-4.7.3-underlinking.patch" ) KMEXTRACTONLY=" libkcompactdisc/ diff --git a/kde-base/kscd/kscd-4.7.4.ebuild b/kde-base/kscd/kscd-4.7.4.ebuild index d6904a1906b7..17a41ad40852 100644 --- a/kde-base/kscd/kscd-4.7.4.ebuild +++ b/kde-base/kscd/kscd-4.7.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/kscd-4.7.4.ebuild,v 1.1 2011/12/11 18:52:16 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/kscd-4.7.4.ebuild,v 1.2 2011/12/27 12:23:55 dilfridge Exp $ EAPI=4 @@ -19,8 +19,7 @@ DEPEND=" " RDEPEND="${DEPEND}" -RESTRICT="test" -# bug 393099 +PATCHES=( "${FILESDIR}/${PN}-4.7.3-underlinking.patch" ) KMEXTRACTONLY=" libkcompactdisc/ -- 2.26.2