x11-libs/qwt: Fix svg support, #421559

Package-Manager: portage-2.2.0_alpha123/cvs/Linux x86_64

5 files changed, 116 insertions, 19 deletions

diff --git a/x11-libs/qwt/ChangeLog b/x11-libs/qwt/ChangeLog
index 320475e2fd41..aeb9484b9108 100644
--- a/x11-libs/qwt/ChangeLog
+++ b/x11-libs/qwt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qwt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.101 2012/03/04 07:33:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.102 2012/08/31 06:51:31 jlec Exp $
+
+*qwt-6.0.1-r1 (31 Aug 2012)
+
+  31 Aug 2012; Justin Lecher <jlec@gentoo.org> qwt-6.0.0.ebuild,
+  qwt-6.0.1.ebuild, +qwt-6.0.1-r1.ebuild:
+  Fix svg support, #421559
 
   04 Mar 2012; Justin Lecher <jlec@gentoo.org> -qwt-5.2.0.ebuild, metadata.xml:
   Clean old
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index ab802f7158b3..b86f8d1c4ad6 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-DIST qwt-5.2.1.tar.bz2 1926453 RMD160 28e07ea12323a5217118a38e1a7d730a8ce50fee SHA1 89de7a90b7eddad2989470627baa19d59e348df1 SHA256 e2b8bb755404cb3dc99e61f3e2d7262152193488f5fbe88524eb698e11ac569f
-DIST qwt-6.0.0.tar.bz2 2723203 RMD160 c0e3c31fcc39e6f9a33b23e91d5f8c8125fb4f69 SHA1 306957fc06c90f2049aec57e13a971f54c3cb21a SHA256 d041d63029ea5f6a64d06be9bfe788e5d8bed8bac1fa129d82466aa09ab4092e
-DIST qwt-6.0.1.tar.bz2 2437570 RMD160 54b815d131fd7e7c8bfd1a49fbf3bc7c0ccc9c7a SHA1 301cca0c49c7efc14363b42e082b09056178973e SHA256 3fe19dd5962d705632fc2ef616b009299de6cf1e702538296924dbfdc8003cb2
-EBUILD qwt-5.2.1.ebuild 1735 RMD160 7541dbb00f0ebbcb797f81a01628cb9c2b80e223 SHA1 5719a5674a66b795c3239c0e8dc20fdf568e2f5b SHA256 c767c7da79819341328ab2dca585185e451a0e67eb08b04f381320c71385c8cb
-EBUILD qwt-6.0.0.ebuild 2241 RMD160 73e06a3379a61f5c9c335cc16189496a12a8745c SHA1 562e5e747516afab2390d0fa0bae5c127a60231a SHA256 32fc7fef56790aab0ba2165ffe0efc7bec93e1b2115cabee6fc34ae5c176734f
-EBUILD qwt-6.0.1.ebuild 2245 RMD160 eebb1308d424f8df30779027619eee837748cb9d SHA1 91556ef11a50f354c625a31eda184cd23c77b0c0 SHA256 2fe4f2207742ecb47f1d7e7093b5c21509ea02aecd711c3807ecf205cdd28c2f
-MISC ChangeLog 13214 RMD160 3afc36652423f5331d46a771e7256d4d86dfd18c SHA1 bcae5abb0742211397c69210d016371ab85a8261 SHA256 e314df7ddb56f51d0e57d29eed280fb933975a1a1ef45cf8cfde062b4e34c109
-MISC metadata.xml 512 RMD160 a6c37a81936e3089b01bd219cb4af8e35062f321 SHA1 23d520398fba087911106e23b5f59e6a7bdf20f4 SHA256 dde17ba1b9edc59f317425c2e33ec3177512cc066524e5ef5eeb55fe25439296
+DIST qwt-5.2.1.tar.bz2 1926453 SHA256 e2b8bb755404cb3dc99e61f3e2d7262152193488f5fbe88524eb698e11ac569f
+DIST qwt-6.0.0.tar.bz2 2723203 SHA256 d041d63029ea5f6a64d06be9bfe788e5d8bed8bac1fa129d82466aa09ab4092e
+DIST qwt-6.0.1.tar.bz2 2437570 SHA256 3fe19dd5962d705632fc2ef616b009299de6cf1e702538296924dbfdc8003cb2 SHA512 36fdd5344203586daa8b8283b6ae743fedd3f0685bc3405295868288de66827695b5e31e9a54231a3fe8aa0f3b008f1d0961ff9d89a201a4f5b14f7376b17610 WHIRLPOOL 2c6cf1bf0431cae719860414bcd17d3e682fdee785980a435f0d7a1a1b45584d200be1e6dcc352f4f56d3aa17262eea59953bbdeb27f2b5c84d72fa6af6b8bcf
+EBUILD qwt-5.2.1.ebuild 1735 SHA256 c767c7da79819341328ab2dca585185e451a0e67eb08b04f381320c71385c8cb SHA512 700de24ecf0291e2510aeeefb97cc96d450ff3751882955e0a9782cd52332fe613ef406ff4536b7297e4a9add22f955b7406d8f2aeb74de3e9be3282e286b225 WHIRLPOOL 02839bfafaabca03a3c290c5a7a00aead768c775d454e45000d9aa0c21b400d0437f6971849835f0519abba929e3eee000c05934ddf18203443f478ad2adc752
+EBUILD qwt-6.0.0.ebuild 2243 SHA256 d557ecd8f682501018f3c59bc5c0223857758b32684425ff229ccbf57f5192e0 SHA512 c971f35346703cda90ef675fdcfcccee0aba88543b7331ec530e2d4aa8b4498e558fc2fb931c2012982d3b5676d9a8d9a38b0bdd794cba1847407bed1881008c WHIRLPOOL 4711d3f98eabf71ff7bcf57839cae7ce591d060c26d882e22dea06962f79c34a17e13478f6e974d333445b22efb1391a55cf6388f8819ddf55692a54c0b4792e
+EBUILD qwt-6.0.1-r1.ebuild 2252 SHA256 ad1f4f550ccce7fef9ccb540a0842d86642d8e7ec3747de54a4a0f489c4f0968 SHA512 92a71a531e7678bb8ba825a47a2967de989c4809470579775a6c2ec7bee5b0c380cd4c5c22840e1971ec61ba64a4c12ca48c8d22bb104063d176d49e6b579d62 WHIRLPOOL d52506c60d0db5173551f68c4b5a718767918ee79dc537f234c5e906bf91993743838943eba10f1455381666fa603fef55abd130fcd180637a3b8d5968b912bf
+EBUILD qwt-6.0.1.ebuild 2249 SHA256 5492d1d8366916f154343f92ae3b98e03fb90acea50c21431e7e531b605bc893 SHA512 c31ae578dc4cf8d0cf11d0b96d146dd91f5b1b6e3ca93b6f7b3a12e75c623ff7a6324c5a1b29d4d30fda72f83789e8f2bfa94ba98ce99bff181b81cd82696e67 WHIRLPOOL e8772123f2757528d3ddd0705e9f10733d1f10f073ec176e4f27a00391463e8e277e670e3ad1533134361d8f22ab4498647e4f9af6a6e86d43ef95a82b49f92c
+MISC ChangeLog 13378 SHA256 4a278e64cd0dd64ae2bad27d9e9277d7c10621e8c59efb75d3ad353bf2a29ac1 SHA512 576cbc3b5247c15d7423b351d6b9330fc9f57c73d1c1dd1717b9953647c5c6c4b5eb6f928d641549a0820063affde31e320f6db6446ff9c564f9718f6a123ba0 WHIRLPOOL c1c9c103de002e766e1a73bac852c20c2c67847ac2f3a1889d59c5a11a5a223fdb462769ac76f86cd4b0fe7f41f4d171961b14df06b773be68e9301ca3b3e101
+MISC metadata.xml 512 SHA256 dde17ba1b9edc59f317425c2e33ec3177512cc066524e5ef5eeb55fe25439296 SHA512 18c9bfa02a98dde2f7c673944381269037ddf327b72d70731af8dc5cfa5ca65a2fa331548647dd39f683cccecab585d2de3628dc935a71fe08f1c44025bc36c5 WHIRLPOOL ec62670b68c3fb9db56c7211f7fc67c3b4e364b075978563c4e6344544802625bdb3bd18fdbf761cb8e3def55faf3c7b5594e87f0bd7ae7a149b5a4aacd7d85f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iEYEAREKAAYFAk9TGuEACgkQgAnW8HDreRa2TACfWOfNqO65BtTP9M5GLaU0vx8k
-DpoAn22yA5lHmGh3Pw0gflizoOkDMyz4
-=cRvO
+iEYEAREIAAYFAlBAXvkACgkQgAnW8HDreRYtRwCdHp9m5cG6YIehgmowFQZD6r/t
+KFUAoLh+bI++1K0QadLuiOKz2hQUTS7m
+=9pHy
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qwt/qwt-6.0.0.ebuild b/x11-libs/qwt/qwt-6.0.0.ebuild
index 29589b5d2010..e97e151eab68 100644
--- a/x11-libs/qwt/qwt-6.0.0.ebuild
+++ b/x11-libs/qwt/qwt-6.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.0.0.ebuild,v 1.8 2012/03/03 15:56:35 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.0.0.ebuild,v 1.9 2012/08/31 06:51:31 jlec Exp $
 
 EAPI=4
 
