Version bump. Removed old

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

3 files changed, 33 insertions, 31 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 59fb10e46236..3ad4f646b53f 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.582 2013/06/20 18:23:54 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.583 2013/07/08 10:54:00 polynomial-c Exp $
+
+*samba-4.0.7 (08 Jul 2013)
+
+  08 Jul 2013; Lars Wendler <polynomial-c@gentoo.org> -samba-4.0.5.ebuild,
+  +samba-4.0.7.ebuild:
+  Version bump. Removed old.
 
   20 Jun 2013; Lars Wendler <polynomial-c@gentoo.org> samba-3.6.16.ebuild:
   Added sys-libs/tevent to DEPEND. Thanks to Grzegorz {NineX} Krzystek for
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index a2836891dadc..6a141e17319b 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -33,31 +33,31 @@ DIST samba-3.5.21.tar.gz 35377315 SHA256 fd9a66056b1ba9496762394efff41fcaa0e58f2
 DIST samba-3.6.12.tar.gz 34073788 SHA256 6ff797c1772613bd5172d2c8b900fd56bf096d7252faee8b47c4925a4fdc9f8b SHA512 06a7b8883a18b802de5aeced2e7dcf97147351b621736ab2383c6e4f22d5fb14e2b1ce88c8137a2fa9571b25357c766b0fb2b31352009b8a7137b20e2e9c3416 WHIRLPOOL 6f41dd455a52c9397fc4e7429aa5312573a9a1888ecde94a25be9d000a6567374e5eb60c3c0a76151f8628e8ee8c68cdce234fb51f4163c9a3996acf74b1f4a7
 DIST samba-3.6.15.tar.gz 34111211 SHA256 42b9acb13f8760a1767829ebaa4c371e462aad5287caf92887e64930cf27da60 SHA512 82a2a76a54c309d4107c19d42e3e9c8cecca0e065095a2471f71bfafcd3883e0a9f06f74e330d3020bad6220f72f4765e9f8c9bed331bafbc69ac0fc080cc537 WHIRLPOOL abff8fbc44222165b0dc32bdb050e785d77c1b1d160cf5b002481a16cf4a841475bd0a0456d2e398482cdb3b3557b19d86fef2da3bfd1ea5aa8303c663cb3c29
 DIST samba-3.6.16.tar.gz 34108738 SHA256 347c0abe608ad907d04e37948d0f82a2d9dd8daeba13b0b78d7463b8d7b3fef4 SHA512 e71328bea07c16d5c72c28f5a5b911e33c65f1a4ac6dff791b820783370d61ce4fde99f24575f0a348b3a87d7eac3961621fb59fd0ef126339aa3c7d31d39ee8 WHIRLPOOL 347b5baa85094933f19c3d35d91c938b8a7854643bbbc515b2293fd05c5f73996057566e0468184eacd06cebc661231f8ab7f9fdbe9e8392f504a265b6243d39
-DIST samba-4.0.5.tar.gz 23958079 SHA256 c1175079d5724441e558982246128ee0578bb0b300e335e91b82ed97b03733f1 SHA512 a610c343f5429c0d155420ffcadabe99b95626de6f0a1c149874cb09c50cb5de7b0c6163b130f1ccd1cc25cc0db18da25c4d17532bc06db13594eae62327921d WHIRLPOOL 54ff5e38a868c0c3ff48c446cad678bb9a1adfc5834fb06e016a80badd4ca965fc8f6a3d4e26c29c9c3d5c39d8116d96c496d77fb50b6a7da62cc027862e5422
 DIST samba-4.0.6.tar.gz 23949307 SHA256 63e53dc270d13231bed56b816c18793d8425f199b1a5efdaadc080f4d6911de3 SHA512 761fa945fdef1ddc7688e8482324aaec10f68252ff201b11739eac9863e3c4ee0d0207b87c735c529d7a62ae65785d146de7e9cd37fdac2c4463e1692635ee11 WHIRLPOOL c8d8ba019c2823da8e73b78496aa5fcfff4e518d66a2915b7fadc6337e18da8f6d379200b03eea0eebf2d6fdd49ae9828e2e1bc1ae5014206f54f21f39d25d02
