x11-libs/qwt: Enhance building static-libs by using multibuild.eclass

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

4 files changed, 228 insertions, 6 deletions

diff --git a/x11-libs/qwt/ChangeLog b/x11-libs/qwt/ChangeLog
index 75f605d50bf0..70e7d282d3fd 100644
--- a/x11-libs/qwt/ChangeLog
+++ b/x11-libs/qwt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/qwt
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.107 2013/03/05 12:56:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.108 2013/03/06 08:37:40 jlec Exp $
+
+*qwt-6.0.2-r2 (06 Mar 2013)
+*qwt-5.2.3-r2 (06 Mar 2013)
+
+  06 Mar 2013; Justin Lecher <jlec@gentoo.org> +qwt-5.2.3-r2.ebuild,
+  +qwt-6.0.2-r2.ebuild:
+  Enhance building static-libs by using multibuild.eclass
 
 *qwt-6.0.2-r1 (05 Mar 2013)
 *qwt-5.2.3-r1 (05 Mar 2013)
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index 8c87ea264792..de049cf36b89 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX qwt-5.2.3-install_qt.patch 963 SHA256 e497e1bdbba7700b28e7cbe99faa196d76115bcfad588495a41f0a05672b5740 SHA512 e4bd767fd0942dbac0a585f4c6b588faa99f1f38d02fe8db6c3be181c7a7c6955abc874df916ed446dde537f6090ca81610ae49ba55766033bd8bd801808e8e9 WHIRLPOOL 1723c57b40061938158977f5ab183caab26b71ed610b5eaef8f90c53596753089719f3a7d345ccc6c6feec86f7ae8f50c7c3154d37bb5b4502a84880d1167d9b
 AUX qwt-6.0.2-invalid-read.patch 9447 SHA256 d063b36170af2c2ca12c44fa283cc1b387b97ce6c53f02f101db45ebed975b43 SHA512 e9912ec60d062bad89ecb74c0342815f8c7b351318df88120e7510e44224f52a1c89e8ab2bcafd6d8c418a7a3e67347b159d174d417cbebf4fa3377191d0f201 WHIRLPOOL 0a71af42f61e605f03c648dd21b74a3b3e6864ca956c9adf84eafe7d98ca6aec49ec23316137ea60a9d0c078f06ec39ac6ae3e02fc217b56b0d3f3f4608564f2
@@ -9,16 +9,18 @@ DIST qwt-6.0.0.tar.bz2 2723203 SHA256 d041d63029ea5f6a64d06be9bfe788e5d8bed8bac1
 DIST qwt-6.0.2.tar.bz2 2688469 SHA256 2e699ac426d96aa14c86e4b7199d6b849c7f65010927ac9cf58f16761ee3281f SHA512 ddf5d50196cf8f3f33a2c935de891474d73b26e529bd4a8873d8c71d7d183242f9289f6ef4a0847c7ca067d30b593d0efc27944f77bb50027df932ea40e19c67 WHIRLPOOL 26e1de7bf7d56ebd72d82ba355a8b74bec289397d3ab70415f69974d7733756635564062a00a93df9763f1f9c14eff19de0aa0b6aec1dd4c098470ecd1381eea
 EBUILD qwt-5.2.1.ebuild 1731 SHA256 410ca2d359f25911e19f2dd6d1f5316ed56b64e186dbc597410c3a59a03e63fc SHA512 f7ed4f67f3222e4b0e25923cfa539447ea85fc821a3d18e156e90916bd031d65b927f617340badcd288a1a5616e6e9d2879860a5d9544d179aa5f9e3ff0731c3 WHIRLPOOL 3f084ea222dc37c4997396ee334029c8edc5b4d23ddf29bdf94222e0108ce489ac441c47293694af8a0fe6458f7a33b89fc338d98ad641c125c4a0ed99d2d098
 EBUILD qwt-5.2.3-r1.ebuild 2316 SHA256 2d60ff3c39d6bd2f9382bb9ce91e0bba097a6355cb575002248960dc85306e55 SHA512 709822df525268bf55d1144ed7c44238e5ed9f6b0a939aedc4d575b928e7287550f5396b8d389a18182e3577520f4c1f4ff859286b51085a72d5aff1244ea9b9 WHIRLPOOL e36a4b89b81befba975e8a5f3ba5705d4d55879d5a1674cd9540017a5ae616fbdbab4ce57f269ccdb3ba7612c428eae31d411617945f2871e0219fd9c36efd74
