Version bump, bug #90374.

(Portage version: 2.0.51.21)

6 files changed, 92 insertions, 21 deletions

diff --git a/net-im/silc-server/ChangeLog b/net-im/silc-server/ChangeLog
index 735fd30eaf5a..971029679d27 100644
--- a/net-im/silc-server/ChangeLog
+++ b/net-im/silc-server/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/silc-server
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/ChangeLog,v 1.4 2005/04/07 13:37:22 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/ChangeLog,v 1.5 2005/05/03 20:15:36 swegener Exp $
+
+*silc-server-0.9.20 (03 May 2005)
+
+  03 May 2005; Sven Wegener <swegener@gentoo.org> silc-server-0.9.18.ebuild,
+  silc-server-0.9.19.ebuild, +silc-server-0.9.20.ebuild:
+  Version bump, bug #90374.
 
 *silc-server-0.9.19 (07 Apr 2005)
 
diff --git a/net-im/silc-server/Manifest b/net-im/silc-server/Manifest
index c21a81f78f7b..1da2288f8b35 100644
--- a/net-im/silc-server/Manifest
+++ b/net-im/silc-server/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5b8732137552cca832558dd31b16374d ChangeLog 991
-MD5 081d7fe487cafda4ccbf08c626ade6fa silc-server-0.9.18.ebuild 1507
 MD5 23f441c043fde934cd443d80f01dc72a silc-server-0.9.19.ebuild 2084
+MD5 e678ab6f53384d34b21577f5c5d9a100 silc-server-0.9.20.ebuild 1708
+MD5 081d7fe487cafda4ccbf08c626ade6fa silc-server-0.9.18.ebuild 1507
+MD5 5b8732137552cca832558dd31b16374d ChangeLog 991
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 1d6f438fd4db0224ebc00a4aedbf03b8 files/silcd.rc6 516
+MD5 35c2cb3f96d044d2fa789fdaee59b960 files/digest-silc-server-0.9.18 72
 MD5 daa76cd2004c198217562515888c3bd6 files/digest-silc-server-0.9.19 74
+MD5 9a530c12a06320d1c91b640c40292ea1 files/digest-silc-server-0.9.20 71
 MD5 98a0c24ebb4913a10047dc242aa60a3a files/silc-server.rc6 541
-MD5 35c2cb3f96d044d2fa789fdaee59b960 files/digest-silc-server-0.9.18 72
-MD5 1d6f438fd4db0224ebc00a4aedbf03b8 files/silcd.rc6 516
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCVTeoQlM6RnzZP+IRAgU2AKCOaa2prh/WYgJXzUSOv1pOEIqHAACfehiJ
-KvSHm3Y/BawgUo+BmV7rACE=
-=nO9e
------END PGP SIGNATURE-----
diff --git a/net-im/silc-server/files/digest-silc-server-0.9.20 b/net-im/silc-server/files/digest-silc-server-0.9.20
new file mode 100644
index 000000000000..8902a1f6335e
--- /dev/null
+++ b/net-im/silc-server/files/digest-silc-server-0.9.20
@@ -0,0 +1 @@
+MD5 014896ce76b6ffb02fc79a7a892f940f silc-server-0.9.20.tar.bz2 906006
diff --git a/net-im/silc-server/silc-server-0.9.18.ebuild b/net-im/silc-server/silc-server-0.9.18.ebuild
index ca1d41253838..17671bcffa6f 100644
--- a/net-im/silc-server/silc-server-0.9.18.ebuild
+++ b/net-im/silc-server/silc-server-0.9.18.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-server/silc-server-0.9.18.ebuild,v 1.3 2005/04/07 13:37:22 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/silc-server-0.9.18.ebuild,v 1.4 2005/05/03 20:15:36 swegener Exp $
 
 inherit eutils
 
