| 1 |
eva 09/05/31 17:37:14 |
| 2 |
|
| 3 |
Modified: libxml2-2.7.3-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Do not install 3 different documentation directories, bug #248127. |
| 6 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 dev-libs/libxml2/libxml2-2.7.3-r1.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libxml2/libxml2-2.7.3-r1.ebuild?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libxml2/libxml2-2.7.3-r1.ebuild?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libxml2/libxml2-2.7.3-r1.ebuild?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: libxml2-2.7.3-r1.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.7.3-r1.ebuild,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- libxml2-2.7.3-r1.ebuild 27 Apr 2009 21:28:46 -0000 1.1 |
| 22 |
+++ libxml2-2.7.3-r1.ebuild 31 May 2009 17:37:14 -0000 1.2 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2009 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.7.3-r1.ebuild,v 1.1 2009/04/27 21:28:46 eva Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.7.3-r1.ebuild,v 1.2 2009/05/31 17:37:14 eva Exp $ |
| 28 |
|
| 29 |
inherit libtool flag-o-matic eutils python |
| 30 |
|
| 31 |
@@ -60,6 +60,8 @@ |
| 32 |
# --with-mem-debug causes unusual segmentation faults (bug #105120). |
| 33 |
|
| 34 |
local myconf="--with-zlib \ |
| 35 |
+ --with-html-subdir=${PF}/html \ |
| 36 |
+ --docdir=/usr/share/doc/${PF} \ |
| 37 |
$(use_with debug run-debug) \ |
| 38 |
$(use_with python) \ |
| 39 |
$(use_with readline) \ |
| 40 |
@@ -89,18 +91,29 @@ |
| 41 |
} |
| 42 |
|
| 43 |
src_install() { |
| 44 |
- emake DESTDIR="${D}" install || die "Installation failed" |
| 45 |
+ emake DESTDIR="${D}" \ |
| 46 |
+ EXAMPLES_DIR=/usr/share/doc/${PF}/examples \ |
| 47 |
+ docsdir=/usr/share/doc/${PF}/python \ |
| 48 |
+ exampledir=/usr/share/doc/${PF}/python/examples \ |
| 49 |
+ install || die "Installation failed" |
| 50 |
|
| 51 |
dodoc AUTHORS ChangeLog Copyright NEWS README* TODO* || die "dodoc failed" |
| 52 |
+ rm "${D}"/usr/share/doc/${P}/Copyright |
| 53 |
+ rm -rf "${D}"/usr/share/doc/${P} |
| 54 |
+ |
| 55 |
+ if ! use python; then |
| 56 |
+ rm -rf "${D}"/usr/share/doc/${PF}/python |
| 57 |
+ rm -rf "${D}"/usr/share/doc/${PN}-python-${PV} |
| 58 |
+ fi |
| 59 |
|
| 60 |
if ! use doc; then |
| 61 |
rm -rf "${D}"/usr/share/gtk-doc |
| 62 |
- rm -rf "${D}"/usr/share/doc/${P}/html |
| 63 |
+ rm -rf "${D}"/usr/share/doc/${PF}/html |
| 64 |
fi |
| 65 |
|
| 66 |
if ! use examples; then |
| 67 |
- rm -rf "${D}/usr/share/doc/${P}/examples" |
| 68 |
- rm -rf "${D}/usr/share/doc/${PN}-python-${PV}/examples" |
| 69 |
+ rm -rf "${D}/usr/share/doc/${PF}/examples" |
| 70 |
+ rm -rf "${D}/usr/share/doc/${PF}/python/examples" |
| 71 |
fi |
| 72 |
} |
| 73 |
|
| 74 |
|
| 75 |
|
| 76 |
|
| 77 |
1.265 dev-libs/libxml2/ChangeLog |
| 78 |
|
| 79 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libxml2/ChangeLog?rev=1.265&view=markup |
| 80 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libxml2/ChangeLog?rev=1.265&content-type=text/plain |
| 81 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libxml2/ChangeLog?r1=1.264&r2=1.265 |
| 82 |
|
| 83 |
Index: ChangeLog |
| 84 |
=================================================================== |
| 85 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v |
| 86 |
retrieving revision 1.264 |
| 87 |
retrieving revision 1.265 |
| 88 |
diff -u -r1.264 -r1.265 |
| 89 |
--- ChangeLog 27 Apr 2009 21:28:46 -0000 1.264 |
| 90 |
+++ ChangeLog 31 May 2009 17:37:14 -0000 1.265 |
| 91 |
@@ -1,6 +1,10 @@ |
| 92 |
# ChangeLog for dev-libs/libxml2 |
| 93 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 94 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.264 2009/04/27 21:28:46 eva Exp $ |
| 95 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.265 2009/05/31 17:37:14 eva Exp $ |
| 96 |
+ |
| 97 |
+ 31 May 2009; Gilles Dartiguelongue <eva@g.o> |
| 98 |
+ libxml2-2.7.3-r1.ebuild: |
| 99 |
+ Do not install 3 different documentation directories, bug #248127. |
| 100 |
|
| 101 |
*libxml2-2.7.3-r1 (27 Apr 2009) |
Archives