summaryrefslogtreecommitdiff
path: root/sys-fs
diff options
context:
space:
mode:
Diffstat (limited to 'sys-fs')
-rw-r--r--sys-fs/ecryptfs-utils/ChangeLog6
-rw-r--r--sys-fs/ecryptfs-utils/Manifest19
-rw-r--r--sys-fs/ecryptfs-utils/ecryptfs-utils-99.ebuild7
-rw-r--r--sys-fs/ecryptfs-utils/files/ecryptfs-utils-99-python-m4.patch11
4 files changed, 31 insertions, 12 deletions
diff --git a/sys-fs/ecryptfs-utils/ChangeLog b/sys-fs/ecryptfs-utils/ChangeLog
index 23d920e3072d..b6d490468ed8 100644
--- a/sys-fs/ecryptfs-utils/ChangeLog
+++ b/sys-fs/ecryptfs-utils/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-fs/ecryptfs-utils
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ChangeLog,v 1.47 2012/07/16 06:23:58 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ChangeLog,v 1.48 2012/07/23 09:44:28 radhermit Exp $
+
+ 23 Jul 2012; Tim Harder <radhermit@gentoo.org> ecryptfs-utils-99.ebuild,
+ +files/ecryptfs-utils-99-python-m4.patch:
+ Respect CPPFLAGS when python and gpg support is enabled (bug #424601).
*ecryptfs-utils-99 (16 Jul 2012)
diff --git a/sys-fs/ecryptfs-utils/Manifest b/sys-fs/ecryptfs-utils/Manifest
index fabbbafbf061..5543b6c97bed 100644
--- a/sys-fs/ecryptfs-utils/Manifest
+++ b/sys-fs/ecryptfs-utils/Manifest
@@ -1,22 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
+AUX ecryptfs-utils-99-python-m4.patch 456 SHA256 578cdcee18b3cf5addf6017cf6ec7cfe858576ab819e4103a47874184e07d235 SHA512 91d3f1737a4b784a6a16b36d025b182195fd4e5cfead5cbe7d43d20f1053ac0e1ddf178ee9658247f64661844e13198df23810481c7272c6a3510a33a4162c74 WHIRLPOOL 9a3d41f5984e143fad882e13620bd273d9fa1c4fb9ec3d01283f2835d4de97f9f2ccd43bb51e6e86376745040b98df892d03de3f22b28bc8327c17b1af908f0e
DIST ecryptfs-utils_96.orig.tar.gz 608135 SHA256 04c43b6e7a2f6b3644a24bcf718bfde6384e74bb4266c053ac78b9cc852f2c0c SHA512 a54dc3a6e8a1d55ea0098f6f1144de06a7fc94503bd2f0a6fc760f593afad8104d13e5fd9753bf0bcde76cf477c68001af5d68ceb62e6923a5e6181ebc01f47f WHIRLPOOL 201077a61d7ca5f63f00caa22e7018c759c841339a4bb572ebdab2a7444f6a6cda378e5a304d45850f1462f2beccfaddbfb4ab7422e91635de5b1eeb403e5952
DIST ecryptfs-utils_97.orig.tar.gz 613364 SHA256 322c1eb6805ea71e75d5699a622ab8e710718bef3b64ce6df144e08fe090fdd6 SHA512 af633c4e756c76d4974cf49ec3edd15b5587d3af4424e795494f734fdb5dc23ee100c53c6cc43c43cebe5e45a83c107c6eb22464f951a82941b7ad79690f780b WHIRLPOOL 0bcb6ab56bb251db1553a7165805f67447b53d3703836c9a28dc5be55d0c4394340f7b9cd83d3eac6db78851641a910dcc63189e753e049bb4818501746aa225
DIST ecryptfs-utils_99.orig.tar.gz 609958 SHA256 145f8aae31c1a03036297f8a15aa2a127c09589765a16dfb551b8d1e7abe6154 SHA512 3c3dafcac2d557b1e86063909d054e1b7ce48361d24a77a3f3a75c8c50b5f2e482c16d940fc24720feddc9924d43d127808eec039c9ce4c1eadc30f271749c30 WHIRLPOOL c6ab305666e56201c9b82ac4928dbcf0c3c34a3af97d2a15b3f80303d7cdfb4210ec8a2fe87a73f9f1c921903012c6110afc4b0343e1c667bce757822535425e
EBUILD ecryptfs-utils-96.ebuild 3544 SHA256 36eb1cd53f8375690a64eca500b5d5a4cd4e043a1304a9c56f6a276342b94842 SHA512 fc2047e54e5b948871ca6ab9ef40f263944bc893e8530887d5d715c5efaa9560e7cd55f74d7d8738f22caba8648969120e75fcb30c8b57fe948f20efab656cd2 WHIRLPOOL 6da6fb7ccfe63d6e8e5dfb1c3a55c60bd50dbbf613bcb6ab11bd140e90b036f72b4dd407839702485c3d7e2dfe7d9a6d61a373eb21b79a64d0f0b85c4899835a
EBUILD ecryptfs-utils-97.ebuild 3550 SHA256 500630f292956973aa11240214505878d07043a207e979b21cfefec3ef18044e SHA512 3a1748d44c509546e205ff9f6b97f66f51fd61e2cf7b841a168ef70a41633ec2faeb55a205cd9182d15862751e63d8b94ff0d0f684a3098d4c29ddb42b06b77b WHIRLPOOL 4952b029dda8bd96c6502f84ad29708e7c390b5c60035dbabf337dfd41403e97bf92ae03f8b93dcfd94e214ca2e46f713770837200a066dd46fc1076d13e2d63
-EBUILD ecryptfs-utils-99.ebuild 3550 SHA256 41f1c7d1455f889181b767f78a9885c84aafa4c8ec01dd1198ee9aa3e528dd72 SHA512 afd81a9a499548a9256bd1bc72932535487b7760606d1427803bdd5c843e3521520854fcb7155efca8f997531dd85389b3e61d7a2a68570e9862a9171b5304de WHIRLPOOL ec3631033d30b37db8e96ae27f4f9e9af39ef37844a7c6099c757ad86557549206f4d96b7e80eaf648d816d46f71190268797b588db60e3ff3353bfb81e93fe1
-MISC ChangeLog 8576 SHA256 b832f143cc5563aaa89c2bd01bb053b90bb340ad737df51e7bc9e240da39ad8d SHA512 5849f46bb81a92886dcb113e4308114a78df1d5eef6ce1cd5fca6bb56eea56aaffac0da57ec1318f52d2038a9745c100a7dc0cdb81beafebf17d9ae5aa1675e1 WHIRLPOOL fc7b4f004e7b790a243517ff1f6b25dc7e1ab000d4fd4ad84bf6fed618db8ace7f09aeb1da25e9d441cbf921d7717fdb48621cb8ce8a139ef67ec17d1b2bc628
+EBUILD ecryptfs-utils-99.ebuild 3666 SHA256 ce0173b7123545b24c8767a9cdd0ba83f77a4a498562808d992c68564fec80d2 SHA512 c6edef261de9e522c4889f203983856a8c92718729d638eb565982c0c2858ab62c62b7fa204ed04b3c984e1ec400b34048c7abe23f898b7f100f60c6bd45b0eb WHIRLPOOL cc1a4f968cad7a63db451ca41220f0b91f07e4e614f8f502611fd70ba10e0bba1d8e714c57544e220e6ee71dfaa2763f995b12dea4ec1ed43ec8f683e9b05a94
+MISC ChangeLog 8769 SHA256 6dbfb91611a76fb13b357bd1d04c679fabcaf4f011934b4d9f7fe5f1ac7db40d SHA512 1e14cf6e5c273318c8629ecc5f6b657bf32d53a61e70cb55bb4898dcf5ed7ba4076736b030d0aef9c4ddd9978e7f2d42e09d448271acb5100ac023dda1d05379 WHIRLPOOL 921b83c07c5193f9972824cb2051258720dcf3c655face4ae0f0c2ba1d7de3102ecfb1881955f050d020fc84349aaf969cb782c494d8c916981902afc6b510d3
MISC metadata.xml 530 SHA256 26f3ef615c7e9d6f9300864ecccb8990fc9e80728292903d5e89f66b0c66f70e SHA512 eefe51cac994918f5141b21d5915177c6dfb4a244f5aa31d7f58614eceeabb7a0986d1a2360822c6239175a6c11bd44785713516bc865b74702db8dba2392972 WHIRLPOOL 775d85e8c359244b7cd3e15c3622f9d13ccd06ae7ba0af3cab428171f8b39556ad8549e45036c318e5b77cf32fb79283284e3f4c569d4ff2c23f97b6b5ed3580
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQEcBAEBCAAGBQJQA7OEAAoJEEqz6FtPBkyjBS8H/1gskUhhNrb4PPDfdDqZQwUa
-Oq8GnOuFNruBiCLGVbxCvkd7YwhGyYVXZQjIz6MEfoW8x4i6KBVRWxs536GVfSEA
-fAoIZwuC1zpnrv9yYsVOLtOGmIWaypGZzlAyWKdbkXRYeWRjamWNYS6v0mfJs5cv
-o0F7OlbdYtms36oyqTB3aVolRPXRhVTQpQSS69OnEwnMnn7HYrOA8NCUHflvszs/
-2/HoAHH9p0wG70+9TaC/kTzepfrMxW/jznigsryiAibAIjIYMgXiPsmELwDOZB/r
-PoEYaLqeSiR4t29+TQJm/fnFD9YHUeIF9TYx5Ux00mEHCQFBzBYtQ5AEvJVP2eM=
-=1cgt
+iQEcBAEBCAAGBQJQDR0NAAoJEEqz6FtPBkyjc8wH/A3WfgaxCBo71a7UXkiCIV0k
+Z70CJTlsyS077FnbRpXs2GD54XUryi+nmEA3dMzUm8GbWrrijrtQRWgixFTWt4AF
+chke15n9psEwufRH3ocI2UrwzUCpZ0dq4nstaMZsJ+Q2k1aQjNEw0bMin8O8q17C
+PaHYnrLksI/5AohAPg8nW9Msy87ckBk5JSYW7q/GMouQyyQDQkyR3AY5lk8nM1vL
+XGV5ag5oU0F3zGa5b/57z2mJ3sm4CtFjLiZPw72B6BwzZOrhgGmIkpc5y4bOoFAS
+hmqFeOrpj9/sEX2cLrtacyx416QsHDCmDqXWugYseGrZl1cEhLmN/1EKrywjl54=
+=Azem
-----END PGP SIGNATURE-----
diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-99.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-99.ebuild
index 0303ba21922e..c6d175b21fce 100644
--- a/sys-fs/ecryptfs-utils/ecryptfs-utils-99.ebuild
+++ b/sys-fs/ecryptfs-utils/ecryptfs-utils-99.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ecryptfs-utils-99.ebuild,v 1.1 2012/07/16 06:23:58 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ecryptfs-utils-99.ebuild,v 1.2 2012/07/23 09:44:28 radhermit Exp $
EAPI="4"
PYTHON_DEPEND="python? 2:2.5"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="2.4 3.* *-jython 2.7-pypy-*"
-inherit flag-o-matic pam python linux-info autotools
+inherit flag-o-matic pam python linux-info autotools eutils
DESCRIPTION="eCryptfs userspace utilities"
HOMEPAGE="https://launchpad.net/ecryptfs"
@@ -49,6 +49,9 @@ src_prepare() {
# Python bindings are built/installed manually.
sed -e "/SUBDIRS =/s/ libecryptfs-swig//" -i src/Makefile.am || die "sed failed"
+ # respect CPPFLAGS when python support is enabled (bug #424601)
+ epatch "${FILESDIR}"/${P}-python-m4.patch
+
eautoreconf
}
diff --git a/sys-fs/ecryptfs-utils/files/ecryptfs-utils-99-python-m4.patch b/sys-fs/ecryptfs-utils/files/ecryptfs-utils-99-python-m4.patch
new file mode 100644
index 000000000000..05fb5fb6d796
--- /dev/null
+++ b/sys-fs/ecryptfs-utils/files/ecryptfs-utils-99-python-m4.patch
@@ -0,0 +1,11 @@
+--- ecryptfs-utils-99/m4/ac_python_devel.m4
++++ ecryptfs-utils-99/m4/ac_python_devel.m4
+@@ -158,6 +158,8 @@
+ AC_MSG_CHECKING([consistency of all components of python development environment])
+ AC_LANG_PUSH([C])
+ # save current global flags
++ ac_save_LIBS="$LIBS"
++ ac_save_CPPFLAGS="$CPPFLAGS"
+ LIBS="$ac_save_LIBS $PYTHON_LDFLAGS"
+ CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
+ AC_TRY_LINK([