Make cracklib support optional through USE flag

(Portage version: 2.1.2_pre3-r1)

6 files changed, 26 insertions, 21 deletions

diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog
index c3f46392a8d8..3c7a976abaa0 100644
--- a/sys-apps/shadow/ChangeLog
+++ b/sys-apps/shadow/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/shadow
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.159 2006/08/04 13:14:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.160 2006/10/17 14:21:36 dsd Exp $
+
+  17 Oct 2006; Daniel Drake <dsd@gentoo.org> shadow-4.0.15-r2.ebuild,
+  shadow-4.0.16-r2.ebuild, shadow-4.0.17.ebuild, shadow-4.0.17-r1.ebuild,
+  shadow-4.0.18.1.ebuild:
+  Make cracklib support optional through USE flag
 
 *shadow-4.0.18.1 (04 Aug 2006)
 
diff --git a/sys-apps/shadow/shadow-4.0.15-r2.ebuild b/sys-apps/shadow/shadow-4.0.15-r2.ebuild
index 8e01e43e3f95..c4ca34298b09 100644
--- a/sys-apps/shadow/shadow-4.0.15-r2.ebuild
+++ b/sys-apps/shadow/shadow-4.0.15-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.15-r2.ebuild,v 1.11 2006/07/09 03:58:39 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.15-r2.ebuild,v 1.12 2006/10/17 14:21:36 dsd Exp $
 
 inherit eutils libtool toolchain-funcs flag-o-matic autotools pam
 
@@ -14,9 +14,9 @@ SRC_URI="ftp://ftp.pld.org.pl/software/${PN}/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
-IUSE="nls pam selinux skey nousuid"
+IUSE="nls pam selinux skey nousuid cracklib"
 
-RDEPEND=">=sys-libs/cracklib-2.7-r3
+RDEPEND="cracklib? ( >=sys-libs/cracklib-2.7-r3 )
 	pam? ( virtual/pam )
 	!sys-apps/pam-login
 	skey? ( app-admin/skey )
