diff options
| author |   Simon Stelling <blubb@gentoo.org> | 2005-03-22 18:40:30 +0000 |
|---|---|---|
| committer | Simon Stelling <blubb@gentoo.org> | 2005-03-22 18:40:30 +0000 |
| commit | 473def417183b02d9bcbcec9c1d9334717765478 (patch) | |
| tree | 68e61122ef17ba6c66762d81c6c2b048d8403e18 | |
| parent | Initial import, ebuild based on the contributions by David Holm <dholm@gentoo... (diff) | |
| download | gentoo-2-473def417183b02d9bcbcec9c1d9334717765478.tar.gz gentoo-2-473def417183b02d9bcbcec9c1d9334717765478.tar.bz2 gentoo-2-473def417183b02d9bcbcec9c1d9334717765478.zip | |
#61133
(Portage version: 2.0.51.19)
| -rw-r--r-- | net-irc/bitchx/ChangeLog | 8 | ||||
| -rw-r--r-- | net-irc/bitchx/bitchx-1.1-r1.ebuild | 4 | ||||
| -rw-r--r-- | net-irc/bitchx/bitchx-1.1-r2.ebuild | 22 |
3 files changed, 21 insertions, 13 deletions
diff --git a/net-irc/bitchx/ChangeLog b/net-irc/bitchx/ChangeLog index 70684d864c77..43b93d057daf 100644 --- a/net-irc/bitchx/ChangeLog +++ b/net-irc/bitchx/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-irc/bitchx -# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/ChangeLog,v 1.51 2004/12/29 03:13:19 ciaranm Exp $ +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/ChangeLog,v 1.52 2005/03/22 18:40:30 blubb Exp $ + + 22 Mar 2005; <blubb@gentoo.org> bitchx-1.1-r2.ebuild: + pseudo-fixing bug #61133 with an ugly hack, prevents bitchx from building with + gtk support on amd64 29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> : Change encoding to UTF-8 for GLEP 31 compliance diff --git a/net-irc/bitchx/bitchx-1.1-r1.ebuild b/net-irc/bitchx/bitchx-1.1-r1.ebuild index cec7b0af5249..ca03aa4c84bb 100644 --- a/net-irc/bitchx/bitchx-1.1-r1.ebuild +++ b/net-irc/bitchx/bitchx-1.1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/bitchx-1.1-r1.ebuild,v 1.4 2004/09/06 00:19:42 ciaranm Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/bitchx-1.1-r1.ebuild,v 1.5 2005/03/22 18:40:30 blubb Exp $ inherit flag-o-matic eutils diff --git a/net-irc/bitchx/bitchx-1.1-r2.ebuild b/net-irc/bitchx/bitchx-1.1-r2.ebuild index 33170fde5950..4b446b5ce3d1 100644 --- a/net-irc/bitchx/bitchx-1.1-r2.ebuild +++ b/net-irc/bitchx/bitchx-1.1-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/bitchx-1.1-r2.ebuild,v 1.3 2004/09/06 00:19:42 ciaranm Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/bitchx-1.1-r2.ebuild,v 1.4 2005/03/22 18:40:30 blubb Exp $ inherit flag-o-matic eutils @@ -22,8 +22,8 @@ DEPEND=">=sys-libs/ncurses-5.1 xmms? ( media-sound/xmms ) esd? ( >=media-sound/esound-0.2.5 >=media-libs/audiofile-0.1.5 ) - gtk? ( =x11-libs/gtk+-1.2* - >=media-libs/imlib-1.9.10-r1 ) + !amd64? ( gtk? ( =x11-libs/gtk+-1.2* + >=media-libs/imlib-1.9.10-r1 )) gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 ) )" src_unpack() { @@ -50,11 +50,11 @@ src_compile() { myconf="${myconf} --enable-debug" fi - use esd && use gtk \ + use !amd64 && use esd && use gtk \ && myconf="${myconf} --enable-sound" \ || myconf="${myconf} --disable-sound" - use gtk && use gnome\ + use !amd64 && use gtk && use gnome\ && myconf="${myconf} --with-gtk" \ || myconf="${myconf} --without-gtk" @@ -71,12 +71,16 @@ src_compile() { ${S}/include/config.h.orig > \ ${S}/include/config.h #ugly workaround - use gtk && use gnome && ( \ + use !amd64 && use gtk && use gnome && ( \ einfo "gtkBitchX will be built, if you want BitchX please issue" einfo "USE="-gtk" emerge bitchx" epause 10 ) && append-flags -I/usr/include/gnome-1.0 - + #even uglier hack + use amd64 && use gtk && use gnome && ( \ + ewarn "gtkBitchX is broken on amd64, so we're building it" + ewarn "with USE=-gtk. See bug #61133" + epause 10 ) econf \ CFLAGS="${CFLAGS}" \ SHLIB_CFLAGS="${CFLAGS} -fPIC" \ @@ -96,7 +100,7 @@ src_install () { rm ${D}/usr/share/man/man1/BitchX* doman doc/BitchX.1 - use gnome && use gtk && ( \ + use !amd64 && use gnome && use gtk && ( \ exeinto /usr/bin #newexe ${S}/source/BitchX BitchX-1.0c19 dosym gtkBitchX-1.1-final /usr/bin/gtkBitchX |