From 43793fab84041cfc5c60c0151d1591b8a69fb24a Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 25 Aug 2018 07:36:27 +0100
Subject: gentoo resync : 25.08.2018

---
 app-admin/apg/Manifest             |  2 +-
 app-admin/apg/apg-2.3.0b-r6.ebuild | 48 -------------------------------------
 app-admin/apg/apg-2.3.0b-r7.ebuild | 49 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 49 deletions(-)
 delete mode 100644 app-admin/apg/apg-2.3.0b-r6.ebuild
 create mode 100644 app-admin/apg/apg-2.3.0b-r7.ebuild

(limited to 'app-admin/apg')

diff --git a/app-admin/apg/Manifest b/app-admin/apg/Manifest
index bda67fbb1809..8e521c327667 100644
--- a/app-admin/apg/Manifest
+++ b/app-admin/apg/Manifest
@@ -2,5 +2,5 @@ AUX apg-2.3.0b-cracklib.patch 920 BLAKE2B d1b0decd8a35db02ee8132350a04f61ada715e
 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-r6.ebuild 1217 BLAKE2B fd7b8b954a015f099f267a76166548894426c5a9c501a3b227c57cd3947d3f802cc02e1102335b7e2dac39c612b7f5460b6efc53eda09a4623a63e25840b6d24 SHA512 dc577d0c2e01ff658c0ad97f8d67219099b69eb83ed58b796f18d0fb2e1a1121d4bbfd35b753fff2c74cf74e1a963516cff49b1991b94c6e38ed00f126409d0a
+EBUILD apg-2.3.0b-r7.ebuild 1237 BLAKE2B a66f321740778cd329def859753a723612c83764753164499865a1e2f2beb46fd8733a20e483a1d659444a6a2be2fc77dc1a24fe926a81fd0eb7d64a79877f03 SHA512 5eae8f6686faf21f319e3ffa9e30086d12a80e8efc434570af8e43bb03e5e6688af684cabcc18412c9ce2e3c0b338313dcee51dfdb64ec1bcca682c4e3738d26
 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
deleted file mode 100644
index 00d3fa923a8d..000000000000
--- a/app-admin/apg/apg-2.3.0b-r6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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/apg-2.3.0b-r7.ebuild b/app-admin/apg/apg-2.3.0b-r7.ebuild
new file mode 100644
index 000000000000..a525c799fd57
--- /dev/null
+++ b/app-admin/apg/apg-2.3.0b-r7.ebuild
@@ -0,0 +1,49 @@
+# 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 )"
+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}
+}
-- 
cgit v1.2.3