diff options
author | Marinus Schraal <foser@gentoo.org> | 2003-09-25 14:02:11 +0000 |
---|---|---|
committer | Marinus Schraal <foser@gentoo.org> | 2003-09-25 14:02:11 +0000 |
commit | c5596259653c5145d879743536f15af2fc070662 (patch) | |
tree | 48c6ff643692082884d545d90698b1cd1e986413 /net-irc/xchat | |
parent | new version, cleanup, mark 2.0.4 x86 (diff) | |
download | gentoo-2-c5596259653c5145d879743536f15af2fc070662.tar.gz gentoo-2-c5596259653c5145d879743536f15af2fc070662.tar.bz2 gentoo-2-c5596259653c5145d879743536f15af2fc070662.zip |
new version, cleanup, mark 2.0.4 x86
Diffstat (limited to 'net-irc/xchat')
-rw-r--r-- | net-irc/xchat/ChangeLog | 7 | ||||
-rw-r--r-- | net-irc/xchat/Manifest | 13 | ||||
-rw-r--r-- | net-irc/xchat/files/digest-xchat-1.8.10-r1 | 1 | ||||
-rw-r--r-- | net-irc/xchat/files/digest-xchat-2.0.2-r2 | 1 | ||||
-rw-r--r-- | net-irc/xchat/files/digest-xchat-2.0.5 | 1 | ||||
-rw-r--r-- | net-irc/xchat/files/xc1810fixme3.diff | 36 | ||||
-rw-r--r-- | net-irc/xchat/files/xc202-fixdetach.diff | 11 | ||||
-rw-r--r-- | net-irc/xchat/files/xc202-fixurlg.diff | 23 | ||||
-rw-r--r-- | net-irc/xchat/xchat-1.8.10-r1.ebuild | 108 | ||||
-rw-r--r-- | net-irc/xchat/xchat-2.0.2-r2.ebuild | 78 | ||||
-rw-r--r-- | net-irc/xchat/xchat-2.0.4.ebuild | 4 | ||||
-rw-r--r-- | net-irc/xchat/xchat-2.0.5.ebuild | 75 |
12 files changed, 87 insertions, 271 deletions
diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog index 2f29104853b6..6be8f3b181f7 100644 --- a/net-irc/xchat/ChangeLog +++ b/net-irc/xchat/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-irc/xchat # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.68 2003/09/04 12:38:30 obz Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.69 2003/09/25 14:02:05 foser Exp $ + +*xchat-2.0.5 (25 Sep 2003) + + 25 Sep 2003; foser <foser@gentoo.org> xchat-2.0.5.ebuild : + New version 04 Sep 2003; Mike Gardiner <obz@gentoo.org> xchat-2.0.4.ebuild: Added local use flags to 2.0.4 for enabling the text frontend, and disabling diff --git a/net-irc/xchat/Manifest b/net-irc/xchat/Manifest index e1235ce6eae4..d5f5f76464a1 100644 --- a/net-irc/xchat/Manifest +++ b/net-irc/xchat/Manifest @@ -1,11 +1,9 @@ MD5 b424d2740a1f93cdc3f306461b4cf778 xchat-2.0.1.ebuild 1946 MD5 8f063703554a529702fa2c9f1d760b86 xchat-1.8.11.ebuild 2220 -MD5 de90aae6823c06e16c5fcd14b1a09d72 xchat-2.0.5.ebuild 2008 +MD5 eec049b795600adb3840fae52b1a8507 xchat-2.0.5.ebuild 1969 MD5 fb630b61d2521058014180c601016cd0 xchat-2.0.0.ebuild 1874 -MD5 0310ac6bab4159a21ebb7f4cc6bf11c1 xchat-2.0.2-r2.ebuild 2095 -MD5 680fe1b0bcd700954a758802313688fe xchat-1.8.10-r1.ebuild 2296 -MD5 de90aae6823c06e16c5fcd14b1a09d72 xchat-2.0.4.ebuild 2008 -MD5 f9c4e7ed38d056126a37bb1360cbbba0 ChangeLog 9800 +MD5 85a180c5ae358ee8d79bf7f0d0eb1f00 xchat-2.0.4.ebuild 2009 +MD5 81e31f0e832c997f2331322706ad8fb1 ChangeLog 9906 MD5 fb5772136a872c08434566d4f0bcdc7f metadata.xml 179 MD5 785881948431e9b5cc0fd90ccbd997e9 xchat-2.0.3-r1.ebuild 1915 MD5 acbd4afdd7d00bceb3816147eb508e4b files/digest-xchat-2.0.0 64 @@ -14,12 +12,7 @@ MD5 73e096b33cdb2fff840d34ecc8d7c3bb files/digest-xchat-2.0.4 64 MD5 dc4dfe00cc6b978d3d8f8bd7bc70643e files/digest-xchat-2.0.5 64 MD5 a8f607d224408d4a27777d2ffce8beac files/xc1811fixststint.diff 422 MD5 e470c6b909112da5b80be6880e56c8c3 files/xchat-2.0.3-fix_cps.patch 438 -MD5 579cf7b7098f443691fcd6e3e41acba2 files/xc202-fixurlg.diff 510 MD5 011b499714e85d4177185aabaeb1db15 files/00_all_tabs-leftright-and-gtk-icons.patch 13367 -MD5 be3a6832adcb4e41de90396ae3f741dc files/xc202-fixdetach.diff 269 -MD5 9636578d0e88ec0185c97a30edb81ce5 files/xc1810fixme3.diff 1025 -MD5 7c2450584076659603dc908ffc53b537 files/digest-xchat-1.8.10-r1 65 MD5 ecfeedae2da4ba7867a2f62227db355b files/xchat-2.0.3-fix_tint.patch 558 MD5 e2b99b2d2dfc54ba96e560c0ed8392df files/digest-xchat-1.8.11 65 -MD5 fb93538acf146307088f7e6707ae3150 files/digest-xchat-2.0.2-r2 64 MD5 f5c539e05a29071298f3d580fb1a3c72 files/digest-xchat-2.0.3-r1 64 diff --git a/net-irc/xchat/files/digest-xchat-1.8.10-r1 b/net-irc/xchat/files/digest-xchat-1.8.10-r1 deleted file mode 100644 index dfe9b6320489..000000000000 --- a/net-irc/xchat/files/digest-xchat-1.8.10-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 9295830df5d040d7723620322a65f89c xchat-1.8.10.tar.bz2 824407 diff --git a/net-irc/xchat/files/digest-xchat-2.0.2-r2 b/net-irc/xchat/files/digest-xchat-2.0.2-r2 deleted file mode 100644 index 8051bdcbb34b..000000000000 --- a/net-irc/xchat/files/digest-xchat-2.0.2-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 909a2855c891d7649e73bf9dfd628e1d xchat-2.0.2.tar.bz2 749398 diff --git a/net-irc/xchat/files/digest-xchat-2.0.5 b/net-irc/xchat/files/digest-xchat-2.0.5 new file mode 100644 index 000000000000..1b857ff4f118 --- /dev/null +++ b/net-irc/xchat/files/digest-xchat-2.0.5 @@ -0,0 +1 @@ +MD5 8a594ed57287a9fb212425ecba8d5401 xchat-2.0.5.tar.bz2 902581 diff --git a/net-irc/xchat/files/xc1810fixme3.diff b/net-irc/xchat/files/xc1810fixme3.diff deleted file mode 100644 index a7537961f7ee..000000000000 --- a/net-irc/xchat/files/xc1810fixme3.diff +++ /dev/null @@ -1,36 +0,0 @@ -diff -ru xchat-1.8.10/src/common/inbound.c xchat-1.8.10p3/src/common/inbound.c ---- xchat-1.8.10/src/common/inbound.c Wed Aug 7 20:15:59 2002 -+++ xchat-1.8.10p3/src/common/inbound.c Tue Aug 13 16:10:21 2002 -@@ -243,19 +243,21 @@ - if (EMIT_SIGNAL (XP_CHANACTION, sess, chan, from, text, NULL, fromme) == 1) - return; - -- if (is_channel (serv, chan) || fromme) -+ if (!fromme) - { -- sess = find_channel (chan, serv); -- if (!fromme && sess) -- if (fe_is_beep (sess) || prefs.beepchans) -+ if (is_channel (serv, chan)) -+ { -+ sess = find_channel (chan, serv); -+ if (sess) -+ if (fe_is_beep (sess) || prefs.beepchans) -+ fe_beep (); -+ } else -+ { -+ /* it's a private action! */ -+ sess = find_dialog (serv, from); -+ if (((sess) && fe_is_beep (sess)) || prefs.beepmsg) - fe_beep (); -- } -- else -- { -- /* it's a private action! */ -- sess = find_dialog (serv, from); -- if (((sess) && fe_is_beep (sess)) || prefs.beepmsg) -- fe_beep (); -+ } - } - - if (!sess && !is_channel (serv, chan) && prefs.autodialog) diff --git a/net-irc/xchat/files/xc202-fixdetach.diff b/net-irc/xchat/files/xc202-fixdetach.diff deleted file mode 100644 index 2833b072751c..000000000000 --- a/net-irc/xchat/files/xc202-fixdetach.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- xchat-2.0.2/src/fe-gtk/tabs.c 2003-04-13 18:26:02.000000000 +1000 -+++ xchat-2.0.2p1/src/fe-gtk/tabs.c 2003-04-25 02:00:24.000000000 +1000 -@@ -404,8 +406,6 @@ - { - int i, max; - -- while (g_main_pending ()) -- g_main_iteration (TRUE); - - tab_group_resize (group); - diff --git a/net-irc/xchat/files/xc202-fixurlg.diff b/net-irc/xchat/files/xc202-fixurlg.diff deleted file mode 100644 index b0a24d423de0..000000000000 --- a/net-irc/xchat/files/xc202-fixurlg.diff +++ /dev/null @@ -1,23 +0,0 @@ ---- xchat-2.0.2/src/fe-gtk/urlgrab.c 2003-04-19 01:44:01.000000000 +1000 -+++ xchat-2.0.2p1/src/fe-gtk/urlgrab.c 2003-04-22 14:43:09.000000000 +1000 -@@ -169,6 +169,13 @@ - } - } - -+static int -+populate_cb (char *urltext, gpointer userdata) -+{ -+ fe_url_add (urltext); -+ return TRUE; -+} -+ - void - url_opengui () - { -@@ -202,5 +209,5 @@ - - gtk_widget_show (urlgrabberwindow); - -- tree_foreach (url_tree, (tree_traverse_func *)fe_url_add, NULL); -+ tree_foreach (url_tree, (tree_traverse_func *)populate_cb, NULL); - } diff --git a/net-irc/xchat/xchat-1.8.10-r1.ebuild b/net-irc/xchat/xchat-1.8.10-r1.ebuild deleted file mode 100644 index acc823267e40..000000000000 --- a/net-irc/xchat/xchat-1.8.10-r1.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-1.8.10-r1.ebuild,v 1.14 2003/09/11 01:23:41 msterret Exp $ - -IUSE="ssl nls mmx gnome ipv6 python kde gtk perl" - -S=${WORKDIR}/${P} -DESCRIPTION="X-Chat is a graphical IRC client for UNIX operating systems." -SRC_URI="http://www.xchat.org/files/source/1.8/${P}.tar.bz2" -HOMEPAGE="http://www.xchat.org/" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="x86 ppc sparc ~alpha" - -RDEPEND="gtk? ( =x11-libs/gtk+-1.2* ) - python? ( >=dev-lang/python-2.2-r7 ) - perl? ( >=dev-lang/perl-5.6.1 ) - gnome? ( <gnome-base/gnome-panel-1.5.0 - >=media-libs/gdk-pixbuf-0.11.0-r1 ) - ssl? ( >=dev-libs/openssl-0.9.6a )" - -DEPEND="${RDEPEND} - nls? ( >=sys-devel/gettext-0.10.38 )" - -src_unpack() { - - unpack ${A} - - cd ${S} - - patch -p1 <${FILESDIR}/xc1810fixme3.diff - cp configure configure.orig - - use python && ( \ - local mylibs=`/usr/bin/python-config` - sed -e 's:PY_LIBS=".*":PY_LIBS="'"$mylibs"'":' \ - configure.orig > configure - ) -} - -src_compile() { - - local myopts myflags - - if [ ! `use perl` ]; then - use gnome \ - && myopts="${myopts} --enable-gnome --enable-panel" \ - CFLAGS="${CFLAGS} -I/usr/include/orbit-1.0" \ - || myopts="${myopts} --enable-gtkfe --disable-gnome --disable-zvt --disable-gdk-pixbuf" - else - myopts="${myopts} --disable-gnome" - fi - - use gtk \ - || myopts="${myopts} --disable-gtkfe" - - use ssl \ - && myopts="${myopts} --enable-openssl" - - use perl \ - || myopts="${myopts} --disable-perl" - - use nls \ - && myopts="${myopts} --enable-hebrew --enable-japanese-conv" \ - || myopts="${myopts} --disable-nls" - - if use x86 - then - use mmx \ - && myopts="${myopts} --enable-mmx" \ - || myopts="${myopts} --disable-mmx" - fi - - use ipv6 \ - && myopts="${myopts} --enable-ipv6" - - use python \ - && myflags="`python-config`" \ - && myopts="${myopts} --enable-python" - - ./configure \ - --prefix=/usr \ - --host=${CHOST} \ - ${myopts} || die - - emake || die -} - -src_install() { - - use kde && ( \ - make \ - prefix=${D}/usr \ - install || die - ) || ( \ - make \ - prefix=${D}/usr \ - install || die - ) - - use gnome && ( \ - insinto /usr/share/gnome/apps/Internet - doins xchat.desktop - ) - - dodoc AUTHORS COPYING ChangeLog README -} diff --git a/net-irc/xchat/xchat-2.0.2-r2.ebuild b/net-irc/xchat/xchat-2.0.2-r2.ebuild deleted file mode 100644 index 045752c68abe..000000000000 --- a/net-irc/xchat/xchat-2.0.2-r2.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.0.2-r2.ebuild,v 1.7 2003/09/11 01:23:41 msterret Exp $ - -IUSE="perl tcltk python ssl gtk mmx ipv6" - -S=${WORKDIR}/${P} - -DESCRIPTION="X-Chat is a graphical IRC client for UNIX operating systems." -SRC_URI="http://www.xchat.org/files/source/2.0/${P}.tar.bz2" -HOMEPAGE="http://www.xchat.org/" - -LICENSE="GPL-2" -SLOT="2" -KEYWORDS="x86 ~ppc ~sparc ~alpha" - -RDEPEND=">=dev-libs/glib-2.0.3 - gtk? ( >=x11-libs/gtk+-2.0.3 ) - perl? ( >=dev-lang/perl-5.6.1 ) - ssl? ( >=dev-libs/openssl-0.9.6d ) - python? ( dev-lang/python ) - tcltk? ( dev-lang/tcl )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - nls? ( >=sys-devel/gettext-0.10.38 )" - -src_unpack() { - unpack ${A} - epatch ${FILESDIR}/xc202-fixdetach.diff - epatch ${FILESDIR}/xc202-fixurlg.diff -} - -src_compile() { - local myopts - - use gtk \ - && myopts="${myopts} --enable-gtkfe" \ - || myopts="${myopts} --disable-gtkfe" - use ssl \ - && myopts="${myopts} --enable-openssl" \ - || myopts="${myopts} --disable-openssl" - use perl \ - && myopts="${myopts} --enable-perl" \ - || myopts="${myopts} --disable-perl" - use python \ - && myopts="${myopts} --enable-python" \ - || myopts="${myopts} --disable-python" - use tcltk \ - && myopts="${myopts} --enable-tcl" \ - || myopts="${myopts} --disable-tcl" - use mmx \ - && myopts="${myopts} --enable-mmx" \ - || myopts="${myopts} --disable-mmx" - use ipv6 \ - && myopts="${myopts} --enable-ipv6" \ - || myopts="${myopts} --disable-ipv6" - - econf \ - --program-suffix=-2 \ - ${myopts} || die "Configure failed" - - MAKEOPTS="-j1" emake || die "Compile failed" -} - -src_install() { - # some magic to create a menu entry for xchat 2 - mv xchat.desktop xchat.desktop.old - sed -e "s:Exec=xchat:Exec=xchat-2:" -e "s:Name=XChat IRC:Name=XChat 2 IRC:" xchat.desktop.old > xchat.desktop - - einstall install || die "Install failed" - - # install plugin development header - insinto /usr/include/xchat - doins src/common/xchat-plugin.h - - dodoc AUTHORS COPYING ChangeLog README* -} diff --git a/net-irc/xchat/xchat-2.0.4.ebuild b/net-irc/xchat/xchat-2.0.4.ebuild index d0266286a5a0..2cb9f5325c4e 100644 --- a/net-irc/xchat/xchat-2.0.4.ebuild +++ b/net-irc/xchat/xchat-2.0.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.0.4.ebuild,v 1.12 2003/09/22 12:01:20 obz Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.0.4.ebuild,v 1.13 2003/09/25 14:02:05 foser Exp $ inherit eutils @@ -10,7 +10,7 @@ HOMEPAGE="http://www.xchat.org/" LICENSE="GPL-2" SLOT="2" -KEYWORDS="~x86 ~ppc ~sparc ~alpha hppa" +KEYWORDS="x86 ~ppc ~sparc ~alpha hppa" IUSE="perl tcltk python ssl mmx ipv6 nls" # Local use flag for the text frontend (bug #26427) IUSE="${IUSE} xchattext xchatnogtk" diff --git a/net-irc/xchat/xchat-2.0.5.ebuild b/net-irc/xchat/xchat-2.0.5.ebuild new file mode 100644 index 000000000000..2f54b3e84960 --- /dev/null +++ b/net-irc/xchat/xchat-2.0.5.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2003 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.0.5.ebuild,v 1.1 2003/09/25 14:02:05 foser Exp $ + +inherit eutils + +DESCRIPTION="Graphical IRC client" +SRC_URI="http://www.xchat.org/files/source/2.0/${P}.tar.bz2" +HOMEPAGE="http://www.xchat.org/" + +LICENSE="GPL-2" +SLOT="2" +KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa" +IUSE="perl tcltk python ssl mmx ipv6 nls" +# Local use flag for the text frontend (bug #26427) +IUSE="${IUSE} xchattext xchatnogtk" + +# Added for to fix a sparc seg fault issue by Jason Wever <weeve@gentoo.org> +if [ ${ARCH} = "sparc" ] +then + replace-flags "-O3" "-O2" +fi + + +RDEPEND=">=dev-libs/glib-2.0.3 + !xchatnogtk ( >=x11-libs/gtk+-2.0.3 ) + perl? ( >=dev-lang/perl-5.6.1 ) + ssl? ( >=dev-libs/openssl-0.9.6d ) + python? ( dev-lang/python ) + tcltk? ( dev-lang/tcl ) + nls? ( sys-devel/gettext )" + +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.7" + +src_compile() { + # xchat's configure script uses sys.path to find library path + # instead of python-config (#25943) + unset PYTHONPATH + + # test for local usage of xchatnogtk + local gtkconf + use xchatnogtk \ + && gtkconf="--disable-gtkfe" \ + || gtkconf="--enable-gtkfe" + + econf \ + ${gtkconf} \ + `use_enable ssl openssl` \ + `use_enable perl` \ + `use_enable python` \ + `use_enable tcltk tcl` \ + `use_enable mmx` \ + `use_enable ipv6` \ + `use_enable nls` \ + `use_enable xchattext textfe` \ + --program-suffix=-2 \ + || die "Configure failed" + + MAKEOPTS="-j1" emake || die "Compile failed" +} + +src_install() { + # some magic to create a menu entry for xchat 2 + mv xchat.desktop xchat.desktop.old + sed -e "s:Exec=xchat:Exec=xchat-2:" -e "s:Name=XChat IRC:Name=XChat 2 IRC:" xchat.desktop.old > xchat.desktop + + einstall install || die "Install failed" + + # install plugin development header + insinto /usr/include/xchat + doins src/common/xchat-plugin.h + + dodoc AUTHORS COPYING ChangeLog README* +} |