Fix old-style Qt4 depend and drop old

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

6 files changed, 4 insertions, 166 deletions

diff --git a/app-i18n/kimera/Manifest b/app-i18n/kimera/Manifest
index 73761a005f03..38ca6c9f3940 100644
--- a/app-i18n/kimera/Manifest
+++ b/app-i18n/kimera/Manifest
@@ -1,22 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX kimera-2.00-gentoo.patch 1028 RMD160 c736dedadc0f5a62c62d0fd8b0cd4428b7442a08 SHA1 55bd84baf37ee26ff93e180c77569a7839bc9b9c SHA256 144d948d9e0cb85cd62f42542e1534680239fb7df9985881abd885266f8e95ab
 AUX kimera-2.11-gentoo.patch 405 RMD160 e9611658f49cf5a138ad0f0f49fb2de3ced5b20d SHA1 8c56d39e09eb168e02382d6fda7a14b1eb2e3009 SHA256 2fa94d765a39e9fb70c1cca27e110796834918a8d21db27bd068b1ec61c31ab4
-DIST kimera-1.32.tar.gz 82335 RMD160 afdd3dd9be60e5a2fbf726d86dddff3256f7c8cc SHA1 351fe88d9f911d2b8339021cdd6bd9fd470d48f8 SHA256 52a1b6878df5c24dc9302c46bdfa606d109e296679d968f106d63b9ca90d8e16
-DIST kimera-1.40.tar.gz 85138 RMD160 4b4d4edf8a85032696d0d832d6531113927ade89 SHA1 dea107752dd1a450040dc55e747e84020baa175f SHA256 421179b9618057ea8a7f9dbadef02d40eef1ba44f072150c38707b6bcbf6904c
-DIST kimera-2.00.tar.gz 99562 RMD160 4def48880574c9929b45363a5b16fa4e66987c7f SHA1 443c7896fdc361b58e896486d29c0b2d4d66bbd0 SHA256 448b0fc9d9445f13af5936ca375073d122cb1c79414230462f022e62a7e85a42
 DIST kimera-2.11.tar.gz 106010 RMD160 0f9d95587a078118a225e3772bfda95612155a1d SHA1 9e6073c0927aaa3a4f4820c6728cfd06eb4e90ee SHA256 4c3ccb532be1d50fa37963a0f0dfa661d92c9c13fcf618c17c9c5dbd66217d98
