10 files changed, 75 insertions, 68 deletions
diff --git a/app-admin/apg/ChangeLog b/app-admin/apg/ChangeLog
index 500a2b3f6f12..4181513ce6a0 100644
--- a/app-admin/apg/ChangeLog
+++ b/app-admin/apg/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-admin/apg
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apg/ChangeLog,v 1.10 2004/10/05 02:58:10 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apg/ChangeLog,v 1.11 2004/12/30 21:37:17 seemant Exp $
+
+*apg-2.3.0b-r1 (30 Dec 2004)
+
+  30 Dec 2004; Seemant Kulleen <seemant@gentoo.org>
+  +files/apg-2.3.0b-cracklib.patch, -apg-2.1.0.ebuild, -apg-2.2.3.ebuild,
+  +apg-2.3.0b-r1.ebuild, apg-2.3.0b.ebuild:
+  move 2.3.0b to stable x86, remove crufty versions, and add -r1 which has
+  support for cracklib, thanks to: Conway S. Smith <beolach@comcast.net> in
+  bug #67564
 
   05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> apg-2.3.0b.ebuild:
   Masked apg-2.3.0b.ebuild stable for ppc
diff --git a/app-admin/apg/Manifest b/app-admin/apg/Manifest
index 76460168e55d..3e388e73a828 100644
--- a/app-admin/apg/Manifest
+++ b/app-admin/apg/Manifest
@@ -1,8 +1,7 @@
+MD5 1f2c526ed6db9d2ef4a8b10ce6f79790 apg-2.3.0b-r1.ebuild 979
+MD5 74938762c8e0365e55f7032f158840c0 apg-2.3.0b.ebuild 904
 MD5 c96720cb54bcc0659c4599c40a292335 ChangeLog 1672
-MD5 bf52b0dd544531086935ad994d60eada apg-2.1.0.ebuild 750
-MD5 fdc443134ab8ebe39491ac485e01b830 apg-2.2.3.ebuild 758
-MD5 285f6047b9bf3426b26c813d9a65db99 apg-2.3.0b.ebuild 905
 MD5 da0599d42e03e0b673419962e271fccb metadata.xml 378
-MD5 b9f654502b82146347ed0e63c71b661d files/digest-apg-2.1.0 60
-MD5 add2720d862ea8f1236b4f49a4582765 files/digest-apg-2.2.3 61
+MD5 e9e2739bee97e63a913b1fccbd90df4a files/digest-apg-2.3.0b-r1 62
 MD5 e9e2739bee97e63a913b1fccbd90df4a files/digest-apg-2.3.0b 62
+MD5 dce62874a145061a44503024bea45cd0 files/apg-2.3.0b-cracklib.patch 925
diff --git a/app-admin/apg/apg-2.1.0.ebuild b/app-admin/apg/apg-2.1.0.ebuild
deleted file mode 100644
index cdbd714cb1af..000000000000
--- a/app-admin/apg/apg-2.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apg/apg-2.1.0.ebuild,v 1.6 2004/06/25 16:04:19 vapier Exp $
-
-DESCRIPTION="Another Password Generator"
-HOMEPAGE="http://www.adel.nursat.kz/apg/"
-SRC_URI="http://www.adel.nursat.kz/apg/download/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_compile() {
-	cp Makefile Makefile.orig
-	sed -e 's,^#\(CS_LIBS = -lnsl\)$,\1,' Makefile.orig > Makefile
-
-	emake standalone || die "compile problem"
-}
-
-src_install() {
-	dobin apg apgbfm || die
-	dodoc CHANGES INSTALL README THANKS TODO
-	cd doc
-	doman man/apg.1
-	dodoc APG_TIPS pronun.txt rfc0972.txt  rfc1750.txt
-}
diff --git a/app-admin/apg/apg-2.2.3.ebuild b/app-admin/apg/apg-2.2.3.ebuild
deleted file mode 100644
index afc0f935147c..000000000000
--- a/app-admin/apg/apg-2.2.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apg/apg-2.2.3.ebuild,v 1.6 2004/10/05 01:33:55 pvdabeel Exp $
-
-DESCRIPTION="Another Password Generator"
-HOMEPAGE="http://www.adel.nursat.kz/apg/"
-SRC_URI="http://www.adel.nursat.kz/apg/download/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 ppc ~sparc"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_compile() {
-	cp Makefile Makefile.orig
-	sed -e 's,^#\(CS_LIBS = -lnsl\)$,\1,' Makefile.orig > Makefile
-
-	emake standalone || die "compile problem"
-}
-
-src_install() {
-	dobin apg apgbfm || die
-	dodoc CHANGES INSTALL README THANKS TODO
-	cd doc
-	doman man/apg.1
-	dodoc APG_TIPS pronun.txt rfc0972.txt rfc1750.txt
-}
diff --git a/app-admin/apg/apg-2.3.0b-r1.ebuild b/app-admin/apg/apg-2.3.0b-r1.ebuild
new file mode 100644
index 000000000000..a03bcfa8d3ae
--- /dev/null
+++ b/app-admin/apg/apg-2.3.0b-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apg/apg-2.3.0b-r1.ebuild,v 1.1 2004/12/30 21:37:17 seemant Exp $
+
+inherit eutils
+
+DESCRIPTION="Another Password Generator"
+HOMEPAGE="http://www.adel.nursat.kz/apg/"
+SRC_URI="http://www.adel.nursat.kz/apg/download/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~hppa"
+IUSE="cracklib"
+
+DEPEND="virtual/libc
+	cracklib? ( sys-libs/cracklib )"
+
+src_unpack() {
+	unpack ${A}
+	chmod -R +w ${S}
+	cd ${S}
+	if use cracklib; then
+		epatch ${FILESDIR}/${P}-cracklib.patch
+	fi
+}
+
+src_compile() {
+	sed -i 's,^#\(APG_CS_CLIBS += -lnsl\)$,\1,' Makefile
+
+	emake standalone || die "compile problem"
+	emake -C bfconvert || die "compile problem"
+}
+
+src_install() {
+	dobin apg apgbfm bfconvert/bfconvert || die
+	dodoc CHANGES INSTALL README THANKS TODO
+	cd doc
+	doman man/apg.1 man/apgbfm.1
+	dodoc APG_TIPS pronun.txt rfc0972.txt rfc1750.txt
+}
diff --git a/app-admin/apg/apg-2.3.0b.ebuild b/app-admin/apg/apg-2.3.0b.ebuild
index ecdd8229135d..87643fe302fd 100644
--- a/app-admin/apg/apg-2.3.0b.ebuild
+++ b/app-admin/apg/apg-2.3.0b.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/app-admin/apg/apg-2.3.0b.ebuild,v 1.10 2004/10/05 02:58:10 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apg/apg-2.3.0b.ebuild,v 1.11 2004/12/30 21:37:17 seemant Exp $
 
 DESCRIPTION="Another Password Generator"
 HOMEPAGE="http://www.adel.nursat.kz/apg/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.adel.nursat.kz/apg/download/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ppc ~sparc amd64 hppa"
