Fix underlinking, bug 368919

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

4 files changed, 36 insertions, 18 deletions

diff --git a/dev-util/kscope/ChangeLog b/dev-util/kscope/ChangeLog
index 0860e6b06a50..fef34c193301 100644
--- a/dev-util/kscope/ChangeLog
+++ b/dev-util/kscope/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/kscope
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kscope/ChangeLog,v 1.51 2011/08/07 18:13:06 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kscope/ChangeLog,v 1.52 2011/08/07 18:36:32 dilfridge Exp $
+
+  07 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  kscope-1.9.4-r1.ebuild, +files/kscope-1.9.4-underlinking.patch:
+  Fix underlinking, bug 368919
 
 *kscope-1.9.4-r1 (07 Aug 2011)
 
diff --git a/dev-util/kscope/Manifest b/dev-util/kscope/Manifest
index c05e15592b80..d61432f08b9d 100644
--- a/dev-util/kscope/Manifest
+++ b/dev-util/kscope/Manifest
@@ -2,25 +2,26 @@
 Hash: SHA512
 
 AUX kscope-1.9.4-actions.patch 3325 RMD160 abb9f3dbb90d840d7956b1346b259a0bc0135afa SHA1 1f0a52557747a530a0fb16ac6e0da2b20ec02c6c SHA256 6404f7f30657473237cb2a992baa80ef5a5aef072192dc5e2edee046464d2744
+AUX kscope-1.9.4-underlinking.patch 419 RMD160 c944a576c611fbeb8061c2efcc7dc4e0cc373662 SHA1 746c1363805d75e02461f419655cee0835f2ddfe SHA256 7f6992dc92e6b2afaffdc5139910b9802e39ea36086ffc6e0c7b9a0242c1e55c
 DIST kscope-1.9.4.tar.gz 127892 RMD160 a86bc524664390e6f3f076567370f4106542f4f4 SHA1 60b00601539367e60367ba9bd2532e7d8fbfee0c SHA256 7bd35960afa29026f8e0c4a827868e93b4d7c6e81796ceb89f086efbc24636df
-EBUILD kscope-1.9.4-r1.ebuild 1014 RMD160 1e9767a1b6617b63708084799d1e907482e7cc31 SHA1 5897badad3ad37bc46adf0fa70af318849b65576 SHA256 b9183c44508ab84d018b61779ebd314a770ab998bf10817cf895345ecdd42dcd
+EBUILD kscope-1.9.4-r1.ebuild 1029 RMD160 0b5169917bda3de71c5deb5c4e1a69723565acea SHA1 b98460904c6863fa13cd644270dafad7d41ccffa SHA256 f78b8aeed7b471167389d9627ba561feeb777811d06fe441f6327903d6fccc5d
 EBUILD kscope-1.9.4.ebuild 961 RMD160 174ac02468c57e1cf5b523c83b614cb307d1710b SHA1 c0d2c468e80f702d9e081c3244120728b70cbc5d SHA256 092f539ecd056698269d407774de02a1fa1b48e9a76b2aba0ea0470fe42c3c2d
