media-video/qnapi: Bump to EAPI 4, drop prepalldocs & nonexistent qt4-r2_pkg_setup...

(Portage version: 2.2.0_alpha100/git/Linux x86_64, signed Manifest commit with key 42B9401D)

diff --git a/media-video/qnapi/ChangeLog b/media-video/qnapi/ChangeLog
index ce3795cefbd08cd78e999fcb14934428ad0066e0..5cfa5e9e38a2b3c9696d200eb86c9ea45e6f4fac 100644 (file)
--- a/media-video/qnapi/ChangeLog
+++ b/media-video/qnapi/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for media-video/qnapi
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Apr 2012; Michał Górny <mgorny@gentoo.org> qnapi-0.1.6_rc2.ebuild:
+  Bump to EAPI 4, drop prepalldocs & nonexistent qt4-r2_pkg_setup() call.
+
   06 Apr 2011; Mike Gilbert <floppymaster@gmail.com> qnapi-0.1.6_rc2.ebuild:
   Bump EAPI to fix kde-functions usage
 

diff --git a/media-video/qnapi/Manifest b/media-video/qnapi/Manifest
index 480432147f35a212f22906e73b96795a6dce9b99..496e4947945af593aaf1135388ca62dcf79a167a 100644 (file)
--- a/media-video/qnapi/Manifest
+++ b/media-video/qnapi/Manifest
@@ -1,5 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX qnapi-0.1.6_rc2-gentoo.diff 4271 RMD160 4846137f5023e30dc72f94a8b0bfffc7f551f087 SHA1 04459eea0d105fc51372fb7f978c269903fa748c SHA256 7e1d18cb2482f7c5749baf46c0359d5732f2f44a3bc2feb9ac62e2e5dda058e0
 DIST qnapi-0.1.6-rc2.tar.gz 211567 RMD160 2696c22f2db7cf9e0e546ad8c08b46070a4186c0 SHA1 884e7b7d9643f8f0d82ece2720f9d3c251fd8d44 SHA256 a2ae2d0b5d800565493c8840f5f584d480daaee1f01742689d927fdf68c5150a
-EBUILD qnapi-0.1.6_rc2.ebuild 1268 RMD160 60f254753624334bd020c965f79e1eddfc29dd50 SHA1 cac659a464d5e0d71ad072e63700db8f7a2708d8 SHA256 addae86f8bc0a431227f06d2631abe9ff706fad2c393c966c7c604c509b7dffa
-MISC ChangeLog 919 RMD160 a5494902cc5a5d44c1dfe001797f849224014160 SHA1 5a0b907d001edad796a7afe518527a1ee10b1db7 SHA256 903dfba040e2c58c31990870dc6719136880784cc0e1cd517d6fee28ef110125
+EBUILD qnapi-0.1.6_rc2.ebuild 1169 RMD160 6a10e4bbb7800453504c46b74c593fb9c19fe72f SHA1 58d6d1fd9ac7d31ecc9b566e271a866bc0adff55 SHA256 c429c188661e6c772c4b4d187c30f854bada564fd7047ab5d2d6fe4e73daa5ac
+MISC ChangeLog 1068 RMD160 123e51a86bd137b65e23148ed7f48714d62d16e7 SHA1 f65a2ceed4848a3a0aa9393790dc0a063dec94c1 SHA256 6234b10014e65453ec6002d2b9ed558e01f685c0dc8efa161f4e71a8db0b6176
 MISC metadata.xml 339 RMD160 e8c08eb9a81367f928f96c4b4f9b22fdd77eade4 SHA1 cf006034ed6e8e57a0f121495cc4acca182086e1 SHA256 6a9920e9481fd1eccfa2d32e1e9eca8275bb989254fc0add49a76bda4f9c0358
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iJwEAQEIAAYFAk+DC3cACgkQfXuS5UK5QB3slgP/ZNbYhAXY6wDkGyXv6ElGEurq
+etnY7HsNfffwgM6xGj1G1pR4yb1XdFh6kcMpg1JRC+LfXaWxMuYeAe4Kq904QY1J
+gIy7v+nTmaUIpt0whFH2TC0S7T/LqpeZGZGp4tONVMxfCBtl6HNPZX/BIZxDtCkR
+05aQNj7LlQ4a0FCpXNA=
+=6u4n
+-----END PGP SIGNATURE-----

diff --git a/media-video/qnapi/qnapi-0.1.6_rc2.ebuild b/media-video/qnapi/qnapi-0.1.6_rc2.ebuild
index 2357e275bdaa1804be540b840d333e2180f469fb..273c64e34a90cd1ae7fc7fb22cc185d95c5e1924 100644 (file)
--- a/media-video/qnapi/qnapi-0.1.6_rc2.ebuild
+++ b/media-video/qnapi/qnapi-0.1.6_rc2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
+EAPI="4"
 KDE_REQUIRED="optional"
 CMAKE_REQUIRED="false"
 
@@ -32,7 +32,6 @@ PATCHES=( "${FILESDIR}/${P}-gentoo.diff" )
 
 pkg_setup() {
        use kde && kde4-base_pkg_setup # get KDEDIR for KDE4
-       qt4-r2_pkg_setup
 }
 
 src_configure() {
@@ -43,11 +42,6 @@ src_configure() {
        KDE4DIR="${KDEDIR}" INTEGRATION_TARGETS="${integr}" eqmake4
 }
 
-src_install() {
-       qt4-r2_src_install
-       prepalldocs || die "prepalldocs failed."
-}
-
 pkg_preinst() {
        use gnome && gnome2_gconf_savelist
 }