summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2012-06-21 09:35:07 +0000
committerMichael Palimaka <kensington@gentoo.org>2012-06-21 09:35:07 +0000
commit3012ca725fad4cb5b081e5f98e879458a8c79f2a (patch)
tree05b0812ce94a02a74081ea86df7dbad81f34b260 /app-crypt
parentGold linker fix (diff)
downloadhistorical-3012ca725fad4cb5b081e5f98e879458a8c79f2a.tar.gz
historical-3012ca725fad4cb5b081e5f98e879458a8c79f2a.tar.bz2
historical-3012ca725fad4cb5b081e5f98e879458a8c79f2a.zip
Fix build with GCC 4.7, wrt bug #421905.
Package-Manager: portage-2.1.10.65/cvs/Linux x86_64
Diffstat (limited to 'app-crypt')
-rw-r--r--app-crypt/kencfs/ChangeLog6
-rw-r--r--app-crypt/kencfs/Manifest23
-rw-r--r--app-crypt/kencfs/files/kencfs-1.2-gcc-4.7.patch10
-rw-r--r--app-crypt/kencfs/kencfs-1.2.ebuild13
4 files changed, 36 insertions, 16 deletions
diff --git a/app-crypt/kencfs/ChangeLog b/app-crypt/kencfs/ChangeLog
index 64a90e6e9d0c..e9887e36388c 100644
--- a/app-crypt/kencfs/ChangeLog
+++ b/app-crypt/kencfs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-crypt/kencfs
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/kencfs/ChangeLog,v 1.2 2012/01/10 14:44:20 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/kencfs/ChangeLog,v 1.3 2012/06/21 09:35:07 kensington Exp $
+
+ 21 Jun 2012; Michael Palimaka <kensington@gentoo.org>
+ +files/kencfs-1.2-gcc-4.7.patch, kencfs-1.2.ebuild:
+ Fix build with GCC 4.7, wrt bug #421905.
*kencfs-1.2 (10 Jan 2012)
diff --git a/app-crypt/kencfs/Manifest b/app-crypt/kencfs/Manifest
index d187ab065687..7e579dc0bf9a 100644
--- a/app-crypt/kencfs/Manifest
+++ b/app-crypt/kencfs/Manifest
@@ -1,21 +1,22 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
AUX kencfs-1.1-underlinking.patch 361 RMD160 6f818cec07640b4944af53d3438d0726f648334e SHA1 af9521f7030f8be58a894331bbd76ce2ccd0f6b1 SHA256 93b4c1a8fd5a052a837c84e2080f7784225cf8c5d944dd023cc83892a5849322
+AUX kencfs-1.2-gcc-4.7.patch 173 RMD160 0ac78ba0a387df2d250f0a77a7ca1f0439998e1f SHA1 f7a4985eb4ee91530746ac56e4359a21859e759b SHA256 84088eb5a8d1f9559cd23b080baa7b4f32d35ae482ff0c64b68733897a0224c0
DIST 134003-kencfs-1.1.tar.gz 77254 RMD160 b666e5fc7195bfb743d8e03fa496087e161303f9 SHA1 572bc97f357ce481cf78dfb6043cc7b1a96dbdf4 SHA256 6e40dd54657fd4ac0a51b938e1fb825c3b3a9323aa8ce19012ec6d286de3a0e2
DIST 134003-kencfs-1.2.tar.gz 79623 RMD160 a009ad9d6d618b75b8367111e7b296324ecfa9a5 SHA1 91ca55825c8ca60cce904306b4a6ef1362c59090 SHA256 0769d0e5500edbdd90886af4dc5e668c37aee0ba9c4e29e5202ce05169f10a42
EBUILD kencfs-1.1.ebuild 606 RMD160 99a5dce5ae405ff68e663ee4283b6f62dccac740 SHA1 8d48e668ff3cbe42e8424b09829fc2f163296604 SHA256 6b8de197ef14b96285cd70540d7f54ac06dd2648a339afe349da6cf69cf56432
-EBUILD kencfs-1.2.ebuild 606 RMD160 4b08359cc5a9c71722ebdb49ee245eec7420e8da SHA1 ecd3d8cbe84a101b11635e0a421f5447955d1b5f SHA256 07bc7664fcdae5235ea81eab3cffa153498cef1281c14671f3895a58258a5c61
-MISC ChangeLog 545 RMD160 a77361feb9e86246433d12dd8afc2e732e0015cb SHA1 01dfd7729d43e12979740b57bf43e5920c32892b SHA256 186c17636d8a6bc6de10b8c374aa6992ca2c8f695b8772ff3515850a0bc91c9b
+EBUILD kencfs-1.2.ebuild 649 RMD160 63a197ed6c5607237af349b85a8e3ae5a04e5b31 SHA1 1f4db8b9266146433f753894d3131556cfe5826f SHA256 dde786f29dd88a6fba272e34b82bb42ede1a2e29b77c3184f45e2c52aac66aed
+MISC ChangeLog 705 RMD160 2b05de36335a38ae8e7621c07d0ecc64ee1f3596 SHA1 64e61bde0fd7271aabc9fe4da94fb41e51864a1f SHA256 2534e855462b6f66c2ec9ff743dd83f8b3fbc6affedc2a3fabc9611c61e8b882
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
-iQEcBAEBCgAGBQJPDE6fAAoJEO+t9ga+3I3aPOsH+gLgFjf9kTNSVKlWD0Ap4qTw
-+nF7v9+i3lGR/tG4kcHK9EXbu/SGdX0DuO3Oz2q6s7WSw7uZZJVucYVLGokrRY+g
-g6h1Gj7S7mMl7OyJ1MDIo8jHUwn9x2JYn093ouCy6Ap8qE8KL/nXgaejueyO8umZ
-/GUHLQBKHl0ioR9rqBJgMsaSAk1VRART4OHy2x5ZfEvZmrzpTYzfwLdMe1fiVT+t
-3BTnWWaxsJaY1h5Tv9yhLbzKpaPJ9cPK2VIxeyA6HK3s4C/EnB9JLLgtEsyhW75R
-ft1T1DXcq27rUNJtMsY1x8fDAK2jGNczcHIU9G9yVYTHvikBNIimJc97WWIUMJ0=
-=P+0B
+iQEcBAEBAgAGBQJP4uqmAAoJEMbwO6tnXQ0sC+EH/A+AyCqjPujb0fu9ZnvowKpT
+ELIGPkma+JCZhVepeFQz9INU9XqpE+arwJTK+9Y64OHw+EYhh4qZQA+fHOuEJUmu
+M+PDuovXKB/t4SBlyVPicoiozBC9YYnXMwBWTgir+D7H5GorzceBzq9rVCQ60RVJ
+fbLnou549WKPagYZFACbqioCiPf/wS1+h8e2N5Dh83H/KT7seOSbV2GQFX1CG/dd
+Fce1Dy33YaNblN6sTscSP4szfhnRgYreWWku8NNOUkcoi4v6FYoNFyAabYa9U7Nm
+IiiufMRE+CUP47v9JFkEuvi9C/8ggIpLwhyktpoxhO2cFvgPg2jWbzB+DoLDsAY=
+=E6XY
-----END PGP SIGNATURE-----
diff --git a/app-crypt/kencfs/files/kencfs-1.2-gcc-4.7.patch b/app-crypt/kencfs/files/kencfs-1.2-gcc-4.7.patch
new file mode 100644
index 000000000000..d4b41a7e4750
--- /dev/null
+++ b/app-crypt/kencfs/files/kencfs-1.2-gcc-4.7.patch
@@ -0,0 +1,10 @@
+--- qtlocalpeer.cpp
++++ qtlocalpeer.cpp
+@@ -57,6 +57,7 @@
+ #endif
+ #if defined(Q_OS_UNIX)
+ #include <time.h>
++#include <unistd.h>
+ #endif
+
+ namespace QtLP_Private {
diff --git a/app-crypt/kencfs/kencfs-1.2.ebuild b/app-crypt/kencfs/kencfs-1.2.ebuild
index 446cc76c882b..be04af2c484b 100644
--- a/app-crypt/kencfs/kencfs-1.2.ebuild
+++ b/app-crypt/kencfs/kencfs-1.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/kencfs/kencfs-1.2.ebuild,v 1.1 2012/01/10 14:44:20 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/kencfs/kencfs-1.2.ebuild,v 1.2 2012/06/21 09:35:07 kensington Exp $
EAPI=4
@@ -16,8 +16,13 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
DEPEND="kde-base/kdelibs
- x11-libs/qt-gui:4"
+ x11-libs/qt-gui:4
+"
RDEPEND="${DEPEND}
- sys-fs/encfs"
+ sys-fs/encfs
+"
-PATCHES=( "${FILESDIR}/${PN}-1.1-underlinking.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-1.1-underlinking.patch"
+ "${FILESDIR}/${P}-gcc-4.7.patch"
+)