Install static library only with USE=static-libs.

Move all patches into patchset on Gentoo mirrors.
Update ebuild to EAPI 4.

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

3 files changed, 105 insertions, 11 deletions

diff --git a/sys-auth/skey/ChangeLog b/sys-auth/skey/ChangeLog
index 1f359820f7a4..7028d6588a97 100644
--- a/sys-auth/skey/ChangeLog
+++ b/sys-auth/skey/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-auth/skey
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/skey/ChangeLog,v 1.14 2011/01/30 18:17:44 ulm Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/skey/ChangeLog,v 1.15 2012/01/04 23:12:01 ulm Exp $
+
+*skey-1.1.5-r8 (04 Jan 2012)
+
+  04 Jan 2012; Ulrich Mueller <ulm@gentoo.org> +skey-1.1.5-r8.ebuild:
+  Install static library only with USE=static-libs. Move all patches into
+  patchset on Gentoo mirrors. Update ebuild to EAPI 4.
 
   30 Jan 2011; Ulrich Mueller <ulm@gentoo.org> skey-1.1.5-r7.ebuild:
   Add die statements throughout.
@@ -160,7 +166,7 @@
 *skey-1.1.5-r4 (23 Sep 2004)
 
   23 Sep 2004; Tavis Ormandy <taviso@gentoo.org> +skey-1.1.5-r4.ebuild:
-  do not include /etc/skey/skeykeys in the package, as quickpkg may package 
+  do not include /etc/skey/skeykeys in the package, as quickpkg may package
   personal files. This also fixes the etc-update issue with #64974.
 
   18 Sep 2004; Joshua Kinard <kumba@gentoo.org> skey-1.1.5-r3.ebuild:
@@ -241,6 +247,6 @@
 *skey-1.1.5 (05 Sep 2003)
 
   05 Sep 2003; Tavis Ormandy <taviso@gentoo.org> skey-1.1.5.ebuild:
-  Initial import, Thanks to Jeb Campbell <jebc@c4solutions.net> for 
+  Initial import, Thanks to Jeb Campbell <jebc@c4solutions.net> for
   submitting the ebuild in #11478
 
diff --git a/sys-auth/skey/Manifest b/sys-auth/skey/Manifest
index f6bb43220623..baf73fe150fe 100644
--- a/sys-auth/skey/Manifest
+++ b/sys-auth/skey/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX skey-1.1.5-binary-search.patch 802 RMD160 aa708c92eb005469232e8ad5f77b1717638854b2 SHA1 f8043cc8b81b29ea10e83cf6a2c89e96825223e8 SHA256 1c0b10479017434f5705baa55664f221ff80e8ed295b71b868f382a0a58938c4
 AUX skey-1.1.5-bind-now.patch 566 RMD160 201059b7ae654f8f12ddd3ffb33c9e2f2311a49d SHA1 ba3be6a9e8da72addc38258e07421d7b18209419 SHA256 febd27580f39bfaf8feb9b172fc144a0becd088afa02dbe96e2cb7474c9a4ef5
@@ -7,16 +7,26 @@ AUX skey-1.1.5-fPIC.patch 271 RMD160 11ba3e2eb2e8407c5e995f0ab102b08765f6b4ba SH
 AUX skey-1.1.5-otp.diff 1437 RMD160 1b8b362e7c31161e3c88730f74b941b83bbba165 SHA1 be2a685faa723662c2df6232eca36547f9463765 SHA256 b8391d0310e5d22ca303ddd13ecdb306b036bc4622e496c516c0c7b54f4540a4
 AUX skey-login_name_max.diff 386 RMD160 44bc80938601c1140658d5ed343bad982e1c6ca4 SHA1 8510f9dcaec2952347da4933f22984d9d816b27b SHA256 d6652f9ba5cc358108ddfaa2f9dd7093e02a1adba4e360a1e6ad1a42a415a0dd
 DIST skey-1.1.5-gentoo.diff.gz 37614 RMD160 997002ac7e2481ec5158db3b2c7280bc80d5c95b SHA1 ea2611abefdd4a13621478a09f5771fc83ab58b6 SHA256 1f4cb9d403c2cd054a451f4d790cbeac68d31f11d0df1588c2bfb769137444a2
