Ebuild cleanups thanks to pva, bug #288536, making docs optional #290193, thanks to Andrew Church for the patch

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

4 files changed, 87 insertions, 12 deletions

diff --git a/sys-libs/talloc/ChangeLog b/sys-libs/talloc/ChangeLog
index de8eeb30c4ee..b8deea6153b0 100644
--- a/sys-libs/talloc/ChangeLog
+++ b/sys-libs/talloc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/talloc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/ChangeLog,v 1.3 2009/10/11 12:03:00 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/ChangeLog,v 1.4 2009/10/23 16:27:11 patrick Exp $
+
+*talloc-2.0.0-r1 (23 Oct 2009)
+
+  23 Oct 2009; Patrick Lauer <patrick@gentoo.org> +talloc-2.0.0-r1.ebuild,
+  +files/talloc-2.0.0-without-doc.patch:
+  Ebuild cleanups thanks to pva, bug #288536, making docs optional #290193,
+  thanks to Andrew Church for the patch
 
   11 Oct 2009; Petteri Räty <betelgeuse@gentoo.org> talloc-2.0.0.ebuild:
   Block <net-fs/samba-libs-3.4 for bug #288545.
diff --git a/sys-libs/talloc/Manifest b/sys-libs/talloc/Manifest
index f6d08246d3d8..741cb57d31a4 100644
--- a/sys-libs/talloc/Manifest
+++ b/sys-libs/talloc/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX talloc-2.0.0-without-doc.patch 556 RMD160 1eabff0f27530719c46e88bdae7934bbdbcd7884 SHA1 dfafebbf8d2196525333dbf3df03d948b82b9845 SHA256 536ebde695f0a403354ce3e75e83ca551ba37e849cb7a4d3d2f4e256dba98639
 DIST talloc-1.3.0.tar.gz 229969 RMD160 770c3c1f7c0e3f08d3b5906454b9d32dd90f0f2e SHA1 58aff3b238bc0125017b4096ecb7c56a5057e6e4 SHA256 80e5d639496e1aac0838a5ae98c883dda9233c235bf51acb9f436776c7dcf824
 DIST talloc-1.3.1.tar.gz 234087 RMD160 1c58328694da837f287c5635499393fa4698e359 SHA1 fba0f9b581683022ddae63df0a1e48fd2eb0d9a4 SHA256 be02b19327fff77030c9a207774e65513e1cc3d3d65c9803634504f76beb1ecc
 DIST talloc-2.0.0.tar.gz 241971 RMD160 72dcb5c0fa8ab180bc701dda27fb115b95d2907c SHA1 a824446ffb3836149df2a16092054ea17d6dc6f8 SHA256 349ac60bcc296aa56832ddfebe7d219d05fc3b8af65cf64ad97d551a6e7d7569
 EBUILD talloc-1.3.0.ebuild 1149 RMD160 3765afa226c884ab6c1a2a2c063aad4aff3b33ec SHA1 b8bc3a7a8e0098e40406378a6657f046a86201ec SHA256 7b0d99cd5850980f9a79d52de0cf38761d7e329ced4b45b41e582f10850f2827
 EBUILD talloc-1.3.1.ebuild 1149 RMD160 84f89aa110cb51d2f710799ddd6f2eebc865ef42 SHA1 91cb7e703e5dab9b0edd5cf52fa60545f426261d SHA256 240048206ace6bbfa3f2c02119390abf91462acf18548b2a80c5e5872617fcf9
+EBUILD talloc-2.0.0-r1.ebuild 1201 RMD160 2cc8d7cdaa6f7f1c1237848bab1dfb5b8cdae059 SHA1 5ec4fa52f371c69633aa0156430c2005e199a642 SHA256 53e162cc6579d6e56a2be6b7f64bae3604a3b30e4b9bed51cfddb357faa47747
 EBUILD talloc-2.0.0.ebuild 1227 RMD160 42db47921167027c6aedba8817504bf334eb12cc SHA1 3c5ae4c85c435c6fbc6d091666c6dff3cd6e0c10 SHA256 e51d0f8f5082548cd13f20e2a12ac566bdaf7c985383d99200354a3d05601d62
