14 files changed, 45 insertions, 310 deletions
diff --git a/net-im/silc-client/ChangeLog b/net-im/silc-client/ChangeLog
index 665601784457..b211f5d37fd9 100644
--- a/net-im/silc-client/ChangeLog
+++ b/net-im/silc-client/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/silc-client
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/ChangeLog,v 1.26 2005/04/22 20:59:42 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/ChangeLog,v 1.27 2005/05/07 17:48:26 swegener Exp $
+
+*silc-client-1.0.2 (07 May 2005)
+
+  07 May 2005; Sven Wegener <swegener@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.ebuild,
+  -silc-client-1.0.1.ebuild, +silc-client-1.0.2.ebuild:
+  Version bump, bug #91756.
 
   22 Apr 2005; Alin Nastac <mrness@gentoo.org> silc-client-0.9.12.1.ebuild,
   silc-client-0.9.14.ebuild, silc-client-1.0.ebuild,
diff --git a/net-im/silc-client/Manifest b/net-im/silc-client/Manifest
index 3d45f72f5590..c8bc2a3343e5 100644
--- a/net-im/silc-client/Manifest
+++ b/net-im/silc-client/Manifest
@@ -1,24 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 a1679d4e94baecb71b3a63938823f3a8 silc-client-1.0.1-r1.ebuild 1611
-MD5 2c99621719c78f9991fc02029368aeec silc-client-0.9.14.ebuild 1830
-MD5 c662c06a1f7d2d0bb0e7c93b509000d8 silc-client-1.0.ebuild 1827
-MD5 b641c1e4d2df87a03bfea1d158f4b4d8 silc-client-0.9.12.1.ebuild 1832
-MD5 d6e823182e97bfc6def84b45d291b87f silc-client-0.9.11.ebuild 1614
+MD5 a1679d4e94baecb71b3a63938823f3a8 silc-client-1.0.2.ebuild 1611
 MD5 34e13564dc0cd77dfbb026c0bf76e97d ChangeLog 3856
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
-MD5 be9aeab744d131f82ae8d8520f3ca156 silc-client-1.0.1.ebuild 1816
 MD5 0e20ae96be7ad95ac6ce7f84345a569c files/digest-silc-client-1.0.1-r1 71
