Version bump, fixes compilation with gcc-4.6 (bug #363531). Also fixed compilation...

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

diff --git a/dev-libs/xalan-c/ChangeLog b/dev-libs/xalan-c/ChangeLog
index 1e62ac93bcd0854139c93f901b3e8b9935fd412a..04eb816515b3afd042eebdf0a7f2f068f939c17e 100644 (file)
--- a/dev-libs/xalan-c/ChangeLog
+++ b/dev-libs/xalan-c/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/xalan-c
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xalan-c/ChangeLog,v 1.27 2011/02/25 17:15:29 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xalan-c/ChangeLog,v 1.28 2011/08/04 12:34:59 dev-zero Exp $
+
+*xalan-c-1.11.0_pre1153059 (04 Aug 2011)
+
+  04 Aug 2011; Tiziano Müller <dev-zero@gentoo.org>
+  +xalan-c-1.11.0_pre1153059.ebuild:
+  Version bump, fixes compilation with gcc-4.6 (bug #363531). Also fixed
+  compilation with USE=-nls (bug #373035) and use EAPI-4.
 
   25 Feb 2011; Tiziano Müller <dev-zero@gentoo.org>
   xalan-c-1.11.0_pre797991.ebuild:

diff --git a/dev-libs/xalan-c/Manifest b/dev-libs/xalan-c/Manifest
index 1432aa090b9c473b5ef5a827711d21c2403ecc62..5b52f19ecf8ccad24077f0e824ec817f8f13726f 100644 (file)
--- a/dev-libs/xalan-c/Manifest
+++ b/dev-libs/xalan-c/Manifest
@@ -1,13 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.10.0-as-needed.patch 4022 RMD160 298171f6d3e6b624dc220ad3d8b2f0d00bfb43b4 SHA1 86d2926aa3dcc382b7491bb3e4c7dad707581f25 SHA256 34e4ccbfcbf11748e60dfb98c6ca2e1b47597031cfcea14cb2df3a43289a8e5a
 AUX 1.11.0_pre797991-as-needed.patch 5376 RMD160 1e9f1f5d99110b89152ca0dfb0b05d5aef0aabc4 SHA1 eb0caccb944bb92c4e9d452f8b324f423034d56c SHA256 5fe1a1ef8320f341118ce27467ecab7d19c23db43f66aa8d3d0c2f178d8ed078
 AUX 1.11.0_pre797991-bugfixes.patch 1652 RMD160 3a6c81b2664984a8cfaf821023c9f11a60113ed1 SHA1 7b6325c95e480448ffd54e567c21036c8763164a SHA256 8b5571fea02b1477b2755fc98bd65aca87096de4ca559b2f53409fbeba2a105a
 AUX 1.11.0_pre797991-parallel-build.patch 2714 RMD160 f1e3b6095a20260c07a974eb4d0e9cd6ef3b130b SHA1 329f061a80e7ed882f04ae0d79d7e36d51dd0a9c SHA256 0dc930aee99bafd42b610747f8d0fbe3cf7737ee8f1135ed5156fe5fd272fa30
 AUX xalan-c-1.10.0+gcc-4.3.patch 1359 RMD160 746ad62dd8090ad950f24e03cc1c20a36ca8753a SHA1 b2072937c4433cb4e59b85de264ee87f67e986a6 SHA256 f560a9ca0d6a7b716174492450160df58fa3e8d261d629ebe07e5f632442b344
 DIST Xalan-C_1_10_0-src.tar.gz 1554940 RMD160 537ba0be6a14e47eb4453c2d813b31ec416835ab SHA1 3fc63045048176e0ab00ce8aa0d15b2c1e5d646b SHA256 40797957fb22797894d33a2fa0e01e3b6cc509fb89bb772c0e835ae840714cfd
+DIST Xalan-C_r1153059-src.tar.gz 1573651 RMD160 891f6f8a7bcfd684bed298ce3c39bd25090111a6 SHA1 309e75e0b78e25e94c871a65996bdc52542a9448 SHA256 518d012f550004c760e225bcfb4a040ec93d0797a2d45a6fa25994a9b23636fa
 DIST Xalan-C_r705082-src.tar.gz 1579340 RMD160 e3f4178e794ad63b6d4ccc1369ed100c8938d447 SHA1 176c46d4926b4c21849b6a0422bfba5c8e2d5046 SHA256 8e7d821a1f09fe69258ff436740e755426179150acedb696b3b431682cc8c3f3
 DIST Xalan-C_r797991-src.tar.gz 1569254 RMD160 791776b7d77a8356abba30b145a6e67d5c32870e SHA1 c9079b5e00afd819306c6799848e5981b87ac2f2 SHA256 8b9e192c715b9f9a9af69fcdf11200b35cd2eecbc62d688ad95cbfa9a8cb240e
 EBUILD xalan-c-1.10.0.ebuild 1954 RMD160 052ee4805ef2b89565cfa6dea05e773df691e4d7 SHA1 2509d043390854035ab786359c9998b638a17519 SHA256 6ba8ab64eba70c90e5da587b063c1a88499d2ed4ea3f1917a261352e1a4d49ed
+EBUILD xalan-c-1.11.0_pre1153059.ebuild 2569 RMD160 25b727664602b8e0d5e0a2b9ea86cafb7f48972e SHA1 7dac6961214738511bf6f0db91bfbe3675bfc0af SHA256 48e07a2c0180b33b1f6c12ed8cbafb67b31ad6b0457f7c812765c429f8e861df
 EBUILD xalan-c-1.11.0_pre705082.ebuild 1610 RMD160 cc81d3ed3c407517455ae26d28b5e9a39b46e504 SHA1 aafdcf8cc580ded8a20befdfbc4472ac0ac618f4 SHA256 1e57e4f809f7add66b490e0a1a98d5b9a0e93243f47dce1d558e400fea502056
 EBUILD xalan-c-1.11.0_pre797991.ebuild 2592 RMD160 890088c3c85292d9f276b7c7bed24b41b553eb80 SHA1 54ea55a7ac10221bf78f1fa705276b4ebc02b6a6 SHA256 1abcaf200c633d6893369071cb9b0a17fc827dcc19123101a5a8beb30c6c81a0
-MISC ChangeLog 4460 RMD160 26ac9c03356d308a50e304def3babf59c737a847 SHA1 aae29fa01dbdf215fbabc68e785c872541b8e37c SHA256 f58a4d156027e75f79a34851d4c1c280e24f31157e034cfa2c463817a39f37cf
+MISC ChangeLog 4724 RMD160 532a0732720dfd93fb06ad7534b429a38a85e8b8 SHA1 80b3d7f633bcbb51a829d6bb0789ba39efcbdeef SHA256 9bde34478bdc7ce61d2b340b90f5f79c8b27e336076e2991dba41527546a1db3
 MISC metadata.xml 156 RMD160 537178ef5a820896e97475fb9aded47d50474bef SHA1 2a4ef4879b918a28132d21cd6d1bbaa2a30dccde SHA256 0e8490f9c62cb74e5894b52f643a02de0024d97dbfebad43082dce6bcb39555f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk46kZMACgkQGwVqY66cHjAhJQCdFpTPZObLkli2306qckTElPR0
+KpsAniLiLXnILNh/Oe8vfKgAqdgERYnS
+=pyPM
+-----END PGP SIGNATURE-----

diff --git a/dev-libs/xalan-c/xalan-c-1.11.0_pre1153059.ebuild b/dev-libs/xalan-c/xalan-c-1.11.0_pre1153059.ebuild
new file mode 100644 (file)
index 0000000..30603fa
--- /dev/null
+++ b/dev-libs/xalan-c/xalan-c-1.11.0_pre1153059.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xalan-c/xalan-c-1.11.0_pre1153059.ebuild,v 1.1 2011/08/04 12:34:59 dev-zero Exp $
+
+EAPI="4"
+
+inherit toolchain-funcs eutils flag-o-matic multilib
+
+DESCRIPTION="XSLT processor for transforming XML into HTML, text, or other XML types"
+HOMEPAGE="http://xml.apache.org/xalan-c/"
+SRC_URI="mirror://gentoo/Xalan-C_r${PV#*_pre}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="doc examples nls threads"
+
+RDEPEND=">=dev-libs/xerces-c-2.8.0"
+#      icu? ( dev-libs/icu )"
+DEPEND="${RDEPEND}
+       doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/xml-xalan/c"
+
+pkg_setup() {
+#      export ICUROOT="/usr"
+       export XALANCROOT="${S}"
+}
+
+src_prepare() {
+       epatch \
+               "${FILESDIR}/1.11.0_pre797991-as-needed.patch" \
+               "${FILESDIR}/1.11.0_pre797991-bugfixes.patch" \
+               "${FILESDIR}/1.11.0_pre797991-parallel-build.patch"
+
+       # - do not run configure in runConfigure
+       # - echo the export commands instead exporting the vars
+       # - remove -O3
+       # - make sure our {C,CXX}FLAGS get respected
+       sed -i \
+               -e '/\/configure/d' \
+               -e 's/^export \([a-zA-Z_]*\)/echo export \1=\\"$\1\\"/' \
+               -e 's/\(debugflag\)="-O.\? /\1="/' \
+               -e 's/^\(CXXFLAGS\)="$compileroptions/\1="${\1}/' \
+               -e 's/^\(CFLAGS\)="$compileroptions/\1="${\1}/' \
+               runConfigure || die "sed failed"
+}
+
+src_configure() {
+       export XERCESCROOT="/usr"
+
+       local target="linux"
+       # add more if needed, see xerces-c-2.8.0-r1 ebuild
+
+       local mloader="inmem"
+       use nls && mloader="nls"
+#      use icu && mloader="icu"
+
+       local transcoder="default"
+#      use icu && transcoder="icu"
+
+       local thread="none"
+       use threads && thread="pthread"
+
+       local bitstobuild="32"
+       $(has_m64) && bitstobuild="64"
+
+       ./runConfigure -p ${target} -c "$(tc-getCC)" -x "$(tc-getCXX)" \
+               -m ${mloader} -t ${transcoder} \
+               -r ${thread} -b ${bitstobuild} > configure.vars || die "runConfigure failed"
+
+       eval $(grep export configure.vars)
+
+       default
+}
+
+src_compile() {
+       default
+
+       if use doc ; then
+               mkdir build
+               cd "${S}/xdocs"
+               doxygen DoxyfileXalan
+       fi
+}
+
+src_install() {
+       default
+
+       if use doc ; then
+               dodir /usr/share/doc/${PF}
+               dohtml -r build/docs/apiDocs/*
+       fi
+
+       if use examples ; then
+               insinto /usr/share/doc/${PF}/examples
+               doins -r samples/*
+       fi
+}
+
+pkg_postinst() {
+       ewarn "If you are upgrading you should run"
+       ewarn "    revdep-rebuild --library=libxalan-c.so.110"
+       ewarn "if using portage or"
+       ewarn "    reconcilio --library libxalan-c.so.110"
+       ewarn "if using paludis as your package manager."
+}