Samba EndOfTheWorld 4 version bump bug #195703

Package-Manager: portage-2.1.11.9/cvs/Linux i686

3 files changed, 30 insertions, 28 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 44237b5b0164..58e8a04f0f1c 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.547 2012/12/20 13:35:59 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.548 2012/12/21 18:18:08 vostorga Exp $
+
+  21 Dec 2012; Víctor Ostorga <vostorga@gentoo.org> samba-4.0.0.ebuild:
+  Samba 4 First Release, including fixes from everyone in bug #195703
 
   20 Dec 2012; Andreas Schuerch <nativemad@gentoo.org> samba-3.6.9.ebuild:
   x86 stable, see bug 432754
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 0b73afabc475..04746c1231a4 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -38,14 +38,14 @@ EBUILD samba-3.5.15.ebuild 12388 SHA256 df87120eb18e960cc2d77d5158ef81d3dbf34a47
 EBUILD samba-3.5.19.ebuild 12464 SHA256 936b24f5a5fe2d9fc7f0d5a7307395eef3e7fc0007cdd9b68f3ec7bc14c7ccf4 SHA512 03c4cb8cc9e73771753b39cf2fc1c2e350cd7c09bc08d0f3f0748d13769fadb0bb08a6855d8f27201412a6ab16cf32c2ce665a53d4d1714462de552ef66f6ab4 WHIRLPOOL b476ee0c7637cb43eb54541add97410c7ec2e5066d546aee7df40309d57978b63a5304a34fd779b448a530d8b0ada178e38eb4a8c43fe7aa4216ee6269e4ab78
 EBUILD samba-3.6.10.ebuild 11843 SHA256 2f6ee70a12ab5863675cf56ec7303cf95594b13893226f06eb2cf4488d8a31f7 SHA512 4cc8c3423f2b5f62b1fd36b3de5cf8a1be41f8208d842c4c81b28c4336c29ea155677d4e28c6587ff2752ae6c43c020a652137f74354f488f5e3fa4101ade774 WHIRLPOOL 52c4b0a765763d786c3f5770158275b185113563065af3fe5d036aa36b061ea6f881f273cfb0c85abb176941d9768447b5c3c1cff65f7200b9b06ad6e8a969eb
 EBUILD samba-3.6.9.ebuild 11833 SHA256 f2a173ddc68d2e6b62cc28925287586d8f1dbaa90d049acfbf40f833e6b7fe84 SHA512 9b21b21ff112bc3c554b605fb649bd8d91ca7dd5d78d7f0bcceafc5f5eb914b0b836df90db9f73706e8d283ef6dd363bcd3d624c886b41a33e5cd9684141fa65 WHIRLPOOL 47a12f01a9b30b35ff6021421f282fed5c8c8792c9234fc425ee27b68742988af93593bd63c4595b7f7aeab9f1d9253e3a530c7b2c6e39088220a8426e036d1c
-EBUILD samba-4.0.0.ebuild 3881 SHA256 7fae4f9e0c6b02992a70d0ce110f55436c20f92b81351a8ec4729f958a618be1 SHA512 112e323af226a59e38160515ac135a265269931b6450dbf62e2414791f6841ac7a6682b38e9b458cc831a32ee0083814a5487ad91941804e6e03a6fde84d7537 WHIRLPOOL a35b182a62e1d07f6c99d0c39273ad67d89a0964d1e11d156847af9e3c6f1e18acda70996d3758ebecaeb19ff3ba9d313cd7d7fddd69d69750090fe5f993b910
+EBUILD samba-4.0.0.ebuild 3991 SHA256 ab6b9554077d11d1fce7f75ef163377d43beab2b01e5efb86aea0b015d070f5f SHA512 9410f6e5c761a70e12950fd3d0c086c815d9c3290ed019c7f14be9f10ec51c25eb8020faaf8675309b9aba97ac89c2017d6542e3f2f05346036842d86a548971 WHIRLPOOL d032f61e1b8c422ed523367b58182a7f34a07aaecbef2c26ba35ac8d6f038211dd1e1be1e4b8d2e7a8510d4880797b3849ce9a7d2417f17d7facf94fa6b1f262
 EBUILD samba-4.0.0_rc5.ebuild 4235 SHA256 b68ed65c086f5e4829d1f1379d00870feeff45683239feec6245ad325d14f08b SHA512 7c03174e4cd2db111dd24512a12366a3104e437ebeceeae734f80caa2379958551ac949bc9d62523fcab5b9f71050aa4493ebc5921703c4b0607edb7611ea13c WHIRLPOOL aad45799e65ac5de203b6bf4cd28d69691beb7ecc5eef190bd53c0cef97ac1fade99e1c8394b21f7deac595f9293c4b4f6ad4014ddc79d95483c1b61293cffa6
