Added gpg and server useflag for fwknop

2 files changed, 47 insertions, 27 deletions

diff --git a/net-firewall/fwknop/Manifest b/net-firewall/fwknop/Manifest
index 5b50d82..b7c8e4b 100644
--- a/net-firewall/fwknop/Manifest
+++ b/net-firewall/fwknop/Manifest
@@ -1,2 +1,2 @@
 DIST fwknop-nodeps-1.9.12.tar.gz 270475 RMD160 c15e7c6464acd050e326d96273340bd656acaf4d SHA1 aed47bde81e869fc0baf6bb689ec703ce5155dd2 SHA256 a67242f25d09c4cdc3c0c449f1a71a3a52db61c79692bbf1a4e90ce9324f32b0
-EBUILD fwknop-1.9.12.ebuild 1927 RMD160 0f67c14f012ba6f9baf568ab73da9f1773dc8864 SHA1 d86cb7afade6b44b1f35c4b2baeb3b88b7b56384 SHA256 17276014177bf82284b8fa9d325df2f2c6faf0f154d21b94db6032256d9c6a14
+EBUILD fwknop-1.9.12.ebuild 2266 RMD160 de89bbc3f1311909a1e895149e2320c7709cb6a0 SHA1 7f715491109b9ab8806906f965d968f23277d537 SHA256 ff23579c5034a1e1f31aa11b531c6676a17e45d9b72400e3be2bfffb0ab4abfd
diff --git a/net-firewall/fwknop/fwknop-1.9.12.ebuild b/net-firewall/fwknop/fwknop-1.9.12.ebuild
index 11af653..86047b7 100644
--- a/net-firewall/fwknop/fwknop-1.9.12.ebuild
+++ b/net-firewall/fwknop/fwknop-1.9.12.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit perl-app
+EAPI=2
 
-IUSE=""
+inherit perl-app
 
 DESCRIPTION="Single Packet Authorization and Port Knocking"
 SRC_URI="http://www.cipherdyne.org/fwknop/download/${PN}-nodeps-${PV}.tar.gz"
@@ -13,51 +13,71 @@ HOMEPAGE="http://www.cipherdyne.org/fwknop"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86"
+IUSE="gpg +server"
 
-RDEPEND="virtual/logger
-	virtual/mailx
+RDEPEND="
 	dev-perl/Class-MethodMaker
-	dev-perl/GnuPG-Interface
-	dev-perl/Unix-Syslog
 	dev-perl/crypt-cbc
 	dev-perl/Crypt-Rijndael
-	dev-perl/Net-Pcap
 	dev-perl/TermReadKey
 	dev-perl/Net-RawIP
 	dev-perl/Net-IPv4Addr
-	dev-perl/IPTables-Parse
-	dev-perl/IPTables-ChainMgr
 	virtual/perl-Digest-SHA
 	virtual/perl-net-ping
-	net-firewall/iptables
-	net-misc/whois"
+	server? (
+		dev-perl/IPTables-Parse
+		dev-perl/IPTables-ChainMgr
+		dev-perl/Net-Pcap
+		dev-perl/Unix-Syslog
+		net-firewall/iptables
+		net-misc/whois
+		virtual/logger
+		virtual/mailx
+		)
+	gpg? ( dev-perl/GnuPG-Interface )"
 
 src_install() {
-	doman *.8
+	# install client binary
+	dobin fwknop
+
+	if use server; then
+		# install daemons
+		insinto /usr
+		dosbin fwknop_serv fwknopd knopmd knoptm knopwatchd
 
-	keepdir /var/log/fwknop /var/run/fwknop
+		# fix config
+		fix_conf
 
-	insinto /usr
-	dosbin fwknop fwknop_serv fwknopd knopmd knoptm knopwatchd
+		# install configs
+		insinto /etc/fwknop
+		doins *.conf
+		fperms 600 /etc/fwknop/access.conf
 
-	fix_conf
+		# init.d
+		newinitd init-scripts/fwknop-init.gentoo fwknop
 
-	insinto /etc/fwknop
-	doins *.conf
-	fperms 600 /etc/fwknop/access.conf
+		# create (and keep) dirs for the daemons
+		keepdir /var/log/fwknop /var/run/fwknop
 
-	newinitd init-scripts/fwknop-init.gentoo fwknop
+		# install manpages
+		doman *.8
+	else
+		# only install the client manpage
+		doman fwknop.8
+	fi
 
 	dodoc CREDITS Change* README README.* VERSION
 }
 
 pkg_postinst() {
-	echo
-	elog "Please be sure to edit /etc/fwknop/fwknop.conf to reflect your system's"
-	elog "configuration or it may not work correctly or start up. Specifically, check"
-	elog "the validity of the HOSTNAME setting and EMAIL_ADDRESSES"
-	echo
-	elog "You must edit /etc/fwknop/access.conf for fwknop to work correctly."
+	if use server; then
+		echo
+		elog "Please be sure to edit /etc/fwknop/fwknop.conf to reflect your system's"
+		elog "configuration or it may not work correctly or start up. Specifically, check"
+		elog "the validity of the HOSTNAME setting and EMAIL_ADDRESSES"
+		echo
+		elog "You must edit /etc/fwknop/access.conf for fwknop to work correctly."
+	fi
 }
 
 fix_conf() {