+DIST skey-1.1.5-patches-1.tar.xz 33332 RMD160 6ca048bd88317adce32133a14a7ec361426d4922 SHA1 31e9d78cd47c50217ad2fea7a949a4eca967f3cc SHA256 254927db4060c5e7fd0d863777f936f360f921647aeab620dcca675af536f865
 DIST skey-1.1.5.tar.bz2 61911 RMD160 33d97cbcd6dbc91bdca5b27056d51d1f5d06b68d SHA1 d55fb286098900cdf3eb6b174a720a06c722312a SHA256 e21bcb7c618c0bc87a72d8f0f097d7517fffa4e881a0f295ee1ce2a7dccf4aef
 EBUILD skey-1.1.5-r7.ebuild 3450 RMD160 d9be7678c1b210010e083839949b7546f621d2e6 SHA1 08c08b834799a586b81621d7273be33beea09986 SHA256 a70f51ed959b1e922988736d81f85f685d92381c379b9040bdfa5511e11a67d5
-MISC ChangeLog 8743 RMD160 a171b4871c836038f33986d82d022b0138dd5a45 SHA1 db9948831e5d02a97d6e177b8a2d9f064933d40e SHA256 296ac2bb381558d980ab0f39553bdd7bb5031c2dd3c791c023abee7cdae65cf5
+EBUILD skey-1.1.5-r8.ebuild 2026 RMD160 b161c85d105eeb248bb59c19912ddbad7ca2c65b SHA1 c9ac3935c92c527c4ae75e41e9d52fbd61744da9 SHA256 8e47626e721a76da0f1c6af540663bd6dde2476088db1112a1c32198900f0181
+MISC ChangeLog 8971 RMD160 9e3295b7c3c66ad6013ea2d47ca44aad6454ccd8 SHA1 bfec2bf2a79881032f3046230a98630d8da1fb1a SHA256 f7baaa320fc50df64b228a624724bce54ffd9651e8b394fc6ccaf236205f3fdc
 MISC metadata.xml 1418 RMD160 5605591bbf305bca751eebb06b39d756861d5adf SHA1 4a266d05c47fbbaf1ce76245a15d5ef3b9840e50 SHA256 786262fdf7d44c395db41d8d273aa75a4aa390abd30348a2fa835e7a8eb64ffc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59skIACgkQfXuS5UK5QB0bdAP/aXeeql5pLMvwbgwSB/ctiSMO
