Fix building with gettext-0.18 (bug #321915).

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

diff --git a/net-misc/cadaver/ChangeLog b/net-misc/cadaver/ChangeLog
index 5302121eca7d2d9cc1a94612ad70ab23a9a18a51..290be5470e48f8655f37e998d85c6e43f11b028c 100644 (file)
--- 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/Manifest b/net-misc/cadaver/Manifest
index cccb788991c92ebe810d6401b6c6f007b9571c86..253aa669f9f3ca0ce2bf29c477795a6550e142f9 100644 (file)
--- a/net-misc/cadaver/Manifest
+++ b/net-misc/cadaver/Manifest
@@ -1,7 +1,5 @@
 AUX cadaver-0.23.2-disable-nls.patch 399 RMD160 fc8c478b62a6a37c3b506f38f62e570b44a4355d SHA1 c984533fccb8b886c24bc0287f3a1e24e3a6705c SHA256 b9ece3e63b6fa3138c3291f84c2923a74fb275f58e4db77bc8c682e3faf6420c
-DIST cadaver-0.23.2.tar.gz 757303 RMD160 6fe51ca3c05e0d8fd02c51863002a29db54ab4d3 SHA1 051c70a27f4b185ebf47da3e5fd99eb9c980585a SHA256 9885511fe98c389a57e04d9d72334ac3b0752534e88710b0623b2f6aa9015844
 DIST cadaver-0.23.3.tar.gz 831884 RMD160 104f687cfd121b091ba2f509b37574509b4ffabd SHA1 4ad8ea2341b77e7dee26b46e4a8a496f1a2962cd SHA256 fd4ce68a3230ba459a92bcb747fc6afa91e46d803c1d5ffe964b661793c13fca
-EBUILD cadaver-0.23.2.ebuild 1056 RMD160 1b9605521081a4c5ab8c3415eb728efd75c3b6c2 SHA1 1b20d3dd69b859f8fa1aafce640b1c0543b55557 SHA256 aa8b9bf3173f63761036120168f88713c69cee60ff7120e3e3c9d31670200edc
-EBUILD cadaver-0.23.3.ebuild 1021 RMD160 6dd075940df3b0a85d29fcb989f836c288080426 SHA1 bd15650b17e6ca911becd1113570f58725be1288 SHA256 f90c483561cbcaa8ef5c2c91f3602d42e43de129110103e4428720d74d2b7aa9
-MISC ChangeLog 5466 RMD160 4eb8723038fe911e37687eac590e06a476b876f1 SHA1 77f7cb3163e2d2ea2b37a14ddf626bda22b78ae1 SHA256 39c16b21d96408231bd1e7882c8968fae0cd0a3fc364e4ac7b6e1cefef44487f
+EBUILD cadaver-0.23.3.ebuild 1177 RMD160 9859fe302d2d16e2eb96ee1b4c27632692ebba37 SHA1 6020077a742585dee1d50f50fa4eb28a67a47c1a SHA256 fefb864a93df14b014cfc8614e810249dc441537640a08cd255543ea5e67aa99
+MISC ChangeLog 5613 RMD160 6ef303cff679f6fc8d80c922d8d8d2c449091620 SHA1 873d8b391c159c2a8a1adb6a5f4354f48dbeeb76 SHA256 26b4153bb9631a1a2dcbf03380d88b0aebe28d49f05fdace7987b432906722e4
 MISC metadata.xml 278 RMD160 bbc1c0098322bba7d2edbf4d41f05e1c010026c2 SHA1 1dcc071f84b18baeca49a6a29ab79a44ac18baa0 SHA256 2b995d31dcd9de1724232025cd606514b27a59bb28a9d6b6bcc8ac42c4cb9e9d

diff --git a/net-misc/cadaver/cadaver-0.23.3.ebuild b/net-misc/cadaver/cadaver-0.23.3.ebuild
index 2b16fe793d12382b0a9e0ed6db6eb6ab38067772..73a2e6c3461e5140f31b87214581af3394c92838 100644 (file)
--- 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
 }