| 1 |
scarabeus 09/05/31 11:05:13 |
| 2 |
|
| 3 |
Modified: licq-1.3.5-r1.ebuild ChangeLog licq-1.3.6.ebuild |
| 4 |
Log: |
| 5 |
Fix dependencies and cmake install path. Per bugs #268134 and #241396. Remove old patches. |
| 6 |
(Portage version: 2.2_rc33/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.7 net-im/licq/licq-1.3.5-r1.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/licq/licq-1.3.5-r1.ebuild?rev=1.7&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/licq/licq-1.3.5-r1.ebuild?rev=1.7&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/licq/licq-1.3.5-r1.ebuild?r1=1.6&r2=1.7 |
| 14 |
|
| 15 |
Index: licq-1.3.5-r1.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.5-r1.ebuild,v |
| 18 |
retrieving revision 1.6 |
| 19 |
retrieving revision 1.7 |
| 20 |
diff -u -r1.6 -r1.7 |
| 21 |
--- licq-1.3.5-r1.ebuild 5 Jul 2008 16:48:39 -0000 1.6 |
| 22 |
+++ licq-1.3.5-r1.ebuild 31 May 2009 11:05:13 -0000 1.7 |
| 23 |
@@ -1,7 +1,8 @@ |
| 24 |
-# Copyright 1999-2008 Gentoo Foundation |
| 25 |
+# Copyright 1999-2009 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.5-r1.ebuild,v 1.6 2008/07/05 16:48:39 armin76 Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.5-r1.ebuild,v 1.7 2009/05/31 11:05:13 scarabeus Exp $ |
| 29 |
|
| 30 |
+EAPI="1" |
| 31 |
WANT_AUTOMAKE=1.9 |
| 32 |
|
| 33 |
inherit autotools eutils kde-functions multilib |
| 34 |
@@ -21,8 +22,8 @@ |
| 35 |
# need-kde and their eclass friends inject things into DEPEND. But we only |
| 36 |
# want them enabled if the kde USE flag is set. We get around this in the |
| 37 |
# following dep lines: |
| 38 |
-RDEPEND="kde? ( >=kde-base/kdelibs-3.0 )" |
| 39 |
-DEPEND="kde? ( >=kde-base/kdelibs-3.0 ) |
| 40 |
+RDEPEND="kde? ( >=kde-base/kdelibs-3.0:3.5 )" |
| 41 |
+DEPEND="kde? ( >=kde-base/kdelibs-3.0:3.5 ) |
| 42 |
ssl? ( >=dev-libs/openssl-0.9.6 ) |
| 43 |
qt3? ( =x11-libs/qt-3* ) |
| 44 |
ncurses? ( sys-libs/ncurses >=dev-libs/cdk-4.9.11.20031210-r1 ) |
| 45 |
|
| 46 |
|
| 47 |
|
| 48 |
1.101 net-im/licq/ChangeLog |
| 49 |
|
| 50 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/licq/ChangeLog?rev=1.101&view=markup |
| 51 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/licq/ChangeLog?rev=1.101&content-type=text/plain |
| 52 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/licq/ChangeLog?r1=1.100&r2=1.101 |
| 53 |
|
| 54 |
Index: ChangeLog |
| 55 |
=================================================================== |
| 56 |
RCS file: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v |
| 57 |
retrieving revision 1.100 |
| 58 |
retrieving revision 1.101 |
| 59 |
diff -u -r1.100 -r1.101 |
| 60 |
--- ChangeLog 17 Nov 2008 20:51:05 -0000 1.100 |
| 61 |
+++ ChangeLog 31 May 2009 11:05:13 -0000 1.101 |
| 62 |
@@ -1,6 +1,13 @@ |
| 63 |
# ChangeLog for net-im/licq |
| 64 |
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 65 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.100 2008/11/17 20:51:05 flameeyes Exp $ |
| 66 |
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 67 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.101 2009/05/31 11:05:13 scarabeus Exp $ |
| 68 |
+ |
| 69 |
+ 31 May 2009; Tomáš Chvátal <scarabeus@g.o> |
| 70 |
+ -files/1.2.7-debugflag.patch, -files/1.2.7-nptl.patch, |
| 71 |
+ -files/1.3.0-gpgme3_hack.patch, -files/1.3.0-no_stupid_koloboks.patch, |
| 72 |
+ -files/1.3.2-email_typo.patch, -files/licq-1.3.2-gcc41.patch, |
| 73 |
+ licq-1.3.5-r1.ebuild, licq-1.3.6.ebuild: |
| 74 |
+ Fix dependencies and cmake install path. Per bugs #268134 and #241396. |
| 75 |
|
| 76 |
17 Nov 2008; Diego E. Pettenò <flameeyes@g.o> |
| 77 |
files/licq-1.3.5-prevent-dos.patch: |
| 78 |
|
| 79 |
|
| 80 |
|
| 81 |
1.3 net-im/licq/licq-1.3.6.ebuild |
| 82 |
|
| 83 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/licq/licq-1.3.6.ebuild?rev=1.3&view=markup |
| 84 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/licq/licq-1.3.6.ebuild?rev=1.3&content-type=text/plain |
| 85 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/licq/licq-1.3.6.ebuild?r1=1.2&r2=1.3 |
| 86 |
|
| 87 |
Index: licq-1.3.6.ebuild |
| 88 |
=================================================================== |
| 89 |
RCS file: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.6.ebuild,v |
| 90 |
retrieving revision 1.2 |
| 91 |
retrieving revision 1.3 |
| 92 |
diff -u -r1.2 -r1.3 |
| 93 |
--- licq-1.3.6.ebuild 3 Nov 2008 16:40:49 -0000 1.2 |
| 94 |
+++ licq-1.3.6.ebuild 31 May 2009 11:05:13 -0000 1.3 |
| 95 |
@@ -1,10 +1,11 @@ |
| 96 |
-# Copyright 1999-2008 Gentoo Foundation |
| 97 |
+# Copyright 1999-2009 Gentoo Foundation |
| 98 |
# Distributed under the terms of the GNU General Public License v2 |
| 99 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.6.ebuild,v 1.2 2008/11/03 16:40:49 mr_bones_ Exp $ |
| 100 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.6.ebuild,v 1.3 2009/05/31 11:05:13 scarabeus Exp $ |
| 101 |
|
| 102 |
EAPI="1" |
| 103 |
|
| 104 |
-inherit eutils kde-functions multilib |
| 105 |
+CMAKE_USE_DIR="${S}/plugins/qt4-gui" |
| 106 |
+inherit eutils kde-functions multilib cmake-utils |
| 107 |
|
| 108 |
DESCRIPTION="ICQ Client with v8 support" |
| 109 |
HOMEPAGE="http://www.licq.org/" |
| 110 |
@@ -23,12 +24,11 @@ |
| 111 |
qt3? ( x11-libs/qt:3 ) |
| 112 |
qt4? ( x11-libs/qt-gui:4 ) |
| 113 |
nls? ( sys-devel/gettext ) |
| 114 |
- ncurses? ( sys-libs/ncurses =dev-libs/cdk-5* ) |
| 115 |
+ ncurses? ( sys-libs/ncurses dev-libs/cdk ) |
| 116 |
crypt? ( app-crypt/gpgme:1 ) |
| 117 |
xosd? ( x11-libs/xosd )" |
| 118 |
DEPEND="${RDEPEND} |
| 119 |
- dev-libs/boost |
| 120 |
- qt4? ( >=dev-util/cmake-2.6.2 )" |
| 121 |
+ dev-libs/boost" |
| 122 |
|
| 123 |
_generate_plugins_directories() { |
| 124 |
PLUGINS="auto-reply email rms" |
| 125 |
@@ -73,19 +73,16 @@ |
| 126 |
done |
| 127 |
# we like qt4 it uses cmake |
| 128 |
if use qt4; then |
| 129 |
- cd "${S}"/plugins/qt4-gui |
| 130 |
einfo "Compiling Licq: \"qt4-gui\"." |
| 131 |
# Possible error because of one tiny issue we introduce in kde |
| 132 |
# it is called kdeprefix and in that case you can't be sure where it |
| 133 |
# find kde stuff. This is working only for -kdeprefix so someone will |
| 134 |
# need to fix this later |
| 135 |
- myconf2="-DCMAKE_INSTALL_PREFIX=/usr" |
| 136 |
# kde not yet workie |
| 137 |
# use kde && myconf2="${myconf2} -DWITH_KDE=1" |
| 138 |
use kde && ewarn "Sorry but kde4 support is duped and not working so not |
| 139 |
enabling for now" |
| 140 |
- cmake . ${myconf2} || die "cmake failed" |
| 141 |
- emake || die "emake failed" |
| 142 |
+ cmake-utils_src_compile |
| 143 |
fi |
| 144 |
} |
| 145 |
|
| 146 |
@@ -102,9 +99,8 @@ |
| 147 |
dodoc README* *.conf |
| 148 |
done |
| 149 |
if use qt4; then |
| 150 |
- cd "${S}"/plugins/qt4-gui |
| 151 |
einfo "Installing Licq: \"qt4-gui\"." |
| 152 |
- emake DESTDIR="${D}" install || die |
| 153 |
+ cmake-utils_src_install |
| 154 |
docinto plugins/qt4-gui |
| 155 |
dodoc doc/README* |
| 156 |
fi |
Archives