Version bump

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 383 insertions, 15 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 06dffacbd3df..5117920663c6 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.713 2015/03/08 13:21:55 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.714 2015/05/14 00:15:06 polynomial-c Exp $
+
+*samba-4.1.18 (13 May 2015)
+*samba-4.0.26 (13 May 2015)
+
+  13 May 2015; Lars Wendler <polynomial-c@gentoo.org> +samba-4.0.26.ebuild,
+  +samba-4.1.18.ebuild:
+  Version bump.
 
 *samba-4.2.0 (08 Mar 2015)
 
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 84a28e455731..d01d1990d2c5 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -47,7 +47,9 @@ DIST samba-3.5.22.tar.gz 35385144 SHA256 b4c98f77f5634478da109063334acd9b6ad7bcb
 DIST samba-3.6.24.tar.gz 34122116 SHA256 11d0bd04b734731970259efc6692b8e749ff671a9b56d8cc5fa98c192ab234a7 SHA512 40f054ab0e1ef07fa4bb4934229c42eb0e484596c4d4b81edbf43951acd56e7b04b6efb17e6cb269b329f1a84d60cbe10a3ff04e86c1983ec603bdcf7fc7ecbb WHIRLPOOL e98d3ae62e5d57e5d16b320213961ba7221b8b38912b90434296323549e1673f25682ec8da469dd771d68ec222a6be7d30e24224e0cde0d9dc1e9c393590c68a
 DIST samba-3.6.25.tar.gz 34121828 SHA256 8f2c8a7f2bd89b0dfd228ed917815852f7c625b2bc0936304ac3ed63aaf83751 SHA512 25a5c56dae4517e82e196b59fa301b661ec75db57effbb0ede35fb23b018f78cdea6513e8760966caf58abc43335fcebda77fe5bf5bb9d4b27fd3ca6e5a3b626 WHIRLPOOL 68c4a335b3912bf3c6baecae337b1131127515191052366ca9a04ec6d919f2fb69c912aefb087e2578134f3a9bde7b496ea880f2197a8dbf8221058dd1e8444d
 DIST samba-4.0.25.tar.gz 22150978 SHA256 e6a07940a658b81d368fc7ed8e5068bd27188996d73dee1cea9755682cb9a485 SHA512 ff8ae7a87c41b8b31ec5069b733b9aec4dffb082ffaa71f33cd031ac8b3e8b5ddef7e579048beb1fc7154f050347d80949cd662c08513a8e0bb6ee9baa84c32c WHIRLPOOL e215b604571feeffa8e52520753769a9a71a339f3c88fd30046bbf8a2b2cdd52b2fd8eac3f911a25fe607667e105aba2b72447d2c4195a5d465101a230bd62d0
+DIST samba-4.0.26.tar.gz 22155521 SHA256 ce2441992c6d18950d752edb2d1274b3f7e056b2e2e8516fc42e408e4a25894a SHA512 0df6f5961b2b6af1a4356540299acae52473f9d4342762d1556c859a36a63a7b8706c94f835581e96ecbf47a2d7fb09b67f93aa3869812215e9661dda7ee1906 WHIRLPOOL fda98da46719e6f4cefa58aef56f4d75120c4386b5e398e9b2ac3aa693255a6bce9606b1bf5646708d96e4f3c8982586501ccdae7c11f223b629ab128d33ae59
 DIST samba-4.1.17.tar.gz 19536407 SHA256 7aeb5d09e9c84bbeeb4b98d33404e9dbc4d99c54e64a447cc9c4d57e9255cb1d SHA512 19fa34521d3d520784d1eb85b4844fa59bf12468bf96b174b952eb63b6645a9eefb9044416829ffbe7a6a57abd28a227d1d57e1567cd46a1495c05a865ae75d5 WHIRLPOOL 1784c0db382e0940acc9fc1c1a0a2274b852bfdf2bf47604af4a253302ff95e2e43ad27e3b73afd8e4efb9fbefd4519b4e9b91bde79ac615881d6ae3f0f354a2
