Version bump to latest. Fixup issues with cmake usage fixing bug#431138. Prune older.

Package-Manager: portage-2.2.0_alpha125/cvs/Linux x86_64

6 files changed, 61 insertions, 96 deletions

diff --git a/net-fs/smbtad/ChangeLog b/net-fs/smbtad/ChangeLog
index 7dcf9b02aa2b..c88fa7e88aa9 100644
--- a/net-fs/smbtad/ChangeLog
+++ b/net-fs/smbtad/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-fs/smbtad
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/smbtad/ChangeLog,v 1.3 2011/06/30 16:07:08 dagger Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/smbtad/ChangeLog,v 1.4 2012/09/13 18:53:38 scarabeus Exp $
+
+*smbtad-1.2.6 (13 Sep 2012)
+
+  13 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org> +smbtad-1.2.6.ebuild,
+  -smbtad-1.2.3.ebuild, -smbtad-1.2.4.ebuild, -smbtad-1.2.5.ebuild,
+  files/smbtad.rc:
+  Version bump to latest. Fixup issues with cmake usage fixing bug#431138. Prune
+  older.
 
 *smbtad-1.2.5 (30 Jun 2011)
 
@@ -17,4 +25,3 @@
   24 Mar 2011; Robert Piasek <dagger@gentoo.org> +smbtad-1.2.3.ebuild,
   +files/smbtad.rc, +metadata.xml:
   Initial ebuild for SMBTAD 1.2.3
