diff options
author | D.M.D. Ljungmark <spider@gentoo.org> | 2002-05-06 18:40:20 +0000 |
---|---|---|
committer | D.M.D. Ljungmark <spider@gentoo.org> | 2002-05-06 18:40:20 +0000 |
commit | 2dbe736faab44af1aa13b801ea25496f9a7ae636 (patch) | |
tree | bd4a96ae6d02e6be7a6a69c03f93ddb5c804b949 /dev-libs | |
parent | version bump (diff) | |
download | gentoo-2-2dbe736faab44af1aa13b801ea25496f9a7ae636.tar.gz gentoo-2-2dbe736faab44af1aa13b801ea25496f9a7ae636.tar.bz2 gentoo-2-2dbe736faab44af1aa13b801ea25496f9a7ae636.zip |
added antidep on libiconv
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/glib/ChangeLog | 9 | ||||
-rw-r--r-- | dev-libs/glib/glib-2.0.1-r4.ebuild | 12 |
2 files changed, 13 insertions, 8 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog index 97931c0ca361..3f30403c3464 100644 --- a/dev-libs/glib/ChangeLog +++ b/dev-libs/glib/ChangeLog @@ -1,9 +1,12 @@ # ChangeLog for dev-libs/glib # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.9 2002/05/04 09:09:16 spider Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.10 2002/05/06 18:40:20 spider Exp $ - -*glib-2.0.0-r4 (1 MayApr 2002) +*glib-2.0.0-r4 (7 May 2002) + 7 May 2002; Spider <spider@gentoo.org> glib-2.0.1-r4.ebuild: + add a !dev-libs/libiconv dependency. + +*glib-2.0.0-r4 (1 May 2002) 1 May 2002 ; Spider <spider@gentoo.org> glib-2.0.1-r4.ebuild: remove libiconv again, this seems to have been a mistake as some other things break because of it. hope I didn't mess too much up diff --git a/dev-libs/glib/glib-2.0.1-r4.ebuild b/dev-libs/glib/glib-2.0.1-r4.ebuild index 73fe9882591c..708a811942de 100644 --- a/dev-libs/glib/glib-2.0.1-r4.ebuild +++ b/dev-libs/glib/glib-2.0.1-r4.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License, v2 or later # Author: Spider <spider@gentoo.org> # Maintainer: Spider <spider@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.0.1-r4.ebuild,v 1.1 2002/05/03 16:44:24 spider Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.0.1-r4.ebuild,v 1.2 2002/05/06 18:40:20 spider Exp $ S=${WORKDIR}/${P} DESCRIPTION="The GLib library of C routines" @@ -13,12 +13,14 @@ SLOT="2" DEPEND="virtual/glibc >=dev-util/pkgconfig-0.12.0 - doc? ( >=dev-util/gtk-doc-0.9-r2 )" -# >=dev-libs/libiconv-1.7 -# this breaks other stuff + doc? ( >=dev-util/gtk-doc-0.9-r2 ) + ! dev-libs/libiconv-1.7" + + +# libiconv breaks other stuff RDEPEND="virtual/glibc" -# >=dev-libs/libiconv-1.7" + ! dev-libs/libiconv-1.7" src_compile() { libtoolize --copy --force |