Fix underlinking in test programs, bug 371897

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

diff --git a/net-libs/libktorrent/ChangeLog b/net-libs/libktorrent/ChangeLog
index 060e54cc7ae411b70452a38cd2d78408dd93c211..4c707cf4b430a86b703b2aba452273c6b9ae205a 100644 (file)
--- a/net-libs/libktorrent/ChangeLog
+++ b/net-libs/libktorrent/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libktorrent
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libktorrent/ChangeLog,v 1.26 2011/12/30 23:02:56 dilfridge Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libktorrent/ChangeLog,v 1.27 2012/01/01 18:05:20 dilfridge Exp $
+
+  01 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  libktorrent-1.1.3.ebuild, +files/libktorrent-1.1.3-underlinking.patch:
+  Fix underlinking in test programs, bug 371897
 
   30 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   +libktorrent-1.1.1.ebuild:

diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest
index cc96f874d1332adc65617c961adb7595a04d5ee7..76b6b46c74a0e95c784b4570ff3fb3ba19b400cb 100644 (file)
--- a/net-libs/libktorrent/Manifest
+++ b/net-libs/libktorrent/Manifest
@@ -1,28 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX libktorrent-1.1.3-underlinking.patch 655 RMD160 5f7312861f0d759e915d1db696a2881d451ed408 SHA1 a14064ef4b12fe63386df9646bac0b994c3d9a17 SHA256 f06311d9ee6369ce1dc87ed386b2161f559d2180c4d6eae414104e8312166ee2
 DIST libktorrent-1.1.1.tar.bz2 921292 RMD160 d76201941b162895f876d7714fcb3f19d4e0faaf SHA1 69230778265d2d9ce3b5570407abace5c2da36a4 SHA256 41bb1da13ecbcc52a33f1a06745ca8cf931cafdfd7400c13f95c75a86f1fa919
 DIST libktorrent-1.1.2.tar.bz2 961858 RMD160 ceb3456fec42b4c023e274dbf63034b42bc91878 SHA1 fa8ddfc25e4b8126b37d6370d841db4748dcea33 SHA256 f00175ae0cd2fa9fac50968bee0384b33a5f68496587db3cd680e62158300e5b
 DIST libktorrent-1.1.3.tar.bz2 922651 RMD160 3e3c0da6d2092af7d4dc6e0e4b8dd3c6654f8986 SHA1 e0ba3360213fbfe1e2e84921bb2baeb13e42c3fc SHA256 b6a0c9f2e2a9ce0bb16cb3b82cac894ab43bdaaa95736a26f41778d7aae97b57
 EBUILD libktorrent-1.1.1.ebuild 1349 RMD160 86ca1e20bd9fa8f5f0a23816ebfa709299df63a8 SHA1 796d9eb182d32a12c05457135b56f52b619d6de8 SHA256 20d31d73c8c5c8825f5e3c2aeb9b802d057eaf773ececd9366a3b624516c6147
 EBUILD libktorrent-1.1.2.ebuild 1345 RMD160 7b035e3644d147dc566994a800476c45378ca605 SHA1 45d0d5521fa29f8a6e49925741860e0a5eefd725 SHA256 ebf75f68d318e36aa8c603e536e6593791ddcae0ded8848a41122a2c126564c8
