Revision bump: port to python-r1 eclass, add missing dependency, wrt bug #195703. Thanks to Georgy Kovtunov

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64

3 files changed, 164 insertions, 2 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index f92ad4b21b0f..4f27c67e74ae 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.555 2013/01/31 07:29:53 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.556 2013/02/03 08:23:28 pinkbyte Exp $
+
+*samba-4.0.1-r1 (03 Feb 2013)
+
+  03 Feb 2013; Sergey Popov <pinkbyte@gentoo.org> +samba-4.0.1-r1.ebuild:
+  Revision bump: port to python-r1 eclass, add missing dependency, wrt bug
+  #195703. Thanks to Georgy Kovtunov
 
 *samba-3.5.21 (31 Jan 2013)
 
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 54cb5e6ccb4b..0745f188a75a 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -40,6 +40,7 @@ EBUILD samba-3.5.21.ebuild 12463 SHA256 e30356ab462326bfdd955c4e1258ef91c3c7bf81
 EBUILD samba-3.6.10.ebuild 11865 SHA256 b240cb91156fa8c976e731b67f0b787c893504688a7cff1ce09c0a36908fea6f SHA512 a291afa5312560dc3ae8556ef73a3e6acacfa35ae37ab6912bb195a7a2a1f78360c8aeb263aa68288828c081bb7758d5201f1928d683af4c92a7da4f8b39019a WHIRLPOOL ad32f0b4009a051334ff384ad580e8b88ac26294896538d6a5ea3c08f437c8e4e790ca0698bd92dede389aa7970a7e3f8faada43566e9862bbab3ff20fe2706f
 EBUILD samba-3.6.11.ebuild 11865 SHA256 779aa21eaf90a721c5ec2b67fee1067e7dcf39671d85120eefaad7620b0e0ab6 SHA512 1198b54dfef2c346dd1f3d5a591537f0304076720ddf40e6afbc4d220aa858e71cc281b7ed70ec485c3b967868a1526b14931d322a31469a884182b518c67229 WHIRLPOOL f3c5943f0153634c9e14edc630fbc51afdcf56d4959cec04e2256bfb7350a3fff39bf8b6b4b73eeef92b3531e720b9e0d86bf479a1f98d91db2554f2f2285de7
 EBUILD samba-3.6.9.ebuild 11843 SHA256 c12e87494c00cbcc91ad1c6d427d6bc34ff86d77137882fd1101cad04e81a855 SHA512 84d4116f75f004d0dadbc143519eaa9174c5d0cceb606a7615c3eb192eb615dfaf9edfebb676a9a6d30e975ea48b8f1cfb118f07971a4676cc3ebf905e680ed4 WHIRLPOOL c69d7caa67ed25f4a62c3f28ba94c48cb5d251e7935ae559a6bffa88451cd9e9ce055628644a639bdd2f87c0e7334071ab2e82007c33f75cb832e06c9e378aec
+EBUILD samba-4.0.1-r1.ebuild 4089 SHA256 2cae775a2857caa32b0fe931f802712221dee7ef9e4ab2d79fc7d203746361ff SHA512 3af1d7111a19a972368b201fad5952fcb1fad1b8214c7a2815937a1fa5e3999e1a7445f08f68a2c6e1890ce3df34645ae0a6fcb5cf119b621217585ad777d825 WHIRLPOOL 808f07924008d8aea6a50d6a649bded3f33504d97dd84f63e612ce3874051cb9d0bf7ef68ffa08ae1a59dd56da118ae5728523ec6c9db934925b13f8c7dee337
 EBUILD samba-4.0.1.ebuild 3990 SHA256 4b067cd86fdaf4db4d80ab0e4a9fb356f23ca8508da455b538c8493832587556 SHA512 2afbd30b3164edb30e9cda167985dd66380352e088ccde2f1d57c9f3ccf649699f6b9df75f3126937ab4d0deab5b2a4e3717941084d4bd0c84461f551e7fee56 WHIRLPOOL 37db16ac12543cb3a7c6e688b3ef41ae38c45bb5805ced164bf24c49509d6be9c10e906b638657f751abb0ececbf1110ae3d6a7b18df31fe891c4539fe38fd17
-MISC ChangeLog 92165 SHA256 767ebf733912eca63d003cb2810d13580b84595ccfeb66591a8eb7046dc749e5 SHA512 724fa0f9257ba98a9c19bfea7ebdba79d6d214fba81ba717cf9c70f9805f9151af4547e5923770478ccdd978c874fd08470a9d3b6e4e0300a1ff6803e087e47a WHIRLPOOL 8f365667601a15a3a047c81b3e9b7798b36c6ecf2cbefd72e3901c94d05e801df2c9aac51a05c30659e713a8b53eeb7e8c92e2a200fe11b6b686657bac54c956
+MISC ChangeLog 92384 SHA256 7947fef6008ec3223961dc7e12707b4eedd9b6e9132959507ba814540fe9dee3 SHA512 f746c89c45706a03706e5e4eb82af7c9e095afd6046f4548808ec97cf16659b11a860b11b113015eaacfd77942ed1e2404fc315b809f0c8aefa6294e4c4d5c6d WHIRLPOOL aeaa48abf67dd09e7090bec863561c190788bfca94f7e5ab8e0fe478cff7a37fc865dff0d9befda351841dc0ed5aa5db67553f779e24a9f1ccc176da62d850cd
 MISC metadata.xml 1514 SHA256 c10deb71703017ec67f4e5bac297d9b4581fec3d8b5549b6aea2a43bda642bc0 SHA512 9e67e8f7e0c972046e32bf4539142559c24183d6c3469e5af2f901728a3c02a9fbfd50e948a9fd414107fd0cb2a8de709ffe3fc5bf3372c77a4a3db6dc622ecc WHIRLPOOL ec92ea6a1b03e70c791670e97e7d9e07e6bdb82c24ed08c186e786afcd009ab63fbee7d481a4cdc394632ad312e58a2048dae3ff333f6f7a1ad19add55e2c8f8
