cleanup

17 files changed, 14 insertions, 322 deletions

diff --git a/sys-libs/cracklib/ChangeLog b/sys-libs/cracklib/ChangeLog
index 7f08344dfeb6..5d12fec8e2ed 100644
--- a/sys-libs/cracklib/ChangeLog
+++ b/sys-libs/cracklib/ChangeLog
@@ -1,14 +1,20 @@
 # ChangeLog for sys-libs/cracklib
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.11 2003/02/09 16:51:07 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.12 2003/02/11 11:32:09 seemant Exp $
+
+*cracklib-2.7-r6 (25 Oct 2002)
+
+  10 Feb 2003; Seemant Kulleen <seemant@gentoo.org> :
+
+  removed old ebuilds, removed the no-longer-used precompiled dicts,
+  removed an unused patch; using epatch from eutils instead.
 
   09 Feb 2003; Guy Martin <gmsoft@gentoo.org> cracklib-2.7-r6.ebuild :
   Added hppa to keywords.
 
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : 
+  changed sparc ~sparc keywords
  
-*cracklib-2.7-r6 (25 Oct 2002)
-
   31 Jan 2003; Ryan Phillips <rphillips@gentoo.org> :
   Install packer.h into /usr/include
   
diff --git a/sys-libs/cracklib/cracklib-2.7-r2.ebuild b/sys-libs/cracklib/cracklib-2.7-r2.ebuild
deleted file mode 100644
index be63a7d4785c..000000000000
--- a/sys-libs/cracklib/cracklib-2.7-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.7-r2.ebuild,v 1.9 2002/10/04 06:36:36 vapier Exp $
-
-A=cracklib2_${PV}.orig.tar.gz
-A0=${P}-redhat.patch
-S=${WORKDIR}/cracklib,${PV}
-DESCRIPTION="Cracklib"
-SRC_URI="ftp://ftp.debian.org/debian/dists/potato/main/source/utils/${A}"
-LICENSE="CRACKLIB"
-KEYWORDS="x86 -ppc"
-SLOT="0"
-HOMEPAGE="http://www.users.dircon.co.uk/~crypto/"
-
-DEPEND="virtual/glibc"
-
-src_unpack() {
-
-  unpack ${A}
-  cd ${S}
-  patch -p1 <${FILESDIR}/${A0}
-  patch -p1 <${FILESDIR}/${P}-gentoo.diff
-
-}
-
-src_compile() {
-
-  # Parallel make does not work for 2.7
-  try make all
-
-}
-
-src_install() {
-
-  dodir /usr/lib
-  dodir /usr/sbin
-  dodir /usr/include
-  dodir /usr/share/cracklib
-
-  try make DESTDIR=${D} install
-
-  mv ${D}/usr/lib ${D}
-  preplib /
-
-  dodoc HISTORY LICENCE MANIFEST POSTER README
-
-}
diff --git a/sys-libs/cracklib/cracklib-2.7-r3.ebuild b/sys-libs/cracklib/cracklib-2.7-r3.ebuild
deleted file mode 100644
index 4c17ee1ee4c3..000000000000
--- a/sys-libs/cracklib/cracklib-2.7-r3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.7-r3.ebuild,v 1.8 2002/10/04 06:36:38 vapier Exp $
-
-S=${WORKDIR}/cracklib,${PV}
-DESCRIPTION="Cracklib"
-SRC_URI="ftp://ftp.debian.org/debian/dists/potato/main/source/utils/cracklib2_${PV}.orig.tar.gz"
-LICENSE="CRACKLIB"
-KEYWORDS="x86 -ppc"
-SLOT="0"
-HOMEPAGE="http://www.users.dircon.co.uk/~crypto/"
-
-DEPEND="virtual/glibc"
-
-src_unpack() {
-
-	unpack ${A}
-  
-	cd ${S}
-	patch -p1 <${FILESDIR}/${P}-redhat.patch || die
-	patch -p1 <${FILESDIR}/${P}-gentoo.diff || die
-}
-
-src_compile() {
-
-	# Parallel make does not work for 2.7
-	make all
-}
-
-src_install() {
-
-	dodir /usr/{lib,sbin,include} /usr/share/cracklib
-
-	make DESTDIR=${D} install || die
-
-	mv ${D}/usr/lib ${D}
-	preplib /
-
-	insinto /usr/lib
-	doins ${FILESDIR}/dict/cracklib_dict.*
-
-	dodoc HISTORY LICENCE MANIFEST POSTER README
-}
-
diff --git a/sys-libs/cracklib/cracklib-2.7-r4.ebuild b/sys-libs/cracklib/cracklib-2.7-r4.ebuild
deleted file mode 100644
index 28c7a28f4abf..000000000000
--- a/sys-libs/cracklib/cracklib-2.7-r4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.7-r4.ebuild,v 1.10 2002/12/09 04:37:29 manson Exp $
-
-S=${WORKDIR}/cracklib,${PV}
-DESCRIPTION="Cracklib"
-SRC_URI="ftp://ftp.debian.org/debian/dists/potato/main/source/utils/cracklib2_${PV}.orig.tar.gz"
-LICENSE="CRACKLIB"
-KEYWORDS="x86 -ppc sparc "
-SLOT="0"
-HOMEPAGE="http://www.users.dircon.co.uk/~crypto/"
-
-DEPEND="virtual/glibc"
-
-src_unpack() {
-
-	unpack ${A}
-  
-	cd ${S}
-	patch -p1 <${FILESDIR}/${P}-redhat.patch || die
-	patch -p1 <${FILESDIR}/${P}-gentoo.diff || die
-}
-
-src_compile() {
-
-	# Parallel make does not work for 2.7
-	make all
-}
-
-src_install() {
-
-	case $ARCH in
-		sparc*)
-				DICTS=dict-sparc
-				;;
-		*)
-				DICTS=dict
-				;;
-	esac
-
-	dodir /usr/{lib,sbin,include} /usr/share/cracklib
-
-	make DESTDIR=${D} install || die
-
-	mv ${D}/usr/lib ${D}
-	preplib /
-
-	insinto /usr/lib
-	doins ${FILESDIR}/${DICTS}/cracklib_dict.*
-
-	dodoc HISTORY LICENCE MANIFEST POSTER README
-}
-
diff --git a/sys-libs/cracklib/cracklib-2.7-r5.ebuild b/sys-libs/cracklib/cracklib-2.7-r5.ebuild
deleted file mode 100644
index 4e2e5676749e..000000000000
--- a/sys-libs/cracklib/cracklib-2.7-r5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.7-r5.ebuild,v 1.13 2002/12/15 10:44:24 bjb Exp $
-
-S=${WORKDIR}/cracklib,${PV}
-DESCRIPTION="Cracklib"
-SRC_URI="ftp://ftp.debian.org/debian/dists/potato/main/source/utils/cracklib2_${PV}.orig.tar.gz"
-DEPEND="virtual/glibc sys-apps/miscfiles"
-LICENSE="CRACKLIB"
-KEYWORDS="x86 ppc sparc alpha"
-SLOT="0"
-HOMEPAGE="http://www.users.dircon.co.uk/~crypto/"
-
-src_unpack() {
-
- 	unpack ${A}
-	cd ${S}
-	patch -p1 <${FILESDIR}/${P}-redhat.patch || die
-	patch -p1 <${FILESDIR}/${P}-gentoo-new.diff || die
-}
-
-src_compile() {
-	# Parallel make does not work for 2.7
-	make all || die
-}
-
-src_install() {
-
-	dodir /usr/{lib,sbin,include} /usr/share/cracklib
-
-	make DESTDIR=${D} install || die
-
-	preplib /usr/lib
-
-	dodoc HISTORY LICENCE MANIFEST POSTER README
-}
diff --git a/sys-libs/cracklib/cracklib-2.7-r6.ebuild b/sys-libs/cracklib/cracklib-2.7-r6.ebuild
index aab618ca0e9f..cb4a2d89894a 100644
--- a/sys-libs/cracklib/cracklib-2.7-r6.ebuild
+++ b/sys-libs/cracklib/cracklib-2.7-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.7-r6.ebuild,v 1.7 2003/02/11 11:32:09 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.7-r6.ebuild,v 1.8 2003/02/11 11:33:34 seemant Exp $
 
 inherit eutils
 
