closing bug #60767

5 files changed, 188 insertions, 3 deletions

diff --git a/net-im/licq/ChangeLog b/net-im/licq/ChangeLog
index 22aefe75f4ba..170345a367e3 100644
--- a/net-im/licq/ChangeLog
+++ b/net-im/licq/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/licq
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.39 2004/06/29 12:22:48 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.40 2004/08/20 13:47:37 voxus Exp $
+
+*licq-1.3.0_pre (20 Aug 2004)
+
+  20 Aug 2004; Konstantin Arkhipov <voxus@gentoo.org> +licq-1.3.0_pre.ebuild:
+  Version bump, closing #60767.
+  Thanks to Andy Crook <crook@mc.iba.by>.
 
   29 Jun 2004; Carsten Lohrke <carlo@gentoo.org> licq-1.2.7.ebuild:
   QA: kde-base -> kde (in comment)
diff --git a/net-im/licq/Manifest b/net-im/licq/Manifest
index 76a8b814d8f6..9f505d691cc2 100644
--- a/net-im/licq/Manifest
+++ b/net-im/licq/Manifest
@@ -1,5 +1,8 @@
 MD5 481c2244bfa25938051e82c760aba1b9 licq-1.2.7.ebuild 3494
-MD5 078a1fd887ef78f63af5debbd31ab395 ChangeLog 5662
-MD5 3795e526fdf015e985be17fca698e2d1 files/digest-licq-1.2.7 64
+MD5 f384e214507cc8d95f5cb8206b30d1e8 ChangeLog 5846
+MD5 538090afac1de8b35c3f1d0102726d28 licq-1.3.0_pre.ebuild 3854
 MD5 c18e90be9c36c7efb06211733ad765ff files/1.2.7-debugflag.patch 396
 MD5 5f64e4b71c311ff7b6489953fc8bf1f9 files/1.2.7-nptl.patch 1178
