Cleanup and stable on x86 and ia64

Package-Manager: portage-2.1.2.5

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index ffa6cf8232c812ec1604f349a4e62e5ddfb8d5f2..74e31d3f68efac77abaac9ad5c5b5a477ddfd740 100644 (file)
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/xchat
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.239 2007/05/02 18:12:18 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.240 2007/05/02 18:29:32 armin76 Exp $
+
+  02 May 2007; Raúl Porcel <armin76@gentoo.org>
+  -files/xchat-2.6.6-suffix.patch, -xchat-2.6.6.ebuild, xchat-2.8.2.ebuild:
+  Cleanup and stable on x86 and ia64
 
   02 May 2007; Bryan Østergaard <kloeri@gentoo.org> xchat-2.8.0.ebuild:
   Stable on Alpha.

diff --git a/net-irc/xchat/Manifest b/net-irc/xchat/Manifest
index dfc247ab36eeccb35bb4ffb389d747b20d6b363f..f37eaaaf524e5dc14f5538da22ad68d0eaa98921 100644 (file)
--- a/net-irc/xchat/Manifest
+++ b/net-irc/xchat/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 2.8.2-fe-text-vartype.patch 474 RMD160 8bd762050a97abcc0b2441dd4c47cf9bd7b95234 SHA1 3f8407f37316373412600f657ca6d047d961cde1 SHA256 40ee51d248682d18f9fd543863cb4c1a3b02affd4e620f631da9185605224da8
 MD5 7833847ce839c0aafb6623d7dc096528 files/2.8.2-fe-text-vartype.patch 474
 RMD160 8bd762050a97abcc0b2441dd4c47cf9bd7b95234 files/2.8.2-fe-text-vartype.patch 474
@@ -13,47 +10,28 @@ AUX xc280-fix-ja.diff 408 RMD160 92117513969886c5b882cea7594f09bb789cfd33 SHA1 1
 MD5 e6795d111f0185592da8b0f3eafc305b files/xc280-fix-ja.diff 408
 RMD160 92117513969886c5b882cea7594f09bb789cfd33 files/xc280-fix-ja.diff 408
 SHA256 3d7728fb3913a12765de778fe1f7db065f6a310c35c290d1c10439f7108fe771 files/xc280-fix-ja.diff 408
-AUX xchat-2.6.6-suffix.patch 647 RMD160 e0c40ec9eec26d9509b27f29c7b850b7d128ab98 SHA1 73be1b06841031f6033d059ccc4eca3d959735b0 SHA256 0ff0f4efb59a2ca4df872fd4bf4550cd063b8d5df8f823d1a83e0b790f604419
-MD5 4ecf29fb5fa64661ca72b43126974480 files/xchat-2.6.6-suffix.patch 647
-RMD160 e0c40ec9eec26d9509b27f29c7b850b7d128ab98 files/xchat-2.6.6-suffix.patch 647
-SHA256 0ff0f4efb59a2ca4df872fd4bf4550cd063b8d5df8f823d1a83e0b790f604419 files/xchat-2.6.6-suffix.patch 647
-DIST xchat-2.6.6.tar.bz2 1098934 RMD160 27cef034342dc831e2ddb11f8bd5f6cb727e8f93 SHA1 ba674165ad9f8e48acd2c0437bea6b1acc2871b9 SHA256 c4b38d29e6a9872c8ffde27c8866d8c3b9f1fe6e227cef5fed39bc79f983d44c
 DIST xchat-2.8.0.tar.bz2 1257232 RMD160 a65329728c050c5448b2cbab2ea6c68ba72a0c95 SHA1 80248b4fcd45261c686557eb243fec6ce459bd60 SHA256 f417891d2405980875fd3ce03eb78f8e2ad3ea7354df8b7bb0a2939a55e20906
 DIST xchat-2.8.2.tar.bz2 1331148 RMD160 62f9ffeb77243e1c20d81f0543ea8ccc7d3cd225 SHA1 5cff7a974819ad8788962742df785aabfe844af0 SHA256 9f6c22e7116afea4c00d90346b0522069f1c2197e8d0ad2f1545da01329750fe
 DIST xchat-dccserver-0.6.patch.bz2 49320 RMD160 24cc9bd414b1dd0e7e38ba9a49d12257aeb89e68 SHA1 e7b8b58cf7f647ff8778c7542cd46e9b22987385 SHA256 90a49a8d810380020c507c1a36f02e7d972cf92b5e4802dcd5cc518cba29078f
