diff options
Diffstat (limited to 'kde-plasma/oxygen')
| -rw-r--r-- | kde-plasma/oxygen/Manifest | 4 | ||||
| -rw-r--r-- | kde-plasma/oxygen/oxygen-5.12.5.ebuild (renamed from kde-plasma/oxygen/oxygen-5.12.4.ebuild) | 59 |
2 files changed, 8 insertions, 55 deletions
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest index a09175d97451..017f71aed587 100644 --- a/kde-plasma/oxygen/Manifest +++ b/kde-plasma/oxygen/Manifest @@ -1,5 +1,5 @@ DIST oxygen-5.11.5.tar.xz 4489196 BLAKE2B 89d8e9742a68b59ad03c697875ca8e1e49e253668db0081a04922b057a7ba67bba1ab785e1507bf4e16ceb3ffa63f5adda54fead63a1704d7fe4298408db4b63 SHA512 101b9a3ace2e619510702feba868bb98cb873b18730d3705803e047ce2b0c0a761c884e1714fc654f85775e461c0784d199baa1b9026c6b8f8a4cfecce2e4209 -DIST oxygen-5.12.4.tar.xz 4467084 BLAKE2B d5cc747e8fef63f06d66b10838a00e144b07a6bf1d4fe5cff63de338f308e457701c075dee5cd8825f87c476b27e9d39833e0ece172745dededdc46bb120e7d3 SHA512 826a8b803dc97cd9d16b982ddd70c75d973fdfdc993ee510720113abedfdb6527c1cf4b1eb42a2b5ffa0c486d52100e43da7eb46fe648db99631dafe1af61094 +DIST oxygen-5.12.5.tar.xz 4467896 BLAKE2B f9477184cc13553086f6b828ab953dc91e42aa9bd50a85d553ed7347e2e588dfc8b5aaab9eec12481e20121044ebd4412fc728e22d437ede54451c0a2245c6be SHA512 92acb2cc2033a8b07a0ac75772f696f5c1196e0c5a424ba6146d576bc956fcfc172b4a65a79551b2d43be4b56d5289bee091ebb837fe40dc60f076ca7d5898b4 EBUILD oxygen-5.11.5.ebuild 1978 BLAKE2B 6948b48c969b6ab6bdf8eaa5a9c2ec0c4c20c770e1ee79f5fbfe47f5ad6f2d3f1a98870883393f836022902e2879ed17cc509f1081c15b3d8d94dddef23f804b SHA512 6d6a1708c3af1600865fc59db2e538e200a6f4c77953016da7493f68c00b237218192fd786e94fbb15e3d5b0fd68d768e60e5380a97e8f4d729706c9f94b5a04 -EBUILD oxygen-5.12.4.ebuild 1980 BLAKE2B 333bef6be5233d9d3c745b076479042f29b03a19ab64f64e62e096cd98f4466628c6e9c7ad36e4a8bc3a12c37cf6393ccae8956f51b6065c6f06ca2bd13e0548 SHA512 bb68d16cb3675a33275b6d277bf97756e8064cbd614170ff8741fe0dff245f83c356c6498dbbdeee452333a36154ae3d89263cd968fca272ff3431ac41e4040c +EBUILD oxygen-5.12.5.ebuild 1131 BLAKE2B 22ba1a44212c649c6582e6253eaed956e3621d6ca94b989948d20fd99699ac5afaae812334f303a8a54b88377af1548792679eaf28db6693beb0b62d2628bef5 SHA512 74e9ce2fb1e37ff8395ca820a1ece9bf28623fe7aaecd41b59bde2572601f048c4a0ffcbfd5b1f68536b13744eaa0dc06d4552c4e13d7d56e89ccc2a7db2c30a MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-plasma/oxygen/oxygen-5.12.4.ebuild b/kde-plasma/oxygen/oxygen-5.12.5.ebuild index ebd8d663ea95..dbf174a24cc8 100644 --- a/kde-plasma/oxygen/oxygen-5.12.4.ebuild +++ b/kde-plasma/oxygen/oxygen-5.12.5.ebuild @@ -3,12 +3,12 @@ EAPI=6 -inherit flag-o-matic kde5 multibuild +inherit kde5 DESCRIPTION="Oxygen visual style for the Plasma desktop" HOMEPAGE="https://cgit.kde.org/oxygen.git" KEYWORDS="~amd64 ~arm ~x86" -IUSE="qt4 wayland" +IUSE="wayland" COMMON_DEPEND=" $(add_frameworks_dep frameworkintegration) @@ -28,66 +28,19 @@ COMMON_DEPEND=" $(add_qt_dep qtwidgets) $(add_qt_dep qtx11extras) x11-libs/libxcb - qt4? ( - >=dev-qt/qtcore-4.8.7-r2:4 - >=dev-qt/qtdbus-4.8.7:4 - >=dev-qt/qtgui-4.8.7:4 - kde-frameworks/kdelibs:4 - x11-libs/libX11 - ) wayland? ( $(add_frameworks_dep kwayland) ) " DEPEND="${COMMON_DEPEND} $(add_frameworks_dep kservice) - qt4? ( - dev-util/automoc:0 - virtual/pkgconfig - ) " RDEPEND="${COMMON_DEPEND} $(add_plasma_dep kde-cli-tools) - qt4? ( - !kde-plasma/kstyles:4 - !kde-plasma/liboxygenstyle:4 - ) !kde-plasma/kdebase-cursors:4 " -pkg_setup() { - kde5_pkg_setup - MULTIBUILD_VARIANTS=( kf5 $(usev qt4) ) -} - src_configure() { - myconfigure() { - local mycmakeargs=() - - if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then - use debug || append-cppflags -DQT_NO_DEBUG - mycmakeargs+=( - -DUSE_KDE4=true - -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc - ) - cmake-utils_src_configure - else - mycmakeargs+=( - $(cmake-utils_use_find_package wayland KF5Wayland) - ) - kde5_src_configure - fi - } - - multibuild_foreach_variant myconfigure -} - -src_compile() { - multibuild_foreach_variant kde5_src_compile -} - -src_test() { - multibuild_foreach_variant kde5_src_test -} - -src_install() { - multibuild_foreach_variant kde5_src_install + local mycmakeargs=( + $(cmake-utils_use_find_package wayland KF5Wayland) + ) + kde5_src_configure } |