commit: 6888cd5aaed97419b5881d67f540dd19f819ce0b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 10 18:39:13 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 10 18:39:13 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6888cd5a
dev-libs/kdiagram: Drop 2.6.1-r1
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-libs/kdiagram/Manifest | 1 -
.../files/kdiagram-2.6.1-fix-horizontal-bars.patch | 75 ----------------------
dev-libs/kdiagram/kdiagram-2.6.1-r1.ebuild | 38 -----------
3 files changed, 114 deletions(-)
diff --git a/dev-libs/kdiagram/Manifest b/dev-libs/kdiagram/Manifest
index e0ae9fbccd0..00956ee7237 100644
--- a/dev-libs/kdiagram/Manifest
+++ b/dev-libs/kdiagram/Manifest
@@ -1,3 +1,2 @@
-DIST kdiagram-2.6.1.tar.xz 674016 BLAKE2B
323fcc1101f4bba527426923652ee53a1986edff1c7a0d17a478585019c97f731675fa30477064f1e5375ef0a3da27ba1918ee21cf6758ac445ea0d7f1b7611c
SHA512
caa1f6f8bffb4b311224edfed115f189fa9c88e4b9d8bc9d4b7bc963c6b8c896813b438ad89fa9e91e4cde2f55ae822cfc7ba559bbdad517c60a037591dc5128
DIST kdiagram-2.6.3.tar.xz 673788 BLAKE2B
467c376a2979e5a8b0c33b014f0490819f9fafca7a87fa95e44c073d166424f84d82771c787995eba05b97c6c8949270cc7101342eb3a2a91ed92d89d2ddc0a9
SHA512
307b0b17c314d5c4672100e2e949c3e8faf38eee7f9d504a15a01da77434e2b6274cb1857d36ea868025499e806643e32c27bb87aa7dfbce36e8dec6e53b11ef
DIST kdiagram-2.7.0.tar.xz 681384 BLAKE2B
0736525293200873cd10f8752b76b8589324e5e1fa9a89c6e3a1c30fc8d82fdf627cb5043eac5633858574a027c9f3ec98549c69718636c8a65cd4199acd7c9e
SHA512
d5004b409bbb79ca858755a02a3673a16a54ffa7c1ed530b9526b8d928bdf0a2ba9730f47fb67203a09ef49d48c0af9b3d933f8f934ca19290376bdb3eefde1d
diff --git a/dev-libs/kdiagram/files/kdiagram-2.6.1-fix-horizontal-bars.patch
b/dev-libs/kdiagram/files/kdiagram-2.6.1-fix-horizontal-bars.patch
deleted file mode 100644
index fae29982773..00000000000
--- a/dev-libs/kdiagram/files/kdiagram-2.6.1-fix-horizontal-bars.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From d3783f643367b264800e853c7c55c515f17c2a3d Mon Sep 17 00:00:00 2001
-From: Dag Andersen <dand...@get2net.dk>
-Date: Thu, 23 Aug 2018 10:47:05 +0200
-Subject: Fix painting bar diagrams with horizontal bars
-
----
- .../Cartesian/DiagramFlavors/KChartNormalLyingBarDiagram_p.cpp | 5 +++--
- .../Cartesian/DiagramFlavors/KChartPercentLyingBarDiagram_p.cpp | 4 ++--
- .../Cartesian/DiagramFlavors/KChartStackedLyingBarDiagram_p.cpp | 4 ++--
- 3 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git
a/src/KChart/Cartesian/DiagramFlavors/KChartNormalLyingBarDiagram_p.cpp
b/src/KChart/Cartesian/DiagramFlavors/KChartNormalLyingBarDiagram_p.cpp
-index 0a262ee..d2343ee 100644
---- a/src/KChart/Cartesian/DiagramFlavors/KChartNormalLyingBarDiagram_p.cpp
-+++ b/src/KChart/Cartesian/DiagramFlavors/KChartNormalLyingBarDiagram_p.cpp
-@@ -158,13 +158,13 @@ void NormalLyingBarDiagram::paint( PaintContext* ctx )
- }
- }
-
-- for ( int column = 0; column < colCount; column++ ) {
-+ for ( int column = colCount-1; column >= 0; --column ) {
- // paint one group
- const CartesianDiagramDataCompressor::CachePosition position(
row, column );
- const CartesianDiagramDataCompressor::DataPoint point =
compressor().data( position );
- const QModelIndex sourceIndex = attributesModel()->mapToSource(
point.index );
-
-- QPointF dataPoint( 0, rowCount - ( point.key + 0.5 ) );
-+ QPointF dataPoint( 0, ( point.key + 0.5 ) );
- const QPointF topLeft = ctx->coordinatePlane()->translate(
dataPoint );
- dataPoint.rx() += point.value;
- const QPointF bottomRight = ctx->coordinatePlane()->translate(
dataPoint ) +
-@@ -173,6 +173,7 @@ void NormalLyingBarDiagram::paint( PaintContext* ctx )
- const QRectF rect = QRectF( topLeft, bottomRight ).translated(
1.0, offset );
- m_private->addLabel( &lpc, sourceIndex, 0, PositionPoints( rect
), Position::North,
- Position::South, point.value );
-+
- paintBars( ctx, sourceIndex, rect, maxDepth );
-
- offset += barWidth + spaceBetweenBars;
-diff --git
a/src/KChart/Cartesian/DiagramFlavors/KChartPercentLyingBarDiagram_p.cpp
b/src/KChart/Cartesian/DiagramFlavors/KChartPercentLyingBarDiagram_p.cpp
-index fee53d3..10dca65 100644
---- a/src/KChart/Cartesian/DiagramFlavors/KChartPercentLyingBarDiagram_p.cpp
-+++ b/src/KChart/Cartesian/DiagramFlavors/KChartPercentLyingBarDiagram_p.cpp
-@@ -192,11 +192,11 @@ void PercentLyingBarDiagram::paint( PaintContext* ctx )
-
- QPointF point, previousPoint;
- if ( sumValuesVector.at( curRow ) != 0 && value > 0 ) {
-- QPointF dataPoint( ( stackedValues / sumValuesVector.at(
curRow ) * maxValue ), rowCount - key );
-+ QPointF dataPoint( ( stackedValues / sumValuesVector.at(
curRow ) * maxValue ), key + 1 );
- point = ctx->coordinatePlane()->translate( dataPoint );
- point.ry() += offset / 2 + threeDOffset;
-
-- previousPoint = ctx->coordinatePlane()->translate( QPointF( (
( stackedValues - value) / sumValuesVector.at( curRow ) * maxValue ), rowCount
- key ) );
-+ previousPoint = ctx->coordinatePlane()->translate( QPointF( (
( stackedValues - value) / sumValuesVector.at( curRow ) * maxValue ), key + 1 )
);
- }
-
- const qreal barHeight = point.x() - previousPoint.x();
-diff --git
a/src/KChart/Cartesian/DiagramFlavors/KChartStackedLyingBarDiagram_p.cpp
b/src/KChart/Cartesian/DiagramFlavors/KChartStackedLyingBarDiagram_p.cpp
-index 70cbba0..1a5b003 100644
---- a/src/KChart/Cartesian/DiagramFlavors/KChartStackedLyingBarDiagram_p.cpp
-+++ b/src/KChart/Cartesian/DiagramFlavors/KChartStackedLyingBarDiagram_p.cpp
-@@ -184,9 +184,9 @@ void StackedLyingBarDiagram::paint( PaintContext* ctx )
- stackedValues += point.value;
- key = point.key;
- }
-- QPointF point = ctx->coordinatePlane()->translate( QPointF(
stackedValues, rowCount - key ) );
-+ QPointF point = ctx->coordinatePlane()->translate( QPointF(
stackedValues, key + 1 ) );
- point.ry() += offset / 2 + threeDOffset;
-- const QPointF previousPoint = ctx->coordinatePlane()->translate(
QPointF( stackedValues - value, rowCount - key ) );
-+ const QPointF previousPoint = ctx->coordinatePlane()->translate(
QPointF( stackedValues - value, key + 1 ) );
- const qreal barHeight = point.x() - previousPoint.x();
- point.rx() -= barHeight;
-
---
-cgit v1.1
diff --git a/dev-libs/kdiagram/kdiagram-2.6.1-r1.ebuild
b/dev-libs/kdiagram/kdiagram-2.6.1-r1.ebuild
deleted file mode 100644
index 9ee52c2d914..00000000000
--- a/dev-libs/kdiagram/kdiagram-2.6.1-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_EXAMPLES="true"
-ECM_QTHELP="true"
-ECM_TEST="true"
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Powerful libraries (KChart, KGantt) for creating business
diagrams"
-HOMEPAGE="https://api.kde.org/extragear-api/graphics-apidocs/kdiagram/html/index.html
-https://www.kdab.com/development-resources/qt-tools/kd-chart/";
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
- KEYWORDS="amd64 arm64 x86"
-fi
-
-LICENSE="GPL-2" # TODO CHECK
-SLOT="5"
-
-REQUIRED_USE="test? ( examples )"
-
-BDEPEND="
- >=dev-qt/linguist-tools-${QTMIN}:5
-"
-DEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-fix-horizontal-bars.patch" )