-EBUILD xchat-2.6.6.ebuild 2555 RMD160 b5a6ab10ac320df90009a488bf159a3d39f12317 SHA1 8b53074a9d2f568906321071b84ccb821599899f SHA256 a5270bc8202e894c014a96371ae187665bf1e003e526c2c29b97eeb3da11f719
-MD5 2d7ab935bd97cd4354860a5c081390f9 xchat-2.6.6.ebuild 2555
-RMD160 b5a6ab10ac320df90009a488bf159a3d39f12317 xchat-2.6.6.ebuild 2555
-SHA256 a5270bc8202e894c014a96371ae187665bf1e003e526c2c29b97eeb3da11f719 xchat-2.6.6.ebuild 2555
 EBUILD xchat-2.8.0.ebuild 2668 RMD160 f21bb9fade88ed8c423074f916a0e4e409fe8088 SHA1 0fc2b57f7445027341484df83eb2e2997dd876db SHA256 ab52c98efa4f2c227dd95ca691fc65c4eb49ae1ea73e888f5bbf181ffc700022
 MD5 86366d437db7db1d576ab85c082b7b56 xchat-2.8.0.ebuild 2668
 RMD160 f21bb9fade88ed8c423074f916a0e4e409fe8088 xchat-2.8.0.ebuild 2668
 SHA256 ab52c98efa4f2c227dd95ca691fc65c4eb49ae1ea73e888f5bbf181ffc700022 xchat-2.8.0.ebuild 2668
-EBUILD xchat-2.8.2.ebuild 2644 RMD160 1978a5948b30ed4be70e8d381ed1e8eab23f2e64 SHA1 3bf523f3c30d6923f2041914c9f98d75f3067019 SHA256 758c7af75daebb21a473a250949faa586859994017deff860c0b0031b5a98148
-MD5 ba5625c057fe03495580e7d6c984d96c xchat-2.8.2.ebuild 2644
-RMD160 1978a5948b30ed4be70e8d381ed1e8eab23f2e64 xchat-2.8.2.ebuild 2644
-SHA256 758c7af75daebb21a473a250949faa586859994017deff860c0b0031b5a98148 xchat-2.8.2.ebuild 2644
-MISC ChangeLog 35428 RMD160 d20c770aaa4de08339e90bbbe3b2f1a012da87f9 SHA1 3a326421471d50ac53064e0441d87d62965633f5 SHA256 bee63e8687de5bf326e063caf0ab8c3bc78d0af3e1e6b4d7c3d2b8b69e001243
-MD5 61cd7ad85229f363ca92e33b516fa238 ChangeLog 35428
-RMD160 d20c770aaa4de08339e90bbbe3b2f1a012da87f9 ChangeLog 35428
-SHA256 bee63e8687de5bf326e063caf0ab8c3bc78d0af3e1e6b4d7c3d2b8b69e001243 ChangeLog 35428
+EBUILD xchat-2.8.2.ebuild 2642 RMD160 b67fdab3dc899dc6d07110b10891027a47ec69f9 SHA1 6637179f567ce2e9f1b59875d4915cea52bededd SHA256 cd6149ffcd941814035cb255a0ffa7685a3ded06a195cd637f3aff21ba6d2864
+MD5 d228e112ea6b80077de65299ef5d8887 xchat-2.8.2.ebuild 2642
+RMD160 b67fdab3dc899dc6d07110b10891027a47ec69f9 xchat-2.8.2.ebuild 2642
+SHA256 cd6149ffcd941814035cb255a0ffa7685a3ded06a195cd637f3aff21ba6d2864 xchat-2.8.2.ebuild 2642
+MISC ChangeLog 35592 RMD160 1e657f67cf53813e2c975748d08d2b793913dd5b SHA1 b3088dd03ec3cc9cc73aca1c25e26d7492f72620 SHA256 d20be5888aaac4e324b8a9229f2759479a7fd819b955a4bc0e744f89a8039d94
+MD5 bbc1971816cfaa6dc8fe9869e4e39f8f ChangeLog 35592
+RMD160 1e657f67cf53813e2c975748d08d2b793913dd5b ChangeLog 35592
+SHA256 d20be5888aaac4e324b8a9229f2759479a7fd819b955a4bc0e744f89a8039d94 ChangeLog 35592
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 RMD160 279429d1df694561fc2b163cb81c09387b9d940c metadata.xml 160
 SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 metadata.xml 160
