[gentoo-commits] repo/gentoo:master commit in: app-admin/apg/

2021-02-10 Thread Sam James 
commit: 23edb8a4917f1263d95a481dbcf65de35ad722aa
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 11 07:54:44 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 11 07:54:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23edb8a4

app-admin/apg: Stabilize 2.3.0b_p20150129 ppc64, #769944

Signed-off-by: Sam James  gentoo.org>

 app-admin/apg/apg-2.3.0b_p20150129.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apg/apg-2.3.0b_p20150129.ebuild 
b/app-admin/apg/apg-2.3.0b_p20150129.ebuild
index 776ab76cb32..239110be3b6 100644
--- a/app-admin/apg/apg-2.3.0b_p20150129.ebuild
+++ b/app-admin/apg/apg-2.3.0b_p20150129.ebuild
@@ -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 )"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apg/files/, app-admin/apg/

2021-01-05 Thread Andrew Savchenko 
commit: eb92af2b5638720bd439406295a237063f0f1a4e
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Wed Jan  6 03:14:28 2021 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Wed Jan  6 03:17:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb92af2b

app-admin/apg: remove old

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-admin/apg/Manifest|  1 -
 app-admin/apg/apg-2.3.0b-r7.ebuild| 49 ---
 app-admin/apg/files/apg-2.3.0b-cracklib.patch | 17 --
 app-admin/apg/files/apg-glibc-2.4.patch   | 11 --
 4 files changed, 78 deletions(-)

diff --git a/app-admin/apg/Manifest b/app-admin/apg/Manifest
index 64074f5c0ab..67631f69f40 100644
--- a/app-admin/apg/Manifest
+++ b/app-admin/apg/Manifest
@@ -1,2 +1 @@
-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

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 cfc9ecdda9b..000
--- 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/files/apg-2.3.0b-cracklib.patch 
b/app-admin/apg/files/apg-2.3.0b-cracklib.patch
deleted file mode 100644
index d297495b321..000
--- 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.0 -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 43b5874fa2b..000
--- 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_H1
- 
-+#define uint32_t int
-+
- #if defined(APG_USE_CRACKLIB)
- #include 
- #endif

[gentoo-commits] repo/gentoo:master commit in: app-admin/apg/

2020-12-27 Thread Sergei Trofimovich 
commit: cd363a21487a95481be41e2425b0f5ade34672fd
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Dec 27 11:32:33 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Dec 27 11:38:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd363a21

app-admin/apg: stable 2.3.0b_p20150129 for ppc

stable wrt bug #761739

Package-Manager: Portage-3.0.12, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 app-admin/apg/apg-2.3.0b_p20150129.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apg/apg-2.3.0b_p20150129.ebuild 
b/app-admin/apg/apg-2.3.0b_p20150129.ebuild
index e1cf535a052..a7a50f646da 100644
--- a/app-admin/apg/apg-2.3.0b_p20150129.ebuild
+++ b/app-admin/apg/apg-2.3.0b_p20150129.ebuild
@@ -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 )"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apg/

2020-12-26 Thread Sam James 
commit: a77199eb6cf1ad0753fb5b1ad9a81fc090c3b90e
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 27 04:54:12 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 27 04:54:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a77199eb

app-admin/apg: Stabilize 2.3.0b_p20150129 amd64, #761739

Signed-off-by: Sam James  gentoo.org>

 app-admin/apg/apg-2.3.0b_p20150129.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apg/apg-2.3.0b_p20150129.ebuild 
b/app-admin/apg/apg-2.3.0b_p20150129.ebuild
index 0d351d723be..e1cf535a052 100644
--- a/app-admin/apg/apg-2.3.0b_p20150129.ebuild
+++ b/app-admin/apg/apg-2.3.0b_p20150129.ebuild
@@ -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 )"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apg/files/, app-admin/apg/

2020-09-30 Thread Andrew Savchenko 
commit: aa72164a2295449bbe4728884441a79d21aa975d
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Wed Sep 30 15:16:32 2020 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Wed Sep 30 15:21:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa72164a

app-admin/apg: version bump

- switch to new upstream
- update to the latest git head
- port cracklib support to the new build system

Closes: https://bugs.gentoo.org/629272
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-admin/apg/Manifest |  1 +
 app-admin/apg/apg-2.3.0b_p20150129.ebuild  | 43 
 .../apg/files/apg-2.3.0b_p20150129-cracklib.patch  | 47 ++
 app-admin/apg/metadata.xml | 10 -
 4 files changed, 99 insertions(+), 2 deletions(-)

