| 1 |
ssuominen 09/12/25 20:20:05 |
| 2 |
|
| 3 |
Modified: ChangeLog licq-1.3.6.ebuild |
| 4 |
Removed: licq-1.3.7.ebuild |
| 5 |
Log: |
| 6 |
Remove kdelibs:3.5 depend and USE kde with it wrt #292791 and workaround multilib-strict bug. |
| 7 |
(Portage version: 2.2_rc60/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.112 net-im/licq/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/licq/ChangeLog?rev=1.112&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/licq/ChangeLog?rev=1.112&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/licq/ChangeLog?r1=1.111&r2=1.112 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v |
| 19 |
retrieving revision 1.111 |
| 20 |
retrieving revision 1.112 |
| 21 |
diff -u -r1.111 -r1.112 |
| 22 |
--- ChangeLog 14 Dec 2009 14:22:08 -0000 1.111 |
| 23 |
+++ ChangeLog 25 Dec 2009 20:20:05 -0000 1.112 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for net-im/licq |
| 26 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.111 2009/12/14 14:22:08 ssuominen Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.112 2009/12/25 20:20:05 ssuominen Exp $ |
| 29 |
+ |
| 30 |
+ 25 Dec 2009; Samuli Suominen <ssuominen@g.o> licq-1.3.6.ebuild: |
| 31 |
+ Remove kdelibs:3.5 depend and USE kde with it wrt #292791 and workaround |
| 32 |
+ multilib-strict bug. |
| 33 |
|
| 34 |
*licq-1.3.8 (14 Dec 2009) |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.12 net-im/licq/licq-1.3.6.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/licq/licq-1.3.6.ebuild?rev=1.12&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/licq/licq-1.3.6.ebuild?rev=1.12&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/licq/licq-1.3.6.ebuild?r1=1.11&r2=1.12 |
| 44 |
|
| 45 |
Index: licq-1.3.6.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.6.ebuild,v |
| 48 |
retrieving revision 1.11 |
| 49 |
retrieving revision 1.12 |
| 50 |
diff -u -r1.11 -r1.12 |
| 51 |
--- licq-1.3.6.ebuild 11 Dec 2009 15:11:08 -0000 1.11 |
| 52 |
+++ licq-1.3.6.ebuild 25 Dec 2009 20:20:05 -0000 1.12 |
| 53 |
@@ -1,11 +1,11 @@ |
| 54 |
# Copyright 1999-2009 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.6.ebuild,v 1.11 2009/12/11 15:11:08 ssuominen Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.6.ebuild,v 1.12 2009/12/25 20:20:05 ssuominen Exp $ |
| 58 |
|
| 59 |
EAPI="1" |
| 60 |
|
| 61 |
CMAKE_USE_DIR="${S}/plugins/qt4-gui" |
| 62 |
-inherit eutils kde-functions multilib cmake-utils |
| 63 |
+inherit eutils qt3 multilib cmake-utils |
| 64 |
|
| 65 |
DESCRIPTION="ICQ Client with v8 support" |
| 66 |
HOMEPAGE="http://www.licq.org/" |
| 67 |
@@ -14,13 +14,9 @@ |
| 68 |
LICENSE="GPL-2" |
| 69 |
SLOT="2" |
| 70 |
KEYWORDS="alpha amd64 ia64 ppc sparc x86" |
| 71 |
-IUSE="crypt debug kde msn ncurses nls qt3 qt4 socks5 ssl xosd" |
| 72 |
+IUSE="crypt debug msn ncurses nls qt3 qt4 socks5 ssl xosd" |
| 73 |
|
| 74 |
-# we use kde as KDE4 |
| 75 |
-RDEPEND="kde? ( |
| 76 |
- qt3? ( kde-base/kdelibs:3.5 ) |
| 77 |
- ) |
| 78 |
- ssl? ( dev-libs/openssl ) |
| 79 |
+RDEPEND="ssl? ( dev-libs/openssl ) |
| 80 |
qt3? ( x11-libs/qt:3 ) |
| 81 |
qt4? ( x11-libs/qt-gui:4 ) |
| 82 |
nls? ( sys-devel/gettext ) |
| 83 |
@@ -65,9 +61,6 @@ |
| 84 |
cd "${S}"/plugins/"${plugin}" |
| 85 |
einfo "Compiling Licq: \"${plugin}\"." |
| 86 |
if use qt3; then |
| 87 |
- set-qtdir 3 |
| 88 |
- set-kdedir 3 |
| 89 |
- use kde && myconf2="${myconf} --with-kde" |
| 90 |
myconf2="${myconf2} --with-qt-libraries=${QTDIR}/$(get_libdir)" |
| 91 |
fi |
| 92 |
econf ${myconf} ${myconf2} || die "econf failed" |
| 93 |
@@ -82,8 +75,6 @@ |
| 94 |
# need to fix this later |
| 95 |
# kde not yet workie |
| 96 |
# use kde && myconf2="${myconf2} -DWITH_KDE=1" |
| 97 |
- use kde && ewarn "Sorry but kde4 support is duped and not working so not |
| 98 |
- enabling for now" |
| 99 |
cmake-utils_src_compile |
| 100 |
fi |
| 101 |
} |
| 102 |
@@ -104,6 +95,9 @@ |
| 103 |
einfo "Installing Licq: \"qt4-gui\"." |
| 104 |
cmake-utils_src_install |
| 105 |
docinto plugins/qt4-gui |
| 106 |
+ # Hack only for 1.3.6. Fixed in 1.3.8. |
| 107 |
+ mv -f "${D}"/usr/lib/licq/licq_qt4-gui.so \ |
| 108 |
+ "${D}"/usr/$(get_libdir)/licq/licq_qt4-gui.so |
| 109 |
fi |
| 110 |
|
| 111 |
exeinto /usr/share/${PN}/upgrade |
Archives