Bump, remove old

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

15 files changed, 54 insertions, 682 deletions

diff --git a/net-fs/samba-client/ChangeLog b/net-fs/samba-client/ChangeLog
index 7c2e233df850..d5f731ff0eca 100644
--- a/net-fs/samba-client/ChangeLog
+++ b/net-fs/samba-client/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-fs/samba-client
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-client/ChangeLog,v 1.16 2009/10/24 11:20:25 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-client/ChangeLog,v 1.17 2009/10/29 20:38:16 patrick Exp $
+
+*samba-client-3.4.3 (29 Oct 2009)
+
+  29 Oct 2009; Patrick Lauer <patrick@gentoo.org>
+  -samba-client-3.3.8.ebuild, -samba-client-3.4.2.ebuild,
+  +samba-client-3.4.3.ebuild:
+  Bump, remove old
 
   24 Oct 2009; Tobias Klausmann <klausman@gentoo.org>
   samba-client-3.3.8.ebuild:
diff --git a/net-fs/samba-client/samba-client-3.3.8.ebuild b/net-fs/samba-client/samba-client-3.3.8.ebuild
deleted file mode 100644
index 64d2f1824b9d..000000000000
--- a/net-fs/samba-client/samba-client-3.3.8.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-client/samba-client-3.3.8.ebuild,v 1.3 2009/10/24 11:20:25 klausman Exp $
-
-EAPI="2"
-
-inherit pam confutils versionator multilib eutils toolchain-funcs
-
-MY_P="samba-${PV}"
-
-DESCRIPTION="Libraries from Samba"
-HOMEPAGE="http://www.samba.org/"
-SRC_URI="mirror://samba/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
-IUSE="ads aio avahi caps cluster cups debug ldap minimal syslog winbind zeroconf"
-
-DEPEND="!<net-fs/samba-3.3
-	!net-fs/mount-cifs
-	ads? ( virtual/krb5 sys-fs/e2fsprogs
-		net-fs/samba-libs[ads] sys-apps/keyutils )
-	!minimal? (
-		dev-libs/popt
-		dev-libs/iniparser
-		virtual/libiconv
-		zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) )
-		caps? ( sys-libs/libcap )
-		cups? ( net-print/cups )
-		debug? ( dev-libs/dmalloc )
-		ldap? ( net-nds/openldap )
-		syslog? ( virtual/logger )
-		net-fs/samba-libs[caps?,cups?,ldap?,syslog?,winbind?]
-	)"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}/source"
-
-# TODO:
-# - enable iPrint on Prefix/OSX and Darwin?
-# - selftest-prefix? selftest?
-
-RESTRICT="test"
-
-CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-BINPROGS="bin/smbclient bin/net bin/smbget bin/smbtree bin/nmblookup bin/smbpasswd bin/rpcclient bin/smbcacls bin/smbcquotas bin/ntlm_auth"
-
-pkg_setup() {
-	confutils_use_depend_all ads ldap
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/3.3.4-missing_includes.patch" \
-		"${FILESDIR}/3.3.3-fix-as-needed.patch"
-
-	sed -i \
-		-e 's|"lib32" ||' \
-		-e 's|if test -d "$i/$l" ;|if test -d "$i/$l" -o -L "$i/$l";|' \
-		configure || die "sed failed"
-
-	sed -i \
-		-e 's|@LIBTALLOC_SHARED@||g' \
-		-e 's|@LIBTDB_SHARED@||g' \
-		-e 's|@LIBWBCLIENT_SHARED@||g' \
-		-e 's|@LIBNETAPI_SHARED@||g' \
-		-e 's|$(REG_SMBCONF_OBJ) @LIBNETAPI_STATIC@ $(LIBNET_OBJ)|$(REG_SMBCONF_OBJ) @LIBNETAPI_LIBS@ $(LIBNET_OBJ)|' \
-		Makefile.in || die "sed failed"
-
-	# Upstream doesn't want us to link certain things dynamically, but those binaries here seem to work
-	sed -i \
-		-e '/^LINK_LIBNETAPI/d' \
-		configure || die "sed failed"
-}
-
-src_configure() {
-	local myconf
-
-	# Filter out -fPIE
-	[[ ${CHOST} == *-*bsd* ]] && myconf="${myconf} --disable-pie"
-	use hppa && myconf="${myconf} --disable-pie"
-
-	# Upstream refuses to make this configurable
-	export ac_cv_header_sys_capability_h=no
-	if ! use minimal ; then
-		use caps && export ac_cv_header_sys_capability_h=yes
-	fi
-
-	if ! use minimal || use ads; then
-		# Notes:
-		# - FAM is a plugin for the server
-		# - DNS-SD is only used in client/server code
-		# - AFS is a pw-auth-method and only used in client/server code
-		# - AFSACL is a server module
-		# - automount is only needed in conjunction with NIS and we don't have that
-		#   anymore
-		# - quota-support is only needed in server-code
-		# - acl-support is only used in server-code
-		# - --without-dce-dfs and --without-nisplus-home can't be passed to configure but are disabled by default
-		# - current DNS/SD support in the client is via the mdnsresponder-compat api in avahi
-		econf ${myconf} \
-			--sysconfdir=/etc/samba \
-			--localstatedir=/var \
-			$(use_enable debug developer) \
-			--enable-largefile \
-			--enable-socket-wrapper \
-			--enable-nss-wrapper \
-			--disable-swat \
-			$(use_enable debug dmalloc) \
-			$(use minimal && echo "--disable-cups" || echo "$(use_enable cups)") \
-			--disable-iprint \
-			--disable-fam \
-			--enable-shared-libs \
-			$(use minimal && echo "--disable-dnssd" || echo "$(use_enable avahi dnssd)") \
-			--disable-avahi \
-			--with-fhs \
-			--with-privatedir=/var/lib/samba/private \
-			--with-rootsbindir=/var/cache/samba \
-			--with-lockdir=/var/cache/samba \
-			--with-swatdir=/usr/share/doc/${PF}/swat \
-			--with-configdir=/etc/samba \
-			--with-logfilebase=/var/log/samba \
-			--with-pammodulesdir=$(getpam_mod_dir) \
-			--without-afs \
-			--without-fake-kaserver \
-			--without-vfs-afsacl \
-			$(use minimal && echo "--without-ldap" || echo "$(use_with ldap)") \
-			$(use minimal && echo "--without-ads" || echo "$(use_with ads)") \
-			$(use minimal && echo "--without-krb5" || echo "$(use_with ads krb5 /usr)") \
-			$(use minimal && echo "--without-dnsupdate" || echo "$(use_with ads dnsupdate)") \
-			--without-automount \
-			--without-cifsmount \
-			--without-cifsupcall \
-			--without-pam \
-			--without-pam_smbpass \
-			$(use minimal && echo "--without-syslog" || echo "$(use_with syslog)") \
-			--without-quotas \
-			--without-sys-quotas \
-			--without-utmp \
-			--with-lib{talloc,tdb,netapi,smbclient,smbsharemodes} \
-			--without-libaddns \
-			$(use minimal && echo "--without-ctdb" || echo "$(use_with cluster ctdb /usr)") \
-			$(use minimal && echo "--without-cluster" || echo "$(use_with cluster cluster-support)") \
-			--without-acl-support \
-			$(use minimal && echo "--without-aio-support" || echo "$(use_with aio aio-support)") \
-			--with-sendfile-support \
-			$(use minimal && echo "--without-winbind" || echo "$(use_with winbind)") \
-			--without-included-popt \
-			--without-included-iniparser
-	fi
-}
-
-src_compile() {
-	mkdir bin
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o bin/mount.cifs client/{mount.cifs,mtab}.c || die "building mount.cifs failed"
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o bin/umount.cifs client/{umount.cifs,mtab}.c || die "building umount.cifs failed"
-
-	if use ads ; then
-		emake bin/cifs.upcall || die "emake cifs.upcall failed"
-	fi
-
-	if ! use minimal ; then
-		emake ${BINPROGS} || die "emake binprogs failed"
-		if use cups ; then
-			emake bin/smbspool || die "emake smbspool failed"
-		fi
-	fi
-}
-
-src_install() {
-	into /
-	dosbin bin/mount.cifs bin/umount.cifs || die "u/mount.cifs not around"
-	doman ../docs/manpages/{u,}mount.cifs.8  || die "can't create man pages"
-	dohtml ../docs/htmldocs/manpages/{u,}mount.cifs.8.html || die "dohtml failed"
-
-	into /usr
-	if use ads ; then
-		dosbin bin/cifs.upcall || die "cifs.upcall not around"
-		doman ../docs/manpages/cifs.upcall.8 || die "doman failed"
-		dohtml ../docs/htmldocs/manpages/cifs.upcall.8.html || die "doman failed"
-	fi
-
-	if ! use minimal ; then
-		dobin ${BINPROGS} || die "not all bins around"
-		for prog in ${BINPROGS} ; do
-			doman ../docs/manpages/${prog/bin\/}* || die "doman failed"
-			dohtml ../docs/htmldocs/manpages/${prog/bin\/}*.html || die "dohtml failed"
-		done
-
-		if use cups ; then
-			dobin bin/smbspool || die "smbspool not around"
-			doman ../docs/manpages/smbspool.8 || die "doman failed"
-			dohtml ../docs/htmldocs/manpages/smbspool.8.html || die "dohtml failed"
-			dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb
-		fi
-	fi
-}
diff --git a/net-fs/samba-client/samba-client-3.3.9.ebuild b/net-fs/samba-client/samba-client-3.3.9.ebuild
index 1c9eb0b89f1f..95b79ec67727 100644
--- a/net-fs/samba-client/samba-client-3.3.9.ebuild
+++ b/net-fs/samba-client/samba-client-3.3.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-client/samba-client-3.3.9.ebuild,v 1.1 2009/10/22 18:51:58 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-client/samba-client-3.3.9.ebuild,v 1.2 2009/10/29 20:38:16 patrick Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.samba.org/"
 SRC_URI="mirror://samba/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
 IUSE="ads aio avahi caps cluster cups debug ldap minimal syslog winbind zeroconf"
 
 DEPEND="!<net-fs/samba-3.3
