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

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

6 files changed, 24 insertions, 109 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/Manifest b/net-libs/liboauth/Manifest
index 78279dece0da..d7460b6264c8 100644
--- a/net-libs/liboauth/Manifest
+++ b/net-libs/liboauth/Manifest
@@ -1,17 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX liboauth-0.8.8-asneeded.patch 1479 RMD160 470ad1c52e2bad159be09b5aac08863f4a3f87db SHA1 28fd382e6cdc5d416d963ba0865d7b5f4b32764e SHA256 bf6e95ba40b3ffb075fd81bcacd000b02041aff00ce689c3f7a51e1afc2f9f1e
-AUX liboauth-0.8.8-pkgconfig.patch 1184 RMD160 f2d8da4fa530789f52ff9fd99364ab6c5d3f3411 SHA1 e1cd4f8929a03a6d1f3cd34b8b64d970ff48745d SHA256 3dce3a2b55929cc21464343dcafea4fa1678068291b4c23df5b1c9cf12c1da9b
-AUX liboauth-0.8.8-tests.patch 472 RMD160 6c211b14b5d421bddda5eca77182b9d5f472872a SHA1 7b454552de364a26ccc1e3990bd93cc9e6647cc1 SHA256 e243777b46bcb6d5d48ff1f363d900c184d208f9c0cb69c1361a61781f08cfdb
-DIST liboauth-0.8.8.tar.gz 391614 RMD160 d84a60b2e6690b96af6aefc7e796e251b4c02e42 SHA1 ba133e8e62ebcc9fd8995f4f903b306d34a44325 SHA256 f5079670c08206a2bb28482934c59994cf1a288d3ec279d9a3723c4941230fd7
-EBUILD liboauth-0.8.8.ebuild 1892 RMD160 5dfd1cb27f517f9e406ebdbaace581da27381387 SHA1 b335b86619e16223ff28b39a33c76bd1d8514163 SHA256 0e03dc8a72876bf0134a11a0c304e43cd4dc402d8299bcfa586638ef76acbdb2
-MISC ChangeLog 780 RMD160 86522f19817f80b139e011c9137d3c807a0ad261 SHA1 c23636eefdd39584e7df7051a33c5b17ea266746 SHA256 b85495dec6c71374fd3fd83ca3d5124de4f571668a330516866d5817f1ce4c8d
+DIST liboauth-0.8.9.tar.gz 394622 RMD160 a540ac04085c999fc8a1d90ae597d2a82117228f SHA1 ab1227d4aba8b9050b93b418b888f696ec0574b7 SHA256 d9f975bd6a85997e422e8e5dc6e562f59340fea0af55bb5ed544d1871371d118
+EBUILD liboauth-0.8.9.ebuild 1871 RMD160 f284039040d105731d809627a8299c1e00db2b64 SHA1 0ef4f9481997144544c7384c0d9fa4dc0006b75e SHA256 613df4dd7f354dcf52d1043b17f8e7dae61ef41d473e87cd36075cb24362eb5b
+MISC ChangeLog 1131 RMD160 d5ffeb4896e28dffbf1bb158d54f43e0c8aab9e3 SHA1 407edcce9083d2be450971bc9132fc86a21bfa24 SHA256 5d9e95c753cd72461db16335cc923975380478af8ec57d38217f3606b3b23150
 MISC metadata.xml 865 RMD160 c4e532e4bdc093f1fd9f875d48e0087ff04e4620 SHA1 7a08aaf44bc5758aa9c917223896c025d338bbd7 SHA256 849bef3eb92d0c8df01f26a9eea1ce5e09259eceb6819d167a81b1605e76c640
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkx4GQUACgkQAiZjviIA2XjlWACfRqQ/HfyOrbV1XVzKQPTHU7WG
-dA4An2PSniVz/7CPErXPxNy5KlmR9e4r
-=8wbu
+iEYEARECAAYFAkx8HggACgkQAiZjviIA2XhFlQCgw8Ipe6XWsGnDP5qbD/IJf7VR
+7YYAoLhjpOkoZHNgjskqAXCy7Eq5oXhf
+=eATp
 -----END PGP SIGNATURE-----
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
 }