+MD5 3795e526fdf015e985be17fca698e2d1 files/digest-licq-1.2.7 64
+MD5 8cc9f21e0153522e2b9a7ac4b4dd023b files/1.3.0-upgradepath.patch 547
+MD5 5079eefd8c78bf30104105bf933436cd files/digest-licq-1.3.0_pre 68
diff --git a/net-im/licq/files/1.3.0-upgradepath.patch b/net-im/licq/files/1.3.0-upgradepath.patch
new file mode 100644
index 000000000000..be1b849b5afc
--- /dev/null
+++ b/net-im/licq/files/1.3.0-upgradepath.patch
@@ -0,0 +1,11 @@
+--- src/licq.cpp-	2004-08-20 17:15:21.151114440 +0400
++++ src/licq.cpp	2004-08-20 17:16:07.409616782 +0400
+@@ -332,7 +332,7 @@
+     fprintf(stderr, tr("Previous Licq config files detected.\n"
+                        "Manual upgrade is necessary.  Follow the instructions\n"
+                        "in the UPGRADE file included with the source tree or\n"
+-                       "in /usr/doc/licq-xxx/upgrade.\n"));
++                       "run /usr/share/licq/upgrade/upgrade-1.3.0.sh\n"));
+     return false;
+   }
+   if (nVersion < INT_VERSION)
diff --git a/net-im/licq/files/digest-licq-1.3.0_pre b/net-im/licq/files/digest-licq-1.3.0_pre
new file mode 100644
index 000000000000..c750dc0bb3eb
--- /dev/null
+++ b/net-im/licq/files/digest-licq-1.3.0_pre
@@ -0,0 +1 @@
+MD5 d063b6f5d29d6bc73d9e59a119137a7c licq-1.3.0-PRE.tar.bz2 3697628
diff --git a/net-im/licq/licq-1.3.0_pre.ebuild b/net-im/licq/licq-1.3.0_pre.ebuild
new file mode 100644
index 000000000000..72f260887a12
--- /dev/null
+++ b/net-im/licq/licq-1.3.0_pre.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.0_pre.ebuild,v 1.1 2004/08/20 13:47:37 voxus Exp $
+
+inherit eutils
+
+DESCRIPTION="ICQ Client with v8 support"
+HOMEPAGE="http://www.licq.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P/_pre/-PRE}.tar.bz2"
+RESTRICT="nomirror"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~ia64 ~amd64"
+IUSE="ssl socks5 qt kde ncurses"
+
+# we can't have conditional dependencies so "use kde && inherit kde"
+# won't work -- messes up dep caching.
+
+# need-kde and their eclass friends inject things into DEPEND. But we only
+# want them enabled if the kde USE flag is set. We get around this in the
+# following dep lines:
+RDEPEND="kde? ( >=kde-base/kdelibs-3.0 )"
+DEPEND="kde? ( >=kde-base/kdelibs-3.0 )
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	qt? ( >=x11-libs/qt-3.0.0 )
+	ncurses? ( sys-libs/ncurses )"
+#	crypt? ( >=app-crypt/gpgme-0.9.0 )"
+
+S=${WORKDIR}/${PN}-${PV/_pre/-PRE}
+
+src_unpack() {
+	unpack ${A}
+
+	if use kde
+	then
+		# fix for #12436
+		ebegin "Setting kde plugin as default..."
+		cp ${S}/src/licq.conf.h ${T}
+		sed "s:Plugin1 = qt-gui:Plugin1 = kde-gui:" \
+			${T}/licq.conf.h > ${S}/src/licq.conf.h
+		eend $?
+	else
+		if ! use qt
+		then
+				ebegin "Setting console plugin as default..."
+				cp ${S}/src/licq.conf.h ${T}
+				sed "s:Plugin1 = qt-gui:Plugin1 = console:" \
+					${T}/licq.conf.h > ${S}/src/licq.conf.h
+				eend $?
+		fi
+	fi
+
+	cd ${S}/src && epatch ${FILESDIR}/${PV/_pre/}-upgradepath.patch || \
+		ewarn "Fail to fix upgrade path, forget it"
+}
+
+src_compile() {
+	local first_conf
+	use ssl		|| myconf="${myconf} --disable-openssl"
+	use socks5	&& myconf="${myconf} --enable-socks5"
+#	use crypt	|| support for gpgme-0.9.0 is totally b0rked
+	myconf="${myconf} --disable-gpgme"
+
+	econf ${myconf} || die
+	emake || die
+
+	# Create the various plug-ins
+
+	# First, the Qt plug-in
+	if use qt
+	then
+		# A hack to build against the latest QT:
+		local v
+		for v in /usr/qt/[0-9]
+		do
+			[ -d "${v}" ] && export QTDIR="${v}"
+		done
+		use kde && kde_src_compile myconf
+		use kde && myconf="${myconf} --with-kde"
+
+		# note! watch the --prefix=/usr placement;
+		# licq itself installs into /usr, but the
+		# optional kde/qt interface (to which second_conf belogns)
+		# installs its files in $KDE3DIR/{lib,share}/licq
+
+		cd ${S}/plugins/qt-gui
+		einfo "Compiling Qt GUI plug-in"
+		econf ${myconf} || die
+		emake || die
+	fi
+
+	# Now the console plug-in
+	if use ncurses
+	then
+		cd ${S}/plugins/console
+		einfo "Compiling the Console plug-in"
+		econf || die
+		emake || die
+	fi
+
+	# The Auto-Responder plug-in
+	cd ${S}/plugins/auto-reply
+	einfo "Compiling the Auto-Reply plug-in"
+	econf || die
+	emake || die
+
+	# The Remote Management Service
+	cd ${S}/plugins/rms
+	einfo "Compiling Remote Management Services plug-in"
+	econf || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	dodoc ChangeLog INSTALL README* doc/*
+
+	# Install the plug-ins
+	if use qt
+	then
+		cd ${S}/plugins/qt-gui
+		make DESTDIR=${D} install || die
+		docinto plugins/qt-gui
+		dodoc README*
+
+	fi
+
+	if use ncurses
+	then
+	    cd ${S}/plugins/console
+	    make DESTDIR=${D} install || die
+	    docinto plugins/console
+	    dodoc README
+	fi
+
+
+	cd ${S}/plugins/auto-reply
+	make DESTDIR=${D} install || die
+	docinto plugins/auto-reply
+	dodoc README licq_autoreply.conf
+
+	cd ${S}/plugins/rms
+	make DESTDIR=${D} install || die
+	docinto plugins/rms
+	dodoc README licq_rms.conf
+
+	insinto /usr/share/${PN}/upgrade
+	doins ${S}/upgrade/*
+
+	# fixes bug #22136
+	rm -fR ${D}/var
+}
+
+pkg_postinst() {
+	echo
+	ewarn
+	ewarn "If you're upgrading from <=licq-1.3.0 - you have to manually "
+	ewarn "upgrade your existing licq installation. Please backup your "
+	ewarn "settings and run: /usr/share/licq/upgrade/upgrade-1.3.0.sh"
+	ewarn
+	echo
+}