diff options
author | Agostino Sarubbo <ago@gentoo.org> | 2012-12-03 21:05:46 +0000 |
---|---|---|
committer | Agostino Sarubbo <ago@gentoo.org> | 2012-12-03 21:05:46 +0000 |
commit | 2ebd80dbd3b9e984cbbc854f4a062f8e964230da (patch) | |
tree | 9c6d2c84e2819557912f9083242542781b7bf4c2 /www-misc/mergelog | |
parent | Stable for x86, wrt bug #417905 (diff) | |
download | gentoo-2-2ebd80dbd3b9e984cbbc854f4a062f8e964230da.tar.gz gentoo-2-2ebd80dbd3b9e984cbbc854f4a062f8e964230da.tar.bz2 gentoo-2-2ebd80dbd3b9e984cbbc854f4a062f8e964230da.zip |
Stable for x86, wrt bug #424119
(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'www-misc/mergelog')
-rw-r--r-- | www-misc/mergelog/ChangeLog | 5 | ||||
-rw-r--r-- | www-misc/mergelog/mergelog-4.5-r2.ebuild | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/www-misc/mergelog/ChangeLog b/www-misc/mergelog/ChangeLog index e62e4a8abecc..f41725e67da2 100644 --- a/www-misc/mergelog/ChangeLog +++ b/www-misc/mergelog/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for www-misc/mergelog # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-misc/mergelog/ChangeLog,v 1.16 2012/12/02 09:03:26 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-misc/mergelog/ChangeLog,v 1.17 2012/12/03 21:05:46 ago Exp $ + + 03 Dec 2012; <ago@gentoo.org> mergelog-4.5-r2.ebuild: + Stable for x86, wrt bug #424119 02 Dec 2012; Sergey Popov <pinkbyte@gentoo.org> mergelog-4.5-r2.ebuild: Add missing sys-libs/zlib dependency, wrt bug #424119. Thanks to Agostino diff --git a/www-misc/mergelog/mergelog-4.5-r2.ebuild b/www-misc/mergelog/mergelog-4.5-r2.ebuild index d74803a5411d..fd900e349cb1 100644 --- a/www-misc/mergelog/mergelog-4.5-r2.ebuild +++ b/www-misc/mergelog/mergelog-4.5-r2.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/www-misc/mergelog/mergelog-4.5-r2.ebuild,v 1.3 2012/12/02 09:03:26 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-misc/mergelog/mergelog-4.5-r2.ebuild,v 1.4 2012/12/03 21:05:46 ago Exp $ EAPI=4 @@ -14,7 +14,7 @@ HOMEPAGE="http://mergelog.sourceforge.net" IUSE="" SLOT="0" LICENSE="GPL-2" -KEYWORDS="amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" RDEPEND="sys-libs/zlib" DEPEND="${DEPEND}" |