[gentoo-commits] gentoo-x86 commit in net-im/licq: ChangeLog licq-1.3.6.ebuild licq-1.3.7.ebuild

[gentoo-commits] gentoo-x86 commit in net-im/licq: ChangeLog licq-1.3.6.ebuild licq-1.3.7.ebuild

[Samuli Suominen (ssuominen)]

ssuominen    09/12/25 20:20:05

  Modified:             ChangeLog licq-1.3.6.ebuild
  Removed:              licq-1.3.7.ebuild
  Log:
  Remove kdelibs:3.5 depend and USE kde with it wrt #292791 and workaround multilib-strict bug.
  (Portage version: 2.2_rc60/cvs/Linux x86_64)

Revision  Changes    Path
1.112                net-im/licq/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/licq/ChangeLog?rev=1.112&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/licq/ChangeLog?rev=1.112&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/licq/ChangeLog?r1=1.111&r2=1.112

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- ChangeLog	14 Dec 2009 14:22:08 -0000	1.111
+++ ChangeLog	25 Dec 2009 20:20:05 -0000	1.112
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/licq
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.111 2009/12/14 14:22:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.112 2009/12/25 20:20:05 ssuominen Exp $
+
+  25 Dec 2009; Samuli Suominen <ssuominen@gentoo.org> licq-1.3.6.ebuild:
+  Remove kdelibs:3.5 depend and USE kde with it wrt #292791 and workaround
+  multilib-strict bug.
 
 *licq-1.3.8 (14 Dec 2009)
 



1.12                 net-im/licq/licq-1.3.6.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/licq/licq-1.3.6.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/licq/licq-1.3.6.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/licq/licq-1.3.6.ebuild?r1=1.11&r2=1.12

Index: licq-1.3.6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.6.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- licq-1.3.6.ebuild	11 Dec 2009 15:11:08 -0000	1.11
+++ licq-1.3.6.ebuild	25 Dec 2009 20:20:05 -0000	1.12
@@ -1,11 +1,11 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.6.ebuild,v 1.11 2009/12/11 15:11:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.6.ebuild,v 1.12 2009/12/25 20:20:05 ssuominen Exp $
 
 EAPI="1"
 
 CMAKE_USE_DIR="${S}/plugins/qt4-gui"
-inherit eutils kde-functions multilib cmake-utils
+inherit eutils qt3 multilib cmake-utils
 
 DESCRIPTION="ICQ Client with v8 support"
 HOMEPAGE="http://www.licq.org/"
@@ -14,13 +14,9 @@
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="alpha amd64 ia64 ppc sparc x86"
-IUSE="crypt debug kde msn ncurses nls qt3 qt4 socks5 ssl xosd"
+IUSE="crypt debug msn ncurses nls qt3 qt4 socks5 ssl xosd"
 
-# we use kde as KDE4
-RDEPEND="kde? (
-		qt3? ( kde-base/kdelibs:3.5 )
-	)
-	ssl? ( dev-libs/openssl )
+RDEPEND="ssl? ( dev-libs/openssl )
 	qt3? ( x11-libs/qt:3 )
 	qt4? ( x11-libs/qt-gui:4 )
 	nls? ( sys-devel/gettext )
@@ -65,9 +61,6 @@
 		cd "${S}"/plugins/"${plugin}"
 		einfo "Compiling Licq: \"${plugin}\"."
 		if use qt3; then
-			set-qtdir 3
-			set-kdedir 3
-			use kde && myconf2="${myconf} --with-kde"
 			myconf2="${myconf2} --with-qt-libraries=${QTDIR}/$(get_libdir)"
 		fi
 		econf ${myconf} ${myconf2} || die "econf failed"
@@ -82,8 +75,6 @@
 		# need to fix this later
 		# kde not yet workie
 		# use kde && myconf2="${myconf2} -DWITH_KDE=1"
-		use kde && ewarn "Sorry but kde4 support is duped and not working so not
-		enabling for now"
 		cmake-utils_src_compile
 	fi
 }
@@ -104,6 +95,9 @@
 		einfo "Installing Licq: \"qt4-gui\"."
 		cmake-utils_src_install
 		docinto plugins/qt4-gui
+		# Hack only for 1.3.6. Fixed in 1.3.8.
+		mv -f "${D}"/usr/lib/licq/licq_qt4-gui.so \
+			"${D}"/usr/$(get_libdir)/licq/licq_qt4-gui.so
 	fi
 
 	exeinto /usr/share/${PN}/upgrade