diff --git a/net-fs/samba/samba-4.0.1-r1.ebuild b/net-fs/samba/samba-4.0.1-r1.ebuild
new file mode 100644
index 000000000000..abb8a8f012f8
--- /dev/null
+++ b/net-fs/samba/samba-4.0.1-r1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.1-r1.ebuild,v 1.1 2013/02/03 08:23:28 pinkbyte Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit python-r1 waf-utils multilib linux-info
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+if [ "${PV}" = "4.9999" ]; then
+	EGIT_REPO_URI="git://git.samba.org/samba.git"
+	KEYWORDS=""
+	inherit git-2
+else
+	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="http://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addns ads aio avahi client cluster cups gnutls iprint
+ldap pam quota selinux swat syslog winbind"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/iniparser
+	dev-libs/popt
+	sys-libs/readline
+	virtual/libiconv
+	dev-python/subunit
+	sys-libs/libcap
+	>=sys-libs/ldb-1.1.13
+	>=sys-libs/tdb-1.2.10[python]
+	>=sys-libs/talloc-2.0.7[python]
+	>=sys-libs/tevent-0.9.17
+	sys-libs/zlib
+	>=app-crypt/heimdal-1.5[-ssl]
+	addns? ( net-dns/bind-tools[gssapi] )
+	client? ( net-fs/cifs-utils[ads?] )
+	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
+	ldap? ( net-nds/openldap )
+	gnutls? ( >=net-libs/gnutls-1.4.0 )
+	selinux? ( sec-policy/selinux-samba )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="ads? ( ldap )"
+
+RESTRICT="mirror"
+
+S="${WORKDIR}/${MY_P}"
+
+CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+pkg_setup() {
+	python_export_best
+	if use aio; then
+		if ! linux_config_exists || ! linux_chkconfig_present AIO; then
+				ewarn "You must enable AIO support in your kernel config, "
+				ewarn "to be able to support asynchronous I/O. "
+				ewarn "You can find it at"
+				ewarn
+				ewarn "General Support"
+				ewarn " Enable AIO support "
+				ewarn
+				ewarn "and recompile your kernel..."
+		fi
+	fi
+}
+
+src_configure() {
+	local myconf=''
+	use "cluster" && myconf+=" --with-ctdb-dir=/usr"
+	use "test" && myconf+=" --enable-selftest"
+	myconf="${myconf} \
+		--enable-fhs \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--with-modulesdir=/usr/$(get_libdir)/samba \
+		--disable-rpath \
+		--disable-rpath-install \
+		--nopyc \
+		--nopyo \
+		--disable-ntdb \
+		--bundled-libraries=NONE \
+		--builtin-libraries=NONE \
+		$(use_with addns dnsupdate) \
+		$(use_with acl) \
+		$(use_with ads) \
+		$(use_with aio aio-support) \
+		$(use_enable avahi) \
+		$(use_with cluster cluster-support) \
+		$(use_enable cups) \
+		$(use_enable gnutls) \
+		$(use_enable iprint) \
+		$(use_with ldap) \
+		$(use_with pam) \
+		$(use_with pam pam_smbpass) \
+		$(use_with quota) \
+		$(use_with syslog) \
+		$(use_with swat) \
+		$(use_with winbind)
+		"
+	CPPFLAGS="-I/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf}
+}
+
+src_install() {
+	waf-utils_src_install
+
+	python_replicate_script \
+		"${D}/usr/sbin/samba_upgradeprovision" \
+		"${D}/usr/sbin/samba_dnsupdate" \
+		"${D}/usr/sbin/samba_spnupdate" \
+		"${D}/usr/sbin/samba_upgradedns" \
+		"${D}/usr/sbin/samba_kcc" \
+		"${D}/usr/bin/samba-tool"
+
+	# Make all .so files executable
+	find "${D}" -type f -name "*.so" -exec chmod +x {} +
+
+	# Move all LDB modules to their correct path
+	mkdir -p "${D}"/usr/$(get_libdir)/ldb/modules/ldb
+	mv "${D}"/usr/$(get_libdir)/ldb/*.so "${D}"/usr/$(get_libdir)/ldb/modules/ldb
+
+	# Install init script and conf.d file
+	newinitd "${CONFDIR}/samba4.initd-r1" samba
+	newconfd "${CONFDIR}/samba4.confd" samba
+}
+
+src_test() {
+	"${WAF_BINARY}" test || die "test failed"
+}
+
+pkg_postinst() {
+	elog "This is is the first stable release of Samba 4.0"
+
+	ewarn "Be aware the this release contains the best of all of Samba's"
+	ewarn "technology parts, both a file server (that you can reasonably expect"
+	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
+	ewarn "controller work previously known as 'samba4'."
+
+	elog "For further information and migration steps make sure to read "
+	elog "http://samba.org/samba/history/${P}.html "
+	elog "http://samba.org/samba/history/${PN}-4.0.0.html and"
+	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
+}