Version bump. Removed old

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

7 files changed, 155 insertions, 118 deletions

diff --git a/net-fs/cifs-utils/ChangeLog b/net-fs/cifs-utils/ChangeLog
index e89faacadd1c..dd1dceabe7b8 100644
--- a/net-fs/cifs-utils/ChangeLog
+++ b/net-fs/cifs-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/cifs-utils
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/ChangeLog,v 1.75 2013/12/24 16:55:46 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/ChangeLog,v 1.76 2014/01/11 21:39:28 polynomial-c Exp $
+
+*cifs-utils-6.3 (11 Jan 2014)
+
+  11 Jan 2014; Lars Wendler <polynomial-c@gentoo.org> -cifs-utils-6.0.ebuild,
+  +cifs-utils-6.3.ebuild:
+  Version bump. Removed old.
 
   24 Dec 2013; Agostino Sarubbo <ago@gentoo.org> cifs-utils-6.1-r1.ebuild:
   Stable for ppc64, wrt bug #486312
diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest
index f76a3d06ce74..b7cb8339fafd 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -1,33 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX cifs-utils-5.5-initialize_rc_var_properly.patch 1033 SHA256 c341bd479fd4e1587bf53db3e525b60f25368ba2860977235a64fa3988671ec9 SHA512 a81a7f36a11d43bdd1b08ed95aa87db1d6f4143a5f172aec1692d089cb4a8e0d0ab7b12a7cedd132182debe2e757c497a7840f3e7003467747712e2d1964617d WHIRLPOOL 157dc9c5939c4f2e4c1f399bb63a4a803af4727ad73df3117a7f674083bd17ba7df22810f6ebc771425010fbda7866b3f818b41d2a468b50d3ad0c15c34ab2da
 AUX cifs-utils-5.9-set-parsed_info-got_user-when-a-cred-file.patch 1165 SHA256 b501c3a0665df177ea3faa682db98a559c736eddb2ef2eb91746ecedc60f8100 SHA512 a479ed28f9266bb0b2ef416d442c37d818c9ed7f141467c28c67e03cc27366cf5f75a8ed7ad8380407419981efa8d40bb8722b50a28bcfedade692d4d95918d8 WHIRLPOOL 91ee78b340e4d76fd3e98130db50599714a8042270df660650b54032e90a39c986f8050f9e7c21551360487b2e3114e759c5f6cdd58e1d68d4039f1c6fdacaf7
 AUX cifs-utils-6.1-hardcoded-path.patch 1513 SHA256 2a0415b1452f3033c8322ed102b9acafbab9640f936254002d1bc493a0e6d7d5 SHA512 3ad0fbea11cd6a4bf6072e1131ccf87b0b81a9c869e2ee199f655ebc974c5e79f87694aa162ce2911767b6689f3b7530895b835d920575b5c37ac8fcd8cf4aad WHIRLPOOL 8684a3a3de491f9bc17070c8ad9d53bad14f5af62692e805bdd548bd4ad731096c01ce580b9800b053fcf583ee7af4166cfe00761f207934fa75b0223b22da76
 DIST cifs-utils-5.9.tar.bz2 388403 SHA256 ee0d4ae25c54f47362ef4c97cda142224360a2c4a5a8fbf71d87003bf3eaaef2 SHA512 c4d789c6dce2c0927ccc9359147c12151ea9a688bc376c1df21deec66a98669dc4fb6dd8e26d549475d0bbe1e5449ce08fb86e45c765eee7013ec2040c23600e WHIRLPOOL ef4c9b23b2e12a53d936acd19ce10fbe347279ee3c2914a2cbe26d101898bad22606c622ca005af68e0c44605c4137b3633691171387e269caf06542919cec90