+EBUILD qwt-5.2.3-r2.ebuild 2658 SHA256 ce0a7ad67de149796a3cd5ea27f67bb39b7ba734ab0a44487454c93789d2ff63 SHA512 dc16ea1164d88305204a976bf3d0b95b225c6dfcc2f56cddabaea22463dcbf9a1ae033d6ba5e880929f0442f5aeeafb4566f14967fcf5c68ba31b6741025a7d4 WHIRLPOOL e34043ae0d1ac5ef624773e09987a6b16876a08725d096fe1d62a65764767fbef26ffe54eb7d29f7e8cc3b9a489a6256d2e7a6ea5d2fdcaa31fc0e8e4208b49e
 EBUILD qwt-5.2.3.ebuild 2115 SHA256 6f638f8a6479b978a776b7a25115f733e6733f2421364a78cdcba3cbd68f8f0e SHA512 d99bdb13652cb82d7ac7791e230f31972285282f84418d925f4b3bd167a4300d7e9339652696e1141ff46d817b29dad98575bfeebd2d880d0243ff63f47dfc72 WHIRLPOOL 87d0bd19a3803053027609cf12d021d10a2399bf60af895e9c674b3e3dc5ba49868e602ab663afdebbae15966d6a3fcbb3840741b55a9a02924650bb61727911
 EBUILD qwt-6.0.0.ebuild 2242 SHA256 a65665ab54e1e6db4c2d7d5a3f7688e07e5f3699bee51ba8b8ff9ca5eb673f5b SHA512 96f9e353dec7319375ad07b49a56164e1bf3236a4f9d1fe1f03beb20a6689c9c2d606a283b43f9a670bff963d4b9feac90e005c5f6cee1a26447d9a9992e1de7 WHIRLPOOL 362a3b10fb1fad2598ed5ec3aee6f78fbc0f48a997b3aff0dde84c59568e9d663b54435e2f0cac7b71c6f93974444eb37ced896daf2f2c2e80b3a3e201d5aab8
 EBUILD qwt-6.0.2-r1.ebuild 2861 SHA256 d9aa1824e0340f1234d41ce4ad6dd726d04b46ff1ea4147dbdee933750d2d765 SHA512 9c50fedabdabcae9511de018ef6ad2a258f7732650bfbae4caac01ddb81c57af095e2bba54de73857fe649a3bb4b69e89e69ec5fb1affd4e7cc9074f44ec59f6 WHIRLPOOL 7278a5a66a8be21eb1cb062e847f2ce3481e2e11c9fdb599adc19063c37e505508e1972f3918a2ce3f97bb5f7bf53668141d6bab3c9da9519af0b201516f053c
+EBUILD qwt-6.0.2-r2.ebuild 3048 SHA256 866d1fae196ca5f8c1ae1daa459074f0b30c6ad559bb29d51d1f08e50a35457f SHA512 9feb25f5c6af425592caa36b95e8ad1882ef7b278a1dac132cfc18bf476ff9df79bafc3cb25f9467c7692841b7745c6c679022e65e5a0a4acd6e3d5e37b32db6 WHIRLPOOL 0145f5a93ca8e348dddd861c77ed8759f79193ca6f3c2df237831542027311ab904aef24604c6159b2d2ee639cbdd06229202d01bf1f82020cc15c7c36acbe8d
 EBUILD qwt-6.0.2.ebuild 2559 SHA256 04c6dd9f29e1fa7cbac94335a2eab3f4b3e3b875bebb35d75e64950c29219ee3 SHA512 46896ebfb91336dc21e4be349870f8faa770cc2be0ea93fe73092c374f688eba2000dd387bb3f1527f1fbafb76b0605b9a3c19e300b902d19cd014f83583b664 WHIRLPOOL 70e7081c9eb7337afa269b823defc4a834b4e4308e0493997f97edd0fcb21337dfb99ead950f9bbedd6e11402a4dbbf9d196b245651aca8805a8e17ed9d7eed1