-MD5 10ba09e32d4d29a3681721ef33bd85f1 files/digest-xchat-2.6.6 368
-RMD160 03cd46952bc2a0b1e5945f491bf0cd2f7d003f57 files/digest-xchat-2.6.6 368
-SHA256 6a86715dfd84a3fc25386b3f07d09e0c6fc236e52b70896f67be2e321db2ae26 files/digest-xchat-2.6.6 368
 MD5 7305ba3f28f483b99b85bd38378b50b2 files/digest-xchat-2.8.0 433
 RMD160 f1988ea6b308aed1bd66d6afd1edf479cb144290 files/digest-xchat-2.8.0 433
 SHA256 e95175e719f9adcf81a2eb67a76f8e1e935a5a89c55df4ac65e1d14f96d298ef files/digest-xchat-2.8.0 433
 MD5 a1aaee75a6c7f58dd8a58e707a17067d files/digest-xchat-2.8.2 433
 RMD160 d6ad9156ac9f2afbf9832b97ac77773db9b65f44 files/digest-xchat-2.8.2 433
 SHA256 1fdc240bf06d802fd0b97299626477a83c4aed268d4ccaa8c8ae2ae78da4b7b3 files/digest-xchat-2.8.2 433
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGONRGugEuf3OQ0akRAotrAJ9Y+XOfxG7WHF6NlCZuwMfcXCndegCfWrEU
-+ulW24VRn2Bl4vZRfPm54kQ=
-=aZLB
------END PGP SIGNATURE-----

diff --git a/net-irc/xchat/files/digest-xchat-2.6.6 b/net-irc/xchat/files/digest-xchat-2.6.6
deleted file mode 100644 (file)
index 8fc1b1c..0000000
--- a/net-irc/xchat/files/digest-xchat-2.6.6
+++ /dev/null
@@ -1,4 +0,0 @@
-RMD160 27cef034342dc831e2ddb11f8bd5f6cb727e8f93 xchat-2.6.6.tar.bz2 1098934
-SHA256 c4b38d29e6a9872c8ffde27c8866d8c3b9f1fe6e227cef5fed39bc79f983d44c xchat-2.6.6.tar.bz2 1098934
-RMD160 24cc9bd414b1dd0e7e38ba9a49d12257aeb89e68 xchat-dccserver-0.6.patch.bz2 49320
-SHA256 90a49a8d810380020c507c1a36f02e7d972cf92b5e4802dcd5cc518cba29078f xchat-dccserver-0.6.patch.bz2 49320

diff --git a/net-irc/xchat/files/xchat-2.6.6-suffix.patch b/net-irc/xchat/files/xchat-2.6.6-suffix.patch
deleted file mode 100644 (file)
index bf5ac2f..0000000
--- a/net-irc/xchat/files/xchat-2.6.6-suffix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur xchat-2.6.6.orig/plugins/dbus/xchat-remote.c xchat-2.6.6/plugins/dbus/xchat-remote.c
---- xchat-2.6.6.orig/plugins/dbus/xchat-remote.c       2006-07-15 08:27:21.000000000 +0000
-+++ xchat-2.6.6/plugins/dbus/xchat-remote.c    2006-10-13 14:16:57.801263851 +0000
-@@ -110,7 +110,7 @@
-         if (fork() == 0)
-         {
-           gchar *url = g_strdup_printf ("--url=%s", opt_open_url);
--          execl (PREFIX"/bin/"PACKAGE_TARNAME, PACKAGE_TARNAME, "-a", url, NULL);
-+          execl (PREFIX"/bin/"PACKAGE_TARNAME"-2", PACKAGE_TARNAME"-2", "-a", url, NULL);
-         }
-       } else
-         write_error (_("Failed to complete command"), error);

