summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2010-07-04 07:59:38 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2010-07-04 07:59:38 +0000
commit23ec385bfb85a6b205fa266bfff353aef5ab531c (patch)
tree5202cb6784f94bae182c9276cee1147e1b054e91 /net-misc/cadaver
parentDelete older ebuild. (diff)
downloadgentoo-2-23ec385bfb85a6b205fa266bfff353aef5ab531c.tar.gz
gentoo-2-23ec385bfb85a6b205fa266bfff353aef5ab531c.tar.bz2
gentoo-2-23ec385bfb85a6b205fa266bfff353aef5ab531c.zip
Fix building with gettext-0.18 (bug #321915).
(Portage version: HEAD/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/cadaver')
-rw-r--r--net-misc/cadaver/ChangeLog6
-rw-r--r--net-misc/cadaver/cadaver-0.23.3.ebuild18
2 files changed, 16 insertions, 8 deletions
diff --git a/net-misc/cadaver/ChangeLog b/net-misc/cadaver/ChangeLog
index 5302121eca7d..290be5470e48 100644
--- a/net-misc/cadaver/ChangeLog
+++ b/net-misc/cadaver/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/cadaver
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cadaver/ChangeLog,v 1.37 2010/06/22 20:06:35 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cadaver/ChangeLog,v 1.38 2010/07/04 07:59:38 arfrever Exp $
+
+ 04 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ cadaver-0.23.3.ebuild:
+ Fix building with gettext-0.18 (bug #321915).
22 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
cadaver-0.23.2.ebuild, cadaver-0.23.3.ebuild:
diff --git a/net-misc/cadaver/cadaver-0.23.3.ebuild b/net-misc/cadaver/cadaver-0.23.3.ebuild
index 2b16fe793d12..73a2e6c3461e 100644
--- a/net-misc/cadaver/cadaver-0.23.3.ebuild
+++ b/net-misc/cadaver/cadaver-0.23.3.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cadaver/cadaver-0.23.3.ebuild,v 1.4 2010/06/22 20:06:35 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cadaver/cadaver-0.23.3.ebuild,v 1.5 2010/07/04 07:59:38 arfrever Exp $
-EAPI="2"
+EAPI="3"
inherit autotools eutils
@@ -15,16 +15,20 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ppc64 ~sparc x86"
IUSE="nls"
-DEPEND=">=net-libs/neon-0.27.0"
-RDEPEND="${DEPEND}"
+RDEPEND=">=net-libs/neon-0.27.0"
+DEPEND="${RDEPEND}
+ sys-devel/gettext"
src_prepare() {
epatch "${FILESDIR}/${PN}-0.23.2-disable-nls.patch"
rm -fr lib/{expat,intl,neon}
- sed -e "/NE_REQUIRE_VERSIONS/s/29/& 30/" \
- -e "s:lib/neon/Makefile lib/intl/Makefile ::" -i configure.ac
- sed -e "s/^\(SUBDIRS.*=\).*/\1/" -i Makefile.in
+ sed \
+ -e "/NE_REQUIRE_VERSIONS/s/29/& 30/" \
+ -e "s:lib/neon/Makefile lib/intl/Makefile ::" \
+ -i configure.ac || die "sed configure.ac failed"
+ sed -e "s/^\(SUBDIRS.*=\).*/\1/" -i Makefile.in || die "sed Makefile.in failed"
+ cp /usr/share/gettext/po/Makefile.in.in po || die "cp failed"
AT_M4DIR="m4 m4/neon" eautoreconf
}