diff options
| -rw-r--r-- | app-admin/keepassx/ChangeLog | 8 | ||||
| -rw-r--r-- | app-admin/keepassx/Manifest | 25 | ||||
| -rw-r--r-- | app-admin/keepassx/files/keepassx-0.4.3-gcc47.patch | 11 | ||||
| -rw-r--r-- | app-admin/keepassx/keepassx-0.4.3.ebuild | 16 |
4 files changed, 29 insertions, 31 deletions
diff --git a/app-admin/keepassx/ChangeLog b/app-admin/keepassx/ChangeLog index e2344e090efb..3fa733c48491 100644 --- a/app-admin/keepassx/ChangeLog +++ b/app-admin/keepassx/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/keepassx -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/ChangeLog,v 1.56 2011/04/10 04:54:59 abcd Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/ChangeLog,v 1.57 2012/04/20 23:05:21 tgurr Exp $ + + 20 Apr 2012; Timo Gurr <tgurr@gentoo.org> keepassx-0.4.3.ebuild, + +files/keepassx-0.4.3-gcc47.patch: + Add patch for building with gcc-4.7, fixes bug #409161. Bump EAPI. 10 Apr 2011; Jonathan Callen <abcd@gentoo.org> keepassx-0.4.3.ebuild: Add prefix support, bump EAPI to 3, add prefix keywords diff --git a/app-admin/keepassx/Manifest b/app-admin/keepassx/Manifest index a0a2bbe98d8f..f20f6e0303c5 100644 --- a/app-admin/keepassx/Manifest +++ b/app-admin/keepassx/Manifest @@ -1,24 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - +AUX keepassx-0.4.3-gcc47.patch 424 RMD160 c9623b31a9682efe3c44f6f6e3d5115483f1922f SHA1 e0d9b458fa34fc4ff4a93dd9e37e14a9d0a07662 SHA256 fc714bb9c2f5f5c71fa0850cd6c3037904dbd5ecfc9fa2e1af6749683dab3cb0 DIST keepassx-0.4.3.tar.gz 1368766 RMD160 3e963d82dd6b8bc32e32dbb46efa9168bac1088b SHA1 d25ecc9d3caaa5a6d0f39a42c730a95997f37e2e SHA256 cd901a0611ce57e62cf6df7eeeb1b690b5232302bdad8626994eb54adcfa1e85 -EBUILD keepassx-0.4.3.ebuild 1107 RMD160 da2e3f0f99e83484f92439f414bee21a877de2da SHA1 ca1a0d61998a2da2f6e8bb197991e8cc14e902d8 SHA256 35f9c75733b025c7b4c1c8d80da23231ba20ee181f58e775282789241dcafe33 -MISC ChangeLog 9058 RMD160 ba148d98506666c9217bfb3144d52cbbdc8e2691 SHA1 b01dfdb91a82be1723196bdb9cc4dc180ad6e380 SHA256 0de6362215239d0ecd1c39fc5b447d252e0af6f37445079c8eab7a456bd4b8c2 +EBUILD keepassx-0.4.3.ebuild 1077 RMD160 e8c5eee744fee204b58ae3317ee9c83508ee4a7b SHA1 0ba6514602f57b8a526ba94583d3ca76ce57439c SHA256 9289d42823b65839d4ff3b86baa48539ffa426eef63907e151271bc986a9599d +MISC ChangeLog 9233 RMD160 f20015fb67a089d50c55896c7bcd86baaf8b6948 SHA1 78f67003fa7392cf2de3539502b7f86485337420 SHA256 7b36e3917aba9e72f91cb10848dbedcf82cea48ff942434197d84bdba954322e MISC metadata.xml 585 RMD160 f2bcf8b777ee678affc418b011b52a5b9c6b9dc5 SHA1 f777322e1b94fa0e5f8b4ba525f0ca37d8ebe1fa SHA256 da01ff6f54242bbf7c3a592cb9fe3565465103456d26eed1a77f01e533c05cca ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iQIcBAEBCAAGBQJNoTgrAAoJELHSF2kinlg4F3sP/jQuzivFuo5oqvGaotCjzXIT -P+G32VoKtjpZhI9+KrnGf75bW3bbcs17rxj9+Tu1slCzA7/uqBhIOj0ktqYdgK9S -wj5Pa91Yxz0bzc0yBjVdaItUrZdWlbDDPjyEQxu2IDDdERDKdPuettkJtQQuyUsN -j5yaarc41j2g6FoU7doyUtBvtNSXaeynKn8C15f/UVQ1uULHFYSlYzll2R0iC4aj -XIaI52Uh55kRTc9uEYlLdeJ111QeuriA9a61QBDAJXgqPQfm1kVv5O0rus7cxqst -vOwyoGqFZ+U/TEfGxuOAwBKhFyxSmbFvxFpHPXoAMOyikjupXXjO2uJo5h5Tegqf -th77Flm63x4WVU6oo0HKAUBwPkoToyPySopPpTaHMqhD1sX4Z79WM3GtZ05HPjXS -5mF1T9/q0MgLMRra/gy0pZccUVck24z8UrHkECCN9gOPx5Nt8V+Cf84jMfcV3zSL -++xjQ9//yu5YQvXgkiusnYxFzsrSMqDoGCas712PQNdSGvyrXVC+tKt/50ysmdkR -XL4GT5Oixg1kUgfWST4jl95QfG0kYQSvYlS3dykB0LmSccYLPuVBuubUWuiuOFAY -i5iZ3Yy49jxRERTAW5YI28NF05uDppb/EJ09/LLHjYwC3LquCJSlE88L6Slmzals -0Jz9NZ936iFIMOl+1dqW -=VjwO ------END PGP SIGNATURE----- diff --git a/app-admin/keepassx/files/keepassx-0.4.3-gcc47.patch b/app-admin/keepassx/files/keepassx-0.4.3-gcc47.patch new file mode 100644 index 000000000000..d5d0d8bd0882 --- /dev/null +++ b/app-admin/keepassx/files/keepassx-0.4.3-gcc47.patch @@ -0,0 +1,11 @@ +diff -Naur keepassx-0.4.3/src/lib/random.cpp keepassx-0.4.3.new/src/lib/random.cpp +--- keepassx-0.4.3/src/lib/random.cpp 2009-06-28 16:22:31.000000000 +0200 ++++ keepassx-0.4.3.new/src/lib/random.cpp 2012-04-19 00:20:15.757415510 +0200 +@@ -19,6 +19,7 @@ + ***************************************************************************/ + + #include "random.h" ++#include <unistd.h> + + + #if defined(Q_WS_X11) || defined(Q_WS_MAC) diff --git a/app-admin/keepassx/keepassx-0.4.3.ebuild b/app-admin/keepassx/keepassx-0.4.3.ebuild index 41db0dfe9a24..062f2f1f4273 100644 --- a/app-admin/keepassx/keepassx-0.4.3.ebuild +++ b/app-admin/keepassx/keepassx-0.4.3.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/keepassx-0.4.3.ebuild,v 1.5 2011/04/10 04:54:59 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/keepassx-0.4.3.ebuild,v 1.6 2012/04/20 23:05:21 tgurr Exp $ -EAPI="3" +EAPI="4" inherit qt4-r2 -DESCRIPTION="Qt password manager compatible with its Win32 and Pocket PC versions." +DESCRIPTION="Qt password manager compatible with its Win32 and Pocket PC versions" HOMEPAGE="http://keepassx.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" @@ -21,6 +21,8 @@ DEPEND="x11-libs/qt-core:4 || ( >=x11-libs/libXtst-1.1.0 <x11-proto/xextproto-7.1.0 )" RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}"/${P}-gcc47.patch ) + src_configure() { local conf_pch use pch && conf_pch="PRECOMPILED=1" || conf_pch="PRECOMPILED=0" @@ -33,10 +35,10 @@ src_configure() { src_compile() { # workaround compile failure due to distcc, bug #214327 PATH=${PATH/\/usr\/lib\/distcc\/bin:} - emake || die "emake failed" + emake } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc changelog || die "dodoc failed" + emake DESTDIR="${D}" install + dodoc changelog } |