migrate to qt4-r2 eclass

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

4 files changed, 21 insertions, 26 deletions

diff --git a/app-cdr/acetoneiso/ChangeLog b/app-cdr/acetoneiso/ChangeLog
index d96fef3cab0c..c7f2ad48f20a 100644
--- a/app-cdr/acetoneiso/ChangeLog
+++ b/app-cdr/acetoneiso/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/acetoneiso
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/acetoneiso/ChangeLog,v 1.3 2009/12/16 12:25:27 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/acetoneiso/ChangeLog,v 1.4 2010/01/06 10:52:04 hwoarang Exp $
+
+  06 Jan 2010; <hwoarang@gentoo.org> acetoneiso-2.1.1.ebuild,
+  acetoneiso-2.2.1.ebuild:
+  Migrate to qt4-r2 eclass
 
   16 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
   acetoneiso-2.2.1.ebuild:
diff --git a/app-cdr/acetoneiso/Manifest b/app-cdr/acetoneiso/Manifest
index cdcec8948053..139fd2b4020e 100644
--- a/app-cdr/acetoneiso/Manifest
+++ b/app-cdr/acetoneiso/Manifest
@@ -1,6 +1,6 @@
 DIST acetoneiso_2.1.1.tar.gz 1108820 RMD160 90f735ab4e20d3451dc6438eb2c15a539c1e1d58 SHA1 c9213cd10ef73ce662cd5c5b8b76dcda7ba396fa SHA256 c93d8b88f7da55b89f32447831767a4091c9f7e9afcc8cdf9b8fb369d28e3e7c
 DIST acetoneiso_2.2.1.tar.gz 1327880 RMD160 520fa58c9a48e713dea22b3eee537aebcfc2b0a3 SHA1 9e3520afc759c855fe040b0310245f23874f704a SHA256 986227313ccd52e989a1f1e2cb73a78267aa1b8fbb08cbaf01469a367eecafb0
-EBUILD acetoneiso-2.1.1.ebuild 830 RMD160 ef6288714e204fa7979f28df5d93184c40cf4164 SHA1 b6160e3670103460387e04c8ab60ad5608164e69 SHA256 016bd86e3abe8606e4bdea4f54b87bf063596ca3bdc91d4f618e9087c6594614
-EBUILD acetoneiso-2.2.1.ebuild 923 RMD160 ee04287fd6acc6b124463dd5f075c99cfeac24a4 SHA1 b14a9b6c91b1348a0e8af5d6911e7896670e5cb1 SHA256 83dfc21cd5f3061953c9f144fe1994e7a19b653f5e7b1e8ffb1b2e7ffd50f26a
-MISC ChangeLog 705 RMD160 c98c0d10a7710ac0258842922405cbb63fb2b408 SHA1 a05e88bca2b6394188600a5a80762de1b8d6f132 SHA256 c5911145dc8f2d1874af2519709e6e9433698b891d3eff783f6c8b406ab67850
+EBUILD acetoneiso-2.1.1.ebuild 757 RMD160 d12976b16941bdc58a3caa3989325f476616cc7d SHA1 cc5b8773537fb7016380437cc2d4c492d0094148 SHA256 52ef747fb0bdcb3f82d3bd63d9a8e79cc855264853645dd50530ccf3427db0ae
+EBUILD acetoneiso-2.2.1.ebuild 894 RMD160 5783ec309eb0baa245d4669fda497c979e8c621a SHA1 5946756e4ca806e94a74db705a8f11ac38aaad77 SHA256 94b9d8ff6b1c99e2858411ca4cf3318ae01ba26b6ee0138f4af266d58596bb16
+MISC ChangeLog 821 RMD160 bb4dcdd5d750009f6efe5d3076803085f9c5154d SHA1 214d53ad420a6ddce7fc1464cfb7edcae484d6c4 SHA256 109763e0d685e20bf385c1ca03936cb6b5814c2a1ce06c16c68806e2b77544c3
 MISC metadata.xml 290 RMD160 9f26be0a3cd20e0085882179855b99dbd18ed161 SHA1 a1fc1b899f969b8656293da359921c18c833c7a4 SHA256 de05249a718d66c02cabbca85d8a7338541d29d15263685fbf7ebdf29e87aae9
diff --git a/app-cdr/acetoneiso/acetoneiso-2.1.1.ebuild b/app-cdr/acetoneiso/acetoneiso-2.1.1.ebuild
index 65d25fa19e29..23f5b2c586e0 100644
--- a/app-cdr/acetoneiso/acetoneiso-2.1.1.ebuild
+++ b/app-cdr/acetoneiso/acetoneiso-2.1.1.ebuild
@@ -1,11 +1,11 @@
-# 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-cdr/acetoneiso/acetoneiso-2.1.1.ebuild,v 1.1 2009/10/25 10:32:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/acetoneiso/acetoneiso-2.1.1.ebuild,v 1.2 2010/01/06 10:52:04 hwoarang Exp $
 
 EAPI=2
 MY_P=${PN}_${PV}
 
-inherit qt4
+inherit qt4-r2
 
 DESCRIPTION="a feature-rich and complete software application to manage CD/DVD images"
 HOMEPAGE="http://www.acetoneteam.org/"
@@ -21,16 +21,9 @@ DEPEND="x11-libs/qt-gui:4
 	x11-libs/qt-webkit:4"
 
 S=${WORKDIR}/${MY_P}/${PN}
+DOCS="AUTHORS CHANGELOG FEATURES README"
+DOCSDIR="${WORKDIR}"
 
 src_prepare() {
 	sed -i -e 's:unrar-nonfree:unrar:g' sources/compress.h locale/*.ts || die
 }
-
-src_configure() {
-	eqmake4
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die
-	dodoc ../{AUTHORS,CHANGELOG,FEATURES,README}
-}
diff --git a/app-cdr/acetoneiso/acetoneiso-2.2.1.ebuild b/app-cdr/acetoneiso/acetoneiso-2.2.1.ebuild
index 040666940847..7afa38579014 100644
--- a/app-cdr/acetoneiso/acetoneiso-2.2.1.ebuild
+++ b/app-cdr/acetoneiso/acetoneiso-2.2.1.ebuild
@@ -1,11 +1,11 @@
-# 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-cdr/acetoneiso/acetoneiso-2.2.1.ebuild,v 1.2 2009/12/16 12:25:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/acetoneiso/acetoneiso-2.2.1.ebuild,v 1.3 2010/01/06 10:52:04 hwoarang Exp $
 
 EAPI=2
 MY_P=${PN}_${PV}
 
-inherit flag-o-matic qt4
+inherit flag-o-matic qt4-r2
 
 DESCRIPTION="a feature-rich and complete software application to manage CD/DVD images"
 HOMEPAGE="http://www.acetoneteam.org/"
@@ -24,16 +24,14 @@ DEPEND="x11-libs/qt-gui:4
 
 S=${WORKDIR}/${MY_P}/${PN}
 
+DOCS="AUTHORS CHANGELOG FEATURES README"
+DOCSDIR="${WORKDIR}"
+
 src_prepare() {
 	sed -i -e 's:unrar-nonfree:unrar:g' sources/compress.h locale/*.ts || die
 }
 
 src_configure() {
 	append-flags -I/usr/include/KDE
-	eqmake4
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die
-	dodoc ../{AUTHORS,CHANGELOG,FEATURES,README}
+	qt4-r2_src_configure
 }