-MD5 fb190d39f5c608735fb3650027e4499f files/digest-silc-client-0.9.11 72
-MD5 f9cd27919c221e1ac86f6c1c9ba7ced5 files/digest-silc-client-0.9.14 72
-MD5 42035d75640deaf297bc5b882db06c71 files/digest-silc-client-1.0 69
-MD5 c0de3b6dda921ad76210c11a653f40ee files/digest-silc-client-0.9.12.1 74
-MD5 0e20ae96be7ad95ac6ce7f84345a569c files/digest-silc-client-1.0.1 71
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCaWXVjiC39V7gKu0RAjnCAKCqY4Du1YcnW01/FXYDmwZCAp6a6QCaAlr/
-Wr8GywUY60gbtOaI2OGYYy8=
-=nK0T
------END PGP SIGNATURE-----
+MD5 2981293a75cd40e2c78b1dc73655aae2 files/digest-silc-client-1.0.2 71
diff --git a/net-im/silc-client/files/digest-silc-client-0.9.11 b/net-im/silc-client/files/digest-silc-client-0.9.11
deleted file mode 100644
index 1b1ccf1900d5..000000000000
--- a/net-im/silc-client/files/digest-silc-client-0.9.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 11870fd7547737893dd0957649f74443 silc-client-0.9.11.tar.bz2 1492223
diff --git a/net-im/silc-client/files/digest-silc-client-0.9.12.1 b/net-im/silc-client/files/digest-silc-client-0.9.12.1
deleted file mode 100644
index 1caf0a29f8da..000000000000
--- a/net-im/silc-client/files/digest-silc-client-0.9.12.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0ea94745b3036e4dcc18f6e8e54bbaa5 silc-client-0.9.12.1.tar.bz2 1529756
diff --git a/net-im/silc-client/files/digest-silc-client-0.9.14 b/net-im/silc-client/files/digest-silc-client-0.9.14
deleted file mode 100644
index 713961a12088..000000000000
--- a/net-im/silc-client/files/digest-silc-client-0.9.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 42c3de93e04d7cca6937620f6380822b silc-client-0.9.14.tar.bz2 1544096
diff --git a/net-im/silc-client/files/digest-silc-client-1.0 b/net-im/silc-client/files/digest-silc-client-1.0
deleted file mode 100644
index c62acb278328..000000000000
--- a/net-im/silc-client/files/digest-silc-client-1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 49075f34f684564c3e84e869fb29c92f silc-client-1.0.tar.bz2 1454135
diff --git a/net-im/silc-client/files/digest-silc-client-1.0.1 b/net-im/silc-client/files/digest-silc-client-1.0.1
deleted file mode 100644
index 4bec8a375cdf..000000000000
--- a/net-im/silc-client/files/digest-silc-client-1.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9bdb66cb5dc970596d2f3c782fcc0a9f silc-client-1.0.1.tar.bz2 1404404
diff --git a/net-im/silc-client/files/digest-silc-client-1.0.2 b/net-im/silc-client/files/digest-silc-client-1.0.2
new file mode 100644
index 000000000000..01aa3ad7acc5
--- /dev/null
+++ b/net-im/silc-client/files/digest-silc-client-1.0.2
@@ -0,0 +1 @@
+MD5 bce9785ae41ae75c7a687176943c081e silc-client-1.0.2.tar.bz2 1696581
diff --git a/net-im/silc-client/silc-client-0.9.11.ebuild b/net-im/silc-client/silc-client-0.9.11.ebuild
deleted file mode 100644
index a181c86ed946..000000000000
--- a/net-im/silc-client/silc-client-0.9.11.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.10 2004/06/24 22:59:30 agriffis Exp $
-
-inherit libtool
-
-DESCRIPTION="IRSSI-based text client for Secure Internet Live Conferencing"
-SRC_URI="http://www.silcnet.org/download/client/sources/${P}.tar.bz2"
-HOMEPAGE="http://silcnet.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc"
-IUSE="ipv6 perl ncurses"
-
-DEPEND="=dev-libs/glib-1.2*
-	perl? ( dev-lang/perl )
-	ncurses? ( sys-libs/ncurses )"
-
-src_compile() {
-	elibtoolize
-
-	econf \
-		--mandir=/usr/share/man \
-		--with-helpdir=/usr/share/silc/help \
-		--with-docdir=/usr/share/doc/${P} \
-		--with-simdir=/usr/lib/silc/modules \
-		--with-logsdir=/var/log/silc \
-		--with-etcdir=/etc/silv \
-		--with-libdir=/usr/lib \
-		--without-libtoolfix \
-		`use_with ncurses` \
-		`use_with ipv6` \
-		|| die "./configure failed"
-
-	make || die "make failed"
-}
-
-src_install() {
-	local myflags
-
-	if use perl
-	then
-		R1="s/installsitearch='//"
-		R2="s/';//"
-		perl_sitearch="`perl -V:installsitearch | sed -e ${R1} -e ${R2}`"
-		myflags="${myflags} INSTALLPRIVLIB=${D}/usr"
-		myflags="${myflags} INSTALLARCHLIB=${D}/${perl_sitearch}"
-		myflags="${myflags} INSTALLSITELIB=${D}/${perl_sitearch}"
-		myflags="${myflags} INSTALLSITEARCH=${D}/${perl_sitearch}"
-	fi
-
-	myflags="${myflags} mandir=${D}/usr/share/man"
-
-	make DESTDIR=${D} ${myflags} install || die "make install failed"
-
-	# screwed up libtool installs things in the wrong place
-	mv ${D}/usr/libsilc* ${D}/usr/lib
-
-	rmdir ${D}/usr/include
-}
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
deleted file mode 100644
index 3b6a4d0554c3..000000000000
--- a/net-im/silc-client/silc-client-0.9.12.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# 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.9 2005/04/22 20:59:42 mrness Exp $
-
-DESCRIPTION="IRSSI-based text client for Secure Internet Live Conferencing"
-SRC_URI="http://www.silcnet.org/download/client/sources/${P}.tar.bz2"
-HOMEPAGE="http://silcnet.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~sparc"
-IUSE="ipv6 perl socks5"
-
-DEPEND="=dev-libs/glib-1.2*
-	perl? ( dev-lang/perl )
-	socks5? ( net-proxy/dante )
-	sys-libs/ncurses"
-
-src_compile() {
-	local myconf
-	use ipv6 && myconf="${myconf} --enable-ipv6"
-	use socks5 && myconf="${myconf} --with-socks5"
-
-	econf \
-		--prefix=/usr \
-		--datadir=/usr/share/${PN} \
-		--with-datadir=/usr/share/${PN} \
-		--with-docdir=/usr/share/doc/${PN} \
-		--with-helpdir=/usr/share/${PN}/help \
-		--with-logsdir=/var/log/${PN} \
-		--with-simdir=/usr/lib/${PN} \
-		--with-mandir=/usr/share/man \
-		--with-ncurses \
-		--without-silcd \
-		${myconf} \
-		|| die "./configure failed"
-
-	make || die "make failed"
-}
-
-src_install() {
-	myflags=""
-	if use perl
-	then
-		R1="s/installsitearch='//"
-		R2="s/';//"
-		perl_sitearch="`perl -V:installsitearch | sed -e ${R1} -e ${R2}`"
-		myflags="${myflags} INSTALLPRIVLIB=${D}/usr/lib"
-		myflags="${myflags} INSTALLARCHLIB=${D}/${perl_sitearch}"
-		myflags="${myflags} INSTALLSITELIB=${D}/${perl_sitearch}"
-		myflags="${myflags} INSTALLSITEARCH=${D}/${perl_sitearch}"
-	fi
-
-	make DESTDIR=${D} ${myflags} install || die "make install failed"
-	mv ${D}/usr/libsilc.a ${D}/usr/lib/
-	mv ${D}/usr/libsilcclient.a ${D}/usr/lib/
-	mv ${D}/usr/libsilcclient.la ${D}/usr/lib/
-	mv ${D}/usr/libsilc.la ${D}/usr/lib/
-	rmdir ${D}/usr/share/silc/
-	rmdir ${D}/usr/include
-
-	dodir /usr/share/man
-	mv ${D}/man1 ${D}/usr/share/man
-}
diff --git a/net-im/silc-client/silc-client-0.9.14.ebuild b/net-im/silc-client/silc-client-0.9.14.ebuild
deleted file mode 100644
index d70e486f0072..000000000000
--- a/net-im/silc-client/silc-client-0.9.14.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# 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.6 2005/04/22 20:59:42 mrness Exp $
-
-DESCRIPTION="IRSSI-based text client for Secure Internet Live Conferencing"
-SRC_URI="http://www.silcnet.org/download/client/sources/${P}.tar.bz2"
-HOMEPAGE="http://silcnet.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~sparc"
-IUSE="ipv6 perl socks5"
-
-DEPEND="=dev-libs/glib-1.2*
-	perl? ( dev-lang/perl )
-	socks5? ( net-proxy/dante )
-	sys-libs/ncurses"
-
-src_compile() {
-	local myconf
-	use ipv6 && myconf="${myconf} --enable-ipv6"
-	use socks5 && myconf="${myconf} --with-socks5"
-
-	econf \
-		--prefix=/usr \
-		--datadir=/usr/share/${PN} \
-		--with-datadir=/usr/share/${PN} \
-		--with-docdir=/usr/share/doc/${PN} \
-		--with-helpdir=/usr/share/${PN}/help \
-		--with-logsdir=/var/log/${PN} \
-		--with-simdir=/usr/lib/${PN} \
-		--with-mandir=/usr/share/man \
-		--with-ncurses \
-		--without-silcd \
-		${myconf} \
-		|| die "./configure failed"
-
-	make || die "make failed"
-}
-
-src_install() {
-	myflags=""
-	if use perl
-	then
-		R1="s/installsitearch='//"
-		R2="s/';//"
-		perl_sitearch="`perl -V:installsitearch | sed -e ${R1} -e ${R2}`"
-		myflags="${myflags} INSTALLPRIVLIB=${D}/usr/lib"
-		myflags="${myflags} INSTALLARCHLIB=${D}/${perl_sitearch}"
-		myflags="${myflags} INSTALLSITELIB=${D}/${perl_sitearch}"
-		myflags="${myflags} INSTALLSITEARCH=${D}/${perl_sitearch}"
-	fi
-
-	make DESTDIR=${D} ${myflags} install || die "make install failed"
-	mv ${D}/usr/libsilc.a ${D}/usr/lib/
-	mv ${D}/usr/libsilcclient.a ${D}/usr/lib/
-	mv ${D}/usr/libsilcclient.la ${D}/usr/lib/
-	mv ${D}/usr/libsilc.la ${D}/usr/lib/
-	rmdir ${D}/usr/share/silc/
-	rmdir ${D}/usr/include
-
-	dodir /usr/share/man
-	mv ${D}/man1 ${D}/usr/share/man
-}
diff --git a/net-im/silc-client/silc-client-1.0.1-r1.ebuild b/net-im/silc-client/silc-client-1.0.1-r1.ebuild
index 8937881e5b03..f3dca216848e 100644
--- a/net-im/silc-client/silc-client-1.0.1-r1.ebuild
+++ b/net-im/silc-client/silc-client-1.0.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # 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-r1.ebuild,v 1.4 2004/10/19 10:54:33 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/silc-client-1.0.1-r1.ebuild,v 1.5 2005/05/07 17:48:26 swegener Exp $
 
 DESCRIPTION="IRSSI-based text client for Secure Internet Live Conferencing"
 SRC_URI="http://www.silcnet.org/download/client/sources/${P}.tar.bz2"