@@ -67,7 +67,7 @@ src_prepare() {
 		-e 's:libqwt:libqwt6:g' \
 		-i qwtbuild.pri || die
 
-	use svg && echo >> qwtconfig.pri "CONFIG += QwtSvg"
+	use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
 	cp *.pri examples/ || die
 }
 
diff --git a/x11-libs/qwt/qwt-6.0.1-r1.ebuild b/x11-libs/qwt/qwt-6.0.1-r1.ebuild
new file mode 100644
index 000000000000..b9a4ed550a8b
--- /dev/null
+++ b/x11-libs/qwt/qwt-6.0.1-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.0.1-r1.ebuild,v 1.1 2012/08/31 06:51:31 jlec Exp $
+
+EAPI=4
+
+inherit eutils 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"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos"
+SLOT="6"
+IUSE="doc examples svg"
+
+DEPEND="
+	x11-libs/qt-gui:4
+	doc? ( !<media-libs/coin-3.1.3[doc] )
+	svg? ( x11-libs/qt-svg:4 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+DOCS="CHANGES README"
+
+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 += QwtDll QwtPlot QwtWidgets QwtDesigner
+		VERSION = ${PV/_*}
+		QWT_INSTALL_PLUGINS   = "${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer6"
+		QWT_INSTALL_FEATURES  = "${EPREFIX}/usr/$(get_libdir)/qt4/features6"
+	EOF
+
+	cat > qwtbuild.pri <<-EOF
+		QWT_CONFIG += qt warn_on thread release no_keywords
+	EOF
+
+	# 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        += -lqwt
+	EOF
+	sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
+	sed \
+		-e 's/target doc/target/' \
+		-i src/src.pro || die
+
+	# Renaming lib to libqwt6.so to enable slotting
+	sed \
+		-e "/^TARGET/s:qwt:qwt6:g" \
+		-i src/src.pro || die
+	sed \
+		-e '/qtAddLibrary/s:qwt:qwt6:g' \
+		-i qwt.prf designer/designer.pro || die
+	sed \
+		-e 's:libqwt:libqwt6:g' \
+		-i qwtbuild.pri || die
+
+	use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
+	cp *.pri examples/ || die
+}
+
+src_compile() {
+	# split compilation to allow parallel building
+	emake sub-src
+	emake
+}
+
+src_install () {
+	qt4-r2_src_install
+	if use doc; then
+		dohtml -r doc/html/*
+	fi
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/x11-libs/qwt/qwt-6.0.1.ebuild b/x11-libs/qwt/qwt-6.0.1.ebuild
index 92567e427c10..80879441072e 100644
--- a/x11-libs/qwt/qwt-6.0.1.ebuild
+++ b/x11-libs/qwt/qwt-6.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.0.1.ebuild,v 1.2 2011/12/21 15:45:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.0.1.ebuild,v 1.3 2012/08/31 06:51:31 jlec Exp $
 
 EAPI=4
 
@@ -67,7 +67,7 @@ src_prepare() {
 		-e 's:libqwt:libqwt6:g' \
 		-i qwtbuild.pri || die
 
-	use svg && echo >> qwtconfig.pri "CONFIG += QwtSvg"
+	use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
 	cp *.pri examples/ || die
 }