-DIST cifs-utils-6.0.tar.bz2 388957 SHA256 f7bc15cc09082eee5e6c9647e826aaa5e73da41646541bb7a50f53f78a6ef8bc SHA512 38ec543110743ace17019d383927f362e55f9d1ad260f897ee443917f7acd6eae1b098f935d5cff077141d7710106378062a9ead6c39c8b15335a6d3af0d3d12 WHIRLPOOL 2a66218c9d31e34a3e7d42e682afa6792cf20601f0e7aca723ba62c0644628426736478f79db32a373318614577a936bb4b407f33e894857f280bb1272354d4d
 DIST cifs-utils-6.1.tar.bz2 390958 SHA256 381f1e9caccdafdcdb0efa32a4cceb77c1a96b0b58702394e4b86dac4825f3b5 SHA512 6427b74edbf56b865dee38a610c74ac5483cdc13096082cfc1e9d225a048c9b5ee0c7afb30e625a615a0e8e9f3767e33765220e27148e2c2a29d12d4129b01fd WHIRLPOOL a800a02a0729996035a331b460cb28ae5463ddecaf205d88173dc08efd7a2bee577995ebba97b36977858c8435ac3b7ec9c7ce5d193f8b30d0602f9546fed5b1
 DIST cifs-utils-6.2.tar.bz2 392856 SHA256 34676e374ee139ce1b6566ed1802c55f92b5d74cc58417a4989df7438ff2cd33 SHA512 dc7060d3da65b706ce491a0c1fd113440f93787b79b29fa6207f96b538a2403f54e5e780418e0ad0b65e14eb45d3b0d50439253266c9d12b0d9f772954031ea6 WHIRLPOOL 5c3414babce753916e1d5660ac5b607c2791fc323d1736e07bd392b71bd3a660ca37257af7f61baed1df5188047d336d7330ae7c9c0980407f0ade74c14d2bc5
+DIST cifs-utils-6.3.tar.bz2 392465 SHA256 fff73b2a2547628acba05d324cf096e50f13fa8712f01bf0eb0dbabfe268375b SHA512 d1a16d56852d0b7570c795e04b6cee89a678e18401ec4a48bf734e5c941518c70d2cf82e795ce857c9aad07d9dfee68e96524e5d6e1392283cfee0a8b38e185e WHIRLPOOL e983ce227234cbc3141aac96d41a576b3bfb8a7cd0ea85191287d489b595e22e20bc9115a92b803da49931bcb7ac567cd3133b5729105ce99f6ea39c504535a8
 EBUILD cifs-utils-5.9-r1.ebuild 2481 SHA256 41f3c1edaea4542178c93fa889b2b88bab9b3330d3751dbdf8b8e9ccfa0f8c26 SHA512 a8ba06aab690449f5d57e63f64f1010744bdcad7bb827b163dbba54c6f041679dcf47d191ceca785a0b8e9f1a1f53d638b993033991f02dd18afefef6fdfb33c WHIRLPOOL 4e9ac7b70e33fc7a21507207624ea8d8ba531e11a383745d25dd84ec6c65eb49beb0b85624b864d49c9bf55a0ea629639e4d77e01d16af5de72026c6815e5c99
-EBUILD cifs-utils-6.0.ebuild 2379 SHA256 7c38f07a707eba179910f100ed78a87a3ae26c0fdc3c34410577f00f9f4a92c1 SHA512 ee5a5a1b8375e2d3654cd0ee68f178aaaf112fc2a35ad2445107c6692a1eff2476c5c37d10da048eb7e09ca9363d9c33a6a39b74ef3191db46c0a7375b8217ce WHIRLPOOL 10266603917ba755138064a640f11ced6ba38dd0e985623506bdbf4596a4c9107a89124252188ce297f1f62642f9f8ea3ea762ea322f7de235fd6ef07aee9f58
 EBUILD cifs-utils-6.1-r1.ebuild 3089 SHA256 b9ccde9490ebd0eddffa30b090a9e9f2aab5f82b17148c47a88b09ce45773b36 SHA512 7599330da3ac9071fd7f0ee236f4a7ca2610653d9c4ac6370181f1933f285b02d5a1e470ee708e4c4f5df53e24025781c2e4ff74b07b2078ffa8c73bdd8a149a WHIRLPOOL 6baed657e1f1b5f62afe475d00914dc8d260b9045d6b72ada75c6198452a74ab16a61b8fe900298e50d92afede0f7ca8f07a3c2cc79f6506858024f67e810593
 EBUILD cifs-utils-6.2.ebuild 2961 SHA256 e1aab0cc9b5949161068df14e6de8e7879caeff03eb959c1efb6638485a04ec8 SHA512 4d1e6a80336ac438c1f0b9d043bc87e590ab249d8785ac689b57b3134878abd5fdddfcc26e835ba2a059b23f92877e7bec25482bcabaafc45a5cb55bbff7ca77 WHIRLPOOL f462ee4eec20a769262035f654017a647cd6bd584e96876597179d3cd895af3d696fac1a1769a5afdd78b4bcdc4ba1e8e69b4d9f810cbe4711813c21fcda401d
