Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: app-admin/keepassx/
Date: Sat, 04 Feb 2012 01:11:47
Message-Id: b0cfc0e18e39a5716ac46a828227c548c395e96d.johu@gentoo
1 commit: b0cfc0e18e39a5716ac46a828227c548c395e96d
2 Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 4 01:15:08 2012 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 4 01:15:08 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=b0cfc0e1
7
8 [app-admin/keepassx] EAPI 4, cmake based build, svn->git
9
10 (Portage version: 2.2.0_alpha84/git/Linux i686, unsigned Manifest commit)
11
12 ---
13 app-admin/keepassx/keepassx-9999.ebuild | 54 ++++++++++--------------------
14 1 files changed, 18 insertions(+), 36 deletions(-)
15
16 diff --git a/app-admin/keepassx/keepassx-9999.ebuild b/app-admin/keepassx/keepassx-9999.ebuild
17 index 13fe5ab..4540198 100644
18 --- a/app-admin/keepassx/keepassx-9999.ebuild
19 +++ b/app-admin/keepassx/keepassx-9999.ebuild
20 @@ -1,52 +1,34 @@
21 -# Copyright 1999-2010 Gentoo Foundation
22 +# Copyright 1999-2012 Gentoo Foundation
23 # Distributed under the terms of the GNU General Public License v2
24 # $Header: $
25
26 -EAPI="2"
27 +EAPI=4
28
29 -LANGS="de_DE es_ES fi_FI fr_FR gl_ES hu_HU it_IT ja_JP nb_NO nl_NL pl_PL ru_RU tr_TR uk_UA zh_CN"
30 -inherit qt4-edge subversion
31 +inherit qt4-edge cmake-utils git-2
32
33 DESCRIPTION="Qt password manager compatible with its Win32 and Pocket PC versions."
34 HOMEPAGE="http://keepassx.sourceforge.net/"
35 -ESVN_REPO_URI="http://${PN}.svn.sourceforge.net/svnroot/${PN}/trunk"
36 +EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}"
37
38 -LICENSE="GPL-2"
39 +LICENSE="LGPL-2.1 GPL-2 GPL-3"
40 SLOT="0"
41 KEYWORDS=""
42 -IUSE="debug pch"
43 +IUSE="debug test"
44
45 -DEPEND="x11-libs/qt-core:4[qt3support]
46 +RDEPEND="dev-libs/libgcrypt
47 + sys-libs/zlib
48 + x11-libs/qt-core:4[qt3support]
49 x11-libs/qt-gui:4[qt3support]
50 - x11-libs/qt-xmlpatterns:4"
51 -RDEPEND="${DEPEND}"
52 -
53 -src_prepare() {
54 - subversion_src_prepare
55 -
56 - # build system installs all translation, so delete unneeded ones
57 - local i18npath="${S}/share/${PN}/i18n"
58 - for X in ${LANGS}; do
59 - if ! use linguas_${X%_*}; then
60 - rm "${i18npath}/${PN}-${X}.qm"
61 - [ -e "${i18npath}/qt_${X%_*}.qm" ] && rm "${i18npath}/qt_${X%_*}.qm"
62 - fi
63 - done
64 -
65 - rmdir "${S}/share/${PN}/i18n/" 2>/dev/null && \
66 - sed -i "/INSTALL.*i18n/d" "${S}/src/CMakeLists.txt"
67 -}
68 +"
69 +DEPEND="${RDEPEND}
70 + test? ( x11-libs/qt-test:4 )
71 +"
72
73 src_configure() {
74 - local conf_pch
75 - use pch && conf_pch="PRECOMPILED=1" || conf_pch="PRECOMPILED=0"
76 -
77 - eqmake4 ${PN}.pro -recursive \
78 - PREFIX="${D}/usr" \
79 - "${conf_pch}"
80 -}
81 + mycmakeargs=(
82 + $(cmake-utils_use_with test TESTS)
83 + -DWITH_GUI_TESTS=OFF
84 + )
85
86 -src_install() {
87 - emake DESTDIR="${D}" install || die "emake install failed"
88 - dodoc changelog || die "dodoc failed"
89 + cmake-utils_src_configure
90 }