[kde-base/kdebase-data] - remove remnants of hicolor-icon-theme (empty index.theme was being installed)

5 files changed, 23 insertions, 31 deletions

diff --git a/kde-base/kdebase-data/Manifest b/kde-base/kdebase-data/Manifest
index ecba83078dc..9a7c0f450b4 100644
--- a/kde-base/kdebase-data/Manifest
+++ b/kde-base/kdebase-data/Manifest
@@ -1,7 +1,7 @@
 DIST kdebase-runtime-4.2.90.tar.bz2 6704496 RMD160 ae5e9aa5cfb1f429fca1c9f36b6dd57c3f57a2c8 SHA1 ef93e47788d3b93d90b323b9eb05f1f48ed98b55 SHA256 595f164253013068615642fe9bff50526fddfac11efc03f480c239af97d1666c
 DIST kdebase-runtime-4.2.91.tar.lzma 6304706 RMD160 c3e524fa7437e3ac7d86be5eccec62846ad4cb94 SHA1 3bcc6f117eb2f9012f35f576efd7e15df794b794 SHA256 5bb0fa94d97b91d2167b3eed2f01397d308c90028b0b347c5832710db64025bc
-EBUILD kdebase-data-4.2.90.ebuild 1083 RMD160 363a8877d081003a11776d213e220b65b6daa50e SHA1 0034b70f18893aeabe4fd9b322805c8b368226bc SHA256 1a24efec7aa26e6c7b8e9179047ce1d0e41bf373237b57e60c8527f96c0e0067
-EBUILD kdebase-data-4.2.91.ebuild 1083 RMD160 363a8877d081003a11776d213e220b65b6daa50e SHA1 0034b70f18893aeabe4fd9b322805c8b368226bc SHA256 1a24efec7aa26e6c7b8e9179047ce1d0e41bf373237b57e60c8527f96c0e0067
-EBUILD kdebase-data-4.2.9999.ebuild 1107 RMD160 3f4fe7e0b9583bbf762d6b9c466a2d1fe0f42472 SHA1 39eff0d359503eba822ac91af4adde398c240bec SHA256 d97cc083bc27e6f30193efc9d4948fcc21e02ec87134850c744d2a05cf3e0033
-EBUILD kdebase-data-9999.ebuild 1041 RMD160 fc027f4a480c11aa1f94bd3b1784e0af4f9e1aed SHA1 5f1f4bce9ccc97500a6a6af7ea94104731034c73 SHA256 404dcb8294f1f5f6faf3ef226be438fe30333e5fed2a18d9646ddf4d5112e12a
+EBUILD kdebase-data-4.2.90.ebuild 1036 RMD160 dfbdf11e1ee8b5aac64f4758c2ba97ba0a307ee4 SHA1 e6e8823730497c09620d7fdf4963813dda832d55 SHA256 593957a3d54f2645c7059fc6c09a944bce361d4377fcd392187250d9a946a0f1
+EBUILD kdebase-data-4.2.91.ebuild 1036 RMD160 dfbdf11e1ee8b5aac64f4758c2ba97ba0a307ee4 SHA1 e6e8823730497c09620d7fdf4963813dda832d55 SHA256 593957a3d54f2645c7059fc6c09a944bce361d4377fcd392187250d9a946a0f1
+EBUILD kdebase-data-4.2.9999.ebuild 1052 RMD160 fbfc1975152373609dd937ae0fb19261218c9f6d SHA1 e42c867b207488c5732c07abf0b6abb64e0bba73 SHA256 f956847815ada1b801e21c76071b387d95e134c4e824bed05061fb4c95140ca1
+EBUILD kdebase-data-9999.ebuild 994 RMD160 517e8c063724780bcbd239fef1e51b12c56d80fb SHA1 61909bda2e7af0a1b0cf43cabea36571faca4087 SHA256 d414daa93669b96f9c3960ceedadd5b8a93568ea9318387f42c59d7001ecdbe9
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kdebase-data/kdebase-data-4.2.90.ebuild b/kde-base/kdebase-data/kdebase-data-4.2.90.ebuild
index 6a5c851b811..d3e77e9779a 100644
--- a/kde-base/kdebase-data/kdebase-data-4.2.90.ebuild
+++ b/kde-base/kdebase-data/kdebase-data-4.2.90.ebuild
@@ -17,8 +17,8 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 RDEPEND="
 	!kdeprefix? ( !<kde-base/dolphin-4.1.87[-kdeprefix] )
 	kdeprefix? ( !<kde-base/dolphin-4.1.87:${SLOT} )
+	>=kde-base/oxygen-icons-${PV}:${SLOT}[kdeprefix=]
 	x11-themes/hicolor-icon-theme