@@ -71,9 +71,9 @@ src_compile() {
 	econf \
 		--disable-desrpc \
 		--with-libcrypt \
-		--with-libcrack \
 		--enable-shared=no \
 		--enable-static=yes \
+		$(use_with cracklib libcrack) \
 		$(use_with pam libpam) \
 		$(use_with skey) \
 		$(use_with selinux) \
diff --git a/sys-apps/shadow/shadow-4.0.16-r2.ebuild b/sys-apps/shadow/shadow-4.0.16-r2.ebuild
index 5bbc44700cf2..d8ac3852b5c3 100644
--- a/sys-apps/shadow/shadow-4.0.16-r2.ebuild
+++ b/sys-apps/shadow/shadow-4.0.16-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.16-r2.ebuild,v 1.1 2006/07/06 01:31:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.16-r2.ebuild,v 1.2 2006/10/17 14:21:36 dsd Exp $
 
 inherit eutils libtool toolchain-funcs flag-o-matic autotools pam
 
@@ -14,9 +14,9 @@ SRC_URI="ftp://ftp.pld.org.pl/software/${PN}/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="nls pam selinux skey nousuid"
+IUSE="nls pam selinux skey nousuid cracklib"
 
-RDEPEND=">=sys-libs/cracklib-2.7-r3
+RDEPEND="cracklib? ( >=sys-libs/cracklib-2.7-r3 )
 	pam? ( virtual/pam )
 	!sys-apps/pam-login
 	skey? ( app-admin/skey )
@@ -73,9 +73,9 @@ src_compile() {
 	econf \
 		--disable-desrpc \
 		--with-libcrypt \
-		--with-libcrack \
 		--enable-shared=no \
 		--enable-static=yes \
+		$(use_with cracklib libcrack) \
 		$(use_with pam libpam) \
 		$(use_with skey) \
 		$(use_with selinux) \
diff --git a/sys-apps/shadow/shadow-4.0.17-r1.ebuild b/sys-apps/shadow/shadow-4.0.17-r1.ebuild
index c35c520b0c7c..21e60b5bfc64 100644
--- a/sys-apps/shadow/shadow-4.0.17-r1.ebuild
+++ b/sys-apps/shadow/shadow-4.0.17-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.17-r1.ebuild,v 1.3 2006/07/19 16:30:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.17-r1.ebuild,v 1.4 2006/10/17 14:21:36 dsd Exp $
 
 inherit eutils libtool toolchain-funcs flag-o-matic autotools pam
 
@@ -11,9 +11,9 @@ SRC_URI="ftp://ftp.pld.org.pl/software/${PN}/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="nls pam selinux skey nousuid"
+IUSE="nls pam selinux skey nousuid cracklib"
 
-RDEPEND=">=sys-libs/cracklib-2.7-r3
+RDEPEND="cracklib? ( >=sys-libs/cracklib-2.7-r3 )
 	pam? ( virtual/pam )
 	!sys-apps/pam-login
 	skey? ( app-admin/skey )
@@ -70,9 +70,9 @@ src_compile() {
 	econf \
 		--disable-desrpc \
 		--with-libcrypt \
-		--with-libcrack \
 		--enable-shared=no \
 		--enable-static=yes \
+		$(use_with cracklib libcrack) \
 		$(use_with pam libpam) \
 		$(use_with skey) \
 		$(use_with selinux) \
diff --git a/sys-apps/shadow/shadow-4.0.17.ebuild b/sys-apps/shadow/shadow-4.0.17.ebuild
index 1fdeb265d233..5ed189106f24 100644
--- a/sys-apps/shadow/shadow-4.0.17.ebuild
+++ b/sys-apps/shadow/shadow-4.0.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.17.ebuild,v 1.2 2006/07/15 04:55:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.17.ebuild,v 1.3 2006/10/17 14:21:36 dsd Exp $
 
 inherit eutils libtool toolchain-funcs flag-o-matic autotools pam
 
@@ -14,9 +14,9 @@ SRC_URI="ftp://ftp.pld.org.pl/software/${PN}/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="nls pam selinux skey nousuid"
+IUSE="nls pam selinux skey nousuid cracklib"
 
-RDEPEND=">=sys-libs/cracklib-2.7-r3
+RDEPEND="cracklib? ( >=sys-libs/cracklib-2.7-r3 )
 	pam? ( virtual/pam )
 	!sys-apps/pam-login
 	skey? ( app-admin/skey )
@@ -73,9 +73,9 @@ src_compile() {
 	econf \
 		--disable-desrpc \
 		--with-libcrypt \
-		--with-libcrack \
 		--enable-shared=no \
 		--enable-static=yes \
+		$(use_with cracklib libcrack) \
 		$(use_with pam libpam) \
 		$(use_with skey) \
 		$(use_with selinux) \
diff --git a/sys-apps/shadow/shadow-4.0.18.1.ebuild b/sys-apps/shadow/shadow-4.0.18.1.ebuild
index 93bc2ec7977f..b6a4b299fe9d 100644
--- a/sys-apps/shadow/shadow-4.0.18.1.ebuild
+++ b/sys-apps/shadow/shadow-4.0.18.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.18.1.ebuild,v 1.1 2006/08/04 13:14:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.18.1.ebuild,v 1.2 2006/10/17 14:21:36 dsd Exp $
 
 inherit eutils libtool toolchain-funcs flag-o-matic autotools pam
 
@@ -11,9 +11,9 @@ SRC_URI="ftp://ftp.pld.org.pl/software/${PN}/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="nls pam selinux skey nousuid"
+IUSE="nls pam selinux skey nousuid cracklib"
 
-RDEPEND=">=sys-libs/cracklib-2.7-r3
+RDEPEND="cracklib? ( >=sys-libs/cracklib-2.7-r3 )
 	pam? ( virtual/pam )
 	!sys-apps/pam-login
 	skey? ( app-admin/skey )
@@ -67,9 +67,9 @@ src_compile() {
 	econf \
 		--disable-desrpc \
 		--with-libcrypt \
-		--with-libcrack \
 		--enable-shared=no \
 		--enable-static=yes \
+		$(use_with cracklib libcrack) \
 		$(use_with pam libpam) \
 		$(use_with skey) \
 		$(use_with selinux) \