app-misc/japanese-vocabulary: Drop qt metapackage from dependencies, EAPI2fy it,...

svn path=/sunrise/; revision=8742

diff --git a/app-misc/japanese-vocabulary/ChangeLog b/app-misc/japanese-vocabulary/ChangeLog
index 226e343f2184fd0d79d82fbc91eee6f57d33600b..9e271c421f4224b04662b442f4950ea42857a4de 100644 (file)
--- a/app-misc/japanese-vocabulary/ChangeLog
+++ b/app-misc/japanese-vocabulary/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for app-misc/japanese-vocabulary
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Jul 2009; Markos Chandras <hwoarang@gentoo.org>
+  japanese-vocabulary-0.6.ebuild:
+  Drop qt metapackage from dependencies, EAPI2fy it, clean up
+
   21 Mar 2008; Jakub Moc <jakub@gentoo.org> japanese-vocabulary-0.6.ebuild:
   Fix pkg_postrm
 

diff --git a/app-misc/japanese-vocabulary/Manifest b/app-misc/japanese-vocabulary/Manifest
index 6a48d0719a6e35e401c50336f9c35cd39e33e4a0..c87f24f523e1be2cea1e65bf0c4dade8a1326e0b 100644 (file)
--- a/app-misc/japanese-vocabulary/Manifest
+++ b/app-misc/japanese-vocabulary/Manifest
@@ -1,4 +1,4 @@
 DIST JapaneseVocabulary-0.6-src.tar.gz 157552 RMD160 b5d36792a763bc5326ac76081fd9850ea22dcc4d SHA1 b0af15d0d41dcf1e08c345252ae62ea436934800 SHA256 aeb7838739b1769ade7bf9df07eb16548e1113ba573bd63d90460630c25e37bb
-EBUILD japanese-vocabulary-0.6.ebuild 1144 RMD160 b9a33d87e04cba4a05ec43edf93a26354aac02c0 SHA1 d370dc3172275ba433d9f14057666d1d61c56fe9 SHA256 abfedf25fdcd87555c1e36c2da8a48d62db50e7d8cab3cc2842af8239eae97df
-MISC ChangeLog 1214 RMD160 f9887e1571892817aae0948b9f7a8c4da7927952 SHA1 dfbe10ca8a6ef5ba81f690d6711786e9390ee308 SHA256 9ffdb787ee169dda3c72f39915435de6debd3a7ead07b9f4cd7938457b59b2c8
+EBUILD japanese-vocabulary-0.6.ebuild 1107 RMD160 63f5471ec5afff1df8fbdd68534e52299a71a49a SHA1 58e1ad66bc4447c6e3a1215808a96d64a679fbc4 SHA256 1459b2b7bf35daf8fb93391c40707ebeeddfe64b7b22b9ee0ff3c866c8548a22
+MISC ChangeLog 1364 RMD160 2eae8000721286b10dd9ce94f35c2fd7114738b1 SHA1 4b125bf3275727b8906706553ef1e07982141e9e SHA256 ea87109059b4212226736487801d0137279baaba959f7eb300e711ec616fa3e6
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/app-misc/japanese-vocabulary/japanese-vocabulary-0.6.ebuild b/app-misc/japanese-vocabulary/japanese-vocabulary-0.6.ebuild
index 12f6bc6e37d4ddad91b0f3b622f105b084015549..7cb74966a4dfeeb2244f471e5f03f0451ad138b4 100644 (file)
--- a/app-misc/japanese-vocabulary/japanese-vocabulary-0.6.ebuild
+++ b/app-misc/japanese-vocabulary/japanese-vocabulary-0.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="1"
+EAPI="2"
 inherit eutils qt4 toolchain-funcs
 
 KEYWORDS="~x86"
@@ -16,15 +16,14 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-DEPEND=">=x11-libs/qt-4.2:4"
+DEPEND="x11-libs/qt-gui:4
+       x11-libs/qt-sql:4[sqlite]"
 RDEPEND="${DEPEND}"
 
-QT4_BUILT_WITH_USE_CHECK="sqlite3"
 S=${WORKDIR}/${PN}
 
-src_compile() {
+src_configure() {
        eqmake4 ${MY_PN}.pro
-       emake || die "emake failed"
 }
 
 src_install() {