-MISC ChangeLog 11597 SHA256 42aeee80e6f1f5fd20d9c2837dd5d7390a062c81d723c39150ffdca732cde1a3 SHA512 c98d4ae1c2bb84c1096b9e0c7938120b38be9fa7cc555b13c23482ecdee6584a44f6ee27275b073228c71790d72bebac35cd9ac1dd4f76f3271a39e72234bf34 WHIRLPOOL a63c70650d29b9eb3c5226cc15c8f1e5aec0e351d5d4dfb72b27ab3ed1d8dddfb0351e709bda2035fce69e2f82fa4a21fe15caf21ed01ac21df25ea71bf5d7eb
+EBUILD cifs-utils-6.3.ebuild 2962 SHA256 5e3e0f304dd593e19b988b69d949e26f63741a9097dfc74211ffb8fe937f5a8d SHA512 eb85bc999b3cce13229feaf0e9da91bfe9d5e4d9c950f3dc61708684831cfb4bc2a428edff0f748f25844a878eb01ec347f80ca3c1c7345a78ad6ef1876eb90e WHIRLPOOL b758d1ce5ff2f71035fb3159266c1b1215c9f91b2702a55a72039432933b6a4958ad802eb2aa2e70fdbbaa4049040fb702e9ba55665f8c3fe9e2865bd5095c35
+MISC ChangeLog 11771 SHA256 ef0dfaa8549f52f6f6a4bfe0d0f2c3166008bc3712cf11eb048c99a6431ca390 SHA512 12eaf13ed934e2de2fbf483a8d8013a064e68a7c44171953d798be92775ee81c27b1e02f5eb6323d94a85e6a0a5732872a9d069c78d92f5bbfde89276f7ac23e WHIRLPOOL 08ef51ebbe7fd793625feb5c49b169c7f19f77b36aef929393d7ac22f7887a1cecf3a18f4967c9f8f4c0548141b55199a172f570b0a4ec17c3aa55c18a4b4a6b
 MISC metadata.xml 894 SHA256 8d598e43e3e8ffcdca076aeecc8d7748574b9b10b0edcb7f29870c5765dac849 SHA512 351c7e517aeaac819858716a196364f033aa384d70dd8128a2e92d4b300ea451416cace7bcb8feeeffeb57264042d02fd814be3fdc8fc305b86f57e51158724f WHIRLPOOL ae8a5e246350bf67577855da35d3d100bd0485f4885cb2f46ca7a0ec3cc3eb6020a188bb0d08793f231adfd7c0b2fef6fe66d5c61a009a6c3aa4989df35d1299
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSubugAAoJELp701BxlEWfYn8QALus9QuVk6XEPTF2Bhj0lKFP
-qXKxzeN8DFcIsFRH5oGMwSA/dFqg5zZqjlk0OhgKbScDOo8IP6EeWpizef+733zz
-LXE0DSiLqTAppO0xzWa7wCzmYXe/5RhxH4kh5nY1glHvIUqJweTdW2we2Jt4R/U6
-hgPgEaR845ElODc46XkPZON2ANTL1mgXMnBLuEpVkirohwCsLn13rvWFQTA07zf2
-S/JngcIOHn/ifBl29/U1dHthspGIzCLaEYzDCfjw0X/8HsSYPEQwAqsfnzbVsYCZ
-RcfJbiyCGRKdGYVZ5s5jI/EZ6NM9EI9lRbfXzWjRAYlhSSY+qesbDDmToKaM2QGK
-BzzDutTQY1mB/ToyQyEatDdQCUrvJqqwo66cz5plw1YOt3GCa9SU0gnRiVUAji9x
-EEX94hGIqycVYY6AVeUc9UT6Q7ZmJrwFF70LTS6zEYYV9+tPTS+Z2V+l8FiY/cRg
-zVmTdCtW+s3cnBc6PWL4DP+FcpCWiovBrmui10EPC7XFG1j4ChvHqA6AojrCIgrP
-quhBXgFWmezApZWkMAoMNBqp19jLIOvdITCepkHChDUxluD69Gmu+TacfJWu3Ev3
-ZAg2TESyTOyca4DaafPxWuVmPQopNvvHJKw36RviNW1I/5lPikzVZDa1L4vxYZJe
-5A1GFmGdslOWdXRfcSKR
-=mblc
+iQIcBAEBCAAGBQJS0boRAAoJEPiazRVxLXTFkb0P/39Ko921p8p5JkkqneusRJgw
+ewj9ho7HlHnJsJDs40gl7JHlo23Mcp8hXKk18SSYNfVWaMIsUFcQOScT9Or0+E76
+u+FEcYZDC632wswBZszZoAiPxTduOa+qyOYuWFdiL4qDLwWR8xOhrm8f2NGaqTnp
+okILb/eguprDc4GGmLFcZE7dLo9TRj2WHX/Co9jBVTYj2OW4QImJfoPPjAnRgMTP
+Gdd02Bl5R9snjBgIMMPwjX+djC9gOyI/jqhTHzPxs3y86aoeS6tphZHrhkFJFGa5
+D3UL1NwihioH6yHIr34WTmx8O1odPqQYsucHuPNhklywHZoozlkO7y35Q8tZKmNh
+VujG1xrMokXWAr3rB92zVQXtsa/tN0pR+KpYD74Gtd3hVP+2AErSqM+R/OO2Eo4L
+K96LSnQas+l31SBCEwrbe1ZI6BXuMey1aXEHa5F1BVl7ko0uUMoWuRKA7SNuE1XF
+KoTIWh8S3tk3fQ+W/D8/uHD65Nidsjdd9eqf5e9C1cBf1rraw4e4eyrAhUIJQDTr
+EaVNIcu9CehZ8PAoAQd6Ad3Y2Toj9dxbEq5Jbj82Sppt60V83yIYxHk+XF7DyZiS
+GLlZI9cIzjMOxomoNlkvkwzFSsyliKE26Jg6MoBDdIJKcrFXLEQPD4q6Vjp3Nl4I
+ec7Z4YOmSWlO8yUcufSW
+=KntY
 -----END PGP SIGNATURE-----