-
diff --git a/net-fs/smbtad/Manifest b/net-fs/smbtad/Manifest
index 0c40e093484e..c3d3c3631bc6 100644
--- a/net-fs/smbtad/Manifest
+++ b/net-fs/smbtad/Manifest
@@ -1,9 +1,25 @@
-AUX smbtad.rc 596 RMD160 55d02bd62e0e0983f8e43647ce6ce7811aeaf30b SHA1 f10a2574f1522ae714e407c4e192f8742e0a52fb SHA256 aee26561e958d534680d0ebf3d55ca0331b3a179862ba09dd0094cd6d105e160
-DIST smbtad-1.2.3.tar.bz2 974487 RMD160 bb877059f3362779c9aa8a8e896363de63ebf5dd SHA1 e9f8027da2092c4828fbee463cd39dfdb7088f5e SHA256 ba41435f96917d9fc94d92ec15a40445e57786819551a91068ab5ee8fd5f6da6
-DIST smbtad-1.2.4.tar.bz2 77498 RMD160 f9fb6626137de92076e3c32769d9da128fc76920 SHA1 31caf2d759d6401d3736d88d6db26117dc8d9f2f SHA256 ad38bd071ee6d47467e1c2f7bf9db119490db1ba13e8c7bc16d8905c511f81ff
-DIST smbtad-1.2.5.tar.bz2 77622 RMD160 3b00533b24e6d0225f343784cfe170d3ebf6482a SHA1 7fba74a64a681081b222fa9613e7497270d82759 SHA256 f0f199d039ea6af84ff081acda92ab952b855cc41fd210520f60d728e8b23845
-EBUILD smbtad-1.2.3.ebuild 814 RMD160 12bff8e0d432953ca16bcdf804ebf8f5a01fbbf0 SHA1 2335ad62985d1993d90a41b002c0cb5b34c1b4ff SHA256 2cf4ed45e2aeb32a2c8d5d89b3d9a257b80ecba9ef5edd81ea0cb1d2f97f0d12
-EBUILD smbtad-1.2.4.ebuild 808 RMD160 45161c362cef510e9db909d9511503fbcb73a1aa SHA1 fccd2d17802b523f23a230a2d193be654916ee2d SHA256 476ed05abb57ced51489a41ac5835d841897dd179441e86baf103a33366d8296
-EBUILD smbtad-1.2.5.ebuild 845 RMD160 70d00c13c8e66f9a90f829448423e297eda2463b SHA1 30051e2928b94b66fb911babe9a14f8d19292b48 SHA256 1cb9aed9c8fc5e58550b38f21082306d920407910fb4cd4c26a0ffdf14f876f4
-MISC ChangeLog 611 RMD160 93165492609ad283fcb8c79a3b4e1ac23bf559ff SHA1 4995d4fa3a7dab61049c34aa15b2b2ad1e6108ec SHA256 f2e97670d293c14ec3c5e968b15e51028313e97930f57ac2fa92bab74cd437b0
-MISC metadata.xml 258 RMD160 edfb716c5c2651a047f3e23577ad474c2b61a9b9 SHA1 f7b924cbc86198c0d8d20d94e1361ac56480a27f SHA256 a3a953237c95c76627333274ff829265fb3314f7a274c1bd42753a50eddb13fa
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX smbtad.rc 599 SHA256 8d83796534aabbbf5f1d9406e1b0103dc84d9a867c583d9089e73e81001a4277 SHA512 ccfef5c8eb292abc027e19543d0517554b1bf24c1b8b644bfc6fdbdf9a977910d6ad8476680abc48824f9d3b75d99d200d5b0894c01a8d3d1d93f33389ac0871 WHIRLPOOL eb1e486b1780ccde8b2f7684f399487e66e1f25803bcd6e99430fc264e753db27cef74bb4bcce0e25625c1778c54c237e0e5310b7cf49109dc462b5b760b9aae
+DIST smbtad-1.2.6.tar.bz2 82062 SHA256 0f641a7cb9f98d6ea28f52bca5055eebec74fa6d3e5fe32236afa3770ea26d48 SHA512 fd3b370d973a42fb2dee48d2fec08e20af32386893ee67bc407decd001a76c944f3a17b3251e9d8d746feb1e87c69776986d600fd108450113835823f6313e2c WHIRLPOOL 697199a30217e5f1c4dd0ce1754b4542725d9e8aa96c8fd78f354a50324518a8bcb6e03bbfe8a789531b5ef02846cb553527d08a25f8297937a2fa511d80376b
+EBUILD smbtad-1.2.6.ebuild 946 SHA256 04c3bcd9489de1d1a57db53ca2b8dc6647f4dce95e283429c7bed8415e62cdbe SHA512 c1bc89fc6292e2001b2610271f8f3f9dbc12aeb1da035e8392b148b28511a6cb3e755d2978e85914fea22aab6f6930a1525c4e25e34380f31403f6ec8680a4f9 WHIRLPOOL 98960071e3e8f8c01d4cac16c86809cde8c295418f3b4fe3d16843c2da1d01eedd2b24ba7f01406e619736594ffad3e358b32e1dbdb6ff86a7e28053f0dd43bb
+MISC ChangeLog 897 SHA256 578bae63da8325ce5a2648bc65c4037e42ef165da5d8334c518e8f40fc08bc84 SHA512 0043588ad71479116f4911d75e2d54d8e0c435ee7dc49c14a9416b379219e02e660c768eeb54e0bf9e92b46f7d591980ea83fc4cc20571d72cd67f0fc62b9fb0 WHIRLPOOL 8cf983079a992730f1b4a3b002fcf2b51e2ad6fadd786a3ecd19960bdb47de0c333b7a71064de723ec31eecfd43b249a129f5d753e2900bd16d1ad65b95e5687
+MISC metadata.xml 258 SHA256 a3a953237c95c76627333274ff829265fb3314f7a274c1bd42753a50eddb13fa SHA512 ed327bf8e11458945106a715efb48a3a9f7d32d16204c5dcce2c7febcd116168f00792d6fae829dcafc7dba10e0725fb32802dcccb9d43c1554d7c64e262c1ee WHIRLPOOL e0975fa44a722cec45f79d214ca44d39c35d6f301b3741f0b7fb9c45650877c367f513939e5423ffb1751ce79618dc03c52f26c85f0cdc8c4f215d23be115c7e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQUiu4AAoJEOSiRoyO7jvo5IEP/2cT6/mAVxbz9Gcr2farmiiv
+3XA7KxZ47+oATGR61w1ORWwvao0iepYId7qUSULyiuWv9QRzSR6gtnXBEFhuYPYy
+9U6pTdLvdOEOCQdayRXqhXYKwT5zyTzynMZr4Hf1Np1mXTwUwU5P40NvGd8FDCnZ
+BZpS9DyQGzb6hIqcOxOr9caynEecpajViRQJEcr/xaF03ztUgjDQTiXKVUBm0Fr8
+v4KJKemVPyUKc8iSzWd6uhszhnybh8IUCGJxzNVYT7y2vUCEsufQiv5l1OQAJ7os
+EJ5npB20X/pU3H1aunM3UdVaw4Mrcs6Y3aJ4NV9I8/n3Ayz4zW3xlveAnbqd60ep
+SNb7eoGD3ikb50c8J6GalnBDtuigHpJWpFhQDTY1Vi/0xQ7knLuej8dCfuCd3uPX
+TTG8qXRL9xkInQfMygWhdtvnWpPMyE8lfSk+kqa/J7L5vXQq9Xb3gjEQgaEo5hLu
+YxvQEjKjAZeJjVSkGnty0pU1mwcaZx76XyuodmeX0IuTvGLc85yoo+zSInrBfm7c
+hbVZgXpq6ZQhmw20funxheBqF2fJCwOh8ZXhtr8u0ab7rpgEx4KtdC5wV0pqeEN4
+Vb0OJrwOXK5DTC9R04veymocjz6J0hRJF0Bp3iU2v2h5El3hMYtyPDKxcQOIrAe3
+vq5hpEUjfUEyQNDsHmDm
+=Eyzy
+-----END PGP SIGNATURE-----
diff --git a/net-fs/smbtad/files/smbtad.rc b/net-fs/smbtad/files/smbtad.rc
index 41a7b4a4df04..22584396aa01 100755
--- a/net-fs/smbtad/files/smbtad.rc
+++ b/net-fs/smbtad/files/smbtad.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/smbtad/files/smbtad.rc,v 1.1 2011/03/24 09:42:30 dagger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/smbtad/files/smbtad.rc,v 1.2 2012/09/13 18:53:38 scarabeus Exp $
 
 CONFFILE=/etc/conf.d/${SVCNAME}.conf
 PIDFILE=/var/run/${SVCNAME}.pid