diff --git a/net-irc/xchat/xchat-2.6.6.ebuild b/net-irc/xchat/xchat-2.6.6.ebuild
deleted file mode 100644 (file)
index 6dce50a..0000000
--- a/net-irc/xchat/xchat-2.6.6.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.6.6.ebuild,v 1.14 2007/04/10 18:59:14 iluxa Exp $
-
-inherit eutils versionator gnome2
-
-DESCRIPTION="Graphical IRC client"
-SRC_URI="http://www.xchat.org/files/source/$(get_version_component_range 1-2)/${P}.tar.bz2
-       mirror://sourceforge/${PN}/${P}.tar.bz2
-       xchatdccserver? ( mirror://gentoo/${PN}-dccserver-0.6.patch.bz2 )"
-HOMEPAGE="http://www.xchat.org/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
-IUSE="perl dbus tcl python ssl mmx ipv6 nls spell xchattext xchatnogtk xchatdccserver"
-
-RDEPEND=">=dev-libs/glib-2.6.0
-       !xchatnogtk? ( >=x11-libs/gtk+-2.6.0 )
-       ssl? ( >=dev-libs/openssl-0.9.6d )
-       perl? ( >=dev-lang/perl-5.6.1 )
-       python? ( >=dev-lang/python-2.2 )
-       tcl? ( dev-lang/tcl )
-       dbus? ( || ( >=dev-libs/dbus-glib-0.71
-                       ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 ) ) )
-       spell? ( app-text/enchant )
-       !<net-irc/xchat-gnome-0.9"
-
-DEPEND="${RDEPEND}
-       >=dev-util/pkgconfig-0.7
-       nls? ( sys-devel/gettext )"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
-       use xchatdccserver && epatch "${DISTDIR}"/xchat-dccserver-0.6.patch.bz2
-       epatch "${FILESDIR}"/xchat-2.6.6-suffix.patch
-
-       # use libdir/xchat/plugins as the plugin directory
-       if [ $(get_libdir) != "lib" ] ; then
-               sed -i -e 's:${prefix}/lib/xchat:${libdir}/xchat:' \
-                       "${S}"/configure{,.in} || die
-       fi
-}
-
-src_compile() {
-       # Added for to fix a sparc seg fault issue by Jason Wever <weeve@gentoo.org>
-       if [ ${ARCH} = "sparc" ] ; then
-               replace-flags "-O[3-9]" "-O2"
-       fi
-
-       # xchat's configure script uses sys.path to find library path
-       # instead of python-config (#25943)
-       unset PYTHONPATH
-
-       econf \
-               --enable-shm \
-               $(use_enable ssl openssl) \
-               $(use_enable perl) \
-               $(use_enable python) \
-               $(use_enable tcl) \
-               $(use_enable mmx) \
-               $(use_enable ipv6) \
-               $(use_enable nls) \
-               $(use_enable dbus) \
-               $(use_enable spell spell static) \
-               $(use_enable xchattext textfe) \
-               $(use_enable !xchatnogtk gtkfe) \
-               --program-suffix=-2 \
-               || die "econf failed"
-
-       emake || die "emake failed"
-}
-
-src_install() {
-       # some magic to create a menu entry for xchat 2
-       sed -i \
-               -e "s:^Exec=xchat$:Exec=xchat-2:" \
-               -e "s:Name=XChat IRC:Name=XChat 2 IRC:" \
-               xchat.desktop
-
-       USE_DESTDIR=1 gnome2_src_install || die "make install failed"
-
-       # install plugin development header
-       insinto /usr/include/xchat
-       doins src/common/xchat-plugin.h || die "doins failed"
-
-       dodoc ChangeLog README* || die "dodoc failed"
-}

diff --git a/net-irc/xchat/xchat-2.8.2.ebuild b/net-irc/xchat/xchat-2.8.2.ebuild
index 08999b6bf74ce410b4dac4311f382f2590574777..e6ae50b19ad7a43b4a9f0536657ed0d765fbe10d 100644 (file)
--- a/net-irc/xchat/xchat-2.8.2.ebuild
+++ b/net-irc/xchat/xchat-2.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.2.ebuild,v 1.5 2007/04/13 11:02:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.2.ebuild,v 1.6 2007/05/02 18:29:32 armin76 Exp $
 
 inherit eutils versionator gnome2
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.xchat.org/"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="perl dbus tcl python ssl mmx ipv6 nls spell xchattext xchatnogtk xchatdccserver"
 
 RDEPEND=">=dev-libs/glib-2.6.0