Fixed: unnecessary inherit, static-libs installation, added tests.

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

3 files changed, 76 insertions, 12 deletions

diff --git a/sys-libs/tdb/ChangeLog b/sys-libs/tdb/ChangeLog
index 9d1e43560e21..d2689a5e62e8 100644
--- a/sys-libs/tdb/ChangeLog
+++ b/sys-libs/tdb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/tdb
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/ChangeLog,v 1.11 2010/01/11 20:43:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/ChangeLog,v 1.12 2010/04/03 19:56:24 dev-zero Exp $
+
+*tdb-1.2.0-r2 (03 Apr 2010)
+
+  03 Apr 2010; Tiziano Müller <dev-zero@gentoo.org> +tdb-1.2.0-r2.ebuild:
+  Fixed: unnecessary inherit, static-libs installation, added tests.
 
 *tdb-1.2.0-r1 (11 Jan 2010)
 
diff --git a/sys-libs/tdb/Manifest b/sys-libs/tdb/Manifest
index 8ef18c83e307..5a64b97bec4e 100644
--- a/sys-libs/tdb/Manifest
+++ b/sys-libs/tdb/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST tdb-1.1.5.tar.gz 254358 RMD160 d13f18e42d87161f7d48876c8d7957c54e889cf0 SHA1 1451cced3d333e24c67464249b4015f048770e40 SHA256 487f8fc773d1ac395d89d61781dbb7dffe0c5a3a816f33c95e381f9ea2a4a67a
 DIST tdb-1.2.0.tar.gz 264551 RMD160 d3a10d8672df999e659777e7da8049eec659b0b6 SHA1 e6bbd027d01e1dc10e6e4226259b9f1a64920223 SHA256 1997f2c651bb68a3bac9a6885c1d623249554f50064fe49ad31711cdedac53fd
 EBUILD tdb-1.1.5-r1.ebuild 1614 RMD160 bc98795253904caaef238afec6a66bb3cad5a47c SHA1 7bd9f261bcc3079956aea8b10972204a03f7b398 SHA256 fcb7bf6d137afafe325299271ece4cf25bf7dd2f6d534ea8ca3885619763596d
 EBUILD tdb-1.1.5.ebuild 1666 RMD160 264ac6940fddd98bf2d89215e13867ad7d58d7b2 SHA1 d633bc00081714022e9ea6b05b1c4823fb3205b4 SHA256 38966e7204b92816bdcdfb52e31efeb828e38af86c181c2ce975875d023bafba
 EBUILD tdb-1.2.0-r1.ebuild 1695 RMD160 41a536aa1fda2f6b4dc6b2bfa3c9ed1bba06b59e SHA1 b862f9c5d5c83a682e195ef98c42c88bd344085d SHA256 6ad47987e388e0a296996a20d393a519db4bd1e98e163415ff1d88523f98b919
+EBUILD tdb-1.2.0-r2.ebuild 1668 RMD160 b1bf89b402c7f02691831d8e4813ca9ea1b53995 SHA1 49d7f81e7c0822d71238cc5a4b6a6488aa376dc1 SHA256 c25ff31325bf3b262bcbd74c0c02c4d3d61e397531ceac8889eb7a132d25c46a
 EBUILD tdb-1.2.0.ebuild 1609 RMD160 c1c3f29318ad6b35f89adfe7b05e56ddde761092 SHA1 1a73b3dc2ba1b2a47930e022f9dccba5aefb9053 SHA256 08ef63f60802cf0ecb8faa437aa0651017de260a41661eb4ebbac9c87509c755
-MISC ChangeLog 1603 RMD160 34ad5a392deb3e33cf595838a3c7f9743b3719e3 SHA1 dbed40430206da1417d95cf9e15f1607db9bd620 SHA256 3372df67d45f6eb9e21eb016e6d7e65b9f20e31a96d53930d8c2a2e441dd0f8f
+MISC ChangeLog 1776 RMD160 3c18ddcbe3583a9a294cca9577d7459814e6d91d SHA1 48f695efa8a32171a113f7d278ff1112fd25a578 SHA256 780e48f6c062c17bb2b26e7b441ffbc0594385e7071095fc9978affc7d36a24a
 MISC metadata.xml 362 RMD160 75a97802cc496bf98325a692bc1fc60212b042b3 SHA1 8302e25e34804c9b5c0b91e547cdd10ee62e156f SHA256 9488379e63418d03eb8f1dd6838c281d8a95413f11685a5427302ec9ad0c5cb5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAktLjWEACgkQAiZjviIA2XgdDQCfQWDwrlqeBVGlkcKNTDyqSwuc
-qHcAoPP+x5reaXYfrM5506Xx83lB7Glf
-=/BPz
------END PGP SIGNATURE-----
diff --git a/sys-libs/tdb/tdb-1.2.0-r2.ebuild b/sys-libs/tdb/tdb-1.2.0-r2.ebuild
new file mode 100644
index 000000000000..42da68434871
--- /dev/null
+++ b/sys-libs/tdb/tdb-1.2.0-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/tdb-1.2.0-r2.ebuild,v 1.1 2010/04/03 19:56:24 dev-zero Exp $
+
+EAPI="2"
+
+inherit autotools python
+
+DESCRIPTION="Samba tdb"
+HOMEPAGE="http://tdb.samba.org/"
+SRC_URI="http://samba.org/ftp/tdb/${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="python static-libs tools tdbtest"
+
+RDEPEND=""
+DEPEND="python? ( dev-lang/python )
+	!<net-fs/samba-libs-3.4
+	!<net-fs/samba-3.3"
+
+src_prepare() {
+	eautoconf -Ilibreplace
+	sed -i \
+		-e 's:$(SHLD_FLAGS) :$(SHLD_FLAGS) $(LDFLAGS) :' \
+		Makefile.in || die "sed failed"
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/samba \
+		--localstatedir=/var \
+		$(use_enable python)
+}
+
+src_compile() {
+	# TODO:
+	# - don't build static-libs in case of USE=-static-libs
+
+	# we create the directories first to avoid workaround parallel build problem
+	emake dirs || die "emake dirs failed"
+
+	emake shared-build || die "emake shared-build failed"
+
+	if use tdbtest ; then
+		emake bin/tdbtest || die "emake tdbtest failed"
+	fi
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "emake install failed"
+
+	# installs a necessary symlink
+	dolib.so sharedbuild/lib/libtdb.so
+
+	dodoc docs/README
+
+	use static-libs || rm -f "${D}"/usr/lib*/*.a
+	use tools || rm -rf "${D}/usr/bin"
+	use tdbtest && dobin bin/tdbtest
+	use python && python_need_rebuild
+}
+
+src_test() {
+	# the default src_test runs 'make test' and 'make check', letting
+	# the tests fail occasionally (reason: unknown)
+	emake check || die "emake check failed"
+}