@@ -24,8 +24,8 @@ src_compile() {
 		--with-logsdir=/var/log/${PN} \
 		--with-simdir=/usr/lib/${PN} \
 		--with-mandir=/usr/share/man \
-		`use_enable ipv6` \
-		`use_enable debug` \
+		$(use_enable ipv6) \
+		$(use_enable debug) \
 		|| die "econf failed"
 	emake -j1 all || die "emake failed"
 }
diff --git a/net-im/silc-server/silc-server-0.9.19.ebuild b/net-im/silc-server/silc-server-0.9.19.ebuild
index 58a9eab761de..4053ea687967 100644
--- a/net-im/silc-server/silc-server-0.9.19.ebuild
+++ b/net-im/silc-server/silc-server-0.9.19.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-server/silc-server-0.9.19.ebuild,v 1.1 2005/04/07 13:37:22 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/silc-server-0.9.19.ebuild,v 1.2 2005/05/03 20:15:36 swegener Exp $
 
 inherit eutils
 
@@ -32,8 +32,8 @@ src_compile() {
 		--with-logsdir=/var/log/${PN} \
 		--with-mandir=/usr/share/man \
 		--with-silcd-pid-file=/var/run/silcd.pid \
-		`use_enable ipv6` \
-		`use_enable debug` \
+		$(use_enable ipv6) \
+		$(use_enable debug) \
 		|| die "econf failed"
 	emake -j1 all || die "emake failed"
 }
diff --git a/net-im/silc-server/silc-server-0.9.20.ebuild b/net-im/silc-server/silc-server-0.9.20.ebuild
new file mode 100644
index 000000000000..b12429b8754d
--- /dev/null
+++ b/net-im/silc-server/silc-server-0.9.20.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/silc-server-0.9.20.ebuild,v 1.1 2005/05/03 20:15:36 swegener Exp $
+
+inherit eutils
+
+DESCRIPTION="Server for Secure Internet Live Conferencing"
+SRC_URI="http://www.silcnet.org/download/server/sources/${P}.tar.bz2"
+HOMEPAGE="http://silcnet.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc"
+IUSE="ipv6 debug"
+
+DEPEND="!<=net-im/silc-toolkit-0.9.12-r1
+	!<=net-im/silc-client-1.0.1"
+
+src_compile() {
+	econf \
+		--sysconfdir=/etc/silc \
+		--with-docdir=/usr/share/doc/${PF} \
+		--with-helpdir=/usr/share/${PN}/help \
+		--with-logsdir=/var/log/${PN} \
+		--with-mandir=/usr/share/man \
+		--with-silcd-pid-file=/var/run/silcd.pid \
+		--with-simdir=/usr/$(get_libdir)/${PN} \
+		--without-silc-libs \
+		$(use_enable ipv6) \
+		$(use_enable debug) \
+		|| die "econf failed"
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+
+	insinto /usr/share/doc/${PF}/examples
+	doins doc/examples/*.conf
+
+	fperms 600 /etc/${PN}
+	keepdir /var/log/${PN}
+
+	rm -rf \
+		${D}/usr/libsilc* \
+		${D}/usr/include \
+		${D}/etc/silc/silcd.{pub,prv}
+
+	newinitd ${FILESDIR}/silcd.rc6 silcd
+
+	sed -i \
+		-e 's:10.2.1.6:0.0.0.0:' \
+		-e 's:User = "nobody";:User = "silcd";:' \
+		-e 's:${D}::g' \
+		${D}/etc/silc/silcd.conf
+}
+
+pkg_postinst() {
+	enewuser silcd
+
+	if [ ! -f ${ROOT}/etc/${PN}/silcd.prv ] ; then
+		einfo "Creating key pair in ${ROOT}etc/silc"
+		silcd -C ${ROOT}etc/silc
+	fi
+
+	ewarn
+	ewarn "Configuration and server keys have been moved to /etc/silc, please check"
+	ewarn "your files."
+	ewarn
+	ewarn "Initscript name has changed from silc-server to silcd in this version."
+	ewarn
+}