diff --git a/net-fs/cifs-utils/cifs-utils-6.0.ebuild b/net-fs/cifs-utils/cifs-utils-6.0.ebuild
deleted file mode 100644
index f4542896aba0..000000000000
--- a/net-fs/cifs-utils/cifs-utils-6.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/cifs-utils-6.0.ebuild,v 1.2 2013/10/22 10:46:10 polynomial-c Exp $
-
-EAPI=4
-
-inherit eutils confutils linux-info
-
-DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems"
-HOMEPAGE="http://wiki.samba.org/index.php/LinuxCIFS_utils"
-SRC_URI="ftp://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux"
-IUSE="ads +caps caps-ng creds"
-
-DEPEND="!net-fs/mount-cifs
-	!<net-fs/samba-3.6_rc1
-	ads? ( sys-libs/talloc virtual/krb5 sys-apps/keyutils )
-	caps? ( sys-libs/libcap )
-	caps-ng? ( sys-libs/libcap-ng )
-	creds? ( sys-apps/keyutils )"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="^^ ( caps caps-ng )"
-
-DOCS="doc/linux-cifs-client-guide.odt"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	confutils_use_conflict caps caps-ng
-	if ! linux_config_exists || ! linux_chkconfig_present CIFS; then
-		ewarn "You must enable CIFS support in your kernel config, "
-		ewarn "to be able to mount samba shares. You can find it at"
-		ewarn
-		ewarn "  File systems"
-		ewarn "	Network File Systems"
-		ewarn "			CIFS support"
-		ewarn
-		ewarn "and recompile your kernel ..."
-	fi
-}
-
-src_configure() {
-	ROOTSBINDIR="${EPREFIX}"/sbin \
-	econf \
-		$(use_enable ads cifsupcall) \
-		$(use_with caps libcap) \
-		$(use_with caps-ng libcap-ng) \
-		$(use_enable creds cifscreds) \
-		--with-libcap-ng=$(use caps-ng && echo 'yes' || echo 'no') \
-		--disable-cifsidmap \
-		--disable-cifsacl
-}
-
-src_install() {
-	default
-
-	# remove empty directories
-	find "${ED}" -type d -print0 | xargs --null rmdir \
-		--ignore-fail-on-non-empty &>/dev/null
-}
-
-pkg_postinst() {
-	# Inform about set-user-ID bit of mount.cifs
-	ewarn "setuid use flag was dropped due to multiple security implications"
-	ewarn "such as CVE-2009-2948, CVE-2011-3585 and CVE-2012-1586"
-	ewarn "You are free to set setuid flags by yourself"
-
-	# Inform about upcall usage
-	if use ads ; then
-		ewarn "Using mount.cifs in combination with keyutils"
-		ewarn "in order to mount DFS shares, you need to add"
-		ewarn "the following line to /etc/request-key.conf:"
-		ewarn "  create dns_resolver * * /usr/sbin/cifs.upcall %k"
-		ewarn "Otherwise, your DFS shares will not work properly."
-	fi
-}
diff --git a/net-fs/cifs-utils/cifs-utils-6.3.ebuild b/net-fs/cifs-utils/cifs-utils-6.3.ebuild
new file mode 100644
index 000000000000..4f98286c09ce
--- /dev/null
+++ b/net-fs/cifs-utils/cifs-utils-6.3.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/cifs-utils-6.3.ebuild,v 1.1 2014/01/11 21:39:28 polynomial-c Exp $
+
+EAPI=5
+
+inherit eutils linux-info multilib
+
+DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems"
+HOMEPAGE="http://wiki.samba.org/index.php/LinuxCIFS_utils"
+SRC_URI="ftp://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~x86 ~arm-linux ~x86-linux"
+IUSE="+acl +ads +caps +caps-ng creds"
+
+DEPEND="!net-fs/mount-cifs
+	!<net-fs/samba-3.6_rc1
+	ads? (
+		sys-apps/keyutils
+		sys-libs/talloc
+		virtual/krb5
+	)
+	caps? ( !caps-ng? ( sys-libs/libcap ) )
+	caps? ( caps-ng? ( sys-libs/libcap-ng ) )
+	creds? ( sys-apps/keyutils )"
+PDEPEND="${DEPEND}
+	acl? ( || (
+		=net-fs/samba-3.6*[winbind]
+		>=net-fs/samba-4.0.0_alpha1
+	) )
+"
+
+REQUIRED_USE="acl? ( ads )"
+
+DOCS="doc/linux-cifs-client-guide.odt"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if ! linux_config_exists || ! linux_chkconfig_present CIFS; then
+		ewarn "You must enable CIFS support in your kernel config, "
+		ewarn "to be able to mount samba shares. You can find it at"
+		ewarn
+		ewarn "  File systems"
+		ewarn "	Network File Systems"
+		ewarn "			CIFS support"
+		ewarn
+		ewarn "and recompile your kernel ..."
+	fi
+}
+
+src_configure() {
+	ROOTSBINDIR="${EPREFIX}"/sbin \
+	econf \
+		$(use_enable acl cifsacl cifsidmap) \
+		$(use_enable ads cifsupcall) \
+		$(use caps && use_with !caps-ng libcap || echo --without-libcap) \
+		$(use caps && use_with caps-ng libcap-ng || echo --without-libcap-ng) \
+		$(use_enable creds cifscreds)
+}
+
+src_install() {
+	default
+
+	# remove empty directories
+	find "${ED}" -type d -print0 | xargs --null rmdir \
+		--ignore-fail-on-non-empty &>/dev/null
+
+	if use acl ; then
+		dodir /etc/cifs-utils
+		dosym /usr/$(get_libdir)/cifs-utils/idmapwb.so \
+			/etc/cifs-utils/idmap-plugin
+		dodir /etc/request-key.d
+		echo 'create cifs.idmap * * /usr/sbin/cifs.idmap %k' \
+			> "${ED}/etc/request-key.d/cifs.idmap.conf"
+	fi
+
+	if use ads ; then
+		dodir /etc/request-key.d
+		echo 'create dns_resolver * * /usr/sbin/cifs.upcall %k' \
+			> "${ED}/etc/request-key.d/cifs.upcall.conf"
+	fi
+}
+
+pkg_postinst() {
+	# Inform about set-user-ID bit of mount.cifs
+	ewarn "setuid use flag was dropped due to multiple security implications"
+	ewarn "such as CVE-2009-2948, CVE-2011-3585 and CVE-2012-1586"
+	ewarn "You are free to set setuid flags by yourself"
+
+	# Inform about upcall usage
+	if use acl ; then
+		einfo "The cifs.idmap utility has been enabled by creating the"
+		einfo "configuration file /etc/request-key.d/cifs.idmap.conf"
+		einfo "This enables you to get and set CIFS acls."
+	fi
+
+	if use ads ; then
+		einfo "The cifs.upcall utility has been enabled by creating the"
+		einfo "configuration file /etc/request-key.d/cifs.upcall.conf"
+		einfo "This enables you to mount DFS shares."
+	fi
+}
diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index b5ab2865d202..d82014370e4f 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.648 2014/01/08 12:46:42 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.649 2014/01/11 21:42:56 polynomial-c Exp $
+
+*samba-4.1.4 (11 Jan 2014)
+
+  11 Jan 2014; Lars Wendler <polynomial-c@gentoo.org> -samba-4.1.2.ebuild,
+  +samba-4.1.4.ebuild:
+  Version bump. Removed old.
 
 *samba-4.0.14 (08 Jan 2014)
 
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 9abbe9c7335a..eba787ad07d6 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -46,8 +46,8 @@ DIST samba-3.6.21.tar.gz 34116243 SHA256 6b960abee66058a9390be036ae42efc463790b2
 DIST samba-3.6.22.tar.gz 34122131 SHA256 30bdf20e7788785573196a33905e7e27083a32d749285c22958edce0721cdeea SHA512 13b7d4c7ee24434626cf7e835e302252a281f00dfff1b83fd3c28f8264c1ce7afa0aa6ad237c28015fd2a39a38954189a140b36c27d8b0434a48b46d56936981 WHIRLPOOL 0daaeee4a7c7c3807ceda6558041708cca6c28ad20051cfff5547477f2acab8b896a4168f44a85eb7722dec5d3772bbc59566e79e1876820057f1f3107962cb5
 DIST samba-4.0.13.tar.gz 22105105 SHA256 cb970bb016fd6403a31a2002b8db57f9201c6333feaafcc6b689eb5bd24174ac SHA512 9170d7f9e5d586091fbba6c8f7fe6b23c969310ab5a1f6e51f5b700385a02086b70ccc5686bddf3687dacf5a6f67aa4ba60360e9eb1ff9dd0d6ac3c5731228e4 WHIRLPOOL 07785fe0b3573fe0a30b55d23a958586a942f3dcfdc341ade5c5aa52c402b12c6f069f090b50f84037da01b97a4159d68a4743112aa420f24700f64e74a4f090
 DIST samba-4.0.14.tar.gz 22108111 SHA256 0f9796579246ac57fd2d9bfd2be1fe2ed5aaccbce1098c03eb528570286636a6 SHA512 651ad1e40b0206390d59ea2dee49fd6769d361a69f3b37683e0ea46c6d0454776c6ea092a063428ee558a6988f5e75a723296253d97cde3d5430b7c843bef7cb WHIRLPOOL 88704645dfe8e4802bc03c07d6029ad3b7a5c59d1705ed7b3e6ea2c2127bc63c195ab1a8a64240dbe5696dba60e94f4027ef8e40ab53b24949b76a0f0fb6cf98