+DIST samba-4.0.7.tar.gz 22078244 SHA256 e9ad36ff65a1d6b6a57f272aa08f844139ac2b5b1cb2257f1236aa2a8c864245 SHA512 84573c9fad7ad2f605661158faf70e3e57c6c15e814dd504314355055e73c58bd48bbdf2941203bb8c6dd36fb1635d3ba54a8a4534bf7a104d0c48e1bc063163 WHIRLPOOL f6001faf8cce7920d5b87ea6ed64a6f0d42f03a73162ae8bcf5b5fc6d0141cef3c038a3993e330008cc3dc445a8b4a388e9a62cb8d8f0bf4e4b4639ab0f5e146
 DIST smb_traffic_analyzer_v2.diff.bz2 12226 SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d SHA512 aa0e457a0dd282e61e6dfcd5705c29b319832dca9711b1b5baf8373e2f079991399c3537c050219ccb861a93f86353ebff677a5c625d2e3f1f3a13ee5c4087d0 WHIRLPOOL 85ee72a360f67ebe71be5cd400ecd635280a0d7c64ebb8b94656a5ef1a94f74a987de86408af00ce1b81cc8363b1b3cf14726860d29b72ee610d4bab73d6b139
 EBUILD samba-3.5.21.ebuild 12567 SHA256 4f7389da068ff867ec8c03afbc451e17580df49a13b4db16aea1532e5d77eb57 SHA512 344036c801e850d097d84f3b6badb83fb1777319d6d90caa8be5621e7a15e6011a07c1a30c7f8870bd302b686511940fef1e03179484a4c37b816e0ff6be06f5 WHIRLPOOL 3b099715d1c01cf241f1fcc6110725f3fb50fb9808aa58b02232ae7a545cc01a7c04bf886dbde14c85f6e12919dbf0aa4acb588d37a059d8db5bd1529a95c4e7
 EBUILD samba-3.6.12.ebuild 12017 SHA256 b1a4ae0e490e6e3ecbdef24b9a50336e676cb39f6077044ef9e99f745e433147 SHA512 f377aa4ad20d5a05d31a492935251040e2a3c4522fb774fc2918d09d629480551a6eb359d1079fd4ed9eed9339985977d5f792358b0b74d426261e01dd662c6e WHIRLPOOL dd77e2be95a4766cce5dab5f06ae5f4064f0824a26018e191ba881cd2aec6a865762441f8f983114f21d58edcbc5dad8c75fe9409db2e4270a6aab64944b7153
 EBUILD samba-3.6.15.ebuild 12347 SHA256 70ceef21473641490f6a5b2c8ff8c2b0306fd6edf6578f278eab616a95b971f3 SHA512 2e474e0ae66f3b1b5041d839c199a6329640786c4a7b0fd34d76ca4246a25ea77464ab31f497d1c5febba2d9f0d582965f63355062dc37bd125037808fb0f4c4 WHIRLPOOL a39b87d43dc4102de248b3fa6b9c99107b4bf6f3427e978dffee2eab1ae24d42484ff0ed0630acb0089702c600281aa2d4b1d15d6414548878e8b4d67dac6a7a
 EBUILD samba-3.6.16.ebuild 12373 SHA256 d154bd135e4243f88d41e0bbd88bb43e5a3bb871c482dc22edd355848c3b1e69 SHA512 08736c0f6f7675b2a9f62c1df564b6ce0bb21e5611fb603810fa4c79540e0909bd2912694cdbeea92149b47fd435df2f3a3c48c3119205a928938f5cee782d7c WHIRLPOOL c015a0326b43091da9dcf3e51dfa33bc2854f16e5878be730f285c2ab8946c54631e6911a9a1d8c367e6725583a2e3e09adecf51586a78a119a2a67d2ad33308