-MISC ChangeLog 6500 RMD160 e774daa88c34a07bc2f7e8d59b180758fad59f77 SHA1 5365bcd272e31b68ade1381ee2382a05118bc9cf SHA256 e10b3b5eeaf14695ac0cc278767dce4060d1413f75ebb1209445f0005fe8a536
+MISC ChangeLog 6655 RMD160 c7a598fe2705d58d03493e47a0e5fc5f270a52a3 SHA1 44aec4466c6466cc9f2aed004ab34116b1b23041 SHA256 b2df8ee4447851524ade0ae09b6493a2eb7b3974dc697a9c3829c9e585e3702a
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOPtXTAAoJEEb+UGWnxTyH1YEP+wSZwrDfaJwKHtbqAFtd/41s
-PmRuDBZGOxvlLF4RxZI7JTwWahdiMypCRbjY9ybMFXgmgwQe+yZI8G5kllwItkF6
-6sTrtV2kIJDg9iNQooxPDjqPlox9gXMfu7QSS7VrmekUiBYKjgTo0CR3dC9/3jEp
-NgV/EyVUWQoyokfcu/4BjgcZ7mGvxHN6A/rBGMzBvbax3rEgE42kcg+aEugEzhRF
-372bZRSccZfFeS3NR3O1EgoUj4BnE/Qv6SC575AWgxOBDLl4T2fWSUFdMQXqPqDq
-XEv4Pmfq00tcfmPiq1tb30LaeYb3elVoqsNdmmp0SpexrMw0MD0//qinqVYnUa8l
-ii5YZe+fVLZCz3YFmC3UWUb+/tHsXOcKPwK+KbCxq+aDnf+wijsT06ONNqPb0zTP
-D2U+WmDT4yw5E3dLOs/kkxndSLHvHGRUCiNVet2yXblWAHKyIe/P7/9lwheQ5skk
-uHuyDvfeB1hmt2oj8t36GMbm7Kn99ODN7SH8ODwGkXKXcNqF73xwWpovIWfHNblt
-ywMstLt5Dx7znlaumCEaEJJ6HF4Xp5rQ++6MTSdK472pj19NA2qHgr93gtfr8lKs
-yGkPZwE2YbzJq5Lfdjn1S5+Nw2V5hTWpJlOUFyHOqTkyxJji2I9B3zYgtmcurLT5
-xARxicbLsqshz99oTvrx
-=wyMT
+iQIcBAEBCgAGBQJOPttFAAoJEEb+UGWnxTyHXTIP/A84G/FOZqmSajjQFykc8MUE
+3xM6lYFk4MJDNIaEycUz+bXd0y9IjYhXLjiSDJ2t+1KwvXOMUdIORqCTC1f8N1PN
+xWe8SXqLXAofz6D7ufaJYRcOOBPtmCFnKh9tSu7D+03bAdd+n+fHLTjW1MHPskxJ
+uZhTswgyf5R7zAT8K1lHipovL7HAgS5SIqPv63OWHUmLHFFiDM5RtXzwCq7V0zuM
+gqt5wF2biyS+RTiEwMcWl8q3nuj8vF0dq5kN2pyq0mL0CfyCU/3JlBTZEc1xbzu0
+D4Xzt5LO2XbI0Pv54kSdBlacZc2bM8XXWHXLy4gC3oxklwCr2kXjNh7NoXFWOOOc
+teza6SJSBFolHfZ2P85rEoUuu4E6Ktv4huX1orFGZB5lEkUljYL08jMM/c/WjkFi
+a8bdaC4WTaQrFItIPs6GCybqz1iaOJY+C5c9ogQYxSuVjGACimo0vr+2eyBgNvFh
+ji3uFHBzKn4IQ34RvLheH6I/MJeUzxUsrhybjNzKnL3xK3d34YrfH5/QzHPqhpJc
+dE/RxkPW9Gm9Q7Kj+G5KIxbaZCn2i1wf0eOHiGLiamu7u3iTkPT4ODVnWeGFki0h
+Dh+PY5cVaMsjWeMueakm20lACCYrdW3+SHTUQr71Zz0g/I01f6jWCh2LOquchsUe
+cFxIXATHzlRt/ICpzojC
+=fCiS
 -----END PGP SIGNATURE-----
diff --git a/dev-util/kscope/files/kscope-1.9.4-underlinking.patch b/dev-util/kscope/files/kscope-1.9.4-underlinking.patch
new file mode 100644
index 000000000000..90b6fc365594
--- /dev/null
+++ b/dev-util/kscope/files/kscope-1.9.4-underlinking.patch
@@ -0,0 +1,13 @@
+diff -ruN kscope-1.9.4.orig/app/app.pro kscope-1.9.4/app/app.pro
+--- kscope-1.9.4.orig/app/app.pro	2009-03-14 12:45:48.000000000 +0100
++++ kscope-1.9.4/app/app.pro	2011-08-07 20:33:04.540575855 +0200
+@@ -58,7 +58,8 @@
+     -L../cscope \
+     -lkscope_cscope \
+     -L../editor \
+-    -lkscope_editor
++    -lkscope_editor \
++    -lqscintilla2
+ RESOURCES = app.qrc
+ target.path = $${INSTALL_PATH}/bin
+ INSTALLS += target
diff --git a/dev-util/kscope/kscope-1.9.4-r1.ebuild b/dev-util/kscope/kscope-1.9.4-r1.ebuild
index dee87f5ad03c..191faf7b4133 100644
--- a/dev-util/kscope/kscope-1.9.4-r1.ebuild
+++ b/dev-util/kscope/kscope-1.9.4-r1.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/dev-util/kscope/kscope-1.9.4-r1.ebuild,v 1.1 2011/08/07 18:13:06 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kscope/kscope-1.9.4-r1.ebuild,v 1.2 2011/08/07 18:36:32 dilfridge Exp $
 
 EAPI=4
 
@@ -34,5 +34,5 @@ src_prepare() {
 	# fix build failure with parallel make
 	echo "CONFIG += ordered" >> kscope.pro
 
-	epatch "${FILESDIR}/${P}-actions.patch"
+	epatch "${FILESDIR}/${P}"-{actions,underlinking}.patch
 }