@@ -39,14 +39,15 @@ src_compile() {
 		--with-mandir=/usr/share/man \
 		--with-ncurses \
 		--without-silcd \
-		`use_enable ipv6` \
-		`use_enable debug` \
+		$(use_enable ipv6) \
+		$(use_enable debug) \
 		|| die "econf failed"
 	emake -j1 || die "emake failed"
 }
 
 src_install() {
 	local myflags=""
+
 	if use perl
 	then
 		R1="s/installsitearch='//"
diff --git a/net-im/silc-client/silc-client-1.0.1.ebuild b/net-im/silc-client/silc-client-1.0.2.ebuild
index 24a35d7603f2..92f65716e8f2 100644
--- a/net-im/silc-client/silc-client-1.0.1.ebuild
+++ b/net-im/silc-client/silc-client-1.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # 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.8 2005/04/22 20:59:42 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/silc-client-1.0.2.ebuild,v 1.1 2005/05/07 17:48:26 swegener Exp $
 
 DESCRIPTION="IRSSI-based text client for Secure Internet Live Conferencing"
 SRC_URI="http://www.silcnet.org/download/client/sources/${P}.tar.bz2"
@@ -8,38 +8,46 @@ HOMEPAGE="http://silcnet.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~sparc amd64"
-IUSE="ipv6 perl socks5"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+IUSE="ipv6 perl debug"
 
 DEPEND="=dev-libs/glib-1.2*
-	perl? ( dev-lang/perl )
-	socks5? ( net-proxy/dante )
-	sys-libs/ncurses"
+	perl? (
+		dev-lang/perl
+		!net-irc/irssi
+		!net-irc/irssi-cvs
+	)
+	sys-libs/ncurses
+	!<=net-im/silc-toolkit-0.9.12-r1"
 
-src_compile() {
-	local myconf
-	use ipv6 && myconf="${myconf} --enable-ipv6"
-	use socks5 && myconf="${myconf} --with-socks5"
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	sed -i \
+		-e "s:-g -O2:${CFLAGS}:g" \
+		configure
+}
 
+src_compile() {
 	econf \
-		--prefix=/usr \
-		--datadir=/usr/share/${PN} \
+		--datadir=/usr/share \
 		--with-datadir=/usr/share/${PN} \
-		--with-docdir=/usr/share/doc/${PN} \
+		--with-docdir=/usr/share/doc/${PF} \
 		--with-helpdir=/usr/share/${PN}/help \
-		--with-logsdir=/var/log/${PN} \
 		--with-simdir=/usr/lib/${PN} \
 		--with-mandir=/usr/share/man \
 		--with-ncurses \
 		--without-silcd \
-		${myconf} \
-		|| die "./configure failed"
-
-	make || die "make failed"
+		$(use_enable ipv6) \
+		$(use_enable debug) \
+		|| die "econf failed"
+	emake -j1 || die "emake failed"
 }
 
 src_install() {
-	myflags=""
+	local myflags=""
+
 	if use perl
 	then
 		R1="s/installsitearch='//"
@@ -52,13 +60,6 @@ src_install() {
 	fi
 
 	make DESTDIR=${D} ${myflags} install || die "make install failed"
-	mv ${D}/usr/libsilc.a ${D}/usr/lib/
-	mv ${D}/usr/libsilcclient.a ${D}/usr/lib/
-	mv ${D}/usr/libsilcclient.la ${D}/usr/lib/
-	mv ${D}/usr/libsilc.la ${D}/usr/lib/
-	rmdir ${D}/usr/share/silc/
-	rmdir ${D}/usr/include
 
-	dodir /usr/share/man
-	mv ${D}/man1 ${D}/usr/share/man
+	rm -rf ${D}/etc ${D}/usr/libsilc* ${D}/usr/include
 }
diff --git a/net-im/silc-client/silc-client-1.0.ebuild b/net-im/silc-client/silc-client-1.0.ebuild
deleted file mode 100644
index d5c2a468ea96..000000000000
--- a/net-im/silc-client/silc-client-1.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# 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.6 2005/04/22 20:59:42 mrness Exp $
-
-DESCRIPTION="IRSSI-based text client for Secure Internet Live Conferencing"
-SRC_URI="http://www.silcnet.org/download/client/sources/${P}.tar.bz2"
-HOMEPAGE="http://silcnet.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~sparc"
-IUSE="ipv6 perl socks5"
-
-DEPEND="=dev-libs/glib-1.2*
-	perl? ( dev-lang/perl )
-	socks5? ( net-proxy/dante )
-	sys-libs/ncurses"
-
-src_compile() {
-	local myconf
-	use ipv6 && myconf="${myconf} --enable-ipv6"
-	use socks5 && myconf="${myconf} --with-socks5"
-
-	econf \
-		--prefix=/usr \
-		--datadir=/usr/share/${PN} \
-		--with-datadir=/usr/share/${PN} \
-		--with-docdir=/usr/share/doc/${PN} \
-		--with-helpdir=/usr/share/${PN}/help \
-		--with-logsdir=/var/log/${PN} \
-		--with-simdir=/usr/lib/${PN} \
-		--with-mandir=/usr/share/man \
-		--with-ncurses \
-		--without-silcd \
-		${myconf} \
-		|| die "./configure failed"
-
-	make || die "make failed"
-}
-
-src_install() {
-	myflags=""
-	if use perl
-	then
-		R1="s/installsitearch='//"
-		R2="s/';//"
-		perl_sitearch="`perl -V:installsitearch | sed -e ${R1} -e ${R2}`"
-		myflags="${myflags} INSTALLPRIVLIB=${D}/usr/lib"
-		myflags="${myflags} INSTALLARCHLIB=${D}/${perl_sitearch}"
-		myflags="${myflags} INSTALLSITELIB=${D}/${perl_sitearch}"
-		myflags="${myflags} INSTALLSITEARCH=${D}/${perl_sitearch}"
-	fi
-
-	make DESTDIR=${D} ${myflags} install || die "make install failed"
-	mv ${D}/usr/libsilc.a ${D}/usr/lib/
-	mv ${D}/usr/libsilcclient.a ${D}/usr/lib/
-	mv ${D}/usr/libsilcclient.la ${D}/usr/lib/
-	mv ${D}/usr/libsilc.la ${D}/usr/lib/
-	rmdir ${D}/usr/share/silc/
-	rmdir ${D}/usr/include
-
-	dodir /usr/share/man
-	mv ${D}/man1 ${D}/usr/share/man
-}