| 1 |
pacho 11/02/12 11:27:22 |
| 2 |
|
| 3 |
Modified: ChangeLog libxml2-2.7.8.ebuild |
| 4 |
Log: |
| 5 |
Apply fixes for PREFIX support (bug #317891), thanks a lot to Fabian Groffen for the patch. |
| 6 |
|
| 7 |
(Portage version: 2.1.9.39/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.297 dev-libs/libxml2/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libxml2/ChangeLog?rev=1.297&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libxml2/ChangeLog?rev=1.297&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libxml2/ChangeLog?r1=1.296&r2=1.297 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v |
| 19 |
retrieving revision 1.296 |
| 20 |
retrieving revision 1.297 |
| 21 |
diff -u -r1.296 -r1.297 |
| 22 |
--- ChangeLog 11 Feb 2011 17:30:19 -0000 1.296 |
| 23 |
+++ ChangeLog 12 Feb 2011 11:27:21 -0000 1.297 |
| 24 |
@@ -1,6 +1,12 @@ |
| 25 |
# ChangeLog for dev-libs/libxml2 |
| 26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.296 2011/02/11 17:30:19 pacho Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.297 2011/02/12 11:27:21 pacho Exp $ |
| 29 |
+ |
| 30 |
+ 12 Feb 2011; Pacho Ramos <pacho@g.o> |
| 31 |
+ +files/libxml2-2.7.1-catalog_path.patch, +files/libxml2-2.7.2-winnt.patch, |
| 32 |
+ libxml2-2.7.8.ebuild: |
| 33 |
+ Apply fixes for PREFIX support (bug #317891), thanks a lot to Fabian Groffen |
| 34 |
+ for the patch. |
| 35 |
|
| 36 |
*libxml2-2.7.8 (11 Feb 2011) |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.2 dev-libs/libxml2/libxml2-2.7.8.ebuild |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libxml2/libxml2-2.7.8.ebuild?rev=1.2&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libxml2/libxml2-2.7.8.ebuild?rev=1.2&content-type=text/plain |
| 45 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libxml2/libxml2-2.7.8.ebuild?r1=1.1&r2=1.2 |
| 46 |
|
| 47 |
Index: libxml2-2.7.8.ebuild |
| 48 |
=================================================================== |
| 49 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.7.8.ebuild,v |
| 50 |
retrieving revision 1.1 |
| 51 |
retrieving revision 1.2 |
| 52 |
diff -u -r1.1 -r1.2 |
| 53 |
--- libxml2-2.7.8.ebuild 11 Feb 2011 17:30:19 -0000 1.1 |
| 54 |
+++ libxml2-2.7.8.ebuild 12 Feb 2011 11:27:21 -0000 1.2 |
| 55 |
@@ -1,19 +1,19 @@ |
| 56 |
# Copyright 1999-2011 Gentoo Foundation |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.7.8.ebuild,v 1.1 2011/02/11 17:30:19 pacho Exp $ |
| 59 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.7.8.ebuild,v 1.2 2011/02/12 11:27:21 pacho Exp $ |
| 60 |
|
| 61 |
EAPI="3" |
| 62 |
SUPPORT_PYTHON_ABIS="1" |
| 63 |
RESTRICT_PYTHON_ABIS="3.* *-jython" |
| 64 |
|
| 65 |
-inherit libtool flag-o-matic eutils python autotools |
| 66 |
+inherit libtool flag-o-matic eutils python autotools prefix |
| 67 |
|
| 68 |
DESCRIPTION="Version 2 of the library to manipulate XML files" |
| 69 |
HOMEPAGE="http://www.xmlsoft.org/" |
| 70 |
|
| 71 |
LICENSE="MIT" |
| 72 |
SLOT="2" |
| 73 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" |
| 74 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" |
| 75 |
IUSE="debug doc examples icu ipv6 python readline test" |
| 76 |
|
| 77 |
XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" |
| 78 |
@@ -56,6 +56,12 @@ |
| 79 |
} |
| 80 |
|
| 81 |
src_prepare() { |
| 82 |
+ # Patches needed for prefix support |
| 83 |
+ epatch "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch |
| 84 |
+ epatch "${FILESDIR}"/${PN}-2.7.2-winnt.patch |
| 85 |
+ |
| 86 |
+ eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c |
| 87 |
+ |
| 88 |
epunt_cxx |
| 89 |
|
| 90 |
# Reactivate the shared library versionning script |
| 91 |
@@ -89,9 +95,9 @@ |
| 92 |
|
| 93 |
# --with-mem-debug causes unusual segmentation faults (bug #105120). |
| 94 |
|
| 95 |
- local myconf="--with-zlib |
| 96 |
+ local myconf="--with-zlib=${EPREFIX}/usr |
| 97 |
--with-html-subdir=${PF}/html |
| 98 |
- --docdir=/usr/share/doc/${PF} |
| 99 |
+ --docdir=${EPREFIX}/usr/share/doc/${PF} |
| 100 |
$(use_with debug run-debug) |
| 101 |
$(use_with icu) |
| 102 |
$(use_with python) |
| 103 |
@@ -111,8 +117,8 @@ |
| 104 |
if use python; then |
| 105 |
python_copy_sources python |
| 106 |
building() { |
| 107 |
- emake PYTHON_INCLUDES="$(python_get_includedir)" \ |
| 108 |
- PYTHON_SITE_PACKAGES="$(python_get_sitedir)" |
| 109 |
+ emake PYTHON_INCLUDES="${EPREFIX}$(python_get_includedir)" \ |
| 110 |
+ PYTHON_SITE_PACKAGES="${EPREFIX}$(python_get_sitedir)" |
| 111 |
} |
| 112 |
python_execute_function -s --source-dir python building |
| 113 |
fi |
| 114 |
@@ -131,15 +137,24 @@ |
| 115 |
|
| 116 |
src_install() { |
| 117 |
emake DESTDIR="${D}" \ |
| 118 |
- EXAMPLES_DIR=/usr/share/doc/${PF}/examples \ |
| 119 |
+ EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples \ |
| 120 |
install || die "Installation failed" |
| 121 |
|
| 122 |
+ # on windows, xmllint is installed by interix libxml2 in parent prefix. |
| 123 |
+ # this is the version to use. the native winnt version does not support |
| 124 |
+ # symlinks, which makes repoman fail if the portage tree is linked in |
| 125 |
+ # from another location (which is my default). -- mduft |
| 126 |
+ if [[ ${CHOST} == *-winnt* ]]; then |
| 127 |
+ rm -rf "${ED}"/usr/bin/xmllint |
| 128 |
+ rm -rf "${ED}"/usr/bin/xmlcatalog |
| 129 |
+ fi |
| 130 |
+ |
| 131 |
if use python; then |
| 132 |
installation() { |
| 133 |
emake DESTDIR="${D}" \ |
| 134 |
- PYTHON_SITE_PACKAGES="$(python_get_sitedir)" \ |
| 135 |
- docsdir=/usr/share/doc/${PF}/python \ |
| 136 |
- exampledir=/usr/share/doc/${PF}/python/examples \ |
| 137 |
+ PYTHON_SITE_PACKAGES="${EPREFIX}$(python_get_sitedir)" \ |
| 138 |
+ docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \ |
| 139 |
+ exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \ |
| 140 |
install |
| 141 |
} |
| 142 |
python_execute_function -s --source-dir python installation |
| 143 |
@@ -173,7 +188,7 @@ |
| 144 |
|
| 145 |
# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not |
| 146 |
# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887. |
| 147 |
- if [ "${EROOT}" != "/" ] |
| 148 |
+ if [ "${ROOT}" != "/" ] |
| 149 |
then |
| 150 |
elog "Skipping XML catalog creation for stage building (bug #208887)." |
| 151 |
else |
| 152 |
@@ -185,7 +200,7 @@ |
| 153 |
# <obz@g.o> |
| 154 |
if [ ! -e ${CATALOG} ]; then |
| 155 |
[ -d "${EROOT}etc/xml" ] || mkdir -p "${EROOT}etc/xml" |
| 156 |
- /usr/bin/xmlcatalog --create > ${CATALOG} |
| 157 |
+ "${EPREFIX}"/usr/bin/xmlcatalog --create > ${CATALOG} |
| 158 |
einfo "Created XML catalog in ${CATALOG}" |
| 159 |
fi |
| 160 |
fi |
Archives