Fix kde3 bugs, remove old.

(Portage version: 2.2_rc33/cvs/Linux i686)

5 files changed, 26 insertions, 95 deletions

diff --git a/x11-themes/gtk-engines-qt/ChangeLog b/x11-themes/gtk-engines-qt/ChangeLog
index 01ca25a8dd60..4e645217ef0d 100644
--- a/x11-themes/gtk-engines-qt/ChangeLog
+++ b/x11-themes/gtk-engines-qt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-themes/gtk-engines-qt
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qt/ChangeLog,v 1.46 2009/02/19 19:28:07 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qt/ChangeLog,v 1.47 2009/05/17 15:21:01 scarabeus Exp $
+
+*gtk-engines-qt-0.8-r4 (17 May 2009)
+
+  17 May 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  -gtk-engines-qt-0.8-r1.ebuild, -gtk-engines-qt-0.8-r2.ebuild,
+  -gtk-engines-qt-0.8-r3.ebuild, +gtk-engines-qt-0.8-r4.ebuild,
+  metadata.xml:
+  Fix kde3 bugs, remove old.
 
   19 Feb 2009; Alexey Shvetsov <alexxy@gentoo.org>
   -gtk-engines-qt-1.1.ebuild:
diff --git a/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r1.ebuild b/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r1.ebuild
deleted file mode 100644
index 05d46941fdf5..000000000000
--- a/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r1.ebuild,v 1.6 2008/07/06 20:33:58 bluebird Exp $
-
-ARTS_REQUIRED="never"
-
-inherit kde
-
-MY_PN="gtk-qt-engine"
-DESCRIPTION="GTK+2 Qt 3 Theme Engine"
-HOMEPAGE="http://gtk-qt.ecs.soton.ac.uk"
-SRC_URI="http://gtk-qt.ecs.soton.ac.uk/files/${PV}/${MY_PN}-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-
-DEPEND=">=x11-libs/gtk+-2.2
-	dev-util/cmake"
-# the little gnome_apps.png...
-RDEPEND="|| ( =kde-base/kdebase-data-3.5* =kde-base/kdebase-3.5* )
-	>=x11-libs/gtk+-2.2"
-need-kde 3.5
-
-# Set slot after the need-kde. Fixes bug #78455.
-SLOT="2"
-
-S="${WORKDIR}/${MY_PN}"
-
-PATCHES="${FILESDIR}/gtk-engines-qt-0.8-konq-flash.patch"
-
-src_install() {
-	kde_src_install
-	mv "${D}"/usr/local/share/{locale,applications} "${D}"/usr/share/ || die
-}
diff --git a/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r2.ebuild b/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r2.ebuild
deleted file mode 100644
index 8cb638cadef1..000000000000
--- a/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r2.ebuild,v 1.1 2008/08/09 22:18:48 wormo Exp $
-
-ARTS_REQUIRED="never"
-
-inherit kde
-
-MY_PN="gtk-qt-engine"
-DESCRIPTION="GTK+2 Qt 3 Theme Engine"
-HOMEPAGE="http://gtk-qt.ecs.soton.ac.uk"
-SRC_URI="http://gtk-qt.ecs.soton.ac.uk/files/${PV}/${MY_PN}-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-IUSE=""
-
-LANGS="bg de es fr it nn ru sv tr"
-for X in ${LANGS}; do IUSE="${IUSE} linguas_${X}"; done
-
-DEPEND=">=x11-libs/gtk+-2.2
-	dev-util/cmake"
-# the little gnome_apps.png...
-RDEPEND="|| ( =kde-base/kdebase-data-3.5* =kde-base/kdebase-3.5* )
-	>=x11-libs/gtk+-2.2"
-need-kde 3.5
-
-# Set slot after the need-kde. Fixes bug #78455.
-SLOT="2"
-
-S="${WORKDIR}/${MY_PN}"
-
-PATCHES="${FILESDIR}/gtk-engines-qt-0.8-konq-flash.patch"
-
-src_install() {
-	kde_src_install
-	mv "${D}"/usr/local/share/applications "${D}"/usr/share/ || die
-
-	# only install requested translations (bug #205940)
-	strip-linguas ${LANGS}
-	dodir /usr/share/locale
-	for lang in ${LINGUAS}; do
-		mv "${D}"/usr/local/share/locale/$lang "${D}"/usr/share/locale || die
-	done
-	rm -rf "${D}"/usr/local/share
-}
diff --git a/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r3.ebuild b/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r4.ebuild
index 028a010a8e13..dba4accf1864 100644
--- a/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r3.ebuild
+++ b/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r4.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r3.ebuild,v 1.2 2008/08/23 19:41:56 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r4.ebuild,v 1.1 2009/05/17 15:21:01 scarabeus Exp $
+
+EAPI=1
 
 ARTS_REQUIRED="never"
 
