From: Tiziano Müller <dev-zero@gentoo.org>
Date: Sat, 3 Apr 2010 19:26:15 +0000 (+0000)
Subject: Fixed: unnecessary inherit, swig dependency, documentation install, static-libs building.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=298da3e1f4265292cf7dc26769997b66e5d35d93;p=gentoo.git

Fixed: unnecessary inherit, swig dependency, documentation install, static-libs building.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

diff --git a/sys-libs/talloc/ChangeLog b/sys-libs/talloc/ChangeLog
index 5f9c92224396..d84277f92149 100644
--- a/sys-libs/talloc/ChangeLog
+++ b/sys-libs/talloc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/talloc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/ChangeLog,v 1.11 2010/01/26 22:04:08 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/ChangeLog,v 1.12 2010/04/03 19:26:15 dev-zero Exp $
+
+*talloc-2.0.1-r1 (03 Apr 2010)
+
+  03 Apr 2010; Tiziano Müller <dev-zero@gentoo.org>
+  +talloc-2.0.1-r1.ebuild, metadata.xml:
+  Fixed: unnecessary inherit, swig dependency, documentation install,
+  static-libs building.
 
 *talloc-2.0.1 (26 Jan 2010)
 
diff --git a/sys-libs/talloc/Manifest b/sys-libs/talloc/Manifest
index 6d502e481739..bf8d0218c196 100644
--- a/sys-libs/talloc/Manifest
+++ b/sys-libs/talloc/Manifest
@@ -7,6 +7,7 @@ EBUILD talloc-1.3.0.ebuild 1064 RMD160 f7901a906acee7da79c1299a4dcf8dde39fea13c
 EBUILD talloc-1.3.1.ebuild 1064 RMD160 a055d90792bb9f115497ab2f6d9618d539b7fc55 SHA1 a93b25ca2f198442e5a9434d84c6ab164de21f9b SHA256 3a555ae5531bee0c0373603d142253abf31ecd9076fc1f309dcf011faaca43f4
 EBUILD talloc-2.0.0-r1.ebuild 1233 RMD160 9f5d47a66e60903d2d5a04a3616240f732a38cb0 SHA1 bd1722659526c12c2004253aa5930cbff603b419 SHA256 6f74ccac49d70581b6cfe15787757b17aa046b9a3ce6772fc91c1e1308de7109
 EBUILD talloc-2.0.0.ebuild 1196 RMD160 459d3e3bce4863cb54843f7defd3cc7cd6cda841 SHA1 0747c77d2d180f2ed193f75a2eaf3c0f212a912d SHA256 d3b23afefe8f5f50f20a117c7c77e8c736c31e66e94552bcc7b8c16ed0b1fce0
+EBUILD talloc-2.0.1-r1.ebuild 1496 RMD160 a9ec4929bbc15fad6d5882f9254afe4f9df08683 SHA1 b06305f75c0148e78875195dbd605806a17e1633 SHA256 5e656d609cd88c2f6dde5d7f2c4a73025edb3e9de0a385b846db5b70a79802f4
 EBUILD talloc-2.0.1.ebuild 1235 RMD160 c541820a899452fb09f6cc9ca4c7f0f22abb7fd3 SHA1 4452a09e7ef669ec996280178190481a839982c7 SHA256 ceaf0d529aef94ec4139d47aee73f7b620a423f4ffe3f4a1f50458aca8d5ca0f
-MISC ChangeLog 1879 RMD160 72a964f39d81d9d056e5ff395fbe0d56daa49d1c SHA1 6fb62b71ada7706ceb67cc0680ce0c615ff389b4 SHA256 e53d4d7d8166f193897d27eee3cf98f710e90f5b3834b87ca58c9098b6cbc2eb
-MISC metadata.xml 334 RMD160 348102afa3697b738985098b940e48dc11077133 SHA1 6f30199e6373fdfc1051eb4b85b383c86d42e678 SHA256 c45ba2af89b800f25129fac929b0b0e1901d7e54996f6d7ba26111fa49281ce6
+MISC ChangeLog 2101 RMD160 5591cae34566cdf5dd1af15995016dc55ce48d10 SHA1 4d427ba684ca62a56623ebae739296721b22ec4b SHA256 7db96f83f1a9a08304c5ceaeb6da2d507592054c40a1db895bc431e7ccd9bd9f
+MISC metadata.xml 412 RMD160 bc4ce1becbf6d6dbf2eef283f818d97e6d8ff4cd SHA1 9535124e040cf03a385425627b3622c06d97bf06 SHA256 732d4c39c6e7ddd2d4768724ae637ebadb6abff069fd3cf16d41778cf9f9c9dc
diff --git a/sys-libs/talloc/metadata.xml b/sys-libs/talloc/metadata.xml
index 89867903e8d8..520f32bf184d 100644
--- a/sys-libs/talloc/metadata.xml
+++ b/sys-libs/talloc/metadata.xml
@@ -7,6 +7,7 @@
 		<name>Patrick Lauer</name>
 	</maintainer>
 <use>
-        <flag name="compat">Enable extra compatibility stuff</flag>
+	<flag name="compat">Enable extra compatibility stuff</flag>
+	<flag name="swig">Install interface definitions for <pkg>dev-lang/swig</pkg></flag>
 </use>
 </pkgmetadata>
diff --git a/sys-libs/talloc/talloc-2.0.1-r1.ebuild b/sys-libs/talloc/talloc-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..ce3e1c485bf7
--- /dev/null
+++ b/sys-libs/talloc/talloc-2.0.1-r1.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/talloc/talloc-2.0.1-r1.ebuild,v 1.1 2010/04/03 19:26:15 dev-zero Exp $
+
+EAPI="2"
+
+inherit eutils autotools
+
+DESCRIPTION="Samba talloc library"
+HOMEPAGE="http://talloc.samba.org/"
+SRC_URI="http://samba.org/ftp/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="compat doc static-libs swig"
+
+RDEPEND=""
+DEPEND="doc? ( app-text/docbook-xml-dtd:4.2
+		dev-libs/libxslt )
+	swig? ( dev-lang/swig )
+	!<net-fs/samba-libs-3.4
+	!<net-fs/samba-3.3"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.0.0-without-doc.patch"
+
+	eautoconf -Ilibreplace
+
+	sed -i \
+		-e 's:$(SHLD_FLAGS) :$(SHLD_FLAGS) $(LDFLAGS) :' \
+		Makefile.in
+}
+
+src_configure() {
+	if ! use swig ; then
+		sed -i \
+			-e '/swig/d' \
+			talloc.mk || die "sed failed"
+	fi
+
+	if ! use static-libs ; then
+		sed -i \
+			-e 's|:: $(TALLOC_STLIB)|::|' \
+			-e '/$(TALLOC_STLIB) /d' \
+			-e '/libtalloc.a/d' \
+			talloc.mk Makefile.in || die "sed failed"
+	fi
+
+	econf \
+		--sysconfdir=/etc/samba \
+		--localstatedir=/var \
+		$(use_enable compat talloc-compat1) \
+		$(use_with doc)
+}
+
+src_compile() {
+	emake shared-build || die "emake shared-build failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	use doc && dohtml *.html
+
+	# installs missing symlink
+	dolib.so sharedbuild/lib/libtalloc.so
+}