app-cdr/acetoneiso2: Migration to splitted QT4, fix license, bump to EAPI=2, deps...

svn path=/sunrise/; revision=7594

diff --git a/app-cdr/acetoneiso2/ChangeLog b/app-cdr/acetoneiso2/ChangeLog
index 10f12cc9cef124a6c55d363b52859fb55328ffcd..bc56cf274d6c024b73bd098496a34836e99b4774 100644 (file)
--- a/app-cdr/acetoneiso2/ChangeLog
+++ b/app-cdr/acetoneiso2/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for app-cdr/acetoneiso2
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Jan 2009; Pacho Ramos (pacho) <pacho@condmat1.ciencias.uniovi.es>
+  +files/acetoneiso2-nostrip.patch, acetoneiso2-2.0.2.ebuild:
+  Migration to splitted QT4, fix license, bump to EAPI=2, deps cleanup,
+  dropped USE flags for fixing automagic deps (acetoneiso2 will warn about
+  missing apps at runtime), fix prestripping issue. Thanks to Christian
+  Ruppert and scarabeus for their help.
+
   23 Aug 2008; Thomas Beierlein (TomJBE) <tb@forth-ev.de> metadata.xml:
   Added local USE flag description wrt GLEP 56
 

diff --git a/app-cdr/acetoneiso2/Manifest b/app-cdr/acetoneiso2/Manifest
index cc8ef5515464cd2e10bc3ef041a122c82fd8625f..386600b0751ab4b280616828dbda5924630f32c4 100644 (file)
--- a/app-cdr/acetoneiso2/Manifest
+++ b/app-cdr/acetoneiso2/Manifest
@@ -1,4 +1,5 @@
+AUX acetoneiso2-nostrip.patch 337 RMD160 d01b4747f4bb9f35016853a100da309f8552c43c SHA1 08c86df24be7584a9f24e03b99c2aee93f29e24f SHA256 da49e0c05a58275e95c1573dccce92eb0b874ccee66c6f4ff001afdf1a92c613
 DIST acetoneiso2_2.0.2_source.tar.bz2 767635 RMD160 4a00b23be2438769bacfcda3cfa4f02a46db262b SHA1 036653d1dfbf21cae418b0fcfd91d99ac32d114c SHA256 5c2f5dda083941a567c47d1d4653e3e1460e5e8b4663446dd94abed7bd2885c8
-EBUILD acetoneiso2-2.0.2.ebuild 850 RMD160 f05ae29b6dc566901483cb8b04d633e07e2c9ff2 SHA1 4eccee2846f8938bdae42fa03f8deb74bf7445ba SHA256 2128095c56c3058fb58f50d466feeb133f01b0b8e457b90423ab021b26a9f975
-MISC ChangeLog 1904 RMD160 56e414f5a88135bd127b2ffab4f76f6d20f9d784 SHA1 78b1a0c3d9c6a464c049bb4ed94e968038c0c6c9 SHA256 387a2d86a67a1268b523da5637391f502e922c81eee12d0609e8d681e8e9c658
+EBUILD acetoneiso2-2.0.2.ebuild 872 RMD160 9c4026e2dd6812e4dff6ddc71d910e8fdb634fac SHA1 db71fe790ebc094361c9c51140fb66426461db25 SHA256 4e371e2cb4fd0894a7bde91a8af87bcebc0a3daf88308b0e84eee2a9cb902418
+MISC ChangeLog 2297 RMD160 9a39b79bd0892a84e4a90a689809a702d0976223 SHA1 9c05097683b542936e1a2b365a8fa7b1a438808b SHA256 cc84173141d1bcceac3b5efdc75b0a84d73ead959820b9290d29f4468add9300
 MISC metadata.xml 248 RMD160 ea97cf815ab89098b11895e911864e628d386e81 SHA1 1f7f107ee3476405ba65a35d8f464a4209a399b3 SHA256 b10d896c416b0f82b38702709a8ac9bb30618ff69469b0f5ff39ad9e7e492206

diff --git a/app-cdr/acetoneiso2/acetoneiso2-2.0.2.ebuild b/app-cdr/acetoneiso2/acetoneiso2-2.0.2.ebuild
index 29eba440f7ed5654288ea84633bb44018bbd7ffd..8757fa081b5c03c4d5c47ec674081d66da1037e6 100644 (file)
--- a/app-cdr/acetoneiso2/acetoneiso2-2.0.2.ebuild
+++ b/app-cdr/acetoneiso2/acetoneiso2-2.0.2.ebuild
@@ -1,34 +1,37 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=1
-inherit qt4
+EAPI=2
+inherit eutils qt4
 
 DESCRIPTION="Graphical tool to do a lot things with image files like extracting, mounting, encrypting."
 HOMEPAGE="http://sourceforge.net/projects/acetoneiso2/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_source.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="7zip cdr crypt"
+IUSE=""
 
-DEPEND="x11-libs/qt:4
-       || ( kde-base/konqueror gnome-base/nautilus kde-base/kdebase )
-       sys-fs/fuse
-       sys-fs/fuseiso"
+DEPEND="|| ( x11-libs/qt-gui:4 x11-libs/qt:4 )"
 
 RDEPEND="${DEPEND}
-       7zip? ( app-arch/p7zip )
-       cdr? ( virtual/cdrtools app-cdr/cdrdao )
-       crypt? ( >=app-crypt/gnupg-2 app-crypt/pinentry )"
+       sys-fs/fuse
+       sys-fs/fuseiso
+       || ( kde-base/dolphin kde-base/kdebase kde-base/konqueror gnome-base/nautilus )
+       >=app-crypt/gnupg-2
+       app-crypt/pinentry"
 
 S="${WORKDIR}"/${PN}/src/
 
-src_compile() {
+src_prepare() {
+       # Fix prestripping bug 221745
+       epatch "${FILESDIR}/${PN}-nostrip.patch"
+}
+
+src_configure() {
        eqmake4
-       emake || die "emake failed"
 }
 
 src_install() {

diff --git a/app-cdr/acetoneiso2/files/acetoneiso2-nostrip.patch b/app-cdr/acetoneiso2/files/acetoneiso2-nostrip.patch
new file mode 100644 (file)
index 0000000..5fd0b3c
--- /dev/null
+++ b/app-cdr/acetoneiso2/files/acetoneiso2-nostrip.patch
@@ -0,0 +1,10 @@
+--- src/acetoneiso2.pro~       2008-05-01 23:47:24.000000000 +0200
++++ src/acetoneiso2.pro        2009-01-09 11:41:10.000000000 +0100
+@@ -2,6 +2,7 @@
+ # Automatically generated by qmake (2.01a) mar apr 24 12:13:52 2007
+ ######################################################################
+ 
++QMAKE_STRIP=""
+ CONFIG += qt
+ TEMPLATE = app
+ TARGET =