diff --git a/net-fs/samba-client/samba-client-3.4.2.ebuild b/net-fs/samba-client/samba-client-3.4.3.ebuild
index 03852b6c60ff..7c6c94bbba7e 100644
--- a/net-fs/samba-client/samba-client-3.4.2.ebuild
+++ b/net-fs/samba-client/samba-client-3.4.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-client/samba-client-3.4.2.ebuild,v 1.3 2009/10/11 20:23:09 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-client/samba-client-3.4.3.ebuild,v 1.1 2009/10/29 20:38:16 patrick Exp $
 
 EAPI="2"
 
-inherit pam confutils versionator multilib eutils toolchain-funcs
+inherit pam confutils versionator multilib eutils toolchain-funcs autotools
 
 MY_P="samba-${PV}"
 
@@ -30,8 +30,8 @@ DEPEND="!<net-fs/samba-3.3
 		debug? ( dev-libs/dmalloc )
 		ldap? ( net-nds/openldap )
 		syslog? ( virtual/logger )
-		virtual/tdb
-		virtual/talloc
+		sys-libs/tdb
+		sys-libs/talloc
 		~net-fs/samba-libs-${PV}[caps?,cups?,ldap?,syslog?,winbind?,ads?,samba4?,netapi] )"
 RDEPEND="${DEPEND}"
 
