Version bump.

(Portage version: 2.2.0_alpha80/cvs/Linux x86_64)

3 files changed, 20 insertions, 108 deletions

diff --git a/net-libs/liboauth/ChangeLog b/net-libs/liboauth/ChangeLog
index e4bd32b7c209..6120c92371f0 100644
--- a/net-libs/liboauth/ChangeLog
+++ b/net-libs/liboauth/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/liboauth
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/liboauth/ChangeLog,v 1.10 2011/11/20 14:00:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/liboauth/ChangeLog,v 1.11 2011/12/13 17:28:51 flameeyes Exp $
+
+*liboauth-0.9.6 (13 Dec 2011)
+
+  13 Dec 2011; Diego E. Pettenò <flameeyes@gentoo.org> +liboauth-0.9.6.ebuild,
+  -liboauth-0.9.2.ebuild, -liboauth-0.9.4.ebuild:
+  Version bump.
 
 *liboauth-0.9.5 (20 Nov 2011)
 
diff --git a/net-libs/liboauth/liboauth-0.9.2.ebuild b/net-libs/liboauth/liboauth-0.9.2.ebuild
deleted file mode 100644
index 62853f9dd240..000000000000
--- a/net-libs/liboauth/liboauth-0.9.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/liboauth/liboauth-0.9.2.ebuild,v 1.2 2011/01/13 23:13:55 flameeyes Exp $
-
-EAPI=2
-
-DESCRIPTION="C library implementing the OAuth secure authentication protocol"
-HOMEPAGE="http://liboauth.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	http://liboauth.sourceforge.net/pool/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 MIT )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl doc bindist +nss"
-
-CDEPEND="
-	nss? ( dev-libs/nss
-		curl? ( || ( net-misc/curl[ssl,nss,-gnutls] net-misc/curl[-ssl] ) )
-	)
-
-	bindist? ( dev-libs/nss
-		curl? ( || ( net-misc/curl[ssl,nss,-gnutls] net-misc/curl[-ssl] ) )
-	)
-
-	!bindist? (
-		!nss? ( dev-libs/openssl
-			curl? ( || ( net-misc/curl[ssl,-nss,-gnutls] net-misc/curl[-ssl] ) )
-		)
-	)
-
-	net-misc/curl
-"
-
-RDEPEND="${CDEPEND}"
-
-DEPEND="${CDEPEND}
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-		media-fonts/freefont-ttf
-	)
-	dev-util/pkgconfig"
-
-src_configure() {
-	local myconf=
-
-	if use nss || use bindist; then
-		myconf="${myconf} --enable-nss"
-	else
-		myconf="${myconf} --disable-nss"
-	fi
-
-	econf \
-		--disable-dependency-tracking \
-		--enable-fast-install \
-		--disable-static \
-		$(use_enable !curl curl) \
-		$(use_enable curl libcurl) \
-		${myconf}
-}
-
-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
-}
-
-src_test() {
-	# explicitly allow parallel test build
-	emake check || die "emake check failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-
-	find "${D}" -name '*.la' -delete || die
-
-	dodoc AUTHORS ChangeLog LICENSE.OpenSSL NEWS README || die "dodoc failed"
-
-	if use doc; then
-		dohtml -r doc/html/* || die "dohtml failed"
-	fi
-}
diff --git a/net-libs/liboauth/liboauth-0.9.4.ebuild b/net-libs/liboauth/liboauth-0.9.6.ebuild
index 24587dcec1db..25e1f777c134 100644
--- a/net-libs/liboauth/liboauth-0.9.4.ebuild
+++ b/net-libs/liboauth/liboauth-0.9.6.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/liboauth/liboauth-0.9.4.ebuild,v 1.2 2011/09/24 15:10:42 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/liboauth/liboauth-0.9.6.ebuild,v 1.1 2011/12/13 17:28:51 flameeyes Exp $
 
-EAPI=3
+EAPI=4
 
 DESCRIPTION="C library implementing the OAuth secure authentication protocol"
 HOMEPAGE="http://liboauth.sourceforge.net/"
@@ -14,19 +14,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x64-macos"
 IUSE="curl doc bindist +nss"
 
+REQUIRED_USE="bindist? ( nss )"
+
 CDEPEND="
 	nss? ( dev-libs/nss
 		curl? ( || ( net-misc/curl[ssl,nss,-gnutls] net-misc/curl[-ssl] ) )
 	)
 
-	bindist? ( dev-libs/nss
-		curl? ( || ( net-misc/curl[ssl,nss,-gnutls] net-misc/curl[-ssl] ) )
-	)
-
-	!bindist? (
-		!nss? ( dev-libs/openssl
-			curl? ( || ( net-misc/curl[ssl,-nss,-gnutls] net-misc/curl[-ssl] ) )
-		)
+	!nss? ( dev-libs/openssl
+		curl? ( || ( net-misc/curl[ssl,-nss,-gnutls] net-misc/curl[-ssl] ) )
 	)
 
 	net-misc/curl
@@ -61,28 +57,26 @@ src_configure() {
 }
 
 src_compile() {
-	emake || die "emake failed"
+	emake
 
 	if use doc ; then
 		# make sure fonts are found
 		export DOTFONTPATH="${EPREFIX}"/usr/share/fonts/freefont-ttf
-		emake dox || die "emake dox failed"
+		emake dox
 	fi
 }
 
 src_test() {
 	# explicitly allow parallel test build
-	emake check || die "emake check failed"
+	emake check
 }
 
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-
-	find "${D}" -name '*.la' -delete || die
+DOCS=( AUTHORS ChangeLog LICENSE.OpenSSL NEWS README )
 
-	dodoc AUTHORS ChangeLog LICENSE.OpenSSL NEWS README || die "dodoc failed"
+src_install() {
+	default
 
 	if use doc; then
-		dohtml -r doc/html/* || die "dohtml failed"
+		dohtml -r doc/html/*
 	fi
 }