gentoo resync : 08.01.2021

5 files changed, 3 insertions, 84 deletions

diff --git a/app-admin/apg/Manifest b/app-admin/apg/Manifest
index 27f775656966..f5a2fc74fea6 100644
--- a/app-admin/apg/Manifest
+++ b/app-admin/apg/Manifest
@@ -1,9 +1,5 @@
-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-2.3.0b_p20150129-cracklib.patch 1485 BLAKE2B e6df97af3cfe408d68a86461733a060a7045d9cafd1a82821c56756b6c69d27aba5ba6b7b189346daf52cd407703e07ccff4a66965953f0a20c1ac19add4a064 SHA512 d7e3b210627ac6df34cb380c9b6bfdfd3eff790750082c7ebc40a837a88c73467f0e5847633a51b32c7634a57821b06c704bace511dfae18bc5d3e473f9e43ad
-AUX apg-glibc-2.4.patch 260 BLAKE2B b30c414ed89f22eb7dc2d0e3b115dbbc0845aba06f2a9dc0dea61fb36d9ccfa231d56959e7f02b3f1fb337654eec5cf2bd60c53ce24e112470c9fc9b9c225680 SHA512 27463b291aee051a4a149664cfd3dea524a34cd88d5cb90c5b4891fe0722aad9993cfd10df555455890ea631d8844d566d23cbb3812f8cb2859e131ea4c42114
-DIST apg-2.3.0b.tar.gz 109995 BLAKE2B 9b4a6141fb7f6e649fe06ed91bda636879a03d6e5e6071267bbb6cd27e63b4588c23ea7902c5b1a74dde8520843566a4f2857a34f4d66020142425e5faf53daf SHA512 3112d2267f2311f960a52fa268b55a5faf0250a4a8c5e7444f0c1326afa2844a476a54befcf79e5b8532d74c53f6f58ffc420591c8c36798dd82b43c14869e1a
 DIST apg-2.3.0b_p20150129.tar.xz 313372 BLAKE2B f5a1b894a0379294c478020de512af047aec2e7c9d881cb2f4c79df88583707b5ce0e995623915b6bd11b720e60e0f8696e0ddce472441cb1d04f3bf7a818e32 SHA512 7be813368b4b6fe4ae2882d85c40b6cf80ad44b7aa7e46c8cb97926ef89edf4f59e9a4c76a7aa9f725ac6ce1f0df361f8b68ef6dce798e1e0a8d55767c7a16e8
-EBUILD apg-2.3.0b-r7.ebuild 1240 BLAKE2B a43a3137eb6f64ef3005812609627b72de0223c73fef78657b15a553f419c0353d8bbc485d708689af0167fcaea0a16dfdfc3779ee13028bbe8b41cbc5c7ff67 SHA512 fec9142349b0d61a2c36b11ce66706a8f8bdafa4dda2dbe6742c4cccb3e0a265643a407d4de01e78dfeb7aecc9b81ac06beebd3247bacb268c4b459877bc032e
-EBUILD apg-2.3.0b_p20150129.ebuild 831 BLAKE2B 401da933459d3f23fd9085176151e383ebef7fb8004097a8f0f703838e886b306fef96ed554be26fd87f5044ae7c6ba6e0ce62e4004a9591dcf4e7814582e279 SHA512 15c3981c58ce8c40dcfb5d57672105480108e007a3b3966786e5f8153bc356e8e61edc6cba66b9ba6effde078b0e7ec88c898e6fa88343871af9bd4b15de355d
+EBUILD apg-2.3.0b_p20150129.ebuild 830 BLAKE2B 85a870b95cfce7962738c907f484ce1556be1dda95c4f6c2e0f62b2349d4bca667e80c892488ea87af7cd9c989404797a6f3b416595331cefb88a2228f77fab6 SHA512 41a9838e7ab2933656a4bcf2bdc5eac3389e26f7269d0ed1194cb36b68111ef612c912d944f837115841c0a3dd4e4263acdbb687315b5baa0f24645e21434040
 MISC metadata.xml 323 BLAKE2B 3b44b94032a0312054a8d1b5e1d77d8104646ca23a5ee93f20e34a93947184353a2c953141a1de172639fff8100eaf8eda38d1a65690ae99dbc3e533464dff6c SHA512 63dcf35a66f95ba538cc976762491f8e248d5679fe854f06f6c98394731c61f28f66f49bab54e5fad3d48a6cb8f611d2afb90f5ddf48a55eb60ca1b26a649926
diff --git a/app-admin/apg/apg-2.3.0b-r7.ebuild b/app-admin/apg/apg-2.3.0b-r7.ebuild
deleted file mode 100644
index cfc9ecdda9be..000000000000
--- a/app-admin/apg/apg-2.3.0b-r7.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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 ~arm ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="cracklib"
-
-DEPEND="cracklib? ( sys-libs/cracklib )"
-RDEPEND="${DEPEND}"
-
-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/apg-2.3.0b_p20150129.ebuild b/app-admin/apg/apg-2.3.0b_p20150129.ebuild
index a7a50f646dae..776ab76cb32c 100644
--- a/app-admin/apg/apg-2.3.0b_p20150129.ebuild
+++ b/app-admin/apg/apg-2.3.0b_p20150129.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~bircoph/distfiles/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="cracklib"
 
 DEPEND="cracklib? ( sys-libs/cracklib )"
diff --git a/app-admin/apg/files/apg-2.3.0b-cracklib.patch b/app-admin/apg/files/apg-2.3.0b-cracklib.patch
deleted file mode 100644
index d297495b3211..000000000000
--- a/app-admin/apg/files/apg-2.3.0b-cracklib.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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)
- #
--#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/apg-glibc-2.4.patch b/app-admin/apg/files/apg-glibc-2.4.patch
deleted file mode 100644
index 43b5874fa2b6..000000000000
--- a/app-admin/apg/files/apg-glibc-2.4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
- 
-+#define uint32_t int
-+
- #if defined(APG_USE_CRACKLIB)
- #include <packer.h>
- #endif