Drop kde3 and fix QA issues.

svn path=/sunrise/; revision=9438

diff --git a/media-video/qnapi/ChangeLog b/media-video/qnapi/ChangeLog
index d8a7b198895a8d64c6901fe92215c1ae39222965..e775fa0842876666bb787e125ecbf5b4b28a5600 100644 (file)
--- a/media-video/qnapi/ChangeLog
+++ b/media-video/qnapi/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  qnapi-0.1.6_rc2.ebuild, metadata.xml:
+  Drop kde3 and fix QA issues.
+
   27 Aug 2009; Michał Górny (sedzimir) <gentoo@mgorny.alt.pl>
   qnapi-0.1.6_rc2.ebuild:
   eqmake4 (much like econf) does not need the '|| die' statement. Updated

diff --git a/media-video/qnapi/Manifest b/media-video/qnapi/Manifest
index 77b84d402abc3ed29533e4a281a3778081bfc47c..f8371e6347901cdf1c08b642717866a561220a4b 100644 (file)
--- a/media-video/qnapi/Manifest
+++ b/media-video/qnapi/Manifest
@@ -1,5 +1,5 @@
 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 1547 RMD160 677c665aebd0fcac01106c9c1f2675927c620ca7 SHA1 06370debc79be507cfa464021b3d43017c3701bb SHA256 3c9f5ce712868d63f0ca2231e09cff9d4c10d019cf9ef17ca17af223320314b3
-MISC ChangeLog 560 RMD160 232f2ab1ea4956bf15682a9a5f5841aff6708378 SHA1 16464034eafaa75b07199a93b80c0b4bbc9ac6f9 SHA256 958e5c32c567a4050310bb69cfb86998232e20c6284e388f5c494744dfb96795
-MISC metadata.xml 368 RMD160 0366e6b013a6e53c0bf0d8491bddceac70fc6bb0 SHA1 063b035727fc758750280ae90001027f1e7e9b36 SHA256 3ddeb504da41a09a71ba9c7daaac033331f0476d6fbc644fccbadf41e217a3cc
+EBUILD qnapi-0.1.6_rc2.ebuild 1354 RMD160 0bbd31b85e794dede3653216b2b390250698c7f1 SHA1 983c1ebce03ad00b51575aa074ad8f7d8cbbfab1 SHA256 96874dc36de4e5b82d7852ab5153e6c8012398bcc1fdf08e2b529fe0eb003aca
+MISC ChangeLog 687 RMD160 e2d706d3ca009d16cec14a7f58dbf22ffa1501c5 SHA1 9cf26aab0acca779aa6aae24032ccbd24f031d83 SHA256 e7e926a2df6c52523ba5361e20727d7374a9af31eff739896bd97d8d30d266f6
+MISC metadata.xml 301 RMD160 3c61360bbf99de11ce4087f2c62f77313d07dab1 SHA1 6ff8f54e1a23f3e157d66ea1099697f84d700d09 SHA256 852dde8e891d94f856fcb10f6c58bcba61396f79b655393a0410f05b35a11ebc

diff --git a/media-video/qnapi/metadata.xml b/media-video/qnapi/metadata.xml
index 1c3fb198641af08ce8d5a34f0b04ff8d839f9ec4..268d0382ff3e18678891f880e428c7d1b5ec5ede 100644 (file)
--- a/media-video/qnapi/metadata.xml
+++ b/media-video/qnapi/metadata.xml
@@ -4,7 +4,6 @@
        <herd>maintainer-wanted</herd>
        <use>
                <flag name='kde'>Enable KDE4 menu integration.</flag>
-               <flag name='kde3'>Enable KDE3 Konqueror menu integration.</flag>
                <flag name='gnome'>Enable GNOME menu integration.</flag>
        </use>
 </pkgmetadata>

diff --git a/media-video/qnapi/qnapi-0.1.6_rc2.ebuild b/media-video/qnapi/qnapi-0.1.6_rc2.ebuild
index 187e4b0c3f9012b3fd14f8c1548d6da36e690718..dc0af2b3df1c5c8565c7d32319d78c122f2f36ee 100644 (file)
--- a/media-video/qnapi/qnapi-0.1.6_rc2.ebuild
+++ b/media-video/qnapi/qnapi-0.1.6_rc2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 KDE_REQUIRED="optional"
-WANT_CMAKE="no"
+CMAKE_REQUIRED="false"
 
 inherit eutils gnome2-utils kde4-base qt4
 
@@ -17,14 +17,13 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gnome kde3"
+IUSE="gnome"
 
 S=${WORKDIR}/${MY_P}
 
 DEPEND="x11-libs/qt-core
        x11-libs/qt-gui
-       gnome? ( gnome-base/gconf )
-       kde3? ( <kde-base/kdelibs-4 )"
+       gnome? ( gnome-base/gconf )"
 RDEPEND="${DEPEND}
        app-arch/p7zip"
 
@@ -41,10 +40,6 @@ src_configure() {
 
        use gnome && integr="gnome_integration"
        use kde && integr="${integr} kde4_integration"
-       use kde3 && integr="${integr} konqueror_integration"
-       # Dolphin for KDE3 is being dropped (bug #280633),
-       # d3lphin isn't yet in portage.
-
        KDE4DIR="${KDEDIR}" INTEGRATION_TARGETS="${integr}" eqmake4
 }
 
@@ -64,9 +59,9 @@ pkg_preinst() {
 
 pkg_postinst() {
        use gnome && gnome2_gconf_install
-       use kde || use kde3 && kde4-base_pkg_postinst
+       use kde && kde4-base_pkg_postinst
 }
 
 pkg_postrm() {
-       use kde || use kde3 && kde4-base_pkg_postrm
+       use kde && kde4-base_pkg_postrm
 }