summaryrefslogtreecommitdiff
path: root/dev-qt/qtgui
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-10-13 22:19:36 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-10-14 23:22:23 +0100
commit4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree76e74807bc479502e13866b581b6bf86734ec634 /dev-qt/qtgui
parent30d6f67c98d149508509d5e86f176d558793acc0 (diff)
gentoo resync : 13.10.2019
Diffstat (limited to 'dev-qt/qtgui')
-rw-r--r--dev-qt/qtgui/Manifest8
-rw-r--r--dev-qt/qtgui/qtgui-5.12.3-r1.ebuild2
-rw-r--r--dev-qt/qtgui/qtgui-5.12.5.ebuild2
3 files changed, 4 insertions, 8 deletions
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index caa14937747f..808e0947420c 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,10 +1,6 @@
AUX qt-5.12-gcc-avx2.patch 1038 BLAKE2B cb54308c8ef4df9efaa8727ba292b7e959ae069237f8dbc6c7432556c4697f0263dca098f348b0afe94cc93359f929c564c8201a60d585b5907b6bd497369e24 SHA512 0eb51d41996bf42bc896eef53d2e335777c6c6f56fe027581f8b636a57759c98b3f08a5330c9fdeb0054aaa1955024140b161fd19c6457cc66fe68414b1cd8ff
DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660
-EBUILD qtgui-5.12.3-r1.ebuild 3719 BLAKE2B 6d8b24192afbda0c9f4955ef6127fa1b334cdfde00a8e78c9eeffc52496d0a8801642c21bc8dd730ed67373c32f738d4f804e6cc3a5901b38360eb39d15caf27 SHA512 5ad5f7b427fb989f0f3bbed475932808d7b598b53d9e16bd25bbb57ec75127c6ccc42295e26446be29516a881bd42989936c665ef48af2ff2c984d617aeb4a16
-<<<<<<< HEAD
-EBUILD qtgui-5.12.4.ebuild 3866 BLAKE2B ad2901c3c6d701c11fce868f9a82e9f986b26fac54bd89a7b4727f0195ae2e881b5f2daa79f3fc433864d6de2daed9fed18aa58acbe9686b4ea523234bb801a1 SHA512 03c883fe4d9f8941b8274d08898ee9d0711719025d16550ed4b00a21e85000ec7edf14e805ad62fbb869a2b942ace5d0932af990128218390ae53954ebd40774
-=======
->>>>>>> next
-EBUILD qtgui-5.12.5.ebuild 3807 BLAKE2B 8a746b5c5fea17dbe9b67d80aa0b6ae31e6ed0a8e2a8837e5d39f738bf32030c2512cc6ccbf57af5425fcf6695177a28fbd9a2ddf98a2fc2b9e294137c378ad6 SHA512 f4d7fba9990fccc579b720c9361f81567e9faa1e5518a38a5ab32d6cf79b64d7b2cdbfc44979f0d8687ab0c47abeb48c10b547d2aed107b6413671f884ade87a
+EBUILD qtgui-5.12.3-r1.ebuild 3707 BLAKE2B b73f820eded407365f5cb7d3a0938dd938a8e5e0573ec7051bb8375424accb8c1d84d50e4673f7504ed76d53d9bc57f9b1ceb64da3f0e883a729d06ad082b9ac SHA512 8afedb468ff74a47d1974858a2d6e67a5a158bd1540195a7211f3109c48c7ce62a293eeb47215eddca0c4126c0729ae5282fb0b9ebd3482fc2262bc9521f2877
+EBUILD qtgui-5.12.5.ebuild 3795 BLAKE2B 6384f89a915a5dae2afb3587c6372af21775a00aa1f6a7dec081a38b0fc23792877eebea19642c3d1fe1f113f1a3adfa0fed80e0c870faf7f007be29f11ef549 SHA512 89c72d955fcabcb2d67efb68f888b1e97f021ce1d708caf67c1b8e41914fdf73ca6317d4f8e4eb81b1b1cba4d1f868e613a8338d729c6dad704e1e8c6832e5a5
MISC metadata.xml 1322 BLAKE2B b6161b568e3a4c34a8fce62a8cce9e1bd7cabbc0d2d2baa0e5e41295974b877d59adff4983b731bb359040f3662999a7915a1527bedeca9de09eb702541d1ae7 SHA512 dcfcdc8f5622e5d6b8488f07b6de62aae829b564ecdb9fb8b9f273bc2593c312f5265849bb3d2175d0ab468977ac2afb8099519cfb66224d8e5df0efec01ae4a
diff --git a/dev-qt/qtgui/qtgui-5.12.3-r1.ebuild b/dev-qt/qtgui/qtgui-5.12.3-r1.ebuild
index 96f73a515635..1487a3600a91 100644
--- a/dev-qt/qtgui/qtgui-5.12.3-r1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.12.3-r1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
+ KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
fi
# TODO: linuxfb
diff --git a/dev-qt/qtgui/qtgui-5.12.5.ebuild b/dev-qt/qtgui/qtgui-5.12.5.ebuild
index c8c5675f6c31..6bec13c736d1 100644
--- a/dev-qt/qtgui/qtgui-5.12.5.ebuild
+++ b/dev-qt/qtgui/qtgui-5.12.5.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
fi
# TODO: linuxfb