Version Bump

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

4 files changed, 110 insertions, 12 deletions

diff --git a/x11-libs/qwt/ChangeLog b/x11-libs/qwt/ChangeLog
index 0f01a8a9ea5b..8ee127ca096b 100644
--- a/x11-libs/qwt/ChangeLog
+++ b/x11-libs/qwt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qwt
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.80 2010/10/21 19:19:35 darkside Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.81 2011/03/05 11:34:43 jlec Exp $
+
+*qwt-6.0.0_rc5 (05 Mar 2011)
+
+  05 Mar 2011; Justin Lecher <jlec@gentoo.org> qwt-5.2.1.ebuild,
+  +qwt-6.0.0_rc5.ebuild:
+  Version Bump
 
   21 Oct 2010; Jeremy Olexa <darkside@gentoo.org> qwt-5.2.1.ebuild:
   Add ~x86-macos, tested in bug 339524
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index c058911de484..d4a4e3706db3 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -1,6 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST qwt-5.2.0.tar.bz2 1371877 RMD160 061319c7b4821c366fd05b68bbc3e134351f9110 SHA1 8830498b87d99d4b7e95ee643f1f7ff178204ba9 SHA256 2b431a6e04cb939f71cdc03a343975162bd6f94bfc11b85227bdb44e9576f5ba
 DIST qwt-5.2.1.tar.bz2 1926453 RMD160 28e07ea12323a5217118a38e1a7d730a8ce50fee SHA1 89de7a90b7eddad2989470627baa19d59e348df1 SHA256 e2b8bb755404cb3dc99e61f3e2d7262152193488f5fbe88524eb698e11ac569f
+DIST qwt-6.0.0-rc5.tar.bz2 2482931 RMD160 8330e5ec74425b0a2f3b8541177a21b47afe0a54 SHA1 435cf30784c789fb5033287f376ac0f6dac3288e SHA256 5a1758105369ca0204142158d4b4d46a0227b8f101f45d129e55effc02dbc16a
 EBUILD qwt-5.2.0.ebuild 1798 RMD160 cbabd1cd4f51aa71c8adf4902abb97fc87815c92 SHA1 545d718d84036a9546262f8c6c705ba9fb6edf7f SHA256 260041676fa1a1c032a6cd76df89bfa3044191e5f81fc59276b584a3196d8159
-EBUILD qwt-5.2.1.ebuild 1876 RMD160 acf05caf53ded7ba80228b8ebaa9685f32e938b0 SHA1 52d346eb217d56ee945a5f6fc2bf879aeff49147 SHA256 b4bcff75f8e958cdcbd0709cbf967fa3f7a21045a0ecaa646a6db4d474d1d521
-MISC ChangeLog 10701 RMD160 74ecab9ce92f0435fabbc1cc1adffe3cd4215fc1 SHA1 763fec5ebc817e2410884988275042b2f6b3dac4 SHA256 fe12064011b193b76bf2761f33cb8a38cdae3c40b44d21f48a818741790565eb
+EBUILD qwt-5.2.1.ebuild 1874 RMD160 43462b8e5891c23cd2ec8188a6503b69726d45e5 SHA1 ce866709b2384d027d0c84ffb6b0ee06563f3224 SHA256 32448fa12b28d2ea427aa3502ab72d4352608d9bd2e3300874bd5e8e6e8e682e
+EBUILD qwt-6.0.0_rc5.ebuild 2161 RMD160 907d5faa14698e64fa9549e7375b91b49252af08 SHA1 0047b02ac904c039600f0a8d8c0cbe626a0d186e SHA256 09dc31b91f222418181151847db98675b398a233930a4186dcf58f5388b3d298
+MISC ChangeLog 10833 RMD160 450714159f91019d2b5cb8d5b1ae21e9cbc4c30c SHA1 d4b6bbb8d58791b048e3c8c4f4e48fc4f351ca8d SHA256 12063e4fb319b46864213fa21a8da059989df5f8594ad0f83c282f1a88448256
 MISC metadata.xml 510 RMD160 7a1780387ea1057ad0c03ebb0893b8b784dbb240 SHA1 33685ae6f5525901140d7edac99e3f1a0b01d430 SHA256 381cae2dbb6c2d0f63af9aa9f11f51c32cca49c390bf6c89d3b2534f31fd7466
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk1yH9oACgkQgAnW8HDreRZHpwCdH4lxtCo7dogQtcMVrP+xssIM
+sPMAoMZ0sF5yP3hVHQU05vvoZsNMlOOC
+=32Xi
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/qwt/qwt-5.2.1.ebuild b/x11-libs/qwt/qwt-5.2.1.ebuild
index f313fbadf1ae..c00e1017bf5a 100644
--- a/x11-libs/qwt/qwt-5.2.1.ebuild
+++ b/x11-libs/qwt/qwt-5.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-5.2.1.ebuild,v 1.4 2010/10/21 19:19:35 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-5.2.1.ebuild,v 1.5 2011/03/05 11:34:43 jlec Exp $
 
 EAPI="3"
 inherit eutils qt4
