diff options
| author |   Ian Stakenvicius <axs@gentoo.org> | 2016-01-13 17:39:14 -0500 |
|---|---|---|
| committer | Ian Stakenvicius <axs@gentoo.org> | 2016-01-13 17:39:44 -0500 |
| commit | 9b06d193e2364840d6316cd4dee2e475a05d1785 (patch) | |
| tree | a792b0c25adb8922993568b8770fdc46470a960a /net-fs/samba/samba-4.3.4.ebuild | |
| parent | app-emulation/virt-viewer: Version bump (diff) | |
| download | gentoo-9b06d193e2364840d6316cd4dee2e475a05d1785.tar.gz gentoo-9b06d193e2364840d6316cd4dee2e475a05d1785.tar.bz2 gentoo-9b06d193e2364840d6316cd4dee2e475a05d1785.zip | |
net-fs/samba: split up altabi patches and tarball them
Package-Manager: portage-2.2.26
Diffstat (limited to 'net-fs/samba/samba-4.3.4.ebuild')
| -rw-r--r-- | net-fs/samba/samba-4.3.4.ebuild | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/net-fs/samba/samba-4.3.4.ebuild b/net-fs/samba/samba-4.3.4.ebuild index e5cb37c45987..d6161bf1b09e 100644 --- a/net-fs/samba/samba-4.3.4.ebuild +++ b/net-fs/samba/samba-4.3.4.ebuild @@ -14,7 +14,8 @@ MY_P="${PN}-${MY_PV}" SRC_PATH="stable" [[ ${PV} = *_rc* ]] && SRC_PATH="rc" -SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz" +SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz + https://dev.gentoo.org/~axs/distfiles/samba-disable-python-patches-4.3.3.tar.xz" KEYWORDS="~amd64 ~hppa ~x86" [[ ${PV} = *_rc* ]] && KEYWORDS="~hppa" @@ -39,7 +40,7 @@ CDEPEND="${PYTHON_DEPS} dev-libs/popt[${MULTILIB_USEDEP}] sys-libs/readline:= virtual/libiconv - dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] + dev-python/subunit[${PYTHON_USEDEP}] >=net-libs/socket_wrapper-1.1.3[${MULTILIB_USEDEP}] sys-apps/attr[${MULTILIB_USEDEP}] sys-libs/libcap @@ -81,7 +82,6 @@ S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}/${PN}-4.2.3-heimdal_compilefix.patch" "${FILESDIR}/${PN}-4.2.7-pam.patch" - "${FILESDIR}/${PN}-4.3.3-disable-python-for-altabi.patch" ) CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" @@ -106,6 +106,12 @@ pkg_setup() { src_prepare() { epatch ${PATCHES[@]} + + # install the patches from tarball(s) + EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" \ + epatch "${WORKDIR}/patches" + # Allow user patches epatch_user multilib_copy_sources |