gentoo resync : 21.07.2018

5 files changed, 60 insertions, 11 deletions

diff --git a/app-admin/apg/Manifest b/app-admin/apg/Manifest
index 3914e77cd8d7..257d06cc672e 100644
--- a/app-admin/apg/Manifest
+++ b/app-admin/apg/Manifest
@@ -1,6 +1,7 @@
-AUX apg-2.3.0b-cracklib.patch 925 BLAKE2B bcc3579d24a69d6936fd14d78cd2d1a1b3f467eb892faa0e7e1ba170dce41e14e3f8c4ebddf44a28d27cb9825d789e54cfc2332ce48bdb582b8536317566d03f SHA512 19477c54c22d2fff712a8a5822bfa11fbf42a55a27a18eb9d6bdbe38e3c388342bc36f596d4c2e03cfbdb9c4a4c6a35b519b48e909602332e063e41c906889eb
-AUX apg-2.3.0b-crypt_password.patch 836 BLAKE2B 974a8a4d5936cc7b30535746011f34f659f46a7f168ca4b60927ac51d88e16dd7b56a3696f2242a53c871e5d0ecaa47135673b2f6a61d2315e44e2f68ec871fb SHA512 3696ea5cf3ebadd22daf589ee708e1472e6f0d7e569cc479b1ea4e59743a31aa484a254e4c02d908996faab624999db76e443f74dccd2117fdab44e1e7fb8580
-AUX apg-glibc-2.4.patch 261 BLAKE2B 10de29e4200591ab800f3c33a2d2936beb0c3c8812b37c9446ac178277d6a54128b675f61d96d607ff4ddc7f23598d61de69d9a6adc3ed20900cd9d944106989 SHA512 c7a3f388b5132d21caf6d45ad0c987bb9511a9fc4edd9e7f75739c270438d436159603b4eeb554bbc8cafce3329d01b66d11ab6e75f43b8bd2de57a31bd73bf5
+AUX apg-2.3.0b-cracklib.patch 920 BLAKE2B d1b0decd8a35db02ee8132350a04f61ada715e3316113ac0afa98b85602cf62594f392b14710c617426273acaf0d2d01a930b00809ba84d9ba3bf05b3ff9a327 SHA512 11fba45b144b28c613d6c9dc4cd2ed62d18ab306dfe2fb8e347e3d809d80f605096168b770fee70f9205f07f94aa87f8afe183551133431ad387d383a9b093a3
+AUX apg-2.3.0b-crypt_password.patch 844 BLAKE2B c87ccb6002eac2c363a5b35dc033badf3968562956a4f49697c98368293aa98f2420ff56ac742a7308a2373183c3883c5bce30cd1d8cb72f6f788df2891f8275 SHA512 bde5b1bbc4084cd4d2630ea92ed73c970cd217554638d17980c4d56b0da2f55cd7cafbc76b5073bd0415a7698b70df9d357f0c1731353dae46990e9407d7bb94
+AUX apg-glibc-2.4.patch 260 BLAKE2B b30c414ed89f22eb7dc2d0e3b115dbbc0845aba06f2a9dc0dea61fb36d9ccfa231d56959e7f02b3f1fb337654eec5cf2bd60c53ce24e112470c9fc9b9c225680 SHA512 27463b291aee051a4a149664cfd3dea524a34cd88d5cb90c5b4891fe0722aad9993cfd10df555455890ea631d8844d566d23cbb3812f8cb2859e131ea4c42114
 DIST apg-2.3.0b.tar.gz 109995 BLAKE2B 9b4a6141fb7f6e649fe06ed91bda636879a03d6e5e6071267bbb6cd27e63b4588c23ea7902c5b1a74dde8520843566a4f2857a34f4d66020142425e5faf53daf SHA512 3112d2267f2311f960a52fa268b55a5faf0250a4a8c5e7444f0c1326afa2844a476a54befcf79e5b8532d74c53f6f58ffc420591c8c36798dd82b43c14869e1a
 EBUILD apg-2.3.0b-r5.ebuild 1344 BLAKE2B cbdb7df15da6c6b6e08804bc5b9a94124a62c2d10c6873a697047d1ab1bbfd0c94bbfe1c992b3a958b141705c8c3749bd9c13a1b1a7646c8e8e28bf9ce56dbb0 SHA512 69f23df5f60996446721ec5ad11b201fa97cf4a1c2c12e28da17ff855debcb349e293fbba174066aa91fac5f773fe69c1b45b46530bc853dcc4c474699c60cd3
+EBUILD apg-2.3.0b-r6.ebuild 1221 BLAKE2B 3acc8161f0d45fc282dc79bdf6b44baedd682f9cc0e09ddbc422d0081f6545d0adaab73f7ee0beca50599cbe5ba1f13ed091a26058e2e887dcf9a64227485691 SHA512 8d46469a0a3448b4b8a3421d1e0674fe44c672f031d99405a8433f7a2569a73ad773611a1d176625aed7091fcf5e3a415095f6037fce830811e758199d9e9d6a
 MISC metadata.xml 490 BLAKE2B 6daed6930e317bb6b39f21dccd9cc4f08ddc549528076d6948212c7f62fe5d1e981f57c52278ea0fbcfd3fa36b3ce79192d52bc6e91c64940c1285933166735c SHA512 b1c2173415979d73b36b5e1650f27eebb89698f65a75af8351f8f77e762b9e54798a7b2398d6146ec54e975e4dd8ce59efc3b3c803eec863784107b1ce588e9c
