From 27c8db100c1925d8f3368b73eb4a11578113e39f Mon Sep 17 00:00:00 2001
From: Joost Ruis <joost.ruis@sabayonlinux.org>
Date: Wed, 6 Apr 2011 18:19:56 +0000
Subject: [PATCH] [kde-base/oxygen-icons] Version bump to 4.6.2, remove older
 versions.

---
 kde-base/oxygen-icons/Manifest                |  8 ++---
 .../oxygen-icons/oxygen-icons-4.4.5-r1.ebuild | 35 -------------------
 .../oxygen-icons-4.5.5-r10.ebuild             | 35 -------------------
 ...4.6.0.ebuild => oxygen-icons-4.6.2.ebuild} |  5 +--
 4 files changed, 5 insertions(+), 78 deletions(-)
 delete mode 100644 kde-base/oxygen-icons/oxygen-icons-4.4.5-r1.ebuild
 delete mode 100644 kde-base/oxygen-icons/oxygen-icons-4.5.5-r10.ebuild
 rename kde-base/oxygen-icons/{oxygen-icons-4.6.0.ebuild => oxygen-icons-4.6.2.ebuild} (80%)

diff --git a/kde-base/oxygen-icons/Manifest b/kde-base/oxygen-icons/Manifest
index 72e67088e..e273d09e9 100644
--- a/kde-base/oxygen-icons/Manifest
+++ b/kde-base/oxygen-icons/Manifest
@@ -1,10 +1,6 @@
 DIST fdo-icons-sabayon4.tar.gz 1020797 RMD160 63bdaba5248fe94d68818f7de65ccfd2e993b539 SHA1 8e876f318d0b3299e9c0b1382396d8f6eae91168 SHA256 0c70090a3db280d7d24533955e5368707aee8bce2d1f771ecea6e56ad90e59eb
-DIST oxygen-icons-4.4.5.tar.bz2 138168441 RMD160 4407ddfb83a1f473cdd8fec198b2a441372f0e30 SHA1 aac74fa4c1b54b7a95ce2e6538e30f958dcb1c20 SHA256 275fa03715e4f0e693d7d725fa103b77662dd05e2a4aecef584791423f82ce96
-DIST oxygen-icons-4.5.5.tar.bz2 30249177 RMD160 3ff4462f3229534b4bed34428b4d2a011d66a88d SHA1 421d1be493d9ab8241a6c2ab088ba893bf384d47 SHA256 519d916ac3ecba8bf55a867553fcc10c145e8d751124b0ce4473ed19e1c3575e
-DIST oxygen-icons-4.6.0.tar.xz 25738596 RMD160 57a31b8ac1fedb1128e0416bc69bda014ac0d4c6 SHA1 84ac4e42296fe07941238ac45db3026251466b57 SHA256 591bde087261071fce1a5d7b6ba654d61b3f8fcd5ac08a9ba41e5530b6b4670c
 DIST oxygen-icons-4.6.1.tar.xz 25781408 RMD160 9d3c67ee186611bff0e3824741e48b558ed2df16 SHA1 39f0164546a6c69ddb697f2778bc7e10e0546969 SHA256 80e3b380dfeddfda41a103de4b2e389358cfdadaceefbe5aad11b8e50ef3a97c
-EBUILD oxygen-icons-4.4.5-r1.ebuild 894 RMD160 4b5ec494b5a16934c0bd64d6235f62d697a60248 SHA1 6148482c246ff0c91e75f58be40ccbe36523f705 SHA256 099da2301f8bb18d825dd309b9852e598a0692193f4c7a6586ffae0c79ac4b2a
-EBUILD oxygen-icons-4.5.5-r10.ebuild 894 RMD160 4b5ec494b5a16934c0bd64d6235f62d697a60248 SHA1 6148482c246ff0c91e75f58be40ccbe36523f705 SHA256 099da2301f8bb18d825dd309b9852e598a0692193f4c7a6586ffae0c79ac4b2a
-EBUILD oxygen-icons-4.6.0.ebuild 915 RMD160 ef53a6c2aad6dfd82f9cf6508548f55f6e216e0c SHA1 7540650bd6f6c84118e59ef8e5e2c98b508b14ef SHA256 642cbec887f866dbeb5abac5ea4af3dd9336348384fcc029f12e1e1c24090223
+DIST oxygen-icons-4.6.2.tar.xz 26034404 RMD160 19dbd26235978d8b5996c8017fbd4f29d69851cf SHA1 110ae7130846c9e2c18050d6491fe7962ea9847b SHA256 a909831b880ac9c13d354d9195323da45ae9bd206019b5876f881d17e854278e
 EBUILD oxygen-icons-4.6.1.ebuild 915 RMD160 ef53a6c2aad6dfd82f9cf6508548f55f6e216e0c SHA1 7540650bd6f6c84118e59ef8e5e2c98b508b14ef SHA256 642cbec887f866dbeb5abac5ea4af3dd9336348384fcc029f12e1e1c24090223
