Revision bump: EAPI 5, add test USE-flag in IUSE explicitly to prevent failure in src_compile, fix underlinking wrt bug #481764

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

3 files changed, 160 insertions, 17 deletions

diff --git a/dev-cpp/xsd/ChangeLog b/dev-cpp/xsd/ChangeLog
index 1367c2767243..ef062d189d53 100644
--- a/dev-cpp/xsd/ChangeLog
+++ b/dev-cpp/xsd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-cpp/xsd
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/xsd/ChangeLog,v 1.11 2013/04/02 20:56:02 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/xsd/ChangeLog,v 1.12 2014/01/20 13:05:41 pinkbyte Exp $
+
+*xsd-3.3.0-r2 (20 Jan 2014)
+
+  20 Jan 2014; Sergey Popov <pinkbyte@gentoo.org> +xsd-3.3.0-r2.ebuild:
+  Revision bump: EAPI 5, add test USE-flag in IUSE explicitly to prevent
+  failure in src_compile, fix underlinking wrt bug #481764
 
   02 Apr 2013; Agostino Sarubbo <ago@gentoo.org> xsd-3.3.0.ebuild:
   Stable for ppc64, wrt bug #462890
diff --git a/dev-cpp/xsd/Manifest b/dev-cpp/xsd/Manifest
index 01c024ba357e..5fc85fd36413 100644
--- a/dev-cpp/xsd/Manifest
+++ b/dev-cpp/xsd/Manifest
@@ -8,23 +8,18 @@ AUX 3.3.0-fix_tests.patch 518 SHA256 c108b896b1c3a3f4da115a89c2e1ef3593a4aaef106
 AUX 3.3.0-xsdcxx-rename.patch 3825 SHA256 d0b9193d9501c6d1d718a3b45de8d6e2a0e20ce11b6f68a4d73d2f77dbe3ceca SHA512 74fb8b0a7dfe9264c50b8ad9f9709b6d9da0b6569b6be964f7d82215c8af93ad68fe1e8f19666137dc891896824792c4f9dc5b5df8f185341d4d7e2fcbb3e8e5 WHIRLPOOL f020a4273f7a81cb7d80deb2137f70b59ffc0b22817c9b91c21267cd1904114edb18dea2e3e8ec2c8e8e7857d4e299c3d9a8cb35850869bdcff296e5a6bcc7ce
 DIST xsd-3.3.0.tar.bz2 999479 SHA256 6157e3b0f3108f69a8d9344956020c234841d4a1de28745b19e45f8ee34b0c66 SHA512 4e7d18d71b362c4b67ad70c59c68d9be4a5f7210c94306c1685c2991a5eb82496675ac0c53f2919237e658d2e1fcf7e1bf5abe295127c7cf175c8eed090a8570 WHIRLPOOL 70b4767c463d4c5be65f8757e519a98a3c9dbc00f9a8a86026bdba5115eae5c5c7008ea05709ba293a68ab8de718b070cc0b4f6390f5bac62dca5f8a63480341
 EBUILD xsd-3.3.0-r1.ebuild 3822 SHA256 dc35ab11bb1204c840eb50f5685904e824d14570b1ca5d9c086851e96443d8e8 SHA512 2c061dce2f30036614ec3d313b50b25ab571ee65e17b147e07d2678b9c9c3e977ef918ea1c2c120c0f0ea22fd2c1c6d304f5b44b3d83ab0fe3425bcfbbe1ff05 WHIRLPOOL e9ccfb7c2973bff8f05aed0ab28a15da753bd134e66abadad6e4bae8f126cebfdeabfb6206a479e2b1329c704db7ede32beb0f75af0bba3bad1144a89c829670
+EBUILD xsd-3.3.0-r2.ebuild 3832 SHA256 e12c681296efac3897fba215c10259a7d45654f5a82099d75f8e42ccfa770a6c SHA512 c98f269d05f95d23a9903a819eccfbd0a7c1d41f08e285d48c2bd5dfae71c10c00cd5e3d7f2c3cf24008473cf7051fb0bdcbc00ff34906ae7cbb870b9adedd66 WHIRLPOOL 562588b224f86e79d7a895043fdf6939530a39146861cd33c921a3717d324296383b96e3fe0a8706b5c599ae8fff2b8dccc03754090aa4275c13a170a29eb607
 EBUILD xsd-3.3.0.ebuild 4146 SHA256 399707aa5b3f4ce3b76b8bafb0156f9862a9973ba48d9a241ae55833104eaba0 SHA512 27567eea51e0abd52432a1b008e981222cc0967780a22fc1fce25f1bef468e5363791d7719d23c637c09a5fa5596a601df098dc51a5d7d78ff757e9865b3d62a WHIRLPOOL c8e3161f9dad8e920b4a6ef3bd3a821cf93f8c7aac5503ee2da272cda11f1523d3ca2dd5e61a3fdab336e166dcf6b80e144fb67727ba70d77852463a9668c6c1
