commit:     eda57f98b48750e6f9b19958b64679a9ea10f5bc
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  9 09:08:21 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Sep  9 09:12:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eda57f98

net-fs/samba: Bump to versions 4.13.11 and 4.15.0_rc5

Removed old

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net-fs/samba/Manifest                              |  3 +-
 ...amba-4.15.0_rc4.ebuild => samba-4.13.11.ebuild} | 39 +++++++++++-----------
 ...a-4.15.0_rc4.ebuild => samba-4.15.0_rc5.ebuild} |  0
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 3595610f511..63fa1a61f18 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,5 +1,6 @@
 DIST samba-4.13.10.tar.gz 18450805 BLAKE2B 
3e9e1c951efe45b1954428c479aefc715b1fff6264d3735873710ca35a6b28320dd82a21e6abb5d75d500dc93514730f88907f51c601b68dceb1261b13163bf2
 SHA512 
dc4ad2dabc630575150d7b6db7818cd62827bdd9cc955c856bf0ba1684a1258d6306acd6e373aff1893255ad42d97fe8bf67c6fc30c5cffb1624fbfe4a238865
+DIST samba-4.13.11.tar.gz 18476158 BLAKE2B 
43bf88a62078c980e274ad978be0e7de46afbb35a873b0f32638bde20a92cf22a27ea6d3da87b2c79fff76bbc932505aac7e7a5aff04ddbada220f019b7ebb44
 SHA512 
d22da31ebbea4c4fb33827b47ab0d21e7753802ab310b68fb5edc48a2419f419737f4df6cc138488f28b70142734e68865ad63944445ede921ea09ebc83fbce7
 DIST samba-4.13.9.tar.gz 18443813 BLAKE2B 
24046586f666e9db02e1dd71d7eb854691f39e6b575b9652a8b7c1aa5569c856dfd48911e3f221de74f9deec5808152fa2836d03bb9810d55d4f526f1567574b
 SHA512 
35c98979c1141fe4bd700e3c8f2439ec08876697faeaced6668ea6a9fea1d8303ca34e82123499aa4a41054b9ed6e1260ae779ea8d59978ba6de6b5861f21948
 DIST samba-4.14.6.tar.gz 18661572 BLAKE2B 
d3bd9ba13c89afab1a2d119cbd0488240802710b24c6f681ba962804c6f5097003ed939da8747582aab710405f09ca90eded06eeddd3dd42a5aaa2a99be6be1b
 SHA512 
0ce3f46b2693daa27656fe9a04925cbe7dd398342cab352f0422a350eb9f91d1ea6d64fb18d04010b93fb3c0b9fe6434b23deb1f26018bd1f9bdc1b0f97beca2
 DIST samba-4.14.7.tar.gz 18668592 BLAKE2B 
3cd8c806c6af85eecafa93ba10562544815f3d73aaa6152774d2443971e8c46e4c12c3097f82d04d1560410e796d60d681ce6b1a637a09f0262b39a1fe28cbea
 SHA512 
155621b44232f696f389b8e01fd7d8a5ef8d4aa6b3de54090589268cf377c09714715a05e6198ee7e168ead71c08b5b20cd63a71811ef7d9bc9746c0d05ae9a6
-DIST samba-4.15.0rc4.tar.gz 19134766 BLAKE2B 
c4c56c78d19494ecf7a29e77100163bd93db074aabcd893781c269c58d8a802ad5f7b4a343555a07b6ce2ebf3ccf0977561389979a93b823f0f3c40946684b3f
 SHA512 
98be630381e3b3ec89cdd4733a6d5cf3dca6b6f56ee6c0f91c33888af286280fa73f24a6f9ad4066fb02f41de7142a73e995fe8052716e54e740dc8292d36686
+DIST samba-4.15.0rc5.tar.gz 18873299 BLAKE2B 
2b2af09d04fad612d67a244590457189232f9a11925d8bb9aa278c64e148034551c0f6d6c7e76a633ad3a3f3c626f998946b8a8596d017301c758725ac2ff81d
 SHA512 
bbdb37cf345a6c0765b5cd361cc858dd4496524bfbf0cdbe15876fe2284d8c39c5835bd5e5c686e9be45712f25aa158c624a2a719c5351f110c367e51443ba0f

diff --git a/net-fs/samba/samba-4.15.0_rc4.ebuild 
b/net-fs/samba/samba-4.13.11.ebuild
similarity index 91%
copy from net-fs/samba/samba-4.15.0_rc4.ebuild
copy to net-fs/samba/samba-4.13.11.ebuild
index aa5b6bd183a..d04cb92e511 100644
--- a/net-fs/samba/samba-4.15.0_rc4.ebuild
+++ b/net-fs/samba/samba-4.13.11.ebuild
@@ -16,22 +16,24 @@ if [[ ${PV} = *_rc* ]]; then
        SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
 else
        SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv 
