gentoo resync : 25.11.2020

4 files changed, 151 insertions, 7 deletions

diff --git a/kde-frameworks/kcalendarcore/Manifest b/kde-frameworks/kcalendarcore/Manifest
index 533943869eaf..ea231d55a3b5 100644
--- a/kde-frameworks/kcalendarcore/Manifest
+++ b/kde-frameworks/kcalendarcore/Manifest
@@ -1,5 +1,6 @@
-DIST kcalendarcore-5.70.0.tar.xz 254768 BLAKE2B 0057903643ba05aeb714faa6833e6e84d51898ddcda4ab60d694dcb1d5ba352a8027fac41362666c657275870c31be0324e6747852955506ff051a7919cd3a6a SHA512 1138a8c45470e4af32a0bbf7384dcba65a666de2cf6598ecd128e42087b16d3814e90cfe610453a1bb5044210e6fac174663c799e52aeffc91863bb5ab7a463d
+AUX kcalendarcore-5.76.0-rfc7986-colour-support-for-incidence.patch 5003 BLAKE2B f9c6d8308a31184e8020a2dda9d3970e0c88dd6a8ebd4b237ddd51a901e4b4e96d7770dd3ff09cbe2be05c06c70eba1287c988bf04c9f03c5845bbd198fc9c0e SHA512 5156956006b8fac892a4ac5ab61aebb01ab2b96c7cf6c5c88214f6cffcbbeb9b1ae5c02d1cc82d3aa0e274fd71593eb10133fd706697bba0aea158fa7e018af6
 DIST kcalendarcore-5.74.0.tar.xz 255684 BLAKE2B 8e2547f784881f031e9e9bd3a461aaa6219d419c43b096be9a7a357ed95fd232c5350577298bc4cc640966023cf6fec51bd952fca4a11cac817d6756fab3b2e4 SHA512 f6b48283d5433e171a1961abcbf47422fb8ce1e6412d0a83de20c16b2e81e065e16c1525440e1a29791b31ec74fbe672878cd554fceab703cc0c9c45c23524af
