eva 15/06/23 11:52:00 Modified: ChangeLog phodav-2.0-r1.ebuild Log: Fix parallel install with locales, bug #551530. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key C6085806)
Revision Changes Path 1.12 net-libs/phodav/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/phodav/ChangeLog?rev=1.12&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/phodav/ChangeLog?rev=1.12&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/phodav/ChangeLog?r1=1.11&r2=1.12 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-libs/phodav/ChangeLog,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ChangeLog 8 Jun 2015 22:01:37 -0000 1.11 +++ ChangeLog 23 Jun 2015 11:52:00 -0000 1.12 @@ -1,6 +1,10 @@ # ChangeLog for net-libs/phodav # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/phodav/ChangeLog,v 1.11 2015/06/08 22:01:37 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/phodav/ChangeLog,v 1.12 2015/06/23 11:52:00 eva Exp $ + + 23 Jun 2015; Gilles Dartiguelongue <e...@gentoo.org> phodav-2.0-r1.ebuild, + +files/phodav-2.0-slot.patch: + Fix parallel install with locales, bug #551530. *phodav-2.0-r1 (08 Jun 2015) 1.2 net-libs/phodav/phodav-2.0-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/phodav/phodav-2.0-r1.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/phodav/phodav-2.0-r1.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/phodav/phodav-2.0-r1.ebuild?r1=1.1&r2=1.2 Index: phodav-2.0-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-libs/phodav/phodav-2.0-r1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- phodav-2.0-r1.ebuild 8 Jun 2015 22:01:37 -0000 1.1 +++ phodav-2.0-r1.ebuild 23 Jun 2015 11:52:00 -0000 1.2 @@ -1,12 +1,12 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/phodav/phodav-2.0-r1.ebuild,v 1.1 2015/06/08 22:01:37 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/phodav/phodav-2.0-r1.ebuild,v 1.2 2015/06/23 11:52:00 eva Exp $ EAPI="5" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" -inherit gnome2 systemd udev +inherit autotools gnome2 systemd udev DESCRIPTION="WebDav server implementation using libsoup" HOMEPAGE="https://wiki.gnome.org/phodav"; @@ -32,9 +32,6 @@ src_prepare() { # Make doc parallel installable cd "${S}"/doc/reference - sed -e "s/\(DOC_MODULE.*=\).*/\1${PN}-${SLOT}/" \ - -e "s/\(DOC_MAIN_SGML_FILE.*=\).*/\1${PN}-docs-${SLOT}.sgml/" \ - -i Makefile.am Makefile.in || die sed -e "s/\(<book.*name=\"\)${PN}/\1${PN}-${SLOT}/" \ -i html/${PN}.devhelp2 || die mv ${PN}-docs{,-${SLOT}}.sgml || die @@ -43,6 +40,10 @@ mv html/${PN}{,-${SLOT}}.devhelp2 cd "${S}" + # Fix locale slottability, from master + epatch "${FILESDIR}"/${P}-slot.patch + eautoreconf + gnome2_src_prepare }
