From bd7908c6630f38067350d396ac5d18c3cc2434a0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 29 Oct 2017 11:22:34 +0000 Subject: gentoo resync : 29.10.2017 --- kde-plasma/oxygen/Manifest | 4 +- kde-plasma/oxygen/oxygen-5.11.1.ebuild | 91 ------------------------------- kde-plasma/oxygen/oxygen-5.11.2.ebuild | 97 ++++++++++++++++++++++++++++++++++ 3 files changed, 99 insertions(+), 93 deletions(-) delete mode 100644 kde-plasma/oxygen/oxygen-5.11.1.ebuild create mode 100644 kde-plasma/oxygen/oxygen-5.11.2.ebuild (limited to 'kde-plasma/oxygen') diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest index 0f25d2bba63c..3cc3674d5784 100644 --- a/kde-plasma/oxygen/Manifest +++ b/kde-plasma/oxygen/Manifest @@ -1,7 +1,7 @@ DIST oxygen-5.10.5.tar.xz 4468276 SHA256 a97a01d0db02b4b1574f5652a9ff1ffef84b085ed67c2b8f68b3818d56d6315c SHA512 176db69036a3da47544075b9b83059f48d6037be21095ffc622811982bf32ece357a37f501f0528abf6ddd974c5c7d680474c325b752bd2f425c81a33fe94f71 WHIRLPOOL e7218e619045d6df5262f478a1962ab1e4393889ba182912758bf0303a00e09b3efef2ec6e37190fce7c62fd14352afad0142b6edc2ffabf68e784ecc624b9f1 -DIST oxygen-5.11.1.tar.xz 4464660 SHA256 3f0544c0376ac98f063dca14f7c0414a69cff775b1e67e4033922d5630a17e2c SHA512 9d3881e6b818a0a80d156a4db9b8b89a40f99bf97ca3b177498d8adbf5f34cb8a8683097dfbb8001c9378f8b2493c05001655c27fc3b41bde1f1b3f310c82322 WHIRLPOOL 53da73124fa2113ca2527880b2030a1fece716e0f7ccd89befeac4ee645e27aceadbe5aeef5b296ebc2492d453bbbff3c1cc7b1a029875331fb706ada26e5ba8 +DIST oxygen-5.11.2.tar.xz 4472224 SHA256 21a9831d03c25955f5381fa8c27e0afa6b024e2c4bf355a982edd38305e0d3a2 SHA512 98cc4a51a222aab50e20126a8c08525473fa41d8a04f316fafc2a079f77c9024f68d6409e335c8ab50d09cebff2e77f806e48be8b6d6e2b5e1b81e28f432d114 WHIRLPOOL 9e6cc87090af17e71e390bf57caba3efc55908a6081dc8b30c97ddc078249532fa071e2a6effb251febf87169a597e94e22cbd7189062f4d24a9fd2adb278e6b EBUILD oxygen-5.10.5.ebuild 1996 SHA256 ca284b286577e826633e45b7bd427ac636d7616a8f59b5e1a7652371d585cfa5 SHA512 22ba19d1265b008ab95f15b19959d53de0bfb09f7fe5fc586606a611a192823274043ac4fc03f6ae324456aef7a4ab959701b45c669efb51119ab8ddaa23bbc3 WHIRLPOOL 1b677166a0b2db59535c17c68a1e52cf74631bde1f29dafc0b397498c942711d2fc8efc905b7dd8dca5bc37050c0b37a3cf0defb8d830d307b773dec3659d4e1 -EBUILD oxygen-5.11.1.ebuild 1998 SHA256 6d7b1460f61285908830117d0824e9e15c9d99ee4a984ce012e44ec020a5a8b8 SHA512 98c37a9a0b15ae1f093eb2204154bbad2118cea67f5c512159f4b9fa554b1905fe58f199ec691e49e4da2af0abb0606a361ef617783d18a2848938cfb2af9985 WHIRLPOOL d3e79f74eb24946682dc8a44a04cb356fb86eb9aaf0722cbec2ab1b8c33b42935e26abc3089f8f67f0ce10a05f71d96d0255ad0a681ae9758248f755103e746b +EBUILD oxygen-5.11.2.ebuild 2141 SHA256 52af8a93f88a432a5d5ee570c20f223ef8203a2cb6defe961301640429abf4a0 SHA512 5d3c5aedcc34390aebc739aa7362c351c2f53153c6f30db51001db6ff2e0469074b7689aa8f5762309ed4c910a5a63efb51d5693af43efa82e599136f9beeb19 WHIRLPOOL dcc0e399ef4e624e936e72d985809d66a35500566196a2f11b38e890fbf4445f7cdfb7efe2292f65f04c9d73f57156b71f95648dedc01ec754260a4d781e18d0 MISC ChangeLog 13152 SHA256 cc7b005adc5ed1b6fd423fd68a2b62d1faf1d9bff6f841c481d9615deb09257b SHA512 596dde0ebdf0b7c096d5e1b8f8e13df34f8ff8d68e1f4d6ae347ca7c3ccbd7b24e9148739d9f7ab5907bd7a5f387bdf3699bc863761397d8688d0b98f1a503f5 WHIRLPOOL d0bc9657c46adb679a67a80b759b799b7f0b77ac4ee702faed0ad2f79faecfe40d9755886f897cf015129c75edc8c8b35354e3925ce131f60c34f0323e75828c MISC ChangeLog-2015 696 SHA256 a0835cf04e221f63a851870aa2b0c27e96af2934f417944223bc5660c13a2bc1 SHA512 b85804e18ac74f5162097474f3573da3f1d3a7447467879b29f73ceffead39b14fb666ea1c9737dcb033043f70e3d50b7cad4258277dd91a9c2bc5f18772f68b WHIRLPOOL 7cfe39d1e4aaeee37a331d1d9bdaeb86823388604b789c3ca98fc66174ec534bcdb9cbd4d1c64f8bedf4a980823d04608ebcc667dd7388feec564902e19b6faa MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c diff --git a/kde-plasma/oxygen/oxygen-5.11.1.ebuild b/kde-plasma/oxygen/oxygen-5.11.1.ebuild deleted file mode 100644 index 322e8762a9df..000000000000 --- a/kde-plasma/oxygen/oxygen-5.11.1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit kde5 multibuild - -DESCRIPTION="Oxygen visual style for the Plasma desktop" -HOMEPAGE="https://projects.kde.org/projects/kde/workspace/oxygen" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="qt4 wayland" - -COMMON_DEPEND=" - $(add_frameworks_dep frameworkintegration) - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_plasma_dep kdecoration) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(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() { - if use qt4 && [[ $(gcc-major-version) -lt 5 ]] ; then - ewarn "A GCC version older than 5 was detected. There may be trouble. See also Gentoo bug #595618" - fi - - kde5_pkg_setup - MULTIBUILD_VARIANTS=( kf5 $(usev qt4) ) -} - -src_configure() { - myconfigure() { - local mycmakeargs=( - $(cmake-utils_use_find_package wayland KF5Wayland) - ) - - if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then - mycmakeargs+=( -DUSE_KDE4=true ) - fi - - kde5_src_configure - } - - 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 -} diff --git a/kde-plasma/oxygen/oxygen-5.11.2.ebuild b/kde-plasma/oxygen/oxygen-5.11.2.ebuild new file mode 100644 index 000000000000..247a5aaaf357 --- /dev/null +++ b/kde-plasma/oxygen/oxygen-5.11.2.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit flag-o-matic kde5 multibuild + +DESCRIPTION="Oxygen visual style for the Plasma desktop" +HOMEPAGE="https://cgit.kde.org/oxygen.git" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="qt4 wayland" + +COMMON_DEPEND=" + $(add_frameworks_dep frameworkintegration) + $(add_frameworks_dep kcmutils) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kguiaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_plasma_dep kdecoration) + $(add_qt_dep qtdbus) + $(add_qt_dep qtdeclarative) + $(add_qt_dep qtgui) + $(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() { + if use qt4 && [[ $(gcc-major-version) -lt 5 ]] ; then + ewarn "A GCC version older than 5 was detected. There may be trouble. See also Gentoo bug #595618" + fi + + 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 +} -- cgit v1.2.3