summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2010-09-25 12:11:59 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2010-09-25 12:11:59 +0000
commita21e4638d70bfd63f790e5f129185c1d5b685491 (patch)
tree88dff1853b7f4c2069065a7952dcaba9538e4e00
parentprofiles/ package.mask: Remove masking as it doesn't apply anymore (diff)
downloadsunrise-a21e4638d70bfd63f790e5f129185c1d5b685491.tar.gz
sunrise-a21e4638d70bfd63f790e5f129185c1d5b685491.tar.bz2
sunrise-a21e4638d70bfd63f790e5f129185c1d5b685491.zip
media-video/qnapi: Migrate to qt4-r2. Clean up ebuild
svn path=/sunrise/; revision=11369
-rw-r--r--media-video/qnapi/ChangeLog5
-rw-r--r--media-video/qnapi/Manifest4
-rw-r--r--media-video/qnapi/qnapi-0.1.6_rc2.ebuild15
3 files changed, 11 insertions, 13 deletions
diff --git a/media-video/qnapi/ChangeLog b/media-video/qnapi/ChangeLog
index e775fa084..ebe44cece 100644
--- a/media-video/qnapi/ChangeLog
+++ b/media-video/qnapi/ChangeLog
@@ -1,7 +1,10 @@
# ChangeLog for media-video/qnapi
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 25 Sep 2010; Markos Chandras <hwoarang@gentoo.org> qnapi-0.1.6_rc2.ebuild:
+ Migrate to qt4-r2. Clean up ebuild
+
30 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org>
qnapi-0.1.6_rc2.ebuild, metadata.xml:
Drop kde3 and fix QA issues.
diff --git a/media-video/qnapi/Manifest b/media-video/qnapi/Manifest
index 9c953f487..9bfa58952 100644
--- 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 1354 RMD160 77563fc38c4665ce7bcc12c576d2a30adeb14923 SHA1 5d1360e5a6b2c726a51bf0bd37a048d289191248 SHA256 db65d7bd7a019d0baff17157f193daa2f5654ce709389ec5e2fba827b9acdf15
-MISC ChangeLog 687 RMD160 e2d706d3ca009d16cec14a7f58dbf22ffa1501c5 SHA1 9cf26aab0acca779aa6aae24032ccbd24f031d83 SHA256 e7e926a2df6c52523ba5361e20727d7374a9af31eff739896bd97d8d30d266f6
+EBUILD qnapi-0.1.6_rc2.ebuild 1268 RMD160 c30aa0da6c4b39848edb57be0a1bcf9444e72341 SHA1 d8e8b300aa5a73e06fa1920924d220618bb95728 SHA256 2bbba319b5b4530e26599dbb197fcc2dd01cd87bea6ee8c28c99856b2731e69a
+MISC ChangeLog 802 RMD160 059319123477f79b92f40cfe9d9c8a285683fc24 SHA1 3d2ea5ac9db000e60aedbfc85df984ac7e944026 SHA256 b367416754b96c6896862900d58f10b279cf1d932a05116b74d299b4f2dcfad0
MISC metadata.xml 361 RMD160 a426a45c7232394353b890c1bc7f8966c09ab66f SHA1 b3800907dea2dbfd8478b10b4ecc19b53d553c4d SHA256 38696682d2cebb76de8c62583fc28d0cb94e91b1a5f3ce2ab82efb994277d26c
diff --git a/media-video/qnapi/qnapi-0.1.6_rc2.ebuild b/media-video/qnapi/qnapi-0.1.6_rc2.ebuild
index 7da8da7ac..26db3b76f 100644
--- a/media-video/qnapi/qnapi-0.1.6_rc2.ebuild
+++ b/media-video/qnapi/qnapi-0.1.6_rc2.ebuild
@@ -6,7 +6,7 @@ EAPI="2"
KDE_REQUIRED="optional"
CMAKE_REQUIRED="false"
-inherit eutils gnome2-utils kde4-base qt4
+inherit eutils gnome2-utils kde4-base qt4-r2
MY_P=${P/_rc/-rc}
@@ -21,8 +21,8 @@ IUSE="gnome"
S=${WORKDIR}/${MY_P}
-DEPEND="x11-libs/qt-core
- x11-libs/qt-gui
+DEPEND="x11-libs/qt-core:4
+ x11-libs/qt-gui:4
gnome? ( gnome-base/gconf )"
RDEPEND="${DEPEND}
app-arch/p7zip"
@@ -32,7 +32,7 @@ PATCHES=( "${FILESDIR}/${P}-gentoo.diff" )
pkg_setup() {
use kde && kde4-base_pkg_setup # get KDEDIR for KDE4
- qt4_pkg_setup
+ qt4-r2_pkg_setup
}
src_configure() {
@@ -43,13 +43,8 @@ src_configure() {
KDE4DIR="${KDEDIR}" INTEGRATION_TARGETS="${integr}" eqmake4
}
-src_compile() {
- emake || die "emake failed."
-}
-
src_install() {
- emake INSTALL_ROOT="${D}" install || die "emake install failed."
-
+ qt4-r2_src_install
prepalldocs || die "prepalldocs failed."
}