@@ -32,8 +32,9 @@ src_compile() {
 
 src_install() {
 
-	dodir /usr/{lib,sbin,include} /usr/share/cracklib
-
+	dodir /usr/{lib,sbin,include}
+	keepdir /usr/share/cracklib
+	
 	make DESTDIR=${D} install || die
 
 	# This link is needed and not created. :| bug #9611
diff --git a/sys-libs/cracklib/files/cracklib-2.7-gentoo.diff b/sys-libs/cracklib/files/cracklib-2.7-gentoo.diff
deleted file mode 100644
index 527ea30ac2a7..000000000000
--- a/sys-libs/cracklib/files/cracklib-2.7-gentoo.diff
+++ /dev/null
@@ -1,131 +0,0 @@
-diff -N -r -U3 cracklib,2.7.orig/Makefile cracklib,2.7/Makefile
---- cracklib,2.7.orig/Makefile	Wed Dec 31 11:33:53 1997
-+++ cracklib,2.7/Makefile	Tue Feb 27 16:03:32 2001
-@@ -7,14 +7,21 @@
- ###
- 
- ###
-+# cracklib version
-+MAJOR=2
-+MINOR=7
-+VERSION=$(MAJOR).$(MINOR)
-+export MAJOR MINOR VERSION
-+
-+###
- # set this to the absolute path (less extn) of compressed dict.
- 
--DICTPATH="/usr/local/lib/pw_dict"
-+DICTPATH="/usr/share/cracklib/pw_dict"
- 
- ###
- # Set this to the path of one or more files continaing wordlists.
- 
--SRCDICTS=/usr/dict/words
-+SRCDICTS=/usr/dict/words /usr/dict/extra.words
- 
- ###
- # If you have installed the cracklib-dicts directory, use this
-@@ -36,7 +43,9 @@
- 	-rm -f all installed Part* *.BAK *.bak *~
- 
- install: all
-+	( cd cracklib && make install && exit $$? )
-+	( cd util && make install && exit $$? )
- 	@echo 'if "sort" dies from lack of space, see "util/mkdict"'
--	util/mkdict $(SRCDICTS) | util/packer $(DICTPATH)
-+	util/mkdict $(SRCDICTS) | LD_LIBRARY_PATH=cracklib util/packer $(DESTDIR)$(DICTPATH)
- 	touch installed
- ###	@echo 'now go install passwd/passwd where you want it'
-diff -N -r -U3 cracklib,2.7.orig/cracklib/Makefile cracklib,2.7/cracklib/Makefile
---- cracklib,2.7.orig/cracklib/Makefile	Sun Dec 14 23:49:21 1997
-+++ cracklib,2.7/cracklib/Makefile	Tue Feb 27 16:03:39 2001
-@@ -6,13 +6,21 @@
- # and upwards.
- ###
- 
--LIB=	libcrack.a
--OBJ=	fascist.o packlib.o rules.o stringlib.o
--CFLAGS= -O -I../cracklib -DIN_CRACKLIB
-+LIB	= libcrack.so
-+OBJ	= fascist.o packlib.o rules.o stringlib.o
-+CFLAGS += -g -I../cracklib -DIN_CRACKLIB -fPIC
-+LD	= ld
- 
--$(LIB):	$(OBJ)
--	ar rv $(LIB) $?
--	-ranlib $(LIB)
-+$(LIB):	$(OBJ) Makefile
-+	$(LD) -shared -soname $(LIB).$(MAJOR) -o $(LIB).$(VERSION) $(OBJ) -lc
-+	rm -f $(LIB).$(MAJOR) $(LIB)
-+	ln -s $(LIB).$(VERSION) $(LIB).$(MAJOR)
-+	ln -s $(LIB).$(MAJOR) $(LIB)
- 
- clean:
--	-rm -f $(OBJ) $(LIB) *~
-+	-rm -f $(OBJ) $(LIB) $(LIB).$(VERSION) *~
-+
-+install: $(LIB) crack.h
-+	install -m 755 $(LIB).$(VERSION) $(DESTDIR)/usr/lib
-+	ln -sf $(LIB).$(VERSION) $(DESTDIR)/usr/lib/$(LIB)
-+	install -m 644 crack.h $(DESTDIR)/usr/include
-diff -N -r -U3 cracklib,2.7.orig/util/Makefile cracklib,2.7/util/Makefile
---- cracklib,2.7.orig/util/Makefile	Sun Dec 14 23:49:34 1997
-+++ cracklib,2.7/util/Makefile	Tue Feb 27 16:03:46 2001
-@@ -14,27 +14,31 @@
- #SunOS users (and others?) should consider static linking of their passwd binary
- #CFLAGS= -O -I../cracklib '-DCRACKLIB_DICTPATH="$(DICTPATH)"' -Bstatic
- 
--CFLAGS= -O -I../cracklib '-DCRACKLIB_DICTPATH="$(DICTPATH)"'
--LIBS=	../cracklib/libcrack.a
-+CFLAGS += -I../cracklib '-DCRACKLIB_DICTPATH="$(DICTPATH)"'
-+LDFLAGS	= -L../cracklib -lcrack
-+LIBS	= ../cracklib/libcrack.so
- 
- all:	packer unpacker testnum teststr testlib
- 	touch all
- 
- packer: packer.o $(LIBS)
--	cc $(CFLAGS) -o $@ $@.o $(LIBS)
-+	cc $(CFLAGS) -o $@ $@.o $(LDFLAGS)
- 
- unpacker: unpacker.o $(LIBS)
--	cc $(CFLAGS) -o $@ $@.o $(LIBS)
-+	cc $(CFLAGS) -o $@ $@.o $(LDFLAGS)
- 
- testnum: testnum.o $(LIBS)
--	cc $(CFLAGS) -o $@ $@.o $(LIBS)
-+	cc $(CFLAGS) -o $@ $@.o $(LDFLAGS)
- 
- teststr: teststr.o $(LIBS)
--	cc $(CFLAGS) -o $@ $@.o $(LIBS)
-+	cc $(CFLAGS) -o $@ $@.o $(LDFLAGS)
- 
- testlib: testlib.o $(LIBS)
--	cc $(CFLAGS) -o $@ $@.o $(LIBS)
-+	cc $(CFLAGS) -o $@ $@.o $(LDFLAGS)
- 
- clean:
- 	-rm *.o *~ all
- 	-rm teststr testnum testlib packer unpacker
-+
-+install: all create-cracklib-dict
-+	install -m 755 mkdict packer create-cracklib-dict $(DESTDIR)/usr/sbin
-diff -N -r -U3 cracklib,2.7.orig/util/create-cracklib-dict cracklib,2.7/util/create-cracklib-dict
---- cracklib,2.7.orig/util/create-cracklib-dict	Thu Jan  1 01:00:00 1970
-+++ cracklib,2.7/util/create-cracklib-dict	Tue Feb 27 16:03:51 2001
-@@ -0,0 +1,15 @@
-+#!/bin/sh
-+if [ -z "$*" ]; then
-+    echo "Usage:"
-+    echo "  /usr/sbin/create-cracklib-dict wordlist ..."
-+    echo
-+    echo "This script takes one or more word list files as arguments"
-+    echo "and converts them into cracklib dictionaries for use"
-+    echo "by password checking programs. The results are placed in"
-+    echo "/usr/lib/cracklib_dict.*"
-+    echo
-+    echo "Example:"
-+    echo "/usr/sbin/create-cracklib-dict /usr/dict/words"
-+else
-+    /usr/sbin/mkdict $* | /usr/sbin/packer /usr/share/cracklib/pw_dict
-+fi
diff --git a/sys-libs/cracklib/files/dict-sparc/cracklib_dict.hwm b/sys-libs/cracklib/files/dict-sparc/cracklib_dict.hwm
deleted file mode 100644
index 3659a3838bb4..000000000000
--- a/sys-libs/cracklib/files/dict-sparc/cracklib_dict.hwm
+++ /dev/null
diff --git a/sys-libs/cracklib/files/dict-sparc/cracklib_dict.pwd b/sys-libs/cracklib/files/dict-sparc/cracklib_dict.pwd
deleted file mode 100644
index a0a1806cbf3c..000000000000
--- a/sys-libs/cracklib/files/dict-sparc/cracklib_dict.pwd
+++ /dev/null
diff --git a/sys-libs/cracklib/files/dict-sparc/cracklib_dict.pwi b/sys-libs/cracklib/files/dict-sparc/cracklib_dict.pwi
deleted file mode 100644
index 77eb7292a739..000000000000
--- a/sys-libs/cracklib/files/dict-sparc/cracklib_dict.pwi
+++ /dev/null
diff --git a/sys-libs/cracklib/files/dict/cracklib_dict.hwm b/sys-libs/cracklib/files/dict/cracklib_dict.hwm
deleted file mode 100644
index 2840153c3e93..000000000000
--- a/sys-libs/cracklib/files/dict/cracklib_dict.hwm
+++ /dev/null
diff --git a/sys-libs/cracklib/files/dict/cracklib_dict.pwd b/sys-libs/cracklib/files/dict/cracklib_dict.pwd
deleted file mode 100644
index 46e083386a49..000000000000
--- a/sys-libs/cracklib/files/dict/cracklib_dict.pwd
+++ /dev/null
diff --git a/sys-libs/cracklib/files/dict/cracklib_dict.pwi b/sys-libs/cracklib/files/dict/cracklib_dict.pwi
deleted file mode 100644
index cbb17cfda7e5..000000000000
--- a/sys-libs/cracklib/files/dict/cracklib_dict.pwi
+++ /dev/null
diff --git a/sys-libs/cracklib/files/digest-cracklib-2.7-r2 b/sys-libs/cracklib/files/digest-cracklib-2.7-r2
deleted file mode 100644
index a7b3902bc30f..000000000000
--- a/sys-libs/cracklib/files/digest-cracklib-2.7-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7f810e310c7f2df33d1eaa2b41ab2435 cracklib2_2.7.orig.tar.gz 20901
diff --git a/sys-libs/cracklib/files/digest-cracklib-2.7-r3 b/sys-libs/cracklib/files/digest-cracklib-2.7-r3
deleted file mode 100644
index a7b3902bc30f..000000000000
--- a/sys-libs/cracklib/files/digest-cracklib-2.7-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7f810e310c7f2df33d1eaa2b41ab2435 cracklib2_2.7.orig.tar.gz 20901
diff --git a/sys-libs/cracklib/files/digest-cracklib-2.7-r4 b/sys-libs/cracklib/files/digest-cracklib-2.7-r4
deleted file mode 100644
index a7b3902bc30f..000000000000
--- a/sys-libs/cracklib/files/digest-cracklib-2.7-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7f810e310c7f2df33d1eaa2b41ab2435 cracklib2_2.7.orig.tar.gz 20901
diff --git a/sys-libs/cracklib/files/digest-cracklib-2.7-r5 b/sys-libs/cracklib/files/digest-cracklib-2.7-r5
deleted file mode 100644
index a7b3902bc30f..000000000000
--- a/sys-libs/cracklib/files/digest-cracklib-2.7-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7f810e310c7f2df33d1eaa2b41ab2435 cracklib2_2.7.orig.tar.gz 20901