-DIST samba-4.1.2.tar.gz 23154809 SHA256 d8883b6ada2a3dafc7b238b043c333004910e4d4bdb207fc8734646ee8b1b042 SHA512 5104c88298567e1338200c039272d2b820fb0335ef363c7f4e1e02d0f1ef2d7d09d4aa919a02cd6b7dee318c89d58b69b650f8811253ce7cfcf1745dc65ba4c9 WHIRLPOOL ef6559a55f249fdb19bf8c9c8da702f5c3362fd2e0e7ef1b24feaf2c6d614becce232bf57235a8c7a1215beaa3358b1a35414602257df332dffbf4b99fb327b6
 DIST samba-4.1.3.tar.gz 23161646 SHA256 71da208d412b8d15ee26d2a76b2247df357242177d995fe5d9320355432e24db SHA512 c3e08df4e23c02ab759e819809ac8b146972508bbbbfc666e47ac180dea75dde85564e839aa4935e43f9b894bdf650fd3ed36463e70e9065c6e1c745142984d5 WHIRLPOOL e8f3025f66ae3cb3086642f2115bb23191b16f57f4e4d818ae5572664c969857873c5074205c17450c43507fd7391b22bd021be120971377f040a25775f7efa9
+DIST samba-4.1.4.tar.gz 23169480 SHA256 1733e1aaa37b4fcb0fc781b07fc6f20831023ce971d8bcd97940c3fbe35766a7 SHA512 a7cc48e00af6637fd464ce8e364b887155fa4ae4e1f6f1c6a0262d38a9c9a35711cb248664b0f81f356ca6afaf0ad44cba6d465207feaf86cde7c4c35e57b596 WHIRLPOOL adbf19246ca216f807ae17c8aa2a3626e81437f11f570d406d3099d6a3606417423e6a36d730aa90619ff18208207e7ca8b13475429ae98a2e47132ffe5620a1
 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
 EBUILD samba-3.5.22.ebuild 12309 SHA256 dc195567858dc0c11b2b86fc42427e1066c5efeef29bfe047bdbac413a62007d SHA512 82125fe1d5ba33f57ca06e513090eb0f2cedcda3242773b8734b4b0a18c68ab12f9149651908ddffbe3b2687b9876491a6cbbee7dc4f1e0584a5eef218ff8a57 WHIRLPOOL 9e87a5fb631fd519c2fc89da8a1a591fc9a4eb58eee63052f09321a6f115dbd82e8dd383843b6e6feffe68edaacb4de5c6ba6e9e66a098fa0cddc480988776c8
