Version bump; fix build of doxygen API doc; upstream merged my patches so less files around.

(Portage version: 2.2_rc72/cvs/Linux x86_64)

5 files changed, 18 insertions, 100 deletions

diff --git a/net-libs/liboauth/ChangeLog b/net-libs/liboauth/ChangeLog
index 2a3b3f87f0e3..967257010aa0 100644
--- a/net-libs/liboauth/ChangeLog
+++ b/net-libs/liboauth/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-libs/liboauth
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/liboauth/ChangeLog,v 1.1 2010/08/27 19:57:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/liboauth/ChangeLog,v 1.2 2010/08/30 21:06:54 flameeyes Exp $
+
+*liboauth-0.8.9 (30 Aug 2010)
+
+  30 Aug 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -liboauth-0.8.8.ebuild, -files/liboauth-0.8.8-asneeded.patch,
+  -files/liboauth-0.8.8-pkgconfig.patch, -files/liboauth-0.8.8-tests.patch,
+  +liboauth-0.8.9.ebuild:
+  Version bump; fix build of doxygen API doc; upstream merged my patches so
+  less files around.
 
   27 Aug 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   +liboauth-0.8.8.ebuild, +files/liboauth-0.8.8-asneeded.patch,
diff --git a/net-libs/liboauth/files/liboauth-0.8.8-asneeded.patch b/net-libs/liboauth/files/liboauth-0.8.8-asneeded.patch
deleted file mode 100644
index eb930aa08412..000000000000
--- a/net-libs/liboauth/files/liboauth-0.8.8-asneeded.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: liboauth-0.8.8/configure.ac
-===================================================================
---- liboauth-0.8.8.orig/configure.ac
-+++ liboauth-0.8.8/configure.ac
-@@ -113,8 +113,8 @@ AS_IF([test "${enable_nss}" == "yes"], [
-   HASH_CFLAGS=""
-   fi
-   report_hash="OpenSSL"
--  PC_LIB="$PC_LIB -lssl"
--  PC_REQ="$PC_REQ libssl"
-+  PC_LIB="$PC_LIB -lcrypto"
-+  PC_REQ="$PC_REQ libcrypto"
-   AC_MSG_NOTICE([
- 
-   NOTE: OpenSSL is not compatible with GPL applications.
-Index: liboauth-0.8.8/src/Makefile.am
-===================================================================
---- liboauth-0.8.8.orig/src/Makefile.am
-+++ liboauth-0.8.8/src/Makefile.am
-@@ -4,4 +4,5 @@ include_HEADERS = oauth.h
- 
- liboauth_la_SOURCES=oauth.c config.h hash.c xmalloc.c xmalloc.h oauth_http.c
- liboauth_la_LDFLAGS=@LIBOAUTH_LDFLAGS@ -version-info @VERSION_INFO@
-+liboauth_la_LIBADD=@HASH_LIBS@ @CURL_LIBS@
- liboauth_la_CFLAGS=@LIBOAUTH_CFLAGS@ @HASH_CFLAGS@ @CURL_CFLAGS@
-Index: liboauth-0.8.8/tests/Makefile.am
-===================================================================
---- liboauth-0.8.8.orig/tests/Makefile.am
-+++ liboauth-0.8.8/tests/Makefile.am
-@@ -4,7 +4,7 @@ ACLOCAL_AMFLAGS= -I m4
- OAUTHDIR =../src
- INCLUDES = -I$(srcdir)/$(OAUTHDIR)
- MYCFLAGS = @LIBOAUTH_CFLAGS@ @HASH_CFLAGS@ @CURL_CFLAGS@ 
--MYLDADD  = $(OAUTHDIR)/liboauth.la @HASH_LIBS@ @CURL_LIBS@
-+MYLDADD  = $(OAUTHDIR)/liboauth.la
- 
- tcwiki_SOURCES = selftest_wiki.c commontest.c commontest.h
- tcwiki_LDADD = $(MYLDADD)
diff --git a/net-libs/liboauth/files/liboauth-0.8.8-pkgconfig.patch b/net-libs/liboauth/files/liboauth-0.8.8-pkgconfig.patch
deleted file mode 100644
index b6cd072cbbb7..000000000000
--- a/net-libs/liboauth/files/liboauth-0.8.8-pkgconfig.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: liboauth-0.8.8/configure.ac
-===================================================================
---- liboauth-0.8.8.orig/configure.ac
-+++ liboauth-0.8.8/configure.ac
-@@ -78,9 +78,9 @@ if test "${enable_curl}" != "no"; then
- fi
- 
- dnl ** check for libcurl
--if test "${enable_libcurl}" != "no"; then
-+AS_IF([test "${enable_libcurl}" != "no"], [
-   PKG_CHECK_MODULES(CURL, libcurl, [ AC_DEFINE(HAVE_CURL, 1) HAVE_CURL=1 PC_REQ="$PC_REQ libcurl" PC_LIB="$PC_LIB -lcurl" report_curl="libcurl" ])
--fi
-+])
- 
- report_curltimeout="-"
- if test -n "${with_curltimeout}"; then
-@@ -99,12 +99,12 @@ AC_SUBST(CURL_CFLAGS)
- AC_SUBST(CURL_LIBS)
- 
- dnl ** crypto/hash lib (OpenSSL or NSS)
--if test "${enable_nss}" == "yes"; then
-+AS_IF([test "${enable_nss}" == "yes"], [
-   PKG_CHECK_MODULES(NSS, nss, [ AC_DEFINE(USE_NSS, 1) USE_NSS=1 PC_REQ="$PC_REQ nss" ])
-   HASH_LIBS=${NSS_LIBS}
-   HASH_CFLAGS=${NSS_CFLAGS}
-   report_hash="NSS"
--else
-+], [
-   AC_CHECK_HEADERS(openssl/hmac.h)
-   if test -z "${HASH_LIBS}"; then
-   HASH_LIBS="-lcrypto"
-@@ -129,7 +129,7 @@ else
-    
-   see http://people.gnome.org/~markmc/openssl-and-the-gpl.html
-   ])
--fi
-+])
- 
- AC_SUBST(HASH_LIBS)
- AC_SUBST(HASH_CFLAGS)
diff --git a/net-libs/liboauth/files/liboauth-0.8.8-tests.patch b/net-libs/liboauth/files/liboauth-0.8.8-tests.patch
deleted file mode 100644
index 7fcd9b57c1cb..000000000000
--- a/net-libs/liboauth/files/liboauth-0.8.8-tests.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: liboauth-0.8.8/tests/Makefile.am
-===================================================================
---- liboauth-0.8.8.orig/tests/Makefile.am
-+++ liboauth-0.8.8/tests/Makefile.am
-@@ -1,4 +1,4 @@
--noinst_PROGRAMS = oauthexample oauthdatapost tcwiki tceran tcother oauthtest oauthtest2 oauthsign oauthbodyhash
-+check_PROGRAMS = oauthexample oauthdatapost tcwiki tceran tcother oauthtest oauthtest2 oauthsign oauthbodyhash
- ACLOCAL_AMFLAGS= -I m4
- 
- OAUTHDIR =../src
diff --git a/net-libs/liboauth/liboauth-0.8.8.ebuild b/net-libs/liboauth/liboauth-0.8.9.ebuild
index c987304fa68e..4734234d0e38 100644
--- a/net-libs/liboauth/liboauth-0.8.8.ebuild
+++ b/net-libs/liboauth/liboauth-0.8.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/liboauth/liboauth-0.8.8.ebuild,v 1.1 2010/08/27 19:57:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/liboauth/liboauth-0.8.9.ebuild,v 1.1 2010/08/30 21:06:54 flameeyes Exp $
 
 EAPI=2
 
@@ -36,18 +36,13 @@ CDEPEND="
 RDEPEND="${CDEPEND}"
 
 DEPEND="${CDEPEND}
-	doc? ( app-doc/doxygen )
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+		media-fonts/freefont-ttf
+	)
 	dev-util/pkgconfig"
 
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-pkgconfig.patch \
-		"${FILESDIR}"/${P}-asneeded.patch \
-		"${FILESDIR}"/${P}-tests.patch
-
-	eautoreconf
-}
-
 src_configure() {
 	local myconf=
 
@@ -70,6 +65,8 @@ src_compile() {
 	emake || die "emake failed"
 
 	if use doc ; then
+		# make sure fonts are found
+		export DOTFONTPATH=/usr/share/fonts/freefont-ttf
 		emake dox || die "emake dox failed"
 	fi
 }