| 1 |
eva 15/06/23 11:52:00 |
| 2 |
|
| 3 |
Modified: ChangeLog phodav-2.0-r1.ebuild |
| 4 |
Log: |
| 5 |
Fix parallel install with locales, bug #551530. |
| 6 |
|
| 7 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key C6085806) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.12 net-libs/phodav/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/phodav/ChangeLog?rev=1.12&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/phodav/ChangeLog?rev=1.12&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/phodav/ChangeLog?r1=1.11&r2=1.12 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/phodav/ChangeLog,v |
| 19 |
retrieving revision 1.11 |
| 20 |
retrieving revision 1.12 |
| 21 |
diff -u -r1.11 -r1.12 |
| 22 |
--- ChangeLog 8 Jun 2015 22:01:37 -0000 1.11 |
| 23 |
+++ ChangeLog 23 Jun 2015 11:52:00 -0000 1.12 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for net-libs/phodav |
| 26 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-libs/phodav/ChangeLog,v 1.11 2015/06/08 22:01:37 eva Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/phodav/ChangeLog,v 1.12 2015/06/23 11:52:00 eva Exp $ |
| 29 |
+ |
| 30 |
+ 23 Jun 2015; Gilles Dartiguelongue <eva@g.o> phodav-2.0-r1.ebuild, |
| 31 |
+ +files/phodav-2.0-slot.patch: |
| 32 |
+ Fix parallel install with locales, bug #551530. |
| 33 |
|
| 34 |
*phodav-2.0-r1 (08 Jun 2015) |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.2 net-libs/phodav/phodav-2.0-r1.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/phodav/phodav-2.0-r1.ebuild?rev=1.2&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/phodav/phodav-2.0-r1.ebuild?rev=1.2&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/phodav/phodav-2.0-r1.ebuild?r1=1.1&r2=1.2 |
| 44 |
|
| 45 |
Index: phodav-2.0-r1.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/phodav/phodav-2.0-r1.ebuild,v |
| 48 |
retrieving revision 1.1 |
| 49 |
retrieving revision 1.2 |
| 50 |
diff -u -r1.1 -r1.2 |
| 51 |
--- phodav-2.0-r1.ebuild 8 Jun 2015 22:01:37 -0000 1.1 |
| 52 |
+++ phodav-2.0-r1.ebuild 23 Jun 2015 11:52:00 -0000 1.2 |
| 53 |
@@ -1,12 +1,12 @@ |
| 54 |
# Copyright 1999-2015 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/net-libs/phodav/phodav-2.0-r1.ebuild,v 1.1 2015/06/08 22:01:37 eva Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/phodav/phodav-2.0-r1.ebuild,v 1.2 2015/06/23 11:52:00 eva Exp $ |
| 58 |
|
| 59 |
EAPI="5" |
| 60 |
GCONF_DEBUG="no" |
| 61 |
GNOME2_LA_PUNT="yes" |
| 62 |
|
| 63 |
-inherit gnome2 systemd udev |
| 64 |
+inherit autotools gnome2 systemd udev |
| 65 |
|
| 66 |
DESCRIPTION="WebDav server implementation using libsoup" |
| 67 |
HOMEPAGE="https://wiki.gnome.org/phodav" |
| 68 |
@@ -32,9 +32,6 @@ |
| 69 |
src_prepare() { |
| 70 |
# Make doc parallel installable |
| 71 |
cd "${S}"/doc/reference |
| 72 |
- sed -e "s/\(DOC_MODULE.*=\).*/\1${PN}-${SLOT}/" \ |
| 73 |
- -e "s/\(DOC_MAIN_SGML_FILE.*=\).*/\1${PN}-docs-${SLOT}.sgml/" \ |
| 74 |
- -i Makefile.am Makefile.in || die |
| 75 |
sed -e "s/\(<book.*name=\"\)${PN}/\1${PN}-${SLOT}/" \ |
| 76 |
-i html/${PN}.devhelp2 || die |
| 77 |
mv ${PN}-docs{,-${SLOT}}.sgml || die |
| 78 |
@@ -43,6 +40,10 @@ |
| 79 |
mv html/${PN}{,-${SLOT}}.devhelp2 |
| 80 |
cd "${S}" |
| 81 |
|
| 82 |
+ # Fix locale slottability, from master |
| 83 |
+ epatch "${FILESDIR}"/${P}-slot.patch |
| 84 |
+ eautoreconf |
| 85 |
+ |
| 86 |
gnome2_src_prepare |
| 87 |
} |
Archives