diff --git a/net-fs/smbtad/smbtad-1.2.4.ebuild b/net-fs/smbtad/smbtad-1.2.4.ebuild
deleted file mode 100644
index 4dec12cd0c78..000000000000
--- a/net-fs/smbtad/smbtad-1.2.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/smbtad/smbtad-1.2.4.ebuild,v 1.1 2011/05/09 13:21:27 dagger Exp $
-
-EAPI="4"
-inherit cmake-utils
-
-DESCRIPTION="Data receiver of the SMB Traffic Analyzer project"
-HOMEPAGE="http://github.com/hhetter/smbtad"
-SRC_URI="http://morelias.org/smbta/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="dev-util/cmake
-	dev-db/libdbi"
-RDEPEND="net-fs/samba[smbtav2]"
-
-DOCS="README AUTHORS"
-
-src_configure() {
-	mycmakeargs="${mycmakeargs} \
-		$(cmake-utils_use debug DEBUG)"
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newinitd "${FILESDIR}"/smbtad.rc smbtad
-	newconfd dist/smbtad.conf_example smbtad.conf
-
-}
diff --git a/net-fs/smbtad/smbtad-1.2.5.ebuild b/net-fs/smbtad/smbtad-1.2.5.ebuild
deleted file mode 100644
index a2ec854779f3..000000000000
--- a/net-fs/smbtad/smbtad-1.2.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/smbtad/smbtad-1.2.5.ebuild,v 1.1 2011/06/30 16:07:08 dagger Exp $
-
-EAPI="4"
-inherit cmake-utils
-
-DESCRIPTION="Data receiver of the SMB Traffic Analyzer project"
-HOMEPAGE="http://github.com/hhetter/smbtad"
-SRC_URI="http://morelias.org/smbta/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="dev-util/cmake
-	dev-db/libdbi"
-RDEPEND="( || (	<net-fs/samba-3.6[smbtav2]
-		>=net-fs/samba-3.6 ) )"
-
-DOCS="README AUTHORS"
-
-src_configure() {
-	mycmakeargs="${mycmakeargs} \
-		$(cmake-utils_use debug DEBUG)"
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newinitd "${FILESDIR}"/smbtad.rc smbtad
-	newconfd dist/smbtad.conf_example smbtad.conf
-
-}
diff --git a/net-fs/smbtad/smbtad-1.2.3.ebuild b/net-fs/smbtad/smbtad-1.2.6.ebuild
index 8aa3fb36130b..ac8564ddd8bf 100644
--- a/net-fs/smbtad/smbtad-1.2.3.ebuild
+++ b/net-fs/smbtad/smbtad-1.2.6.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/smbtad/smbtad-1.2.3.ebuild,v 1.1 2011/03/24 09:42:30 dagger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/smbtad/smbtad-1.2.6.ebuild,v 1.1 2012/09/13 18:53:38 scarabeus Exp $
+
+EAPI=4
 
-EAPI="4"
 inherit cmake-utils
 
 DESCRIPTION="Data receiver of the SMB Traffic Analyzer project"
@@ -14,15 +15,30 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
-DEPEND="dev-util/cmake
-	>=dev-db/sqlite-3.5"
-RDEPEND="net-fs/samba[smbtav2]"
+DEPEND="
+	dev-db/libdbi
+	dev-libs/iniparser
+	sys-libs/talloc
+"
+RDEPEND="${DEPEND}
+	|| (
+		<net-fs/samba-3.6[smbtav2]
+		>=net-fs/samba-3.6
+	)
+"
 
 DOCS="README AUTHORS"
 
+src_prepare() {
+	sed -i \
+		-e '/CMAKE_C_FLAGS/d' \
+		CMakeLists.txt || die
+}
+
 src_configure() {
-	mycmakeargs="${mycmakeargs} \
-		$(cmake-utils_use debug DEBUG)"
+	local mycmakeargs=(
+		$(cmake-utils_use debug)
+	)
 
 	cmake-utils_src_configure
 }
@@ -32,5 +48,4 @@ src_install() {
 
 	newinitd "${FILESDIR}"/smbtad.rc smbtad
 	newconfd dist/smbtad.conf_example smbtad.conf
-
 }