-CH/OdGqRaSWUAODbdlmbnE2DBgZW1V9aKDTUgBHz46GqqxzO9IBf9XsuzjKuycf3
-mXvQexgAMUXAwq6oLfy47CnGnDVbTyf/5y7oqNLimuIjEne1AuQiMbX5vG4Xcz94
-dvFHW4XsqctX0nO59bw=
-=BzaG
+iQIcBAEBAgAGBQJPBN9JAAoJEDxpGckxwJCBbGwQAJ/1juvF6XQRsyyLBJaHNHPf
+5cfrz0HIcC9e6O5QJfUBwyfh2AbM3kVFQWPb+Rb48Id+ejv4QDeMZ87Em1SyNnHX
+tm7udURmwONfaQHCy5eGHwBj3A28XKLk4Z244nNFtE4Ypyx9V9j6dL1c3YIdIGP0
+Iufd9kn/4jpXoecV+gxp7shhxBeTEcosSmqwZUrxLc3kN9IXu1bbohgOmLDlXq1Y
+j/tk2+MgNiessBStTVBilCODLhsAwcbZRWoti9tN9INa0xqtpcXVw23JVXmtZZLV
+dScxTBOWZK5eFPWuC5vC0kOFNTC+ooBlYZo52ttfHr87JnqD0Dm0g7VSZha2oTPr
+xy8FlHqHiajlWDelDjAAf0BnB0j/u6lv4KATLOa+Dx/pa0inv68zsFJYdmIDNkdL
+PSdWetlpKBd/RgZkqGE/g+1omdKE48Go00uvivO5BBZbR2Y/X2rJGUFwaAY2xLSW
+YZDuXiATH86Eo30hYbmTUeITvISnvgFGT8W03f7jojuDexbbuekgPoMi4kdjkvik
+NGLsX3uedWe80VGhEdiw1sISX9PIS4hzK4nFIQcvoc8jJmULfRlxGsvcdmgDQctB
+bX2dy70Kjh3fUeZJ9wM7l32oq2ifMNX+Z0tJHnfV/26ynJGsHgP2HdHlwpyoEpP1
+5uOIGsK34w4cFPRQB7aK
+=Ycym
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/skey/skey-1.1.5-r8.ebuild b/sys-auth/skey/skey-1.1.5-r8.ebuild
new file mode 100644
index 000000000000..974b596dd255
--- /dev/null
+++ b/sys-auth/skey/skey-1.1.5-r8.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/skey/skey-1.1.5-r8.ebuild,v 1.1 2012/01/04 23:12:01 ulm Exp $
+
+EAPI=4
+
+inherit flag-o-matic eutils toolchain-funcs
+
+DESCRIPTION="Linux Port of OpenBSD Single-key Password System"
+HOMEPAGE="http://www.openbsd.org/faq/faq8.html#SKey"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	mirror://gentoo/skey-1.1.5-patches-1.tar.xz"
+
+LICENSE="BSD MIT RSA-MD4 RSA-MD5 BEER-WARE"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="static-libs"
+
+DEPEND="dev-lang/perl
+	app-arch/xz-utils"
+RDEPEND="dev-lang/perl
+	sys-libs/cracklib"
+
+src_prepare() {
+	EPATCH_SUFFIX=patch epatch
+}
+
+src_configure() {
+	tc-export CC
+	econf --sysconfdir=/etc/skey
+}
+
+src_install() {
+	dobin skey skeyinit skeyinfo
+	newbin skeyaudit.sh skeyaudit
+	newsbin skeyprune.pl skeyprune
+
+	dosym skey /usr/bin/otp-md4
+	dosym skey /usr/bin/otp-md5
+	dosym skey /usr/bin/otp-sha1
+
+	use static-libs && dolib.a libskey.a
+
+	doman skey.1 skeyaudit.1 skeyinfo.1 skeyinit.1 skey.3 skeyprune.8
+
+	into /
+	dolib.so libskey.so.1.1.5 libskey.so.1.1 libskey.so.1 libskey.so
+	gen_usr_ldscript libskey.so
+
+	insinto /usr/include
+	doins skey.h
+
+	keepdir /etc/skey
+
+	# only root needs to have access to these files.
+	fperms g-rx,o-rx /etc/skey
+
+	# skeyinit and skeyinfo must be suid root so users
+	# can generate their passwords.
+	fperms u+s,og-r /usr/bin/skeyinit /usr/bin/skeyinfo
+
+	dodoc README CHANGES
+}
+
+pkg_postinst() {
+	# do not include /etc/skey/skeykeys in the package, as quickpkg
+	# may package sensitive information.
+	# This also fixes the etc-update issue with #64974.
+
+	# skeyinit will not function if this file is not present.
+	touch /etc/skey/skeykeys
+
+	# these permissions are applied by the skey system if missing.
+	chmod 0600 /etc/skey/skeykeys
+
+	elog "For an introduction into using s/key authentication, take"
+	elog "a look at the EXAMPLES section from the skey(1) manpage."
+}