+DIST samba-4.1.18.tar.gz 19550894 SHA256 5bd302355c82195271de41d4f1e0c6353bde652a23886940b310b7734256f156 SHA512 1798fc23bfa282f4e0cc047e8da6fc553f4e56a19ec1f82877a7381b7ba2d97b4687de0d499a094e725e420303e2e07038a63b9cc463f97131b91c29c0919dec WHIRLPOOL fce4c07255c882c742429a91b6faeeb079a4c85a227b803c6e2e6b7531402746f57d02099bf5104c8c7db0190ff9ca9cc69797bf30000412aecbe90906a66100
 DIST samba-4.2.0.tar.gz 20682204 SHA256 66a6057815a971fee64fbe936ff6cbad542421a4bd52cba8d8d41afc9abc490f SHA512 ec6f1a6276087196450cf5774690cde564beb414ab55fb7db6991f8ae470d338fb9c2b12d38232b804436efc686450d1fa19a26bc234e9f63d8c569e321357e0 WHIRLPOOL a3c44ac80f22fc34b9bcdf8d4ad20a79b275d4f7ac0006e879df80c7d1e8f7f859e47d3020c29e709aca27102165efb169c325c6c4cb691f99dace893da5ad76
 DIST smb_traffic_analyzer_v2.diff.bz2 12226 SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d SHA512 aa0e457a0dd282e61e6dfcd5705c29b319832dca9711b1b5baf8373e2f079991399c3537c050219ccb861a93f86353ebff677a5c625d2e3f1f3a13ee5c4087d0 WHIRLPOOL 85ee72a360f67ebe71be5cd400ecd635280a0d7c64ebb8b94656a5ef1a94f74a987de86408af00ce1b81cc8363b1b3cf14726860d29b72ee610d4bab73d6b139
 EBUILD samba-3.5.21.ebuild 12311 SHA256 2a849451f886614315680b28b944840d1c670a2b878329773de63a72797a6fa1 SHA512 5006f1afdc2df93f317d15e1e9781bee20eb0e17e4a15892cb5ebe8bb2ab0a7a56bbbf2ed67099620391eda14b53a8fdb78a5ee9634a489915fcf84b031704b7 WHIRLPOOL a295b28990480ed3e13cf76d4f04270739b2669837d5ea93691888c488ee10dad22cd4bcc2037b09e66be41eda4d3d2e064e28701acb1f2dc7acf80935283123
@@ -55,25 +57,27 @@ EBUILD samba-3.5.22.ebuild 12309 SHA256 dc195567858dc0c11b2b86fc42427e1066c5efee
 EBUILD samba-3.6.24.ebuild 13517 SHA256 34686659fa4f283611d0469bf778aed6160a79100745dee23e05f14a13021db8 SHA512 3a614416b770a1ff19e1ccf604b2b6e7a8777c73cf662ddd9606e34125187a5e681774ee496b5de44f36e99973c906da019fbec6a17534859972884c3be1618c WHIRLPOOL 78dca5f9e07afb61308b40a3da1a6fcfea80969d6f08098b2b66bd5fceb4d84f77d8fcb939e0fcf64c94efa43640c973b01b416f191e17011d2fb9c8de584ebd
 EBUILD samba-3.6.25.ebuild 13518 SHA256 276106437cfc337e476e402146bb7fd5036711e1d77ad1f9d2fdf794cb7d98db SHA512 a813e2e6aa9ab65bd8b06da36e7124c45315f99a485d6b84b38733468bbb291833afb9d9392c15e3fd6f7e1f1d09043921990bb0e9c3ea991a3eedeb1aee422a WHIRLPOOL 79b51e9420b02096dc0b69af0d0cd6abe82cbc42ad4af702488223808fa6e23dfc1894281f2ade8db9c28f4a44b3a3961cbb8aaf6914c5255c9803c381b0a6ac
 EBUILD samba-4.0.25.ebuild 4873 SHA256 75b4385a15ecd85490687bae81fa46fcb3b1e78379a53a9e1a857492b371c912 SHA512 9c90b4eff6eab6ef80a1c44976c1d6f099aa34ead782e014f22dbe415f884092252812609f07c9f1b5216e0a43d9fa1f33badc0603d68b0feeb88ed60bc5dace WHIRLPOOL 648ffb43a1b5299d74c0d1d7c8608f4f78bd4144f568f5d5514568abcd7f28252330bb53b38e901fb8dbc10217c2f44e9fa4f7f9053dd57cd5ca77bb1125b0d3