@@ -14,16 +14,17 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos"
 SLOT="5"
 IUSE="doc examples svg"
 
-DEPEND="x11-libs/qt-gui:4
+DEPEND="
+	x11-libs/qt-gui:4
 	doc? ( !<media-libs/coin-3.1.3[doc] )
 	svg? ( x11-libs/qt-svg:4 )"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
 	cat > qwtconfig.pri <<-EOF
-		target.path = "${EPREFIX}"/usr/$(get_libdir)
-		headers.path = "${EPREFIX}"/usr/include/qwt5
-		doc.path = "${EPREFIX}"/usr/share/doc/${PF}
+		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 += QwtDll QwtPlot QwtWidgets QwtDesigner
 		VERSION = ${PV}
@@ -33,8 +34,8 @@ src_prepare() {
 		include( qwtconfig.pri )
 		TEMPLATE     = app
 		MOC_DIR      = moc
-		INCLUDEPATH += "${EPREFIX}"/usr/include/qwt5
-		DEPENDPATH  += "${EPREFIX}"/usr/include/qwt5
+		INCLUDEPATH += "${EPREFIX}/usr/include/qwt5"
+		DEPENDPATH  += "${EPREFIX}/usr/include/qwt5"
 		LIBS        += -lqwt
 	EOF
 	sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
diff --git a/x11-libs/qwt/qwt-6.0.0_rc5.ebuild b/x11-libs/qwt/qwt-6.0.0_rc5.ebuild
new file mode 100644
index 000000000000..93bb9d818113
--- /dev/null
+++ b/x11-libs/qwt/qwt-6.0.0_rc5.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2011 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_rc5.ebuild,v 1.1 2011/03/05 11:34:43 jlec Exp $
+
+EAPI="3"
+inherit eutils qt4
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="2D plotting library for Qt4"
+HOMEPAGE="http://qwt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}-beta/${PV/_/-}/${MY_P}.tar.bz2"
+
+LICENSE="qwt"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos"
+SLOT="5"
+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}
+
+src_prepare() {
+	cat > qwtconfig.pri <<-EOF
+		QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)"
+		QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt5"
+		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/designer"
+		QWT_INSTALL_FEATURES  = "${EPREFIX}/usr/$(get_libdir)/qt4/features"
+	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/qwt5"
+		DEPENDPATH  += "${EPREFIX}/usr/include/qwt5"
+		LIBS        += -lqwt
+	EOF
+	sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
+	sed -i -e 's/target doc/target/' src/src.pro || die
+	qt4_src_prepare
+}
+
+src_configure() {
+	use svg && echo >> qwtconfig.pri "CONFIG += QwtSvg"
+	cp *.pri examples/ || die
+	eqmake4
+}
+src_compile() {
+	# split compilation to allow parallel building
+	emake sub-src || die "emake library failed"
+	emake || die "emake failed"
+}
+
+src_install () {
+	emake INSTALL_ROOT="${D}" install || die "emake install failed"
+	dodoc CHANGES README
+	insinto /usr/share/doc/${PF}
+	if use doc; then
+		doman doc/man/*/* || die
+		doins -r doc/html || die
+	fi
+	if use examples; then
+		doins -r examples || die
+	fi
+}