-MISC ChangeLog 767 RMD160 ee3d255989fb651d958f95e6feee8eb1f68cfa45 SHA1 89450768ff832717924eb806fad07a6b7734fced SHA256 22dc042f1adf5258dc6f8368ca912aa31d66921e525ffda368097b2f5e7411bb
+MISC ChangeLog 1029 RMD160 9d94e8faa94eb42de2bc43d9bebb1c5b6569b5ce SHA1 3d3b580a93cabbe2c9a30ee608e27f90f5e1083d SHA256 03157fe16a604a1ada3b8ff40e13d070ed461a7c876d642eb9e69296751b3d99
 MISC metadata.xml 334 RMD160 348102afa3697b738985098b940e48dc11077133 SHA1 6f30199e6373fdfc1051eb4b85b383c86d42e678 SHA256 c45ba2af89b800f25129fac929b0b0e1901d7e54996f6d7ba26111fa49281ce6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrRyXoACgkQcxLzpIGCsLTlEQCgnSHK6p3ou3zN0J4HvCuegptP
-UUsAnjVuiersAzfu0wYxeF7LOS/fxmPG
-=YOfQ
------END PGP SIGNATURE-----
diff --git a/sys-libs/talloc/files/talloc-2.0.0-without-doc.patch b/sys-libs/talloc/files/talloc-2.0.0-without-doc.patch
new file mode 100644
index 000000000000..1e9a319dc753
--- /dev/null
+++ b/sys-libs/talloc/files/talloc-2.0.0-without-doc.patch
@@ -0,0 +1,21 @@
+--- talloc-2.0.0-orig/configure.ac	2009-08-31 02:58:36 +0900
++++ talloc-2.0.0/configure.ac	2009-10-23 11:00:13 +0900
+@@ -36,10 +36,15 @@
+ m4_include(libtalloc.m4)
+ m4_include(compat/talloc_compat1.m4)
+ 
+-AC_PATH_PROG(XSLTPROC,xsltproc)
+ DOC_TARGET=""
+-if test -n "$XSLTPROC"; then
+-	DOC_TARGET=doc
++AC_ARG_WITH([doc],
++	AS_HELP_STRING([--without-doc], [disable manpage generation]),
++	[], [with_doc=yes])
++if test "yes" = "$with_doc"; then
++	AC_PATH_PROG(XSLTPROC,xsltproc)
++	if test -n "$XSLTPROC"; then
++		DOC_TARGET=doc
++	fi
+ fi
+ AC_SUBST(DOC_TARGET)
+ 
diff --git a/sys-libs/talloc/talloc-2.0.0-r1.ebuild b/sys-libs/talloc/talloc-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..b362403963fc
--- /dev/null
+++ b/sys-libs/talloc/talloc-2.0.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/talloc-2.0.0-r1.ebuild,v 1.1 2009/10/23 16:27:11 patrick Exp $
+
+EAPI="2"
+
+inherit confutils eutils autotools
+
+DESCRIPTION="Samba talloc library"
+HOMEPAGE="http://talloc.samba.org/"
+SRC_URI="http://samba.org/ftp/talloc/${P}.tar.gz"
+LICENSE="GPL-3"
+IUSE="compat doc"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
+
+DEPEND="
+	doc? ( app-text/docbook-xml-dtd:4.2 )
+	!net-fs/samba-libs[talloc]
+	!<net-fs/samba-libs-3.4
+	"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+
+	epatch "${FILESDIR}"/${P}-without-doc.patch
+	eautoconf -Ilibreplace
+	sed -e 's:$(SHLD_FLAGS) :$(SHLD_FLAGS) $(LDFLAGS) :' -i Makefile.in
+}
+
+src_configure() {
+
+	econf \
+		--sysconfdir=/etc/samba \
+		--localstatedir=/var \
+		$(use_enable compat talloc-compat1) \
+		$(use_with doc) \
+	|| die "econf failed"
+
+}
+
+src_compile() {
+
+	emake showflags || die "emake showflags failed"
+	emake shared-build || die "emake shared-build failed"
+
+}
+
+src_install() {
+
+	emake install DESTDIR="${D}" || die "emake install failed"
+	dolib.a sharedbuild/lib/libtalloc.a
+	dolib.so sharedbuild/lib/libtalloc.so
+
+}