Update to EAPI=4 to have USE=static depend on USE=static-libs of all the library packages #443682 by siebz0r.

2 files changed, 29 insertions, 22 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 4ea1b05878d9..522c96551887 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.457 2012/11/16 17:45:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.458 2012/11/19 20:41:05 vapier Exp $
+
+  19 Nov 2012; Mike Frysinger <vapier@gentoo.org> openssh-6.1_p1.ebuild:
+  Update to EAPI=4 to have USE=static depend on USE=static-libs of all the
+  library packages #443682 by siebz0r.
 
   16 Nov 2012; Agostino Sarubbo <ago@gentoo.org> -openssh-5.5_p1-r2.ebuild,
   -openssh-5.6_p1-r2.ebuild, -openssh-5.7_p1-r1.ebuild,
diff --git a/net-misc/openssh/openssh-6.1_p1.ebuild b/net-misc/openssh/openssh-6.1_p1.ebuild
index bd6561639bbb..dc97fb7d4752 100644
--- a/net-misc/openssh/openssh-6.1_p1.ebuild
+++ b/net-misc/openssh/openssh-6.1_p1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.1_p1.ebuild,v 1.6 2012/11/11 21:12:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.1_p1.ebuild,v 1.7 2012/11/19 20:41:05 vapier Exp $
 
-EAPI="2"
+EAPI="4"
 inherit eutils user flag-o-matic multilib autotools pam systemd
 
 # Make it more portable between straight releases
@@ -26,23 +26,26 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="bindist ${HPN_PATCH:++}hpn kerberos ldap libedit pam selinux skey static tcpd X X509"
 
-RDEPEND="pam? ( virtual/pam )
-	kerberos? ( virtual/krb5 )
-	selinux? ( >=sys-libs/libselinux-1.28 )
-	skey? ( >=sys-auth/skey-1.1.5-r1 )
-	ldap? ( net-nds/openldap )
-	libedit? ( dev-libs/libedit )
+LIB_DEPEND="selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
+	skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
+	libedit? ( dev-libs/libedit[static-libs(+)] )
 	>=dev-libs/openssl-0.9.6d:0[bindist=]
-	>=sys-libs/zlib-1.2.3
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	X? ( x11-apps/xauth )
-	userland_GNU? ( virtual/shadow )"
+	dev-libs/openssl[static-libs(+)]
+	>=sys-libs/zlib-1.2.3[static-libs(+)]
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	pam? ( virtual/pam )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )"
 DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
 	virtual/pkgconfig
 	virtual/os-headers
 	sys-devel/autoconf"
 RDEPEND="${RDEPEND}
-	pam? ( >=sys-auth/pambase-20081028 )"
+	pam? ( >=sys-auth/pambase-20081028 )
+	userland_GNU? ( virtual/shadow )
+	X? ( x11-apps/xauth )"
 
 S=${WORKDIR}/${PARCH}
 
@@ -178,9 +181,9 @@ src_configure() {
 }
 
 src_install() {
-	emake install-nokeys DESTDIR="${D}" || die
+	emake install-nokeys DESTDIR="${D}"
 	fperms 600 /etc/ssh/sshd_config
-	dobin contrib/ssh-copy-id || die
+	dobin contrib/ssh-copy-id
 	newinitd "${FILESDIR}"/sshd.rc6.3 sshd
 	newconfd "${FILESDIR}"/sshd.confd sshd
 	keepdir /var/empty
@@ -188,7 +191,7 @@ src_install() {
 	# not all openssl installs support ecc, or are functional #352645
 	if ! grep -q '#define OPENSSL_HAS_ECC 1' config.h ; then
 		elog "dev-libs/openssl was built with 'bindist' - disabling ecdsa support"
-		dosed 's:&& gen_key ecdsa::' /etc/init.d/sshd || die
+		sed -i 's:&& gen_key ecdsa::' "${ED}"/etc/init.d/sshd || die
 	fi
 
 	newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
@@ -198,16 +201,16 @@ src_install() {
 			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
 			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
 			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
-			"${D}"/etc/ssh/sshd_config || die "sed of configuration file failed"
+			"${ED}"/etc/ssh/sshd_config || die "sed of configuration file failed"
 	fi
 
 	# Gentoo tweaks to default config files
-	cat <<-EOF >> "${D}"/etc/ssh/sshd_config
+	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
 
 	# Allow client to pass locale environment variables #367017
 	AcceptEnv LANG LC_*
 	EOF
-	cat <<-EOF >> "${D}"/etc/ssh/ssh_config
+	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
 
 	# Send locale environment variables #367017
 	SendEnv LANG LC_*
@@ -230,8 +233,8 @@ src_install() {
 	diropts -m 0700
 	dodir /etc/skel/.ssh
 
-	systemd_dounit "${FILESDIR}"/sshd.{service,socket} || die
-	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service' || die
+	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
+	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
 }
 
 src_test() {