@@ -57,25 +57,25 @@ EBUILD samba-3.6.21.ebuild 12812 SHA256 9fc75de96f03115d6e1404879af7175c3e13a824
 EBUILD samba-3.6.22.ebuild 12795 SHA256 5499306dcd115ba547697adb586dec649530325f07fa00b2ede204560a608c1a SHA512 fbc13929950a7d2545459be4bbbd1ff5dd7c258524ce351833a824763ee74c96604d7cfdcd3141772d4ce8fedd532beb46f639d616a1bcc5713ca16c03aec7b4 WHIRLPOOL 75d92ca156dadfa9c7ca8357082f462666cd1597fa0dda57150da842007ccfcc300a6fc1a10f7f2f6d47a9b0f02544edccbe7794250381ddbe9b5e3b07cd15b1
 EBUILD samba-4.0.13.ebuild 4770 SHA256 0799118a293e78a566d7e2bc0a187c60af983a60abba0f620ca3f80d63688d6c SHA512 8c7da30eb19b4e0ff25065571873b18dfe402f9bf6c70166a72e58bf0dd7c1ec64c760d598ea1dcd4e3d40464e821399f1fe5db421e2a9058cffd5e574257c6b WHIRLPOOL da10dcaee3c7476c7eedb0c197f6f2c0f2abaab2e6c783b51c254e7a7e1875f48b7edd1d8a273ea183575511b1842166b006074e8ce890ffb584e64f86de8cc0
 EBUILD samba-4.0.14.ebuild 4770 SHA256 e7dfde6f3fb4e11a12b5640e9fc96135af02a1c55f8d5fefb83f086d919d13e0 SHA512 7087fba7e8b68281df58e48ae26919746b4f7f49708e714e20ae18d1b2ea0adef961cbdcff4a486cc0a622248a626a27340ef89a31bce4406248cb550d34c154 WHIRLPOOL c61eef3ae11d4ee676de47a4d4375c938752b2c85a82f547b2cdbf0dc0d02d08bcb936adcdb9250a3e3e8e55500d0b7b3e1b93f2c5902783a07e9beb17628827
