Version bump (bug #305859).

(Portage version: HEAD/cvs/Linux x86_64)

5 files changed, 61 insertions, 54 deletions

diff --git a/net-libs/serf/ChangeLog b/net-libs/serf/ChangeLog
index b2608030d97d..d6258ef39401 100644
--- 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/files/0.1.2-disable-unneeded-linking.patch b/net-libs/serf/files/0.1.2-disable-unneeded-linking.patch
deleted file mode 100644
index 4c3af29560e7..000000000000
--- 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
index 000000000000..0240b500d873
--- /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
index 397ac658e4e8..000000000000
--- 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
index 000000000000..b3934dccc503
--- /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
+}