remove newer version and put epunt_cxx into 2.8.3-r1

(Portage version: 2.0.51.21)

4 files changed, 1 insertions, 118 deletions

diff --git a/sys-libs/cracklib/ChangeLog b/sys-libs/cracklib/ChangeLog
index ae27937227fa..30525fcfebcd 100644
--- a/sys-libs/cracklib/ChangeLog
+++ b/sys-libs/cracklib/ChangeLog
@@ -1,12 +1,6 @@
 # ChangeLog for sys-libs/cracklib
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.69 2005/05/02 21:45:44 solar Exp $
-
-*cracklib-2.8.3-r2 (02 May 2005)
-
-  02 May 2005; <solar@gentoo.org> +files/cracklib-2.8.3-packer-uint.patch,
-  +cracklib-2.8.3-r2.ebuild:
-  - added epunt_cxx and fixed a uclibc error reported by psm
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.70 2005/05/03 01:47:56 vapier Exp $
 
 *cracklib-2.8.3-r1 (16 Apr 2005)
 
diff --git a/sys-libs/cracklib/cracklib-2.8.3-r2.ebuild b/sys-libs/cracklib/cracklib-2.8.3-r2.ebuild
deleted file mode 100644
index d9e726b7f84d..000000000000
--- a/sys-libs/cracklib/cracklib-2.8.3-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.8.3-r2.ebuild,v 1.1 2005/05/02 21:45:44 solar Exp $
-
-inherit eutils toolchain-funcs
-
-MY_P=${P/_}
-DESCRIPTION="Password Checking Library"
-HOMEPAGE="http://sourceforge.net/projects/cracklib"
-SRC_URI="mirror://sourceforge/cracklib/${MY_P}.tar.gz"
-
-LICENSE="CRACKLIB"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="uclibc"
-
-DEPEND=""
-RDEPEND="app-arch/gzip"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/cracklib-2.8.3-dictname.patch
-	epatch "${FILESDIR}"/cracklib-2.8.3-packer-defines.patch
-
-	use uclibc && epatch "${FILESDIR}"/cracklib-2.8.3-packer-uint.patch
-
-	epunt_cxx
-}
-
-src_compile() {
-	econf --disable-dependency-tracking --with-pic || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	rm -r "${D}"/usr/share/cracklib
-
-	insinto /usr/include
-	doins lib/packer.h || die "doins packer.h"
-
-	# move shared libs to /
-	dodir /$(get_libdir)
-	mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir)/ || die "could not move shared"
-	gen_usr_ldscript libcrack.so
-
-	insinto /usr/share/dict
-	doins dicts/cracklib-small || die "word dict"
-	tc-is-cross-compiler \
-		|| export PATH=${D}/usr/sbin:${PATH} LD_LIBRARY_PATH=${D}/$(get_libdir)
-	cracklib-format dicts/cracklib-small \
-		| cracklib-packer "${D}"/usr/$(get_libdir)/cracklib_dict \
-		|| die "couldnt create dict"
-
-	dodoc AUTHORS ChangeLog NEWS README*
-}
diff --git a/sys-libs/cracklib/files/cracklib-2.8.3-packer-uint.patch b/sys-libs/cracklib/files/cracklib-2.8.3-packer-uint.patch
deleted file mode 100644
index 7372f15d1842..000000000000
--- a/sys-libs/cracklib/files/cracklib-2.8.3-packer-uint.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- cracklib-2.8.3.orig/lib/packer.h	2005-05-02 15:48:26.000000000 -0400
-+++ cracklib-2.8.3/lib/packer.h	2005-05-02 15:20:01.000000000 -0400
-@@ -31,18 +31,18 @@
- #if defined(HAVE_STDINT_H)
- #include <stdint.h>
- #else
--typedef unsigned int uint32_t;
--typedef unsigned short uint16_t;
-+typedef unsigned int u_int32_t;
-+typedef unsigned short u_int16_t;
- #endif
- #endif
- 
- 
- struct pi_header
- {
--    uint32_t pih_magic;
--    uint32_t pih_numwords;
--    uint16_t pih_blocklen;
--    uint16_t pih_pad;
-+    u_int32_t pih_magic;
-+    u_int32_t pih_numwords;
-+    u_int16_t pih_blocklen;
-+    u_int16_t pih_pad;
- };
- 
- typedef struct
-@@ -51,12 +51,12 @@
-     FILE *dfp;
-     FILE *wfp;
- 
--    uint32_t flags;
-+    u_int32_t flags;
- #define PFOR_WRITE	0x0001
- #define PFOR_FLUSH	0x0002
- #define PFOR_USEHWMS	0x0004
- 
--    uint32_t hwms[256];
-+    u_int32_t hwms[256];
- 
-     struct pi_header header;
- 
-@@ -68,7 +68,7 @@
- #define PIH_MAGIC 0x70775631
- 
- /* Internal routines */
--extern char *GetPW(PWDICT *pwp, uint32_t number);
-+extern char *GetPW(PWDICT *pwp, u_int32_t number);
- 
- #else
- 
diff --git a/sys-libs/cracklib/files/digest-cracklib-2.8.3-r2 b/sys-libs/cracklib/files/digest-cracklib-2.8.3-r2
deleted file mode 100644
index 438a526b528d..000000000000
--- a/sys-libs/cracklib/files/digest-cracklib-2.8.3-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 13f82f75b892cbd0ba7cb9069e307006 cracklib-2.8.3.tar.gz 480439