summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-editors/elvis/ChangeLog7
-rw-r--r--app-editors/elvis/Manifest18
-rw-r--r--app-editors/elvis/elvis-2.2.0-r3.ebuild8
3 files changed, 27 insertions, 6 deletions
diff --git a/app-editors/elvis/ChangeLog b/app-editors/elvis/ChangeLog
index 6a08b58d1bc4..50c2ba5e22c8 100644
--- a/app-editors/elvis/ChangeLog
+++ b/app-editors/elvis/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-editors/elvis
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/ChangeLog,v 1.42 2009/08/05 18:29:29 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/ChangeLog,v 1.43 2010/08/31 16:59:59 nelchael Exp $
+
+ 31 Aug 2010; Krzysztof Pawlik <nelchael@gentoo.org> elvis-2.2.0-r3.ebuild:
+ Respect LDFLAGS, bug #335437.
05 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> elvis-2.2.0-r3.ebuild,
+files/elvis-2.2.0-glibc-2.10.patch:
diff --git a/app-editors/elvis/Manifest b/app-editors/elvis/Manifest
index 7a9d6a5bd8ac..fe92ef14ac9c 100644
--- a/app-editors/elvis/Manifest
+++ b/app-editors/elvis/Manifest
@@ -1,6 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX elvis-2.2.0-glibc-2.10.patch 1526 RMD160 bcc0a2905063606ee6079a12a474a2aa27649d47 SHA1 d21ab5fd0146025bfa0750a78dace1ce5204eb88 SHA256 1363fd4ed25c7b97d1a79da7c243f38ed5d2053fdf83e23ed0be3167bd14c46d
AUX ft2.3-symbol-collision-fix.patch 2396 RMD160 c80ec1c5e7a15e2dea185e2d0d83da5fccd39b1b SHA1 3957feb87b9d8fe0a3a58ec8715d0c328545c086 SHA256 59960b0498863f0793b5c33a824efc62c6255d26455d3ec6c87f62cb1969f008
DIST elvis-2.2_0.tar.gz 1439293 RMD160 9867a3941a84a3db0bcfe4e36dd14132fbcf5805 SHA1 8c16574b6d36529735b8ced70972ddaf6275a477 SHA256 9a8466b2293798441056bc279736af3a616baaba2f11940396cc60ff71924ea0
-EBUILD elvis-2.2.0-r3.ebuild 2266 RMD160 d3d1f48a644358a400b89122b367b056f3816f20 SHA1 7d382ea75bfabde0fc762de600763e34b5782223 SHA256 56358b67b78a984dbecee454aba85c18cc52936af299fdbba12f30c4a0290da9
-MISC ChangeLog 5093 RMD160 f1d80da05b4d9334cfd949b6622fbffef51ac371 SHA1 df55b7d62313d1419aa0182f883ecd48746b6a70 SHA256 02bd20ecd425e48c4afbb20b28869545cf9c2cd29acb656a466b35c2da2d5266
+EBUILD elvis-2.2.0-r3.ebuild 2379 RMD160 bc8e6531dab4bd4b760922d39ceb714688702c54 SHA1 a75697ef930deb4feddf265cae190cd3072dc336 SHA256 b32ca96b608482c5d41434719bd5b7c31492eedd618064098d80badfe94f11d6
+MISC ChangeLog 5202 RMD160 ce4bdbb90d02837ecc7a65fe1409f29eba3a8134 SHA1 9e82c4a4b63bc0a5e324a01d053d88f87037373c SHA256 07f5ebcbb99e11f5f9d73b0963f0889d278992caa410afad23aa7e513725c1d9
MISC metadata.xml 156 RMD160 3e105a159e09ab3231aaa16b01919bcfbf58a0a8 SHA1 fe63ba71f6fd04f1e293fb238af2eba994b0335d SHA256 64d20c782589b423a6e75ba6fff7edead1ec8fbae742d27dd57f5299e8328500
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQEcBAEBAgAGBQJMfTUVAAoJEBZyv1r2qA5GfZsIAIdM7PafZ8lJMoz8isZf/3GV
+7I87ab2/GK3a4dTqqkT9sG/2cQu8LJAjDGuHIVhrRwzP6XGqzXFteDth3Bq/ou/q
+67WO8a3XQWr5XZ/X3v5OYjyQYH/ymdqVHjYvRXbxLI9pR3LOR9SI0GvdeyrINPYr
+7BGCzK3qxYf1cLniSLsgHXwpoVv9g2llDKn2fNvv8TIXqBQJDvY8iG56SWSUOJOB
+ltN+uZaSKWmx0c4v+T8YOHmIDVTdxQuNHvtzZ6L0mamqZFnBG2+Sy9kBaqlJW27N
+xbebfhgIuKS7UxzANkl2bzgxSLkfUJosQX1q8gSpArrW3HCVS9D4FeMOmdVdiIE=
+=Yb7O
+-----END PGP SIGNATURE-----
diff --git a/app-editors/elvis/elvis-2.2.0-r3.ebuild b/app-editors/elvis/elvis-2.2.0-r3.ebuild
index 5f779ecefed9..ccd5559e7043 100644
--- a/app-editors/elvis/elvis-2.2.0-r3.ebuild
+++ b/app-editors/elvis/elvis-2.2.0-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/elvis-2.2.0-r3.ebuild,v 1.11 2009/08/05 18:29:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/elvis-2.2.0-r3.ebuild,v 1.12 2010/08/31 16:59:59 nelchael Exp $
inherit eutils versionator
@@ -51,6 +51,10 @@ src_compile() {
# Don't try to write to /etc
sed -i -e 's,/etc/elvis,${D}/etc/elvis,g' Makefile || die "sed 3 failed"
+ # Use LDFLAGS
+ sed -i -e "s#\$(CC) \$(CFLAGS)#\$(CC) \$(CFLAGS) ${LDFLAGS}#" Makefile || \
+ die "sed 4 failed"
+
emake || die "make failed"
}