Add missing qt-webkit dependency, add doc USE flag, migrate to EAPI 4. Patch by Michael (kensington) in bug #369297.

Package-Manager: portage-2.2.0_alpha87/cvs/Linux x86_64

4 files changed, 39 insertions, 25 deletions

diff --git a/media-gfx/picturewall/ChangeLog b/media-gfx/picturewall/ChangeLog
index 800967952dd8..13e87c9c6569 100644
--- a/media-gfx/picturewall/ChangeLog
+++ b/media-gfx/picturewall/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/picturewall
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/picturewall/ChangeLog,v 1.6 2010/10/23 00:42:59 hwoarang Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/picturewall/ChangeLog,v 1.7 2012/02/18 15:23:55 pesa Exp $
+
+  18 Feb 2012; Davide Pesavento <pesa@gentoo.org> metadata.xml,
+  picturewall-1.0-r1.ebuild:
+  Add missing qt-webkit dependency, add doc USE flag, migrate to EAPI 4. Patch
+  by Michael (kensington) in bug #369297.
 
   23 Oct 2010; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   Remove myself from metadata
diff --git a/media-gfx/picturewall/Manifest b/media-gfx/picturewall/Manifest
index 49012a2f9a08..5a9ab9643b58 100644
--- a/media-gfx/picturewall/Manifest
+++ b/media-gfx/picturewall/Manifest
@@ -1,14 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 DIST PictureWall_1.0.zip 3265185 RMD160 da1ccf548e14e6ec9da6b9c24fa47d4e8cdbeab5 SHA1 ab8570cbdb93b95ef0dff0ed6bcc90118a5ade20 SHA256 e7458a6f71b3354fd88ce0656d236e7aafa9736f1d079f417986cf3bc6a39722
-EBUILD picturewall-1.0-r1.ebuild 888 RMD160 2d2f8c35b4ca3db9e4434c7f5299050f1f62b9af SHA1 59e4e65d3b41bdf5d6e3d78307db46eaf79346c7 SHA256 1948586ca133f1da4e8e0b7876b312ec10c755e36e37195f59a0ab76f8e7fdfd
-MISC ChangeLog 954 RMD160 5850a76ff8a8e2c675bc31fb66b0041e616b1a95 SHA1 aab1ebe425c0e5d7d5cd5ae7099d44518e9fcfb7 SHA256 f82c630fabcfa2aafd6052bd8d575a0ca3c1e82a5723a142e5a1d29a5341612d
-MISC metadata.xml 203 RMD160 f21ab0adb7ed966ccbfb8706172574746bf83c45 SHA1 9929f57d84969eaa6e4f2b8d399921bc4c7ba1e4 SHA256 e70e3acb51ca19e8ef1c7b3fe1356e152781028e0bdccd400e0979db61b77070
+EBUILD picturewall-1.0-r1.ebuild 834 RMD160 1a70cd2d01ec8e64e1364e4f87ccd0deab2eabda SHA1 e0cae0a88100b673869a3e454142aae60c559c5f SHA256 2c6a74edd9f32921f5a7521093f5c6e203b754ec5bfbc9c4b696d96e332504d0
+MISC ChangeLog 1165 RMD160 7a3b490b8a4291d9f6431da3598d77b55a62ac20 SHA1 d6c468cc40226c11b256d90c49fa7e21c829af5c SHA256 311c46dc68ce693bbd3c09805aeea446b02c2aad217db0b1bd715227b6e702cd
+MISC metadata.xml 155 RMD160 654eebe07944b4d18c58e4a54c50758eceead53e SHA1 967490b59f5185a6849cb5583390dd0d0b0dd512 SHA256 94ed5876ef16dbc191744ff6b8939a0f428fcb8add316d898880e1c4c880b9e7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAkzCL4YACgkQ9/cejkQaxBB2wQCdEMS8p7m9IwFs3Jts5PK3mZkt
-p7sAnRDgpGFBflFc5wjQ5YF9emfQ+p6Z
-=XrDR
+iQIcBAEBCgAGBQJPP8KQAAoJENXLsxwXqFxyifgP/0WVnTEvDcLw8vhk5UNiMNh3
+aabFpbC6+KmqU3BQkFYxACt242UHOlk1nkEafZHt/kbXepmUzZgwl6PQXB/+V90k
+KJa+e2ivNcM6CU9KjSYmHWA0dU27LSpmqNtcYj48/0sSXIyndLVjDXIQO03ZJ8B/
+HQag62QZyI4Jm6JKbPMz8jJOFBN8D9EXDzLUpTTjesMjeA0zdTCkAVZC+WXQbrmX
+qheLNjuH6vULtYtFSgwt2/ywObd8VYUeM3PlpOz+KuVMwYnMIiIBiKXGTY5UT4tJ
+/ot8ymvENKVXeBHkqJOhjWbakl9NJEz2dqVacts++QZR1CPZnqpg9vgSVDRXIupf
+iIUPXkLzJ+mVfktuJZVFj9eOvgYpJBgL1jY2lEmniIdSdS54r9+d4/QAP9Cffo3Y
+5eJFM5I4JIPOxEHMljk6oknEJOSWlF15PjCVARBB2hrRg296+Tr/J8/Qa+Topjz+
+/AqA3+u9etY3W6znYM5U3aOVk3GGfmqEqV0h+HppKhGAMRe/5tGefBNwDqEFG2Ag
+35I/rTzxyn6sQWZQAvEnei0ZtKblvtoqN6xx4quZYOPru4jsCR2+X84tRTDxMjh3
+1oLswmjkEoIxWjvmKaMn+pPIGJkhbJTzGgohgZMmVVCtACp+mOPjdevHaxLPDxLa
+wZg24LMM/5zZMQYwHVTI
+=k9AZ
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/picturewall/metadata.xml b/media-gfx/picturewall/metadata.xml
index 1d7818888617..dc439f7e84f5 100644
--- a/media-gfx/picturewall/metadata.xml
+++ b/media-gfx/picturewall/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>qt</herd>
-<longdescription lang="en">
-</longdescription>
 </pkgmetadata>