@@ -13,20 +15,19 @@ SRC_URI="http://gtk-qt.ecs.soton.ac.uk/files/${PV}/${MY_PN}-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
 IUSE="gnome"
 
 LANGS="bg de es fr it nn ru sv tr"
 for X in ${LANGS}; do IUSE="${IUSE} linguas_${X}"; done
 
-COMMONDEPEND=">=x11-libs/gtk+-2.2
-	gnome? ( =gnome-base/libbonoboui-2* )"
+COMMONDEPEND="x11-libs/gtk+:2
+	gnome? ( gnome-base/libbonoboui )"
 
 DEPEND="${COMMONDEPEND}
 	dev-util/cmake"
 # the little gnome_apps.png...
 RDEPEND="${COMMONDEPEND}
-	|| ( =kde-base/kdebase-data-3.5* =kde-base/kdebase-3.5* )"
+	|| ( kde-base/kdebase-data:3.5 kde-base/kdebase:3.5 )"
 need-kde 3.5
 
 # Set slot after the need-kde. Fixes bug #78455.
@@ -34,8 +35,10 @@ SLOT="2"
 
 S="${WORKDIR}/${MY_PN}"
 
-PATCHES="${FILESDIR}/gtk-engines-qt-0.8-konq-flash.patch
-	${FILESDIR}/gtk-engines-qt-0.8-optional-bonobo.patch"
+PATCHES=(
+	"${FILESDIR}/gtk-engines-qt-0.8-konq-flash.patch"
+	"${FILESDIR}/gtk-engines-qt-0.8-optional-bonobo.patch"
+)
 
 src_compile() {
 	# enable or disable bonobo support based on gnome useflag (bug #206568)
@@ -50,9 +53,10 @@ src_install() {
 
 	# only install requested translations (bug #205940)
 	strip-linguas ${LANGS}
-	mv "${D}"/usr/share/locale "${T}"/all-locales || die
-	dodir /usr/share/locale
-	for lang in ${LINGUAS}; do
-		mv "${T}"/all-locales/$lang "${D}"/usr/share/locale || die
+	mv "${D}/${KDEDIR}"/share/locale "${D}/${KDEDIR}"share/temp || die
+	dodir "${KDEDIR}"/share/locale
+	for lang in "${LINGUAS}"; do
+	    mv "${D}/${KDEDIR}"/share/temp/"${lang}" "${D}/${KDEDIR}"/share/locale || die
 	done
+	rm -rf "${D}/${KDEDIR}"/share/temp || die
 }
diff --git a/x11-themes/gtk-engines-qt/metadata.xml b/x11-themes/gtk-engines-qt/metadata.xml
index b907f311bdd6..a0284aa6717e 100644
--- a/x11-themes/gtk-engines-qt/metadata.xml
+++ b/x11-themes/gtk-engines-qt/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>kde</herd>
 <maintainer>
   <email>genstef@gentoo.org</email>
 </maintainer>