-EBUILD libktorrent-1.1.3.ebuild 1352 RMD160 a11570f4ffa89bb3f11febc0ae5026d6cac80811 SHA1 b7af57c52a7439190cd0acd34c1697f842e4a0ad SHA256 249a950944d244496fc3109ef74f3fa646a4613c014a52fab640fe5fd23b660b
-MISC ChangeLog 3793 RMD160 b78919635162a564ed20a16bc155239dfc6adb10 SHA1 9126d7e264a4c04ead893b1b897257909e570ca6 SHA256 eb8bee026649194173b07541b3ab526fc2afcd2fccdff1a13695bb82540e9321
+EBUILD libktorrent-1.1.3.ebuild 1429 RMD160 c8535dd083cb985589a70cc5d7c147cfa4cac4a1 SHA1 5fece0985a92ca2e02dfb370ee3b4f137f06bfa9 SHA256 6e91b6a991056c353e763f1fa1ebf0a8e15c308d490a49fcba4c9db5c1930b0a
+MISC ChangeLog 3972 RMD160 d7f2777cfab44404a269a4828d088f425b3a565e SHA1 be3e3315c95dc7637c3e16864df6e23900a772c6 SHA256 993ebc738a75053ad0181efcb148a9431b4c872a512d46489c6977f22b430b82
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJO/kOgAAoJEEb+UGWnxTyHm2EP/2vzFN2avrVn3FX5RJ9oQD2u
-YUhdMaTyZ65VYUMFcu8rXhU4w0Xz3ms0Dpb6BIoehzv4KDA0sZ0K5iOq63jLTFaA
-Ppzja/6TONkSn7KHWTEddZMmvQ9sWCUTa8G+u0ID5WemWLqMlQh+Sm8KOYBQPuER
-8LSBgupcJ/JoDLjCh27J4QHGKi2KAsWuDmPbNuWkT851qcFYsrznSmbS3TzTrpJW
-FdlmRgLRyZzDB1R7R1DadeZihLvFVfoeZDgjurnzQkbIR3bp4y9B3LpaPxqLhUC0
-rFF+jVweLROFjFt3Lrq11lzpjvL1adUyzzyEWo5xeDZV9TcFNI0MwRTXTCLI1R6t
-W++wv/PYBxhUGB/9rHGJiCeyhwoAOoIBEXEz8sC9fzIYII8skj+peAQV4JrCmgsA
-C5nKW+eL+8jB1n6lb3wlEkq4G0XVqlupKihBGF8R9OfLXXEgl/OmVqljj/m+oDx+
-f/EVvKCf3xxvOMplMwqxPbHbyy1vAAagVi5PWUaJosGyaS5DM2FPO9oIEsjO8rct
-I5Ruw6eB0VMsnMM4uEdQfvwEaPtDiBt3N01JLDnSEcjf9wP1yKYnUS1HQ2i8OBb9
-dwLsD1YuJh9Q/4XgNlTVH/MjCK9rhG9hKsbe2XGcE2N6vVkau6HzyoQTWh6DjlBu
-1p+0ddxN/GT7evqSuZ7a
-=3i5g
+iQIcBAEBCgAGBQJPAKDiAAoJEEb+UGWnxTyH1BwP/RpIgetp2UKbOnqUt6YdnwVc
+dbDGOfxLk3QFDEusnzv6q3cvc4+wci2uY3tPppC4qTuxEN/nRKOfG/7hfiAHK1GF
+weZDbOZSy89f95MJSxtdLBdImTD2PGI8IzRsGwnKsIreDwK6zCcpZPKfI4Xpt8Ll
+Tkc6TbzgNpIzoZfS930mRMZjZjAKt9Iao1ypfX8CsSMr4SjLZJrIDXHZYBkHah6U
+fRyMj7oGX0f27eP5zwhJ39FvKjydjFSB5iuvcZR/+tgHbFoTF1xyt7koY9Zwnvcx
+PJxmYoQaPPa77mcwhoc1xF4AoXRCDuZ+8nV3BZe4xt9M89y7iOjQPs/HNkiE5d6Z
+2HPSWU0soQAYpNSOR4gRqWkar45X6rlXmlT6bQ7DLYy7FBWWTzUDvLbsFd47bF8c
+29eOyfkiLTZa1Jo2n5LwFht1giqostvMm8xqOD9FXCbYyWTRFIe8eZxX8pVvR54h
+XLtNV1yysVu9HL9n77EcK5GyV78BdXvJXqkwMfRUsXjYZdNaCwDj1DRC+y9H5AMI
+u3PyVlyavoh0Ey9W9ToKxafvENqDwAGxNUhS1q2JTSdjpS2GEAyN0mcN1TNJ2o5t
+9nvnDpbGoQy2P87uzrp2a8DEZWwpo6U1Hz9npgWnC4J7GZTWdZTBUThZkGw2ZZh+
++HbeSS6KPvQcx0WLmavJ
+=tHfn
 -----END PGP SIGNATURE-----

diff --git a/net-libs/libktorrent/files/libktorrent-1.1.3-underlinking.patch b/net-libs/libktorrent/files/libktorrent-1.1.3-underlinking.patch
new file mode 100644 (file)
index 0000000..85ef103
--- /dev/null
+++ b/net-libs/libktorrent/files/libktorrent-1.1.3-underlinking.patch
@@ -0,0 +1,10 @@
+diff -ruN libktorrent-1.1.3.orig/src/util/tests/CMakeLists.txt libktorrent-1.1.3/src/util/tests/CMakeLists.txt
+--- libktorrent-1.1.3.orig/src/util/tests/CMakeLists.txt       2011-11-22 18:21:28.000000000 +0100
++++ libktorrent-1.1.3/src/util/tests/CMakeLists.txt    2012-01-01 19:03:45.000000000 +0100
+@@ -14,4 +14,4 @@
+ 
+ set(fileopstest_SRCS fileopstest.cpp)
+ kde4_add_unit_test(fileopstest TESTNAME fileopstest ${fileopstest_SRCS})
+-target_link_libraries( fileopstest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ktorrent)
+\ Kein Zeilenumbruch am Dateiende.
++target_link_libraries( fileopstest ${KDE4_KDECORE_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTTEST_LIBRARY} ktorrent)

diff --git a/net-libs/libktorrent/libktorrent-1.1.3.ebuild b/net-libs/libktorrent/libktorrent-1.1.3.ebuild
index 014d8d4737bddf3e7dc9c57038a483dd14e299ec..e3eb106cb4bae470f8d46174ff47d00afb4b3253 100644 (file)
--- a/net-libs/libktorrent/libktorrent-1.1.3.ebuild
+++ b/net-libs/libktorrent/libktorrent-1.1.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libktorrent/libktorrent-1.1.3.ebuild,v 1.1 2011/12/30 22:58:46 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libktorrent/libktorrent-1.1.3.ebuild,v 1.2 2012/01/01 18:05:20 dilfridge Exp $
 
 EAPI=4
 
@@ -38,12 +38,15 @@ IUSE="debug"
 RDEPEND="
        app-crypt/qca:2
        dev-libs/gmp
+       $(add_kdebase_dep solid)
 "
 DEPEND="${RDEPEND}
        dev-libs/boost
        sys-devel/gettext
 "
 
+PATCHES=( "${FILESDIR}/${P}-underlinking.patch" )
+
 src_prepare() {
        kde4-base_src_prepare
        # do not build non-installed example binary