* [gentoo-commits] proj/kde:master commit in: kde-apps/dolphin-plugins-mercurial/, kde-apps/dolphin-plugins-git/, ...
@ 2019-12-12 23:55 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2019-12-12 23:55 UTC (permalink / raw
To: gentoo-commits
commit: a984674101392a666f74cd5fc587974db81cc091
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 12 23:46:43 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 12 23:53:31 2019 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a9846741
kde-apps/dolphin-plugins-*: Fix file collision between split packages
Closes: https://bugs.gentoo.org/702626
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../dolphin-plugins-bazaar-19.12.49.9999.ebuild | 5 +++++
kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-9999.ebuild | 5 +++++
.../dolphin-plugins-dropbox-19.12.49.9999.ebuild | 5 +++++
kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-9999.ebuild | 5 +++++
.../dolphin-plugins-git/dolphin-plugins-git-19.12.49.9999.ebuild | 5 +++++
kde-apps/dolphin-plugins-git/dolphin-plugins-git-9999.ebuild | 5 +++++
.../dolphin-plugins-mercurial-19.12.49.9999.ebuild | 5 +++++
.../dolphin-plugins-mercurial/dolphin-plugins-mercurial-9999.ebuild | 5 +++++
.../dolphin-plugins-subversion-19.12.49.9999.ebuild | 5 +++++
.../dolphin-plugins-subversion-9999.ebuild | 5 +++++
10 files changed, 50 insertions(+)
diff --git a/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-19.12.49.9999.ebuild b/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-19.12.49.9999.ebuild
index 1614a0429b..5fe6f56c63 100644
--- a/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-19.12.49.9999.ebuild
+++ b/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-19.12.49.9999.ebuild
@@ -54,3 +54,8 @@ src_configure() {
)
ecm_src_configure
}
+
+src_install() {
+ ecm_src_install
+ rm "${D}"/usr/share/metainfo/org.kde.dolphin-plugins.metainfo.xml || die
+}
diff --git a/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-9999.ebuild b/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-9999.ebuild
index 71aa7ad535..9bce34a609 100644
--- a/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-9999.ebuild
+++ b/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-9999.ebuild
@@ -54,3 +54,8 @@ src_configure() {
)
ecm_src_configure
}
+
+src_install() {
+ ecm_src_install
+ rm "${D}"/usr/share/metainfo/org.kde.dolphin-plugins.metainfo.xml || die
+}
diff --git a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.12.49.9999.ebuild b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.12.49.9999.ebuild
index 2c4a4f686d..13b85b590f 100644
--- a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.12.49.9999.ebuild
+++ b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.12.49.9999.ebuild
@@ -53,3 +53,8 @@ src_configure() {
)
ecm_src_configure
}
+
+src_install() {
+ ecm_src_install
+ rm "${D}"/usr/share/metainfo/org.kde.dolphin-plugins.metainfo.xml || die
+}
diff --git a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-9999.ebuild b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-9999.ebuild
index b8640bfd9e..f5249cc54a 100644
--- a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-9999.ebuild
+++ b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-9999.ebuild
@@ -53,3 +53,8 @@ src_configure() {
)
ecm_src_configure
}
+
+src_install() {
+ ecm_src_install
+ rm "${D}"/usr/share/metainfo/org.kde.dolphin-plugins.metainfo.xml || die
+}
diff --git a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-19.12.49.9999.ebuild b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-19.12.49.9999.ebuild
index a871d83d14..00f404df6e 100644
--- a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-19.12.49.9999.ebuild
+++ b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-19.12.49.9999.ebuild
@@ -56,3 +56,8 @@ src_configure() {
)
ecm_src_configure
}
+
+src_install() {
+ ecm_src_install
+ rm "${D}"/usr/share/metainfo/org.kde.dolphin-plugins.metainfo.xml || die
+}
diff --git a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-9999.ebuild b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-9999.ebuild
index 6232424a53..2c89f67aa5 100644
--- a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-9999.ebuild
+++ b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-9999.ebuild
@@ -56,3 +56,8 @@ src_configure() {
)
ecm_src_configure
}
+
+src_install() {
+ ecm_src_install
+ rm "${D}"/usr/share/metainfo/org.kde.dolphin-plugins.metainfo.xml || die
+}
diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.12.49.9999.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.12.49.9999.ebuild
index d9241f55ce..413d22de9b 100644
--- a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.12.49.9999.ebuild
+++ b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.12.49.9999.ebuild
@@ -59,3 +59,8 @@ src_configure() {
)
ecm_src_configure
}
+
+src_install() {
+ ecm_src_install
+ rm "${D}"/usr/share/metainfo/org.kde.dolphin-plugins.metainfo.xml || die
+}
diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-9999.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-9999.ebuild
index 867446fa65..784865c500 100644
--- a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-9999.ebuild
+++ b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-9999.ebuild
@@ -59,3 +59,8 @@ src_configure() {
)
ecm_src_configure
}
+
+src_install() {
+ ecm_src_install
+ rm "${D}"/usr/share/metainfo/org.kde.dolphin-plugins.metainfo.xml || die
+}
diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-19.12.49.9999.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-19.12.49.9999.ebuild
index af57bd5c3c..9106f392be 100644
--- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-19.12.49.9999.ebuild
+++ b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-19.12.49.9999.ebuild
@@ -55,3 +55,8 @@ src_configure() {
)
ecm_src_configure
}
+
+src_install() {
+ ecm_src_install
+ rm "${D}"/usr/share/metainfo/org.kde.dolphin-plugins.metainfo.xml || die
+}
diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-9999.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-9999.ebuild
index d041de3874..daec9da4e0 100644
--- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-9999.ebuild
+++ b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-9999.ebuild
@@ -55,3 +55,8 @@ src_configure() {
)
ecm_src_configure
}
+
+src_install() {
+ ecm_src_install
+ rm "${D}"/usr/share/metainfo/org.kde.dolphin-plugins.metainfo.xml || die
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/dolphin-plugins-mercurial/, kde-apps/dolphin-plugins-git/, ...
@ 2020-05-26 16:31 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2020-05-26 16:31 UTC (permalink / raw
To: gentoo-commits
commit: 26499ebdf73454a09e67beeb753bdf3bc83f9ed4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May 26 15:55:04 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 26 15:55:04 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=26499ebd
kde-apps/dolphin-plugins*: Sort dependencies
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../dolphin-plugins-dropbox/dolphin-plugins-dropbox-9999.ebuild | 8 ++++----
kde-apps/dolphin-plugins-git/dolphin-plugins-git-9999.ebuild | 6 +++---
.../dolphin-plugins-mercurial-9999.ebuild | 6 +++---
.../dolphin-plugins-subversion-9999.ebuild | 8 ++++----
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-9999.ebuild b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-9999.ebuild
index 1d03b2ddfc..e72ec6528f 100644
--- a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-9999.ebuild
+++ b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-9999.ebuild
@@ -20,15 +20,15 @@ KEYWORDS=""
IUSE=""
DEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/dolphin-${PVCUT}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
>=kde-frameworks/ktextwidgets-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-apps/dolphin-${PVCUT}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
"
RDEPEND="${DEPEND}
!kde-apps/dolphin-plugins:5
diff --git a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-9999.ebuild b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-9999.ebuild
index b32a08c5a9..e503f9092f 100644
--- a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-9999.ebuild
+++ b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-9999.ebuild
@@ -20,15 +20,15 @@ KEYWORDS=""
IUSE=""
DEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/dolphin-${PVCUT}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
>=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-apps/dolphin-${PVCUT}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
"
RDEPEND="${DEPEND}
!kde-apps/dolphin-plugins:5
diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-9999.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-9999.ebuild
index b3559097a4..2a6e585468 100644
--- a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-9999.ebuild
+++ b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-9999.ebuild
@@ -20,6 +20,9 @@ KEYWORDS=""
IUSE=""
DEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/dolphin-${PVCUT}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
@@ -29,9 +32,6 @@ DEPEND="
>=kde-frameworks/ktexteditor-${KFMIN}:5
>=kde-frameworks/ktextwidgets-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-apps/dolphin-${PVCUT}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
"
RDEPEND="${DEPEND}
!kde-apps/dolphin-plugins:5
diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-9999.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-9999.ebuild
index a4f9dcce22..3cd266bb6a 100644
--- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-9999.ebuild
+++ b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-9999.ebuild
@@ -20,18 +20,18 @@ KEYWORDS=""
IUSE=""
DEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/dolphin-${PVCUT}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
>=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-apps/dolphin-${PVCUT}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
"
RDEPEND="${DEPEND}
!kde-apps/dolphin-plugins:5
- >=kde-apps/kompare-${PVCUT}:5
dev-vcs/subversion
+ >=kde-apps/kompare-${PVCUT}:5
"
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/dolphin-plugins-mercurial/, kde-apps/dolphin-plugins-git/, ...
@ 2020-05-26 16:31 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2020-05-26 16:31 UTC (permalink / raw
To: gentoo-commits
commit: 2933775f8f47e476a2b9d3b6d821fcb2ee3cc848
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May 26 16:07:30 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 26 16:24:02 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=2933775f
kde-apps/dolphin-plugins*: Disable mountiso and punt its exclusive deps
Upstream commits:
f7f2f62606f8cfa87ec23d5924b70d4b419234e1
f6f1a4808a8ff8e19b3f434479c473f4f9b48d07
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-9999.ebuild | 4 ++++
kde-apps/dolphin-plugins-git/dolphin-plugins-git-9999.ebuild | 4 ++++
.../dolphin-plugins-mercurial/dolphin-plugins-mercurial-9999.ebuild | 4 ++++
.../dolphin-plugins-subversion/dolphin-plugins-subversion-9999.ebuild | 4 ++++
4 files changed, 16 insertions(+)
diff --git a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-9999.ebuild b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-9999.ebuild
index e72ec6528f..d3c1589d94 100644
--- a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-9999.ebuild
+++ b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-9999.ebuild
@@ -37,6 +37,9 @@ RDEPEND="${DEPEND}
src_prepare() {
ecm_src_prepare
+ # solid, qtdbus only required by mountiso
+ ecm_punt_bogus_dep Qt5 DBus
+ ecm_punt_bogus_dep KF5 Solid
# delete non-${PN} translations
if [[ ${KDE_BUILD_TYPE} = release ]]; then
find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
@@ -49,6 +52,7 @@ src_configure() {
-DBUILD_bazaar=OFF
-DBUILD_git=OFF
-DBUILD_hg=OFF
+ -DBUILD_mountiso=OFF
-DBUILD_svn=OFF
)
ecm_src_configure
diff --git a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-9999.ebuild b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-9999.ebuild
index e503f9092f..f22826fd78 100644
--- a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-9999.ebuild
+++ b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-9999.ebuild
@@ -37,6 +37,9 @@ RDEPEND="${DEPEND}
src_prepare() {
ecm_src_prepare
+ # solid, qtdbus only required by mountiso
+ ecm_punt_bogus_dep Qt5 DBus
+ ecm_punt_bogus_dep KF5 Solid
# kxmlgui, qtnetwork only required by dropbox
ecm_punt_bogus_dep Qt5 Network
ecm_punt_bogus_dep KF5 XmlGui
@@ -52,6 +55,7 @@ src_configure() {
-DBUILD_bazaar=OFF
-DBUILD_dropbox=OFF
-DBUILD_hg=OFF
+ -DBUILD_mountiso=OFF
-DBUILD_svn=OFF
)
ecm_src_configure
diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-9999.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-9999.ebuild
index 2a6e585468..c6276d704f 100644
--- a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-9999.ebuild
+++ b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-9999.ebuild
@@ -40,6 +40,9 @@ RDEPEND="${DEPEND}
src_prepare() {
ecm_src_prepare
+ # solid, qtdbus only required by mountiso
+ ecm_punt_bogus_dep Qt5 DBus
+ ecm_punt_bogus_dep KF5 Solid
# kxmlgui, qtnetwork only required by dropbox
ecm_punt_bogus_dep Qt5 Network
ecm_punt_bogus_dep KF5 XmlGui
@@ -55,6 +58,7 @@ src_configure() {
-DBUILD_bazaar=OFF
-DBUILD_dropbox=OFF
-DBUILD_git=OFF
+ -DBUILD_mountiso=OFF
-DBUILD_svn=OFF
)
ecm_src_configure
diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-9999.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-9999.ebuild
index 3cd266bb6a..82fa20fe6b 100644
--- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-9999.ebuild
+++ b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-9999.ebuild
@@ -36,6 +36,9 @@ RDEPEND="${DEPEND}
src_prepare() {
ecm_src_prepare
+ # solid, qtdbus only required by mountiso
+ ecm_punt_bogus_dep Qt5 DBus
+ ecm_punt_bogus_dep KF5 Solid
# kxmlgui, qtnetwork only required by dropbox
ecm_punt_bogus_dep Qt5 Network
ecm_punt_bogus_dep KF5 XmlGui
@@ -52,6 +55,7 @@ src_configure() {
-DBUILD_dropbox=OFF
-DBUILD_git=OFF
-DBUILD_hg=OFF
+ -DBUILD_mountiso=OFF
)
ecm_src_configure
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-05-26 16:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-26 16:31 [gentoo-commits] proj/kde:master commit in: kde-apps/dolphin-plugins-mercurial/, kde-apps/dolphin-plugins-git/, Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2020-05-26 16:31 Andreas Sturmlechner
2019-12-12 23:55 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox