gentoo resync : 14.04.2018

3 files changed, 2 insertions, 65 deletions

diff --git a/x11-libs/qwtpolar/Manifest b/x11-libs/qwtpolar/Manifest
index 7662fca4fc40..4cb635a441e7 100644
--- a/x11-libs/qwtpolar/Manifest
+++ b/x11-libs/qwtpolar/Manifest
@@ -1,4 +1,3 @@
 DIST qwtpolar-1.1.1.tar.bz2 565546 BLAKE2B 7067a006c44d49fab1dc16e115c528aaf72fa172d92487bd38e112bdff99e8ea4d83f0dafcb7f17af4bad9190c809468e47db652ca712645504b350dc9f03ed3 SHA512 5b752e5426ae15740737277c2ba244cab947c54d573b4eedd1f54359b6eab1fa738d40f68f6c806106d01596eabc9f6d7ee825dde11a4925bebd643f42021621
-EBUILD qwtpolar-1.1.1-r1.ebuild 1511 BLAKE2B e9813d90fa313f8c4323353ce613aabfc38e2dede7763b74f8529456909dd536a19c58dc957e77c2774107274260809806f3cd993bf6d795436ebac02c20a8bf SHA512 67dc81e5899408b04ff6a4164aedaf128e5035053e39d5ff9d42ae3d24914e3e62c5ca7a78b9e6af9fc0fcadda83066a73f3fde803b66a1c4d2caadfc4994063
-EBUILD qwtpolar-1.1.1-r2.ebuild 1442 BLAKE2B 9a00c1d7a39f0490c03e58235d4a1507094ca92a41494a36b0623ed90303dedbdf797df200ad9f3f0272c03bf3d4ea64cce941b7a59eaca84ae67b251349cfee SHA512 89fd40d5c9af004d792b1a6c65c7ff88ffeec039ab7d36e598a21cca84193b4091aa7f16e71f44d009a7af068058e16345d4ae185927e6ffd1dda51233efb400
+EBUILD qwtpolar-1.1.1-r2.ebuild 1441 BLAKE2B fc2164438a0db2b0a5c0d49757c0387af8d32aa710474d4f74423de3e509847bf5e9c4e65d1eb698ff4a32044e12849e5c1ed5834a61714149a67ee17148c5c2 SHA512 474574fa866d9efc3afa074deed099a34a5813383cd4d050fdc6f7a8071e8143b3309eb642a580af579179639ebe8eee430024849c7b28740e2a10ac2585a338
 MISC metadata.xml 347 BLAKE2B e21decebd423f18e461da054cc36d026ebbb79da6419b31602b0ce8abd33922cd6d82a60c86a0d2eabfdf3eddd9aeaaed03a93cb83dec0a4a725d85c6b4dc794 SHA512 854d3d9237d44a1afc6926805c9efb4444326a87bf68fd0c2e636d44b4f3e012490f327921f0e3174579657b7177e231d64c983412d8f09cd4b99592d311986e
diff --git a/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild b/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild
deleted file mode 100644
index 92b8ca54a3b0..000000000000
--- a/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-DESCRIPTION="Library for displaying values on a polar coordinate system"
-HOMEPAGE="http://qwtpolar.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="qwt"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+qt4 qt5"
-
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
-RDEPEND="
-	qt4? ( x11-libs/qwt:6=[designer,qt4(+),svg] )
-	qt5? ( x11-libs/qwt:6=[designer,qt5,svg] )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	local qtplugindir="${EPREFIX}$(qt4_get_plugindir)"
-	use qt5 && qtplugindir="${EPREFIX}$(qt5_get_plugindir)"
-
-	sed \
-		-e "/QWT_POLAR_INSTALL_PREFIX /s:=.*$:= ${EPREFIX}/usr:g" \
-		-e "/QWT_POLAR_INSTALL_LIBS/s:lib:$(get_libdir):g" \
-		-e "/QWT_POLAR_INSTALL_DOCS/s:doc:share/doc/${PF}:g" \
-		-e "/QWT_POLAR_INSTALL_PLUGINS/s:=.*$:= ${qtplugindir}/designer/:g" \
-		-e "/QWT_POLAR_INSTALL_FEATURES/s:=.*$:= ${qtplugindir}/features/:g" \
-		-e "/= QwtPolarDesigner/ d" \
-		-e "/= QwtPolarExamples/d" \
-		-i ${PN}config.pri || die
-
-	sed \
-		-e "s:{QWT_POLAR_ROOT}/lib:{QWT_POLAR_ROOT}/$(get_libdir):" \
-		-i src/src.pro || die
-	echo "INCLUDEPATH += ${EPREFIX}/usr/include/qwt6" >> src/src.pro
-	cat >> designer/designer.pro <<- EOF
-	INCLUDEPATH += "${EPREFIX}"/usr/include/qwt6
-	LIBS += -L"${S}/$(get_libdir)"
-	EOF
-}
-
-src_configure() {
-	if use qt5; then
-		eqmake5
-	else
-		eqmake4
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
-	einstalldocs
-}
diff --git a/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild b/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild
index 0d0c1346e7b2..2206f2747bf8 100644
--- a/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild
+++ b/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="qwt"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="