Version bump. Removed old

(Portage version: 2.2.0_alpha194/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

4 files changed, 17 insertions, 60 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index bb7956e2317f..ec180c27b69f 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,13 @@
 # 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.587 2013/08/05 04:41:22 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.588 2013/08/06 11:31:36 polynomial-c Exp $
+
+*samba-4.0.8 (06 Aug 2013)
+
+  06 Aug 2013; Lars Wendler <polynomial-c@gentoo.org> -samba-4.0.6.ebuild,
+  +samba-4.0.8.ebuild, -files/samba-4.0.5-fix_linking_to_heimdal.patch,
+  -files/samba-4.0.6-add-missing-new-line-to-fix-python-shebang.patch:
+  Version bump. Removed old.
 
 *samba-4.1.0_rc1 (05 Aug 2013)
 
diff --git a/net-fs/samba/files/samba-4.0.5-fix_linking_to_heimdal.patch b/net-fs/samba/files/samba-4.0.5-fix_linking_to_heimdal.patch
deleted file mode 100644
index 7ba92fc6c0c8..000000000000
--- a/net-fs/samba/files/samba-4.0.5-fix_linking_to_heimdal.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugzilla.samba.org/show_bug.cgi?id=9781
-
-diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
-index f447115..ce4211e 100644
---- a/source4/heimdal_build/wscript_build
-+++ b/source4/heimdal_build/wscript_build
-@@ -948,13 +948,13 @@ HEIMDAL_BINARY('samba4kinit',
- 
- HEIMDAL_BINARY('samba4kgetcred',
-     'kuser/kgetcred.c',
--    deps='krb5 heimntlm roken HEIMDAL_VERS hcrypto',
-+    deps='krb5 asn1 heimntlm roken HEIMDAL_VERS hcrypto',
-     install=False
-     )
- 
- HEIMDAL_BINARY('samba4kpasswd',
-     'kpasswd/kpasswd.c',
--    deps='krb5 heimntlm roken HEIMDAL_VERS hcrypto',
-+    deps='krb5 asn1 heimntlm roken HEIMDAL_VERS hcrypto',
-     install=False
-     )
- 
diff --git a/net-fs/samba/files/samba-4.0.6-add-missing-new-line-to-fix-python-shebang.patch b/net-fs/samba/files/samba-4.0.6-add-missing-new-line-to-fix-python-shebang.patch
deleted file mode 100644
index bab2d882849d..000000000000
--- a/net-fs/samba/files/samba-4.0.6-add-missing-new-line-to-fix-python-shebang.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From fb9334099771e6e4d50715f3c5dedce1866a6e0d Mon Sep 17 00:00:00 2001
-From: Michael Adam <obnox@samba.org>
-Date: Tue, 28 May 2013 12:19:34 +0200
-Subject: [PATCH] wafsamba.py: Add missing new line to fix python shebang.
-
-That fixes e.g. samba_spnupdate on some systems.
-
-Signed-off-by: Michael Adam <obnox@samba.org>
-Signed-off-by: Karolin Seeger <kseeger@samba.org>
-
-diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
-index 3559cc1..8eace08 100644
---- a/buildtools/wafsamba/wafsamba.py
-+++ b/buildtools/wafsamba/wafsamba.py
-@@ -699,9 +699,9 @@ sys.path.insert(1, "%s")""" % (task.env["PYTHONARCHDIR"], task.env["PYTHONDIR"])
-     shebang = None
- 
-     if task.env["PYTHON"][0] == "/":
--        replacement_shebang = "#!%s" % task.env["PYTHON"]
-+        replacement_shebang = "#!%s\n" % task.env["PYTHON"]
-     else:
--        replacement_shebang = "#!/usr/bin/env %s" % task.env["PYTHON"]
-+        replacement_shebang = "#!/usr/bin/env %s\n" % task.env["PYTHON"]
- 
-     installed_location=task.outputs[0].bldpath(task.env)
-     source_file = open(task.inputs[0].srcpath(task.env))
--- 
-1.7.10.4
-
diff --git a/net-fs/samba/samba-4.0.6.ebuild b/net-fs/samba/samba-4.0.8.ebuild
index 5d2a170be310..6526f0d92099 100644
--- a/net-fs/samba/samba-4.0.6.ebuild
+++ b/net-fs/samba/samba-4.0.8.ebuild
@@ -1,11 +1,11 @@
 # 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.6.ebuild,v 1.2 2013/07/20 17:44:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.8.ebuild,v 1.1 2013/08/06 11:31:36 polynomial-c Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7} )
 
-inherit python-r1 waf-utils multilib linux-info
+inherit python-r1 waf-utils multilib linux-info systemd
 
 MY_PV="${PV/_rc/rc}"
 MY_P="${PN}-${MY_PV}"
@@ -35,7 +35,7 @@ RDEPEND="${PYTHON_DEPS}
 	virtual/libiconv
 	dev-python/subunit
 	sys-libs/libcap
-	>=sys-libs/ldb-1.1.15-r1
+	>=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,11 +60,6 @@ CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
 
 WAF_BINARY="${S}/buildtools/bin/waf"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.5-fix_linking_to_heimdal.patch"
-	"${FILESDIR}/${P}-add-missing-new-line-to-fix-python-shebang.patch"
-)
-
 pkg_setup() {
 	python_export_best
 	if use aio; then
@@ -136,6 +131,12 @@ src_install() {
 	# 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() {