+EBUILD oxygen-icons-4.6.2.ebuild 972 RMD160 a1c578ea60a474334ec60fe2e6f3f57652a9d6d6 SHA1 23056ed0d0e1e35d729d958b28a60021a268ed43 SHA256 3941d6043c02a564b9f78933b6a6e5078924c2864b5b3d78393cd5e108ad7210
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
diff --git a/kde-base/oxygen-icons/oxygen-icons-4.4.5-r1.ebuild b/kde-base/oxygen-icons/oxygen-icons-4.4.5-r1.ebuild
deleted file mode 100644
index de7444ffd..000000000
--- a/kde-base/oxygen-icons/oxygen-icons-4.4.5-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/oxygen-icons/oxygen-icons-4.3.4.ebuild,v 1.1 2009/12/01 11:28:27 wired Exp $
-
-EAPI="3"
-
-if [[ ${PV} = *9999* ]]; then
-	KMNAME="kdesupport"
-else
-	KMNAME="oxygen-icons"
-fi
-KDE_REQUIRED="never"
-SLREV=4
-inherit kde4-base
-
-DESCRIPTION="Oxygen SVG icon theme."
-HOMEPAGE="http://www.oxygen-icons.org/"
-SRC_URI="${SRC_URI}
-       mirror://sabayon/x11-themes/fdo-icons-sabayon${SLREV}.tar.gz"
-#SRC_URI="mirror://kde/unstable/${PV}/src/${P}.tar.bz2"
-
-LICENSE="LGPL-3"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="aqua"
-
-# Block conflicting packages
-add_blocker kdebase-data '<4.2.67'
-add_blocker kdepim-icons 4.2.89
-add_blocker step 4.2.98
-add_blocker kmail '<4.3.2'
-
-src_prepare() {
-       cp -r ../fdo-icons-sabayon/* ../${P}
-}
-
diff --git a/kde-base/oxygen-icons/oxygen-icons-4.5.5-r10.ebuild b/kde-base/oxygen-icons/oxygen-icons-4.5.5-r10.ebuild
deleted file mode 100644
index de7444ffd..000000000
--- a/kde-base/oxygen-icons/oxygen-icons-4.5.5-r10.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/oxygen-icons/oxygen-icons-4.3.4.ebuild,v 1.1 2009/12/01 11:28:27 wired Exp $
-
-EAPI="3"
-
-if [[ ${PV} = *9999* ]]; then
-	KMNAME="kdesupport"
-else
-	KMNAME="oxygen-icons"
-fi
-KDE_REQUIRED="never"
-SLREV=4
-inherit kde4-base
-
-DESCRIPTION="Oxygen SVG icon theme."
-HOMEPAGE="http://www.oxygen-icons.org/"
-SRC_URI="${SRC_URI}
-       mirror://sabayon/x11-themes/fdo-icons-sabayon${SLREV}.tar.gz"
-#SRC_URI="mirror://kde/unstable/${PV}/src/${P}.tar.bz2"
-
-LICENSE="LGPL-3"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="aqua"
-
-# Block conflicting packages
-add_blocker kdebase-data '<4.2.67'
-add_blocker kdepim-icons 4.2.89
-add_blocker step 4.2.98
-add_blocker kmail '<4.3.2'
-
-src_prepare() {
-       cp -r ../fdo-icons-sabayon/* ../${P}
-}
-
diff --git a/kde-base/oxygen-icons/oxygen-icons-4.6.0.ebuild b/kde-base/oxygen-icons/oxygen-icons-4.6.2.ebuild
similarity index 80%
rename from kde-base/oxygen-icons/oxygen-icons-4.6.0.ebuild
rename to kde-base/oxygen-icons/oxygen-icons-4.6.2.ebuild
index 17b0c003d..a2563196b 100644
--- a/kde-base/oxygen-icons/oxygen-icons-4.6.0.ebuild
+++ b/kde-base/oxygen-icons/oxygen-icons-4.6.2.ebuild
@@ -15,8 +15,9 @@ inherit kde4-base
 DESCRIPTION="Oxygen SVG icon theme."
 HOMEPAGE="http://www.oxygen-icons.org/"
 SLREV=4
-SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.xz
-	mirror://sabayon/x11-themes/fdo-icons-sabayon${SLREV}.tar.gz"
+SRC_URI="http://dev.gentoo.org/~scarabeus/${P}.tar.xz"
+#SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.xz
+#	mirror://sabayon/x11-themes/fdo-icons-sabayon${SLREV}.tar.gz"
 
 LICENSE="LGPL-3"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"