-	>=kde-base/oxygen-icons-${PV}[kdeprefix=]
 "
 
 KMEXTRA="
@@ -32,12 +32,10 @@ KMEXTRACTONLY="
 "
 
 src_configure() {
-	# remove instalation of colliding file for hicolor-icon-theme
-	if ! use kdeprefix; then
-		sed -i \
-			-e "s:add_subdirectory( hicolor ):#donotwant:g" \
-			pics/CMakeLists.txt
-	fi
+	# Remove remnants of hicolor-icon-theme
+	sed -i \
+		-e "s:add_subdirectory( hicolor ):#donotwant:g" \
+		pics/CMakeLists.txt
 
 	kde4-meta_src_configure
 }
diff --git a/kde-base/kdebase-data/kdebase-data-4.2.91.ebuild b/kde-base/kdebase-data/kdebase-data-4.2.91.ebuild
index 6a5c851b811..d3e77e9779a 100644
--- a/kde-base/kdebase-data/kdebase-data-4.2.91.ebuild
+++ b/kde-base/kdebase-data/kdebase-data-4.2.91.ebuild
@@ -17,8 +17,8 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 RDEPEND="
 	!kdeprefix? ( !<kde-base/dolphin-4.1.87[-kdeprefix] )
 	kdeprefix? ( !<kde-base/dolphin-4.1.87:${SLOT} )
+	>=kde-base/oxygen-icons-${PV}:${SLOT}[kdeprefix=]
 	x11-themes/hicolor-icon-theme
-	>=kde-base/oxygen-icons-${PV}[kdeprefix=]
 "
 
 KMEXTRA="
@@ -32,12 +32,10 @@ KMEXTRACTONLY="
 "
 
 src_configure() {
-	# remove instalation of colliding file for hicolor-icon-theme
-	if ! use kdeprefix; then
-		sed -i \
-			-e "s:add_subdirectory( hicolor ):#donotwant:g" \
-			pics/CMakeLists.txt
-	fi
+	# Remove remnants of hicolor-icon-theme
+	sed -i \
+		-e "s:add_subdirectory( hicolor ):#donotwant:g" \
+		pics/CMakeLists.txt
 
 	kde4-meta_src_configure
 }
diff --git a/kde-base/kdebase-data/kdebase-data-4.2.9999.ebuild b/kde-base/kdebase-data/kdebase-data-4.2.9999.ebuild
index ce2ffe64995..7eaa86ae6fa 100644
--- a/kde-base/kdebase-data/kdebase-data-4.2.9999.ebuild
+++ b/kde-base/kdebase-data/kdebase-data-4.2.9999.ebuild
@@ -31,12 +31,10 @@ KMEXTRACTONLY="
 "
 
 src_configure() {
-	# remove instalation of colliding file for hicolor-icon-theme
-	if ! use kdeprefix; then
-		sed -i \
-			-e "s:add_subdirectory( hicolor ):#donotwant:g" \
-			pics/CMakeLists.txt
-	fi
+	# Remove remnants of hicolor-icon-theme
+	sed -i \
+		-e "s:add_subdirectory( hicolor ):#donotwant:g" \
+		pics/CMakeLists.txt
 
 	kde4-meta_src_configure
 }
diff --git a/kde-base/kdebase-data/kdebase-data-9999.ebuild b/kde-base/kdebase-data/kdebase-data-9999.ebuild
index 034602305e6..4a66bb92849 100644
--- a/kde-base/kdebase-data/kdebase-data-9999.ebuild
+++ b/kde-base/kdebase-data/kdebase-data-9999.ebuild
@@ -17,8 +17,8 @@ KEYWORDS=""
 RDEPEND="
 	!kdeprefix? ( !<kde-base/dolphin-4.1.87[-kdeprefix] )
 	kdeprefix? ( !<kde-base/dolphin-4.1.87:${SLOT} )
+	>=kde-base/oxygen-icons-${PV}:${SLOT}[kdeprefix=]
 	x11-themes/hicolor-icon-theme
-	>=kde-base/oxygen-icons-${PV}[kdeprefix=]
 "
 
 KMEXTRA="
@@ -32,12 +32,10 @@ KMEXTRACTONLY="
 "
 
 src_configure() {
-	# remove instalation of colliding file for hicolor-icon-theme
-	if ! use kdeprefix; then
-		sed -i \
-			-e "s:add_subdirectory( hicolor ):#donotwant:g" \
-			pics/CMakeLists.txt
-	fi
+	# Remove remnants of hicolor-icon-theme
+	sed -i \
+		-e "s:add_subdirectory( hicolor ):#donotwant:g" \
+		pics/CMakeLists.txt
 
 	kde4-meta_src_configure
 }