changelog:P

7 files changed, 15 insertions, 335 deletions

diff --git a/net-im/licq/ChangeLog b/net-im/licq/ChangeLog
index 833c8f0a78a6..5013e9af9110 100644
--- a/net-im/licq/ChangeLog
+++ b/net-im/licq/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/licq
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.32 2003/09/24 21:43:47 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.33 2003/10/19 15:13:57 lanius Exp $
+
+  19 Oct 2003; Heinrich Wendel <lanius@gentoo.org> licq-1.2.6-r1.ebuild,
+  licq-1.2.6.ebuild, licq-1.2.7.ebuild:
+  cleanups, bug #22136
 
   24 Sep 2003; Chuck Short <zul@gentoo.org> licq-1.2.7.ebuild:
   Unmasked for sparc.
diff --git a/net-im/licq/Manifest b/net-im/licq/Manifest
index ef43f5681b90..d3be437bd889 100644
--- a/net-im/licq/Manifest
+++ b/net-im/licq/Manifest
@@ -1,12 +1,8 @@
-MD5 25237fe99d7426f9e4889206083f6a35 ChangeLog 5020
-MD5 d256bc31fd85d1c82db81b8aae130db8 licq-1.2.6-r1.ebuild 3478
-MD5 7d7f44364eef0bcb47bf21dc8770649f licq-1.2.6.ebuild 4008
-MD5 0fa4b843c82e991f0bef9031d13ef5a8 licq-1.2.7.ebuild 3482
-MD5 6d0aca705b508a2fef7714d742683001 files/1.2.0a-config.patch 996
-MD5 3b10872fafb342e13b1b81dacae7d68e files/1.2.0a-gcc3-gentoo.patch 1996
-MD5 ea0b7f8aa5cf8b175753ede6025f06ce files/1.2.0a-qt31.patch 1306
+MD5 bd20358d14087cf721fe844e4d91278f licq-1.2.7.ebuild 3523
+MD5 23c0d550f3b147754737160bfa28bea8 ChangeLog 5160
+MD5 3795e526fdf015e985be17fca698e2d1 files/digest-licq-1.2.7 64
 MD5 1ac1dc493a89a6338d9e432e072e73a4 files/1.2.6-debugflag.patch 382
+MD5 ea0b7f8aa5cf8b175753ede6025f06ce files/1.2.0a-qt31.patch 1306
+MD5 3b10872fafb342e13b1b81dacae7d68e files/1.2.0a-gcc3-gentoo.patch 1996
 MD5 c18e90be9c36c7efb06211733ad765ff files/1.2.7-debugflag.patch 396
