Version bump (bug #305859).

Package-Manager: portage-HEAD/cvs/Linux x86_64

diff --git a/net-libs/serf/ChangeLog b/net-libs/serf/ChangeLog
index b2608030d97dfae4de0ca36dcda8942f9aae97e3..d6258ef39401df1b9edb44b99fda50428e9bcaeb 100644 (file)
--- a/net-libs/serf/ChangeLog
+++ b/net-libs/serf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/serf
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/serf/ChangeLog,v 1.23 2009/04/28 14:56:32 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/serf/ChangeLog,v 1.24 2010/05/26 21:25:55 arfrever Exp $
+
+*serf-0.3.1 (26 May 2010)
+
+  26 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +serf-0.3.1.ebuild, +files/serf-0.3.1-disable-unneeded-linking.patch:
+  Version bump (bug #305859).
 
   28 Apr 2009; Raúl Porcel <armin76@gentoo.org> serf-0.3.0.ebuild:
   alpha/arm/ia64/s390/sh/sparc stable wrt #267269

diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest
index 55f00b07155d6975273253360ce8fb1c9ba98e3e..0714b27f2b89160a4476af28abc62b77a0b25d73 100644 (file)
--- a/net-libs/serf/Manifest
+++ b/net-libs/serf/Manifest
@@ -1,8 +1,8 @@
-AUX 0.1.2-disable-unneeded-linking.patch 374 RMD160 370285bd4b41a625f0e7ac44af149007f46463b9 SHA1 c4f1cc189fcbf6036731c5c98fd6d56c7d932949 SHA256 74e7023c01b1a69c443fa968ecced9135f7e4985269c958d4bfff9f70ad66b22
 AUX serf-0.3.0-disable-unneeded-linking.patch 320 RMD160 ca67bdef4a42752ca2942c6704502e6ee96d51b6 SHA1 05d03c1bae6e0e0940cc9753ad642a1daec5a9b7 SHA256 d5c98c4d31c58826c73579aa81ecdebeae25b02a0ce03e8fe3029edd7500e5eb
-DIST serf-0.2.0.tar.bz2 137742 RMD160 ea3f121f2cc9a2c71a6115bcdc4889af6f643928 SHA1 498060fee2cd2c3408bdbeb5be5c6ed8f923c838 SHA256 9cadd3c9e42fa204b60f338c89033743b4e83a952641ad5c4be18bed059e6008
+AUX serf-0.3.1-disable-unneeded-linking.patch 371 RMD160 f85d8ac31e42bf2bd2a5a7ead312305de75d6084 SHA1 cfff0e88731185ba99a27ad84d0548a3faa42f5d SHA256 a246c046a52e039309d7b4da26fb5d5d14aab54c33ede1597b93ca9552064fe0
 DIST serf-0.3.0.tar.bz2 139893 RMD160 fdab06e71b459c2a616e5cd83ec40152c80493d8 SHA1 7f80479d262ae0012dcd0bc20d0ef09c945d58c5 SHA256 4eebd2a349e80a716a5f5aa4ee2e809f6be2c4b568390a0784cb30c2669a5c73
-EBUILD serf-0.2.0.ebuild 970 RMD160 b41b0ff1c48553bcbbcad53052da183fd02cb458 SHA1 3568f9d69e9c0c89cb5b5b0feb3fe9275c214c00 SHA256 6567234c86e475cc3c1b94d94b48eddd35ddb561f2a759e286f6f7fa0f5f07b9
+DIST serf-0.3.1.tar.bz2 142578 RMD160 04acaa73ae7d50fa11fc0307b33584340efa8467 SHA1 6365c21090adae7f17636b72979e761db95ad30a SHA256 8bcdb09952152376e6c2ada9e8b4b6cdf300e099711e1224a4f501bac22fb72a
 EBUILD serf-0.3.0.ebuild 973 RMD160 991f9ea5a2bf154ec46078bc3d25e7d5e2df3c99 SHA1 6cfc81ae22d11086a37d8d6e9ee9507f8d74f13f SHA256 bcbda73f4454fcc2769ea6b2ba53271f40ca2fc7f45309c7b32a3a8be35a4a70
-MISC ChangeLog 2580 RMD160 033c8d97e5b0773044f21eb0c6703124ee4c010e SHA1 38eb1db64a668a557fd7cc6df7995c9972e24041 SHA256 1ae6792f933dfc804e299aa86deb6ca1ce98f6e9f47898d6475d9b805beb1491
+EBUILD serf-0.3.1.ebuild 984 RMD160 48c67ff62baaf6e98bb5f9749701e21d9a200db6 SHA1 53bd6087523067af151434e5517928fcce1af12c SHA256 db83b71ab20217e2b6c0c015e2de10aa5caba009fca1ae9ccec6c1b8d39608e4
+MISC ChangeLog 2784 RMD160 8b5bd9745fe6a7c9c4b65d3c5da58833bb127344 SHA1 31701eaf52aa70e51e7558e5027273e806df9f94 SHA256 f238ec6b98c519a463ff1691b0044c6c278e1ad34801ed2038e1db617b03eb84
 MISC metadata.xml 278 RMD160 75da24ac664cf3d369c995a0a3f51e19646bb42f SHA1 c39437106ae6b75702d3cf8164f90120124861f0 SHA256 a2d2ffc9403a5174394f89170153a725cb0fb829d81261bc69d455a182a74932

diff --git a/net-libs/serf/files/0.1.2-disable-unneeded-linking.patch b/net-libs/serf/files/0.1.2-disable-unneeded-linking.patch
deleted file mode 100644 (file)
index 4c3af29..0000000
--- a/net-libs/serf/files/0.1.2-disable-unneeded-linking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in
-+++ configure.in
-@@ -160,7 +160,7 @@
- AC_CHECK_HEADER([openssl/opensslv.h], [],
-                 [AC_MSG_ERROR([We require OpenSSL; try --with-openssl])])
- 
--libs="`$apu_config --link-libtool --libs` `$apr_config --link-libtool --libs`"
-+libs="`$apu_config --link-libtool` `$apr_config --link-libtool`"
- APR_ADDTO(SERF_LIBS, [$libs])
- AC_SUBST(SERF_LIBS)
- 

diff --git a/net-libs/serf/files/serf-0.3.1-disable-unneeded-linking.patch b/net-libs/serf/files/serf-0.3.1-disable-unneeded-linking.patch
new file mode 100644 (file)
index 0000000..0240b50
--- /dev/null
+++ b/net-libs/serf/files/serf-0.3.1-disable-unneeded-linking.patch
@@ -0,0 +1,14 @@
+--- configure.in
++++ configure.in
+@@ -192,9 +192,9 @@
+ 
+ libs=""
+ if test -n "$apu_config"; then
+-  APR_ADDTO(libs, [`$apu_config --link-libtool --libs`])
++  APR_ADDTO(libs, [`$apu_config --link-ld`])
+ fi
+-APR_ADDTO(libs, [`$apr_config --link-libtool --libs` $LIBS])
++APR_ADDTO(libs, [`$apr_config --link-ld` $LIBS])
+ 
+ APR_ADDTO(SERF_LIBS, [$libs])
+ AC_SUBST(SERF_LIBS)

diff --git a/net-libs/serf/serf-0.2.0.ebuild b/net-libs/serf/serf-0.2.0.ebuild
deleted file mode 100644 (file)
index 397ac65..0000000
--- a/net-libs/serf/serf-0.2.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/serf/serf-0.2.0.ebuild,v 1.8 2008/11/12 16:03:04 pva Exp $
-
-inherit autotools eutils
-
-DESCRIPTION="HTTP client library"
-HOMEPAGE="http://code.google.com/p/serf/"
-SRC_URI="http://serf.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-libs/apr
-       dev-libs/apr-util
-       dev-libs/openssl
-       sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
-       epatch "${FILESDIR}"/0.1.2-disable-unneeded-linking.patch
-       eautoreconf
-}
-
-src_compile() {
-       econf \
-               --with-apr=/usr/bin/apr-1-config \
-               --with-apr-util=/usr/bin/apu-1-config \
-               --with-openssl=/usr
-       emake || die "emake failed"
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed"
-       dodoc CHANGES README
-}

diff --git a/net-libs/serf/serf-0.3.1.ebuild b/net-libs/serf/serf-0.3.1.ebuild
new file mode 100644 (file)
index 0000000..b3934dc
--- /dev/null
+++ b/net-libs/serf/serf-0.3.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/serf/serf-0.3.1.ebuild,v 1.1 2010/05/26 21:25:55 arfrever Exp $
+
+EAPI="3"
+
+inherit autotools eutils
+
+DESCRIPTION="HTTP client library"
+HOMEPAGE="http://code.google.com/p/serf/"
+SRC_URI="http://serf.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-libs/apr:1
+       dev-libs/apr-util:1
+       dev-libs/openssl
+       sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+       epatch "${FILESDIR}/${P}-disable-unneeded-linking.patch"
+       eautoreconf
+}
+
+src_configure() {
+       econf \
+               --with-apr="${EPREFIX}/usr/bin/apr-1-config" \
+               --with-apr-util="${EPREFIX}/usr/bin/apu-1-config" \
+               --with-openssl="${EPREFIX}/usr"
+}
+
+src_install() {
+       emake DESTDIR="${D}" install || die "emake install failed"
+       dodoc CHANGES README
+}