~sparc ~x86"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="acl addc ads ceph client cluster cups debug dmapi fam glusterfs
-gpg iprint json ldap pam profiling-data python quota +regedit selinux
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
+gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
 snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
 zeroconf"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
        addc? ( python json winbind )
-       ads? ( acl ldap python winbind )
+       addns? ( python )
+       ads? ( acl ldap winbind )
        cluster? ( ads )
        gpg? ( addc )
+       ntvfs? ( addc )
        spotlight? ( json )
        test? ( python )
        !ads? ( !addc )
@@ -64,30 +66,27 @@ COMMON_DEPEND="
        dev-libs/popt[${MULTILIB_USEDEP}]
        dev-perl/Parse-Yapp
        >=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
+       net-libs/libnsl:=[${MULTILIB_USEDEP}]
        sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
-       >=sys-libs/ldb-2.4.0[ldap(+)?,${MULTILIB_USEDEP}]
-       <sys-libs/ldb-2.5.0[ldap(+)?,${MULTILIB_USEDEP}]
+       >=sys-libs/ldb-2.2.1[ldap(+)?,${MULTILIB_USEDEP}]
+       <sys-libs/ldb-2.3.0[ldap(+)?,${MULTILIB_USEDEP}]
        sys-libs/libcap[${MULTILIB_USEDEP}]
        sys-libs/liburing:=[${MULTILIB_USEDEP}]
        sys-libs/ncurses:0=
        sys-libs/readline:0=
-       >=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}]
-       >=sys-libs/tdb-1.4.4[${MULTILIB_USEDEP}]
-       >=sys-libs/tevent-0.11.0[${MULTILIB_USEDEP}]
+       >=sys-libs/talloc-2.3.1[${MULTILIB_USEDEP}]
+       >=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
+       >=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}]
        sys-libs/zlib[${MULTILIB_USEDEP}]
        virtual/libcrypt:=[${MULTILIB_USEDEP}]
        virtual/libiconv
        $(python_gen_cond_dep "
-               addc? (
-                       dev-python/dnspython:=[\${PYTHON_USEDEP}]
-                       dev-python/markdown[\${PYTHON_USEDEP}]
-               )
-               ads? (
+               addns? (
                        dev-python/dnspython:=[\${PYTHON_USEDEP}]
                        net-dns/bind-tools[gssapi]
                )
        ")
-       !alpha? ( !sparc? ( !riscv? ( sys-libs/libunwind:= ) ) )
+       !alpha? ( !sparc? ( sys-libs/libunwind:= ) )
        acl? ( virtual/acl )
        ceph? ( sys-cluster/ceph )
        cluster? ( net-libs/rpcsvc-proto )
@@ -209,6 +208,7 @@ multilib_src_configure() {
                --without-winexe
                $(multilib_native_use_with acl acl-support)
                $(multilib_native_usex addc '' '--without-ad-dc')
+               $(multilib_native_use_with addns dnsupdate)
                $(multilib_native_use_with ads)
                $(multilib_native_use_enable ceph cephfs)
                $(multilib_native_use_with cluster cluster-support)
@@ -219,6 +219,7 @@ multilib_src_configure() {
                $(multilib_native_use_with gpg gpgme)
                $(multilib_native_use_with json)
                $(multilib_native_use_enable iprint)
+               $(multilib_native_use_with ntvfs ntvfs-fileserver)
                $(multilib_native_use_with pam)
                $(multilib_native_usex pam 
"--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
                $(multilib_native_use_with quota quotas)
@@ -328,9 +329,7 @@ pkg_postinst() {
                elog "controller work previously known as 'samba4'."
                elog
        fi
-       if [[ "${PV}" != *_rc* ]] ; then
-               elog "For further information and migration steps make sure to 
read "
-               elog "https://samba.org/samba/history/${P}.html "
-               elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-       fi
+       elog "For further information and migration steps make sure to read "
+       elog "https://samba.org/samba/history/${P}.html "
+       elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
 }

diff --git a/net-fs/samba/samba-4.15.0_rc4.ebuild 
b/net-fs/samba/samba-4.15.0_rc5.ebuild
similarity index 100%
rename from net-fs/samba/samba-4.15.0_rc4.ebuild
rename to net-fs/samba/samba-4.15.0_rc5.ebuild

Reply via email to