+KEYWORDS="x86 ppc ~sparc amd64 hppa"
 IUSE=""
 
 DEPEND="virtual/libc"
diff --git a/app-admin/apg/files/apg-2.3.0b-cracklib.patch b/app-admin/apg/files/apg-2.3.0b-cracklib.patch
new file mode 100644
index 000000000000..a1c34a14f5a0
--- /dev/null
+++ b/app-admin/apg/files/apg-2.3.0b-cracklib.patch
@@ -0,0 +1,17 @@
+--- Makefile	2003-08-07 09:40:39.000000000 -0600
++++ Makefile.cracklib	2004-10-14 07:16:17.288530686 -0600
+@@ -44,10 +44,10 @@
+ # If you want to use cracklib for password quality check then you
+ # must uncomment the folowing 4 lines (you must not do this for WIN32)
+ #
+-#CRACKLIB_DICTPATH = "/usr/local/lib/pw_dict"
+-#STANDALONE_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}' -I/usr/local/include -L/usr/local/lib
+-#CLISERV_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}' -I/usr/local/include -L/usr/local/lib
+-#APG_CLIBS += -lcrack
++CRACKLIB_DICTPATH = "/usr/lib/cracklib_dict"
++STANDALONE_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}'
++CLISERV_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}'
++APG_CLIBS += -lcrack
+ 
+ ##################################################################
+ # Support for ANSI X9.17/SHA1 PRNG
diff --git a/app-admin/apg/files/digest-apg-2.1.0 b/app-admin/apg/files/digest-apg-2.1.0
deleted file mode 100644
index 7d1ae425c7aa..000000000000
--- a/app-admin/apg/files/digest-apg-2.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 402769cce2c5ffef9806993d93c5b56d apg-2.1.0.tar.gz 99202
diff --git a/app-admin/apg/files/digest-apg-2.2.3 b/app-admin/apg/files/digest-apg-2.2.3
deleted file mode 100644
index f2579b3bf88d..000000000000
--- a/app-admin/apg/files/digest-apg-2.2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3b3fc4f11e90635519fe627c1137c9ac apg-2.2.3.tar.gz 108186
diff --git a/app-admin/apg/files/digest-apg-2.3.0b-r1 b/app-admin/apg/files/digest-apg-2.3.0b-r1
new file mode 100644
index 000000000000..d0e5c478f6fa
--- /dev/null
+++ b/app-admin/apg/files/digest-apg-2.3.0b-r1
@@ -0,0 +1 @@
+MD5 bd82400a5a731070ce895313576afe24 apg-2.3.0b.tar.gz 109995