+EBUILD samba-4.0.26.ebuild 4873 SHA256 2899177781d8b118281a2003624528bd8282b525c2bf1327a93e3087c3b4a363 SHA512 e67f69d8f79a295860d9a8d8ec8168e599b91c817b9075992b1512e0184ce3f66dbc9d4cad5e806c93a4c73d3002a70c9a9f931f49f73b686b2440e618d903d1 WHIRLPOOL 7835c847ee59dff6fb6bc1e98fdfce8d584f77ced38e2fd00fae240ad0e0dd678b9b0aa9378089c55e9378d5aaaf268bd917ddb5040913fc09ff478462e125bc
 EBUILD samba-4.1.17.ebuild 4870 SHA256 c385fad5eae0a6a3b69c5930e7b11e225f093f9b936582a05edfd013575238e7 SHA512 c0eff9fe40cd52cb6352af4564a9837e59dfda6512c262dce7ed4cc4b1f388d91ea90de184808251a92eb025d751f7102e6fe0f30c5da4104769b4686db508d6 WHIRLPOOL 0f700f7fd6dd7bd9056660d59bf426c0f8473dd837d28aa62432f55478e5cb71707c25ac6afa48aa897e7fb523096e59cee3b93f04d040ab0b67744d20d6b36b
+EBUILD samba-4.1.18.ebuild 4878 SHA256 777138944caade2b4e37f31e368a7ec1e9f1269f2e6d693042bbc9cafdeaeda2 SHA512 1d335a95b2467bf845295e53300e7d4b277c4e086d6ee725c85761daad89e52189454febaaf99e2383257e3d5aba0415b82a8eea3cb042593c8ac733e97dee61 WHIRLPOOL a4e18da3cd46dd1669256270835f205df1e67b0830830a98d3f0d18ed70dbf726104c4f8cb6f99e513651a0a198a50f26cd0e92a70614398fe5377ac6598585e
 EBUILD samba-4.2.0.ebuild 4833 SHA256 b992151a21dce533657f0789a71bc3b21fb8e6d02e104369e9f4f5ee589e94e7 SHA512 50801fdba5ea745ba6b26081cb24d803be5a3ce9533d83c7ddad258e2eb901692e739073a9ecd925a9c5a34ade7d327c59af97407344654eb6b8bbecec149ee1 WHIRLPOOL 738f41f8e78acc67b6c0441c1200f43cd0decacc489069976b9aab5e139ceae1d4d7f623647439b79c33de79e6545eb7a420db6cb918cb272b53ac444b34c54f
-MISC ChangeLog 10358 SHA256 52a87da087d1434725acd1039c598c23bca04b043422f8a6b103fa96234e3209 SHA512 65029ce039011f8a596041be0a89ef83ae0590bad541dc21cbc3220cb7e7e209845a89083de837abfe3771759392d14584d85397c49ad2c40ab669f9aae511f9 WHIRLPOOL 1f72465fa3d3baeb6c0fa233b55ddeac78f5344f64e6f2ebabf065beb1e2d70b209a61c8ef3f98d017cb77fbdc12fcd7661fa4677c8de33f17ac80584e828eda
+MISC ChangeLog 10532 SHA256 734172a9bf8bd5e69e793146ad32ba34e183c7c02ca09875a6562c58e0cf0138 SHA512 1d1f49a9c7dac60b8b9bbc9ea94cae793314766ef1b391a4b15d03807c65247cb55ebefc5930629a89e9d020eef024d392dedb8f5bf1f1e3643f9af48424fa47 WHIRLPOOL 9644984b560f3b8fa923302c5de0f32121896739697f6d01473204a6db316eb24a447634aa0de91e3d1fba397bfcb224a0f85245b9ee08642de5fff9938885cf
 MISC ChangeLog-2013 106689 SHA256 00ac832a137c7ce1d21be794b45339e1f4e9c51eb1b796cbcac90a03e1cf5453 SHA512 9dc4e4e22042db7f5ff3a474eb7a454044ea6958ffc3ba5c5de6f09608cfbbcaed8db00763a38995276de03a5f1c728fc783d4addaca7da16f4be76a4e49fd6f WHIRLPOOL 85a746ae34c0386ecb151f5f323b92615cce971b1e46f249cccfdc682bdddd7dad080dd4ffbe5748f093ee11db3f5182cae6d85191a37014639a56040eff9644
 MISC metadata.xml 1514 SHA256 c10deb71703017ec67f4e5bac297d9b4581fec3d8b5549b6aea2a43bda642bc0 SHA512 9e67e8f7e0c972046e32bf4539142559c24183d6c3469e5af2f901728a3c02a9fbfd50e948a9fd414107fd0cb2a8de709ffe3fc5bf3372c77a4a3db6dc622ecc WHIRLPOOL ec92ea6a1b03e70c791670e97e7d9e07e6bdb82c24ed08c186e786afcd009ab63fbee7d481a4cdc394632ad312e58a2048dae3ff333f6f7a1ad19add55e2c8f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU/Ez0AAoJEPiazRVxLXTFGp8P/0Ywr8eW1/YwIqgEXRlOPair
