commit: f9742b65fa670d936a7dbd459b4c685c95bb936b
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 6 12:30:08 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Jan 6 12:30:08 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9742b65
net-fs/samba: Fixing automagic dependency on pam for samba-4.3.x (bug #489770)
Package-Manager: portage-2.2.26
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-fs/samba/samba-4.2.7.ebuild | 8 +++++---
net-fs/samba/samba-4.3.3.ebuild | 16 +++++-----------
2 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/net-fs/samba/samba-4.2.7.ebuild b/net-fs/samba/samba-4.2.7.ebuild
index 170e737..f80127c 100644
--- a/net-fs/samba/samba-4.2.7.ebuild
+++ b/net-fs/samba/samba-4.2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -73,8 +73,10 @@ REQUIRED_USE="addc? ( gnutls !system-mitkrb5 )
S="${WORKDIR}/${MY_P}"
-PATCHES=( "${FILESDIR}/${PN}-4.2.3-heimdal_compilefix.patch" \
- "${FILESDIR}/${PN}-4.2.7-pam.patch")
+PATCHES=(
+ "${FILESDIR}/${PN}-4.2.3-heimdal_compilefix.patch"
+ "${FILESDIR}/${PN}-4.2.7-pam.patch"
+)
CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
diff --git a/net-fs/samba/samba-4.3.3.ebuild b/net-fs/samba/samba-4.3.3.ebuild
index a6497de..e71e35f 100644
--- a/net-fs/samba/samba-4.3.3.ebuild
+++ b/net-fs/samba/samba-4.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -28,7 +28,6 @@ IUSE="acl addc addns ads aio avahi client cluster cups dmapi
fam gnutls iprint
ldap pam quota selinux syslog +system-mitkrb5 systemd test winbind"
# sys-apps/attr is an automagic dependency (see bug #489748)
-# sys-libs/pam is an automagic dependency (see bug #489770)
CDEPEND="${PYTHON_DEPS}
dev-libs/iniparser:0
dev-libs/popt
@@ -73,7 +72,10 @@ REQUIRED_USE="addc? ( gnutls !system-mitkrb5 )
S="${WORKDIR}/${MY_P}"
-PATCHES=( "${FILESDIR}/${PN}-4.2.3-heimdal_compilefix.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-4.2.3-heimdal_compilefix.patch"
+ "${FILESDIR}/${PN}-4.2.7-pam.patch"
+)
CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
@@ -93,14 +95,6 @@ pkg_setup() {
ewarn "and recompile your kernel..."
fi
fi
- if ! use pam ; then
- ewarn "You have pam USE flag disabled!"
- ewarn "Unfortunately we still have to hard depend on
virtual/pam as samba upstream"
- ewarn "still unconditionally links libauth4-samba4.so library
to libpam.so once being"
- ewarn "found on the sytem."
- ewarn "Disabling the pam USE flag only disables installation of
samba's pam authenti-"
- ewarn "cation modules."
- fi
}
src_prepare() {
