use the host cracklib utils if need be

diff --git a/sys-libs/cracklib/Manifest b/sys-libs/cracklib/Manifest
index ac16538f3af6cfb21b86652ade6a0668410de62b..7cd4905f65a7c6e09d064ea109f646c3abff2088 100644 (file)
--- a/sys-libs/cracklib/Manifest
+++ b/sys-libs/cracklib/Manifest
@@ -1,11 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 ed745a2759035f4922967b3b287dc48a ChangeLog 8081
-MD5 92aaceba37a026a4e21c6b950c710cf4 cracklib-2.7-r10.ebuild 2823
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 0f7dd7a2fc4289edbdff4a11309585d5 cracklib-2.7-r10.ebuild 2859
 MD5 85783b83e5bfa51190033895cfaf803e files/cracklib-2.7-dec-alpha-compiler.diff 333
 MD5 57ed4f94412bd475a0774c8e0db99712 files/cracklib-2.7-gentoo-new.diff 4235
 MD5 954e8e0d53c6f878366e472a90917356 files/cracklib-2.7-redhat.patch 1224
-MD5 e9edfa4c3852810514a42e43e4f66b4e files/cracklib-2.7-parallel-make.patch 1066
 MD5 69aa6844bbf39d86cde364729ca9f9dd files/cracklib-2.7-static-lib.patch 1328
+MD5 54fd099e82280ba9b2715f7842615654 files/cracklib-2.7-cross-compile.patch 470
 MD5 336ab4f8ce8e3a3955ec8722d32076b4 files/cracklib-2.7-gzip.patch 521
 MD5 f27fad03a3939b6e405193b419b645a4 files/digest-cracklib-2.7-r10 63
 MD5 70692d376ebaca787743b7e54d7dd49e files/cracklib-2.7-libdir.patch 762
+MD5 e9edfa4c3852810514a42e43e4f66b4e files/cracklib-2.7-parallel-make.patch 1066
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBtmbaroRuSHgZdywRAt/SAJ0Y9rZ161B5c29w5EV//LHDOCK9ggCePMbu
+xIO4Mgv+zXIoP/bOfEp9grg=
+=YiPK
+-----END PGP SIGNATURE-----

diff --git a/sys-libs/cracklib/cracklib-2.7-r10.ebuild b/sys-libs/cracklib/cracklib-2.7-r10.ebuild
index 8c6c24995a00b8dfd5c7bea11604aa34231e24f0..25e1cf8c1f4391ff62f7bd23c1ce3a7c111f3766 100644 (file)
--- 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.9 2004/12/07 09:46:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.7-r10.ebuild,v 1.10 2004/12/08 02:28:33 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -25,15 +25,16 @@ 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
+       epatch ${FILESDIR}/${P}-parallel-make.patch
+       epatch ${FILESDIR}/${P}-cross-compile.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|' \
@@ -42,7 +43,8 @@ src_unpack() {
 
        if [ "${ARCH}" = "alpha" -a "${CC}" = "ccc" ] ; then
                sed -i \
-                       -e 's:CFLAGS += -g :CFLAGS += -g3 :' ${S}/cracklib/Makefile \
+                       -e 's:CFLAGS += -g :CFLAGS += -g3 :' \
+                       ${S}/cracklib/Makefile \
                        || die "sed ${S}/cracklib/Makefile failed"
        fi
 }

diff --git a/sys-libs/cracklib/files/cracklib-2.7-cross-compile.patch b/sys-libs/cracklib/files/cracklib-2.7-cross-compile.patch
new file mode 100644 (file)
index 0000000..86af22d
--- /dev/null
+++ b/sys-libs/cracklib/files/cracklib-2.7-cross-compile.patch
@@ -0,0 +1,9 @@
+--- cracklib,2.7/Makefile.orig 2004-12-07 21:39:56.830924520 -0500
++++ cracklib,2.7/Makefile      2004-12-07 21:40:24.097525749 -0500
+@@ -43,5 +43,5 @@
+       $(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)
++      PATH="${PATH}:./util" mkdict $(SRCDICTS) | LD_LIBRARY_PATH=cracklib packer $(DESTDIR)$(DICTPATH)
+       touch installed