Make documentation build properly optional instead of dependant on system contents.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.27-rc1-10246-gca5de40 x86_64

4 files changed, 29 insertions, 17 deletions

diff --git a/dev-db/libdbi/ChangeLog b/dev-db/libdbi/ChangeLog
index f4a7874303c7..ebe189df00ff 100644
--- a/dev-db/libdbi/ChangeLog
+++ b/dev-db/libdbi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/libdbi
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi/ChangeLog,v 1.22 2008/10/05 21:12:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi/ChangeLog,v 1.23 2008/10/10 00:24:46 robbat2 Exp $
+
+  10 Oct 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +files/libdbi-0.8.3-doc-build-fix.patch, libdbi-0.8.3.ebuild:
+  Make documentation build properly optional instead of dependant on system
+  contents.
 
   05 Oct 2008; Diego Pettenò <flameeyes@gentoo.org> libdbi-0.8.3.ebuild:
   Fix build-time dependencies.
diff --git a/dev-db/libdbi/Manifest b/dev-db/libdbi/Manifest
index d75e1ebf56fe..724a7e374f0b 100644
--- a/dev-db/libdbi/Manifest
+++ b/dev-db/libdbi/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX dbi.pc.in 244 RMD160 e2e7e23133ec332611f44c7f508f44698592cb93 SHA1 25291f1f97c21c355a7acf1507faf779150eb508 SHA256 9c7969c72ad8bb5371fd8c30a163408ed5dcd2a9523b6274b2e7e7f2fb9eba40
 AUX libdbi-0.8.1-pkg-config.patch 202 RMD160 26b9e1450339629ca14e1ae61105760e23505139 SHA1 288337a476cf16bc454e97a53d516680f6d3d150 SHA256 835cfe7ce28f0859c092848404a2d35820a876fff9023115dcfac9d671c96daa
+AUX libdbi-0.8.3-doc-build-fix.patch 526 RMD160 98a57211fcc61b5dce925733ea704cba1a0c1086 SHA1 8b4a15869e01f1e18216e5ca3940bb5f3824a165 SHA256 eda2d5fe104894f946f80cf2067f6340d0908996d2459a405becd44d9c3be388
 DIST libdbi-0.8.1.tar.gz 1018608 RMD160 cfd1349ffd3b929465a6612244319bf0c5f163cb SHA1 69f9d4d1af904d2b6e8f8435e078a62d4ea83f2a SHA256 df940f1d98a0b2006a15e4d3a2f309a7f0fb3e1b0e357d21515cfc13287379c2
 DIST libdbi-0.8.3.tar.gz 1060714 RMD160 c264a9cf0ef85ccd823273a205a961b6e33773cf SHA1 bda606fa6628eed451e492182e1943bd1d824c33 SHA256 72e41856bebb1da7b1fd1e6369358c294913f329c5e594e338b3983e6369a5e3
 EBUILD libdbi-0.8.1.ebuild 969 RMD160 c5918ae6a74afe6a6cd98996bad626a66149e17b SHA1 a33d38aa9e9b1e3090e0c37da262c0169d937058 SHA256 03982d4bf96e037883ffa2d19f2208d0a911dcba45133e4d903b75b3fdae204d