-jg5tcB8YWrw4hc/UrKnLlh/U9nYKs2u6V6Dn1QPqHDKYw/kc8QO1tbP3tpjc3vUO
-h9F+bqKLv5TavSWvyEpflmgyi6PVApdvHggNHt21kc9t2fWeeTNFvvwDL+9bNGrA
-wQdZRc+MGjWsTekTyb7yxwbaQWcWXCqH7inEc9oHYUiNxyeiJnKBhIT6aw2x7pu7
-xBUGA/2PJSzmtgSWhlVQiD1gFt14Dv7K0KqbSz4lTmH+Eq5cqQGsOg5zM2hqAN8e
-cUN4o+RSX18o1IjGZ+cIFTi61bI8+S2OkO5aiUqhYv40lgsYkFmSuAcThA7cU1Fh
-TZJNFi4lk6DO9DxcLIRYP080o7UXuRzsvRN+RkKGXSVFo+xBFa9ajZt0r2VjJ8K2
-dqxkC7yI8ZirZfCDGpRHxO4PvY6ffEsEwMua2ZQ025T3OfFosvgmmXv6MsWdZyLO
-TbyOZeUK0AdmcVckjv/eP//T2xEMhmDn6nwfK1hif6R6r9aFxzsmdUPwubOqWytv
-ipjyIJ8IIVMqDQDqmaWk/pwECfChfJnmvUnJ/HTJb8L5AF5bDogL7vXrCLKDN8Dt
-Aq4bcHA7j2xB0AjMII3J/8sT9vs+O7IBpslF2/3Dyjc0EKR1+dc5uTaewkgmu/qF
-yTjtTbg4FIwtXC0QIIng
-=19AI
+iQIcBAEBCAAGBQJVU+kLAAoJEPiazRVxLXTF2hwQAI3ZC3pW8B/43EaTLwftrR8W
+g8SstU0UckkwQgpy5fIF7WjDUYAucd0TLrVwK1RI8LMUmPYdfPEf+aPqS4Dq6gyQ
+Ac7UD82HUd3I8FMMyjoC14H57i0pWAC+uW8vXtuMlqEUODmv74t+wSAm3ImZ5zHc
+OlXwZxvyf+9BYwfkCW+rUUIA+5azCNxHGfP0yFH0seypq5jsixLxaXcO0B831oYE
+3JvHK8aG8O14Db3eVil9q+5D0zAm4GlU8tf+WfDi5+JglCWxWGnTqI0u23dt3t9y
+bNIXJkbZrjbfNxp+IF8rqerhh4Z8vgO9bwm2TPcfxzZLssx8Pvkqtgk215iwpGU6
+3PVh/miIHPmtDvnog9nqJERLV5NMGmoAvEWSmu6lvn4BYPnjXCN4DbRCSCArKUJk
+x57XyPdKx/pdHFmRxo1NxRtwQr8bvHfygtGiD7Qast+Ov2Yt1qGYF7jjNggL2DyQ
+gxLmxs28Oo4WVO2pSj7mmXbDYz7zoziHJV/MLn9ZsPpCxTg//ZXp/SJQsmgP71Xv
+7k8MLFFjDd3GfsAyg8fBsmQcbmc+0zYUc7vp5/vXqbimGxtYaSaXOAbzadQfTu7O
+n0wzPWZJBviEVkCntLynL6Pc/eN39HSgX1C9wINld5DUmi1LWVjmr979wpbrNp2i
+QjojTO83+H7z3qcSaVLj
+=BWDe
 -----END PGP SIGNATURE-----