@@ -56,7 +56,6 @@ src_prepare() {
 	cd ".."
 
 	epatch \
-		"${FILESDIR}/samba-3.4.2-add-zlib-linking.patch" \
 		"${FILESDIR}/samba-3.4.2-missing_includes.patch" \
 		"${FILESDIR}/samba-3.4.2-fix-samba4-automake.patch" \
 		"${FILESDIR}/samba-3.4.2-insert-AC_LD_VERSIONSCRIPT.patch"
@@ -65,26 +64,7 @@ src_prepare() {
 	cp "${FILESDIR}/samba-3.4.2-lib.tevent.python.mk" "lib/tevent/python.mk"
 
 	cd "source3"
-
-#	sed -i \
-#		-e 's|@LIBTALLOC_SHARED@||g' \
-#		-e 's|@LIBTDB_SHARED@||g' \
-#		-e 's|@LIBWBCLIENT_SHARED@||g' \
-#		-e 's|@LIBNETAPI_SHARED@||g' \
-#		-e 's|$(REG_SMBCONF_OBJ) @LIBNETAPI_STATIC@ $(LIBNET_OBJ)|$(REG_SMBCONF_OBJ) @LIBNETAPI_LIBS@ $(LIBNET_OBJ)|' \
-#		Makefile.in || die "sed failed"
-
-	./autogen.sh || die "autogen.sh failed"
-
-#	sed -i \
-#		-e 's|"lib32" ||' \
-#		-e 's|if test -d "$i/$l" ;|if test -d "$i/$l" -o -L "$i/$l";|' \
-#		configure || die "sed failed"
-
-	# Upstream doesn't want us to link certain things dynamically, but those binaries here seem to work
-#	sed -i \
-#		-e '/^LINK_LIBNETAPI/d' \
-#		configure || die "sed failed"
+	eautoconf -Ilibreplace -Im4 -I../m4 -I../lib/replace -I../source4
 }
 
 src_configure() {
diff --git a/net-fs/samba-libs/ChangeLog b/net-fs/samba-libs/ChangeLog
index e5268971fe68..1d3700cdc45d 100644
--- a/net-fs/samba-libs/ChangeLog
+++ b/net-fs/samba-libs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/samba-libs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-libs/ChangeLog,v 1.19 2009/10/24 11:20:45 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-libs/ChangeLog,v 1.20 2009/10/29 20:38:39 patrick Exp $
+
+*samba-libs-3.4.3 (29 Oct 2009)
+
+  29 Oct 2009; Patrick Lauer <patrick@gentoo.org> -samba-libs-3.3.8.ebuild,
+  -samba-libs-3.4.2-r2.ebuild, +samba-libs-3.4.3.ebuild:
+  Bump, remove old
 
   24 Oct 2009; Tobias Klausmann <klausman@gentoo.org>
   samba-libs-3.3.8.ebuild:
diff --git a/net-fs/samba-libs/samba-libs-3.3.8.ebuild b/net-fs/samba-libs/samba-libs-3.3.8.ebuild
deleted file mode 100644
index de395259cce0..000000000000
--- a/net-fs/samba-libs/samba-libs-3.3.8.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-libs/samba-libs-3.3.8.ebuild,v 1.4 2009/10/24 11:20:45 klausman Exp $
-
-EAPI="2"
-
-inherit pam confutils versionator multilib
-
-MY_P="samba-${PV}"
-
-DESCRIPTION="Libraries from Samba"
-HOMEPAGE="http://www.samba.org/"
-SRC_URI="mirror://samba/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
-IUSE="ads aio caps cluster cups debug examples ldap pam syslog winbind"
-
-DEPEND="dev-libs/popt
-	virtual/libiconv
-	ads? ( virtual/krb5 sys-fs/e2fsprogs )
-	caps? ( sys-libs/libcap )
-	cluster? ( dev-db/ctdb )
-	cups? ( net-print/cups )
-	debug? ( dev-libs/dmalloc )
-	ldap? ( net-nds/openldap )
-	pam? ( virtual/pam
-		winbind? ( dev-libs/iniparser ) )
-	syslog? ( virtual/logger )
-	!<net-fs/samba-3.3
-	!sys-libs/tdb
-	!sys-libs/talloc"
-RDEPEND="${DEPEND}"
-
-# Disable tests since we don't want to build that much here
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}/source"
-
-# TODO:
-# - enable iPrint on Prefix/OSX and Darwin?
-# - selftest-prefix? selftest?
-
-CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-
-pkg_setup() {
-	confutils_use_depend_all ads ldap
-}
-
-src_prepare() {
-	sed -i \
-		-e 's|"lib32" ||' \
-		-e 's|if test -d "$i/$l" ;|if test -d "$i/$l" -o -L "$i/$l";|' \
-		configure || die "sed failed"
-}
-
-src_configure() {
-	local myconf
-
-	# Filter out -fPIE
-	[[ ${CHOST} == *-*bsd* ]] && myconf="${myconf} --disable-pie"
-	use hppa && myconf="${myconf} --disable-pie"
-
-	# Upstream refuses to make this configurable
-	use caps && export ac_cv_header_sys_capability_h=yes || export ac_cv_header_sys_capability_h=no
-
-	# Notes:
-	# - FAM is a plugin for the server
-	# - DNS-SD is only used in client/server code
-	# - AFS is a pw-auth-method and only used in client/server code
-	# - AFSACL is a server module
-	# - automount is only needed in conjunction with NIS and we don't have that
-	#   anymore
-	# - quota-support is only needed in server-code
-	# - acl-support is only used in server-code
-	# - --without-dce-dfs and --without-nisplus-home can't be passed to configure but are disabled by default
-	econf ${myconf} \
-		--sysconfdir=/etc/samba \
-		--localstatedir=/var \
-		$(use_enable debug developer) \
-		--enable-largefile \
-		--enable-socket-wrapper \
-		--enable-nss-wrapper \
-		--disable-swat \
-		$(use_enable debug dmalloc) \
-		$(use_enable cups) \
-		--disable-iprint \
-		--disable-fam \
-		--enable-shared-libs \
-		--disable-dnssd \
-		--disable-avahi \
-		--with-fhs \
-		--with-privatedir=/var/lib/samba/private \
-		--with-rootsbindir=/var/cache/samba \
-		--with-lockdir=/var/cache/samba \
-		--with-swatdir=/usr/share/doc/${PF}/swat \
-		--with-configdir=/etc/samba \
-		--with-logfilebase=/var/log/samba \
-		--with-pammodulesdir=$(getpam_mod_dir) \
-		--without-afs \
-		--without-fake-kaserver \
-		--without-vfs-afsacl \
-		$(use_with ldap) \
-		$(use_with ads) \
-		$(use_with ads krb5 /usr) \
-		$(use_with ads dnsupdate) \
-		--without-automount \
-		--without-cifsmount \
-		--without-cifsupcall \
-		$(use_with pam) \
-		$(use_with pam pam_smbpass) \
-		$(use_with syslog) \
-		--without-quotas \
-		--without-sys-quotas \
-		--without-utmp \
-		--with-lib{talloc,tdb,netapi,smbclient,smbsharemodes} \
-		--without-libaddns \
-		$(use_with cluster ctdb /usr) \
-		$(use_with cluster cluster-support) \
-		--without-acl-support \
-		$(use_with aio aio-support) \
-		--with-sendfile-support \
-		$(use_with winbind) \
-		--without-included-popt \
-		--without-included-iniparser
-}
-
-src_compile() {
-	emake libs pam_modules nss_modules || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" installlibs || die "emake installlibs failed"
-	if use pam ; then
-		emake DESTDIR="${D}" installpammodules || die "emake installpammodules failed"
-	fi
-
-	# Remove empty installation directories
-	rmdir \
-		"${D}/usr/$(get_libdir)/samba" \
-		"${D}/usr"/{sbin,bin} \
-		"${D}/usr/share"/{man,locale,} \
-		"${D}/var"/{run,lib/samba/private,lib/samba,lib,cache/samba,cache,} \
-		|| die "tried to remove non-empty dirs, this seems like a bug in the ebuild"
-
-	# Nsswitch extensions. Make link for wins and winbind resolvers
-	if use winbind ; then
-		dolib.so nsswitch/libnss_wins.so
-		dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2
-		dolib.so nsswitch/libnss_winbind.so
-		dosym libnss_winbind.so /usr/$(get_libdir)/libnss_winbind.so.2
-	fi
-
-	if use pam ; then
-		if use winbind ; then
-			newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-			doman ../docs/manpages/pam_winbind.7
-			dohtml ../docs/htmldocs/manpages/pam_winbind.7.html
-
-			if use examples ; then
-				insinto /usr/share/doc/${PF}/examples
-				doins -r ../examples/pam_winbind
-			fi
-		fi
-
-		newpamd "${CONFDIR}/samba.pam" samba
-		dodoc pam_smbpass/README
-	fi
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r ../examples/libsmbclient
-
-		use winbind && doins -r ../examples/nss
-	fi
-
-}
diff --git a/net-fs/samba-libs/samba-libs-3.3.9.ebuild b/net-fs/samba-libs/samba-libs-3.3.9.ebuild
index ce7e774cc909..fd0021f21254 100644
--- a/net-fs/samba-libs/samba-libs-3.3.9.ebuild
+++ b/net-fs/samba-libs/samba-libs-3.3.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-libs/samba-libs-3.3.9.ebuild,v 1.1 2009/10/22 18:52:20 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-libs/samba-libs-3.3.9.ebuild,v 1.2 2009/10/29 20:38:39 patrick Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.samba.org/"
 SRC_URI="mirror://samba/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
 IUSE="ads aio caps cluster cups debug examples ldap pam syslog winbind"
 
 DEPEND="dev-libs/popt
diff --git a/net-fs/samba-libs/samba-libs-3.4.2-r2.ebuild b/net-fs/samba-libs/samba-libs-3.4.3.ebuild
index 2e09c5c9b44a..59adfacffa50 100644
--- a/net-fs/samba-libs/samba-libs-3.4.2-r2.ebuild
+++ b/net-fs/samba-libs/samba-libs-3.4.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-libs/samba-libs-3.4.2-r2.ebuild,v 1.2 2009/10/23 09:37:39 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-libs/samba-libs-3.4.3.ebuild,v 1.1 2009/10/29 20:38:39 patrick Exp $
 
 EAPI="2"
 
-inherit pam confutils versionator multilib
+inherit pam confutils versionator multilib autotools
 
 MY_P="samba-${PV}"
 
@@ -60,7 +60,6 @@ src_prepare() {
 	cd ".."
 
 	epatch \
-		"${FILESDIR}/samba-3.4.2-add-zlib-linking.patch" \
 		"${FILESDIR}/samba-3.4.2-missing_includes.patch" \
 		"${FILESDIR}/samba-3.4.2-fix-samba4-automake.patch" \
 		"${FILESDIR}/samba-3.4.2-insert-AC_LD_VERSIONSCRIPT.patch"
@@ -69,32 +68,12 @@ src_prepare() {
 	cp "${FILESDIR}/samba-3.4.2-lib.tevent.python.mk" "lib/tevent/python.mk"
 
 	cd "source3"
-
-#	sed -i \
-#		-e 's|@LIBTALLOC_SHARED@||g' \
-#		-e 's|@LIBTDB_SHARED@||g' \
-#		-e 's|@LIBWBCLIENT_SHARED@||g' \
-#		-e 's|@LIBNETAPI_SHARED@||g' \
-#		-e 's|$(REG_SMBCONF_OBJ) @LIBNETAPI_STATIC@ $(LIBNET_OBJ)|$(REG_SMBCONF_OBJ) @LIBNETAPI_LIBS@ $(LIBNET_OBJ)|' \
-#		Makefile.in || die "sed failed"
-
-	./autogen.sh || die "autogen.sh failed"
+	eautoconf -Ilibreplace -Im4 -I../m4 -I../lib/replace -I../source4
 
 	# ensure that winbind has correct ldflags (QA notice)
 	sed -i \
 		-e 's|LDSHFLAGS="|LDSHFLAGS="\\${LDFLAGS} |g' \
 		configure || die "sed failed"
-
-#	sed -i \
-#		-e 's|"lib32" ||' \
-#		-e 's|if test -d "$i/$l" ;|if test -d "$i/$l" -o -L "$i/$l";|' \
-#		configure || die "sed failed"
-
-	# Upstream doesn't want us to link certain things dynamically, but those binaries here seem to work
-#	sed -i \
-#		-e '/^LINK_LIBNETAPI/d' \
-#		configure || die "sed failed"
-
 }
 
 src_configure() {
diff --git a/net-fs/samba-server/ChangeLog b/net-fs/samba-server/ChangeLog
index dfc643714113..246a22a74f3b 100644
--- a/net-fs/samba-server/ChangeLog
+++ b/net-fs/samba-server/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-fs/samba-server
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-server/ChangeLog,v 1.21 2009/10/24 11:20:05 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-server/ChangeLog,v 1.22 2009/10/29 20:39:03 patrick Exp $
+
+*samba-server-3.4.3 (29 Oct 2009)
+
+  29 Oct 2009; Patrick Lauer <patrick@gentoo.org>
+  -samba-server-3.3.8.ebuild, -samba-server-3.4.2.ebuild,
+  +samba-server-3.4.3.ebuild:
+  Bump, remove old
 
   24 Oct 2009; Tobias Klausmann <klausman@gentoo.org>
   samba-server-3.3.8.ebuild:
diff --git a/net-fs/samba-server/samba-server-3.3.8.ebuild b/net-fs/samba-server/samba-server-3.3.8.ebuild
deleted file mode 100644
index 601f1921935f..000000000000
--- a/net-fs/samba-server/samba-server-3.3.8.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-server/samba-server-3.3.8.ebuild,v 1.4 2009/10/24 11:20:05 klausman Exp $
-
-EAPI="2"
-
-inherit pam confutils versionator multilib
-
-MY_P="samba-${PV}"
-
-DESCRIPTION="Libraries from Samba"
-HOMEPAGE="http://www.samba.org/"
-SRC_URI="mirror://samba/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
-IUSE="acl ads aio avahi caps cluster cups debug doc examples fam ldap quota swat syslog winbind zeroconf"
-
-# currently a bit broken
-RESTRICT="test"
-
-DEPEND="!<net-fs/samba-3.3
-	ads? ( virtual/krb5 sys-fs/e2fsprogs net-fs/samba-libs[ads] )
-	dev-libs/popt
-	virtual/libiconv
-	avahi? ( net-dns/avahi )
-	zeroconf? ( !avahi? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) ) )
-	caps? ( sys-libs/libcap )
-	cups? ( net-print/cups )
-	debug? ( dev-libs/dmalloc )
-	ldap? ( net-nds/openldap )
-	syslog? ( virtual/logger )
-	net-fs/samba-libs[caps?,cluster?,cups?,ldap?,syslog?,winbind?]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}/source"
-
-# TODO:
-# - enable iPrint on Prefix/OSX and Darwin?
-# - selftest-prefix? selftest?
-
-CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-SBINPROGS="bin/smbd bin/nmbd"
-BINPROGS="bin/testparm bin/smbstatus bin/smbcontrol bin/tdbbackup bin/pdbedit
-	bin/tdbdump bin/tdbtool bin/profiles bin/sharesec
-	bin/eventlogadm bin/ldbedit bin/ldbsearch bin/ldbadd bin/ldbdel bin/ldbmodify bin/ldbrename"
-
-pkg_setup() {
-	confutils_use_depend_all ads ldap
-}
-
-src_prepare() {
-	sed -i \
-		-e 's|"lib32" ||' \
-		-e 's|if test -d "$i/$l" ;|if test -d "$i/$l" -o -L "$i/$l";|' \
-		configure || die "sed failed"
-
-	sed -i \
-		-e 's|@LIBTALLOC_SHARED@||g' \
-		-e 's|@LIBTDB_SHARED@||g' \
-		-e 's|@LIBWBCLIENT_SHARED@||g' \
-		-e 's|@LIBNETAPI_SHARED@||g' \
-		-e 's|$(REG_SMBCONF_OBJ) @LIBNETAPI_STATIC@ $(LIBNET_OBJ)|$(REG_SMBCONF_OBJ) @LIBNETAPI_LIBS@ $(LIBNET_OBJ)|' \
-		Makefile.in || die "sed failed"
-
-	# Upstream doesn't want us to link certain things dynamically, but those binaries here seem to work
-	sed -i \
-		-e '/^LINK_LIBNETAPI/d' \
-		configure || die "sed failed"
-
-	#Fixing crash in dns_register_smbd_reply
-	epatch "${CONFDIR}/${PN}-3.3.7-dns-register.patch"
-}
-
-src_configure() {
-	local myconf
-
-	# Filter out -fPIE
-	[[ ${CHOST} == *-*bsd* ]] && myconf="${myconf} --disable-pie"
-	use hppa && myconf="${myconf} --disable-pie"
-
-	# Upstream refuses to make this configurable
-	export ac_cv_header_sys_capability_h=no
-	use caps && export ac_cv_header_sys_capability_h=yes
-
-	local dnssd="--disable-dnssd"
-	use zeroconf && ! use avahi && dnssd="--enable-dnssd"
-
-	# Notes:
-	# - FAM is a plugin for the server
-	# - DNS-SD is only used in client/server code
-	# - AFS is a pw-auth-method and only used in client/server code
-	# - AFSACL is a server module
-	# - automount is only needed in conjunction with NIS and we don't have that
-	#   anymore
-	# - quota-support is only needed in server-code
-	# - acl-support is only used in server-code
-	# - --without-dce-dfs and --without-nisplus-home can't be passed to configure but are disabled by default
-	econf ${myconf} \
-		--with-piddir=/var/run/samba \
-		--sysconfdir=/etc/samba \
-		--localstatedir=/var \
-		$(use_enable debug developer) \
-		--enable-largefile \
-		--enable-socket-wrapper \
-		--enable-nss-wrapper \
-		$(use_enable swat) \
-		$(use_enable debug dmalloc) \
-		$(use_enable cups) \
-		--disable-iprint \
-		$(use_enable fam) \
-		--enable-shared-libs \
-		${dnssd} \
-		$(use_enable avahi) \
-		--with-fhs \
-		--with-privatedir=/var/lib/samba/private \
-		--with-rootsbindir=/var/cache/samba \
-		--with-lockdir=/var/cache/samba \
-		--with-swatdir=/usr/share/doc/${PF}/swat \
-		--with-configdir=/etc/samba \
-		--with-logfilebase=/var/log/samba \
-		--with-pammodulesdir=$(getpam_mod_dir) \
-		--without-afs \
-		--without-fake-kaserver \
-		--without-vfs-afsacl \
-		$(use_with ldap) \
-		$(use_with ads) \
-		$(use_with ads krb5 /usr) \
-		$(use_with ads dnsupdate) \
-		--without-automount \
-		--without-cifsmount \
-		--without-cifsupcall \
-		--without-pam \
-		--without-pam_smbpass \
-		$(use_with syslog) \
-		$(use_with quota quotas) \
-		$(use_with quota sys-quotas) \
-		--without-utmp \
-		--with-lib{talloc,tdb,netapi,smbclient,smbsharemodes} \
-		--without-libaddns \
-		$(use_with cluster ctdb /usr) \
-		$(use_with cluster cluster-support) \
-		$(use_with acl acl-support) \
-		$(use_with aio aio-support) \
-		--with-sendfile-support \
-		$(use_with winbind)
-
-	use swat && SBINPROGS="${SBINPROGS} bin/swat"
-	use winbind && SBINPROGS="${SBINPROGS} bin/winbindd"
-	use ads && use winbind && SBIN_PROGS="${SBINPROGS} bin/winbind_krb5_locator"
-
-	use winbind && BINPROGS="${BINPROGS} bin/wbinfo"
-}
-
-src_compile() {
-	emake ${SBINPROGS} || die "building server binaries failed"
-	emake modules || die "building modules failed"
-	emake ${BINPROGS} || die "building binaries failed"
-}
-
-src_install() {
-	dosbin ${SBINPROGS} || die "installing server binaries failed"
-
-	emake DESTDIR="${D}" installmodules || die "installing modules failed"
-
-	dobin ${BINPROGS} || die "installing binaries failed"
-
-	for prog in ${BINPROGS} ${SBINPROGS} ; do
-		doman ../docs/manpages/${prog/bin\/}*
-	done
-
-	doman ../docs/manpages/vfs* ../docs/manpages/samba.7 ../docs/manpages/smb.conf.5
-
-	diropts -m0700
-	keepdir /var/lib/samba/private
-
-	diropts -m1777
-	keepdir /var/spool/samba
-
-	diropts -m0755
-	keepdir /var/{cache,log}/samba
-	keepdir /var/lib/samba/{netlogon,profiles}
-	keepdir /var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC,X64,IA64,COLOR}
-	keepdir /usr/$(get_libdir)/samba/{auth,pdb,rpc,idmap,nss_info,gpext}
-
-	newconfd "${CONFDIR}/samba.confd" samba
-	newinitd "${CONFDIR}/samba.initd" samba
-
-	insinto /etc/samba
-	doins "${CONFDIR}"/{smbusers,lmhosts,smb.conf.default}
-
-	insinto /usr/"$(get_libdir)"/samba
-	doins codepages/{valid.dat,upcase.dat,lowcase.dat}
-
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		doins ../examples/LDAP/samba.schema
-	fi
-
-	if use swat ; then
-		insinto /etc/xinetd.d
-		newins "${CONFDIR}/swat.xinetd" swat
-	fi
-
-	dodoc ../MAINTAINERS ../README* ../Roadmap ../WHATSNEW.txt ../docs/THANKS
-
-	if use doc ; then
-		dohtml -r ../docs/htmldocs/*
-		dodoc ../docs/*.pdf
-	fi
-
-	if use examples ; then
-		cd ../examples
-		insinto /usr/share/doc/${PF}/examples
-		doins -r \
-			auth autofs dce-dfs LDAP logon misc pdb perfcounter \
-			printer-accounting printing scripts tridge validchars VFS
-	fi
-}
diff --git a/net-fs/samba-server/samba-server-3.3.9.ebuild b/net-fs/samba-server/samba-server-3.3.9.ebuild
index 35a4d75dd458..4a41d7a65219 100644
--- a/net-fs/samba-server/samba-server-3.3.9.ebuild
+++ b/net-fs/samba-server/samba-server-3.3.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-server/samba-server-3.3.9.ebuild,v 1.1 2009/10/22 18:52:41 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-server/samba-server-3.3.9.ebuild,v 1.2 2009/10/29 20:39:03 patrick Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.samba.org/"
 SRC_URI="mirror://samba/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
 IUSE="acl ads aio avahi caps cluster cups debug doc examples fam ldap quota swat syslog winbind zeroconf"
 
 # currently a bit broken
diff --git a/net-fs/samba-server/samba-server-3.4.2.ebuild b/net-fs/samba-server/samba-server-3.4.3.ebuild
index 9abb8247b1f3..6a7dcf770821 100644
--- a/net-fs/samba-server/samba-server-3.4.2.ebuild
+++ b/net-fs/samba-server/samba-server-3.4.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-server/samba-server-3.4.2.ebuild,v 1.3 2009/10/11 20:25:56 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-server/samba-server-3.4.3.ebuild,v 1.1 2009/10/29 20:39:03 patrick Exp $
 
 EAPI="2"
 
-inherit pam confutils versionator multilib
+inherit pam confutils versionator multilib autotools
 
 MY_P="samba-${PV}"
 
@@ -25,10 +25,11 @@ DEPEND="!<net-fs/samba-3.3
 	caps? ( sys-libs/libcap )
 	cups? ( net-print/cups )
 	debug? ( dev-libs/dmalloc )
+	fam? ( dev-libs/libgamin )
 	ldap? ( net-nds/openldap )
 	syslog? ( virtual/logger )
-	virtual/tdb
-	virtual/talloc
+	sys-libs/tdb
+	sys-libs/talloc
 	~net-fs/samba-libs-${PV}[caps?,cluster?,cups?,ldap?,syslog?,winbind?,ads?,samba4?]"
 RDEPEND="${DEPEND}"
 
@@ -52,7 +53,6 @@ src_prepare() {
 	cd ".."
 
 	epatch \
-		"${FILESDIR}/samba-3.4.2-add-zlib-linking.patch" \
 		"${FILESDIR}/samba-3.4.2-missing_includes.patch" \
 		"${FILESDIR}/samba-3.4.2-fix-samba4-automake.patch" \
 		"${FILESDIR}/samba-3.4.2-insert-AC_LD_VERSIONSCRIPT.patch"
@@ -61,27 +61,7 @@ src_prepare() {
 	cp "${FILESDIR}/samba-3.4.2-lib.tevent.python.mk" "lib/tevent/python.mk"
 
 	cd "source3"
-
-#	sed -i \
-#		-e 's|@LIBTALLOC_SHARED@||g' \
-#		-e 's|@LIBTDB_SHARED@||g' \
-#		-e 's|@LIBWBCLIENT_SHARED@||g' \
-#		-e 's|@LIBNETAPI_SHARED@||g' \
-#		-e 's|$(REG_SMBCONF_OBJ) @LIBNETAPI_STATIC@ $(LIBNET_OBJ)|$(REG_SMBCONF_OBJ) @LIBNETAPI_LIBS@ $(LIBNET_OBJ)|' \
-#		Makefile.in || die "sed failed"
-
-	./autogen.sh || die "autogen.sh failed"
-
-#	sed -i \
-#		-e 's|"lib32" ||' \
-#		-e 's|if test -d "$i/$l" ;|if test -d "$i/$l" -o -L "$i/$l";|' \
-#		configure || die "sed failed"
-
-	# Upstream doesn't want us to link certain things dynamically, but those binaries here seem to work
-#	sed -i \
-#		-e '/^LINK_LIBNETAPI/d' \
-#		configure || die "sed failed"
-
+	eautoconf -Ilibreplace -Im4 -I../m4 -I../lib/replace -I../source4
 }
 
 src_configure() {
diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index f5b4b0df8998..a9c92d3dd1b4 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.381 2009/10/24 11:19:44 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.382 2009/10/29 20:37:52 patrick Exp $
+
+*samba-3.4.3 (29 Oct 2009)
+
+  29 Oct 2009; Patrick Lauer <patrick@gentoo.org> -samba-3.3.8.ebuild,
+  +samba-3.4.3.ebuild:
+  Bump, remove old
 
   24 Oct 2009; Tobias Klausmann <klausman@gentoo.org> samba-3.3.8.ebuild:
   Keyworded on alpha, bug #285952
diff --git a/net-fs/samba/samba-3.3.9.ebuild b/net-fs/samba/samba-3.3.9.ebuild
index ef10bd98349d..7b1c55afcff9 100644
--- a/net-fs/samba/samba-3.3.9.ebuild
+++ b/net-fs/samba/samba-3.3.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.3.9.ebuild,v 1.1 2009/10/22 18:51:36 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.3.9.ebuild,v 1.2 2009/10/29 20:37:52 patrick Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ DESCRIPTION="Meta package for samba-{libs,client,server}"
 HOMEPAGE="http://www.samba.org/"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc64 ~x86"
 IUSE="+client +server"
 
 DEPEND=""
diff --git a/net-fs/samba/samba-3.3.8.ebuild b/net-fs/samba/samba-3.4.3.ebuild
index 754029a5dd1d..cae2bf9258bf 100644
--- a/net-fs/samba/samba-3.3.8.ebuild
+++ b/net-fs/samba/samba-3.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.3.8.ebuild,v 1.2 2009/10/24 11:19:44 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.4.3.ebuild,v 1.1 2009/10/29 20:37:52 patrick Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ DESCRIPTION="Meta package for samba-{libs,client,server}"
 HOMEPAGE="http://www.samba.org/"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
 IUSE="+client +server"
 
 DEPEND=""