Version bump with upstreamed patch, and remove old.

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

5 files changed, 16 insertions, 119 deletions

diff --git a/net-libs/liboauth/ChangeLog b/net-libs/liboauth/ChangeLog
index 036347b9cdd6..9f1fc28e40cd 100644
--- a/net-libs/liboauth/ChangeLog
+++ b/net-libs/liboauth/ChangeLog
@@ -1,6 +1,13 @@
 # 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.5 2011/01/12 23:21:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/liboauth/ChangeLog,v 1.6 2011/01/13 22:50:03 flameeyes Exp $
+
+*liboauth-0.9.2 (13 Jan 2011)
+
+  13 Jan 2011; Diego E. Pettenò <flameeyes@gentoo.org> -liboauth-0.9.0.ebuild,
+  -liboauth-0.9.1.ebuild, -files/liboauth-0.9.1-ldflags.patch,
+  +liboauth-0.9.2.ebuild:
+  Version bump with upstreamed patch, and remove old.
 
 *liboauth-0.9.1 (12 Jan 2011)
 
diff --git a/net-libs/liboauth/Manifest b/net-libs/liboauth/Manifest
index ab2632a2e777..886b809978ea 100644
--- a/net-libs/liboauth/Manifest
+++ b/net-libs/liboauth/Manifest
@@ -1,17 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX liboauth-0.9.1-ldflags.patch 464 RMD160 d18e66e10ee97372fe97caf3a26a52b685edf9b7 SHA1 1079eeb4fd7ab5b0ebf7a895d1c3f5230d06b1e2 SHA256 0ca2c2a4dbfd6ddc8c3f1b3565783e05973b2d1e3181312dbb15b5f473e4a35e
-DIST liboauth-0.9.0.tar.gz 458621 RMD160 8d51fa79dadab5d648e18bc499c5e4d34201d810 SHA1 ff669bd19edc8aabbde3d8fee712d876e3891267 SHA256 eacdb421b727cbc1fccfd95b44cb3af5d226f585344b3cccd0d8780c9d2835d0
-DIST liboauth-0.9.1.tar.gz 395025 RMD160 4b23665ebacd055e172c34e8a2773b599607a5e1 SHA1 f554a8f5e4edbabd64df7638cf4a2f9060ac5671 SHA256 7e2eb08cfb0771e5fb79b458ac749a2f7a87d3d7d732bff7548ad8834aee013b
-EBUILD liboauth-0.9.0.ebuild 1845 RMD160 a0cd296559dcc4846c1bbbd56370949bb1848409 SHA1 8eb0096c4745d33801c7dc61291a8a9f3e8cfad9 SHA256 11b544d24faac6cbe09f7c10f07cf2527ee1263296b0cddd01cd360d5e03bf0c
-EBUILD liboauth-0.9.1.ebuild 1944 RMD160 633cba62745e6710432423535ec971f9e1c7b488 SHA1 dc2aff0b0c9f5218360bbdd396d17b7ec1f7e296 SHA256 e04b8166fbd919bd31ef7a389d7715bf925fc39735155e3353798a5889e1edf7
-MISC ChangeLog 1597 RMD160 9d55ed3f425d789d5f23083d56efcdda9fe008fb SHA1 08b8ed00392ea4e44ac48c8fb3fb049d123dd282 SHA256 2328b7e4203ee126f2d8db18d4c15fe89cba2ec5e0b979e35705f942ae0bb62a
+DIST liboauth-0.9.2.tar.gz 395412 RMD160 7c548ca9d876fa39be60c72ac9af7115a4e136c2 SHA1 87448a0a54ba7dcc31e92450af01a48d63b06315 SHA256 125916399626ad67895d7f599f9bb48fdfd7d8aff88aff5522ab9f5fba74fae4
+EBUILD liboauth-0.9.2.ebuild 1845 RMD160 41480dcd6f10e86aff9273b469a9397910cbfc87 SHA1 1c67100fc47e6b9d178954a2742bbf0b5127a169 SHA256 b94baf6a48cfa29f6b5c2573ade35c8ea57d3652251b33e0cfc8472ffd95baea
+MISC ChangeLog 1852 RMD160 ddd82b293cd0ff689be5b40577e041727fc0e1dd SHA1 1f579419974ba1a808fd2b6e8fe9f3f174c41fe6 SHA256 f1597b20be6132d962a6b755ccc84daefb65715437e6a7f79215356a4fc8799c
 MISC metadata.xml 865 RMD160 c4e532e4bdc093f1fd9f875d48e0087ff04e4620 SHA1 7a08aaf44bc5758aa9c917223896c025d338bbd7 SHA256 849bef3eb92d0c8df01f26a9eea1ce5e09259eceb6819d167a81b1605e76c640
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk0uN2EACgkQAiZjviIA2XhFrgCfROA2kuio/Z4zv7wHTKEcTxPD
-iCMAoMtF7yxrfZBfzeeJT9Ki/MEfAbVW
-=8mdp
+iEYEARECAAYFAk0vgXUACgkQAiZjviIA2Xgj0gCePH42Bd+e1fOCO7kTMoDQC91A
+IYsAoNcoPDbCkHaUUjYmgxMEDLEqzS8j
+=Qkbq
 -----END PGP SIGNATURE-----
diff --git a/net-libs/liboauth/files/liboauth-0.9.1-ldflags.patch b/net-libs/liboauth/files/liboauth-0.9.1-ldflags.patch
deleted file mode 100644
index cff5d7887d61..000000000000
--- a/net-libs/liboauth/files/liboauth-0.9.1-ldflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: liboauth-0.9.1/configure.ac
-===================================================================
---- liboauth-0.9.1.orig/configure.ac
-+++ liboauth-0.9.1/configure.ac
-@@ -81,7 +81,7 @@ LIBOAUTH_LDFLAGS="${LIBOAUTH_CFLAGS} -ex
- #LIBOAUTH_CFLAGS="${LIBOAUTH_CFLAGS} -g -posix -std=c99 -pedantic"
- 
- AC_MSG_CHECKING([if -Wl,--as-needed works])
--LFDLAGS_save=$LDFLAGS
-+LDFLAGS_save=$LDFLAGS
- LDFLAGS="$LDFLAGS -Wl,--as-needed"
- AC_TRY_LINK([], [],
-             [
diff --git a/net-libs/liboauth/liboauth-0.9.1.ebuild b/net-libs/liboauth/liboauth-0.9.1.ebuild
deleted file mode 100644
index 6a5e10315972..000000000000
--- a/net-libs/liboauth/liboauth-0.9.1.ebuild
+++ /dev/null
@@ -1,94 +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.1.ebuild,v 1.1 2011/01/12 23:21:44 flameeyes Exp $
-
-EAPI=2
-
-inherit eutils autotools
-
-DESCRIPTION="C library implementing the OAuth secure authentication protocol"
-HOMEPAGE="http://liboauth.sourceforge.net/"
-SRC_URI="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_prepare() {
-	epatch "${FILESDIR}/${P}-ldflags.patch"
-	eautoreconf
-}
-
-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.0.ebuild b/net-libs/liboauth/liboauth-0.9.2.ebuild
index e70c2fc6c112..5a11bc82b344 100644
--- a/net-libs/liboauth/liboauth-0.9.0.ebuild
+++ b/net-libs/liboauth/liboauth-0.9.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.0.ebuild,v 1.1 2010/09/10 12:31:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/liboauth/liboauth-0.9.2.ebuild,v 1.1 2011/01/13 22:50:03 flameeyes Exp $
 
 EAPI=2