Build fix for #461274 thanks to Ian Abbott

(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 59 insertions, 4 deletions

diff --git a/net-libs/liboauth/ChangeLog b/net-libs/liboauth/ChangeLog
index 8cf7f535f3fd..19e9da48abca 100644
--- a/net-libs/liboauth/ChangeLog
+++ b/net-libs/liboauth/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/liboauth
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/liboauth/ChangeLog,v 1.23 2013/03/09 13:51:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/liboauth/ChangeLog,v 1.24 2013/04/10 04:09:59 patrick Exp $
+
+  10 Apr 2013; Patrick Lauer <patrick@gentoo.org>
+  +files/liboauth-1.0.1-doxygen-out-of-tree.patch, liboauth-1.0.1.ebuild:
+  Build fix for #461274 thanks to Ian Abbott
 
 *liboauth-1.0.1 (09 Mar 2013)
 
diff --git a/net-libs/liboauth/files/liboauth-1.0.1-doxygen-out-of-tree.patch b/net-libs/liboauth/files/liboauth-1.0.1-doxygen-out-of-tree.patch
new file mode 100644
index 000000000000..3ed37ec266cc
--- /dev/null
+++ b/net-libs/liboauth/files/liboauth-1.0.1-doxygen-out-of-tree.patch
@@ -0,0 +1,50 @@
+diff -urp liboauth-1.0.1-orig/Doxyfile.in liboauth-1.0.1/Doxyfile.in
+--- liboauth-1.0.1-orig/Doxyfile.in	2012-11-01 04:34:49.000000000 +0000
++++ liboauth-1.0.1/Doxyfile.in	2013-03-14 14:25:11.000000000 +0000
+@@ -45,7 +45,7 @@ PROJECT_BRIEF          =
+ # exceed 55 pixels and the maximum width should not exceed 200 pixels.
+ # Doxygen will copy the logo to the output directory.
+ 
+-PROJECT_LOGO           = doc/libOAuth.png
++PROJECT_LOGO           = @top_srcdir@/doc/libOAuth.png
+ 
+ # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+ # base path where the generated documentation will be put.
+@@ -130,7 +130,7 @@ FULL_PATH_NAMES        = YES
+ # relative paths, which will be relative from the directory where doxygen is
+ # started.
+ 
+-STRIP_FROM_PATH        = src/
++STRIP_FROM_PATH        = @top_srcdir@/src/
+ 
+ # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+ # the path mentioned in the documentation of a class, which tells
+@@ -661,8 +661,8 @@ WARN_LOGFILE           =
+ # directories like "/usr/src/myproject". Separate the files or directories
+ # with spaces.
+ 
+-INPUT                  = src/oauth.h \
+-                         doc/mainpage.dox
++INPUT                  = @top_srcdir@/src/oauth.h \
++                         @top_srcdir@/doc/mainpage.dox
+ 
+ # This tag can be used to specify the character encoding of the source files
+ # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
+@@ -722,7 +722,7 @@ EXCLUDE_SYMBOLS        =
+ # directories that contain example code fragments that are included (see
+ # the \include command).
+ 
+-EXAMPLE_PATH           = tests/
++EXAMPLE_PATH           = @top_srcdir@/tests/
+ 
+ # If the value of the EXAMPLE_PATH tag contains directories, you can use the
+ # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+@@ -742,7 +742,7 @@ EXAMPLE_RECURSIVE      = NO
+ # directories that contain image that are included in the documentation (see
+ # the \image command).
+ 
+-IMAGE_PATH             = doc/
++IMAGE_PATH             = @top_srcdir@/doc/
+ 
+ # The INPUT_FILTER tag can be used to specify a program that doxygen should
+ # invoke to filter for each input file. Doxygen will invoke the filter program
diff --git a/net-libs/liboauth/liboauth-1.0.1.ebuild b/net-libs/liboauth/liboauth-1.0.1.ebuild
index 621f637aef9b..b65e0901812c 100644
--- a/net-libs/liboauth/liboauth-1.0.1.ebuild
+++ b/net-libs/liboauth/liboauth-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/liboauth/liboauth-1.0.1.ebuild,v 1.1 2013/03/09 13:51:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/liboauth/liboauth-1.0.1.ebuild,v 1.2 2013/04/10 04:09:59 patrick Exp $
 
 EAPI=5
 
@@ -15,6 +15,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
 IUSE="curl doc bindist +nss"
 
+PATCHES=( "${FILESDIR}"/${P}-doxygen-out-of-tree.patch )
 REQUIRED_USE="bindist? ( nss )"
 
 CDEPEND="
@@ -56,14 +57,14 @@ src_compile() {
 	if use doc ; then
 		# make sure fonts are found
 		export DOTFONTPATH="${EPREFIX}"/usr/share/fonts/freefont-ttf
-		emake dox
+		autotools-utils_src_compile dox
 	fi
 }
 
 DOCS=( AUTHORS ChangeLog LICENSE.OpenSSL README )
 
 src_install() {
-	use doc && HTML_DOCS=("${BUILD_DIR}"/doc/html)
+	use doc && HTML_DOCS=("${BUILD_DIR}"/doc/html/)
 
 	autotools-utils_src_install
 }