From e9e8d1e75464a51c79fac850bd2342ca6e9f1fbc Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Tue, 22 Dec 2020 21:38:52 +0300 Subject: sys-auth/pambase: correct versioning logic Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Mikle Kolyada --- sys-auth/pambase/pambase-20201103.ebuild | 2 +- sys-auth/pambase/pambase-9999.ebuild | 105 ------------------------------ sys-auth/pambase/pambase-999999999.ebuild | 105 ++++++++++++++++++++++++++++++ 3 files changed, 106 insertions(+), 106 deletions(-) delete mode 100644 sys-auth/pambase/pambase-9999.ebuild create mode 100644 sys-auth/pambase/pambase-999999999.ebuild diff --git a/sys-auth/pambase/pambase-20201103.ebuild b/sys-auth/pambase/pambase-20201103.ebuild index d8f55e9965e6..085421e24509 100644 --- a/sys-auth/pambase/pambase-20201103.ebuild +++ b/sys-auth/pambase/pambase-20201103.ebuild @@ -10,7 +10,7 @@ inherit pam python-any-r1 readme.gentoo-r1 DESCRIPTION="PAM base configuration files" HOMEPAGE="https://github.com/gentoo/pambase" -if [[ ${PV} == 9999 ]]; then +if [[ ${PV} == *9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/gentoo/pambase.git" else diff --git a/sys-auth/pambase/pambase-9999.ebuild b/sys-auth/pambase/pambase-9999.ebuild deleted file mode 100644 index d8f55e9965e6..000000000000 --- a/sys-auth/pambase/pambase-9999.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit pam python-any-r1 readme.gentoo-r1 - -DESCRIPTION="PAM base configuration files" -HOMEPAGE="https://github.com/gentoo/pambase" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/gentoo/pambase.git" -else - SRC_URI="https://github.com/gentoo/pambase/archive/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux" - S="${WORKDIR}/${PN}-${P}" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="caps debug elogind gnome-keyring minimal mktemp +nullok pam_krb5 pam_ssh +passwdqc pwhistory pwquality securetty selinux +sha512 systemd" - -RESTRICT="binchecks" - -REQUIRED_USE=" - ?? ( elogind systemd ) - ?? ( passwdqc pwquality ) - pwhistory? ( || ( passwdqc pwquality ) ) -" - -MIN_PAM_REQ=1.4.0 - -RDEPEND=" - >=sys-libs/pam-${MIN_PAM_REQ} - elogind? ( sys-auth/elogind[pam] ) - gnome-keyring? ( gnome-base/gnome-keyring[pam] ) - mktemp? ( sys-auth/pam_mktemp ) - pam_krb5? ( - >=sys-libs/pam-${MIN_PAM_REQ} - sys-auth/pam_krb5 - ) - caps? ( sys-libs/libcap[pam] ) - pam_ssh? ( sys-auth/pam_ssh ) - passwdqc? ( >=sys-auth/passwdqc-1.4.0-r1 ) - pwquality? ( dev-libs/libpwquality[pam] ) - selinux? ( sys-libs/pam[selinux] ) - sha512? ( >=sys-libs/pam-${MIN_PAM_REQ} ) - systemd? ( sys-apps/systemd[pam] ) -" - -BDEPEND="$(python_gen_any_dep ' - dev-python/jinja[${PYTHON_USEDEP}] - ')" - -python_check_deps() { - has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" -} - -src_configure() { - ${EPYTHON} ./${PN}.py \ - $(usex caps '--caps' '') \ - $(usex debug '--debug' '') \ - $(usex elogind '--elogind' '') \ - $(usex gnome-keyring '--gnome-keyring' '') \ - $(usex minimal '--minimal' '') \ - $(usex mktemp '--mktemp' '') \ - $(usex nullok '--nullok' '') \ - $(usex pam_krb5 '--krb5' '') \ - $(usex pam_ssh '--pam-ssh' '') \ - $(usex passwdqc '--passwdqc' '') \ - $(usex pwhistory '--pwhistory' '') \ - $(usex pwquality '--pwquality' '') \ - $(usex securetty '--securetty' '') \ - $(usex selinux '--selinux' '') \ - $(usex sha512 '--sha512' '') \ - $(usex systemd '--systemd' '') \ - || die -} - -src_test() { :; } - -src_install() { - local DOC_CONTENTS - - if use passwdqc; then - DOC_CONTENTS="To amend the existing password policy please see the man 5 passwdqc.conf - page and then edit the /etc/security/passwdqc.conf file" - fi - - if use pwquality; then - DOC_CONTENTS="To amend the existing password policy please see the man 5 pwquality.conf - page and then edit the /etc/security/pwquality.conf file" - fi - - { use passwdqc || use pwquality; } && readme.gentoo_create_doc - - dopamd -r stack/. -} - -pkg_postinst() { - { use passwdqc || use pwquality; } && readme.gentoo_print_elog -} diff --git a/sys-auth/pambase/pambase-999999999.ebuild b/sys-auth/pambase/pambase-999999999.ebuild new file mode 100644 index 000000000000..085421e24509 --- /dev/null +++ b/sys-auth/pambase/pambase-999999999.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) + +inherit pam python-any-r1 readme.gentoo-r1 + +DESCRIPTION="PAM base configuration files" +HOMEPAGE="https://github.com/gentoo/pambase" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/gentoo/pambase.git" +else + SRC_URI="https://github.com/gentoo/pambase/archive/${P}.tar.gz" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux" + S="${WORKDIR}/${PN}-${P}" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="caps debug elogind gnome-keyring minimal mktemp +nullok pam_krb5 pam_ssh +passwdqc pwhistory pwquality securetty selinux +sha512 systemd" + +RESTRICT="binchecks" + +REQUIRED_USE=" + ?? ( elogind systemd ) + ?? ( passwdqc pwquality ) + pwhistory? ( || ( passwdqc pwquality ) ) +" + +MIN_PAM_REQ=1.4.0 + +RDEPEND=" + >=sys-libs/pam-${MIN_PAM_REQ} + elogind? ( sys-auth/elogind[pam] ) + gnome-keyring? ( gnome-base/gnome-keyring[pam] ) + mktemp? ( sys-auth/pam_mktemp ) + pam_krb5? ( + >=sys-libs/pam-${MIN_PAM_REQ} + sys-auth/pam_krb5 + ) + caps? ( sys-libs/libcap[pam] ) + pam_ssh? ( sys-auth/pam_ssh ) + passwdqc? ( >=sys-auth/passwdqc-1.4.0-r1 ) + pwquality? ( dev-libs/libpwquality[pam] ) + selinux? ( sys-libs/pam[selinux] ) + sha512? ( >=sys-libs/pam-${MIN_PAM_REQ} ) + systemd? ( sys-apps/systemd[pam] ) +" + +BDEPEND="$(python_gen_any_dep ' + dev-python/jinja[${PYTHON_USEDEP}] + ')" + +python_check_deps() { + has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" +} + +src_configure() { + ${EPYTHON} ./${PN}.py \ + $(usex caps '--caps' '') \ + $(usex debug '--debug' '') \ + $(usex elogind '--elogind' '') \ + $(usex gnome-keyring '--gnome-keyring' '') \ + $(usex minimal '--minimal' '') \ + $(usex mktemp '--mktemp' '') \ + $(usex nullok '--nullok' '') \ + $(usex pam_krb5 '--krb5' '') \ + $(usex pam_ssh '--pam-ssh' '') \ + $(usex passwdqc '--passwdqc' '') \ + $(usex pwhistory '--pwhistory' '') \ + $(usex pwquality '--pwquality' '') \ + $(usex securetty '--securetty' '') \ + $(usex selinux '--selinux' '') \ + $(usex sha512 '--sha512' '') \ + $(usex systemd '--systemd' '') \ + || die +} + +src_test() { :; } + +src_install() { + local DOC_CONTENTS + + if use passwdqc; then + DOC_CONTENTS="To amend the existing password policy please see the man 5 passwdqc.conf + page and then edit the /etc/security/passwdqc.conf file" + fi + + if use pwquality; then + DOC_CONTENTS="To amend the existing password policy please see the man 5 pwquality.conf + page and then edit the /etc/security/pwquality.conf file" + fi + + { use passwdqc || use pwquality; } && readme.gentoo_create_doc + + dopamd -r stack/. +} + +pkg_postinst() { + { use passwdqc || use pwquality; } && readme.gentoo_print_elog +} -- cgit v1.2.3-65-gdbad