diff options
| author |   Ian Stakenvicius <axs@gentoo.org> | 2012-12-05 21:26:03 +0000 |
|---|---|---|
| committer | Ian Stakenvicius <axs@gentoo.org> | 2012-12-05 21:26:03 +0000 |
| commit | 6c868a5108655d2a7df208bd6a7937bf8797325c (patch) | |
| tree | c44f846c46f3b91f188123b7e35d0968a088e199 /app-portage | |
| parent | removed some nasty stuff and added some elog about it (diff) | |
| download | gentoo-2-6c868a5108655d2a7df208bd6a7937bf8797325c.tar.gz gentoo-2-6c868a5108655d2a7df208bd6a7937bf8797325c.tar.bz2 gentoo-2-6c868a5108655d2a7df208bd6a7937bf8797325c.zip | |
fixed bug 446078
(Portage version: 2.1.11.33/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)
Diffstat (limited to 'app-portage')
| -rw-r--r-- | app-portage/eix/ChangeLog | 9 | ||||
| -rw-r--r-- | app-portage/eix/eix-0.27.5-r1.ebuild (renamed from app-portage/eix/eix-0.27.5.ebuild) | 6 | ||||
| -rw-r--r-- | app-portage/eix/files/eix-0.2.5-commentlines.patch | 11 |
3 files changed, 23 insertions, 3 deletions
diff --git a/app-portage/eix/ChangeLog b/app-portage/eix/ChangeLog index a8d3432123b9..d4af76c384fc 100644 --- a/app-portage/eix/ChangeLog +++ b/app-portage/eix/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-portage/eix # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/ChangeLog,v 1.435 2012/12/04 21:46:28 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/ChangeLog,v 1.436 2012/12/05 21:26:03 axs Exp $ + +*eix-0.27.5-r1 (05 Dec 2012) + + 05 Dec 2012; Ian Stakenvicius <axs@gentoo.org> + +files/eix-0.2.5-commentlines.patch, -eix-0.27.5.ebuild, + +eix-0.27.5-r1.ebuild: + fixed bug 446078 *eix-0.27.5 (04 Dec 2012) diff --git a/app-portage/eix/eix-0.27.5.ebuild b/app-portage/eix/eix-0.27.5-r1.ebuild index 9be5cef9bf6b..e965e7bb33e4 100644 --- a/app-portage/eix/eix-0.27.5.ebuild +++ b/app-portage/eix/eix-0.27.5-r1.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-portage/eix/eix-0.27.5.ebuild,v 1.1 2012/12/04 21:46:28 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.27.5-r1.ebuild,v 1.1 2012/12/05 21:26:03 axs Exp $ EAPI=5 @@ -32,8 +32,10 @@ pkg_setup() { } src_prepare() { + # bug 446078 + epatch "${FILESDIR}"/${P}-commentlines.patch + epatch_user - # consider inheriting autotools.eclass and adding eautoreconf here } src_configure() { diff --git a/app-portage/eix/files/eix-0.2.5-commentlines.patch b/app-portage/eix/files/eix-0.2.5-commentlines.patch new file mode 100644 index 000000000000..797ce8ea0d78 --- /dev/null +++ b/app-portage/eix/files/eix-0.2.5-commentlines.patch @@ -0,0 +1,11 @@ +--- src/portage/mask_list.cc ++++ src/portage/mask_list.cc +@@ -36,7 +36,7 @@ bool + MaskList<Mask>::add_file(const char *file, Mask::Type mask_type, bool recursive, bool keep_commentlines) + { + vector<string> lines; +- if(!pushback_lines(file, &lines, false, recursive, (keep_commentlines ? -1 : 0))) { ++ if(!pushback_lines(file, &lines, false, recursive, (keep_commentlines ? -1 : 1))) { + return false; + } + bool added(false), finishcomment(false); |