* closing bug #126995

(Portage version: 2.1_pre7)

5 files changed, 85 insertions, 4 deletions

diff --git a/app-admin/apg/ChangeLog b/app-admin/apg/ChangeLog
index 75f8f5591bba..6fb7f6f8cb17 100644
--- a/app-admin/apg/ChangeLog
+++ b/app-admin/apg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/apg
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apg/ChangeLog,v 1.16 2005/08/03 18:41:51 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apg/ChangeLog,v 1.17 2006/03/25 23:38:05 voxus Exp $
+
+*apg-2.3.0b-r2 (26 Mar 2006)
+
+  26 Mar 2006; Konstantin Arkhipov <voxus@gentoo.org> +apg-2.3.0b-r2.ebuild,
+  +files/apg-glibc-2.4.patch:
+  Closing bug #126995.
 
   03 Aug 2005; Konstantin Arkhipov <voxus@gentoo.org> -apg-2.3.0b.ebuild:
   Cleanup.
diff --git a/app-admin/apg/Manifest b/app-admin/apg/Manifest
index ea34c5c5309d..ab2d1f15016d 100644
--- a/app-admin/apg/Manifest
+++ b/app-admin/apg/Manifest
@@ -1,5 +1,24 @@
+MD5 d241b42efb271c9effd21e9280d7688e ChangeLog 2574
+RMD160 271a4121773bad29f4826c2fecd4ada69164f21b ChangeLog 2574
+SHA256 c60f7032d1e48a59c48dd01507b773f4b0de7723f3ca4ec9adb1977cccdd7603 ChangeLog 2574
 MD5 68e1a1632cd983aa311c0c58e7dec21b apg-2.3.0b-r1.ebuild 998
-MD5 65aa36ef5eebe42d25a15717e8ef5bd2 ChangeLog 2413
-MD5 3d43186fb48e5b87885712431e438a41 metadata.xml 389
-MD5 e9e2739bee97e63a913b1fccbd90df4a files/digest-apg-2.3.0b-r1 62
+RMD160 a1431d17a2eba749575d05e9dee40bd8d5851c47 apg-2.3.0b-r1.ebuild 998
+SHA256 664e92c65b63fd6cab8ff19c511a54eb37878183649017edb53c7a9121bf5ac1 apg-2.3.0b-r1.ebuild 998
+MD5 652e0464d0982b141a2f77d07d58dd6b apg-2.3.0b-r2.ebuild 1045
+RMD160 0ac99e2ba790c94f7b5bdb69a6805d3b5532fc82 apg-2.3.0b-r2.ebuild 1045
+SHA256 34a143d2511ed0ef5e0aafcef92b7ed25effd0537bfc2ef0dd634074cb8b66a6 apg-2.3.0b-r2.ebuild 1045
 MD5 dce62874a145061a44503024bea45cd0 files/apg-2.3.0b-cracklib.patch 925
+RMD160 d1335cd51f86799596bb7d3349049caa6f44204b files/apg-2.3.0b-cracklib.patch 925
+SHA256 fbe7c7761187b358164bc768ab57475d2662bf855d79f285af92de15e007b3da files/apg-2.3.0b-cracklib.patch 925
+MD5 974fa5c90251f2d9b21637301f1fa238 files/apg-glibc-2.4.patch 261
+RMD160 71d148c23339c0d3a4a4913c5be5837df0eb6263 files/apg-glibc-2.4.patch 261
+SHA256 2d9e4deff463ba2419fea45d9942309b6d7ae5e3b32ceb835715bc98791e23cb files/apg-glibc-2.4.patch 261
+MD5 e9e2739bee97e63a913b1fccbd90df4a files/digest-apg-2.3.0b-r1 62
+RMD160 21488dbf7aad2aa8ac375c19c92a66450f648b33 files/digest-apg-2.3.0b-r1 62
+SHA256 d6b064c692533c39cc48824e30388a0c5712c8dab95a277429eee5b8f238ed6b files/digest-apg-2.3.0b-r1 62
+MD5 dc44f4bf1b541fc11f5cee276da1cf02 files/digest-apg-2.3.0b-r2 232
+RMD160 df7053fcbe7fd5c526f00212667bf0742d4aaeaf files/digest-apg-2.3.0b-r2 232
+SHA256 bba6febbb858351c4965e9427b5c5c14c82a64c4ba7fab5e22588bf07bedecfc files/digest-apg-2.3.0b-r2 232
+MD5 3d43186fb48e5b87885712431e438a41 metadata.xml 389
+RMD160 ed839ff6c7cbf1fc1e76d0c067ff45d5d02beae1 metadata.xml 389
+SHA256 f9598ea46753fa2e0a19c1941b9a45b15bbc1ff03a58274438fe88eb7f78fe8c metadata.xml 389
diff --git a/app-admin/apg/apg-2.3.0b-r2.ebuild b/app-admin/apg/apg-2.3.0b-r2.ebuild
new file mode 100644
index 000000000000..69b40a064140
--- /dev/null
+++ b/app-admin/apg/apg-2.3.0b-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2006 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-r2.ebuild,v 1.1 2006/03/25 23:38:05 voxus 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="~amd64 ~hppa ~ppc ~sparc ~x86"
+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
+		epatch ${FILESDIR}/${PN}-glibc-2.4.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/files/apg-glibc-2.4.patch b/app-admin/apg/files/apg-glibc-2.4.patch
new file mode 100644
index 000000000000..be90c6355e66
--- /dev/null
+++ b/app-admin/apg/files/apg-glibc-2.4.patch
@@ -0,0 +1,11 @@
+--- restrict.h.orig	2006-03-26 03:33:50.168661936 +0400
++++ restrict.h	2006-03-26 03:34:10.427582112 +0400
+@@ -33,6 +33,8 @@
+ #ifndef APG_RESTRICT_H
+ #define APG_RESTRICT_H	1
+ 
++#define uint32_t int
++
+ #if defined(APG_USE_CRACKLIB)
+ #include <packer.h>
+ #endif
diff --git a/app-admin/apg/files/digest-apg-2.3.0b-r2 b/app-admin/apg/files/digest-apg-2.3.0b-r2
new file mode 100644
index 000000000000..bfa7c2e787b1
--- /dev/null
+++ b/app-admin/apg/files/digest-apg-2.3.0b-r2
@@ -0,0 +1,3 @@
+MD5 bd82400a5a731070ce895313576afe24 apg-2.3.0b.tar.gz 109995
+RMD160 18f9955d6fdb721bec26613860b312d7fea6fba7 apg-2.3.0b.tar.gz 109995
+SHA256 d1e52029709e2d7f9cb99bedce3e02ee7a63cff7b8e2b4c2bc55b3dc03c28b92 apg-2.3.0b.tar.gz 109995