diff options
| author |   Nathan Phillip Brink <binki@gentoo.org> | 2011-06-16 13:06:45 +0000 |
|---|---|---|
| committer | Nathan Phillip Brink <binki@gentoo.org> | 2011-06-16 13:06:45 +0000 |
| commit | f75db890583dcd5574876649322f44e4cf12ec12 (patch) | |
| tree | b7fe85d5f8fbb41df94a7486dcb984f5043846c6 /net-irc/ultimate | |
| parent | Make initscript openrc compatible, bug #367817 wrt Robert Trace. Drop old. (diff) | |
| download | gentoo-2-f75db890583dcd5574876649322f44e4cf12ec12.tar.gz gentoo-2-f75db890583dcd5574876649322f44e4cf12ec12.tar.bz2 gentoo-2-f75db890583dcd5574876649322f44e4cf12ec12.zip | |
Fix bug #371889 by flameeyes caused by bad system-zlib patch.
(Portage version: 2.2.0_alpha37-r1/cvs/Linux x86_64)
Diffstat (limited to 'net-irc/ultimate')
| -rw-r--r-- | net-irc/ultimate/ChangeLog | 10 | ||||
| -rw-r--r-- | net-irc/ultimate/files/ultimate-3.0.2-system-zlib-r1.patch (renamed from net-irc/ultimate/files/ultimate-3.0.2-system-zlib.patch) | 8 | ||||
| -rw-r--r-- | net-irc/ultimate/ultimate-3.0.2-r2.ebuild (renamed from net-irc/ultimate/ultimate-3.0.2-r1.ebuild) | 4 |
3 files changed, 17 insertions, 5 deletions
diff --git a/net-irc/ultimate/ChangeLog b/net-irc/ultimate/ChangeLog index 6e7746b61e98..7d2f47f052b8 100644 --- a/net-irc/ultimate/ChangeLog +++ b/net-irc/ultimate/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-irc/ultimate # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/ultimate/ChangeLog,v 1.21 2011/05/04 21:04:09 binki Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/ultimate/ChangeLog,v 1.22 2011/06/16 13:06:44 binki Exp $ + +*ultimate-3.0.2-r2 (16 Jun 2011) + + 16 Jun 2011; Nathan Phillip Brink <binki@gentoo.org> + -ultimate-3.0.2-r1.ebuild, +ultimate-3.0.2-r2.ebuild, + -files/ultimate-3.0.2-system-zlib.patch, + +files/ultimate-3.0.2-system-zlib-r1.patch: + Fix bug #371889 by flameeyes caused by bad system-zlib patch. 04 May 2011; Nathan Phillip Brink (binki) <binki@gentoo.org> metadata.xml: Take ownership of this package now that I don't need to proxy it. diff --git a/net-irc/ultimate/files/ultimate-3.0.2-system-zlib.patch b/net-irc/ultimate/files/ultimate-3.0.2-system-zlib-r1.patch index e2e86a0481e0..acbb71c73d42 100644 --- a/net-irc/ultimate/files/ultimate-3.0.2-system-zlib.patch +++ b/net-irc/ultimate/files/ultimate-3.0.2-system-zlib-r1.patch @@ -3,6 +3,10 @@ Subject: Don't compile against internal zlib. Missing ./configure.ac changes because ./configure.ac wasn't shipped with the dist tarball. Date: 2011/04/27 +Subject: Use @ZLIB_LIBS@ and @ZLIB_CFLAGS@ instead of $(ZLIB_LIBS) and + friends because we don't get AC_SUBST() declared as Makefile + variables for free. https://bugs.gentoo.org/371889 +Date: 2011/06/16 --- a/autoconf/configure.in +++ b/autoconf/configure.in @@ -39,10 +43,10 @@ Date: 2011/04/27 SSL_INCLUDES = @SSL_INCLUDES@ -IRCDLIBS = ../zlib/libz.a @LIBS@ $(SSL_LIBS) -+IRCDLIBS = $(ZLIB_LIBS) @LIBS@ $(SSL_LIBS) ++IRCDLIBS = @ZLIB_LIBS@ @LIBS@ $(SSL_LIBS) -INCLUDES = -I../include -I../zlib $(SSL_INCLUDES) -+INCLUDES = -I../include $(ZLIB_CFLAGS) $(SSL_INCLUDES) ++INCLUDES = -I../include @ZLIB_CFLAGS@ $(SSL_INCLUDES) CPPFLAGS = ${INCLUDES} @CPPFLAGS@ default: all diff --git a/net-irc/ultimate/ultimate-3.0.2-r1.ebuild b/net-irc/ultimate/ultimate-3.0.2-r2.ebuild index 0f9daf96a72f..782a95b9fef1 100644 --- a/net-irc/ultimate/ultimate-3.0.2-r1.ebuild +++ b/net-irc/ultimate/ultimate-3.0.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/ultimate/ultimate-3.0.2-r1.ebuild,v 1.1 2011/05/02 20:43:45 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/ultimate/ultimate-3.0.2-r2.ebuild,v 1.1 2011/06/16 13:06:45 binki Exp $ EAPI=4 @@ -32,7 +32,7 @@ src_prepare() { eprefixify "${T}"/${P}-config.patch epatch "${T}"/${P}-config.patch - epatch "${FILESDIR}"/${P}-system-zlib.patch + epatch "${FILESDIR}"/${P}-system-zlib-r1.patch epatch "${FILESDIR}"/${P}-make-failfast.patch epatch "${FILESDIR}"/${P}-open-mode.patch epatch "${FILESDIR}"/${P}-entropy-path.patch |