summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikle Kolyada <zlogene@gentoo.org>2020-03-15 21:26:40 +0300
committerMikle Kolyada <zlogene@gentoo.org>2020-03-15 21:36:23 +0300
commit80e0726ba5650061c9529e00ceceb700add9b25f (patch)
tree6d26ef0fbb3089bd7e29e7e692b35b738e7bc7d6
parentdev-python/snakeoil: s390 stable wrt bug #712324 (diff)
downloadgentoo-80e0726ba5650061c9529e00ceceb700add9b25f.tar.gz
gentoo-80e0726ba5650061c9529e00ceceb700add9b25f.tar.bz2
gentoo-80e0726ba5650061c9529e00ceceb700add9b25f.zip
sys-libs/pam: make gettext no-op
There is no nls use flag at all. Closes: https://bugs.gentoo.org/709532 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
-rw-r--r--sys-libs/pam/pam-1.3.1-r2.ebuild (renamed from sys-libs/pam/pam-1.3.1-r1.ebuild)11
-rw-r--r--sys-libs/pam/pam-1.3.1_p20200128-r1.ebuild (renamed from sys-libs/pam/pam-1.3.1_p20200128.ebuild)11
2 files changed, 10 insertions, 12 deletions
diff --git a/sys-libs/pam/pam-1.3.1-r1.ebuild b/sys-libs/pam/pam-1.3.1-r2.ebuild
index f79b0b171ba5..0d8769b37abd 100644
--- a/sys-libs/pam/pam-1.3.1-r1.ebuild
+++ b/sys-libs/pam/pam-1.3.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/linux-pam/linux-pam/archive/v${PV}.tar.gz -> ${P}.ta
LICENSE="|| ( BSD GPL-2 )"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="audit berkdb +cracklib debug nis nls +pie selinux static-libs"
+IUSE="audit berkdb +cracklib debug nis +pie selinux static-libs"
BDEPEND="app-text/docbook-xml-dtd:4.1.2
app-text/docbook-xml-dtd:4.3
@@ -20,17 +20,17 @@ BDEPEND="app-text/docbook-xml-dtd:4.1.2
app-text/docbook-xml-dtd:4.5
dev-libs/libxslt
sys-devel/flex
- virtual/pkgconfig[${MULTILIB_USEDEP}]
- nls? ( sys-devel/gettext )"
+ sys-devel/gettext
+ virtual/pkgconfig[${MULTILIB_USEDEP}]"
DEPEND="
virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ >=virtual/libintl-0-r1[${MULTILIB_USEDEP}]
audit? ( >=sys-process/audit-2.2.2[${MULTILIB_USEDEP}] )
berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
cracklib? ( >=sys-libs/cracklib-2.9.1-r1[${MULTILIB_USEDEP}] )
selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
- nis? ( >=net-libs/libtirpc-0.2.4-r2[${MULTILIB_USEDEP}] )
- nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
+ nis? ( >=net-libs/libtirpc-0.2.4-r2[${MULTILIB_USEDEP}] )"
RDEPEND="${DEPEND}"
@@ -65,7 +65,6 @@ multilib_src_configure() {
$(use_enable cracklib)
$(use_enable debug)
$(use_enable nis)
- $(use_enable nls)
$(use_enable pie)
$(use_enable selinux)
$(use_enable static-libs static)
diff --git a/sys-libs/pam/pam-1.3.1_p20200128.ebuild b/sys-libs/pam/pam-1.3.1_p20200128-r1.ebuild
index fca700457b03..60b2db8d2493 100644
--- a/sys-libs/pam/pam-1.3.1_p20200128.ebuild
+++ b/sys-libs/pam/pam-1.3.1_p20200128-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/linux-pam/linux-pam/archive/${COMMIT_HASH}.tar.gz#/$
LICENSE="|| ( BSD GPL-2 )"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit berkdb +cracklib debug nis nls +pie selinux static-libs"
+IUSE="audit berkdb +cracklib debug nis +pie selinux static-libs"
BDEPEND="app-text/docbook-xml-dtd:4.1.2
app-text/docbook-xml-dtd:4.3
@@ -22,17 +22,17 @@ BDEPEND="app-text/docbook-xml-dtd:4.1.2
app-text/docbook-xml-dtd:4.5
dev-libs/libxslt
sys-devel/flex
- virtual/pkgconfig[${MULTILIB_USEDEP}]
- nls? ( sys-devel/gettext )"
+ sys-devel/gettext
+ virtual/pkgconfig[${MULTILIB_USEDEP}]"
DEPEND="
virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ >=virtual/libintl-0-r1[${MULTILIB_USEDEP}]
audit? ( >=sys-process/audit-2.2.2[${MULTILIB_USEDEP}] )
berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
cracklib? ( >=sys-libs/cracklib-2.9.1-r1[${MULTILIB_USEDEP}] )
selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
- nis? ( >=net-libs/libtirpc-0.2.4-r2[${MULTILIB_USEDEP}] )
- nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
+ nis? ( >=net-libs/libtirpc-0.2.4-r2[${MULTILIB_USEDEP}] )"
RDEPEND="${DEPEND}"
@@ -70,7 +70,6 @@ multilib_src_configure() {
$(use_enable cracklib)
$(use_enable debug)
$(use_enable nis)
- $(use_enable nls)
$(use_enable pie)
$(use_enable selinux)
$(use_enable static-libs static)