Version bump. Removed old. Added rewritten init script

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

7 files changed, 67 insertions, 235 deletions

diff --git a/net-im/silc-server/ChangeLog b/net-im/silc-server/ChangeLog
index 900acb727a47..3fb98c9d76ea 100644
--- a/net-im/silc-server/ChangeLog
+++ b/net-im/silc-server/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-im/silc-server
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/ChangeLog,v 1.42 2009/02/24 17:33:34 drizzt Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/ChangeLog,v 1.43 2013/10/31 10:01:10 polynomial-c Exp $
+
+*silc-server-1.1.18 (31 Oct 2013)
+
+  31 Oct 2013; Lars Wendler <polynomial-c@gentoo.org>
+  -silc-server-1.1.2.ebuild, -silc-server-1.1.6.ebuild,
+  -silc-server-1.1.8.ebuild, -silc-server-1.1.11.ebuild,
+  silc-server-1.1.14.ebuild, +silc-server-1.1.18.ebuild, +files/silcd.initd-r1:
+  Non-maintainer commit: Version bump. Removed old. Added rewritten init
+  script.
 
   24 Feb 2009; Timothy Redaelli <drizzt@gentoo.org> files/silcd.initd:
   Remove bashism in init.d file
diff --git a/net-im/silc-server/files/silcd.initd-r1 b/net-im/silc-server/files/silcd.initd-r1
new file mode 100644
index 000000000000..57862e3fa7b8
--- /dev/null
+++ b/net-im/silc-server/files/silcd.initd-r1
@@ -0,0 +1,25 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/files/silcd.initd-r1,v 1.1 2013/10/31 10:01:09 polynomial-c Exp $
+
+description="Server for Secure Internet Live Conferencing"
+pidfile="/run/silcd.pid"
+command="/usr/sbin/silcd"
+command_args="-f /etc/silc/silcd.conf >/dev/null 2>&1"
+start_stop_daemon_args="-w 2000"
+
+depend() {
+	need net
+	use dns
+}
+
+start_pre() {
+	local silcdconf="/etc/silc/silcd.conf"
+
+	if [ ! -f "${silcdconf}" ] ; then
+		eerror "You need to set up a ${silcdconf} file in order to start the server."
+		eerror "You can find an example config in /usr/share/doc/silc-server*"
+		return 1
+	fi
+}
diff --git a/net-im/silc-server/silc-server-1.1.11.ebuild b/net-im/silc-server/silc-server-1.1.11.ebuild
deleted file mode 100644
index ea30177f2fd2..000000000000
--- a/net-im/silc-server/silc-server-1.1.11.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/silc-server-1.1.11.ebuild,v 1.4 2008/12/16 20:33:05 bluebird Exp $
-
-inherit eutils autotools flag-o-matic
-
-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="~amd64 ppc sparc x86"
-IUSE="ipv6 debug"
-
-RDEPEND="!<=net-im/silc-toolkit-0.9.12-r1
-	!<=net-im/silc-client-1.0.1"
-
-src_compile() {
-	econf \
-		--datadir=/usr/share/${PN} \
-		--datarootdir=/usr/share/${PN} \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/silc \
-		--with-helpdir=/usr/share/${PN}/help \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-optimizations \
-		--with-logsdir=/var/log/${PN} \
-		--with-silcd-pid-file=/var/run/silcd.pid \
-		$(use_enable ipv6) \
-		$(use_enable debug) \
-		|| die "econf failed"
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	insinto /usr/share/doc/${PF}/examples
-	doins doc/examples/*.conf
-
-	fperms 600 /etc/silc
-	keepdir /var/log/${PN}
-
-	rm -rf \
-		"${D}"/usr/libsilc* \
-		"${D}"/usr/include \
-		"${D}"/etc/silc/silcd.{pub,prv}
-
-	newinitd "${FILESDIR}/silcd.initd" silcd
-
-	sed -i \
-		-e 's:10.2.1.6:0.0.0.0:' \
-		-e 's:User = "nobody";:User = "silcd";:' \
-		"${D}"/etc/silc/silcd.conf
-}
-
-pkg_postinst() {
-	enewuser silcd
-
-	if [ ! -f "${ROOT}"/etc/silc/silcd.prv ] ; then
-		einfo "Creating key pair in /etc/silc"
-		silcd -C "${ROOT}"/etc/silc
-		chmod 600 "${ROOT}"/etc/silc/silcd.{prv,pub}
-	fi
-}
diff --git a/net-im/silc-server/silc-server-1.1.14.ebuild b/net-im/silc-server/silc-server-1.1.14.ebuild
index bcf40f511ee8..c8fd1c559564 100644
--- a/net-im/silc-server/silc-server-1.1.14.ebuild
+++ b/net-im/silc-server/silc-server-1.1.14.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/silc-server-1.1.14.ebuild,v 1.1 2008/11/27 10:31:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/silc-server-1.1.14.ebuild,v 1.2 2013/10/31 10:01:10 polynomial-c Exp $
 
-inherit eutils autotools flag-o-matic
+inherit eutils flag-o-matic
 
 DESCRIPTION="Server for Secure Internet Live Conferencing"
 SRC_URI="http://www.silcnet.org/download/server/sources/${P}.tar.bz2"
diff --git a/net-im/silc-server/silc-server-1.1.6.ebuild b/net-im/silc-server/silc-server-1.1.18.ebuild
index ee3896be1513..5ae629dbfaf4 100644
--- a/net-im/silc-server/silc-server-1.1.6.ebuild
+++ b/net-im/silc-server/silc-server-1.1.18.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/silc-server-1.1.6.ebuild,v 1.1 2008/04/24 18:51:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/silc-server-1.1.18.ebuild,v 1.1 2013/10/31 10:01:10 polynomial-c Exp $
 
-inherit eutils autotools flag-o-matic
+EAPI=5
+
+inherit eutils flag-o-matic
 
 DESCRIPTION="Server for Secure Internet Live Conferencing"
 SRC_URI="http://www.silcnet.org/download/server/sources/${P}.tar.bz2"
@@ -11,39 +13,41 @@ HOMEPAGE="http://silcnet.org/"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="ipv6 debug"
+IUSE="gmp ipv6 debug"
 
 RDEPEND="!<=net-im/silc-toolkit-0.9.12-r1
-	!<=net-im/silc-client-1.0.1"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+	!<=net-im/silc-client-1.0.1
+	gmp? ( dev-libs/gmp )"
 
-	epatch "${FILESDIR}"/1.1-execstack.patch
+pkg_setup() {
+	enewuser silcd
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		--datadir=/usr/share/${PN} \
 		--datarootdir=/usr/share/${PN} \
 		--mandir=/usr/share/man \
 		--sysconfdir=/etc/silc \
-		--with-helpdir=/usr/share/${PN}/help \
 		--libdir=/usr/$(get_libdir)/${PN} \
 		--docdir=/usr/share/doc/${PF} \
 		--disable-optimizations \
 		--with-logsdir=/var/log/${PN} \
 		--with-silcd-pid-file=/var/run/silcd.pid \
+		$(use_with gmp) \
 		$(use_enable ipv6) \
-		$(use_enable debug) \
-		|| die "econf failed"
-	emake -j1 || die "emake failed"
+		$(use_enable debug)
 }
 
+#src_compile() {
+#	emake -j1
+#}
+
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install
+
+	insinto /etc/silc
+	doins doc/silcalgs.conf
 
 	insinto /usr/share/doc/${PF}/examples
 	doins doc/examples/*.conf
@@ -56,17 +60,20 @@ src_install() {
 		"${D}"/usr/include \
 		"${D}"/etc/silc/silcd.{pub,prv}
 
-	newinitd "${FILESDIR}/silcd.initd" silcd
+	newinitd "${FILESDIR}/silcd.initd-r1" silcd
+	doman doc/silcd.8 doc/silcd.conf.5
 
 	sed -i \
 		-e 's:10.2.1.6:0.0.0.0:' \
 		-e 's:User = "nobody";:User = "silcd";:' \
-		"${D}"/etc/silc/silcd.conf
+		-e 's:/var/run:/run:' \
+		-e 's:lassi.kuo.fi.ssh.com:localhost:' \
+		doc/example_silcd.conf \
+		|| die
+	dodoc doc/example_silcd.conf
 }
 
 pkg_postinst() {
-	enewuser silcd
-
 	if [ ! -f "${ROOT}"/etc/silc/silcd.prv ] ; then
 		einfo "Creating key pair in /etc/silc"
 		silcd -C "${ROOT}"/etc/silc
diff --git a/net-im/silc-server/silc-server-1.1.2.ebuild b/net-im/silc-server/silc-server-1.1.2.ebuild
deleted file mode 100644
index 2a7762f8f791..000000000000
--- a/net-im/silc-server/silc-server-1.1.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/silc-server-1.1.2.ebuild,v 1.4 2008/03/27 18:17:20 dertobi123 Exp $
-
-inherit eutils autotools flag-o-matic
-
-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="~amd64 ppc sparc x86"
-IUSE="ipv6 debug"
-
-RDEPEND="!<=net-im/silc-toolkit-0.9.12-r1
-	!<=net-im/silc-client-1.0.1"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/1.1-execstack.patch
-}
-
-src_compile() {
-	econf \
-		--datadir=/usr/share/${PN} \
-		--datarootdir=/usr/share/${PN} \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/silc \
-		--with-helpdir=/usr/share/${PN}/help \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-optimizations \
-		--with-logsdir=/var/log/${PN} \
-		--with-silcd-pid-file=/var/run/silcd.pid \
-		$(use_enable ipv6) \
-		$(use_enable debug) \
-		|| die "econf failed"
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	insinto /usr/share/doc/${PF}/examples
-	doins doc/examples/*.conf
-
-	fperms 600 /etc/silc
-	keepdir /var/log/${PN}
-
-	rm -rf \
-		"${D}"/usr/libsilc* \
-		"${D}"/usr/include \
-		"${D}"/etc/silc/silcd.{pub,prv}
-
-	newinitd "${FILESDIR}/silcd.initd" silcd
-
-	sed -i \
-		-e 's:10.2.1.6:0.0.0.0:' \
-		-e 's:User = "nobody";:User = "silcd";:' \
-		"${D}"/etc/silc/silcd.conf
-}
-
-pkg_postinst() {
-	enewuser silcd
-
-	if [ ! -f "${ROOT}"/etc/silc/silcd.prv ] ; then
-		einfo "Creating key pair in /etc/silc"
-		silcd -C "${ROOT}"/etc/silc
-		chmod 600 "${ROOT}"/etc/silc/silcd.{prv,pub}
-	fi
-}
diff --git a/net-im/silc-server/silc-server-1.1.8.ebuild b/net-im/silc-server/silc-server-1.1.8.ebuild
deleted file mode 100644
index 8e02c9faebfc..000000000000
--- a/net-im/silc-server/silc-server-1.1.8.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/silc-server-1.1.8.ebuild,v 1.1 2008/06/06 10:45:13 armin76 Exp $
-
-inherit eutils autotools flag-o-matic
-
-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="~amd64 ~ppc ~sparc ~x86"
-IUSE="ipv6 debug"
-
-RDEPEND="!<=net-im/silc-toolkit-0.9.12-r1
-	!<=net-im/silc-client-1.0.1"
-
-src_compile() {
-	econf \
-		--datadir=/usr/share/${PN} \
-		--datarootdir=/usr/share/${PN} \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/silc \
-		--with-helpdir=/usr/share/${PN}/help \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-optimizations \
-		--with-logsdir=/var/log/${PN} \
-		--with-silcd-pid-file=/var/run/silcd.pid \
-		$(use_enable ipv6) \
-		$(use_enable debug) \
-		|| die "econf failed"
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	insinto /usr/share/doc/${PF}/examples
-	doins doc/examples/*.conf
-
-	fperms 600 /etc/silc
-	keepdir /var/log/${PN}
-
-	rm -rf \
-		"${D}"/usr/libsilc* \
-		"${D}"/usr/include \
-		"${D}"/etc/silc/silcd.{pub,prv}
-
-	newinitd "${FILESDIR}/silcd.initd" silcd
-
-	sed -i \
-		-e 's:10.2.1.6:0.0.0.0:' \
-		-e 's:User = "nobody";:User = "silcd";:' \
-		"${D}"/etc/silc/silcd.conf
-}
-
-pkg_postinst() {
-	enewuser silcd
-
-	if [ ! -f "${ROOT}"/etc/silc/silcd.prv ] ; then
-		einfo "Creating key pair in /etc/silc"
-		silcd -C "${ROOT}"/etc/silc
-		chmod 600 "${ROOT}"/etc/silc/silcd.{prv,pub}
-	fi
-}