-MD5 361d20e528b72b61170b815694ebe1c7 files/digest-licq-1.2.6 64
-MD5 361d20e528b72b61170b815694ebe1c7 files/digest-licq-1.2.6-r1 64
-MD5 3795e526fdf015e985be17fca698e2d1 files/digest-licq-1.2.7 64
+MD5 6d0aca705b508a2fef7714d742683001 files/1.2.0a-config.patch 996
diff --git a/net-im/licq/files/digest-licq-1.2.6 b/net-im/licq/files/digest-licq-1.2.6
deleted file mode 100644
index 8d03f75b6eb7..000000000000
--- a/net-im/licq/files/digest-licq-1.2.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7e84a1dde8b21eb2bb057d3755353500 licq-1.2.6.tar.bz2 3282918
diff --git a/net-im/licq/files/digest-licq-1.2.6-r1 b/net-im/licq/files/digest-licq-1.2.6-r1
deleted file mode 100644
index 8d03f75b6eb7..000000000000
--- a/net-im/licq/files/digest-licq-1.2.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7e84a1dde8b21eb2bb057d3755353500 licq-1.2.6.tar.bz2 3282918
diff --git a/net-im/licq/licq-1.2.6-r1.ebuild b/net-im/licq/licq-1.2.6-r1.ebuild
deleted file mode 100644
index 499d8fee9584..000000000000
--- a/net-im/licq/licq-1.2.6-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.2.6-r1.ebuild,v 1.4 2003/09/05 23:58:58 msterret Exp $
-
-inherit kde-base
-need-kde 3.0
-
-DESCRIPTION="ICQ Client with v8 support"
-HOMEPAGE="http://www.licq.org/"
-SRC_URI="http://download.sourceforge.net/licq/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="x86"
-IUSE="ssl socks5 qt kde ncurses"
-
-# we can't have conditional dependencies so "use kde && inherit kde-base"
-# 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? ( ${DEPEND} )"
-DEPEND="kde? ( ${DEPEND} )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	qt? ( >=x11-libs/qt-3.0.0 )
-	ncurses? ( sys-libs/ncurses )"
-
-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 [ -z "`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}
-	patch -p0 < ${FILESDIR}/1.2.6-debugflag.patch || die "patch failed"
-}
-
-src_compile() {
-	local first_conf
-	use ssl		|| myconf="${myconf} --disable-openssl"
-	use socks5	&& myconf="${myconf} --enable-socks5"
-
-	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*
-
-	# Install the plug-ins
-	if [ "`use qt`" ]
-	then
-		cd ${S}/plugins/qt-gui
-		make DESTDIR=${D} install || die
-		docinto plugins/qt-gui
-		dodoc README*
-
-		# fix bug #12436, see my comment there
-##		if [ "`use kde`" ]; then
-##			cd $D/usr/lib/licq
-##			ln -s licq_kde-gui.la licq_qt-gui.la
-##			ln -s licq_kde-gui.so licq_qt-gui.so
-##		fi
-	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
-}
diff --git a/net-im/licq/licq-1.2.6.ebuild b/net-im/licq/licq-1.2.6.ebuild
deleted file mode 100644
index d53e7a25c984..000000000000
--- a/net-im/licq/licq-1.2.6.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.2.6.ebuild,v 1.3 2003/09/05 23:58:58 msterret Exp $
-
-inherit kde-base
-need-kde 3.0
-
-DESCRIPTION="ICQ Client with v8 support"
-HOMEPAGE="http://www.licq.org/"
-SRC_URI="http://download.sourceforge.net/licq/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="x86"
-IUSE="ssl socks5 qt kde gtk ncurses"
-
-# we can't have conditional dependencies so "use kde && inherit kde-base"
-# 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? ( ${DEPEND} )"
-DEPEND="kde? ( ${DEPEND} )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	qt? ( >=x11-libs/qt-3.0.0 )
-	gtk? ( =x11-libs/gtk+-1.2* )
-	ncurses? ( sys-libs/ncurses )"
-
-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 [ -z "`use qt`" ]
-		then
-			if [ -z "`use gtk`" ]
-			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 $?
-			else
-				ebegin "Setting GTK plugin as default..."
-				cp ${S}/src/licq.conf.h ${T}
-				sed "s:Plugin1 = qt-gui:Plugin1 = jons-gtk-gui:" \
-					${T}/licq.conf.h > ${S}/src/licq.conf.h
-				eend $?
-			fi
-		fi
-	fi
-}
-
-src_compile() {
-	local first_conf
-	use ssl		|| first_conf="${first_conf} --disable-openssl"
-	use socks5	&& first_conf="${first_conf} --enable-socks5"
-
-	econf ${first_conf} || 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 && second_conf="${second_conf} ${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 ${second_conf} || die
-		emake || die
-	fi
-
-	# Now Jon's GTK plug-in
-	if [ "`use gtk`" ]
-	then
-		cd ${S}/plugins/jons-gtk-gui
-		einfo "Compiling GTK GUI plug-in"
-		econf || 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*
-
-	# Install the plug-ins
-	if [ "`use qt`" ]
-	then
-		cd ${S}/plugins/qt-gui
-		make DESTDIR=${D} install || die
-		docinto plugins/qt-gui
-		dodoc README*
-
-		# fix bug #12436, see my comment there
-##		if [ "`use kde`" ]; then
-##			cd $D/usr/lib/licq
-##			ln -s licq_kde-gui.la licq_qt-gui.la
-##			ln -s licq_kde-gui.so licq_qt-gui.so
-##		fi
-	fi
-
-	if [ "`use gtk`" ]
-	then
-		cd ${S}/plugins/jons-gtk-gui
-		make DESTDIR=${D} install || die
-		docinto plugins/jons-gtk-gui
-		dodoc TODO
-	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
-}
diff --git a/net-im/licq/licq-1.2.7.ebuild b/net-im/licq/licq-1.2.7.ebuild
index 82329ca64341..4945cebc3169 100644
--- a/net-im/licq/licq-1.2.7.ebuild
+++ b/net-im/licq/licq-1.2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.2.7.ebuild,v 1.8 2003/09/24 21:43:47 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.2.7.ebuild,v 1.9 2003/10/19 15:13:57 lanius Exp $
 
 DESCRIPTION="ICQ Client with v8 support"
 HOMEPAGE="http://www.licq.org/"
@@ -142,4 +142,7 @@ src_install() {
 	make DESTDIR=${D} install || die
 	docinto plugins/rms
 	dodoc README licq_rms.conf
+
+	# fixes bug #22136
+	rm -fR ${D}/var
 }