Version bump.

Package-Manager: portage-2.2.0_alpha80/cvs/Linux x86_64

4 files changed, 26 insertions, 116 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/Manifest b/net-libs/liboauth/Manifest
index ff5f2ed644b4..f8faa4f2e35f 100644
--- a/net-libs/liboauth/Manifest
+++ b/net-libs/liboauth/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST liboauth-0.9.2.tar.gz 395412 RMD160 7c548ca9d876fa39be60c72ac9af7115a4e136c2 SHA1 87448a0a54ba7dcc31e92450af01a48d63b06315 SHA256 125916399626ad67895d7f599f9bb48fdfd7d8aff88aff5522ab9f5fba74fae4
-DIST liboauth-0.9.4.tar.gz 459597 RMD160 afe4e2e1266e13c16b501470d41a61e1bcdc2192 SHA1 9c48dcfe9bb2f7b0fa4825e645056bdf77640454 SHA256 77e372359caca5375fbcc63ac638f349e6c93c98d291992d8ebb9bb8291ca549
 DIST liboauth-0.9.5.tar.gz 423311 RMD160 10bda9d8504c222373b8235d9901ad706836148d SHA1 bc168c8bb549126497cffa72675a3c93e0d26adc SHA256 845dfca491dba3631bd61d0fb8d18a2121bd1512ef9c1ee1228a27868ac64cb8
-EBUILD liboauth-0.9.2.ebuild 1885 RMD160 b213cf77c265c2c08e24857c15f582196e06bf72 SHA1 ccaab1b82addefd90d5e92d0731b8a33d88152ed SHA256 1ed2f6f73d9bce7c7d1a3931f865b0c1ab71764e12475b72b23c0b6ca9902616
-EBUILD liboauth-0.9.4.ebuild 1906 RMD160 bfbd99e782b912b8e830219cffb98ca438087afa SHA1 307b9e36f7e0580d51fb45c9537640b7f5090442 SHA256 2bdd0a750d32f0c11ab042190d0f75ebed5ca42911d87782b1bc6dab97ca401c
+DIST liboauth-0.9.6.tar.gz 492499 RMD160 4ac91c4558238006d9c5e4e7c67548b566547f37 SHA1 9182ca5d7e127589d132377b807d0c8a8878b122 SHA256 9fa0f9d86ac4fbdd8c17d4c242ceef33096e8cf3b1834d9198ccc0cbf8b0f207
 EBUILD liboauth-0.9.5.ebuild 1617 RMD160 4ea3f449e1726f14bb66d6d4376589ed547db193 SHA1 86ff692b251a15394f5d1367f88ca8b068cc5b66 SHA256 9e61de83b1d2e789414254bd695f3f17d437c5e7b4f82252acb7825e29bffdf4
-MISC ChangeLog 2435 RMD160 a8175f348e43c0ff215fc0d7f5e3689538988098 SHA1 6d32bd5489c69e6c18fb0f9cd135db80bbdd522e SHA256 5f0031821014cbcbcaa3d2efde85aadb0a3195f033bf5430a94fb8621f3f03b1
+EBUILD liboauth-0.9.6.ebuild 1617 RMD160 5d3189ac045db875982f22a9b29ffbbcdf12aac1 SHA1 1bf500cb4f34d49d52e3e0b8098122bfff3a229e SHA256 3c52f49c82768252fe842e2abbb781e46c21c324a9d47868f062cb8758c4f916
+MISC ChangeLog 2613 RMD160 1057643431e443a85c00208da80863367963db85 SHA1 1d602c08e689f30468bdf5fa92993440fdc124cf SHA256 5192b95f89f352b1e5e508f63d463cfe4f25075e154c73e98deb5ea7a11a3508
 MISC metadata.xml 842 RMD160 92fe1259e43980954894904a5440e140def22848 SHA1 fad59f8babe792e28f34af023a321c07fab78b5c SHA256 fa588009106534f46d45108252915079585d17b76c53a7e1e726f0d04254596c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7JB/cACgkQAiZjviIA2XgjLgCgqajJtglJCNp5+5qgisEMD74J
-+4IAoK5CRX3Yj1RqmE74tX5xt1rospBD
-=GGJ5
+iEYEARECAAYFAk7ni0UACgkQAiZjviIA2XgfAwCgsZGXlj6v14z8VdBZwMmrY314
+b0oAn0gHifPMRl2XDzzhMond3PGS9WjK
+=JCWj
 -----END PGP SIGNATURE-----
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
 }