-MISC ChangeLog 1734 SHA256 4f7a4f2d44d955fa16f309e913843ef57dec71c593d6ff163efeb7de1e704d5b SHA512 88399572a74777d8fb6a398cae1de4237bb0179776329d83637855369947f8c306f42dc99cda872a436dc267285d30f15dd8fa42523f2ba9b6b0ec17b9d105d8 WHIRLPOOL e7406a133e5ba0c3dfa6170c658d04c4abfbf225ab75c45af14ebef08095d4db26fe41322cc224952141c915b8ab1bde4662691c69be6a3d6bed65f9d26bfe27
+MISC ChangeLog 1973 SHA256 ac2e94dfac8c8bc562adb4c224db42049521fccb5f98ed3d43c318af8b08a5fb SHA512 94aa99396da1fb2a155722cc2b48ac8e452c42205dadb89d94192bc0a1e769a5d46292bfe2cd18b864abab886cd678f22a7b8c40345aca3e1d375419da3194bd WHIRLPOOL 908376b8f8049ec67bf10ea671388dbe45fe8e6e51591067c62454c589dfdd76c0824315ec50bba602d649612e2b7bbf6c234c6ea85812f6aba049f9432d6a60
 MISC metadata.xml 335 SHA256 3c49f7ca9d13a17bbe874ce93eb199e7c5d185fc063f34920e056e0d37dfa06d SHA512 e963a4fdc96d86ef48f4a61bc4ba127832d37eea26ad335455be64fa954b8a24b1d0c8ea35d273466c339e03423b4fdb4aa4989909a062efaf12c6336f3b983d WHIRLPOOL ff628441272080415185657a1dfc35a17b9b0a7682da68c8c579142734f33da52afac311d10abcee61f01549a6d63feaf8618a8c870064e69b7b0cbb9ccc9e69
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRW0XlAAoJELp701BxlEWfXjoQAMbdH6smOkiqnkiM2WGAVCep
-01BiwBBnOMzzWPIwtvdP2gTvOsoHhUuvjNzw3d0fqc+Cu2nyAHRkhEBxd1DDJ5Ek
-nPO65yoVYrpRnOrud+hTHjI9htBb3j5o64znSo52KnnA0C7dzNNqjXOKy0jfxYu9
-rKbRhvqez2h5GTfKQOL3jRBBqmyZyoiIyaZLdFmSTFz9jjZpQXp7RXYg5LlTu8/e
-l3KcNX4mxurFRMDIlzt1G3Q39l2ajh+pV9FVoHVsro7HeDP3ss6GOAA8Eg1cGv/o
-hfWZDxoEWkkPRePI88gvQDKmG8RofgHRW7+MbtHN8T7HHpEtlSFB52kFhxvAOeWp
-kkSFz2o6RCBlmRxHA5hXpff7yJudlQRkgAHOEzqjcbQcfAQcj12TKkWZwIW2NTOX
-XBdBcAMUGZ0MMoLsZznb7N169bX9VCPI4BPd7LaxsNeJ/nmEjRipBkxe/15N3xkA
-LnYdS6gmssxB/MycBSds+/Dw6BUhzVVbK9iXWLhSwrMOZH8YHg257Q/oX1oii+q7
-YUlqBNlLCeYusQGU5pPAqAgjjwg9dQBUC/od4kFXIPiqroJ8eqwYjxKY03Gcrz9F
-tzeJc4lbezMfUVPdqE+Sij7eyOdmhUvSG/oTN2vquOTM8bwaV88lxuXURDcZsHX1
-mLrjLyRgR1hL7cSMIjV6
-=YRB2
+iQEcBAEBCAAGBQJS3R8jAAoJECo/aRed9267JJYH/AyCMaSNWQ1BEl1Kg15RZHkm
+kNqgTSBaKvbXTONN43AeY6H5MrhQD0BNEmXPA9OEue5PXLxQZzvptcduVa58vs5K
+3P69NmWVTdNrbmNmhZ/iytUZ8c2c5bklxXS5n3tPkasVS4iyL9imtOdn8RT11QYL
+AhTsvMaso2hNKaE4b4Z/BcTn8SragSGNBY44qFmnj1zABjCGB57dXdkd6+J5pTa1
+B9YcHpQ624e73tT9QRrlknyGCOiKnhMUsKWvTq12BXu4n5G0Dgeun2OEDxWBzHss
+XAjEMutYercBhjGj7t+An10/Grah1dav3gL6l3mbGBYbYXwaHdumkjnTCnlanWI=
+=OJjm
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/xsd/xsd-3.3.0-r2.ebuild b/dev-cpp/xsd/xsd-3.3.0-r2.ebuild
new file mode 100644
index 000000000000..badbe2a8c87c
--- /dev/null
+++ b/dev-cpp/xsd/xsd-3.3.0-r2.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/xsd/xsd-3.3.0-r2.ebuild,v 1.1 2014/01/20 13:05:41 pinkbyte Exp $
+
+EAPI=5
+
+inherit toolchain-funcs eutils versionator
+
+DESCRIPTION="An open-source, cross-platform W3C XML Schema to C++ data binding compiler."
+HOMEPAGE="http://www.codesynthesis.com/products/xsd/"
+SRC_URI="http://www.codesynthesis.com/download/${PN}/$(get_version_component_range 1-2)/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="ace doc examples test zlib"
+
+RDEPEND=">=dev-libs/xerces-c-3
+	>=dev-libs/boost-1.52.0-r1[threads]
+	>=dev-cpp/libcult-1.4.6-r1
+	>=dev-cpp/libxsd-frontend-1.18.0-r1
+	>=dev-cpp/libbackend-elements-1.7.2
+	ace? ( dev-libs/ace )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	dev-util/build
+	doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${PV}-disable_examples_and_tests.patch" \
+		"${FILESDIR}/${PV}-xsdcxx-rename.patch" \
+		"${FILESDIR}/${PV}-fix_include.patch" \
+		"${FILESDIR}/${PV}-fix_tests.patch" \
+		"${FILESDIR}/${PV}-boost-filesystem-v2-deprecation.patch"
+}
+
+src_configure() {
+	# Maintainer notes:
+	# * xqilla is not required, this is only whether or not to include the xpath
+	#   examples which require xqilla
+	mkdir -p \
+		build/cxx/gnu \
+		build/import/lib{ace,boost,cult,backend-elements,xerces-c,xqilla,xsd-frontend,z}
+
+	cat >> build/configuration-dynamic.make <<- EOF
+xsd_with_zlib := $(usex zlib y n)
+xsd_with_ace := $(usex ace y n)
+xsd_with_xdr := y
+xsd_with_dbxml := n
+xsd_with_xqilla := y
+xsd_with_boost_date_time := y
+xsd_with_boost_serialization := y
+	EOF
+
+	cat >> build/cxx/configuration-dynamic.make <<- EOF
+cxx_id       := gnu
+cxx_optimize := n
+cxx_debug    := n
+cxx_rpath    := n
+cxx_pp_extra_options :=
+cxx_extra_options    := ${CXXFLAGS}
+cxx_ld_extra_options := ${LDFLAGS}
+cxx_extra_libs       :=
+cxx_extra_lib_paths  :=
+	EOF
+
+	cat >> build/cxx/gnu/configuration-dynamic.make <<- EOF
+cxx_gnu := $(tc-getCXX)
+cxx_gnu_libraries :=
+cxx_gnu_optimization_options :=
+	EOF
+
+	cat >> build/import/libace/configuration-dynamic.make <<- EOF
+libace_installed := y
+	EOF
+
+	cat >> build/import/libbackend-elements/configuration-dynamic.make <<- EOF
+libbackend_elements_installed := y
+	EOF
+
+	cat >> build/import/libboost/configuration-dynamic.make <<- EOF
+libboost_installed := y
+libboost_system := y
+	EOF
+
+	cat >> build/import/libcult/configuration-dynamic.make <<- EOF
+libcult_installed := y
+	EOF
+
+	cat >> build/import/libxerces-c/configuration-dynamic.make <<- EOF
+libxerces_c_installed := y
+	EOF
+
+	cat >> build/import/libxqilla/configuration-dynamic.make <<- EOF
+libxqilla_installed := y
+	EOF
+
+	cat >> build/import/libxsd-frontend/configuration-dynamic.make <<- EOF
+libxsd_frontend_installed := y
+	EOF
+
+	cat >> build/import/libz/configuration-dynamic.make <<- EOF
+libz_installed := y
+	EOF
+
+	MAKEOPTS+=" verbose=1"
+}
+
+src_compile() {
+	default
+	if use doc ; then
+		emake -C "${S}/documentation/cxx/tree/reference" || die "generating reference docs failed"
+	fi
+	if use test ; then
+		XERCESC_NLS_HOME="${ROOT}usr/share/xerces-c/msg" emake -C "${S}/tests" || die "building tests failed"
+	fi
+}
+
+src_install() {
+	emake install_prefix="${D}/usr" install || die "emake install failed"
+
+	# Renaming binary/manpage to avoid collision with mono-2.0's xsd/xsd2
+	mv "${D}"/usr/bin/xsd{,cxx}
+	mv "${D}"/usr/share/man/man1/xsd{,cxx}.1
+
+	rm -rf "${D}/usr/share/doc"
+
+	dohtml -r -A xhtml -A pdf documentation/*
+
+	dodoc NEWS README FLOSSE documentation/custom-literals.xsd
+	newdoc libxsd/README README.libxsd
+	newdoc libxsd/FLOSSE FLOSSE.libxsd
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
+
+src_test() {
+	XERCESC_NLS_HOME="${ROOT}usr/share/xerces-c/msg" emake -C "${S}/tests" test || die "tests failed"
+}