-EBUILD samba-4.0.5.ebuild 4108 SHA256 ee056af6d62ccfe62771d78d4940dfeeaffb041b3c03defea8ce201474763bba SHA512 1ea07c0f7a4831b92ea0c18d0616496cfaafb057531d635a5c2dce9a507df1e32e96166f80ac2f3c9f54a41a7d5ca1c1108cc0b4ec648024cae8400ec69518c3 WHIRLPOOL f6e5517e135858565b4bb0de81f9f2cf01476bb70a5b87440fbb728d76aceb3c90e960655d9c77df0fc9f76c36b7c70ab4851ba5d3595dd65810c2422b71c3f3
 EBUILD samba-4.0.6.ebuild 4100 SHA256 8bcbd66efbadd379f605e5d2db9bc7c096b6a9a73871e8ea8fe56a7ccb6ade60 SHA512 efac7c5c9f87b43356edc3098056a9b6a1df1f7c9a41ece3ff4062b07dd8b5d1c7c4c6ec02de98540ced8c3aec10377627197744d3231fc91d1fe69d63c037fa WHIRLPOOL 427573bdeb6cc6de80100de10c602dd09f29b6ea200d06e6e3876698e01c979db460d89ad4da34e5bda9ba5cc8aa190b9940c33fe19103327311ddfe53032614
-MISC ChangeLog 96299 SHA256 8a4f6cef3d54e068de1837c6dfc17e4f654149452175e6d414b03aea7b32473a SHA512 9861121def34033546ccc54ddf08386fd54479b68547a6b645f100645d1bd3327e557f5b7314806db3b31668ac014b8bff0a5de3e2d628d2be5247e02e08f1f2 WHIRLPOOL d5fcaf432b035097447ec24239b35875facb9f574de173a2a98d8277c1028461cea746099187fec5bcd7c61f2e8ee143844234da3630e777e643fb16f835a103
+EBUILD samba-4.0.7.ebuild 3959 SHA256 dd3223efd3923a90064e1f23c0a649ee8b2dbfa9a13084811d23360c5e7b72e9 SHA512 d970b0889c2e4ff74905ef97f10806e61a7452f0fff57acc34d59d16a3c8fef95558b79e3873a936c63756405d634a8634efb795cd7a05e3b68f67546d9b2ef5 WHIRLPOOL 5201389cfa41b2727490be9c169f59357c2ed2e3039b972486514df8a6c9fef9cf6e9910f4693c44991758699747fcac112faa8e4370b353649d69f7dbf09003
+MISC ChangeLog 96455 SHA256 4b653751edc6a0d6e3894a8391f0bac980e3d5e1b34b01391eb869e1f24378c8 SHA512 526dae7409c028e8a00aee035224944149c7470cab71bf048bf1b111071f0a40213bbb3428bdfbb235b2367c0a589f1e24ba5825e6b94b2e9dbc147dac26709d WHIRLPOOL 12e1fabfad723959aa0d56d01e315f9ecf2c5eabf675a376c6f4167bb7e9cdc07815a8efd6c8e1b556be5be5a829109cdf9544348cea833bc85e91527e3c75fc
 MISC metadata.xml 1514 SHA256 c10deb71703017ec67f4e5bac297d9b4581fec3d8b5549b6aea2a43bda642bc0 SHA512 9e67e8f7e0c972046e32bf4539142559c24183d6c3469e5af2f901728a3c02a9fbfd50e948a9fd414107fd0cb2a8de709ffe3fc5bf3372c77a4a3db6dc622ecc WHIRLPOOL ec92ea6a1b03e70c791670e97e7d9e07e6bdb82c24ed08c186e786afcd009ab63fbee7d481a4cdc394632ad312e58a2048dae3ff333f6f7a1ad19add55e2c8f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRw0i7AAoJEPiazRVxLXTF/5sQAICbldvwyUQu7zhzKqEdJQeq
