x11-libs/qwt: Add blocker to avoid file collision, #496714

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

8 files changed, 13 insertions, 542 deletions

diff --git a/x11-libs/qwt/ChangeLog b/x11-libs/qwt/ChangeLog
index 9e6dbba8ac01..77c81340279e 100644
--- a/x11-libs/qwt/ChangeLog
+++ b/x11-libs/qwt/ChangeLog
@@ -1,6 +1,11 @@
 # 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.125 2013/12/29 20:36:39 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.126 2014/01/02 18:31:07 jlec Exp $
+
+  02 Jan 2014; Justin Lecher <jlec@gentoo.org> qwt-5.2.1.ebuild,
+  -qwt-5.2.3.ebuild, -qwt-5.2.3-r1.ebuild, -qwt-6.0.2.ebuild,
+  -qwt-6.0.2-r1.ebuild, -qwt-6.0.2-r2.ebuild, qwt-6.1.0.ebuild:
+  Add blocker to avoid file collision, #496714
 
   29 Dec 2013; Agostino Sarubbo <ago@gentoo.org> qwt-5.2.3-r2.ebuild,
   qwt-6.1.0.ebuild:
diff --git a/x11-libs/qwt/qwt-5.2.1.ebuild b/x11-libs/qwt/qwt-5.2.1.ebuild
index 83c896b1df84..9a23f4abfcc3 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-2013 Gentoo Foundation
+# Copyright 1999-2014 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.17 2013/12/09 08:32:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-5.2.1.ebuild,v 1.18 2014/01/02 18:31:07 jlec Exp $
 
 EAPI=4
 
@@ -16,6 +16,7 @@ SLOT="5"
 IUSE="doc examples svg"
 
 DEPEND="
+	!>=x11-libs/qwt-6.1.0
 	dev-qt/qtgui:4
 	doc? ( !<media-libs/coin-3.1.3[doc] )
 	svg? ( dev-qt/qtsvg:4 )"
