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, 38 insertions, 8 deletions

diff --git a/dev-db/libdbi-drivers/ChangeLog b/dev-db/libdbi-drivers/ChangeLog
index 3e442a4fdea6..9a7402154b44 100644
--- a/dev-db/libdbi-drivers/ChangeLog
+++ b/dev-db/libdbi-drivers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/libdbi-drivers
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi-drivers/ChangeLog,v 1.28 2008/09/29 02:47:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi-drivers/ChangeLog,v 1.29 2008/10/10 00:32:18 robbat2 Exp $
+
+  10 Oct 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +files/libdbi-drivers-0.8.3-doc-build-fix.patch,
+  libdbi-drivers-0.8.3.ebuild:
+  Make documentation build properly optional instead of dependant on system
+  contents.
 
   29 Sep 2008; Robin H. Johnson <robbat2@gentoo.org>
   -libdbi-drivers-0.7.1.ebuild, -libdbi-drivers-0.7.1-r1.ebuild,
diff --git a/dev-db/libdbi-drivers/Manifest b/dev-db/libdbi-drivers/Manifest
index b0b59640c59c..67f351071f5f 100644
--- a/dev-db/libdbi-drivers/Manifest
+++ b/dev-db/libdbi-drivers/Manifest
@@ -1,8 +1,9 @@
 AUX libdbi-drivers-0.8.1-oci8.diff 695 RMD160 5431c6888dc5b703d91343f4f3d3be6f4e6e1c9d SHA1 68599f1c5d3c9e0c2c970f40574a2f9055dac9dc SHA256 23a2c8819f9f80548f2c933278c844d03dec35e8500883f25ab4b7d5f4b7c523
+AUX libdbi-drivers-0.8.3-doc-build-fix.patch 566 RMD160 42a6e40d92dd878e66cb2f5087af463d463ab09d SHA1 c3a62be19e77d9bdd253eefb9ee7f8d69f375d95 SHA256 ef18cdb0e5338d29bcdbbf9839bd64283d067bfe3eed3d4af3eb58fa29a316ec
 DIST libdbi-drivers-0.8.1.tar.gz 1147446 RMD160 280c5ea3a8a2b7029865d4fc48064620d9db2e38 SHA1 82c00d3f4d86a88d57cc1b58163182c5db09d990 SHA256 1b45bb53693feccdcc7fe7d32d37474e3ae15e8013553cc7051faa101f445bcd
 DIST libdbi-drivers-0.8.3-1.tar.gz 1534420 RMD160 e0aa9e67f6560fb44018b1d35d90d4ac21b48597 SHA1 599fbab115419e8fc88b3b31a38031584ee213b5 SHA256 4ab9944398ce769c0deeb64d2f73555c67bc25ccd2ade1ccf552226c7b2acf72
 EBUILD libdbi-drivers-0.8.1-r1.ebuild 1954 RMD160 ffc858a4f9d82cc32f9f5163a124788d93026c33 SHA1 15fed89756af2398dc7d818155f19841e37ddc2e SHA256 359b8e491e02cd1b050136b63e0053c073f56e187eb8080d760cd0bc630ee128
 EBUILD libdbi-drivers-0.8.1-r2.ebuild 2357 RMD160 bbae69623ea77a491df71761241aa490e175d9d5 SHA1 d92dce2365a1b73f8f83a1a660b9adac3d2baf67 SHA256 c65a3868043b7123b118634431f88661185b0a5769e98ebabd6cdba5a5bf062a
-EBUILD libdbi-drivers-0.8.3.ebuild 2325 RMD160 3577102b3fe9d14221d975c18862b522f90f4733 SHA1 755079fa634e65b753efd28f659f0c1177301d24 SHA256 21cf0035969019343f7907802fed7e0977c69db7ccf1ce6092cee3953c15cd69
-MISC ChangeLog 4139 RMD160 85bebf777588bd9933de515ac2829eb8397a4143 SHA1 984a85a2e5cba2c7ba713d4ae98099d7f224bb28 SHA256 6277fa56d5a022f65ed97b8257f62399f9a8bf87efa3cf51c145fdfe1dcce0b7
+EBUILD libdbi-drivers-0.8.3.ebuild 2500 RMD160 07a890cb5143381b22b4afd419e9bedca75a2c9d SHA1 17b161efd3ecacd09263c11ddda58491370a91f1 SHA256 288a0b7a1fd1fdd733e025606adc0f5214359c564c6adfee6d92f67ef4cb8bcd
+MISC ChangeLog 4363 RMD160 d51a0e9a86f581d3bfb7e563bb2a2fd1aafbbd15 SHA1 8639444669133a260e9bd814904451ca4981426d SHA256 e5e61764a085921acc3661e2f3aa8ad9b1c2d9cf05e82bbae1ec2997c6205236
 MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44
diff --git a/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-doc-build-fix.patch b/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-doc-build-fix.patch
new file mode 100644
index 000000000000..f3caedb1dbc6
--- /dev/null
+++ b/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-doc-build-fix.patch
@@ -0,0 +1,15 @@
+diff -Nuar libdbi-drivers-0.8.3-1.orig/configure.in libdbi-drivers-0.8.3-1/configure.in
+--- libdbi-drivers-0.8.3-1.orig/configure.in	2008-10-09 17:09:09.303141877 -0700
++++ libdbi-drivers-0.8.3-1/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-drivers/libdbi-drivers-0.8.3.ebuild b/dev-db/libdbi-drivers/libdbi-drivers-0.8.3.ebuild
index a2ad7c7f5455..400912f06149 100644
--- a/dev-db/libdbi-drivers/libdbi-drivers-0.8.3.ebuild
+++ b/dev-db/libdbi-drivers/libdbi-drivers-0.8.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi-drivers/libdbi-drivers-0.8.3.ebuild,v 1.1 2008/09/29 02:41:13 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi-drivers/libdbi-drivers-0.8.3.ebuild,v 1.2 2008/10/10 00:32:18 robbat2 Exp $
 
-inherit eutils
+inherit eutils autotools
 
 MY_PV="${PV}-1"
 MY_P="${PN}-${MY_PV}"
@@ -16,13 +16,21 @@ DEPEND=">=dev-db/libdbi-0.8.3
 		postgres? ( virtual/postgresql-server )
 		sqlite? ( <dev-db/sqlite-3 )
 		sqlite3? ( >=dev-db/sqlite-3 )
-		!bindist? ( firebird? ( dev-db/firebird ) )"
+		!bindist? ( firebird? ( dev-db/firebird ) )
+		doc? ( app-text/openjade )"
 
-IUSE="mysql postgres sqlite oci8 firebird sqlite3 bindist"
+IUSE="mysql postgres sqlite oci8 firebird sqlite3 bindist doc"
 KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
 SLOT=0
 S="${WORKDIR}/${MY_P}"
 
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${PN}-0.8.3-doc-build-fix.patch
+	cd "${S}"
+	eautoreconf
+}
+
 pkg_setup() {
 	local drivers=""
 	use mysql && drivers="${drivers} mysql"
@@ -66,7 +74,7 @@ src_compile() {
 		myconf="${myconf} --with-oracle-dir=${ORACLE_HOME} --with-oracle"
 	fi
 
-	econf ${myconf} || die "econf failed"
+	econf $(use_enable doc docs) ${myconf} || die "econf failed"
 	emake || die "emake failed"
 }