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

(Portage version: 2.2.0_alpha125/cvs/Linux x86_64)

5 files changed, 36 insertions, 87 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/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
-
 }