-MISC ChangeLog 90766 SHA256 5bd50dd28a654d8d5cdbd7606fcc1974eed9326241dbc4798413af9e1875961a SHA512 ed146a839485be3d45e00e81d640ee6cc3322f48f9a37d08a045900a2336899008b58665cabecc028838809b22efe0c0017202bc44122d65527ef15645c7ab74 WHIRLPOOL 6b0f8cb312cd6fefa9d90bebc2bc9aaa31ee0d88c2dc550533e678fc0bc841df25a31eb0ec61103bc81b4a98e80578fc74f4599f39427cff7a39d4a45d57a032
+MISC ChangeLog 90909 SHA256 f45d8390581076c9539b78630426fef742b57411087af9daba5b59c038a4e00b SHA512 a13ebda181ae7340f1430f08e97d07cd58f5282336c4b58362979efc089d5289c42d6124a55f3883d8ed51fb7d991b2f21ba7e1c101db19e3d540851977029bc WHIRLPOOL 4da947bfdab0b8177e6360a24c1ae562e5fc1d99b572cf11021da5f244ab40afd82264a01a16ea38f8a92d0eae57e0134b3f467912be2be7cfbda521c25dab58
 MISC metadata.xml 1580 SHA256 bcce2c1233c04b8066d36ca7aae3027c8618eebeea88ebe82e54cbb536c2a0e7 SHA512 38c688ed70818517bb21870872b39e478651b93d380cb36acd8b30c4db691d8157776a3f8eebf93731e6b7c2b5f06d96e202331d585e266a0fd3b12b890697aa WHIRLPOOL b8c85e3168186acd9c157b2e4541c6518a06fba8f319bea38f58078c0bd4a4dd6482a1f1a0eefda4d0cc41c4b4f22e215f15f48244a32e1e7710e71c8b3b8bce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDTgu4ACgkQakKUmsHeVLIIPACePAjJimzY9sa5THVJZ8Q3IbB5
-yqMAn3pzpdeAEOp49rNxitVTHFyZVZG4
-=/kKc
+iEYEAREIAAYFAlDUp+YACgkQKQaZ7OJe4zZEZQCeKc/zAYjbRBk5X7OQO1iMKw89
+F/EAn2GSH3lB/1grNLHZC2LKhW//oujn
+=pUUR
 -----END PGP SIGNATURE-----
diff --git a/net-fs/samba/samba-4.0.0.ebuild b/net-fs/samba/samba-4.0.0.ebuild
index a6ca08d7133a..d919db41b2bc 100644
--- a/net-fs/samba/samba-4.0.0.ebuild
+++ b/net-fs/samba/samba-4.0.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.0.ebuild,v 1.1 2012/12/12 04:50:23 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.0.ebuild,v 1.2 2012/12/21 18:18:08 vostorga Exp $
 
 EAPI=4
 PYTHON_DEPEND="2"
 
-inherit confutils python waf-utils multilib linux-info
+inherit python waf-utils multilib linux-info
 
 MY_PV="${PV/_rc/rc}"
 MY_P="${PN}-${MY_PV}"
@@ -25,7 +25,7 @@ LICENSE="GPL-3"
 
 SLOT="0"
 
-IUSE="acl addns ads aio avahi client cluster cups debug fulltest gnutls iprint
+IUSE="acl addns ads aio avahi client cluster cups gnutls iprint
 ldap pam quota selinux swat syslog winbind"
 
 RDEPEND="dev-libs/iniparser
@@ -44,7 +44,7 @@ RDEPEND="dev-libs/iniparser
 	ads? ( client? ( net-fs/cifs-utils[ads] ) )
 	client? ( net-fs/cifs-utils )
 	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
-	ldap? ( net-nds/openldap[kerberos] )
+	ldap? ( net-nds/openldap )
 	gnutls? ( >=net-libs/gnutls-1.4.0 )
 	selinux? ( sec-policy/selinux-samba )"
 DEPEND="${RDEPEND}
@@ -59,8 +59,6 @@ CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
 WAF_BINARY="${S}/buildtools/bin/waf"
 
 pkg_setup() {
-	confutils_use_depend_all fulltest test
-
 	python_set_active_version 2
 	python_pkg_setup
 
@@ -80,12 +78,8 @@ pkg_setup() {
 
 src_configure() {
 	local myconf=''
-	if use "debug"; then
-		myconf="${myconf} --enable-developer"
-	fi
-	if use "cluster"; then
-		myconf="${myconf} --with-ctdb-dir=/usr"
-	fi
+	use "cluster" && myconf+=" --with-ctdb-dir=/usr"
+	use "test" && myconf+=" --enable-selftest"
 	myconf="${myconf} \
 		--enable-fhs \
 		--sysconfdir=/etc \
@@ -113,7 +107,8 @@ src_configure() {
 		$(use_with quota) \
 		$(use_with syslog) \
 		$(use_with swat) \
-		$(use_with winbind)"
+		$(use_with winbind)
+		"
 	CPPFLAGS="-I/usr/include/et ${CPPFLAGS}" \
 		waf-utils_src_configure ${myconf}
 }
@@ -129,25 +124,29 @@ src_install() {
 	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 || die "newinitd failed"
-	newconfd "${CONFDIR}/samba4.confd" samba || die "newconfd failed"
+	newinitd "${CONFDIR}/samba4.initd-r1" samba
+	newconfd "${CONFDIR}/samba4.confd" samba
 }
 
 src_test() {
-	local extra_opts=""
-	use fulltest || extra_opts+="--quick"
-	"${WAF_BINARY}" test ${extra_opts} || die "test failed"
+	"${WAF_BINARY}" test || die "test failed"
 }
 
 pkg_postinst() {
 	# Optimize the python modules so they get properly removed
 	python_mod_optimize "${PN}"
 
-	# Warn that it's a release candidate
-	ewarn "This is not necessarily compatible with samba-3. Read the wiki page."
+	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'."
 
-	einfo "See http://wiki.samba.org/index.php/Samba4/HOWTO for more"
-	einfo "information about samba 4."
+	elog "For further information and migration steps make sure to read "
+	#elog "http://samba.org/samba/history/${P}.html and "
+	elog "http://samba.org/samba/history/${PN}-4.0.0.html and"
+	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
 }
 
 pkg_postrm() {