diff --git a/net-fs/samba/samba-4.0.26.ebuild b/net-fs/samba/samba-4.0.26.ebuild
new file mode 100644
index 000000000000..7479b552d252
--- /dev/null
+++ b/net-fs/samba/samba-4.0.26.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.26.ebuild,v 1.1 2015/05/14 00:15:06 polynomial-c Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-single-r1 waf-utils multilib linux-info systemd
+
+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 ~hppa ~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 dmapi fam gnutls iprint
+ldap quota selinux swat syslog 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}
+	>=app-crypt/heimdal-1.5[-ssl]
+	dev-libs/iniparser
+	dev-libs/popt
+	sys-libs/readline:=
+	virtual/libiconv
+	dev-python/subunit[${PYTHON_USEDEP}]
+	sys-apps/attr
+	sys-libs/libcap
+	>=sys-libs/ldb-1.1.16
+	>=sys-libs/tdb-1.2.11[python,${PYTHON_USEDEP}]
+	>=sys-libs/talloc-2.0.8[python,${PYTHON_USEDEP}]
+	>=sys-libs/tevent-0.9.18
+	sys-libs/zlib
+	virtual/pam
+	acl? ( virtual/acl )
+	addns? ( net-dns/bind-tools[gssapi] )
+	aio? ( dev-libs/libaio )
+	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
+	cups? ( net-print/cups )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gnutls? ( dev-libs/libgcrypt:0
+		>=net-libs/gnutls-1.4.0 )
+	ldap? ( net-nds/openldap )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	client? ( net-fs/cifs-utils[ads?] )
+	selinux? ( sec-policy/selinux-samba )
+"
+
+REQUIRED_USE="ads? ( acl ldap )
+	${PYTHON_REQUIRED_USE}"
+
+RESTRICT="mirror"
+
+S="${WORKDIR}/${MY_P}"
+
+CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+
+# sys-apps/dmapi is an automagic dependency (see bug #474492)
+PATCHES=(
+	"${FILESDIR}/named.conf.dlz.patch"
+	"${FILESDIR}/${PN}-4.0.19-automagic_aio_fix.patch"
+)
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	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 \
+		--with-pammodulesdir=/$(get_libdir)/security \
+		--with-piddir=/var/run/${PN} \
+		--disable-rpath \
+		--disable-rpath-install \
+		--nopyc \
+		--nopyo \
+		--disable-ntdb \
+		--bundled-libraries=NONE \
+		--builtin-libraries=NONE \
+		$(use_with addns dnsupdate) \
+		$(use_with acl acl-support) \
+		$(use_with ads) \
+		$(use_with aio aio-support) \
+		$(use_enable avahi) \
+		$(use_with cluster cluster-support) \
+		$(use_enable cups) \
+		$(use_with dmapi) \
+		$(use_with fam) \
+		$(use_enable gnutls) \
+		$(use_enable iprint) \
+		$(use_with ldap) \
+		--with-pam \
+		--with-pam_smbpass \
+		$(use_with quota quotas) \
+		$(use_with syslog) \
+		$(use_with swat) \
+		$(use_with winbind)
+		"
+	use "ads" && myconf+=" --with-shared-modules=idmap_ad"
+
+	CPPFLAGS="-I/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf}
+}
+
+src_install() {
+	waf-utils_src_install
+
+	# install ldap schema for server (bug #491002)
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		doins examples/LDAP/samba.schema
+	fi
+
+	# Make all .so files executable
+	find "${D}" -type f -name "*.so" -exec chmod +x {} +
+
+	# Install init script and conf.d file
+	newinitd "${CONFDIR}/samba4.initd-r1" samba
+	newconfd "${CONFDIR}/samba4.confd" samba
+
+	systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+	systemd_dounit "${FILESDIR}"/nmbd.service
+	systemd_dounit "${FILESDIR}"/smbd.{service,socket}
+	systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
+	systemd_dounit "${FILESDIR}"/winbindd.service
+}
+
+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 "
+}
diff --git a/net-fs/samba/samba-4.1.18.ebuild b/net-fs/samba/samba-4.1.18.ebuild
new file mode 100644
index 000000000000..5f4b7303e8cf
--- /dev/null
+++ b/net-fs/samba/samba-4.1.18.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.18.ebuild,v 1.1 2015/05/14 00:15:06 polynomial-c Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-single-r1 waf-utils multilib linux-info systemd
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
+KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="http://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addns ads aio avahi client cluster cups dmapi fam gnutls iprint
+ldap quota selinux syslog 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}
+	>=app-crypt/heimdal-1.5[-ssl]
+	dev-libs/iniparser
+	dev-libs/popt
+	sys-libs/readline:=
+	virtual/libiconv
+	dev-python/subunit[${PYTHON_USEDEP}]
+	sys-apps/attr
+	sys-libs/libcap
+	>=sys-libs/ntdb-1.0[python,${PYTHON_USEDEP}]
+	>=sys-libs/ldb-1.1.17
+	>=sys-libs/tdb-1.2.12[python,${PYTHON_USEDEP}]
+	>=sys-libs/talloc-2.0.8[python,${PYTHON_USEDEP}]
+	>=sys-libs/tevent-0.9.18
+	sys-libs/zlib
+	virtual/pam
+	acl? ( virtual/acl )
+	addns? ( net-dns/bind-tools[gssapi] )
+	aio? ( dev-libs/libaio )
+	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
+	cups? ( net-print/cups )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gnutls? ( dev-libs/libgcrypt:0
+		>=net-libs/gnutls-1.4.0 )
+	ldap? ( net-nds/openldap )
+	systemd? ( sys-apps/systemd:0= )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	client? ( net-fs/cifs-utils[ads?] )
+	selinux? ( sec-policy/selinux-samba )
+"
+
+REQUIRED_USE="ads? ( acl ldap )
+	${PYTHON_REQUIRED_USE}"
+
+RESTRICT="mirror"
+
+S="${WORKDIR}/${MY_P}"
+
+CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.1.14-named.conf.dlz.patch"
+	"${FILESDIR}/${PN}-4.0.19-automagic_aio_fix.patch"
+	# support libsystemd (instead of libsystemd-daemon), bug #526362
+	"${FILESDIR}/${PN}-4.1.14-libsystemd.patch"
+)
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	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 \
+		--with-pammodulesdir=/$(get_libdir)/security \
+		--with-piddir=/var/run/${PN} \
+		--disable-rpath \
+		--disable-rpath-install \
+		--nopyc \
+		--nopyo \
+		--bundled-libraries=NONE \
+		--builtin-libraries=NONE \
+		$(use_with addns dnsupdate) \
+		$(use_with acl acl-support) \
+		$(use_with ads) \
+		$(use_with aio aio-support) \
+		$(use_enable avahi) \
+		$(use_with cluster cluster-support) \
+		$(use_enable cups) \
+		$(use_with dmapi) \
+		$(use_with fam) \
+		$(use_enable gnutls) \
+		$(use_enable iprint) \
+		$(use_with ldap) \
+		--with-pam \
+		--with-pam_smbpass \
+		$(use_with quota quotas) \
+		$(use_with syslog) \
+		$(use_with systemd) \
+		$(use_with winbind)
+		"
+	use "ads" && myconf+=" --with-shared-modules=idmap_ad"
+
+	CPPFLAGS="-I/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf}
+}
+
+src_install() {
+	waf-utils_src_install
+
+	# install ldap schema for server (bug #491002)
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		doins examples/LDAP/samba.schema
+	fi
+
+	# Make all .so files executable
+	find "${D}" -type f -name "*.so" -exec chmod +x {} +
+
+	# Install init script and conf.d file
+	newinitd "${CONFDIR}/samba4.initd-r1" samba
+	newconfd "${CONFDIR}/samba4.confd" samba
+
+	systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+	systemd_dounit "${FILESDIR}"/nmbd.service
+	systemd_dounit "${FILESDIR}"/smbd.{service,socket}
+	systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
+	systemd_dounit "${FILESDIR}"/winbindd.service
+	systemd_dounit "${FILESDIR}"/samba.service
+}
+
+src_test() {
+	"${WAF_BINARY}" test || die "test failed"
+}
+
+pkg_postinst() {
+	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 "
+}