-EBUILD kimera-1.32.ebuild 840 RMD160 3e825d5804d409d0aaad1abeb3ec96510a92ff1e SHA1 05928f3ca065df0bc92073581e164dd19a0565ba SHA256 675744b7a02436d1fb8700d314cf7739ff66653abc8402b2a4a555072ac310c4
-EBUILD kimera-1.40.ebuild 841 RMD160 38ef4474acd180fccb4b9b8499d26b49f93749d5 SHA1 c284e7b9db55a420cd98c97a8fc049dd5086f3ec SHA256 9318bbdbb812a3259c8799b4e668ad6123686505b00aaee55aa3f425ae41bbff
-EBUILD kimera-2.00.ebuild 926 RMD160 da554a064d44ad5faf533b0a4855b64d73209242 SHA1 50e0cede1efb3b8710bb98e01a676d63d4067955 SHA256 f05ac263aa53696c50023fa6e15539d6a8e59c6fc6638d42d5dc514d63c67f25
-EBUILD kimera-2.11.ebuild 944 RMD160 91e27aa43835414788377823b497cef68931d09f SHA1 c6a083ff092ed7743044dc98d562e28e7f7faf36 SHA256 a1c0e982b762aed5cef9522acd7440be97ddf6eba552446305419a6c1d31ef75
+EBUILD kimera-2.11.ebuild 926 RMD160 dd6ed93512abc76fec70fe99bdca404460a8ac5f SHA1 16e481ff9f2253cd2aa268eccc1b4858e4500a7c SHA256 8e24fe2cb3afa00de254b40c759320e9b649f70039b556ec511cab2a1bf55224
 MISC ChangeLog 2356 RMD160 176866fb2a9188ab4429dde9d3148be62512b0cd SHA1 93b34903f9cda4d21f7b47ca5a8f0e30743d6682 SHA256 e29f6875c8e260ded6b812710485254a3c6ad9d987b06afe415eefa2deadf5a6
 MISC metadata.xml 355 RMD160 c1c10ed97e03e4a8b57694abd7d474909f308c48 SHA1 38da58f79834c4efa57c0fcefb9d3b59d47bca84 SHA256 3f7fff150e68a77ea53a1005143edef961f39ce50e58a556149202d1d3859e16
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoN4HYACgkQkKaRLQcq0GIAAgCfSzJUl99cYJS+LUS8cSh/NYhK
-AaQAn1pWXTZA8FG6sJazLgYDof2FXyLt
-=U6+d
------END PGP SIGNATURE-----
diff --git a/app-i18n/kimera/files/kimera-2.00-gentoo.patch b/app-i18n/kimera/files/kimera-2.00-gentoo.patch
deleted file mode 100644
index e70d660efbd3..000000000000
--- a/app-i18n/kimera/files/kimera-2.00-gentoo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur kimera-2.00.orig/kimera.pro kimera-2.00/kimera.pro
---- kimera-2.00.orig/kimera.pro	2008-08-30 22:05:31.000000000 +0900
-+++ kimera-2.00/kimera.pro	2008-08-31 11:52:37.000000000 +0900
-@@ -1,5 +1,5 @@
- TEMPLATE        = app
--CONFIG         += qt x11 warn_on release
-+CONFIG         += qt x11 warn_on release nostrip
- QT             += network
- TARGET          = kimera-bin
- VERSION         = 2.00
-diff -Naur kimera-2.00.orig/src/inputmethod.cpp kimera-2.00/src/inputmethod.cpp
---- kimera-2.00.orig/src/inputmethod.cpp	2008-08-30 22:05:31.000000000 +0900
-+++ kimera-2.00/src/inputmethod.cpp	2008-08-31 11:43:44.000000000 +0900
-@@ -165,7 +165,7 @@
- 	   im, ic, flag, errcode, errtype, __FILE__, __LINE__);
-   if (errlen > 0) {
-     char errdetail[256] = { 0 };
--    dsbuf.readRawData((char*)errdetail, qMin((quint32)errlen, sizeof(errdetail) - 1));   // header
-+    dsbuf.readRawData((char*)errdetail, qMin((quint32)errlen, (quint32)sizeof(errdetail) - 1));   // header
-     qDebug("Error detail: %s", errdetail);
-   }
- }
diff --git a/app-i18n/kimera/kimera-1.32.ebuild b/app-i18n/kimera/kimera-1.32.ebuild
deleted file mode 100644
index 290521517eab..000000000000
--- a/app-i18n/kimera/kimera-1.32.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/kimera/kimera-1.32.ebuild,v 1.4 2008/07/27 19:44:54 carlo Exp $
-
-EAPI=1
-
-inherit qt3
-
-IUSE="anthy"
-
-DESCRIPTION="A Japanese input method which supports the XIM protocol"
-SRC_URI="mirror://sourceforge.jp/kimera/19749/${P}.tar.gz"
-HOMEPAGE="http://kimera.sourceforge.jp/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 x86"
-
-DEPEND="x11-libs/qt:3
-	anthy? ( app-i18n/anthy )
-	!anthy? ( app-i18n/canna )"
-
-src_compile(){
-	local myconf
-	if ! use anthy ; then
-		myconf="no_anthy=1"
-	fi
-
-	${QTDIR}/bin/qmake ${myconf} kimera.pro || die
-
-	# Avoid pre-stripping
-	sed -i -e '/strip/d' Makefile
-
-	emake || die
-}
-
-src_install(){
-	emake INSTALL_ROOT="${D}" install || die
-
-	dodoc AUTHORS INSTALL README*
-}
diff --git a/app-i18n/kimera/kimera-1.40.ebuild b/app-i18n/kimera/kimera-1.40.ebuild
deleted file mode 100644
index 0537f1231e60..000000000000
--- a/app-i18n/kimera/kimera-1.40.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/kimera/kimera-1.40.ebuild,v 1.2 2008/07/27 19:44:54 carlo Exp $
-
-EAPI=1
-
-inherit qt3
-
-IUSE="anthy"
-
-DESCRIPTION="A Japanese input method which supports the XIM protocol"
-SRC_URI="mirror://sourceforge.jp/kimera/24905/${P}.tar.gz"
-HOMEPAGE="http://kimera.sourceforge.jp/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="x11-libs/qt:3
-	anthy? ( app-i18n/anthy )
-	!anthy? ( app-i18n/canna )"
-
-src_compile(){
-	local myconf
-	if ! use anthy ; then
-		myconf="no_anthy=1"
-	fi
-
-	${QTDIR}/bin/qmake ${myconf} kimera.pro || die
-
-	# Avoid pre-stripping
-	sed -i -e '/strip/d' Makefile
-
-	emake || die
-}
-
-src_install(){
-	emake INSTALL_ROOT="${D}" install || die
-
-	dodoc AUTHORS INSTALL README*
-}
diff --git a/app-i18n/kimera/kimera-2.00.ebuild b/app-i18n/kimera/kimera-2.00.ebuild
deleted file mode 100644
index 7cfbc7bc945f..000000000000
--- a/app-i18n/kimera/kimera-2.00.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/kimera/kimera-2.00.ebuild,v 1.1 2008/08/31 03:00:07 matsuu Exp $
-
-EAPI=1
-inherit eutils multilib qt4
-
-DESCRIPTION="A Japanese input method which supports the XIM protocol"
-SRC_URI="mirror://sourceforge.jp/kimera/32701/${P}.tar.gz"
-HOMEPAGE="http://kimera.sourceforge.jp/"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-IUSE="+anthy"
-
-DEPEND="|| ( x11-libs/qt-core:4 x11-libs/qt:4 )
-	anthy? ( app-i18n/anthy )
-	!anthy? ( app-i18n/canna )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_compile() {
-	local myconf="target.path=/usr/$(get_libdir)/${P}"
-
-	use anthy || myconf="${myconf} no_anthy=1"
-
-	eqmake4 kimera.pro ${myconf} || die
-	emake || die
-}
-
-src_install(){
-	emake INSTALL_ROOT="${D}" install || die
-
-	dodoc AUTHORS README*
-}
diff --git a/app-i18n/kimera/kimera-2.11.ebuild b/app-i18n/kimera/kimera-2.11.ebuild
index 0b5d61b388a8..eb1bad0f1883 100644
--- a/app-i18n/kimera/kimera-2.11.ebuild
+++ b/app-i18n/kimera/kimera-2.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/kimera/kimera-2.11.ebuild,v 1.3 2009/05/15 21:36:33 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/kimera/kimera-2.11.ebuild,v 1.4 2010/01/03 11:15:10 ssuominen Exp $
 
 EAPI=1
 inherit eutils multilib qt4
@@ -14,7 +14,7 @@ LICENSE="GPL-3"
 KEYWORDS="amd64 x86"
 IUSE="+anthy"
 
-DEPEND="|| ( x11-libs/qt-core:4 x11-libs/qt:4 )
+DEPEND="x11-libs/qt-core:4
 	anthy? ( app-i18n/anthy )
 	!anthy? ( app-i18n/canna )"
 RDEPEND="${DEPEND}"