-EBUILD libdbi-0.8.3.ebuild 1319 RMD160 13f09fb98d6a58c3ba5d38d80395dddb7c42c025 SHA1 615f863ba1f91181a73e6c0a7538d07875d82f0e SHA256 65ec93de0904a49c9973823bef454781810c2997ab895d46f00113c10600c021
-MISC ChangeLog 2615 RMD160 51dae3ad1b55a59ff16a7cbae2fd2aea4ea18be6 SHA1 fcf18a7616fcf0876b9e6950a60a7db12dc7fa9d SHA256 36cc7aab5cc80fc5d26872079eb5bc82249617a92fb7707877472681534e48cf
+EBUILD libdbi-0.8.3.ebuild 1407 RMD160 56dd4f67723d41eb199a0a9d362554724fd8934f SHA1 abfc792ebe88bc442a59a2e4af2a55d34cb82efd SHA256 e00e321c33773c4ed99c95e9bd773d0cddd1ddf990fba94048c026b8a7e9ddf3
+MISC ChangeLog 2819 RMD160 7944ebed3dca63ba73355ecb77eac0ba826427e8 SHA1 e1204468be5dc453da9299ccff9271865a08c2d8 SHA256 8af16f55e8c7e360cec4fe5bcb8f2dfe15ed5d33a2a4c96a08b03c07afddad2b
 MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkjpLbgACgkQAiZjviIA2XgmwwCg3KRxmreyzdKgjOuawWUVm0Yn
-dugAnig5APhH4OWy6M0VMXSXDIdtXnS2
-=8+A2
------END PGP SIGNATURE-----
diff --git a/dev-db/libdbi/files/libdbi-0.8.3-doc-build-fix.patch b/dev-db/libdbi/files/libdbi-0.8.3-doc-build-fix.patch
new file mode 100644
index 000000000000..831d6d25c2b7
--- /dev/null
+++ b/dev-db/libdbi/files/libdbi-0.8.3-doc-build-fix.patch
@@ -0,0 +1,15 @@
+diff -Nuar libdbi-0.8.3.orig/configure.in libdbi-0.8.3/configure.in
+--- libdbi-0.8.3.orig/configure.in	2008-10-09 17:09:09.303141877 -0700
++++ libdbi-0.8.3/configure.in	2008-10-09 17:10:48.100635797 -0700
+@@ -149,7 +149,8 @@
+-ac_docs="YES"
++ac_docs="no"
+ AC_ARG_ENABLE(docs,
+ 	[  --disable-docs	  do not build and install the documentation.],
+-	[  ac_docs="NO" ])
++	[ ac_docs="$enableval" ],
++	[ ac_docs="no" ])
+ 
+-if test "$ac_docs" = "YES"; then
++if test "$ac_docs" = "yes"; then
+ dnl   AC_PATH_PROGS(myjade, openjade jade)
diff --git a/dev-db/libdbi/libdbi-0.8.3.ebuild b/dev-db/libdbi/libdbi-0.8.3.ebuild
index bf732c8cd2d9..184b8645d16a 100644
--- a/dev-db/libdbi/libdbi-0.8.3.ebuild
+++ b/dev-db/libdbi/libdbi-0.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi/libdbi-0.8.3.ebuild,v 1.3 2008/10/05 21:12:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi/libdbi-0.8.3.ebuild,v 1.4 2008/10/10 00:24:46 robbat2 Exp $
 
 inherit eutils autotools multilib
 
@@ -11,10 +11,10 @@ LICENSE="LGPL-2.1"
 RDEPEND="virtual/libc"
 DEPEND=">=sys-apps/sed-4
 		dev-util/pkgconfig
-		app-text/openjade
+		doc? ( app-text/openjade )
 		${RDEPEND}"
 PDEPEND=">=dev-db/libdbi-drivers-0.8.3"
-IUSE=""
+IUSE="doc"
 KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
 SLOT=0
 
@@ -24,6 +24,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/libdbi-0.8.1-pkg-config.patch
 	cp -f "${FILESDIR}"/dbi.pc.in "${S}"/dbi.pc.in
+	epatch "${FILESDIR}"/libdbi-0.8.3-doc-build-fix.patch
 
 	# configure.in has been changed
 	eautoreconf || die "eautoreconf failed"
@@ -32,7 +33,7 @@ src_unpack() {
 src_compile() {
 	# should append CFLAGS, not replace them
 	sed -i.orig -e 's/^CFLAGS = /CFLAGS += /g' src/Makefile.in
-	econf || die "econf failed"
+	econf $(use_enable doc docs) || die "econf failed"
 	emake || die "emake failed"
 }