-0EvVqGyuLtc4GeKumxbcYYCBGrB+uCgJit0XIEMBhi0pntKAZdUWsilX5Wn1b2vZ
-bTes66jdece3NRoyVaWC7G/SiCnfaNgNu3CzZDo2jA1vqrDdRsDk267MSr/4GeZA
-ivtRxwxOBkOu8oz9P38yu2gxU0ESBri36xiJG/IgkprpaiN1DfrmmvXOuvTnmfeD
-lKpfUcgUuDGD0dPF6NMQU9Pcq7VDsvew68k9mAhnvAD/OYGEmi+cT0Alj9RbQLZX
-oaSRAquOjV26dJvdY8JfZQC7GjPLVZ0AolQMlN76C9BaZysHssWhv2sMkLelXk+B
-qgQUz20Ev9JjNW/fdx+dtR2roNpV55Oh5A5JRLlt/G5cKBMJyqFfhVyvnx2fLcVv
-VBHg0m4BT/FIzwpWaCeKnZ9C/ZBm8RWJj2BinvRIRsG0Xc46kmVKzh83lOVRyqir
-FIxJwGpSaYPc4eB7c5OQQPGR2HEWFZ0d4OCXrEDWDTOgHDHvd7S3ow6UxPiI8xQE
-c40z9LR/cDgJovFG/xpibG8WajGLlyYc4dApq6AGmvlG8IUQJmcb5u83EchoeUEi
-zpXfkIkY++YQNrRyCC40q9f0Yqk/x+WOXMYe6GZ9Qw1Yx2rpOO7+FPGB1Ek1j+V+
-3uGBoh5ymWpFiDz8YKRa
-=lC62
+iQIcBAEBCAAGBQJR2ppJAAoJEPiazRVxLXTF+fUP/2vm1EiwnW9ACSzfuU4nigh9
+OKln7rWoN5xj3jfWpZes1rargAznDMDfgU1kCeBeT30av20urEiBpAclDNeAgjLR
+E5ngxApor044HPRJlhAo8u0Tc5MSvj1Nnh85F07y3U/s6zMwEjjZszmBxw4yzeyF
+W1cXTSCt0SoLf7HfMCQRv6ncXHVb7FpNyB8wwtQH2zcHXGzApqeSn+EpKxcRpEYW
+RdtbRoXqIU8NyZMVt58u0nGzXrYyxwYcqkDxF3yBPHLLXuASCgsya10uzqA7qXfY
+5nI1tthxwXgp/TjAknwfWOuZXTIxpxA5fyIvgB9EH3BuxhoxcUwdIsaEyN8oov55
+Kv+bN1HGo8KtEMRISeOPxEAvlMtJ+vuM1fkcXaoHEDk0d38a9pVvP8Ag1Dr92FUe
+HhUBzTkBEdO/HkZT7BXt8aNp19GOcbZZM9XfWmhbdnT8lz5hN5esQuMvEnpG7gm8
+6rZ468dryCWFaYp6DiGPPywoF7GYkEA715yNrHMjgbsEDb2OVZa4mlRnakUV7lUX
+Ze0QhCchXlaTynpEKhPMdNb19Dbn4IkXVeFn4DR+kLgR6CEMzDxo3xVLj5N5LPm0
+2BzQM/lEnuV5UgwKFiCeYcqqGinJk/50T1nyQNVudwTgyJVGLEwG9614L+cepyG1
+B8yKy8k+y/8umv4glsJs
+=JcaQ
 -----END PGP SIGNATURE-----
diff --git a/net-fs/samba/samba-4.0.5.ebuild b/net-fs/samba/samba-4.0.7.ebuild
index 059006ab6568..47289f2cbfbc 100644
--- a/net-fs/samba/samba-4.0.5.ebuild
+++ b/net-fs/samba/samba-4.0.7.ebuild
@@ -1,6 +1,6 @@
 # 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.5.ebuild,v 1.3 2013/05/08 06:00:01 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.7.ebuild,v 1.1 2013/07/08 10:54:00 polynomial-c Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7} )
@@ -35,7 +35,7 @@ RDEPEND="${PYTHON_DEPS}
 	virtual/libiconv
 	dev-python/subunit
 	sys-libs/libcap
-	>=sys-libs/ldb-1.1.15
+	>=sys-libs/ldb-1.1.16
 	>=sys-libs/tdb-1.2.11[python]
 	>=sys-libs/talloc-2.0.8[python]
 	>=sys-libs/tevent-0.9.18
@@ -60,8 +60,6 @@ CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
 
 WAF_BINARY="${S}/buildtools/bin/waf"
 
-PATCHES=( "${FILESDIR}/${P}-fix_linking_to_heimdal.patch" )
-
 pkg_setup() {
 	python_export_best
 	if use aio; then
@@ -118,20 +116,18 @@ src_configure() {
 src_install() {
 	waf-utils_src_install
 
-	python_replicate_script \
-		"${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"
+	# Seems like the build script gets the shebangs correct by itself
+	# (4.0.6)
+	#python_replicate_script \
+	#	"${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