Fix linkage for kopete-antispam

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 55 insertions, 4 deletions

diff --git a/kde-misc/kopete-antispam/ChangeLog b/kde-misc/kopete-antispam/ChangeLog
index 12b04cb7a652..96fb3f367bee 100644
--- a/kde-misc/kopete-antispam/ChangeLog
+++ b/kde-misc/kopete-antispam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/kopete-antispam
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kopete-antispam/ChangeLog,v 1.1 2009/02/01 18:45:34 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kopete-antispam/ChangeLog,v 1.2 2009/02/03 10:18:42 alexxy Exp $
+
+  03 Feb 2009; Alexey Shvetsov <alexxy@gentoo.org>
+  +files/kopete-antispam-0.4-fixlink.patch, kopete-antispam-0.4.ebuild:
+  Fix linkage
 
 *kopete-antispam-0.4 (01 Feb 2009)
 
diff --git a/kde-misc/kopete-antispam/Manifest b/kde-misc/kopete-antispam/Manifest
index abedda144f89..acb5a5f417ec 100644
--- a/kde-misc/kopete-antispam/Manifest
+++ b/kde-misc/kopete-antispam/Manifest
@@ -1,4 +1,5 @@
+AUX kopete-antispam-0.4-fixlink.patch 1804 RMD160 2cef87b6424fd107ec57486514aa9e86903cc615 SHA1 a3085a57b9e6f2c3cc4e10c2c27d7149a459d7ff SHA256 a608263284e558b9e43fa04972e1eb0cbde66a7d865cb5c7896b507e7d22bb7f
 DIST kopete-antispam-kde4-0.4.tar.gz 5808 RMD160 8eb8ca67753b76397fdd572b2c45ede225bacc45 SHA1 37cbb781a20b1bb5b7b948027bab9defb82d73f8 SHA256 e9adcb65077d52d1e2da55141b62c8128f846204d42b7744dfbf9af3f954be2f
-EBUILD kopete-antispam-0.4.ebuild 753 RMD160 d1eeee54564e97d8cb6be7cf34e0b59e375ab538 SHA1 036a057ea7cc98903e3e2e0a0a708dddbf7a6a22 SHA256 cc6ad9c3c1219a53b72552fc42933e21f29b523ea2e1531b04677950c38852cd
-MISC ChangeLog 415 RMD160 edaac3b54cd35a75bb5cb57914b4987da3913c8e SHA1 90b3cbb112e55ae2a18ac7011dbeb3f33537ec90 SHA256 7a3c5d9650b16dbaadee585b376ee0fe7863805297ddb589955630b8750caadd
+EBUILD kopete-antispam-0.4.ebuild 799 RMD160 c4db673f3d69556f8456fb73650a4f29300f49f2 SHA1 303f8b776f20381dd04441e6d052fc009c3936ac SHA256 d10c6dc4fb74b9b7beed60df2f6342047c7676cda21881977ce28c66af0a4653
+MISC ChangeLog 553 RMD160 abaf71d59bc3d99da52617b0ebb7618b4d672161 SHA1 df4900351a8866f50f5ece04007b9c9a2cf40b2f SHA256 44f33724c98aee0958db21b79d5f37f3d7fc45e436683315058c9615d20778e3
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-misc/kopete-antispam/files/kopete-antispam-0.4-fixlink.patch b/kde-misc/kopete-antispam/files/kopete-antispam-0.4-fixlink.patch
new file mode 100644
index 000000000000..e92ff398ab4f
--- /dev/null
+++ b/kde-misc/kopete-antispam/files/kopete-antispam-0.4-fixlink.patch
@@ -0,0 +1,44 @@
+--- kopete-antispam-kde4-0.4/CMakeLists.txt.orig	2009-02-03 13:12:45.000000000 +0300
++++ kopete-antispam-kde4-0.4/CMakeLists.txt	2009-02-03 13:13:36.000000000 +0300
+@@ -2,10 +2,14 @@
+ 
+ find_package( KDE4 REQUIRED ) 
+ find_package( Automoc4 REQUIRED )
+-
++find_package( Qt4 REQUIRED )
++set(QT_USE_QTGUI 1)
++set(QT_USE_QTCORE 1)
++set(QT_USE_QT3SUPPORT 1)
++include(${QT_USE_FILE})
+ add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+ 
+-include_directories( ${KDE4_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} )
++include_directories( ${KDE4_INCLUDES}  ${CMAKE_CURRENT_BINARY_DIR} )
+ link_directories( ${KDE4_LIB_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
+ 
+ # libkopete_antispam
+@@ -15,7 +19,7 @@
+ kde4_add_kcfg_files( KOPETEANTISPAM_SRCS kopeteantispamconfig.kcfgc )
+ 
+ kde4_add_plugin( kopete_antispam ${KOPETEANTISPAM_SRCS} )
+-target_link_libraries( kopete_antispam kopete kdeui )
++target_link_libraries( kopete_antispam kopete kdecore kdeui ${QT_LIBRARIES} )
+ 
+ # libkcm_kopete_antispam
+ 
+@@ -25,11 +29,12 @@
+ kde4_add_ui_files( KCMKOPETEANTISPAM_SRCS kopeteantispampreferencesuibase.ui )
+ 
+ kde4_add_plugin( kcm_kopete_antispam ${KCMKOPETEANTISPAM_SRCS} )
+-target_link_libraries( kcm_kopete_antispam kopete kdeui )
++target_link_libraries( kcm_kopete_antispam kopete kdecore kdeui ${QT_LIBRARIES} )
+ 
+ # installation
+ 
+ install( FILES kopeteantispamconfig.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
+ install( FILES kopete_antispam.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+ install( FILES kopete_antispam_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+-install( TARGETS kopete_antispam kcm_kopete_antispam DESTINATION ${PLUGIN_INSTALL_DIR} )
+\ В конце файла нет новой строки
++install( TARGETS kopete_antispam kcm_kopete_antispam DESTINATION ${PLUGIN_INSTALL_DIR} )
++
diff --git a/kde-misc/kopete-antispam/kopete-antispam-0.4.ebuild b/kde-misc/kopete-antispam/kopete-antispam-0.4.ebuild
index 0da6e8ba4dfb..8e90831bf89c 100644
--- a/kde-misc/kopete-antispam/kopete-antispam-0.4.ebuild
+++ b/kde-misc/kopete-antispam/kopete-antispam-0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kopete-antispam/kopete-antispam-0.4.ebuild,v 1.1 2009/02/01 18:45:34 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kopete-antispam/kopete-antispam-0.4.ebuild,v 1.2 2009/02/03 10:18:42 alexxy Exp $
 
 EAPI="2"
 KDE_MINIMAL="4.1"
@@ -23,6 +23,8 @@ DEPEND=">=kde-base/kopete-${KDE_MINIMAL}"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=( "${FILESDIR}/${P}-fixlink.patch" )
+
 pkg_postinst() {
 	elog "You can now enable and set up the Antispam plugin in Kopete."
 	elog "It can be reached in the Kopete Plugin dialog."