-
diff --git a/media-gfx/picturewall/picturewall-1.0-r1.ebuild b/media-gfx/picturewall/picturewall-1.0-r1.ebuild
index be584c50a9cd..f44f5d96cee4 100644
--- a/media-gfx/picturewall/picturewall-1.0-r1.ebuild
+++ b/media-gfx/picturewall/picturewall-1.0-r1.ebuild
@@ -1,31 +1,33 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/picturewall/picturewall-1.0-r1.ebuild,v 1.3 2010/07/14 13:12:33 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/picturewall/picturewall-1.0-r1.ebuild,v 1.4 2012/02/18 15:23:55 pesa Exp $
 
-EAPI="2"
+EAPI=4
 
 inherit eutils qt4-r2
+
 MY_PN="PictureWall"
-MY_P="${MY_PN}_${PV}"
 
 DESCRIPTION="Qt4 picture viewer and image searching tool using google.com"
 HOMEPAGE="http://www.qt-apps.org/content/show.php?content=106101"
-SRC_URI="http://picturewall.googlecode.com/files/PictureWall_1.0.zip"
+SRC_URI="http://picturewall.googlecode.com/files/${MY_PN}_${PV}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="debug"
+IUSE="debug doc"
 
-RDEPEND=">=x11-libs/qt-gui-4.5.3"
+RDEPEND=">=x11-libs/qt-core-4.5.3:4
+	>=x11-libs/qt-gui-4.5.3:4
+	>=x11-libs/qt-webkit-4.5.3:4"
 DEPEND="app-arch/unzip
 	${RDEPEND}"
 
-S="${WORKDIR}/${MY_PN}/${MY_PN}"
+S=${WORKDIR}/${MY_PN}/${MY_PN}
 
 src_install(){
-	dobin bin/${PN} || die "dobin failed"
-	dodoc ReadMe || die "dodoc failed"
-	dohtml -r doc/html/* || die "dohtml failed"
-	make_desktop_entry ${PN} ${MY_PN} || die "make_desktop_entry failed"
+	dobin bin/${PN}
+	dodoc ReadMe
+	use doc && dohtml -r doc/html/*
+	make_desktop_entry ${PN} ${MY_PN}
 }