-EBUILD samba-4.1.2.ebuild 4651 SHA256 abc25239ad949510e921ccd7ee374592fc52c7fd48eaf42ced3c2b8ebd7da259 SHA512 98e193d674020dc9817258e933ef36aadef687f21db6b9f3647d3f6d7d398136ebbc340815c7e3f5df22b13983289d9ee08ef3bb1eae8e6f36b493852a1a9951 WHIRLPOOL 7801357c43856d55c15d84bd9b1b7185820d1d96cb1d92487dc5cb4e60f52294fbb2059e5ea4c19a7c11f0917b785b75876633844cabe82c3f5aac4d8502e76a
 EBUILD samba-4.1.3.ebuild 4651 SHA256 073fec982c1b8208f60862e16d259299e86d7322aa93b3487d6d7190daca4629 SHA512 8db5718f834e15d9569149652db860db0a24840acc655b88a7283d39b0d870e58f02e28fd8d8487b2f2264168aee12cd61e2b0aaf076bae737175a66f010b839 WHIRLPOOL 639c520f4713fa6f029a05235ce5fdc0cd5b4cb843b745db7abfa2eb400504ca5f65a7f76b6143d1bcb6e1df77f571074fbdb0c6da89ccce5e22fb5c9a5dccae
-MISC ChangeLog 509 SHA256 4e681acfce1a795a32398718860e32ea4aa23361f8f29622098ee9af93cede18 SHA512 6f4b554a4d732b5aaf84e1a1ba439d18806d86d3cad694bf3502028947fb08cd7f2b529d6f923c59c9944e50aab49bc9737b932a4427348ab8c992449d73b38e WHIRLPOOL a8aa29287b54c7c77df152c670edd7321793c888e2d347d9e78c9e38ab0ab653ba71a1f000622f1e84d5247a050cdf618705eaec41dcd780a69e8464251ffa32
+EBUILD samba-4.1.4.ebuild 4651 SHA256 dd09221e756d0463f80bf5a3c0ef9cc853b26b898857124fe46d082c0d13a6ac SHA512 60b276d798e92b51d28ec6b3173f57ec75fd8e65e64caecfac3b50bc072939f65ace60cf1ed895108c808c5cfe0a01ea94b0e57c46cbaa8fbb666ec4931d096e WHIRLPOOL 0d79aad592aefb243f42f1c10caacfaabd1f346e61e947261423acacf76e7da83d021c497ccaac0685e0094f84e53ff8d94d368dbc4368b7a985e6ee2cac87a6
+MISC ChangeLog 665 SHA256 0d40eed40231523e09df97f76d5c8e10f11a575c1a435681e1f560c998666736 SHA512 4a0a050ac7d0659b3a7ba50fbfe8c650217ee4baf5aa67cfa0cdb2be3f366e788d182ae06349d7406d6442e80c2765470570b3217b843f4aadc58db04811f8c3 WHIRLPOOL eeb930b3e7733f4d9b2eacf65c82478fff3bdb6c56ea1b6bc3d27664c367ce0d837a22e269b2101e1ffdf95299c22f85a5a6f04da86424c305bcd4a483208e0d
 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.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSzUizAAoJEPiazRVxLXTFca0P/AvxCJFI9YrsjGLbTPdxe6hB
