summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
Diffstat (limited to 'net-im')
-rw-r--r--net-im/gnomemeeting/ChangeLog7
-rw-r--r--net-im/gnomemeeting/gnomemeeting-0.98.0.ebuild4
-rw-r--r--net-im/gnomemeeting/gnomemeeting-0.98.5-r1.ebuild4
-rw-r--r--net-im/gnomemeeting/gnomemeeting-0.98.5.ebuild4
-rw-r--r--net-im/gnomemeeting/gnomemeeting-1.0.2.ebuild4
-rw-r--r--net-im/gnomemeeting/gnomemeeting-1.00.ebuild4
-rw-r--r--net-im/gyach/ChangeLog6
-rw-r--r--net-im/gyach/gyach-0.9.6.ebuild6
-rw-r--r--net-im/gyach/gyach-0.9.7.ebuild4
-rw-r--r--net-im/jabberd/ChangeLog6
-rw-r--r--net-im/jabberd/jabberd-1.4.3-r1.ebuild8
-rw-r--r--net-im/jabberd/jabberd-1.4.3-r2.ebuild8
-rw-r--r--net-im/jabberd/jabberd-1.4.3-r3.ebuild8
-rw-r--r--net-im/jabberd/jabberd-2.0.ebuild18
-rw-r--r--net-im/jit/ChangeLog6
-rw-r--r--net-im/jit/jit-1.1.6-r2.ebuild4
-rw-r--r--net-im/jit/jit-1.1.6-r3.ebuild4
-rw-r--r--net-im/licq/ChangeLog5
-rw-r--r--net-im/licq/licq-1.2.7.ebuild16
-rw-r--r--net-im/linphone/ChangeLog5
-rw-r--r--net-im/linphone/linphone-0.12.1.ebuild4
-rw-r--r--net-im/linpopup/ChangeLog6
-rw-r--r--net-im/linpopup/linpopup-2.0.2.ebuild4
-rw-r--r--net-im/linpopup/linpopup-2.0.3.ebuild4
-rw-r--r--net-im/pork/ChangeLog6
-rw-r--r--net-im/pork/pork-0.99.1.ebuild4
-rw-r--r--net-im/pork/pork-0.99.2.ebuild4
-rw-r--r--net-im/silc-client/ChangeLog7
-rw-r--r--net-im/silc-client/silc-client-0.9.11.ebuild4
-rw-r--r--net-im/silc-client/silc-client-0.9.12.1.ebuild4
-rw-r--r--net-im/silc-client/silc-client-0.9.14.ebuild4
-rw-r--r--net-im/silc-client/silc-client-1.0.1.ebuild4
-rw-r--r--net-im/silc-client/silc-client-1.0.ebuild4
-rw-r--r--net-im/silc-toolkit/ChangeLog6
-rw-r--r--net-im/silc-toolkit/silc-toolkit-0.9.11-r1.ebuild6
35 files changed, 121 insertions, 81 deletions
diff --git a/net-im/gnomemeeting/ChangeLog b/net-im/gnomemeeting/ChangeLog
index af61841f7080..ea775412a0ca 100644
--- a/net-im/gnomemeeting/ChangeLog
+++ b/net-im/gnomemeeting/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-im/gnomemeeting
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/ChangeLog,v 1.36 2004/05/26 23:52:39 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/ChangeLog,v 1.37 2004/06/10 19:20:40 agriffis Exp $
+
+ 10 Jun 2004; Aron Griffis <agriffis@gentoo.org> gnomemeeting-0.98.0.ebuild,
+ gnomemeeting-0.98.5-r1.ebuild, gnomemeeting-0.98.5.ebuild,
+ gnomemeeting-1.0.2.ebuild, gnomemeeting-1.00.ebuild:
+ Fix use invocation
27 May 2004; Stefan Knoblich <stkn@gentoo.org> gnomemeeting-1.00.ebuild,
metadata.xml:
diff --git a/net-im/gnomemeeting/gnomemeeting-0.98.0.ebuild b/net-im/gnomemeeting/gnomemeeting-0.98.0.ebuild
index 05fd2f2e5af3..ad84f8b4d8f3 100644
--- a/net-im/gnomemeeting/gnomemeeting-0.98.0.ebuild
+++ b/net-im/gnomemeeting/gnomemeeting-0.98.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-0.98.0.ebuild,v 1.6 2004/03/09 07:12:15 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-0.98.0.ebuild,v 1.7 2004/06/10 19:20:40 agriffis Exp $
IUSE="sdl ssl ipv6"
@@ -46,7 +46,7 @@ src_compile() {
myconf="${myconf} --with-openh323-includes=/usr/include/openh323"
myconf="${myconf} --with-openh323-libs=/usr/lib"
- if [ -n "`use ssl`" ]; then
+ if use ssl; then
myconf="${myconf} --with-openssl-libs=/usr/lib"
myconf="${myconf} --with-openssl-includes=/usr/include/openssl"
fi
diff --git a/net-im/gnomemeeting/gnomemeeting-0.98.5-r1.ebuild b/net-im/gnomemeeting/gnomemeeting-0.98.5-r1.ebuild
index dd486230000b..bcfd74d5f841 100644
--- a/net-im/gnomemeeting/gnomemeeting-0.98.5-r1.ebuild
+++ b/net-im/gnomemeeting/gnomemeeting-0.98.5-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-0.98.5-r1.ebuild,v 1.2 2004/04/27 21:52:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-0.98.5-r1.ebuild,v 1.3 2004/06/10 19:20:40 agriffis Exp $
inherit gnome2 eutils
@@ -52,7 +52,7 @@ src_compile() {
myconf="${myconf} --with-openh323-includes=/usr/include/openh323"
myconf="${myconf} --with-openh323-libs=/usr/lib"
- if [ -n "`use ssl`" ]; then
+ if use ssl; then
myconf="${myconf} --with-openssl-libs=/usr/lib"
myconf="${myconf} --with-openssl-includes=/usr/include/openssl"
fi
diff --git a/net-im/gnomemeeting/gnomemeeting-0.98.5.ebuild b/net-im/gnomemeeting/gnomemeeting-0.98.5.ebuild
index b29be86802bd..b815a6806e1e 100644
--- a/net-im/gnomemeeting/gnomemeeting-0.98.5.ebuild
+++ b/net-im/gnomemeeting/gnomemeeting-0.98.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-0.98.5.ebuild,v 1.7 2004/04/27 21:52:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-0.98.5.ebuild,v 1.8 2004/06/10 19:20:40 agriffis Exp $
inherit gnome2 eutils
@@ -52,7 +52,7 @@ src_compile() {
myconf="${myconf} --with-openh323-includes=/usr/include/openh323"
myconf="${myconf} --with-openh323-libs=/usr/lib"
- if [ -n "`use ssl`" ]; then
+ if use ssl; then
myconf="${myconf} --with-openssl-libs=/usr/lib"
myconf="${myconf} --with-openssl-includes=/usr/include/openssl"
fi
diff --git a/net-im/gnomemeeting/gnomemeeting-1.0.2.ebuild b/net-im/gnomemeeting/gnomemeeting-1.0.2.ebuild
index fecc071d952e..f9116f9d145a 100644
--- a/net-im/gnomemeeting/gnomemeeting-1.0.2.ebuild
+++ b/net-im/gnomemeeting/gnomemeeting-1.0.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-1.0.2.ebuild,v 1.3 2004/05/09 14:17:03 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-1.0.2.ebuild,v 1.4 2004/06/10 19:20:40 agriffis Exp $
inherit gnome2 eutils
@@ -57,7 +57,7 @@ src_compile() {
myconf="${myconf} --with-openh323-includes=/usr/include/openh323"
myconf="${myconf} --with-openh323-libs=/usr/lib"
- if [ -n "`use ssl`" ]; then
+ if use ssl; then
myconf="${myconf} --with-openssl-libs=/usr/lib"
myconf="${myconf} --with-openssl-includes=/usr/include/openssl"
fi
diff --git a/net-im/gnomemeeting/gnomemeeting-1.00.ebuild b/net-im/gnomemeeting/gnomemeeting-1.00.ebuild
index c4613486b1eb..d992f4309423 100644
--- a/net-im/gnomemeeting/gnomemeeting-1.00.ebuild
+++ b/net-im/gnomemeeting/gnomemeeting-1.00.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-1.00.ebuild,v 1.5 2004/05/26 23:52:39 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-1.00.ebuild,v 1.6 2004/06/10 19:20:40 agriffis Exp $
inherit gnome2
@@ -48,7 +48,7 @@ src_compile() {
myconf="${myconf} --with-openh323-includes=/usr/include/openh323"
myconf="${myconf} --with-openh323-libs=/usr/lib"
- if [ -n "`use ssl`" ]; then
+ if use ssl; then
myconf="${myconf} --with-openssl-libs=/usr/lib"
myconf="${myconf} --with-openssl-includes=/usr/include/openssl"
fi
diff --git a/net-im/gyach/ChangeLog b/net-im/gyach/ChangeLog
index 913203c97638..cc0fe211f6cf 100644
--- a/net-im/gyach/ChangeLog
+++ b/net-im/gyach/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-im/gyach
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gyach/ChangeLog,v 1.4 2004/02/03 06:29:05 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gyach/ChangeLog,v 1.5 2004/06/10 19:22:32 agriffis Exp $
+
+ 10 Jun 2004; Aron Griffis <agriffis@gentoo.org> gyach-0.9.6.ebuild,
+ gyach-0.9.7.ebuild:
+ Fix use invocation
*gyach-0.9.7 (03 Feb 2004)
diff --git a/net-im/gyach/gyach-0.9.6.ebuild b/net-im/gyach/gyach-0.9.6.ebuild
index 8f5748cefcaa..a9d7209c286b 100644
--- a/net-im/gyach/gyach-0.9.6.ebuild
+++ b/net-im/gyach/gyach-0.9.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gyach/gyach-0.9.6.ebuild,v 1.1 2003/10/08 14:10:01 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gyach/gyach-0.9.6.ebuild,v 1.2 2004/06/10 19:22:32 agriffis Exp $
S=${WORKDIR}/${P}
DESCRIPTION="GTK+-based Yahoo! chat client"
@@ -25,7 +25,7 @@ src_install() {
dodoc sample.*
# install icon and desktop entry for gnome
- if [ "`use gnome`" ] ; then
+ if use gnome ; then
insinto /usr/share/pixmaps
doins ${D}/usr/share/gyach/pixmaps/gyach-icon.xpm
insinto /usr/share/gnome/apps/Internet
diff --git a/net-im/gyach/gyach-0.9.7.ebuild b/net-im/gyach/gyach-0.9.7.ebuild
index 99a52c32b41f..47943d285048 100644
--- a/net-im/gyach/gyach-0.9.7.ebuild
+++ b/net-im/gyach/gyach-0.9.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gyach/gyach-0.9.7.ebuild,v 1.1 2004/02/03 06:29:05 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gyach/gyach-0.9.7.ebuild,v 1.2 2004/06/10 19:22:32 agriffis Exp $
S=${WORKDIR}/${P}
DESCRIPTION="GTK+-based Yahoo! chat client"
@@ -24,7 +24,7 @@ src_install() {
dodoc sample.*
# install icon and desktop entry for gnome
- if [ "`use gnome`" ] ; then
+ if use gnome ; then
insinto /usr/share/pixmaps
doins ${D}/usr/share/gyach/pixmaps/gyach-icon.xpm
insinto /usr/share/gnome/apps/Internet
diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog
index 88ccd402c7df..36400dbd0e94 100644
--- a/net-im/jabberd/ChangeLog
+++ b/net-im/jabberd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-im/jabberd
# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.24 2004/06/08 13:34:04 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.25 2004/06/10 19:24:04 agriffis Exp $
+
+ 10 Jun 2004; Aron Griffis <agriffis@gentoo.org> jabberd-1.4.3-r1.ebuild,
+ jabberd-1.4.3-r2.ebuild, jabberd-1.4.3-r3.ebuild, jabberd-2.0.ebuild:
+ Fix use invocation
08 Jun 2004; Guy Martin <gmsoft@gentoo.org> jabberd-1.4.3-r3.ebuild:
Marked stable on hppa.
diff --git a/net-im/jabberd/jabberd-1.4.3-r1.ebuild b/net-im/jabberd/jabberd-1.4.3-r1.ebuild
index 930b67038526..bfa6b634d2ac 100644
--- a/net-im/jabberd/jabberd-1.4.3-r1.ebuild
+++ b/net-im/jabberd/jabberd-1.4.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.3-r1.ebuild,v 1.12 2004/06/03 16:35:32 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.3-r1.ebuild,v 1.13 2004/06/10 19:24:04 agriffis Exp $
inherit eutils
@@ -73,7 +73,7 @@ src_install() {
doins pthsock/pthsock_client.so
doins dnsrv/dnsrv.so
doins dialback/dialback.so
- if [ `use ldap` ]; then
+ if use ldap; then
insinto /etc/jabber
doins xdb_ldap/jabber.schema
doins xdb_ldap/slapd.conf
@@ -142,11 +142,11 @@ pkg_postinst() {
einfo "Change 'localhost' to your server's domainname in the"
einfo "/etc/jabber/*.xml configs first"
einfo "Server admins should be added to the "jabber" group"
- if [ `use ssl` ]; then
+ if use ssl; then
einfo
einfo "To enable SSL connections, execute /etc/jabber/self-cert.sh"
fi
- if [ `use ldap` ]; then
+ if use ldap; then
einfo
einfo "In order to use the ldap backend, you need to copy"
einfo "the file /etc/jabber/jabber.schema into the /etc/openldap/schemas"
diff --git a/net-im/jabberd/jabberd-1.4.3-r2.ebuild b/net-im/jabberd/jabberd-1.4.3-r2.ebuild
index 2de5cc619f36..a57fd7a76a01 100644
--- a/net-im/jabberd/jabberd-1.4.3-r2.ebuild
+++ b/net-im/jabberd/jabberd-1.4.3-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.3-r2.ebuild,v 1.6 2004/06/03 16:35:32 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.3-r2.ebuild,v 1.7 2004/06/10 19:24:04 agriffis Exp $
inherit eutils
@@ -73,7 +73,7 @@ src_install() {
doins pthsock/pthsock_client.so
doins dnsrv/dnsrv.so
doins dialback/dialback.so
- if [ `use ldap` ]; then
+ if use ldap; then
insinto /etc/jabber
doins xdb_ldap/jabber.schema
doins xdb_ldap/slapd.conf
@@ -142,11 +142,11 @@ pkg_postinst() {
einfo "Change 'localhost' to your server's domainname in the"
einfo "/etc/jabber/*.xml configs first"
einfo "Server admins should be added to the "jabber" group"
- if [ `use ssl` ]; then
+ if use ssl; then
einfo
einfo "To enable SSL connections, execute /etc/jabber/self-cert.sh"
fi
- if [ `use ldap` ]; then
+ if use ldap; then
einfo
einfo "In order to use the ldap backend, you need to copy"
einfo "the file /etc/jabber/jabber.schema into the /etc/openldap/schemas"
diff --git a/net-im/jabberd/jabberd-1.4.3-r3.ebuild b/net-im/jabberd/jabberd-1.4.3-r3.ebuild
index d745db1e1667..26efa45a990d 100644
--- a/net-im/jabberd/jabberd-1.4.3-r3.ebuild
+++ b/net-im/jabberd/jabberd-1.4.3-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.3-r3.ebuild,v 1.4 2004/06/08 13:34:04 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.3-r3.ebuild,v 1.5 2004/06/10 19:24:04 agriffis Exp $
inherit eutils
@@ -76,7 +76,7 @@ src_install() {
doins pthsock/pthsock_client.so
doins dnsrv/dnsrv.so
doins dialback/dialback.so
- if [ `use ldap` ]; then
+ if use ldap; then
insinto /etc/jabber
doins xdb_ldap/jabber.schema
doins xdb_ldap/slapd.conf
@@ -145,11 +145,11 @@ pkg_postinst() {
einfo "Change 'localhost' to your server's domainname in the"
einfo "/etc/jabber/*.xml configs first"
einfo "Server admins should be added to the "jabber" group"
- if [ `use ssl` ]; then
+ if use ssl; then
einfo
einfo "To enable SSL connections, execute /etc/jabber/self-cert.sh"
fi
- if [ `use ldap` ]; then
+ if use ldap; then
einfo
einfo "In order to use the ldap backend, you need to copy"
einfo "the file /etc/jabber/jabber.schema into the /etc/openldap/schemas"
diff --git a/net-im/jabberd/jabberd-2.0.ebuild b/net-im/jabberd/jabberd-2.0.ebuild
index c6e6afe8d7a2..c8e90e6fc47e 100644
--- a/net-im/jabberd/jabberd-2.0.ebuild
+++ b/net-im/jabberd/jabberd-2.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-2.0.ebuild,v 1.4 2004/04/27 21:56:50 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-2.0.ebuild,v 1.5 2004/06/10 19:24:04 agriffis Exp $
inherit eutils
@@ -24,7 +24,7 @@ DEPEND="!net-im/jabber-server
postgres? ( dev-db/postgresql )"
pkg_setup() {
- if [ ! `use postgres` ] && [ ! `use mysql` ] && [ ! `use berkdb` ]; then
+ if ! use postgres && ! use mysql && ! use berkdb; then
eerror
eerror "For this version of jabberd you must have"
eerror "at least one of 'mysql', 'postgres' and/or 'berkdb'"
@@ -44,26 +44,26 @@ src_compile() {
storage="fs"
authreg="anon"
- if [ `use db` ]; then
+ if use db; then
storage="${storage} db"
authreg="${authreg} db"
fi
- if [ `use mysql` ]; then
+ if use mysql; then
storage="${storage} mysql"
authreg="${authreg} mysql"
fi
- if [ `use postgres` ]; then
+ if use postgres; then
storage="${myconf} pgsql"
authreg="${authreg} pgsql"
fi
- if [ `use pam` ]; then
+ if use pam; then
authreg="${authreg} pam"
fi
- if [ `use ldap` ]; then
+ if use ldap; then
authreg="${authreg} ldap"
fi
- if [ `use ipv6` ]; then
+ if use ipv6; then
enables="${enables} --enable-ipv6"
fi
@@ -168,7 +168,7 @@ pkg_postinst() {
einfo "Change 'localhost' to your server's domainname in the"
einfo "/etc/jabberd/*.xml configs first"
einfo "Server admins should be added to the "jabber" group"
- if [ `use ssl` ]; then
+ if use ssl; then
einfo
einfo "To enable SSL connections, execute /etc/jabberd/self-cert.sh"
einfo
diff --git a/net-im/jit/ChangeLog b/net-im/jit/ChangeLog
index 71b7ad006f0c..95e5fa3fcc89 100644
--- a/net-im/jit/ChangeLog
+++ b/net-im/jit/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-im/jit
# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jit/ChangeLog,v 1.10 2004/06/08 13:21:28 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jit/ChangeLog,v 1.11 2004/06/10 19:24:46 agriffis Exp $
+
+ 10 Jun 2004; Aron Griffis <agriffis@gentoo.org> jit-1.1.6-r2.ebuild,
+ jit-1.1.6-r3.ebuild:
+ Fix use invocation
08 Jun 2004; Guy Martin <gmsoft@gentoo.org> jit-1.1.6-r3.ebuild:
Marked stable on hppa.
diff --git a/net-im/jit/jit-1.1.6-r2.ebuild b/net-im/jit/jit-1.1.6-r2.ebuild
index 52404325ed4f..d742573667a6 100644
--- a/net-im/jit/jit-1.1.6-r2.ebuild
+++ b/net-im/jit/jit-1.1.6-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jit/jit-1.1.6-r2.ebuild,v 1.6 2004/06/03 16:32:42 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jit/jit-1.1.6-r2.ebuild,v 1.7 2004/06/10 19:24:46 agriffis Exp $
inherit flag-o-matic eutils
@@ -20,7 +20,7 @@ RDEPEND=">=net-im/jabberd-1.4.3"
src_compile() {
epatch ${FILESDIR}/jit-patch-00
- [ `use sparc` ] && epatch ${FILESDIR}/jit-sparc.patch
+ use sparc && epatch ${FILESDIR}/jit-sparc.patch
./configure
emake || die
cp ${S}/jabberd/jabberd ${S}/jabberd/jit-wpjabber
diff --git a/net-im/jit/jit-1.1.6-r3.ebuild b/net-im/jit/jit-1.1.6-r3.ebuild
index 3e916f696cfe..bee7136fbd09 100644
--- a/net-im/jit/jit-1.1.6-r3.ebuild
+++ b/net-im/jit/jit-1.1.6-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jit/jit-1.1.6-r3.ebuild,v 1.7 2004/06/08 13:21:28 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jit/jit-1.1.6-r3.ebuild,v 1.8 2004/06/10 19:24:46 agriffis Exp $
inherit flag-o-matic eutils
@@ -21,7 +21,7 @@ RDEPEND=">=net-im/jabberd-1.4.3"
src_compile() {
epatch ${FILESDIR}/jit-patch-00
- [ `use sparc` ] && epatch ${FILESDIR}/jit-sparc.patch
+ use sparc && epatch ${FILESDIR}/jit-sparc.patch
./configure
emake || die
cp ${S}/jabberd/jabberd ${S}/jabberd/jit-wpjabber
diff --git a/net-im/licq/ChangeLog b/net-im/licq/ChangeLog
index 003f85316acd..7813cfd5fc45 100644
--- a/net-im/licq/ChangeLog
+++ b/net-im/licq/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-im/licq
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.36 2004/04/27 21:59:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.37 2004/06/10 19:27:07 agriffis Exp $
+
+ 10 Jun 2004; Aron Griffis <agriffis@gentoo.org> licq-1.2.7.ebuild:
+ Fix use invocation
27 Apr 2004; Aron Griffis <agriffis@gentoo.org> licq-1.2.7.ebuild:
Add inherit eutils
diff --git a/net-im/licq/licq-1.2.7.ebuild b/net-im/licq/licq-1.2.7.ebuild
index 40e19a833ab0..c94ab82a6cc9 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-2004 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.14 2004/04/27 21:59:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.2.7.ebuild,v 1.15 2004/06/10 19:27:07 agriffis Exp $
inherit eutils
@@ -28,7 +28,7 @@ DEPEND="kde? ( >=kde-base/kdelibs-3.0 )
src_unpack() {
unpack ${A}
- if [ "`use kde`" ]
+ if use kde
then
# fix for #12436
ebegin "Setting kde plugin as default..."
@@ -37,7 +37,7 @@ src_unpack() {
${T}/licq.conf.h > ${S}/src/licq.conf.h
eend $?
else
- if [ -z "`use qt`" ]
+ if ! use qt
then
ebegin "Setting console plugin as default..."
cp ${S}/src/licq.conf.h ${T}
@@ -62,7 +62,7 @@ src_compile() {
# Create the various plug-ins
# First, the Qt plug-in
- if [ "`use qt`" ]
+ if use qt
then
# A hack to build against the latest QT:
local v
@@ -85,7 +85,7 @@ src_compile() {
fi
# Now the console plug-in
- if [ "`use ncurses `" ]
+ if use ncurses
then
cd ${S}/plugins/console
einfo "Compiling the Console plug-in"
@@ -112,7 +112,7 @@ src_install() {
dodoc ChangeLog INSTALL README* doc/*
# Install the plug-ins
- if [ "`use qt`" ]
+ if use qt
then
cd ${S}/plugins/qt-gui
make DESTDIR=${D} install || die
@@ -120,14 +120,14 @@ src_install() {
dodoc README*
# fix bug #12436, see my comment there
-## if [ "`use kde`" ]; then
+## 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`" ]
+ if use ncurses
then
cd ${S}/plugins/console
make DESTDIR=${D} install || die
diff --git a/net-im/linphone/ChangeLog b/net-im/linphone/ChangeLog
index 62e9c4c9c31b..0fc9ffe58df8 100644
--- a/net-im/linphone/ChangeLog
+++ b/net-im/linphone/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-im/linphone
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/linphone/ChangeLog,v 1.14 2004/04/27 22:00:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/linphone/ChangeLog,v 1.15 2004/06/10 19:26:47 agriffis Exp $
+
+ 10 Jun 2004; Aron Griffis <agriffis@gentoo.org> linphone-0.12.1.ebuild:
+ Fix use invocation
27 Apr 2004; Aron Griffis <agriffis@gentoo.org> linphone-0.12.1.ebuild:
Add inherit eutils
diff --git a/net-im/linphone/linphone-0.12.1.ebuild b/net-im/linphone/linphone-0.12.1.ebuild
index f75d1a0b4336..5e2b87feb9c8 100644
--- a/net-im/linphone/linphone-0.12.1.ebuild
+++ b/net-im/linphone/linphone-0.12.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/linphone/linphone-0.12.1.ebuild,v 1.5 2004/04/27 22:00:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/linphone/linphone-0.12.1.ebuild,v 1.6 2004/06/10 19:26:47 agriffis Exp $
inherit eutils
@@ -40,7 +40,7 @@ src_compile() {
local myconf
- if [ `use gnome` ]
+ if use gnome
then
einfo "Building with Gnome gui"
myconf="${myconf} --enable-gnome_ui=yes"
diff --git a/net-im/linpopup/ChangeLog b/net-im/linpopup/ChangeLog
index 46cb9affc8ef..12719c7e7e6d 100644
--- a/net-im/linpopup/ChangeLog
+++ b/net-im/linpopup/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-im/linpopup
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/linpopup/ChangeLog,v 1.8 2004/05/09 11:30:58 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/linpopup/ChangeLog,v 1.9 2004/06/10 19:28:03 agriffis Exp $
+
+ 10 Jun 2004; Aron Griffis <agriffis@gentoo.org> linpopup-2.0.2.ebuild,
+ linpopup-2.0.3.ebuild:
+ Fix use invocation
09 May 2004; <SeJo@gentoo.org> linpopup-2.0.3.ebuild:
added ~ppc keyword
diff --git a/net-im/linpopup/linpopup-2.0.2.ebuild b/net-im/linpopup/linpopup-2.0.2.ebuild
index 9aa1ed5744c4..15d47cad7ade 100644
--- a/net-im/linpopup/linpopup-2.0.2.ebuild
+++ b/net-im/linpopup/linpopup-2.0.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/linpopup/linpopup-2.0.2.ebuild,v 1.2 2004/04/23 10:21:28 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/linpopup/linpopup-2.0.2.ebuild,v 1.3 2004/06/10 19:28:03 agriffis Exp $
inherit gnome2
@@ -26,7 +26,7 @@ DOCS="AUTHORS BUGS COPYING ChangeLog INSTALL MANUAL NEWS README THANKS TODO"
src_install() {
# Install icon and .desktop for menu entry
- if [ `use gnome` ] ; then
+ if use gnome ; then
insinto /usr/share/pixmaps
newins ${S}/pixmaps/icon_256.xpm linpopup.xpm
insinto /usr/share/applications
diff --git a/net-im/linpopup/linpopup-2.0.3.ebuild b/net-im/linpopup/linpopup-2.0.3.ebuild
index 3c10c035a1ee..393710e8cf22 100644
--- a/net-im/linpopup/linpopup-2.0.3.ebuild
+++ b/net-im/linpopup/linpopup-2.0.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/linpopup/linpopup-2.0.3.ebuild,v 1.2 2004/05/09 11:30:58 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/linpopup/linpopup-2.0.3.ebuild,v 1.3 2004/06/10 19:28:03 agriffis Exp $
inherit gnome2
@@ -27,7 +27,7 @@ S=${WORKDIR}/${P}
src_install() {
# Install icon and .desktop for menu entry
- if [ `use gnome` ] ; then
+ if use gnome ; then
insinto /usr/share/pixmaps
newins ${S}/pixmaps/icon_256.xpm linpopup.xpm
insinto /usr/share/applications
diff --git a/net-im/pork/ChangeLog b/net-im/pork/ChangeLog
index 0c248de9bf2b..b8ebfbc359ad 100644
--- a/net-im/pork/ChangeLog
+++ b/net-im/pork/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-im/pork
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pork/ChangeLog,v 1.15 2004/04/29 04:30:39 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pork/ChangeLog,v 1.16 2004/06/10 19:29:10 agriffis Exp $
+
+ 10 Jun 2004; Aron Griffis <agriffis@gentoo.org> pork-0.99.1.ebuild,
+ pork-0.99.2.ebuild:
+ Fix use invocation
28 Apr 2004; Jason Wever <weeve@gentoo.org> pork-0.99.2.ebuild:
~sparc, it does an ebuild good.
diff --git a/net-im/pork/pork-0.99.1.ebuild b/net-im/pork/pork-0.99.1.ebuild
index de7c749de7ff..4d0529e468f8 100644
--- a/net-im/pork/pork-0.99.1.ebuild
+++ b/net-im/pork/pork-0.99.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pork/pork-0.99.1.ebuild,v 1.4 2004/04/26 04:46:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pork/pork-0.99.1.ebuild,v 1.5 2004/06/10 19:29:10 agriffis Exp $
IUSE=""
@@ -17,7 +17,7 @@ DEPEND="perl? ( dev-lang/perl )
src_compile() {
local myconf=""
- [ `use perl` ] || myconf="${myconf} --disable-perl"
+ use perl || myconf="${myconf} --disable-perl"
einfo "Configure options: ${myconf}"
econf ${myconf} || die "econf failed"
emake
diff --git a/net-im/pork/pork-0.99.2.ebuild b/net-im/pork/pork-0.99.2.ebuild
index d30e82280aa7..195b236d54b9 100644
--- a/net-im/pork/pork-0.99.2.ebuild
+++ b/net-im/pork/pork-0.99.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pork/pork-0.99.2.ebuild,v 1.4 2004/04/29 04:30:39 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pork/pork-0.99.2.ebuild,v 1.5 2004/06/10 19:29:10 agriffis Exp $
IUSE=""
@@ -17,7 +17,7 @@ DEPEND="perl? ( dev-lang/perl )
src_compile() {
local myconf=""
- [ `use perl` ] || myconf="${myconf} --disable-perl"
+ use perl || myconf="${myconf} --disable-perl"
einfo "Configure options: ${myconf}"
econf ${myconf} || die "econf failed"
emake
diff --git a/net-im/silc-client/ChangeLog b/net-im/silc-client/ChangeLog
index 48b091a92d61..e551fcc1d3bf 100644
--- a/net-im/silc-client/ChangeLog
+++ b/net-im/silc-client/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-im/silc-client
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/ChangeLog,v 1.20 2004/02/15 18:24:47 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/ChangeLog,v 1.21 2004/06/10 19:31:20 agriffis Exp $
+
+ 10 Jun 2004; Aron Griffis <agriffis@gentoo.org> silc-client-0.9.11.ebuild,
+ silc-client-0.9.12.1.ebuild, silc-client-0.9.14.ebuild,
+ silc-client-1.0.1.ebuild, silc-client-1.0.ebuild:
+ Fix use invocation
14 Feb 2004; Chuck Short <zul@gentoo.org> silc-client-1.0.1.ebuild:
Perl modules was not being installed into the right directories. Closes #40610.
diff --git a/net-im/silc-client/silc-client-0.9.11.ebuild b/net-im/silc-client/silc-client-0.9.11.ebuild
index 02fe90490fe8..8ccac0ea75fd 100644
--- a/net-im/silc-client/silc-client-0.9.11.ebuild
+++ b/net-im/silc-client/silc-client-0.9.11.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/silc-client-0.9.11.ebuild,v 1.8 2004/01/03 04:11:28 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/silc-client-0.9.11.ebuild,v 1.9 2004/06/10 19:31:20 agriffis Exp $
inherit libtool
@@ -39,7 +39,7 @@ src_compile() {
src_install() {
local myflags
- if [ "`use perl`" ]
+ if use perl
then
R1="s/installsitearch='//"
R2="s/';//"
diff --git a/net-im/silc-client/silc-client-0.9.12.1.ebuild b/net-im/silc-client/silc-client-0.9.12.1.ebuild
index d68b1e8d994e..d5fd55e3abd8 100644
--- a/net-im/silc-client/silc-client-0.9.12.1.ebuild
+++ b/net-im/silc-client/silc-client-0.9.12.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/silc-client-0.9.12.1.ebuild,v 1.6 2004/01/03 04:11:28 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/silc-client-0.9.12.1.ebuild,v 1.7 2004/06/10 19:31:20 agriffis Exp $
DESCRIPTION="IRSSI-based text client for Secure Internet Live Conferencing"
SRC_URI="http://www.silcnet.org/download/client/sources/${P}.tar.bz2"
@@ -40,7 +40,7 @@ src_compile() {
src_install() {
myflags=""
- if [ "`use perl`" ]
+ if use perl
then
R1="s/installsitearch='//"
R2="s/';//"
diff --git a/net-im/silc-client/silc-client-0.9.14.ebuild b/net-im/silc-client/silc-client-0.9.14.ebuild
index d176e27318b7..e97c24053275 100644
--- a/net-im/silc-client/silc-client-0.9.14.ebuild
+++ b/net-im/silc-client/silc-client-0.9.14.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/silc-client-0.9.14.ebuild,v 1.2 2004/01/03 04:11:28 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/silc-client-0.9.14.ebuild,v 1.3 2004/06/10 19:31:20 agriffis Exp $
DESCRIPTION="IRSSI-based text client for Secure Internet Live Conferencing"
SRC_URI="http://www.silcnet.org/download/client/sources/${P}.tar.bz2"
@@ -40,7 +40,7 @@ src_compile() {
src_install() {
myflags=""
- if [ "`use perl`" ]
+ if use perl
then
R1="s/installsitearch='//"
R2="s/';//"
diff --git a/net-im/silc-client/silc-client-1.0.1.ebuild b/net-im/silc-client/silc-client-1.0.1.ebuild
index 0b1a7837f14b..bd000241735c 100644
--- a/net-im/silc-client/silc-client-1.0.1.ebuild
+++ b/net-im/silc-client/silc-client-1.0.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/silc-client-1.0.1.ebuild,v 1.4 2004/02/15 18:24:47 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/silc-client-1.0.1.ebuild,v 1.5 2004/06/10 19:31:20 agriffis Exp $
DESCRIPTION="IRSSI-based text client for Secure Internet Live Conferencing"
SRC_URI="http://www.silcnet.org/download/client/sources/${P}.tar.bz2"
@@ -40,7 +40,7 @@ src_compile() {
src_install() {
myflags=""
- if [ "`use perl`" ]
+ if use perl
then
R1="s/installsitearch='//"
R2="s/';//"
diff --git a/net-im/silc-client/silc-client-1.0.ebuild b/net-im/silc-client/silc-client-1.0.ebuild
index d16eb9034c8e..3ee15f9ddff6 100644
--- a/net-im/silc-client/silc-client-1.0.ebuild
+++ b/net-im/silc-client/silc-client-1.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/silc-client-1.0.ebuild,v 1.2 2004/01/18 19:38:38 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/silc-client-1.0.ebuild,v 1.3 2004/06/10 19:31:20 agriffis Exp $
DESCRIPTION="IRSSI-based text client for Secure Internet Live Conferencing"
SRC_URI="http://www.silcnet.org/download/client/sources/${P}.tar.bz2"
@@ -40,7 +40,7 @@ src_compile() {
src_install() {
myflags=""
- if [ "`use perl`" ]
+ if use perl
then
R1="s/installsitearch='//"
R2="s/';//"
diff --git a/net-im/silc-toolkit/ChangeLog b/net-im/silc-toolkit/ChangeLog
index c5170c4a1677..493619675001 100644
--- a/net-im/silc-toolkit/ChangeLog
+++ b/net-im/silc-toolkit/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-im/silc-toolkit
# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-toolkit/ChangeLog,v 1.11 2004/06/03 23:39:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-toolkit/ChangeLog,v 1.12 2004/06/10 19:32:25 agriffis Exp $
+
+ 10 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+ silc-toolkit-0.9.11-r1.ebuild:
+ Fix use invocation
03 Jun 2004; Aron Griffis <agriffis@gentoo.org> silc-toolkit-0.9.12.ebuild:
Add ~alpha and ~ia64
diff --git a/net-im/silc-toolkit/silc-toolkit-0.9.11-r1.ebuild b/net-im/silc-toolkit/silc-toolkit-0.9.11-r1.ebuild
index a84fb3abef27..8c4c6d9a3a88 100644
--- a/net-im/silc-toolkit/silc-toolkit-0.9.11-r1.ebuild
+++ b/net-im/silc-toolkit/silc-toolkit-0.9.11-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-toolkit/silc-toolkit-0.9.11-r1.ebuild,v 1.3 2004/04/19 22:15:11 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-toolkit/silc-toolkit-0.9.11-r1.ebuild,v 1.4 2004/06/10 19:32:25 agriffis Exp $
IUSE="client server debug ipv6 perl socks5"
@@ -59,9 +59,9 @@ src_compile() {
}
src_install() {
- if [ -z "`use client`" ]
+ if ! use client
then
- if [ -z "`use perl`" ]
+ if ! use perl
then
R1="s/installsitearch='//"
R2="s/';//"