diff options
| -rw-r--r-- | net-im/licq/ChangeLog | 6 | ||||
| -rw-r--r-- | net-im/licq/licq-1.3.6.ebuild | 20 | ||||
| -rw-r--r-- | net-im/licq/licq-1.3.7.ebuild | 114 |
3 files changed, 12 insertions, 128 deletions
diff --git a/net-im/licq/ChangeLog b/net-im/licq/ChangeLog index e31372ca07d9..0bf58133dded 100644 --- a/net-im/licq/ChangeLog +++ b/net-im/licq/ChangeLog @@ -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) diff --git a/net-im/licq/licq-1.3.6.ebuild b/net-im/licq/licq-1.3.6.ebuild index 458fe67d18f1..6eeed04c27d5 100644 --- a/net-im/licq/licq-1.3.6.ebuild +++ b/net-im/licq/licq-1.3.6.ebuild @@ -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 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" 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 @@ src_compile() { 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 @@ src_compile() { # 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 @@ src_install() { 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 diff --git a/net-im/licq/licq-1.3.7.ebuild b/net-im/licq/licq-1.3.7.ebuild deleted file mode 100644 index 25070602d9b0..000000000000 --- a/net-im/licq/licq-1.3.7.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# 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.7.ebuild,v 1.1 2009/10/26 11:49:44 patrick Exp $ - -EAPI="1" - -CMAKE_USE_DIR="${S}/plugins/qt4-gui" -inherit eutils kde-functions multilib cmake-utils - -DESCRIPTION="ICQ Client with v8 support" -HOMEPAGE="http://www.licq.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86" -IUSE="crypt debug kde 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 ) - qt3? ( x11-libs/qt:3 ) - qt4? ( x11-libs/qt-gui:4 ) - nls? ( sys-devel/gettext ) - ncurses? ( sys-libs/ncurses dev-libs/cdk ) - crypt? ( app-crypt/gpgme:1 ) - xosd? ( x11-libs/xosd )" -DEPEND="${RDEPEND} - dev-libs/boost" - -#PATCHES=( "${FILESDIR}/${P}-glibc-2.10.patch" ) - -_generate_plugins_directories() { - PLUGINS="auto-reply email rms" - use msn && PLUGINS="${PLUGINS} msn" - use ncurses && PLUGINS="${PLUGINS} console" - use xosd && PLUGINS="${PLUGINS} osd" - # QT4 is something extra. Uses cmake. - use qt4 && PLUGINS_CMAKE="${PLUGINS_CMAKE} qt4-gui" - use qt3 && PLUGINS="${PLUGINS} qt-gui" - elog "I will generate these plugins/frontends for licq:" - elog "${PLUGINS} ${PLUGINS_CMAKE}" -} - -pkg_setup() { - _generate_plugins_directories -} - -src_compile() { - local myconf myconf2 plugin - # global config setup for automake - myconf="$(use_enable crypt gpgme) - $(use_enable ssl openssl) - $(use_enable socks5) - $(use_enable debug) - $(use_enable nls)" - - einfo "Compiling Licq core." - econf ${myconf} || die "econf failed" - emake || die "emake failed" - - for plugin in ${PLUGINS}; do - 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" - emake || die "emake failed" - done - # we like qt4 it uses cmake - if use qt4; then - einfo "Compiling Licq: \"qt4-gui\"." - # Possible error because of one tiny issue we introduce in kde - # it is called kdeprefix and in that case you can't be sure where it - # find kde stuff. This is working only for -kdeprefix so someone will - # 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 -} - -src_install() { - # install core - einfo "Installing Licq core." - emake DESTDIR="${D}" install || die "emake install failed" - dodoc README* doc/* - # Install the plug-ins - for plugin in ${PLUGINS}; do - cd "${S}"/plugins/"${plugin}" - einfo "Installing Licq: \"${plugin}\"." - emake DESTDIR="${D}" install || die "emake install failed" - dodoc README* *.conf - done - if use qt4; then - einfo "Installing Licq: \"qt4-gui\"." - cmake-utils_src_install - docinto plugins/qt4-gui - fi - - exeinto /usr/share/${PN}/upgrade - doexe "${S}"/upgrade/* - - # fixes bug #22136 and #149464 - rm -fR "${D}"/var -} |