diff --git a/app-admin/apg/apg-2.3.0b-r6.ebuild b/app-admin/apg/apg-2.3.0b-r6.ebuild
new file mode 100644
index 000000000000..34ea033ebee5
--- /dev/null
+++ b/app-admin/apg/apg-2.3.0b-r6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Another Password Generator"
+HOMEPAGE="http://www.adel.nursat.kz/apg/"
+SRC_URI="http://www.adel.nursat.kz/apg/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="cracklib"
+
+DEPEND="cracklib? ( sys-libs/cracklib )"
+
+src_prepare() {
+	default
+	if use cracklib; then
+		eapply "${FILESDIR}"/${P}-cracklib.patch
+	fi
+	eapply "${FILESDIR}"/${PN}-glibc-2.4.patch
+	eapply "${FILESDIR}"/${P}-crypt_password.patch
+
+	sed -i 's,^#\(APG_CS_CLIBS += -lnsl\)$,\1,' Makefile \
+		|| die "Sed failed"
+	if [[ ${CHOST} == *-darwin* ]]; then
+		sed -i 's,^APG_CLIBS += -lcrypt,APG_CLIBS += ,' Makefile \
+			|| die "Sed failed"
+	fi
+}
+
+src_compile() {
+	emake \
+		FLAGS="${CFLAGS} ${LDFLAGS}" CFLAGS="${CFLAGS} ${LDFLAGS}" \
+		CC="$(tc-getCC)" standalone
+	emake FLAGS="${CFLAGS} ${LDFLAGS}" CC="$(tc-getCC)" \
+		-C bfconvert
+}
+
+src_install() {
+	dobin apg apgbfm bfconvert/bfconvert
+	dodoc CHANGES INSTALL README THANKS TODO \
+		doc/{APG_TIPS,pronun.txt,rfc0972.txt,rfc1750.txt}
+	doman doc/man/{apg.1,apgbfm.1}
+}
diff --git a/app-admin/apg/files/apg-2.3.0b-cracklib.patch b/app-admin/apg/files/apg-2.3.0b-cracklib.patch
index a1c34a14f5a0..d297495b3211 100644
--- a/app-admin/apg/files/apg-2.3.0b-cracklib.patch
+++ b/app-admin/apg/files/apg-2.3.0b-cracklib.patch
@@ -1,5 +1,5 @@
---- Makefile	2003-08-07 09:40:39.000000000 -0600
-+++ Makefile.cracklib	2004-10-14 07:16:17.288530686 -0600
+--- a/Makefile	2003-08-07 09:40:39.000000000 -0600
++++ b/Makefile	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)
diff --git a/app-admin/apg/files/apg-2.3.0b-crypt_password.patch b/app-admin/apg/files/apg-2.3.0b-crypt_password.patch
index 93f3f152a2b4..64a7fdcb37d3 100644
--- a/app-admin/apg/files/apg-2.3.0b-crypt_password.patch
+++ b/app-admin/apg/files/apg-2.3.0b-crypt_password.patch
@@ -1,5 +1,5 @@
---- restrict.c	2007-03-09 13:48:27.000000000 +0300
-+++ restrict.c	2007-03-09 13:49:31.000000000 +0300
+--- a/restrict.c	2007-03-09 13:48:27.000000000 +0300
++++ b/restrict.c	2007-03-09 13:49:31.000000000 +0300
 @@ -33,6 +33,9 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -10,8 +10,8 @@
  #include "restrict.h"
  extern struct sym smbl[94];
  /*
---- apg.c	2007-03-08 17:32:40.000000000 +0300
-+++ apg.c	2007-03-08 17:34:07.000000000 +0300
+--- a/apg.c	2007-03-08 17:32:40.000000000 +0300
++++ b/apg.c	2007-03-08 17:34:07.000000000 +0300
 @@ -100,6 +100,7 @@
  #else /* CLISERV */
  #if defined(APG_USE_CRACKLIB)
diff --git a/app-admin/apg/files/apg-glibc-2.4.patch b/app-admin/apg/files/apg-glibc-2.4.patch
index be90c6355e66..43b5874fa2b6 100644
--- a/app-admin/apg/files/apg-glibc-2.4.patch
+++ b/app-admin/apg/files/apg-glibc-2.4.patch
@@ -1,5 +1,5 @@
---- restrict.h.orig	2006-03-26 03:33:50.168661936 +0400
-+++ restrict.h	2006-03-26 03:34:10.427582112 +0400
+--- a/restrict.h	2006-03-26 03:33:50.168661936 +0400
++++ b/restrict.h	2006-03-26 03:34:10.427582112 +0400
 @@ -33,6 +33,8 @@
  #ifndef APG_RESTRICT_H
  #define APG_RESTRICT_H	1