diff --git a/app-admin/apg/Manifest b/app-admin/apg/Manifest
index ea6ed5bf852..64074f5c0ab 100644
--- a/app-admin/apg/Manifest
+++ b/app-admin/apg/Manifest
@@ -1 +1,2 @@
 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

diff --git a/app-admin/apg/apg-2.3.0b_p20150129.ebuild 
b/app-admin/apg/apg-2.3.0b_p20150129.ebuild
new file mode 100644
index 000..0d351d723be
--- /dev/null
+++ b/app-admin/apg/apg-2.3.0b_p20150129.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+BASEVER=$(ver_cut 1-4)
+
+DESCRIPTION="Another Password Generator"
+HOMEPAGE="https://github.com/wilx/apg;
+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"
+IUSE="cracklib"
+
+DEPEND="cracklib? ( sys-libs/cracklib )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-${BASEVER}-crypt_password.patch"
+   "${FILESDIR}/${P}-cracklib.patch"
+)
+
+DOCS=( CHANGES README THANKS TODO doc/APG_TIPS doc/rfc0972.txt doc/rfc1750.txt 
)
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   econf $(use_with cracklib)
+}
+
+src_install() {
+   default
+   doman doc/man/apg*
+}

diff --git a/app-admin/apg/files/apg-2.3.0b_p20150129-cracklib.patch 
b/app-admin/apg/files/apg-2.3.0b_p20150129-cracklib.patch
new file mode 100644
index 000..b019f565e15
--- /dev/null
+++ b/app-admin/apg/files/apg-2.3.0b_p20150129-cracklib.patch
@@ -0,0 +1,47 @@
+commit 8c3976544af138aa5d8bc21aa5bc80ba91babc92
+Author: Andrew Savchenko 
+Date:   Wed Sep 30 17:12:18 2020 +0300
+
+add cracklib support to the new build system
+
+diff --git a/Makefile.am b/Makefile.am
+index 42068bf..3871295 100644
+--- a/Makefile.am
 b/Makefile.am
+@@ -19,9 +19,15 @@ common_apg_sources = \
+ convert.c
+ 
+ apg_SOURCES = $(common_apg_sources)
++if HAVE_CRACKLIB
++apg_LDFLAGS = -lcrack
++apg_CPPFLAGS = -DAPG_USE_CRACKLIB 
-DCRACKLIB_DICTPATH=\"/usr/lib/cracklib_dict\"
++endif
+ 
+ apgd_SOURCES = $(common_apg_sources)
+ apgd_CPPFLAGS = -DCLISERV
++apgd_CPPFLAGS += $(apg_CPPFLAGS)
++apgd_LDFLAGS = $(apg_LDFLAGS)
+ 
+ apgbfm_SOURCES = apgbfm.c bloom.c sha/sha.c errors.c getopt.c convert.c
+ apgbfm_CPPFLAGS = -DAPGBFM
+diff --git a/configure.ac b/configure.ac
+index d8fd056..75483d1 100644
+--- a/configure.ac
 b/configure.ac
+@@ -43,8 +43,16 @@ AC_SEARCH_LIBS([strerror], [cposix])
+ AC_CHECK_FUNCS([getpass gettimeofday inet_ntoa memset strchr strerror])
+ AC_CHECK_FUNCS([crypt])
+ 
++AC_ARG_WITH([cracklib],
++AC_HELP_STRING([--with-cracklib], [Use cracklib for strong password 
checking [default=no]]))
++AS_IF([test "x$with_cracklib" = "xyes"],[
++AC_SEARCH_LIBS([FascistCheck],[crack],[HAVE_CRACKLIB=1],
++AC_MSG_ERROR([cracklib requested but not found]))
++])
++
+ LT_PREREQ([2.4.2])
+ LT_INIT([win32-dll disable-static pic-only])
+ 
++AM_CONDITIONAL([HAVE_CRACKLIB],[test "x$HAVE_CRACKLIB" != "x"])
+ AC_CONFIG_FILES([Makefile])
+ AC_OUTPUT

diff --git a/app-admin/apg/metadata.xml b/app-admin/apg/metadata.xml
index 585b0dc75dd..039bfee611a 100644
--- a/app-admin/apg/metadata.xml
+++ b/app-admin/apg/metadata.xml
@@ -1,5 +1,11 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   
+   
+   birc...@gentoo.org
+   Andrew Savchenko
+   
+   
+

[gentoo-commits] repo/gentoo:master commit in: app-admin/apg/

2020-08-12 Thread Jonas Stein 
commit: 21178ae12d47bb3f4f5ed988ca6282e606461585
Author: Jonas Stein  gentoo  org>
AuthorDate: Wed Aug 12 20:15:25 2020 +
Commit: Jonas Stein  gentoo  org>
CommitDate: Wed Aug 12 20:15:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21178ae1

