New revision that adds support for the xosd USE flag by pulling in net-irc/xchatosd as a PDEPEND.

4 files changed, 115 insertions, 12 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index 42a81d336708..d537e4d93616 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/xchat
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.132 2004/10/31 22:45:36 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.133 2004/11/22 00:15:17 swegener Exp $
+
+*xchat-2.4.0-r1 (22 Nov 2004)
+
+  22 Nov 2004; Sven Wegener <swegener@gentoo.org> +xchat-2.4.0-r1.ebuild:
+  New revision that adds support for the xosd USE flag by pulling in
+  net-irc/xchatosd as a PDEPEND.
 
   31 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> xchat-2.4.0.ebuild:
   Stable on alpha.
diff --git a/net-irc/xchat/Manifest b/net-irc/xchat/Manifest
index a6e3ccffc4af..2e42647bff4e 100644
--- a/net-irc/xchat/Manifest
+++ b/net-irc/xchat/Manifest
@@ -3,25 +3,27 @@ Hash: SHA1
 
 MD5 96336ad893ce3a77a2447d78b7a45f53 xchat-2.4.0.ebuild 2235
 MD5 e862cd62853b7ae38fc97f1fcedfcab8 xchat-1.8.11-r1.ebuild 2267
-MD5 1c061ad25ddc8bddcdc44d92e9ad7da1 ChangeLog 20042
-MD5 fb5772136a872c08434566d4f0bcdc7f metadata.xml 179
-MD5 f75cb4bd0abd91125e5a0fa51926002a xchat-2.0.9.ebuild 2056
 MD5 2482bed10a2e7145bc1814f094dd41a8 xchat-2.0.8-r1.ebuild 2005
+MD5 54dacc826ef684b14418dedb67e00b4d xchat-2.4.0-r1.ebuild 2310
 MD5 65093a354c3fae242fcf0a37a96a8b88 xchat-2.0.10-r3.ebuild 2467
-MD5 31de685eff3d16d9466416434c9fd6c3 files/xc208-fixsocks5.diff 688
-MD5 3d228dd6bbf6d081f6888dd7b3d2a6af files/2.0.10-preeditstring.patch 820
+MD5 f75cb4bd0abd91125e5a0fa51926002a xchat-2.0.9.ebuild 2056
+MD5 50025b71b9555b856ab9f53b707b154f ChangeLog 20252
+MD5 fb5772136a872c08434566d4f0bcdc7f metadata.xml 179
 MD5 2effc9c4c2a5454c5abba3817894e865 files/digest-xchat-2.0.9 126
+MD5 3ddde600db975d5c534197fa4fe2b1b7 files/digest-xchat-2.4.0 134
 MD5 28706a4c0068f4066e78bc9f93945fc2 files/digest-xchat-2.0.10-r3 135
 MD5 a8f607d224408d4a27777d2ffce8beac files/xc1811fixststint.diff 422
+MD5 3d228dd6bbf6d081f6888dd7b3d2a6af files/2.0.10-preeditstring.patch 820
+MD5 31de685eff3d16d9466416434c9fd6c3 files/xc208-fixsocks5.diff 688
 MD5 bef9c7a09196ed8da457ee9fb36e8fe9 files/xc2010-fixtabcomp3.diff 828
-MD5 3ddde600db975d5c534197fa4fe2b1b7 files/digest-xchat-2.4.0 134
+MD5 ce08cfd7b93fbb37e1d9b510747a58d5 files/xc2010-fixfocus.diff 676
 MD5 e2b99b2d2dfc54ba96e560c0ed8392df files/digest-xchat-1.8.11-r1 65
 MD5 aac7b6be8968c5e6e1bdf580546a18fd files/digest-xchat-2.0.8-r1 64
-MD5 ce08cfd7b93fbb37e1d9b510747a58d5 files/xc2010-fixfocus.diff 676
+MD5 3ddde600db975d5c534197fa4fe2b1b7 files/digest-xchat-2.4.0-r1 134
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBhWsZugEuf3OQ0akRAljhAJ4zvlOeAgQxl+fNZkMggOR1wGioUwCePZrM
-gYZ+Iv0Xoa2o4I5CZRIyAR4=
-=Ee2u
+iD8DBQFBoS+dI1lqEGTUzyQRAhYiAKCBESS+k1WQH9xsdJWZyQYRRNw30QCfSyWf
+CI5X4gEQ87Z+U5ITd/6w5mg=
+=CABv
 -----END PGP SIGNATURE-----
diff --git a/net-irc/xchat/files/digest-xchat-2.4.0-r1 b/net-irc/xchat/files/digest-xchat-2.4.0-r1
new file mode 100644
index 000000000000..379df169720c
--- /dev/null
+++ b/net-irc/xchat/files/digest-xchat-2.4.0-r1
@@ -0,0 +1,2 @@
+MD5 084585b765509d5da355155189b16ecd xchat-2.4.0.tar.bz2 1159266
+MD5 4e66cb157c70b8d02f74238dc9a5057c xchat-dccserver-0.4.patch 11767
diff --git a/net-irc/xchat/xchat-2.4.0-r1.ebuild b/net-irc/xchat/xchat-2.4.0-r1.ebuild
new file mode 100644
index 000000000000..14785ed4f42f
--- /dev/null
+++ b/net-irc/xchat/xchat-2.4.0-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.4.0-r1.ebuild,v 1.1 2004/11/22 00:15:17 swegener Exp $
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="Graphical IRC client"
+SRC_URI="http://www.xchat.org/files/source/2.4/${P}.tar.bz2
+	xchatdccserver? ( http://dfx.at/xchat/xchat-dccserver-0.4.patch )"
+HOMEPAGE="http://www.xchat.org/"
+
+LICENSE="GPL-2"
+SLOT="2"
+#KEYWORDS="~x86 ~sparc ~hppa ~ppc ~alpha ~amd64 ~ia64 ~mips ~ppc64"
+KEYWORDS="~x86 ~ppc"
+IUSE="perl tcltk python ssl mmx ipv6 nls xchattext xchatnogtk xchatdccserver xosd"
+
+# 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 )
+	ssl? ( >=dev-libs/openssl-0.9.6d )
+	perl? ( >=dev-lang/perl-5.6.1 )
+	python? ( dev-lang/python )
+	tcltk? ( dev-lang/tcl )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.7
+	>=sys-apps/sed-4
+	nls? ( sys-devel/gettext )"
+
+PDEPEND="xosd? ( net-irc/xchatosd )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	use xchatdccserver && epatch ${DISTDIR}/xchat-dccserver-0.4.patch
+}
+
+src_compile() {
+
+	# xchat's configure script uses sys.path to find library path
+	# instead of python-config (#25943)
+	unset PYTHONPATH
+
+	econf \
+		$(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) \
+		$(use_enable !xchatnogtk gtkfe) \
+		--program-suffix=-2 \
+		|| die "Configure failed"
+
+	emake || die "Compile 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
+
+	make DESTDIR=${D} install || die "Install failed"
+
+	# install plugin development header
+	insinto /usr/include/xchat
+	doins src/common/xchat-plugin.h
+
+	dodoc ChangeLog README*
+
+}
+
+pkg_postinst() {
+	einfo
+	einfo "The default theme has been changed to be black on white."
+	einfo "You can download the old theme files at:"
+	einfo "\thttp://xchat.org/files/themes/blacktheme.zip"
+	einfo "Place the files into your ~/.xchat2 directory."
+	einfo
+}