From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 19F2C1396D0 for ; Thu, 7 Sep 2017 13:14:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 700B3E0DD0; Thu, 7 Sep 2017 13:14:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 410BCE0DD0 for ; Thu, 7 Sep 2017 13:14:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3982133E4AD for ; Thu, 7 Sep 2017 13:14:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D8EBF8ED4 for ; Thu, 7 Sep 2017 13:14:30 +0000 (UTC) From: "Craig Andrews" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Craig Andrews" Message-ID: <1504790054.6f6c7207eb9bd0da8a2145667a1f8f8b543b121d.candrews@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/google-authenticator/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-auth/google-authenticator/Manifest sys-auth/google-authenticator/google-authenticator-1.04.ebuild sys-auth/google-authenticator/google-authenticator-9999.ebuild X-VCS-Directories: sys-auth/google-authenticator/ X-VCS-Committer: candrews X-VCS-Committer-Name: Craig Andrews X-VCS-Revision: 6f6c7207eb9bd0da8a2145667a1f8f8b543b121d X-VCS-Branch: master Date: Thu, 7 Sep 2017 13:14:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9ff20277-385e-4b06-878c-f075a4144dd1 X-Archives-Hash: 066ccaeac55cef5c095fb81e9bbdb355 commit: 6f6c7207eb9bd0da8a2145667a1f8f8b543b121d Author: Craig Andrews gentoo org> AuthorDate: Tue Aug 15 16:33:57 2017 +0000 Commit: Craig Andrews gentoo org> CommitDate: Thu Sep 7 13:14:14 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f6c7207 sys-auth/google-authenticator: bump to 1.04, update -9999, EAPI=6 Gentoo-bug: 619346 Package-Manager: Portage-2.3.7, Repoman-2.3.3 Closes #5430 sys-auth/google-authenticator/Manifest | 1 + .../google-authenticator-1.04.ebuild | 49 ++++++++++++++++++++++ .../google-authenticator-9999.ebuild | 37 ++++------------ 3 files changed, 58 insertions(+), 29 deletions(-) diff --git a/sys-auth/google-authenticator/Manifest b/sys-auth/google-authenticator/Manifest index ddc10ac8ae5..2ef77cc79bd 100644 --- a/sys-auth/google-authenticator/Manifest +++ b/sys-auth/google-authenticator/Manifest @@ -1 +1,2 @@ DIST google-authenticator-1.01_pre20160307231538.tar.xz 255316 SHA256 41bdc47278903bc33e87c8b4da6f9fe5b526a2f780790d4f83bb67634f3f53b0 SHA512 cee3898b7afec54079968ff0690f076b78512b0b2c982ef5bedb2d6c5850b103c80191caa4b172069a83eb4d15ea4fce5b3f5eefdb36aa0426d985ba29736108 WHIRLPOOL 90e6439c632ccf4c791d988304b2e1cb7753f03ec03678b7f83946bdefc2bf1ca6d81538c484bc73561060fc7a7d80518845e13c49f6b5d943233e0123b2a1c8 +DIST google-authenticator-1.04.tar.gz 54019 SHA256 8284cc046be436513d9d4bbb1285017327edbcc32f6f620c47e7e889c4b966ef SHA512 e4b8ad74301312e17edd0a7f25257086fd805c8d5215b06b71d96e9a64a71b2c87d0c5a532d9eca21d6d67e30c02c2c2c77dbd338a2f49af25c32dcd355ee98e WHIRLPOOL a170c155125c6ee51b9aac346a36fe1ed7efac9d215251cb2c14fb462e3e03643cfdc85aa393e491223f1050dc514356ce8199dece327c45368481131b9b1de7 diff --git a/sys-auth/google-authenticator/google-authenticator-1.04.ebuild b/sys-auth/google-authenticator/google-authenticator-1.04.ebuild new file mode 100644 index 00000000000..e3259cba968 --- /dev/null +++ b/sys-auth/google-authenticator/google-authenticator-1.04.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit multilib + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/google/google-authenticator-libpam.git" + inherit git-r3 autotools +else + SRC_URI="https://github.com/google/google-authenticator-libpam/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + S="${WORKDIR}/google-authenticator-libpam-${PV}" +fi + +DESCRIPTION="PAM Module for two step verification via mobile platform" +HOMEPAGE="https://github.com/google/google-authenticator-libpam" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="" + +DEPEND="virtual/pam" +RDEPEND="${DEPEND}" + +src_prepare() { + default + if [[ ${PV} == 9999 ]] ; then + eautoreconf + fi +} + +src_compile() { + default +} + +src_install() { + default +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]] ; then + elog "For further information see" + elog "https://wiki.gentoo.org/wiki/Google_Authenticator" + elog "" + elog "If you want support for QR-Codes, install media-gfx/qrencode." + fi +} diff --git a/sys-auth/google-authenticator/google-authenticator-9999.ebuild b/sys-auth/google-authenticator/google-authenticator-9999.ebuild index b637ffb3858..e3259cba968 100644 --- a/sys-auth/google-authenticator/google-authenticator-9999.ebuild +++ b/sys-auth/google-authenticator/google-authenticator-9999.ebuild @@ -1,23 +1,21 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI="6" inherit multilib -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/google/${PN}.git" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/google/google-authenticator-libpam.git" inherit git-r3 autotools - S="${WORKDIR}/${P}/libpam" else - MY_P=${P%_pre*} - SRC_URI="mirror://gentoo/${P}.tar.xz" + SRC_URI="https://github.com/google/google-authenticator-libpam/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" - S="${WORKDIR}/${MY_P}" + S="${WORKDIR}/google-authenticator-libpam-${PV}" fi DESCRIPTION="PAM Module for two step verification via mobile platform" -HOMEPAGE="https://github.com/google/google-authenticator" +HOMEPAGE="https://github.com/google/google-authenticator-libpam" LICENSE="Apache-2.0" SLOT="0" @@ -27,37 +25,18 @@ DEPEND="virtual/pam" RDEPEND="${DEPEND}" src_prepare() { - if [[ ${PV} == "9999" ]] ; then + default + if [[ ${PV} == 9999 ]] ; then eautoreconf fi } -src_configure() { - # We might want to use getpam_mod_dir from pam eclass, - # but the build already appends "/security" for us. - econf \ - --docdir="\$(datarootdir)/doc/${PF}" \ - --htmldir='$(docdir)/html' \ - --libdir="/$(get_libdir)" -} - src_compile() { default - - if [[ ${PV} == "9999" ]] ; then - local stamp=$(date --date="$(git log -n1 --pretty=format:%ci master)" -u "+%Y%m%d%H%M%S") - emake dist - - local otar=$(echo ${PN}-*.tar.gz) - local ntar="${otar%.tar.gz}_pre${stamp}.tar.xz" - zcat "${otar}" | xz > "${ntar}" - fi } src_install() { default - # Punt the pam module libtool archive. - find "${ED}" -name '*.la' -delete } pkg_postinst() {