make it so parallel make works; tidy

3 files changed, 55 insertions, 20 deletions

diff --git a/sys-libs/cracklib/ChangeLog b/sys-libs/cracklib/ChangeLog
index 619166456f57..4346148718aa 100644
--- a/sys-libs/cracklib/ChangeLog
+++ b/sys-libs/cracklib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/cracklib
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.59 2004/12/07 09:10:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.60 2004/12/07 09:46:11 mr_bones_ Exp $
+
+  07 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/cracklib-2.7-parallel-make.patch, cracklib-2.7-r10.ebuild:
+  make it so parallel make works; tidy
 
   07 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org>
   -cracklib-2.7-r7.ebuild, -cracklib-2.7-r8.ebuild, -cracklib-2.7-r9.ebuild:
diff --git a/sys-libs/cracklib/cracklib-2.7-r10.ebuild b/sys-libs/cracklib/cracklib-2.7-r10.ebuild
index e6b8c47b80de..8c6c24995a00 100644
--- a/sys-libs/cracklib/cracklib-2.7-r10.ebuild
+++ b/sys-libs/cracklib/cracklib-2.7-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.7-r10.ebuild,v 1.8 2004/12/06 06:18:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.7-r10.ebuild,v 1.9 2004/12/07 09:46:11 mr_bones_ Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -25,14 +25,15 @@ S="${WORKDIR}/${MY_P}"
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
-	epatch ${FILESDIR}/${P}-redhat.patch
-	epatch ${FILESDIR}/${P}-gentoo-new.diff
-	epatch ${FILESDIR}/${P}-static-lib.patch
-	epatch ${FILESDIR}/${P}-libdir.patch
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-redhat.patch"
+	epatch "${FILESDIR}/${P}-gentoo-new.diff"
+	epatch "${FILESDIR}/${P}-static-lib.patch"
+	epatch "${FILESDIR}/${P}-libdir.patch"
 
 	# add compressed dict support, taken from shadow-4.0.4.1
 	use uclibc && epatch ${FILESDIR}/${PN}-${PV}-gzip.patch
+	epatch "${FILESDIR}/${P}-parallel-make.patch"
 
 	sed -i \
 		-e 's|/usr/dict/words|/usr/share/dict/words|' \
@@ -55,24 +56,26 @@ src_install() {
 	dodir /usr/{$(get_libdir),sbin,include,lib} /$(get_libdir)
 	keepdir /usr/share/cracklib
 
-	make DESTDIR="${D}" install LIBDIR=/usr/$(get_libdir) || die "make install failed"
+	make DESTDIR="${D}" install LIBDIR="/usr/$(get_libdir)" \
+		|| die "make install failed"
 
 	# Needed by pam
-	if [ ! -f "${D}/usr/$(get_libdir)/libcrack.a" ] && use pam
-	then
+	if [ ! -f "${D}/usr/$(get_libdir)/libcrack.a" ] && use pam ; then
 		eerror "Could not find libcrack.a which is needed by core components!"
 		die "Could not find libcrack.a which is needed by core components!"
 	fi
 
 	# correct permissions on static lib
-	[ -x ${D}/usr/$(get_libdir)/libcrack.a ] && fperms 644 usr/$(get_libdir)/libcrack.a
+	if [ -x "${D}/usr/$(get_libdir)/libcrack.a" ] ; then
+		fperms 644 "/usr/$(get_libdir)/libcrack.a"
+	fi
 
 	# put libcrack.so.2.7 in /lib for cases where /usr isn't available yet
-	mv ${D}/usr/$(get_libdir)/libcrack.so* ${D}/$(get_libdir)
+	mv "${D}/usr/$(get_libdir)/libcrack.so"* "${D}/$(get_libdir)" \
+		|| die "mv failed"
 
 	# This link is needed and not created. :| bug #9611
-	cd ${D}/$(get_libdir)
-	dosym libcrack.so.2.7 /$(get_libdir)/libcrack.so.2
+	dosym libcrack.so.2.7 "/$(get_libdir)/libcrack.so.2"
 
 	## remove it, if not needed
 	##use pam || rm -f ${D}/usr/lib/libcrack.a
@@ -80,13 +83,11 @@ src_install() {
 	# it's possible that pam is NOT in the USE flag at the time, and will be
 	# later on only.
 
-	cd ${S}
-
-	cp ${S}/cracklib/packer.h ${D}/usr/include
+	cp "${S}/cracklib/packer.h" "${D}/usr/include" || die "cp failed"
 	#fix the permissions on it as they may be wrong in some cases
-	fperms 644 usr/include/packer.h
+	fperms 644 /usr/include/packer.h
 
-	preplib /usr/$(get_libdir) /$(get_libdir)
+	preplib "/usr/$(get_libdir)" "/$(get_libdir)"
 
-	dodoc HISTORY LICENCE MANIFEST POSTER README
+	dodoc "${S}/"{HISTORY,MANIFEST,POSTER,README}
 }
diff --git a/sys-libs/cracklib/files/cracklib-2.7-parallel-make.patch b/sys-libs/cracklib/files/cracklib-2.7-parallel-make.patch
new file mode 100644
index 000000000000..42c0f3592a9e
--- /dev/null
+++ b/sys-libs/cracklib/files/cracklib-2.7-parallel-make.patch
@@ -0,0 +1,30 @@
+--- Makefile.orig	2004-12-07 01:17:53.000000000 -0800
++++ Makefile	2004-12-07 01:34:09.000000000 -0800
+@@ -31,21 +31,17 @@
+ 	@echo "you evidently don't know what you're doing. go read the README"
+ 
+ all:
+-	( cd cracklib && make && exit $$? )
+-	( cd util && make DICTPATH=$(DICTPATH) && exit $$? )
+-###	( cd passwd && make DICTPATH=$(DICTPATH) passwd && exit $$? )
+-###	touch all
++	$(MAKE) -C cracklib
++	$(MAKE) DICTPATH=$(DICTPATH) -C util
+ 
+ clean:
+-	-( cd cracklib && make clean && exit $$? )
+-	-( cd util && make clean && exit $$? )
+-###	-( cd passwd && make clean && exit $$? )
++	$(MAKE) -C cracklib clean
++	$(MAKE) -C util clean
+ 	-rm -f all installed Part* *.BAK *.bak *~
+ 
+ install: all
+-	( cd cracklib && make install && exit $$? )
+-	( cd util && make install && exit $$? )
++	$(MAKE) -C cracklib install
++	$(MAKE) -C util install
+ 	@echo 'if "sort" dies from lack of space, see "util/mkdict"'
+ 	util/mkdict $(SRCDICTS) | LD_LIBRARY_PATH=cracklib util/packer $(DESTDIR)$(DICTPATH)
+ 	touch installed
+-###	@echo 'now go install passwd/passwd where you want it'