-MISC ChangeLog 14359 SHA256 fdf84592ecf0b74bcf45762f6896897ef7d65777ea83f02bd52c4d9a53d3fef8 SHA512 68da25bff7b053794169606bc3038e3ea8668c8c9b650cd2ac2f7e5f4ad0b4bbea27307de3e5e6ef758ea5047d60d5b62ef0e1a9232ef33b81d9cd64f8c32dab WHIRLPOOL 86cdaf173b869d7eacde9c71e18448bafac468f8a09e701f99b48a0dfaa4692f0bfe87ed0ae4de9509493c19a08c0bada60302725e3ff7168994ccc3836dcedc
+MISC ChangeLog 14568 SHA256 7ba419c5f23b302cb6b4a6a2f3fca8412811b445694617d0f9dee5906d4cf97d SHA512 234919e1e69f2f4634e9b591c4b3401ac2a43237ddba02efe5ad0582cf11eab310a3a996a79e817b60ad08afee48775713c8c8500f2e091dda8c718cd8a858bf WHIRLPOOL 908e27797a9dab3a2727ec80822ccfc0b7f36a6ecef13cb3b68a456dd8ba8758c06b5ca25bc5b19af46879c3145733d6b7bf0d8546c2277226cd0548dbcc798b
 MISC metadata.xml 615 SHA256 143e1e3cfb374536ae429ca941b781a34060906c17144a72f95c6717c9f9dc91 SHA512 dce756ddd462905a17ff1504eb3615cf652e2da0dae7678689d5880940601a4ecce8dbc2808feb6de9061fbf602c8d8a19d0f17a3ea7e0ec4af38688a9a6d466 WHIRLPOOL e89713d285d300cd40c9691b3e36581d300fc7e5877d8c0c6e0013ea74e761354416e44a5137b2c234b20b2e6fa9e759e6127c9b182628679ce418d695b120de
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAlE168MACgkQgAnW8HDreRYbMACeJWMv5NfTJNAvzA16ex/2Ve/L
-UEIAoJaqDvkBVH7HTQ8IcmEFd+HR/H7A
-=HhiL
+iEYEAREIAAYFAlE3AFUACgkQgAnW8HDreRaFEwCbBibOsu5lRNjkNACx7Tj8bqfS
+KxgAnAo7BCLAAm2xg2EiKW72q3rzW6z5
+=2Jyu
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qwt/qwt-5.2.3-r2.ebuild b/x11-libs/qwt/qwt-5.2.3-r2.ebuild
new file mode 100644
index 000000000000..cf659f9949eb
--- /dev/null
+++ b/x11-libs/qwt/qwt-5.2.3-r2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-5.2.3-r2.ebuild,v 1.1 2013/03/06 08:37:40 jlec Exp $
+
+EAPI=5
+
+inherit eutils multibuild qt4-r2
+
+DESCRIPTION="2D plotting library for Qt4"
+HOMEPAGE="http://qwt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="qwt"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos"
+SLOT="5"
+IUSE="doc examples static-libs svg"
+
+DEPEND="
+	dev-qt/qtgui:4
+	doc? ( !<media-libs/coin-3.1.3[doc] )
+	svg? ( dev-qt/qtsvg:4 )"
+RDEPEND="${DEPEND}"
+
+DOCS="CHANGES README"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-install_qt.patch
+	sed -e "/QwtVersion/s:5.2.2.:${PV}:g" -i ${PN}.prf || die
+
+	cat > qwtconfig.pri <<-EOF
+		target.path = "${EPREFIX}/usr/$(get_libdir)"
+		headers.path = "${EPREFIX}/usr/include/qwt5"
+		doc.path = "${EPREFIX}/usr/share/doc/${PF}"
+		CONFIG += qt warn_on thread release
+		CONFIG += QwtPlot QwtWidgets QwtDesigner
+		VERSION = ${PV}
+		QWT_VERSION = ${PV/_*}
+		QWT_INSTALL_PLUGINS   = "${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer"
+		QWT_INSTALL_FEATURES  = "${EPREFIX}/usr/share/qt4/mkspecs/features"
+	EOF
+	sed -i -e 's/headers doc/headers/' src/src.pro || die
+	use svg && echo >> qwtconfig.pri "CONFIG += QwtSVGItem"
+
+	MULTIBUILD_VARIANTS=( )
+	use static-libs && MULTIBUILD_VARIANTS+=( static )
+	MULTIBUILD_VARIANTS+=( shared )
+
+	qt4-r2_src_prepare
+
+	preparation() {
+		cp -rf "${S}" "${BUILD_DIR}" || die
+		[[ ${MULTIBUILD_VARIANT} == shared ]] && \
+			echo "CONFIG += QwtDll" >> "${BUILD_DIR}"/qwtconfig.pri
+	}
+
+	multibuild_foreach_variant preparation
+}
+
+src_configure() {
+	multibuild_parallel_foreach_variant run_in_build_dir eqmake4 ${PN}.pro
+}
+
+src_compile() {
+	multibuild_foreach_variant run_in_build_dir qt4-r2_src_compile
+}
+
+src_test() {
+	testing() {
+		cd examples || die
+		eqmake4 examples.pro
+		emake
+	}
+	multibuild_foreach_variant run_in_build_dir testing
+}
+
+src_install () {
+	multibuild_foreach_variant run_in_build_dir qt4-r2_src_install
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		rm doc/man/*/*license*
+		doman doc/man/*/*
+		doins -r doc/html
+	fi
+	if use examples; then
+		# don't build examples - fix the qt files to build once installed
+		cat > examples/examples.pri <<-EOF
+			include( qwtconfig.pri )
+			TEMPLATE     = app
+			MOC_DIR      = moc
+			INCLUDEPATH += "${EPREFIX}/usr/include/qwt5"
+			DEPENDPATH  += "${EPREFIX}/usr/include/qwt5"
+			LIBS        += -lqwt
+		EOF
+		sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
+		cp *.pri examples/ || die
+		insinto /usr/share/${PN}
+		doins -r examples
+	fi
+}
diff --git a/x11-libs/qwt/qwt-6.0.2-r2.ebuild b/x11-libs/qwt/qwt-6.0.2-r2.ebuild
new file mode 100644
index 000000000000..d9c53cb3bed4
--- /dev/null
+++ b/x11-libs/qwt/qwt-6.0.2-r2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.0.2-r2.ebuild,v 1.1 2013/03/06 08:37:40 jlec Exp $
+
+EAPI=5
+
+inherit eutils multibuild qt4-r2
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="2D plotting library for Qt4"
+HOMEPAGE="http://qwt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV/_/-}/${MY_P}.tar.bz2"
+
+LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+SLOT="6"
+IUSE="doc examples mathml static-libs svg"
+
+DEPEND="
+	dev-qt/qtgui:4
+	doc? ( !<media-libs/coin-3.1.3[doc] )
+	svg? ( dev-qt/qtsvg:4 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+DOCS="CHANGES README"
+
+PATCHES=( "${FILESDIR}"/${PN}-6.0.2-invalid-read.patch )
+
+src_prepare() {
+	cat > qwtconfig.pri <<-EOF
+		QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)"
+		QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6"
+		QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}"
+		QWT_CONFIG += QwtPlot QwtWidgets QwtDesigner
+		VERSION = ${PV/_*}
+		QWT_VERSION = ${PV/_*}
+		QWT_INSTALL_PLUGINS   = "${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer"
+		QWT_INSTALL_FEATURES  = "${EPREFIX}/usr/share/qt4/mkspecs/features"
+	EOF
+
+	use mathml && echo "QWT_CONFIG += QwtMathML" >> qwtconfig.pri
+	use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
+
+	cat > qwtbuild.pri <<-EOF
+		QWT_CONFIG += qt warn_on thread release no_keywords
+	EOF
+
+	sed \
+		-e 's/target doc/target/' \
+		-e "/^TARGET/s:(qwt):(qwt6):g" \
+		-i src/src.pro || die
+
+	sed \
+		-e '/qwtAddLibrary/s:(qwt):(qwt6):g' \
+		-i qwt.prf designer/designer.pro examples/examples.pri \
+		textengines/mathml/qwtmathml.prf textengines/textengines.pri || die
+
+	MULTIBUILD_VARIANTS=( )
+	use static-libs && MULTIBUILD_VARIANTS+=( static )
+	MULTIBUILD_VARIANTS+=( shared )
+
+	qt4-r2_src_prepare
+
+	preparation() {
+		cp -rf "${S}" "${BUILD_DIR}" || die
+		[[ ${MULTIBUILD_VARIANT} == shared ]] && \
+			echo "QWT_CONFIG += QwtDll" >> "${BUILD_DIR}"/qwtconfig.pri
+	}
+
+	multibuild_foreach_variant preparation
+}
+
+src_configure() {
+	multibuild_parallel_foreach_variant run_in_build_dir eqmake4 ${PN}.pro
+}
+
+src_compile() {
+	multibuild_foreach_variant run_in_build_dir qt4-r2_src_compile
+}
+
+src_test() {
+	testing() {
+		cd examples || die
+		eqmake4 examples.pro
+		emake
+	}
+	multibuild_foreach_variant run_in_build_dir testing
+}
+
+src_install () {
+	multibuild_foreach_variant run_in_build_dir qt4-r2_src_install
+
+	use doc && dohtml -r doc/html/*
+
+	if use examples; then
+		# don't build examples - fix the qt files to build once installed
+		cat > examples/examples.pri <<-EOF
+			include( qwtconfig.pri )
+			TEMPLATE     = app
+			MOC_DIR      = moc
+			INCLUDEPATH += "${EPREFIX}/usr/include/qwt6"
+			DEPENDPATH  += "${EPREFIX}/usr/include/qwt6"
+			LIBS        += -lqwt6
+		EOF
+		sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
+		cp *.pri examples/ || die
+		insinto /usr/share/${PN}
+		doins -r examples
+	fi
+}