diff --git a/x11-libs/qwt/qwt-5.2.3-r1.ebuild b/x11-libs/qwt/qwt-5.2.3-r1.ebuild
deleted file mode 100644
index ff51ea581660..000000000000
--- a/x11-libs/qwt/qwt-5.2.3-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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-r1.ebuild,v 1.3 2013/12/09 08:32:59 jlec Exp $
-
-EAPI=5
-
-inherit eutils 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 ~arm ~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 += QwtDll
-		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"
-}
-
-src_compile() {
-	building() {
-		# split compilation to allow parallel building
-		emake sub-src
-		emake
-	}
-	building
-
-	if use static-libs; then
-		sed "/QwtDll/d" -i qwtconfig.pri || die
-		eqmake4
-		building
-		echo "CONFIG += QwtDll" >> qwtconfig.pri || die
-	fi
-}
-
-src_test() {
-	cd examples || die
-	eqmake4 examples.pro
-	emake
-}
-
-src_install () {
-	qt4-r2_src_install
-
-	use static-libs && dolib.a lib/libqwt.a
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		rm doc/man/*/*license*
-		rm -f doc/man/*/{_,deprecated}* || die
-		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
-		doins -r examples
-	fi
-}
diff --git a/x11-libs/qwt/qwt-5.2.3.ebuild b/x11-libs/qwt/qwt-5.2.3.ebuild
deleted file mode 100644
index cafc5d025c66..000000000000
--- a/x11-libs/qwt/qwt-5.2.3.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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.ebuild,v 1.3 2013/12/09 08:32:59 jlec Exp $
-
-EAPI=5
-
-inherit eutils 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 ~arm ~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() {
-	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 += QwtDll
-		CONFIG += QwtPlot QwtWidgets QwtDesigner
-		VERSION = ${PV}
-	EOF
-	sed -i -e 's/headers doc/headers/' src/src.pro || die
-	use svg && echo >> qwtconfig.pri "CONFIG += QwtSVGItem"
-}
-
-src_compile() {
-	building() {
-		# split compilation to allow parallel building
-		emake sub-src
-		emake
-	}
-	building
-
-	if use static-libs; then
-		sed "/QwtDll/d" -i qwtconfig.pri || die
-		eqmake4
-		building
-		echo "CONFIG += QwtDll" >> qwtconfig.pri || die
-	fi
-}
-
-src_test() {
-	cd examples || die
-	eqmake4 examples.pro
-	emake
-}
-
-src_install () {
-	qt4-r2_src_install
-
-	use static-libs && dolib.a lib/libqwt.a
-
-	insinto /usr/share/doc/${PF}
-	if use doc; then
-		rm doc/man/*/*license*
-		rm -f doc/man/*/{_,deprecated}* || die
-		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 qwtconfig.pri examples/qwtconfig.pri || die
-		doins -r examples
-	fi
-}
diff --git a/x11-libs/qwt/qwt-6.0.2-r1.ebuild b/x11-libs/qwt/qwt-6.0.2-r1.ebuild
deleted file mode 100644
index c134002bc616..000000000000
--- a/x11-libs/qwt/qwt-6.0.2-r1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# 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-r1.ebuild,v 1.3 2013/12/09 08:32:59 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"
-
-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
-	if use mathml; then
-		cat >> qwtconfig.pri <<-EOF
-			QWT_CONFIG += QwtMathML
-		EOF
-	fi
-	cat > qwtbuild.pri <<-EOF
-		QWT_CONFIG += qt warn_on thread release no_keywords
-	EOF
-
-	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 '/qwtAddLibrary/s:(qwt):(qwt6):g' \
-		-i qwt.prf designer/designer.pro examples/examples.pri \
-		textengines/mathml/qwtmathml.prf textengines/textengines.pri || die
-	sed \
-		-e 's:libqwt:libqwt6:g' \
-		-i qwtbuild.pri || die
-
-	use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
-
-	epatch "${FILESDIR}/${PN}-6.0.2-invalid-read.patch"
-
-	MULTIBUILD_VARIANTS=( shared )
-	use static-libs && MULTIBUILD_VARIANTS+=( static )
-
-	preparation() {
-		cp -rf "${S}" "${BUILD_DIR}" || die
-		[[ ${MULTIBUILD_VARIANT} == shared ]] && \
-			echo "QWT_CONFIG += QwtDll" >> "${BUILD_DIR}"/qwtconfig.pri
-		run_in_build_dir qt4-r2_src_prepare
-	}
-	multibuild_foreach_variant preparation
-}
-
-src_configure() {
-	multibuild_parallel_foreach_variant qt4-r2_src_configure
-}
-
-src_compile() {
-	compilation() {
-#		cd "${BUILD_DIR}" || die
-#		run_in_build_dir pwd
-#		run_in_build_dir ls -l
-#	run_in_build_dir default
-		cd "${BUILD_DIR}" || die
-		default
-	}
-#	multibuild_foreach_variant run_in_build_dir default
-	multibuild_foreach_variant compilation
-
-	building() {
-		# split compilation to allow parallel building
-		emake sub-src
-		emake
-	}
-#	building
-
-#	if use static-libs; then
-#		sed "/QwtDll/d" -i qwtconfig.pri || die
-#		eqmake4
-#		building
-#		echo "QWT_CONFIG += QwtDll" >> qwtconfig.pri || die
-#	fi
-}
-
-src_test() {
-	cd examples || die
-	eqmake4 examples.pro
-	emake
-}
-
-src_install () {
-	rm -f doc/man/*/{_,deprecated}* || die
-	qt4-r2_src_install
-
-#	use static-libs && dolib.so lib/*.so*
-	use static-libs && dolib.a lib/*.a
-
-	if use doc; then
-		dohtml -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/qwt6"
-			DEPENDPATH  += "${EPREFIX}/usr/include/qwt6"
-			LIBS        += -lqwt6
-		EOF
-		sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
-		cp *.pri examples/ || die
-		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
deleted file mode 100644
index cee578720832..000000000000
--- a/x11-libs/qwt/qwt-6.0.2-r2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# 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.4 2013/12/09 08:32:59 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
-
-	multibuild_copy_sources
-	preparation() {
-		[[ ${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 qt4-r2_src_configure
-}
-
-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 () {
-	rm -f doc/man/*/{_,deprecated}* || die
-	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}6
-		doins -r examples
-	fi
-}
diff --git a/x11-libs/qwt/qwt-6.0.2.ebuild b/x11-libs/qwt/qwt-6.0.2.ebuild
deleted file mode 100644
index b7fce9583554..000000000000
--- a/x11-libs/qwt/qwt-6.0.2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# 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.ebuild,v 1.4 2013/12/09 08:32:59 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 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 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"
-
-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
-	if use mathml; then
-		cat >> qwtconfig.pri <<-EOF
-			QWT_CONFIG += QwtMathML
-		EOF
-	fi
-	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 '/qwtAddLibrary/s:qwt:qwt6:g' \
-		-i qwt.prf designer/designer.pro examples/examples.pri \
-		textengines/mathml/qwtmathml.prf textengines/textengines.pri || die
-	sed \
-		-e 's:libqwt:libqwt6:g' \
-		-i qwtbuild.pri || die
-
-	use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
-	cp *.pri examples/ || die
-	epatch "${FILESDIR}/${PN}-6.0.2-invalid-read.patch"
-}
-
-src_compile() {
-	# split compilation to allow parallel building
-	emake sub-src
-	emake
-}
-
-src_install () {
-	rm -f doc/man/*/{_,deprecated}* || die
-	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.1.0.ebuild b/x11-libs/qwt/qwt-6.1.0.ebuild
index ee0490670d9b..b43430227aa4 100644
--- a/x11-libs/qwt/qwt-6.1.0.ebuild
+++ b/x11-libs/qwt/qwt-6.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.1.0.ebuild,v 1.8 2013/12/29 20:36:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.1.0.ebuild,v 1.9 2014/01/02 18:31:07 jlec Exp $
 
 EAPI=5
 
@@ -18,6 +18,7 @@ SLOT="6"
 IUSE="doc examples mathml static-libs svg"
 
 DEPEND="
+	!<x11-libs/qwt-5.2.3
 	|| ( <dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 )
 	doc? ( !<media-libs/coin-3.1.3[doc] )
 	svg? ( dev-qt/qtsvg:4 )"