-EBUILD kcalendarcore-5.70.0.ebuild 511 BLAKE2B ceb5c882d52b5cb0fd960bde3103c3d66f997e1fb1fcf383bc01a35194b4746c4120b2681062725abd757b3f038cb3ce25c8e92e056a36bf55c2665198b01fd8 SHA512 5594ee45f00343d2ba62019d075794dfc4446347457772ab446b073d56ee301e71e36deae19c28bb51de4f94f11f57d8f78ad3c4db4a1abd3cbf7174f3aa1318
-EBUILD kcalendarcore-5.74.0.ebuild 514 BLAKE2B 35bbb4475b565c172ad74fe6ae414067faab94f0b47291a6d0c4af8db125a35abeb3d6d54de3acda50b12a819ad3aecd8f4b193956a480bab7041c2bd3298529 SHA512 1678713158b093b13cc405813ea22c948f2b43b148a294754cb23839a040b4129e09153d150109f6f9563ba74f7f79300189520d0ebf704f9e20f1bc14a5f492
+DIST kcalendarcore-5.76.0.tar.xz 256404 BLAKE2B 297c05e36c2562b8ac71aca338e99cc1e72c6224baf4a19457c2ea9bb5c0a7936ae3bd6470b92614c185e4e01ad2c9719a9bcc2f07cc1a9b9967bc8189d6a69f SHA512 9b6ce54997e8d95a04f3d0042ef3bd1488874aeeaa9896afbda281bd8098d8256face05edaa68d790b92e38338b1eb31151826b2c52fd94488a7ac2c87a72785
+EBUILD kcalendarcore-5.74.0.ebuild 511 BLAKE2B 1a79526a7ba308161c52379851496559f63647501b3fe5bef4383a815310a5d03ab426ce6e223ae3d5288cca040c71e5171099d99dda38b3e99a89bc60c41a92 SHA512 e38c66eaa57e568385457d95b0f7ee45ee776cf1ff4a86c6e7fb0cc0fa4752dba6edc206bfca5cbf8371552bd9ebb27d7c51fb03ec20c18506dfb4a3c4ca67fa
+EBUILD kcalendarcore-5.76.0.ebuild 597 BLAKE2B 282a4c84f8c013b475ead7efbe3abd28d6b79ae6420067e14248c578bd17a432e25d41513bfb54f3053736400a5dcd74ef776ecae37135f31a7d491591dc8533 SHA512 3c81b8f425f43cf9db2590eeedcd6a128a8b24f11a74d5bcce24afe96f5322a652b097365ae2949af19e593404e53798865ac21350f77f8af755558b97a88559
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcalendarcore/files/kcalendarcore-5.76.0-rfc7986-colour-support-for-incidence.patch b/kde-frameworks/kcalendarcore/files/kcalendarcore-5.76.0-rfc7986-colour-support-for-incidence.patch
new file mode 100644
index 000000000000..3be1f0c4a52b
--- /dev/null
+++ b/kde-frameworks/kcalendarcore/files/kcalendarcore-5.76.0-rfc7986-colour-support-for-incidence.patch
@@ -0,0 +1,141 @@
+From b567a3af18a19009a1e0fc637bdd004ce4ca857f Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 8 Nov 2020 18:07:09 +0100
+Subject: [PATCH] Revert Revert "Add COLOR property serialization from
+ RFC7986."
+
+The raised minimum dependency is no problem for us.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/icalformat_p.cpp | 10 ++++++++++
+ src/incidence.cpp    | 21 +++++++++++++++++++++
+ src/incidence.h      | 16 ++++++++++++++++
+ src/incidencebase.h  |  3 ++-
+ 4 files changed, 49 insertions(+), 1 deletion(-)
+
+diff --git a/src/icalformat_p.cpp b/src/icalformat_p.cpp
+index 51ebda04a..aa7b526d9 100644
+--- a/src/icalformat_p.cpp
++++ b/src/icalformat_p.cpp
+@@ -530,6 +530,12 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent,
+         icalcomponent_add_property(parent, icalproperty_new_class(secClass));
+     }
+ 
++    // color
++    if (!incidence->color().isEmpty()) {
++        icalcomponent_add_property(
++            parent, icalproperty_new_color(incidence->color().toUtf8().constData()));
++    }
++
+     // geo
+     if (incidence->hasGeo()) {
+         icalgeotype geo;
+@@ -1881,6 +1887,10 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent, const Incidence::Ptr &
+             incidence->addAttachment(readAttachment(p));
+             break;
+ 
++        case ICAL_COLOR_PROPERTY:
++            incidence->setColor(QString::fromUtf8(icalproperty_get_color(p)));
++            break;
++
+         default:
+             // TODO: do something about unknown properties?
+             break;
+diff --git a/src/incidence.cpp b/src/incidence.cpp
+index db0d3255b..ab13048d5 100644
+--- a/src/incidence.cpp
++++ b/src/incidence.cpp
+@@ -73,6 +73,7 @@ public:
+         , mPriority(p.mPriority)
+         , mStatus(p.mStatus)
+         , mSecrecy(p.mSecrecy)
++        , mColor(p.mColor)
+         , mDescriptionIsRich(p.mDescriptionIsRich)
+         , mSummaryIsRich(p.mSummaryIsRich)
+         , mLocationIsRich(p.mLocationIsRich)
+@@ -150,6 +151,7 @@ public:
+     int mPriority;                      // priority: 1 = highest, 2 = less, etc.
+     Status mStatus;                     // status
+     Secrecy mSecrecy;                   // secrecy
++    QString mColor;                     // background color
+     bool mDescriptionIsRich = false;            // description string is richtext.
+     bool mSummaryIsRich = false;                // summary string is richtext.
+     bool mLocationIsRich = false;               // location string is richtext.
+@@ -284,6 +286,7 @@ bool Incidence::equals(const IncidenceBase &incidence) const
+         && secrecy() == i2->secrecy()
+         && priority() == i2->priority()
+         && stringCompare(location(), i2->location())
++        && stringCompare(color(), i2->color())
+         && stringCompare(schedulingID(), i2->schedulingID())
+         && recurrenceId() == i2->recurrenceId()
+         && thisAndFuture() == i2->thisAndFuture();
+@@ -542,6 +545,24 @@ QString Incidence::relatedTo(RelType relType) const
+     return d->mRelatedToUid.value(relType);
+ }
+ 
++void Incidence::setColor(const QString &colorName)
++{
++    if (mReadOnly) {
++        return;
++    }
++    if (!stringCompare(d->mColor, colorName)) {
++        update();
++        d->mColor = colorName;
++        setFieldDirty(FieldColor);
++        updated();
++    }
++}
++
++QString Incidence::color() const
++{
++    return d->mColor;
++}
++
+ // %%%%%%%%%%%%  Recurrence-related methods %%%%%%%%%%%%%%%%%%%%
+ 
+ Recurrence *Incidence::recurrence() const
+diff --git a/src/incidence.h b/src/incidence.h
+index 622ddb6f5..5ea625042 100644
+--- a/src/incidence.h
++++ b/src/incidence.h
+@@ -397,6 +397,22 @@ public:
+     */
+     Q_REQUIRED_RESULT QString relatedTo(RelType relType = RelTypeParent) const;
+ 
++    /**
++      Set the incidence color, as added in RFC7986.
++
++      @param colorName a named color as defined in CSS3 color name, see
++       https://www.w3.org/TR/css-color-3/#svg-color.
++      @since: 5.76
++     */
++    void setColor(const QString &colorName);
++
++    /**
++      Returns the color, if any is defined, for this incidence.
++
++      @since: 5.76
++     */
++    Q_REQUIRED_RESULT QString color() const;
++
+ // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ // %%%%%  Convenience wrappers for property handling
+ // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+diff --git a/src/incidencebase.h b/src/incidencebase.h
+index 2dcac9a34..c079c0df2 100644
+--- a/src/incidencebase.h
++++ b/src/incidencebase.h
+@@ -185,7 +185,8 @@ public:
+         FieldComment,         ///> Field representing the COMMENT component.
+         FieldUid,             ///> Field representing the UID component.
+         FieldUnknown,         ///> Something changed. Always set when you use the assignment operator.
+-        FieldUrl              ///> Field representing the URL component.
++        FieldUrl,             ///> Field representing the URL component.
++        FieldColor            ///> Field representing the COLOR component.
+     };
+ 
+     /**
+-- 
+2.29.2
+
diff --git a/kde-frameworks/kcalendarcore/kcalendarcore-5.74.0.ebuild b/kde-frameworks/kcalendarcore/kcalendarcore-5.74.0.ebuild
index e231bbfeee5b..c63c59e2c202 100644
--- a/kde-frameworks/kcalendarcore/kcalendarcore-5.74.0.ebuild
+++ b/kde-frameworks/kcalendarcore/kcalendarcore-5.74.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Library for interfacing with calendars"
 LICENSE="GPL-2+ test? ( LGPL-3+ )"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-frameworks/kcalendarcore/kcalendarcore-5.70.0.ebuild b/kde-frameworks/kcalendarcore/kcalendarcore-5.76.0.ebuild
index 9abec5db33a6..17e3740db53b 100644
--- a/kde-frameworks/kcalendarcore/kcalendarcore-5.70.0.ebuild
+++ b/kde-frameworks/kcalendarcore/kcalendarcore-5.76.0.ebuild
@@ -4,24 +4,26 @@
 EAPI=7
 
 ECM_TEST="true"
-QTMIN=5.12.3
+QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Library for interfacing with calendars"
 LICENSE="GPL-2+ test? ( LGPL-3+ )"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 BDEPEND="
 	sys-devel/bison
 "
 DEPEND="
+	>=dev-libs/libical-3.0.5:=
 	>=dev-qt/qtgui-${QTMIN}:5
-	dev-libs/libical:=
 "
 RDEPEND="${DEPEND}
 	!kde-apps/kcalcore:5
 "
 
 RESTRICT+=" test" # multiple tests fail or hang indefinitely
+
+PATCHES=( "${FILESDIR}/${P}-rfc7986-colour-support-for-incidence.patch" )