Call econf in src_configure, spotted by maekke in bug #290199. Add doc USE flag to install html and pdf docs.

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

3 files changed, 24 insertions, 15 deletions

diff --git a/net-misc/omniORB/ChangeLog b/net-misc/omniORB/ChangeLog
index 166eb3c9fa8b..4d0050c133bf 100644
--- a/net-misc/omniORB/ChangeLog
+++ b/net-misc/omniORB/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/omniORB
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/ChangeLog,v 1.54 2009/11/17 19:52:37 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/ChangeLog,v 1.55 2009/11/21 19:16:50 caster Exp $
+
+  21 Nov 2009; Vlastimil Babka <caster@gentoo.org> omniORB-4.1.4.ebuild:
+  Call econf in src_configure, spotted by maekke in bug #290199. Add doc USE
+  flag to install html and pdf docs.
 
   17 Nov 2009; Brent Baude <ranger@gentoo.org> omniORB-4.1.4.ebuild:
   Marking omniORB-4.1.4 ppc64 for bug 290199
diff --git a/net-misc/omniORB/Manifest b/net-misc/omniORB/Manifest
index 3baa2fbc4963..4b45e56f9b52 100644
--- a/net-misc/omniORB/Manifest
+++ b/net-misc/omniORB/Manifest
@@ -8,6 +8,6 @@ DIST omniORB-4.1.4.tar.gz 3093814 RMD160 b84131230c59b1cef8f714ff1545e44f6779ade
 EBUILD omniORB-4.0.5.ebuild 1960 RMD160 8879842dd545ab10f164864e8090472cc14c1068 SHA1 5e0eae55d5fe33a1aaca4404dc9c1e735fdf9499 SHA256 edd56499c0d5410d785e56571d0beec943551ee1249c367606ab94149f58fa68
 EBUILD omniORB-4.1.2.ebuild 1983 RMD160 0dfa720fb79a1e0e0303a33307f6aa77060f8de1 SHA1 4c058a93b3b312fc5a9c72e9ef64249d485e0f52 SHA256 c7447c24aec62e7f78dcade901dad7e1b5c3fcc4a693f512b8ca1e7bf92484b4
 EBUILD omniORB-4.1.3.ebuild 2317 RMD160 c3df25f1aebbb1cfeb4db3cb665bd267b46bf7a8 SHA1 de0953efc464c0d4212b5da8163c92c71f441290 SHA256 040f229a1b7695f1a010abf2319063d09b43af5c60ba49d452929c6855fb0fec
-EBUILD omniORB-4.1.4.ebuild 2254 RMD160 61acdfa80a60ed0b4cb15fbecc028fe141051c6d SHA1 03ff755b8d7f0b050d3a38ed03efdc647fcdeb99 SHA256 5cfa774f3433ebb3f52464523983a755d3643131ce959c6cef82f2a03cf33d4d
-MISC ChangeLog 8740 RMD160 653740705def858192156617f025cfba54599640 SHA1 85f050655b3d6af52f2f27b463c1ff88667e112e SHA256 a2cd2807d7ea16cc3fdacfc772f21b5abbd8b33a7bcec1faa8e3759394d90656
+EBUILD omniORB-4.1.4.ebuild 2326 RMD160 2ba5b781213a18f6adba433cb484412ee8eceb7f SHA1 dae8764f4d5d9bb0ab5296575fb8ac702b1b19b8 SHA256 5c1cb604b8b138ad73fd6e28f3a45b4579144cb91607c9690f70a59d77f04339
+MISC ChangeLog 8928 RMD160 3e576f9e6d0335389e43d9a89fb5dbab54067783 SHA1 0f2fe96bee821d7ee3cf2ff610622cc3e7a1b834 SHA256 2a0dd3fc7927240abfad5f286194ae36b4ecb539375da02e871378df12caf79d
 MISC metadata.xml 225 RMD160 106c8f5ff0028efc2beb2d1d065d08e3de1941e3 SHA1 39b11879fb0385ec1afee3995b2d04ba5489f867 SHA256 f27264dffc823378b544553a8bde8fa711cdbd8f06750cc02a4714705e2c81a0
diff --git a/net-misc/omniORB/omniORB-4.1.4.ebuild b/net-misc/omniORB/omniORB-4.1.4.ebuild
index 8062ff9c43fd..f1836e389870 100644
--- a/net-misc/omniORB/omniORB-4.1.4.ebuild
+++ b/net-misc/omniORB/omniORB-4.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/omniORB-4.1.4.ebuild,v 1.3 2009/11/17 19:52:37 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/omniORB-4.1.4.ebuild,v 1.4 2009/11/21 19:16:50 caster Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://omniorb.sourceforge.net/"
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~ia64 ~ppc ppc64 ~sparc ~x86"
-IUSE="ssl"
+IUSE="doc ssl"
 
 RDEPEND="dev-lang/python
 	ssl? ( >=dev-libs/openssl-0.9.6b )"
@@ -26,31 +26,36 @@ src_prepare() {
 		mk/platforms/i586_linux_2.0*.mk || die "sed failed"
 }
 
-src_compile() {
-	mkdir build || die
-	cd build
+src_configure() {
+	mkdir build && cd build || die
 
-	MY_CONF="--prefix=/usr --with-omniORB-config=/etc/omniorb/omniORB.cfg \
+	local MY_CONF="--prefix=/usr --with-omniORB-config=/etc/omniorb/omniORB.cfg \
 		--with-omniNames-logdir=/var/log/omniORB --libdir=/usr/$(get_libdir)"
 
 	use ssl && MY_CONF="${MY_CONF} --with-openssl=/usr"
 
 	python_version
-	PYTHON=/usr/bin/python${PYVER} ECONF_SOURCE=".." econf ${MY_CONF} \
-		|| die "./configure failed"
+	PYTHON=/usr/bin/python${PYVER} ECONF_SOURCE=".." econf ${MY_CONF}
+}
 
-	emake OPTCFLAGS="${OPTCFLAGS}" OPTCXXFLAGS="${CXXFLAGS}" || die "emake failed"
+src_compile() {
+	cd build
+	emake OPTCFLAGS="${CFLAGS}" OPTCXXFLAGS="${CXXFLAGS}" || die "emake failed"
 }
 
 src_install () {
-	cd "${S}/build"
+	cd build
 	emake DESTDIR="${D}" install || die "emake install failed"
 
 	cd "${S}"
 	dodoc COPYING* CREDITS README* ReleaseNotes* || die
 
-	docinto print
-	#dodoc doc/*.ps doc/*.pdf || die
+	if use doc; then
+		dohtml doc/*.html || die
+		dohtml -r doc/omniORB || die
+		docinto print
+		dodoc doc/*.pdf || die
+	fi
 
 	dodir /etc/env.d/
 	cat <<- EOF > "${T}/90omniORB"