-2psXxT3rutxdre7WseC8nJHY43ETrttteKL/U97ky46Ef1xjK2fxHAoGX2TDPyXr
-VaoEUt1mRE7YVQItY1JSlTNYEagOgxfKwkGFuwKCBKskyA1waHR1X6UAp+em6H0F
-/smO7vVo4ayiTB7PLfq7IKFPg/pA+h5ix1f0HsvxJuU/L9hPgTSd4GkLQcgYBzK3
-VvGDVzd1YIBvaycDNB0rpxFFabo0PLkI2GEq6Il0Rvy6xAHPcN3/3YlwiSgsm9Iz
-xhLfUurPf/c+yTk+g5FecirapRPpLB0Q5JLyk1n+fcDxcrVzSIJIFBL9Ag/3Pcro
-mvacuvmE6v20tNvSBxiR9kZOc8am3s3aJPoD6rpuxrov2XJ9tmauj8njochZbrn4
-jbdgAYDTqcHvCawSsEq4koA9vii+C4dIEq/HAubkshFXtquFR3w3oHMSVQ/3YHr/
-k0IMc12VF9S4s+W5snF/cnQ3dfpdsZnS9NdCicUZ96VshlRVQ57VLp/aGnIHos6C
-DMyqmRaJ2SpJdrkiDRwQTLoTnVI/roiNnWh92p6HTPX+NFyFi3+D4cEZxuwjFVfp
-A1hffRK1c7qxiUbKi0ldQsyhxezXNnM6kdv7Xd0gGNxioqLgD7ITYuCeIgHt0/bY
-osS6VkJc4yaAv7LDZB7t
-=nHy8
+iQIcBAEBCAAGBQJS0brhAAoJEPiazRVxLXTFvswQALkCJFQX7dJOzAzM1OADM4iy
+X50snz6vWEUheCbFfpDQhuEY5/gSz/eHDNMUsEwtETeNiP5g3frnjGpIpciG7oW5
+TqW9gGzFgUjdLHKSQaZonEF9dRXYHDZ2IFb7NSJg+T4DUzzHvHNYNeUfNsGQkbff
+llb0+eb5FCVaMOpOwrNYs0y/p+kbtw3UBcJ58D4UfWmcGQGwvC8mtzvDWg2UOoGC
++OL+2PhZGbvqR0efKH4hIXp7hZQe+GEfErk178qc1wWNWjo8w2zgZHljpxKJ6Hg+
+ELzkc7mwYQzprjzzLIhlUrbaIbt2EHVDB+7y5J2b+BS2mfWlCY8ruaeV8caqbOJk
+4FvDtFvGQprk/ap2meh0vYuDwpzRlt1snms/7brVvsqUnotgRmJFGy/VETvRGJ/G
+GAUr4z8zatGzgEMp/hbBDcaRu1iBSo8u4T7s2FttCDUHSFgNEibcMo5/08lnDehQ
+gTN4/EqX0PWHxsugqGNIeHi3wVUcNS9cMOzGky3gf799S4NvAKRfZHfqNRiKJRBr
+bgMtOwq3j8wGV8g14PWFoy7jCqE+wQvI4zp1rlBNjf991h9ezkHw5HAJUq2fOyUt
+s0bOvYPIx5v6VF5zpMbAxSgxhWyCudLVwtz72VXi73eSbkFK7dAvJRe/jm3u/uNI
+ueH2yttd3eNVYVdhSh74
+=ua6q
 -----END PGP SIGNATURE-----
diff --git a/net-fs/samba/samba-4.1.2.ebuild b/net-fs/samba/samba-4.1.4.ebuild
index 2685588c614b..4b5bb30d049a 100644
--- a/net-fs/samba/samba-4.1.2.ebuild
+++ b/net-fs/samba/samba-4.1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.2.ebuild,v 1.4 2013/12/11 07:15:47 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.4.ebuild,v 1.1 2014/01/11 21:42:56 polynomial-c Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{6,7} )