Index: glib-2.6.1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.6.1.ebuild,v retrieving revision 1.2 diff -u -b -B -w -p -r1.2 glib-2.6.1.ebuild --- glib-2.6.1.ebuild 28 Jan 2005 02:12:21 -0000 1.2 +++ glib-2.6.1.ebuild 30 Jan 2005 19:04:29 -0000 @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.6.1.ebuild,v 1.2 2005/01/28 02:12:21 vapier Exp $ -inherit libtool +inherit libtool eutils DESCRIPTION="The GLib library of C routines" HOMEPAGE="http://www.gtk.org/" @@ -11,25 +11,32 @@ SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.6/ LICENSE="LGPL-2" SLOT="2" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sparc ~x86" -IUSE="doc static" +IUSE="doc static uclibc" DEPEND=">=dev-util/pkgconfig-0.14 - >=sys-devel/gettext-0.11 + uclibc? ( sys-devel/autoconf ) + !uclibc? ( >=sys-devel/gettext-0.11 ) doc? ( >=dev-util/gtk-doc-1 )" RDEPEND="virtual/libc" -src_compile() { +src_unpack() { + unpack ${A} + cd ${S} + + # patches + epatch ${FILESDIR}/glib-2.4.6-config.patch + epatch ${FILESDIR}/glib-2.4.6-no_iconv.patch - if use ppc-macos; then - glibtoolize -# else -# elibtoolize - fi + use ppc-macos && glibtoolize + use uclibc && autoconf +} +src_compile() { econf \ --with-threads=posix \ `use_enable static` \ `use_enable doc gtk-doc` \ + `use uclibc >/dev/null && echo --with-libiconv=no` \ || die emake || die