Readding samba stuff

(Portage version: 2.1.2_pre2-r6)
 (Signed Manifest commit)

3 files changed, 14 insertions, 72 deletions

diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index d8fc3ee2e869..a83d4ce155cf 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -28,14 +28,14 @@ EBUILD tcpdump-3.9.4.ebuild 1458 RMD160 8b327734139427ed34a13bcc608cc12e1259b33f
 MD5 2c0fad20640768f5c28323ebe70b3bbd tcpdump-3.9.4.ebuild 1458
 RMD160 8b327734139427ed34a13bcc608cc12e1259b33f tcpdump-3.9.4.ebuild 1458
 SHA256 069e9dc2ccdb73c30acc82cce009d281c5fbc762f37bb4c4eb5ae77b9f44b9cb tcpdump-3.9.4.ebuild 1458
-EBUILD tcpdump-3.9.5.ebuild 1468 RMD160 75bf43f4264b6ac6eb8965ddfac42f3314eb69ac SHA1 1305f04e65a881d79df85b3e2e55fcf58b398cd6 SHA256 f9b8d6faedb5650650821e151b21550d62952655d03b862034451a1a3b77aec5
-MD5 37ac254d8fc26e44c0c214a9079f65ac tcpdump-3.9.5.ebuild 1468
-RMD160 75bf43f4264b6ac6eb8965ddfac42f3314eb69ac tcpdump-3.9.5.ebuild 1468
-SHA256 f9b8d6faedb5650650821e151b21550d62952655d03b862034451a1a3b77aec5 tcpdump-3.9.5.ebuild 1468
-MISC ChangeLog 10939 RMD160 4bbfa03d8ae70c7807b63b0c1cb1893e5c978e57 SHA1 7be207d88e55849da58e704e8b2cd2890ab94820 SHA256 5b305827c4c92a1c265329e40e0be01e1df97203dfe4f0a3b680dd657c08ace6
-MD5 5fd05fc6504955a31737bac8c25c34ba ChangeLog 10939
-RMD160 4bbfa03d8ae70c7807b63b0c1cb1893e5c978e57 ChangeLog 10939
-SHA256 5b305827c4c92a1c265329e40e0be01e1df97203dfe4f0a3b680dd657c08ace6 ChangeLog 10939
+EBUILD tcpdump-3.9.5-r1.ebuild 1803 RMD160 d865f10d96d2db355872d53b2f27e23f0ac67842 SHA1 972bbd5429fc7105d99c01caf47425767668bb39 SHA256 fd5b13fbb0d271a5d1f4e329c0a4389d917c36e60c7665cc7a896fa1745f65e0
+MD5 696afb64d045a1ab5a1fa83bd6b2b0f9 tcpdump-3.9.5-r1.ebuild 1803
+RMD160 d865f10d96d2db355872d53b2f27e23f0ac67842 tcpdump-3.9.5-r1.ebuild 1803
+SHA256 fd5b13fbb0d271a5d1f4e329c0a4389d917c36e60c7665cc7a896fa1745f65e0 tcpdump-3.9.5-r1.ebuild 1803
+MISC ChangeLog 11071 RMD160 46f2b86cabc3da07f0396aec2a1c940fccb202a8 SHA1 419d2b61816b9b95f51fed86573b876b08270e38 SHA256 45797ecafe331cc418b7d647e2c6d18491c1f3095afd1e79912b4091d13100eb
+MD5 74ed8f4ef061eee401b1f649a6828828 ChangeLog 11071
+RMD160 46f2b86cabc3da07f0396aec2a1c940fccb202a8 ChangeLog 11071
+SHA256 45797ecafe331cc418b7d647e2c6d18491c1f3095afd1e79912b4091d13100eb ChangeLog 11071
 MISC metadata.xml 268 RMD160 896e1ec3be866fe1d515b55473f0ac763b9f8a12 SHA1 9a77e6e1b7e0c4469583dc9d9a20065d6ac74ab6 SHA256 01030866e2f7de584ec505f71cfbfbbb48f8a790a0ea50a3da1974b74423f827
 MD5 1465cdeb961745379a8ae1402b3e51ab metadata.xml 268
 RMD160 896e1ec3be866fe1d515b55473f0ac763b9f8a12 metadata.xml 268
