From 4142e279bb24a535963cad02aafe912f31f5d89f Mon Sep 17 00:00:00 2001 From: Sven Wegener Date: Sun, 20 Feb 2005 17:51:13 +0000 Subject: Version bump. (Portage version: 2.0.51.16) --- net-irc/xchatosd/ChangeLog | 9 +++++- net-irc/xchatosd/Manifest | 14 ++------ net-irc/xchatosd/files/5.17-iconv-fix.patch | 14 -------- net-irc/xchatosd/files/5.17-return-values.patch | 38 ---------------------- net-irc/xchatosd/files/digest-xchatosd-5.17-r1 | 1 - net-irc/xchatosd/files/digest-xchatosd-5.18 | 1 + net-irc/xchatosd/xchatosd-5.17-r1.ebuild | 43 ------------------------- net-irc/xchatosd/xchatosd-5.18.ebuild | 40 +++++++++++++++++++++++ 8 files changed, 51 insertions(+), 109 deletions(-) delete mode 100644 net-irc/xchatosd/files/5.17-iconv-fix.patch delete mode 100644 net-irc/xchatosd/files/5.17-return-values.patch delete mode 100644 net-irc/xchatosd/files/digest-xchatosd-5.17-r1 create mode 100644 net-irc/xchatosd/files/digest-xchatosd-5.18 delete mode 100644 net-irc/xchatosd/xchatosd-5.17-r1.ebuild create mode 100644 net-irc/xchatosd/xchatosd-5.18.ebuild diff --git a/net-irc/xchatosd/ChangeLog b/net-irc/xchatosd/ChangeLog index 928c6eefcff8..63af5d5dcf3b 100644 --- a/net-irc/xchatosd/ChangeLog +++ b/net-irc/xchatosd/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-irc/xchatosd # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/xchatosd/ChangeLog,v 1.9 2005/02/19 23:40:57 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/xchatosd/ChangeLog,v 1.10 2005/02/20 17:51:13 swegener Exp $ + +*xchatosd-5.18 (20 Feb 2005) + + 20 Feb 2005; Sven Wegener + -files/5.17-iconv-fix.patch, -files/5.17-return-values.patch, + -xchatosd-5.17-r1.ebuild, +xchatosd-5.18.ebuild: + Version bump. *xchatosd-5.17-r1 (20 Feb 2005) diff --git a/net-irc/xchatosd/Manifest b/net-irc/xchatosd/Manifest index 61ba57eb914d..cb7742ffa277 100644 --- a/net-irc/xchatosd/Manifest +++ b/net-irc/xchatosd/Manifest @@ -1,19 +1,9 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +MD5 a8e9c89d570fd0e6b4c4bd0d8b21030a xchatosd-5.18.ebuild 1232 MD5 bee7f395b77d83073fca6a7001c85d69 xchatosd-5.12.ebuild 1093 MD5 406c48eb39c5277cbddbd4e7bb8de50c ChangeLog 1433 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160 -MD5 a8e9c89d570fd0e6b4c4bd0d8b21030a xchatosd-5.17-r1.ebuild 1232 MD5 73a892b3dd95b4ea0441cb8a92829f5a files/5.17-iconv-fix.patch 369 MD5 556374cc39115a0d31091bdde6b5d15f files/5.17-return-values.patch 1437 -MD5 4ab5968709df638e1ecc7a143d927cfa files/digest-xchatosd-5.17-r1 64 MD5 81c1e430042db312cd8ebfcde85c3a25 files/digest-xchatosd-5.12 63 +MD5 4a469b706c4100d15151e114918362f9 files/digest-xchatosd-5.18 64 MD5 aa8f7d8a41446470ada6599787802bd1 files/5.12-return-values.patch 1486 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.0 (GNU/Linux) - -iD8DBQFCF86RI1lqEGTUzyQRAhnAAJsHBSvhmEaqNR+RCrIgRmSbd0CVSwCbBqTK -P4WZ6Pu3zYU1fYK/ssBMJ6Q= -=vx1D ------END PGP SIGNATURE----- diff --git a/net-irc/xchatosd/files/5.17-iconv-fix.patch b/net-irc/xchatosd/files/5.17-iconv-fix.patch deleted file mode 100644 index 9c28a161d81f..000000000000 --- a/net-irc/xchatosd/files/5.17-iconv-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- xchatosd.cpp.orig 2005-02-17 03:46:17.792283275 +0100 -+++ xchatosd.cpp 2005-02-17 03:46:27.179969269 +0100 -@@ -239,9 +239,11 @@ - delete osd; - osd = NULL; - XOSD_init(); -+#ifdef ICONV_LIB - if(status && cmd2 == "codepage") { - ICONV_init(); - } -+#endif - if (status == 1) { - string msg; - msg = MSG_Success1 + cmd2 + MSG_Success2 + cmd3 + "\n"; diff --git a/net-irc/xchatosd/files/5.17-return-values.patch b/net-irc/xchatosd/files/5.17-return-values.patch deleted file mode 100644 index a45de146bb8a..000000000000 --- a/net-irc/xchatosd/files/5.17-return-values.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- xchatosd.cpp.orig 2005-02-20 00:35:28.056851489 +0100 -+++ xchatosd.cpp 2005-02-20 00:36:19.240761787 +0100 -@@ -79,16 +79,25 @@ - return -1; - } - int status = 0; -- status += osd->setPos(config.getValue("pos")); -- status += osd->setVOffset(config.getiValue("voffset")); -- status += osd->setHOffset(config.getiValue("hoffset")); -- status += osd->setAlign(config.getValue("align")); -- status += osd->setSOffset(config.getiValue("shadow")); -- status += osd->setTimeout(config.getiValue("timeout")); -- status += osd->setFont(config.getValue("font")); -- status += osd->setColor(config.getValue("color")); -- status += osd->display(MSG_Hello); -- return status; -+ status = osd->setPos(config.getValue("pos")); -+ if (-1 == status) return -1; -+ status = osd->setVOffset(config.getiValue("voffset")); -+ if (-1 == status) return -1; -+ status = osd->setHOffset(config.getiValue("hoffset")); -+ if (-1 == status) return -1; -+ status = osd->setAlign(config.getValue("align")); -+ if (-1 == status) return -1; -+ status = osd->setSOffset(config.getiValue("shadow")); -+ if (-1 == status) return -1; -+ status = osd->setTimeout(config.getiValue("timeout")); -+ if (-1 == status) return -1; -+ status = osd->setFont(config.getValue("font")); -+ if (-1 == status) return -1; -+ status = osd->setColor(config.getValue("color")); -+ if (-1 == status) return -1; -+ status = osd->display(MSG_Hello); -+ if (-1 == status) return -1; -+ return 0; - } - - #ifdef ICONV_LIB diff --git a/net-irc/xchatosd/files/digest-xchatosd-5.17-r1 b/net-irc/xchatosd/files/digest-xchatosd-5.17-r1 deleted file mode 100644 index 24ccca38e0fd..000000000000 --- a/net-irc/xchatosd/files/digest-xchatosd-5.17-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 7710947b2607e3b3f406e8c964deb827 xchatosd-5.17.tar.gz 10158 diff --git a/net-irc/xchatosd/files/digest-xchatosd-5.18 b/net-irc/xchatosd/files/digest-xchatosd-5.18 new file mode 100644 index 000000000000..6bcf936ff2be --- /dev/null +++ b/net-irc/xchatosd/files/digest-xchatosd-5.18 @@ -0,0 +1 @@ +MD5 ece7f6d2b2eb8dea12b375d5e97534d9 xchatosd-5.18.tar.gz 10325 diff --git a/net-irc/xchatosd/xchatosd-5.17-r1.ebuild b/net-irc/xchatosd/xchatosd-5.17-r1.ebuild deleted file mode 100644 index 9f874d1820b0..000000000000 --- a/net-irc/xchatosd/xchatosd-5.17-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/xchatosd/xchatosd-5.17-r1.ebuild,v 1.1 2005/02/19 23:40:57 swegener Exp $ - -inherit eutils toolchain-funcs flag-o-matic - -DESCRIPTION="On-Screen Display for XChat" -HOMEPAGE="http://sourceforge.net/projects/xchatosd/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~ppc ~amd64" -IUSE="iconv" - -RDEPEND=">=x11-libs/xosd-2.2.5 - >=net-irc/xchat-2.0.9" -DEPEND="${RDEPEND} - >=sys-apps/sed-4" - -src_unpack() { - unpack ${A} - cd ${S} - - epatch ${FILESDIR}/${PV}-iconv-fix.patch - epatch ${FILESDIR}/${PV}-return-values.patch - - # We have our own include file in /usr/include/xchat - einfo "Updating xchat-plugin.h from /usr/include/xchat/xchat-plugin.h" - cp -f ${ROOT}/usr/include/xchat/xchat-plugin.h xchat-plugin.h -} - -src_compile() { - append-flags -fPIC -DPIC - use iconv || sed -i -e "/^#define ICONV_LIB$/d" xchatosd.h - - emake CC="$(tc-getCXX)" CPP="$(tc-getCXX)" CFLAGS="${CFLAGS}" || die "emake failed" -} - -src_install() { - exeinto /usr/$(get_libdir)/xchat/plugins - doexe xchatosd.so || die "doexe failed" - dodoc ChangeLog README || die "dodoc failed" -} diff --git a/net-irc/xchatosd/xchatosd-5.18.ebuild b/net-irc/xchatosd/xchatosd-5.18.ebuild new file mode 100644 index 000000000000..702c1de752f4 --- /dev/null +++ b/net-irc/xchatosd/xchatosd-5.18.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-irc/xchatosd/xchatosd-5.18.ebuild,v 1.1 2005/02/20 17:51:13 swegener Exp $ + +inherit eutils toolchain-funcs flag-o-matic + +DESCRIPTION="On-Screen Display for XChat" +HOMEPAGE="http://sourceforge.net/projects/xchatosd/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~ppc ~amd64" +IUSE="iconv" + +RDEPEND=">=x11-libs/xosd-2.2.5 + >=net-irc/xchat-2.0.9" +DEPEND="${RDEPEND} + >=sys-apps/sed-4" + +src_unpack() { + unpack ${A} + cd ${S} + + # We have our own include file in /usr/include/xchat + einfo "Updating xchat-plugin.h from /usr/include/xchat/xchat-plugin.h" + cp -f ${ROOT}/usr/include/xchat/xchat-plugin.h xchat-plugin.h +} + +src_compile() { + append-flags -fPIC -DPIC + use iconv || sed -i -e "/^#define ICONV_LIB$/d" xchatosd.h + + emake CC="$(tc-getCXX)" CPP="$(tc-getCXX)" CFLAGS="${CFLAGS}" || die "emake failed" +} + +src_install() { + exeinto /usr/$(get_libdir)/xchat/plugins + doexe xchatosd.so || die "doexe failed" + dodoc ChangeLog README || die "dodoc failed" +} -- cgit v1.2.3-65-gdbad