summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Raschbacher <lordvan@gentoo.org>2003-02-07 22:21:59 +0000
committerThomas Raschbacher <lordvan@gentoo.org>2003-02-07 22:21:59 +0000
commit70602f0bf4cec26d595840ee1e6c626b9a34f7a2 (patch)
treef1695498793a5a2687522ac26d6db5c552b5d29f /net-im/licq
parentMarked stable for x86 (diff)
downloadgentoo-2-70602f0bf4cec26d595840ee1e6c626b9a34f7a2.tar.gz
gentoo-2-70602f0bf4cec26d595840ee1e6c626b9a34f7a2.tar.bz2
gentoo-2-70602f0bf4cec26d595840ee1e6c626b9a34f7a2.zip
fixed wrong plugin name for gtk-gui + removed symlinks if kde-gui is built(changing default config instead) fixing bug #12436
Diffstat (limited to 'net-im/licq')
-rw-r--r--net-im/licq/ChangeLog5
-rw-r--r--net-im/licq/licq-1.2.4-r2.ebuild48
2 files changed, 33 insertions, 20 deletions
diff --git a/net-im/licq/ChangeLog b/net-im/licq/ChangeLog
index 7fa7bdc5edf7..c52eb309554a 100644
--- a/net-im/licq/ChangeLog
+++ b/net-im/licq/ChangeLog
@@ -1,9 +1,12 @@
# ChangeLog for net-im/licq
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.18 2003/02/07 20:47:56 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.19 2003/02/07 22:21:59 lordvan Exp $
*licq-1.2.4-r2 (07 Feb 2003)
+ 07 Feb 2003; Thomas Raschbacher <lordvan@gentoo.org> licq-1.2.4-r2.ebuild:
+ removed old fix for #12436 and added new (set kde-gui as default)
+
07 Feb 2003; Seemant Kulleen <seemant@gentoo.org> licq-1.2.4-r2.ebuild :
Some sed magic to detect which plugin is preferred
diff --git a/net-im/licq/licq-1.2.4-r2.ebuild b/net-im/licq/licq-1.2.4-r2.ebuild
index 06e3f763ac11..fda32e83f51d 100644
--- a/net-im/licq/licq-1.2.4-r2.ebuild
+++ b/net-im/licq/licq-1.2.4-r2.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.4-r2.ebuild,v 1.5 2003/02/07 20:47:56 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.2.4-r2.ebuild,v 1.6 2003/02/07 22:21:59 lordvan Exp $
IUSE="ssl socks5 qt kde gtk ncurses"
@@ -24,21 +24,31 @@ KEYWORDS="x86"
src_unpack() {
unpack ${A}
- if [ -z "`use qt`" ]
+ if [ "`use kde`" ]
then
- if [ -z "`use gtk`" ]
+ # 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 $?
- else
- ebegin "Setting GTK plugin as default..."
- cp ${S}/src/licq.conf.h ${T}
- sed "s:Plugin1 = qt-gui:Plugin1 = gtk-gui:" \
- ${T}/licq.conf.h > ${S}/src/licq.conf.h
- eend $?
+ 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
}
@@ -125,11 +135,11 @@ src_install() {
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
+## 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`" ]