[gentoo-commits] proj/kde:master commit in: kde-apps/oxygen-icons/

[Michael Palimaka]

commit:     741dbc422877f4df321cfd790e94bcaf9149abe2
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  1 13:36:42 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Dec  2 10:02:10 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=741dbc42

[kde-apps/oxygen-icons] Update for KDE Applications.

Package-Manager: portage-2.2.14

---
 kde-apps/oxygen-icons/oxygen-icons-14.11.97.ebuild | 19 +++++++++----------
 kde-apps/oxygen-icons/oxygen-icons-9999.ebuild     | 20 +++++++++-----------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/kde-apps/oxygen-icons/oxygen-icons-14.11.97.ebuild 
b/kde-apps/oxygen-icons/oxygen-icons-14.11.97.ebuild
index 3d1d49c..f829295 100644
--- a/kde-apps/oxygen-icons/oxygen-icons-14.11.97.ebuild
+++ b/kde-apps/oxygen-icons/oxygen-icons-14.11.97.ebuild
@@ -7,21 +7,20 @@ EAPI=5
 if [[ ${PV} == *9999 ]]; then
        KMNAME="kdesupport"
 fi
-KDE_REQUIRED="never"
+KDE_AUTODEPS="false"
 KDE_SCM="svn"
-inherit kde4-base
+inherit kde5
 
 DESCRIPTION="Oxygen SVG icon theme"
 HOMEPAGE="http://www.oxygen-icons.org/";
-[[ ${PV} == *9999 ]] || \
-#SRC_URI="
-#      !bindist? ( http://dev.gentoo.org/~johu/distfiles/${P}.repacked.tar.xz )
-#      bindist? ( ${SRC_URI} )
-#"
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+       SRC_URI="
+               bindist? ( ${SRC_URI} )
+       "
+fi
 
 LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux 
~x86-linux"
+KEYWORDS=" ~amd64 ~x86"
 IUSE="bindist"
 
-DEPEND=""
-RDEPEND="${DEPEND}"
+RDEPEND="!kde-base/oxygen-icons:4"

diff --git a/kde-apps/oxygen-icons/oxygen-icons-9999.ebuild 
b/kde-apps/oxygen-icons/oxygen-icons-9999.ebuild
index dc0c7a5..f8578d6 100644
--- a/kde-apps/oxygen-icons/oxygen-icons-9999.ebuild
+++ b/kde-apps/oxygen-icons/oxygen-icons-9999.ebuild
@@ -7,23 +7,21 @@ EAPI=5
 if [[ ${PV} == *9999 ]]; then
        KMNAME="kdesupport"
 fi
-KDE_REQUIRED="never"
+KDE_AUTODEPS="false"
 KDE_SCM="svn"
-inherit kde4-base
+inherit kde5
 
 DESCRIPTION="Oxygen SVG icon theme"
 HOMEPAGE="http://www.oxygen-icons.org/";
-[[ ${PV} == *9999 ]] || \
-SRC_URI="
-       !bindist? ( http://dev.gentoo.org/~johu/distfiles/${P}.repacked.tar.xz )
-       bindist? ( ${SRC_URI} )
-"
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+       SRC_URI="
+               !bindist? ( 
http://dev.gentoo.org/~johu/distfiles/${P}.repacked.tar.xz )
+               bindist? ( ${SRC_URI} )
+       "
+fi
 
 LICENSE="LGPL-3"
 KEYWORDS=""
 IUSE="bindist"
 
-DEPEND=""
-RDEPEND="${DEPEND}
-       !kde-base/oxygen-icons
-"
+RDEPEND="!kde-base/oxygen-icons:4"