@@ -49,13 +49,13 @@ SHA256 0f31cf28e2cf548760dec49e19d8e615588655abd6bc3a7a2c63372683fcb4ba files/di
 MD5 5b7e9e87db98adceedf64b926fb30901 files/digest-tcpdump-3.9.4-r2 241
 RMD160 7ce1afbd50b447cfef1b5702157cfbfab6cfa78b files/digest-tcpdump-3.9.4-r2 241
 SHA256 0f31cf28e2cf548760dec49e19d8e615588655abd6bc3a7a2c63372683fcb4ba files/digest-tcpdump-3.9.4-r2 241
-MD5 529ef132e81950340671aa911a76e183 files/digest-tcpdump-3.9.5 241
-RMD160 eb77d5212d7f489fa7ff696bfb37f6bb534a5ab9 files/digest-tcpdump-3.9.5 241
-SHA256 e7b50f54579db8c825c28d89b19081abf1c5407bd89276f47b03ada1968e085e files/digest-tcpdump-3.9.5 241
+MD5 529ef132e81950340671aa911a76e183 files/digest-tcpdump-3.9.5-r1 241
+RMD160 eb77d5212d7f489fa7ff696bfb37f6bb534a5ab9 files/digest-tcpdump-3.9.5-r1 241
+SHA256 e7b50f54579db8c825c28d89b19081abf1c5407bd89276f47b03ada1968e085e files/digest-tcpdump-3.9.5-r1 241
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFKWTHz974XjDVpbkRAizcAKC9SrH5CKF6n0y85MDk0fZ24jxclQCfZg8l
-xPV9mQ+BexjVA0A/MTFmGY0=
-=j8vw
+iD8DBQFFKhwlz974XjDVpbkRAsh8AJ9oFARhD7HsMkQckkq1nJPX/A8GPgCfZ1ec
+ag/1ZGshEUB3dnEwbycWSe0=
+=HYRp
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/tcpdump/files/digest-tcpdump-3.9.5 b/net-analyzer/tcpdump/files/digest-tcpdump-3.9.5
deleted file mode 100644
index c7b2ab6bf4ef..000000000000
--- a/net-analyzer/tcpdump/files/digest-tcpdump-3.9.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2135e7b1f09af0eaf66d2af822bed44a tcpdump-3.9.5.tar.gz 712411
-RMD160 e0409ad55deda1b2a74950522720610c6c94d771 tcpdump-3.9.5.tar.gz 712411
-SHA256 6a1617253f12bf2ac440eeb8709baeb907c6b801442bf2229a6bb84489cf38f4 tcpdump-3.9.5.tar.gz 712411
diff --git a/net-analyzer/tcpdump/tcpdump-3.9.5.ebuild b/net-analyzer/tcpdump/tcpdump-3.9.5.ebuild
deleted file mode 100644
index 4ed328e17751..000000000000
--- a/net-analyzer/tcpdump/tcpdump-3.9.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-3.9.5.ebuild,v 1.1 2006/10/08 20:51:03 jokey Exp $
-
-inherit flag-o-matic toolchain-funcs eutils
-
-DESCRIPTION="A Tool for network monitoring and data acquisition"
-HOMEPAGE="http://www.tcpdump.org/"
-SRC_URI="http://www.tcpdump.org/release/${P}.tar.gz
-	http://www.jp.tcpdump.org/release/${P}.tar.gz"
-	#mirror://sourceforge/tcpdump/${P}.tar.gz
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ssl ipv6"
-
-DEPEND="net-libs/libpcap
-	ssl? ( >=dev-libs/openssl-0.9.6m )"
-
-src_unpack() {
-	unpack ${A}
-
-	if use ssl ; then
-		sed -i -e 's|des\(_cbc_encrypt\)|DES\1|' "${S}"/configure || \
-			die "sed configure failed"
-	fi
-}
-
-src_compile() {
-	# tcpdump needs some optymalization. see bug #108391
-	( ! is-flag -O? || is-flag -O0 ) && append-flags -O
-
-	replace-flags -O[3-9] -O2
-	filter-flags -finline-functions
-
-	if [[ $(gcc-major-version) -gt 3 ]] || \
-		[[ $(gcc-major-version) -eq 3 && $(gcc-minor-version) -ge 4 ]]
-	then
-		filter-flags -funit-at-a-time
-		append-flags -fno-unit-at-a-time #48747
-	fi
-
-	local myconf
-	use ssl || myconf="${myconf} --without-crypto"
-	econf $(use_enable ipv6) ${myconf} || die
-	make CCOPT="$CFLAGS" || die
-}
-
-src_install() {
-	dosbin tcpdump || die
-	doman tcpdump.1
-	dodoc *.awk
-	dodoc README FILES VERSION CHANGES
-}