app-admin/apg: Maintainer retired

Proxied maintainer retired due to inactivity.
Closes: https://bugs.gentoo.org/632850
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Jonas Stein  gentoo.org>

 app-admin/apg/metadata.xml | 11 ++-
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/app-admin/apg/metadata.xml b/app-admin/apg/metadata.xml
index 5a5329bfe18..585b0dc75dd 100644
--- a/app-admin/apg/metadata.xml
+++ b/app-admin/apg/metadata.xml
@@ -1,12 +1,5 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   du...@gmx.de
-   Dustin Polke
-   
-   
-   proxy-ma...@gentoo.org
-   Proxy Maintainers
-   
-
+   
+

[gentoo-commits] repo/gentoo:master commit in: app-admin/apg/

2020-07-01 Thread Michał Górny 
commit: 36a08d89160e9f87963966adccbc6515a7a1e9ff
Author: Sam James (sam_c)  cmpct  info>
AuthorDate: Mon Jun 29 15:20:53 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Jul  1 12:21:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36a08d89

app-admin/apg: arm keyworded (bug #728494)

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sam James (sam_c)  cmpct.info>
Signed-off-by: Michał Górny  gentoo.org>

 app-admin/apg/apg-2.3.0b-r7.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-admin/apg/apg-2.3.0b-r7.ebuild 
b/app-admin/apg/apg-2.3.0b-r7.ebuild
index a525c799fd5..77a760e1baf 100644
--- a/app-admin/apg/apg-2.3.0b-r7.ebuild
+++ b/app-admin/apg/apg-2.3.0b-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux 
~ppc-macos"
 IUSE="cracklib"
 
 DEPEND="cracklib? ( sys-libs/cracklib )"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apg/

2020-03-20 Thread Joonas Niilola 
commit: 20fafff30140dfd746ba8eb0570fe471b02a39cf
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Mar 20 14:23:46 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Mar 20 14:30:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20fafff3

app-admin/apg: RedundantLongDescription

Signed-off-by: Joonas Niilola  gentoo.org>

 app-admin/apg/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-admin/apg/metadata.xml b/app-admin/apg/metadata.xml
index 971e516f3bf..5a5329bfe18 100644
--- a/app-admin/apg/metadata.xml
+++ b/app-admin/apg/metadata.xml
@@ -9,5 +9,4 @@
proxy-ma...@gentoo.org
Proxy Maintainers

-Another Password Generator. Generates random, pronouncable 
passwords with a variety of algorithms

[gentoo-commits] repo/gentoo:master commit in: app-admin/apg/

2018-08-23 Thread Michał Górny 
commit: 028a9200245a7f5a3ed69b877eaf848ef44b02fc
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Tue Aug 21 07:17:50 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Aug 23 12:11:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=028a9200

app-admin/apg: restore RDEPEND

Closes: https://github.com/gentoo/gentoo/pull/9647

 app-admin/apg/{apg-2.3.0b-r6.ebuild => apg-2.3.0b-r7.ebuild} | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-admin/apg/apg-2.3.0b-r6.ebuild 
b/app-admin/apg/apg-2.3.0b-r7.ebuild
similarity index 98%
rename from app-admin/apg/apg-2.3.0b-r6.ebuild
rename to app-admin/apg/apg-2.3.0b-r7.ebuild
index 00d3fa923a8..a525c799fd5 100644
--- a/app-admin/apg/apg-2.3.0b-r6.ebuild
+++ b/app-admin/apg/apg-2.3.0b-r7.ebuild
@@ -15,6 +15,7 @@ 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

[gentoo-commits] repo/gentoo:master commit in: app-admin/apg/

2018-07-26 Thread Mikle Kolyada 
commit: 1066ee1abde0483c71e8840a70119ac453f2854e
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu Jul 26 21:39:27 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu Jul 26 21:39:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1066ee1a

app-admin/apg: Drop old

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-admin/apg/apg-2.3.0b-r5.ebuild | 51 --
 1 file changed, 51 deletions(-)

diff --git a/app-admin/apg/apg-2.3.0b-r5.ebuild 
b/app-admin/apg/apg-2.3.0b-r5.ebuild
deleted file mode 100644
index 818202c48ce..000
--- a/app-admin/apg/apg-2.3.0b-r5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils 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() {
-   chmod -R 0700 "${S}"
-   if use cracklib; then
-   epatch "${FILESDIR}"/${P}-cracklib.patch
-   epatch "${FILESDIR}"/${PN}-glibc-2.4.patch
-   fi
-   epatch "${FILESDIR}"/${P}-crypt_password.patch
-}
-
-src_compile() {
-   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
-
-   emake \
-   FLAGS="${CFLAGS} ${LDFLAGS}" CFLAGS="${CFLAGS} ${LDFLAGS}" \
-   CC="$(tc-getCC)" \
-   standalone || die "compile problem"
-   emake FLAGS="${CFLAGS} ${LDFLAGS}" CC="$(tc-getCC)" \
-   -C bfconvert || die "compile problem"
-}
-
-src_install() {
-   dobin apg apgbfm bfconvert/bfconvert || die
-   dodoc CHANGES INSTALL README THANKS TODO || die
-   cd doc
-   doman man/apg.1 man/apgbfm.1 || die
-   dodoc APG_TIPS pronun.txt rfc0972.txt rfc1750.txt || die
-}

[gentoo-commits] repo/gentoo:master commit in: app-admin/apg/

2018-07-26 Thread Mikle Kolyada 
commit: 0fd810bb00438b2dd565781fbe7bbbc8cab28b1f
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu Jul 26 21:38:59 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu Jul 26 21:39:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fd810bb

app-admin/apg: merge stable keywords

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-admin/apg/apg-2.3.0b-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apg/apg-2.3.0b-r6.ebuild 
b/app-admin/apg/apg-2.3.0b-r6.ebuild
index 34ea033ebee..00d3fa923a8 100644
--- a/app-admin/apg/apg-2.3.0b-r6.ebuild
+++ b/app-admin/apg/apg-2.3.0b-r6.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="cracklib"
 
 DEPEND="cracklib? ( sys-libs/cracklib )"

[gentoo-commits] repo/gentoo:master commit in: app-admin/apg/files/, app-admin/apg/

2018-07-20 Thread Michał Górny 
commit: 4c77d2a532c04095b44862b3d579420ede3a4a4f
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sun Jul  8 16:14:53 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jul 20 12:50:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c77d2a5

app-admin/apg: EAPI7, improve ebuild

Closes: https://github.com/gentoo/gentoo/pull/9146

 app-admin/apg/apg-2.3.0b-r6.ebuild | 48 ++
 app-admin/apg/files/apg-2.3.0b-cracklib.patch  |  4 +-
 .../apg/files/apg-2.3.0b-crypt_password.patch  |  8 ++--
 app-admin/apg/files/apg-glibc-2.4.patch|  4 +-
 4 files changed, 56 insertions(+), 8 deletions(-)

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 000..34ea033ebee
--- /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 a1c34a14f5a..d297495b321 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.0 -0600
-+++ Makefile.cracklib  2004-10-14 07:16:17.288530686 -0600
+--- a/Makefile 2003-08-07 09:40:39.0 -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 93f3f152a2b..64a7fdcb37d 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.0 +0300
-+++ restrict.c 2007-03-09 13:49:31.0 +0300
+--- a/restrict.c   2007-03-09 13:48:27.0 +0300
 b/restrict.c   2007-03-09 13:49:31.0 +0300
 @@ -33,6 +33,9 @@
  #include 
  #include 
@@ -10,8 +10,8 @@
  #include "restrict.h"
  extern struct sym smbl[94];
  /*
 apg.c  2007-03-08 17:32:40.0 +0300
-+++ apg.c  2007-03-08 17:34:07.0 +0300
+--- a/apg.c2007-03-08 17:32:40.0 +0300
 b/apg.c2007-03-08 17:34:07.0 +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 be90c6355e6..43b5874fa2b 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.orig2006-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_H1

[gentoo-commits] repo/gentoo:master commit in: app-admin/apg/

2015-10-31 Thread Ian Delaney 
commit: da36ac4697d4984c302f723b32241b7a1a7e2ad9
Author: Ian Delaney  gentoo  org>
AuthorDate: Sat Oct 31 02:58:59 2015 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Sat Oct 31 09:36:02 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da36ac46

app-admin/apg: metadata.xml: update maintainer's email address

Package-Manager: portage-2.2.23

 app-admin/apg/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/apg/metadata.xml b/app-admin/apg/metadata.xml
index 6569104..9cf9bbc 100644
--- a/app-admin/apg/metadata.xml
+++ b/app-admin/apg/metadata.xml
@@ -3,7 +3,7 @@
 
 proxy-maintainers
 
-   gentoobugsie.20.dsuraw...@spamgourmet.com
+   du...@gmx.de
Dustin Polke
Proxy Maintainer. CC him on bugs.