diff options
author | Cédric Krier <cedk@gentoo.org> | 2008-09-28 12:59:51 +0000 |
---|---|---|
committer | Cédric Krier <cedk@gentoo.org> | 2008-09-28 12:59:51 +0000 |
commit | 8c101ee6f25cebfc246738214197a1f53c9ab835 (patch) | |
tree | 24e40636a9131280bccd2d68fc6aaccf98160512 /net-im/bitlbee | |
parent | Add install-dev for bug #237943 (diff) | |
download | gentoo-2-8c101ee6f25cebfc246738214197a1f53c9ab835.tar.gz gentoo-2-8c101ee6f25cebfc246738214197a1f53c9ab835.tar.bz2 gentoo-2-8c101ee6f25cebfc246738214197a1f53c9ab835.zip |
Remove old
(Portage version: 2.1.4.4)
Diffstat (limited to 'net-im/bitlbee')
-rw-r--r-- | net-im/bitlbee/ChangeLog | 10 | ||||
-rw-r--r-- | net-im/bitlbee/bitlbee-1.0.3.ebuild | 148 | ||||
-rw-r--r-- | net-im/bitlbee/bitlbee-1.0.4.ebuild | 161 | ||||
-rw-r--r-- | net-im/bitlbee/bitlbee-1.1-r1.ebuild | 164 | ||||
-rw-r--r-- | net-im/bitlbee/bitlbee-1.1.1.ebuild | 162 | ||||
-rw-r--r-- | net-im/bitlbee/bitlbee-1.2.1.ebuild | 170 | ||||
-rw-r--r-- | net-im/bitlbee/bitlbee-1.2.2.ebuild | 172 | ||||
-rw-r--r-- | net-im/bitlbee/bitlbee-1.2.ebuild | 170 | ||||
-rw-r--r-- | net-im/bitlbee/files/bitlbee-1.0.3-xinetd.patch | 17 | ||||
-rw-r--r-- | net-im/bitlbee/files/bitlbee-gentoohack.patch | 32 | ||||
-rw-r--r-- | net-im/bitlbee/files/bitlbee-xinetd.patch | 19 | ||||
-rw-r--r-- | net-im/bitlbee/files/bitlbeed.confd | 16 | ||||
-rw-r--r-- | net-im/bitlbee/files/bitlbeed.init | 27 | ||||
-rw-r--r-- | net-im/bitlbee/files/oscar-sms.patch | 22 |
14 files changed, 9 insertions, 1281 deletions
diff --git a/net-im/bitlbee/ChangeLog b/net-im/bitlbee/ChangeLog index bf853ade3e9e..efc811d13de8 100644 --- a/net-im/bitlbee/ChangeLog +++ b/net-im/bitlbee/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-im/bitlbee # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.117 2008/09/28 12:52:01 cedk Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.118 2008/09/28 12:59:50 cedk Exp $ + + 28 Sep 2008; Cédric Krier <cedk@gentoo.org> + -files/bitlbee-1.0.3-xinetd.patch, -files/bitlbee-gentoohack.patch, + -files/bitlbee-xinetd.patch, -files/bitlbeed.confd, -files/bitlbeed.init, + -files/oscar-sms.patch, -bitlbee-1.0.3.ebuild, -bitlbee-1.0.4.ebuild, + -bitlbee-1.1-r1.ebuild, -bitlbee-1.1.1.ebuild, -bitlbee-1.2.ebuild, + -bitlbee-1.2.1.ebuild, -bitlbee-1.2.2.ebuild: + Remove old *bitlbee-1.2.3-r1 (28 Sep 2008) diff --git a/net-im/bitlbee/bitlbee-1.0.3.ebuild b/net-im/bitlbee/bitlbee-1.0.3.ebuild deleted file mode 100644 index d36903c7fc14..000000000000 --- a/net-im/bitlbee/bitlbee-1.0.3.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-1.0.3.ebuild,v 1.14 2008/03/25 22:11:48 cedk Exp $ - -inherit eutils toolchain-funcs - -DESCRIPTION="irc to IM gateway that support multiple IM protocols" -HOMEPAGE="http://www.bitlbee.org/" -SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-fbsd" -IUSE="debug jabber msn oscar yahoo gnutls ssl nss xinetd ipv6" - -DEPEND=">=dev-libs/glib-2.0 - msn? ( gnutls? ( net-libs/gnutls ) - ssl? ( dev-libs/openssl ) - nss? ( dev-libs/nss ) ) - jabber? ( gnutls? ( net-libs/gnutls ) - ssl? ( dev-libs/openssl ) - nss? ( dev-libs/nss ) )" - -RDEPEND="${DEPEND} - virtual/logger" - -no_flags_die() { - eerror "" - eerror "Please choose a protocol or protocols to use with" - eerror "bitlbee by enabling the useflag for the protocol" - eerror "desired." - eerror "" - eerror " Valid useflags are;" - eerror " jabber, msn, oscar and yahoo" - die "No IM protocols selected!" -} - -pkg_setup() { - elog "Note: Support for all IM protocols are controlled by use flags." - elog " Make sure you've enabled the flags you want." - elog "" - - # Warn but not die if jabber is enabled but SSL is not - if ( use jabber && ( use !ssl && use !gnutls && use !nss ) ); then - ewarn "" - ewarn "You have enabled support for Jabber but do not have SSL" - ewarn "support enabled. This *will* prevent bitlbee from being" - ewarn "able to connect to SSL enabled Jabber servers. If you need to" - ewarn "connect to Jabber over SSL, enable one of the following use" - ewarn "flags: gnutls, nss ssl" - ewarn "" - fi - - # At the request of upstream, die if MSN Messenger support is enabled - # but no SSL support has been enabled - if ( use msn && ( use !ssl && use !gnutls && use !nss ) ); then - eerror "" - eerror "In order to enable support for the MSN Messenger protocol," - eerror "SSL support needs to be enabled. Please enable the ssl," - eerror "gnutls or nss use flags to provide SSL support". - die "MSN support enabled without any SSL support enabled." - fi - - use jabber || use msn || use oscar || use yahoo || no_flags_die -} - -src_unpack() { - unpack ${P}.tar.gz - - # Patch the default xinetd file to add/adjust values to Gentoo defaults - cd "${S}"/doc && epatch "${FILESDIR}"/${PN}-1.0.3-xinetd.patch - cd "${S}" && epatch "${FILESDIR}"/${PN}-gentoohack.patch -} - -src_compile() { - # setup protocol, ipv6 and debug - local myconf - use debug && myconf="${myconf} --debug=1" - use ipv6 || myconf="${myconf} --ipv6=0" - use msn || myconf="${myconf} --msn=0 " - use jabber || myconf="${myconf} --jabber=0" - use oscar || myconf="${myconf} --oscar=0" - use yahoo || myconf="${myconf} --yahoo=0" - - # setup ssl use flags - use ssl && use gnutls && myconf="${myconf} --ssl=gnutls" - use ssl && use nss && myconf="${myconf} --ssl=nss" - use ssl && use !gnutls && use !nss && myconf="${myconf} --ssl=openssl" - - if ( ( use jabber && ( use gnutls || use ssl || use nss ) ) \ - || use msn ) && use !gnutls && use !ssl && use !nss; then - myconf="${myconf} --ssl=bogus" - fi - - # NOTE: bitlbee's configure script is not an autotool creation, so that is - # why we don't use econf. - - ./configure --prefix=/usr --datadir=/usr/share/bitlbee \ - --etcdir=/etc/bitlbee ${myconf} || die "econf failed" - - emake || die "make failed" - - # make bitlbeed forking server - cd utils - $(tc-getCC) ${CFLAGS} bitlbeed.c -o bitlbeed || die "bitlbeed failed to compile" -} - -src_install() { - dodir /var/lib/bitlbee - make install DESTDIR="${D}" || die "install failed" - make install-etc DESTDIR="${D}" || die "install failed" - make install-doc DESTDIR="${D}" || die "install failed" - keepdir /var/lib/bitlbee - - dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README} - dodoc doc/user-guide/user-guide.txt - dohtml -A xml doc/user-guide/*.xml - dohtml -A xsl doc/user-guide/*.xsl - dohtml doc/user-guide/*.html - - doman doc/bitlbee.8 doc/bitlbee.conf.5 - - dobin utils/bitlbeed - - if use xinetd; then - insinto /etc/xinetd.d - newins doc/bitlbee.xinetd bitlbee - fi - - newinitd "${FILESDIR}"/bitlbeed.init bitlbeed || die - - newconfd "${FILESDIR}"/bitlbeed.confd bitlbeed || die - - keepdir /var/run/bitlbeed - - dodir /usr/share/bitlbee - cp "${S}"/utils/* "${D}"/usr/share/bitlbee - rm "${D}"/usr/share/bitlbee/bitlbeed* -} - -pkg_postinst() { - chown nobody:nobody "${ROOT}"/var/lib/bitlbee - chmod 700 "${ROOT}"/var/lib/bitlbee - elog "The utils included in bitlbee (other than bitlbeed) are now" - elog "located in /usr/share/bitlbee" - elog - elog "NOTE: The IRSSI script is no longer provided by BitlBee." -} diff --git a/net-im/bitlbee/bitlbee-1.0.4.ebuild b/net-im/bitlbee/bitlbee-1.0.4.ebuild deleted file mode 100644 index fb50af8f8959..000000000000 --- a/net-im/bitlbee/bitlbee-1.0.4.ebuild +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-1.0.4.ebuild,v 1.4 2008/03/25 22:11:48 cedk Exp $ - -inherit eutils toolchain-funcs - -DESCRIPTION="irc to IM gateway that support multiple IM protocols" -HOMEPAGE="http://www.bitlbee.org/" -SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd" -IUSE="debug jabber msn oscar yahoo gnutls ssl nss xinetd ipv6" - -DEPEND=">=dev-libs/glib-2.0 - msn? ( gnutls? ( net-libs/gnutls ) - ssl? ( dev-libs/openssl ) - nss? ( dev-libs/nss ) ) - jabber? ( gnutls? ( net-libs/gnutls ) - ssl? ( dev-libs/openssl ) - nss? ( dev-libs/nss ) )" - -RDEPEND="${DEPEND} - virtual/logger" - -no_flags_die() { - eerror "" - eerror "Please choose a protocol or protocols to use with" - eerror "bitlbee by enabling the useflag for the protocol" - eerror "desired." - eerror "" - eerror " Valid useflags are;" - eerror " jabber, msn, oscar and yahoo" - die "No IM protocols selected!" -} - -pkg_setup() { - elog "Note: Support for all IM protocols are controlled by use flags." - elog " Make sure you've enabled the flags you want." - elog "" - - # Warn but not die if jabber is enabled but SSL is not - if ( use jabber && ( use !ssl && use !gnutls && use !nss ) ); then - ewarn "" - ewarn "You have enabled support for Jabber but do not have SSL" - ewarn "support enabled. This *will* prevent bitlbee from being" - ewarn "able to connect to SSL enabled Jabber servers. If you need to" - ewarn "connect to Jabber over SSL, enable one of the following use" - ewarn "flags: gnutls, nss ssl" - ewarn "" - fi - - # At the request of upstream, die if MSN Messenger support is enabled - # but no SSL support has been enabled - if ( use msn && ( use !ssl && use !gnutls && use !nss ) ); then - eerror "" - eerror "In order to enable support for the MSN Messenger protocol," - eerror "SSL support needs to be enabled. Please enable the ssl," - eerror "gnutls or nss use flags to provide SSL support". - die "MSN support enabled without any SSL support enabled." - fi - - use jabber || use msn || use oscar || use yahoo || no_flags_die - - enewgroup bitlbee - enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee -} - -src_unpack() { - unpack ${P}.tar.gz - cd "${S}" - - sed -i \ - -e "s@/usr/local/sbin/bitlbee@/usr/sbin/bitlbee@" \ - -e "s/nobody/bitlbee/" \ - -e "s/}/ disable = yes\n}/" \ - doc/bitlbee.xinetd || die "sed failed" -} - -src_compile() { - # setup protocol, ipv6 and debug - local myconf - use debug && myconf="${myconf} --debug=1" - use ipv6 || myconf="${myconf} --ipv6=0" - use msn || myconf="${myconf} --msn=0 " - use jabber || myconf="${myconf} --jabber=0" - use oscar || myconf="${myconf} --oscar=0" - use yahoo || myconf="${myconf} --yahoo=0" - - # setup ssl use flags - use ssl && use gnutls && myconf="${myconf} --ssl=gnutls" - use ssl && use nss && myconf="${myconf} --ssl=nss" - use ssl && use !gnutls && use !nss && \ - myconf="${myconf} --ssl=openssl" - - if ( use jabber || use msn ) \ - && use !ssl && use !gnutls && use !nss; then - myconf="${myconf} --ssl=bogus" - fi - - # NOTE: bitlbee's configure script is not an autotool creation, - # so that is why we don't use econf. - - ./configure --prefix=/usr --datadir=/usr/share/bitlbee \ - --etcdir=/etc/bitlbee --strip=0 ${myconf} || die "econf failed" - - sed -i \ - -e "s/CFLAGS=.*$/CFLAGS=${CFLAGS}/" \ - Makefile.settings || die "sed failed" - - emake || die "make failed" - - # make bitlbeed forking server - cd utils - $(tc-getCC) ${CFLAGS} bitlbeed.c -o bitlbeed \ - || die "bitlbeed failed to compile" -} - -src_install() { - make install DESTDIR="${D}" || die "install failed" - make install-etc DESTDIR="${D}" || die "install failed" - make install-doc DESTDIR="${D}" || die "install failed" - keepdir /var/lib/bitlbee - fperms 700 /var/lib/bitlbee - fowners bitlbee:bitlbee /var/lib/bitlbee - - dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README} - dodoc doc/user-guide/user-guide.txt - dohtml -A xml doc/user-guide/*.xml - dohtml -A xsl doc/user-guide/*.xsl - dohtml doc/user-guide/*.html - - doman doc/bitlbee.8 doc/bitlbee.conf.5 - - dobin utils/bitlbeed - - if use xinetd; then - insinto /etc/xinetd.d - newins doc/bitlbee.xinetd bitlbee - fi - - newinitd "${FILESDIR}"/bitlbeed.initd bitlbeed || die - newconfd "${FILESDIR}"/bitlbeed.confd2 bitlbeed || die - - keepdir /var/run/bitlbeed - - dodir /usr/share/bitlbee - insinto /usr/share/bitlbee - cd utils - doins centericq2bitlbee.sh convert_gnomeicu.txt create_nicksfile.pl -} - -pkg_postinst() { - chown -R bitlbee:bitlbee "${ROOT}"/var/lib/bitlbee - - elog "The utils included in bitlbee (other than bitlbeed) are now" - elog "located in /usr/share/bitlbee" - elog - elog "NOTE: The IRSSI script is no longer provided by BitlBee." -} diff --git a/net-im/bitlbee/bitlbee-1.1-r1.ebuild b/net-im/bitlbee/bitlbee-1.1-r1.ebuild deleted file mode 100644 index adc3db4ea405..000000000000 --- a/net-im/bitlbee/bitlbee-1.1-r1.ebuild +++ /dev/null @@ -1,164 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-1.1-r1.ebuild,v 1.4 2008/03/25 22:11:48 cedk Exp $ - -EAPI="1" -inherit eutils toolchain-funcs confutils - -MY_P="${P}dev" - -DESCRIPTION="irc to IM gateway that support multiple IM protocols" -HOMEPAGE="http://www.bitlbee.org/" -SRC_URI="http://get.bitlbee.org/src/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd" -IUSE="debug gnutls ipv6 +jabber msn nss +oscar ssl +yahoo xinetd" # ldap - Bug 195758 - -COMMON_DEPEND=">=dev-libs/glib-2.4 - msn? ( gnutls? ( net-libs/gnutls ) - !gnutls? ( nss? ( dev-libs/nss ) ) - !gnutls? ( !nss? ( ssl? ( dev-libs/openssl ) ) ) - ) - jabber? ( gnutls? ( net-libs/gnutls ) - !gnutls? ( nss? ( dev-libs/nss ) ) - !gnutls? ( !nss? ( ssl? ( dev-libs/openssl ) ) ) - )" - # ldap? ( net-nds/openldap )" -DEPEND="${COMMON_DEPEND} - dev-util/pkgconfig" - -RDEPEND="${COMMON_DEPEND} - virtual/logger - xinetd? ( sys-apps/xinetd )" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - elog "Note: Support for all IM protocols are controlled by use flags." - elog " Make sure you've enabled the flags you want." - elog - confutils_require_any jabber msn oscar yahoo - - # At the request of upstream, die if MSN Messenger support is enabled - # but no SSL support has been enabled - confutils_use_depend_any msn gnutls nss ssl - - # Warn but not die if jabber is enabled but SSL is not - if use jabber && ! use gnutls && ! use nss && ! use ssl ; then - ewarn "" - ewarn "You have enabled support for Jabber but do not have SSL" - ewarn "support enabled. This *will* prevent bitlbee from being" - ewarn "able to connect to SSL enabled Jabber servers. If you need to" - ewarn "connect to Jabber over SSL, enable ONE of the following use" - ewarn "flags: gnutls, nss or ssl" - ewarn "" - fi - - enewgroup bitlbee - enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee -} - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}/oscar-sms.patch" - - sed -i \ - -e "s@/usr/local/sbin/bitlbee@/usr/sbin/bitlbee@" \ - -e "s/nobody/bitlbee/" \ - -e "s/}/ disable = yes\n}/" \ - doc/bitlbee.xinetd || die "sed failed in xinetd" - - sed -i \ - -e "s@mozilla-nss@nss@g" \ - configure || die "sed failed in configure" -} - -src_compile() { - # ldap hard-disabled for now - local myconf="--ldap=0" - - # setup protocol, ipv6 and debug - for flag in debug ipv6 msn jabber oscar yahoo ; do - if use ${flag} ; then - myconf="${myconf} --${flag}=1" - else - myconf="${myconf} --${flag}=0" - fi - done - - # setup ssl use flags - if use gnutls ; then - myconf="${myconf} --ssl=gnutls" - elif use nss ; then - myconf="${myconf} --ssl=nss" - elif use ssl ; then - myconf="${myconf} --ssl=openssl" - else - myconf="${myconf} --ssl=bogus" - einfo "You will not have any encryption support enabled." - fi - - # NOTE: bitlbee's configure script is not an autotool creation, - # so that is why we don't use econf. - ./configure --prefix=/usr --datadir=/usr/share/bitlbee \ - --etcdir=/etc/bitlbee --strip=0 ${myconf} || die "econf failed" - - sed -i \ - -e "s/CFLAGS=.*$/CFLAGS=${CFLAGS}/" \ - Makefile.settings || die "sed failed" - - emake || die "make failed" - - # make bitlbeed forking server - cd utils - $(tc-getCC) ${CFLAGS} bitlbeed.c -o bitlbeed \ - || die "bitlbeed failed to compile" -} - -src_install() { - make install DESTDIR="${D}" || die "install failed" - make install-etc DESTDIR="${D}" || die "install failed" - make install-doc DESTDIR="${D}" || die "install failed" - keepdir /var/lib/bitlbee - fperms 700 /var/lib/bitlbee - fowners bitlbee:bitlbee /var/lib/bitlbee - - dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README} - dodoc doc/user-guide/user-guide.txt - dohtml -A xml doc/user-guide/*.xml - dohtml -A xsl doc/user-guide/*.xsl - dohtml doc/user-guide/*.html - - doman doc/bitlbee.8 doc/bitlbee.conf.5 - - dobin utils/bitlbeed - - if use xinetd; then - insinto /etc/xinetd.d - newins doc/bitlbee.xinetd bitlbee - fi - - newinitd "${FILESDIR}"/bitlbeed.initd bitlbeed || die - newconfd "${FILESDIR}"/bitlbeed.confd2 bitlbeed || die - - keepdir /var/run/bitlbeed - - dodir /usr/share/bitlbee - insinto /usr/share/bitlbee - cd utils - doins centericq2bitlbee.sh convert_gnomeicu.txt create_nicksfile.pl - doins bitlbee-ctl.pl -} - -pkg_postinst() { - chown -R bitlbee:bitlbee "${ROOT}"/var/lib/bitlbee - - elog "The utils included in bitlbee (other than bitlbeed) are now" - elog "located in /usr/share/bitlbee" - elog - elog "NOTE: The IRSSI script is no longer provided by BitlBee." -} diff --git a/net-im/bitlbee/bitlbee-1.1.1.ebuild b/net-im/bitlbee/bitlbee-1.1.1.ebuild deleted file mode 100644 index da87aa33fbda..000000000000 --- a/net-im/bitlbee/bitlbee-1.1.1.ebuild +++ /dev/null @@ -1,162 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-1.1.1.ebuild,v 1.1 2007/12/30 12:18:08 cedk Exp $ - -EAPI="1" -inherit eutils toolchain-funcs confutils - -MY_P="${P}dev" - -DESCRIPTION="irc to IM gateway that support multiple IM protocols" -HOMEPAGE="http://www.bitlbee.org/" -SRC_URI="http://get.bitlbee.org/src/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd" -IUSE="debug gnutls ipv6 +jabber msn nss +oscar ssl +yahoo xinetd" # ldap - Bug 195758 - -COMMON_DEPEND=">=dev-libs/glib-2.4 - msn? ( gnutls? ( net-libs/gnutls ) - !gnutls? ( nss? ( dev-libs/nss ) ) - !gnutls? ( !nss? ( ssl? ( dev-libs/openssl ) ) ) - ) - jabber? ( gnutls? ( net-libs/gnutls ) - !gnutls? ( nss? ( dev-libs/nss ) ) - !gnutls? ( !nss? ( ssl? ( dev-libs/openssl ) ) ) - )" - # ldap? ( net-nds/openldap )" -DEPEND="${COMMON_DEPEND} - dev-util/pkgconfig" - -RDEPEND="${COMMON_DEPEND} - virtual/logger - xinetd? ( sys-apps/xinetd )" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - elog "Note: Support for all IM protocols are controlled by use flags." - elog " Make sure you've enabled the flags you want." - elog - confutils_require_any jabber msn oscar yahoo - - # At the request of upstream, die if MSN Messenger support is enabled - # but no SSL support has been enabled - confutils_use_depend_any msn gnutls nss ssl - - # Warn but not die if jabber is enabled but SSL is not - if use jabber && ! use gnutls && ! use nss && ! use ssl ; then - ewarn "" - ewarn "You have enabled support for Jabber but do not have SSL" - ewarn "support enabled. This *will* prevent bitlbee from being" - ewarn "able to connect to SSL enabled Jabber servers. If you need to" - ewarn "connect to Jabber over SSL, enable ONE of the following use" - ewarn "flags: gnutls, nss or ssl" - ewarn "" - fi - - enewgroup bitlbee - enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee -} - -src_unpack() { - unpack ${A} - cd "${S}" - - sed -i \ - -e "s@/usr/local/sbin/bitlbee@/usr/sbin/bitlbee@" \ - -e "s/nobody/bitlbee/" \ - -e "s/}/ disable = yes\n}/" \ - doc/bitlbee.xinetd || die "sed failed in xinetd" - - sed -i \ - -e "s@mozilla-nss@nss@g" \ - configure || die "sed failed in configure" -} - -src_compile() { - # ldap hard-disabled for now - local myconf="--ldap=0" - - # setup protocol, ipv6 and debug - for flag in debug ipv6 msn jabber oscar yahoo ; do - if use ${flag} ; then - myconf="${myconf} --${flag}=1" - else - myconf="${myconf} --${flag}=0" - fi - done - - # setup ssl use flags - if use gnutls ; then - myconf="${myconf} --ssl=gnutls" - elif use nss ; then - myconf="${myconf} --ssl=nss" - elif use ssl ; then - myconf="${myconf} --ssl=openssl" - else - myconf="${myconf} --ssl=bogus" - einfo "You will not have any encryption support enabled." - fi - - # NOTE: bitlbee's configure script is not an autotool creation, - # so that is why we don't use econf. - ./configure --prefix=/usr --datadir=/usr/share/bitlbee \ - --etcdir=/etc/bitlbee --strip=0 ${myconf} || die "econf failed" - - sed -i \ - -e "s/CFLAGS=.*$/CFLAGS=${CFLAGS}/" \ - Makefile.settings || die "sed failed" - - emake || die "make failed" - - # make bitlbeed forking server - cd utils - $(tc-getCC) ${CFLAGS} bitlbeed.c -o bitlbeed \ - || die "bitlbeed failed to compile" -} - -src_install() { - make install DESTDIR="${D}" || die "install failed" - make install-etc DESTDIR="${D}" || die "install failed" - make install-doc DESTDIR="${D}" || die "install failed" - keepdir /var/lib/bitlbee - fperms 700 /var/lib/bitlbee - fowners bitlbee:bitlbee /var/lib/bitlbee - - dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README} - dodoc doc/user-guide/user-guide.txt - dohtml -A xml doc/user-guide/*.xml - dohtml -A xsl doc/user-guide/*.xsl - dohtml doc/user-guide/*.html - - doman doc/bitlbee.8 doc/bitlbee.conf.5 - - dobin utils/bitlbeed - - if use xinetd; then - insinto /etc/xinetd.d - newins doc/bitlbee.xinetd bitlbee - fi - - newinitd "${FILESDIR}"/bitlbeed.initd bitlbeed || die - newconfd "${FILESDIR}"/bitlbeed.confd2 bitlbeed || die - - keepdir /var/run/bitlbeed - - dodir /usr/share/bitlbee - insinto /usr/share/bitlbee - cd utils - doins centericq2bitlbee.sh convert_gnomeicu.txt create_nicksfile.pl - doins bitlbee-ctl.pl -} - -pkg_postinst() { - chown -R bitlbee:bitlbee "${ROOT}"/var/lib/bitlbee - - elog "The utils included in bitlbee (other than bitlbeed) are now" - elog "located in /usr/share/bitlbee" - elog - elog "NOTE: The IRSSI script is no longer provided by BitlBee." -} diff --git a/net-im/bitlbee/bitlbee-1.2.1.ebuild b/net-im/bitlbee/bitlbee-1.2.1.ebuild deleted file mode 100644 index ff817746dd9e..000000000000 --- a/net-im/bitlbee/bitlbee-1.2.1.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-1.2.1.ebuild,v 1.1 2008/07/08 07:52:04 cedk Exp $ - -EAPI="1" -inherit eutils toolchain-funcs confutils - -DESCRIPTION="irc to IM gateway that support multiple IM protocols" -HOMEPAGE="http://www.bitlbee.org/" -SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd" -IUSE="debug gnutls ipv6 +jabber msn nss +oscar ssl test +yahoo xinetd" # ldap - Bug 195758 - -COMMON_DEPEND=">=dev-libs/glib-2.4 - msn? ( gnutls? ( net-libs/gnutls ) - !gnutls? ( nss? ( dev-libs/nss ) ) - !gnutls? ( !nss? ( ssl? ( dev-libs/openssl ) ) ) - ) - jabber? ( gnutls? ( net-libs/gnutls ) - !gnutls? ( nss? ( dev-libs/nss ) ) - !gnutls? ( !nss? ( ssl? ( dev-libs/openssl ) ) ) - )" - # ldap? ( net-nds/openldap )" -DEPEND="${COMMON_DEPEND} - dev-util/pkgconfig - test? ( dev-libs/check )" - -RDEPEND="${COMMON_DEPEND} - virtual/logger - xinetd? ( sys-apps/xinetd )" - -pkg_setup() { - elog "Note: Support for all IM protocols are controlled by use flags." - elog " Make sure you've enabled the flags you want." - elog - confutils_require_any jabber msn oscar yahoo - - # At the request of upstream, die if MSN Messenger support is enabled - # but no SSL support has been enabled - confutils_use_depend_any msn gnutls nss ssl - - if use jabber && ! use gnutls && ! use ssl ; then - if use nss; then - ewarn "" - ewarn "You have enabled nss and jabber" - ewarn "but nss doesn't work with jabber" - ewarn "Enable ONE of the following use instead" - ewarn "flags: gnutls or ssl" - ewarn "" - die "nss with jabber doesn't work" - fi - elog "" - elog "You have enabled support for Jabber but do not have SSL" - elog "support enabled. This *will* prevent bitlbee from being" - elog "able to connect to SSL enabled Jabber servers. If you need to" - elog "connect to Jabber over SSL, enable ONE of the following use" - elog "flags: gnutls or ssl" - elog "" - fi - - enewgroup bitlbee - enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee -} - -src_unpack() { - unpack ${A} - cd "${S}" - - sed -i \ - -e "s@/usr/local/sbin/bitlbee@/usr/sbin/bitlbee@" \ - -e "s/nobody/bitlbee/" \ - -e "s/}/ disable = yes\n}/" \ - doc/bitlbee.xinetd || die "sed failed in xinetd" - - sed -i \ - -e "s@mozilla-nss@nss@g" \ - configure || die "sed failed in configure" -} - -src_compile() { - # ldap hard-disabled for now - local myconf="--ldap=0" - - # setup protocol, ipv6 and debug - for flag in debug ipv6 msn jabber oscar yahoo ; do - if use ${flag} ; then - myconf="${myconf} --${flag}=1" - else - myconf="${myconf} --${flag}=0" - fi - done - - # setup ssl use flags - if use gnutls ; then - myconf="${myconf} --ssl=gnutls" - einfo "Use gnutls as SSL support" - elif use ssl ; then - myconf="${myconf} --ssl=openssl" - einfo "Use openssl as SSL support" - elif use nss ; then - myconf="${myconf} --ssl=nss" - einfo "Use nss as SSL support" - else - myconf="${myconf} --ssl=bogus" - einfo "You will not have any encryption support enabled." - fi - - # NOTE: bitlbee's configure script is not an autotool creation, - # so that is why we don't use econf. - ./configure --prefix=/usr --datadir=/usr/share/bitlbee \ - --etcdir=/etc/bitlbee --strip=0 ${myconf} || die "econf failed" - - sed -i \ - -e "s/CFLAGS=.*$/CFLAGS=${CFLAGS}/" \ - Makefile.settings || die "sed failed" - - emake || die "make failed" - - # make bitlbeed forking server - cd utils - $(tc-getCC) ${CFLAGS} bitlbeed.c -o bitlbeed \ - || die "bitlbeed failed to compile" -} - -src_install() { - make install DESTDIR="${D}" || die "install failed" - make install-etc DESTDIR="${D}" || die "install failed" - make install-doc DESTDIR="${D}" || die "install failed" - keepdir /var/lib/bitlbee - fperms 700 /var/lib/bitlbee - fowners bitlbee:bitlbee /var/lib/bitlbee - - dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README} - dodoc doc/user-guide/user-guide.txt - dohtml -A xml doc/user-guide/*.xml - dohtml -A xsl doc/user-guide/*.xsl - dohtml doc/user-guide/*.html - - doman doc/bitlbee.8 doc/bitlbee.conf.5 - - dobin utils/bitlbeed - - if use xinetd; then - insinto /etc/xinetd.d - newins doc/bitlbee.xinetd bitlbee - fi - - newinitd "${FILESDIR}"/bitlbeed.initd bitlbeed || die - newconfd "${FILESDIR}"/bitlbeed.confd2 bitlbeed || die - - keepdir /var/run/bitlbeed - - dodir /usr/share/bitlbee - insinto /usr/share/bitlbee - cd utils - doins centericq2bitlbee.sh convert_gnomeicu.txt create_nicksfile.pl - doins bitlbee-ctl.pl -} - -pkg_postinst() { - chown -R bitlbee:bitlbee "${ROOT}"/var/lib/bitlbee - - elog "The utils included in bitlbee (other than bitlbeed) are now" - elog "located in /usr/share/bitlbee" - elog - elog "NOTE: The IRSSI script is no longer provided by BitlBee." -} diff --git a/net-im/bitlbee/bitlbee-1.2.2.ebuild b/net-im/bitlbee/bitlbee-1.2.2.ebuild deleted file mode 100644 index 1bb1dbeaa109..000000000000 --- a/net-im/bitlbee/bitlbee-1.2.2.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-1.2.2.ebuild,v 1.7 2008/08/31 15:54:11 dertobi123 Exp $ - -EAPI="1" -inherit eutils toolchain-funcs confutils - -DESCRIPTION="irc to IM gateway that support multiple IM protocols" -HOMEPAGE="http://www.bitlbee.org/" -SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-fbsd" -IUSE="debug gnutls ipv6 +jabber msn nss +oscar ssl test +yahoo xinetd" # ldap - Bug 195758 - -COMMON_DEPEND=">=dev-libs/glib-2.4 - msn? ( gnutls? ( net-libs/gnutls ) - !gnutls? ( nss? ( dev-libs/nss ) ) - !gnutls? ( !nss? ( ssl? ( dev-libs/openssl ) ) ) - ) - jabber? ( gnutls? ( net-libs/gnutls ) - !gnutls? ( nss? ( dev-libs/nss ) ) - !gnutls? ( !nss? ( ssl? ( dev-libs/openssl ) ) ) - )" - # ldap? ( net-nds/openldap )" -DEPEND="${COMMON_DEPEND} - dev-util/pkgconfig - test? ( dev-libs/check )" - -RDEPEND="${COMMON_DEPEND} - virtual/logger - xinetd? ( sys-apps/xinetd )" - -pkg_setup() { - elog "Note: Support for all IM protocols are controlled by use flags." - elog " Make sure you've enabled the flags you want." - elog - confutils_require_any jabber msn oscar yahoo - - # At the request of upstream, die if MSN Messenger support is enabled - # but no SSL support has been enabled - confutils_use_depend_any msn gnutls nss ssl - - if use jabber && ! use gnutls && ! use ssl ; then - if use nss; then - ewarn "" - ewarn "You have enabled nss and jabber" - ewarn "but nss doesn't work with jabber" - ewarn "Enable ONE of the following use instead" - ewarn "flags: gnutls or ssl" - ewarn "" - die "nss with jabber doesn't work" - fi - elog "" - elog "You have enabled support for Jabber but do not have SSL" - elog "support enabled. This *will* prevent bitlbee from being" - elog "able to connect to SSL enabled Jabber servers. If you need to" - elog "connect to Jabber over SSL, enable ONE of the following use" - elog "flags: gnutls or ssl" - elog "" - fi - - enewgroup bitlbee - enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee -} - -src_unpack() { - unpack ${A} - cd "${S}" - - sed -i \ - -e "s@/usr/local/sbin/bitlbee@/usr/sbin/bitlbee@" \ - -e "s/nobody/bitlbee/" \ - -e "s/}/ disable = yes\n}/" \ - doc/bitlbee.xinetd || die "sed failed in xinetd" - - sed -i \ - -e "s@mozilla-nss@nss@g" \ - configure || die "sed failed in configure" - - epatch "${FILESDIR}/${P}-fix_tests_check_set.patch" -} - -src_compile() { - # ldap hard-disabled for now - local myconf="--ldap=0" - - # setup protocol, ipv6 and debug - for flag in debug ipv6 msn jabber oscar yahoo ; do - if use ${flag} ; then - myconf="${myconf} --${flag}=1" - else - myconf="${myconf} --${flag}=0" - fi - done - - # setup ssl use flags - if use gnutls ; then - myconf="${myconf} --ssl=gnutls" - einfo "Use gnutls as SSL support" - elif use ssl ; then - myconf="${myconf} --ssl=openssl" - einfo "Use openssl as SSL support" - elif use nss ; then - myconf="${myconf} --ssl=nss" - einfo "Use nss as SSL support" - else - myconf="${myconf} --ssl=bogus" - einfo "You will not have any encryption support enabled." - fi - - # NOTE: bitlbee's configure script is not an autotool creation, - # so that is why we don't use econf. - ./configure --prefix=/usr --datadir=/usr/share/bitlbee \ - --etcdir=/etc/bitlbee --strip=0 ${myconf} || die "econf failed" - - sed -i \ - -e "s/CFLAGS=.*$/CFLAGS=${CFLAGS}/" \ - Makefile.settings || die "sed failed" - - emake || die "make failed" - - # make bitlbeed forking server - cd utils - $(tc-getCC) ${CFLAGS} bitlbeed.c -o bitlbeed \ - || die "bitlbeed failed to compile" -} - -src_install() { - make install DESTDIR="${D}" || die "install failed" - make install-etc DESTDIR="${D}" || die "install failed" - make install-doc DESTDIR="${D}" || die "install failed" - keepdir /var/lib/bitlbee - fperms 700 /var/lib/bitlbee - fowners bitlbee:bitlbee /var/lib/bitlbee - - dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README} - dodoc doc/user-guide/user-guide.txt - dohtml -A xml doc/user-guide/*.xml - dohtml -A xsl doc/user-guide/*.xsl - dohtml doc/user-guide/*.html - - doman doc/bitlbee.8 doc/bitlbee.conf.5 - - dobin utils/bitlbeed - - if use xinetd; then - insinto /etc/xinetd.d - newins doc/bitlbee.xinetd bitlbee - fi - - newinitd "${FILESDIR}"/bitlbeed.initd bitlbeed || die - newconfd "${FILESDIR}"/bitlbeed.confd2 bitlbeed || die - - keepdir /var/run/bitlbeed - - dodir /usr/share/bitlbee - insinto /usr/share/bitlbee - cd utils - doins centericq2bitlbee.sh convert_gnomeicu.txt create_nicksfile.pl - doins bitlbee-ctl.pl -} - -pkg_postinst() { - chown -R bitlbee:bitlbee "${ROOT}"/var/lib/bitlbee - - elog "The utils included in bitlbee (other than bitlbeed) are now" - elog "located in /usr/share/bitlbee" - elog - elog "NOTE: The IRSSI script is no longer provided by BitlBee." -} diff --git a/net-im/bitlbee/bitlbee-1.2.ebuild b/net-im/bitlbee/bitlbee-1.2.ebuild deleted file mode 100644 index f2cb912206ce..000000000000 --- a/net-im/bitlbee/bitlbee-1.2.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-1.2.ebuild,v 1.9 2008/04/12 18:30:03 dertobi123 Exp $ - -EAPI="1" -inherit eutils toolchain-funcs confutils - -DESCRIPTION="irc to IM gateway that support multiple IM protocols" -HOMEPAGE="http://www.bitlbee.org/" -SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-fbsd" -IUSE="debug gnutls ipv6 +jabber msn nss +oscar ssl test +yahoo xinetd" # ldap - Bug 195758 - -COMMON_DEPEND=">=dev-libs/glib-2.4 - msn? ( gnutls? ( net-libs/gnutls ) - !gnutls? ( nss? ( dev-libs/nss ) ) - !gnutls? ( !nss? ( ssl? ( dev-libs/openssl ) ) ) - ) - jabber? ( gnutls? ( net-libs/gnutls ) - !gnutls? ( nss? ( dev-libs/nss ) ) - !gnutls? ( !nss? ( ssl? ( dev-libs/openssl ) ) ) - )" - # ldap? ( net-nds/openldap )" -DEPEND="${COMMON_DEPEND} - dev-util/pkgconfig - test? ( dev-libs/check )" - -RDEPEND="${COMMON_DEPEND} - virtual/logger - xinetd? ( sys-apps/xinetd )" - -pkg_setup() { - elog "Note: Support for all IM protocols are controlled by use flags." - elog " Make sure you've enabled the flags you want." - elog - confutils_require_any jabber msn oscar yahoo - - # At the request of upstream, die if MSN Messenger support is enabled - # but no SSL support has been enabled - confutils_use_depend_any msn gnutls nss ssl - - if use jabber && ! use gnutls && ! use ssl ; then - if use nss; then - ewarn "" - ewarn "You have enabled nss and jabber" - ewarn "but nss doesn't work with jabber" - ewarn "Enable ONE of the following use instead" - ewarn "flags: gnutls or ssl" - ewarn "" - die "nss with jabber doesn't work" - fi - elog "" - elog "You have enabled support for Jabber but do not have SSL" - elog "support enabled. This *will* prevent bitlbee from being" - elog "able to connect to SSL enabled Jabber servers. If you need to" - elog "connect to Jabber over SSL, enable ONE of the following use" - elog "flags: gnutls or ssl" - elog "" - fi - - enewgroup bitlbee - enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee -} - -src_unpack() { - unpack ${A} - cd "${S}" - - sed -i \ - -e "s@/usr/local/sbin/bitlbee@/usr/sbin/bitlbee@" \ - -e "s/nobody/bitlbee/" \ - -e "s/}/ disable = yes\n}/" \ - doc/bitlbee.xinetd || die "sed failed in xinetd" - - sed -i \ - -e "s@mozilla-nss@nss@g" \ - configure || die "sed failed in configure" -} - -src_compile() { - # ldap hard-disabled for now - local myconf="--ldap=0" - - # setup protocol, ipv6 and debug - for flag in debug ipv6 msn jabber oscar yahoo ; do - if use ${flag} ; then - myconf="${myconf} --${flag}=1" - else - myconf="${myconf} --${flag}=0" - fi - done - - # setup ssl use flags - if use gnutls ; then - myconf="${myconf} --ssl=gnutls" - einfo "Use gnutls as SSL support" - elif use ssl ; then - myconf="${myconf} --ssl=openssl" - einfo "Use openssl as SSL support" - elif use nss ; then - myconf="${myconf} --ssl=nss" - einfo "Use nss as SSL support" - else - myconf="${myconf} --ssl=bogus" - einfo "You will not have any encryption support enabled." - fi - - # NOTE: bitlbee's configure script is not an autotool creation, - # so that is why we don't use econf. - ./configure --prefix=/usr --datadir=/usr/share/bitlbee \ - --etcdir=/etc/bitlbee --strip=0 ${myconf} || die "econf failed" - - sed -i \ - -e "s/CFLAGS=.*$/CFLAGS=${CFLAGS}/" \ - Makefile.settings || die "sed failed" - - emake || die "make failed" - - # make bitlbeed forking server - cd utils - $(tc-getCC) ${CFLAGS} bitlbeed.c -o bitlbeed \ - || die "bitlbeed failed to compile" -} - -src_install() { - make install DESTDIR="${D}" || die "install failed" - make install-etc DESTDIR="${D}" || die "install failed" - make install-doc DESTDIR="${D}" || die "install failed" - keepdir /var/lib/bitlbee - fperms 700 /var/lib/bitlbee - fowners bitlbee:bitlbee /var/lib/bitlbee - - dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README,RELEASE-SPEECH-1.2} - dodoc doc/user-guide/user-guide.txt - dohtml -A xml doc/user-guide/*.xml - dohtml -A xsl doc/user-guide/*.xsl - dohtml doc/user-guide/*.html - - doman doc/bitlbee.8 doc/bitlbee.conf.5 - - dobin utils/bitlbeed - - if use xinetd; then - insinto /etc/xinetd.d - newins doc/bitlbee.xinetd bitlbee - fi - - newinitd "${FILESDIR}"/bitlbeed.initd bitlbeed || die - newconfd "${FILESDIR}"/bitlbeed.confd2 bitlbeed || die - - keepdir /var/run/bitlbeed - - dodir /usr/share/bitlbee - insinto /usr/share/bitlbee - cd utils - doins centericq2bitlbee.sh convert_gnomeicu.txt create_nicksfile.pl - doins bitlbee-ctl.pl -} - -pkg_postinst() { - chown -R bitlbee:bitlbee "${ROOT}"/var/lib/bitlbee - - elog "The utils included in bitlbee (other than bitlbeed) are now" - elog "located in /usr/share/bitlbee" - elog - elog "NOTE: The IRSSI script is no longer provided by BitlBee." -} diff --git a/net-im/bitlbee/files/bitlbee-1.0.3-xinetd.patch b/net-im/bitlbee/files/bitlbee-1.0.3-xinetd.patch deleted file mode 100644 index 7abffd48bccc..000000000000 --- a/net-im/bitlbee/files/bitlbee-1.0.3-xinetd.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- bitlbee.xinetd.orig 2006-07-16 11:38:25.534054090 -0600 -+++ bitlbee.xinetd 2006-07-16 11:39:25.039033992 -0600 -@@ -11,7 +11,7 @@ - - ## You most likely want to change these two - user = nobody -- server = /usr/local/sbin/bitlbee -+ server = /usr/sbin/bitlbee - - ## You might want to limit access to localhost only: - # bind = 127.0.0.1 -@@ -21,4 +21,5 @@ - ## /etc/services too. - type = UNLISTED - port = 6667 -+ disable = yes - } diff --git a/net-im/bitlbee/files/bitlbee-gentoohack.patch b/net-im/bitlbee/files/bitlbee-gentoohack.patch deleted file mode 100644 index b39a64922518..000000000000 --- a/net-im/bitlbee/files/bitlbee-gentoohack.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -Naur bitlbee-0.91/bitlbee.c bitlbee-0.91-gentoohack/bitlbee.c ---- bitlbee-0.91/bitlbee.c 2004-11-21 15:52:28.000000000 +0100 -+++ bitlbee-0.91-gentoohack/bitlbee.c 2004-12-21 17:15:15.000000000 +0100 -@@ -285,6 +285,7 @@ - account_t *a; - FILE *fp; - char *hash; -+ int retval; - - /*\ - * [SH] Nothing should be saved if no password is set, because the -@@ -344,11 +345,16 @@ - g_snprintf( path, 511, "%s%s%s", global.conf->configdir, irc->nick, ".accounts~" ); - fp = fopen( path, "w" ); - if( !fp ) return( 0 ); -- if( fprintf( fp, "%s", hash ) != strlen( hash ) ) -+ retval = fprintf( fp, "%s", hash ); -+ if( retval != strlen( hash ) ) - { -- irc_usermsg( irc, "fprintf() wrote too little. Disk full?" ); -- fclose( fp ); -- return( 0 ); -+ if( retval == 1) { -+ irc_usermsg( irc, "Enabling writing hack for gentoo. This is dangerous and may corrupt your files."); -+ } else { -+ irc_usermsg( irc, "fprintf() wrote too little. Disk full?" ); -+ fclose( fp ); -+ return( 0 ); -+ } - } - g_free( hash ); - diff --git a/net-im/bitlbee/files/bitlbee-xinetd.patch b/net-im/bitlbee/files/bitlbee-xinetd.patch deleted file mode 100644 index d32dd8f3313a..000000000000 --- a/net-im/bitlbee/files/bitlbee-xinetd.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- bitlbee.xinetd.orig 2003-04-08 13:01:45.000000000 -0400 -+++ bitlbee.xinetd 2003-04-08 13:01:36.000000000 -0400 -@@ -1,12 +1,14 @@ - ## xinetd file for BitlBee. Please check this file before using it, the - ## user, port and/or binary location might be wrong. - --service 6667 -+service ircd - { - socket_type = stream - protocol = tcp - wait = no -- user = bitlbee -+ user = nobody -+ only_from = localhost - server = /usr/sbin/bitlbee - port = 6667 -+ disable = yes - } diff --git a/net-im/bitlbee/files/bitlbeed.confd b/net-im/bitlbee/files/bitlbeed.confd deleted file mode 100644 index 0d75efd0c017..000000000000 --- a/net-im/bitlbee/files/bitlbeed.confd +++ /dev/null @@ -1,16 +0,0 @@ -# location of bitlbeed executable -BITLBEED_EXEC=/usr/bin/bitlbeed -# -# output from bitlbeed -h -# -# Usage: bitlbeed [-i <interface>] [-p <port>] [-n <num>] <command> <args...> -# A simple inetd-like daemon to have a program listening on a TCP socket without -# needing root access to the machine -# -# -i Specify the interface (by IP address) to listen on. -# (Default: 0.0.0.0 (any interface)) -# -p Port number to listen on. (Default: 6667) -# -n Maximum number of connections. (Default: 0 (unlimited)) -# -h This information -# -#BITLBEED_OPTS="" diff --git a/net-im/bitlbee/files/bitlbeed.init b/net-im/bitlbee/files/bitlbeed.init deleted file mode 100644 index 093a06e7341e..000000000000 --- a/net-im/bitlbee/files/bitlbeed.init +++ /dev/null @@ -1,27 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or -# later -# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/files/bitlbeed.init,v 1.4 2004/07/14 23:44:31 agriffis Exp $ - - -depend() { - need logger net -} - -start () { - ebegin "Starting bitlbeed" - start-stop-daemon --start --startas ${BITLBEED_EXEC} \ - -c nobody:nobody --exec ${BITLBEED_EXEC} -- \ - ${BITLBEED_OPTS} /usr/sbin/bitlbee - eend $? "Failed to start bitlbeed" -} - -stop() { - ebegin "Stopping bitlbeed" - #killall -9 bitlbeed &>/dev/null - start-stop-daemon --stop --signal 9 \ - --exec ${BITLBEED_EXEC} - eend $? "Failed to stop bitlbeed" -} - diff --git a/net-im/bitlbee/files/oscar-sms.patch b/net-im/bitlbee/files/oscar-sms.patch deleted file mode 100644 index 070928b68bfb..000000000000 --- a/net-im/bitlbee/files/oscar-sms.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -ru bitlbee-1.1dev~/protocols/oscar/oscar.c bitlbee-1.1dev/protocols/oscar/oscar.c ---- bitlbee-1.1dev~/protocols/oscar/oscar.c 2007-12-13 21:24:28.000000000 +0100 -+++ bitlbee-1.1dev/protocols/oscar/oscar.c 2007-12-13 21:30:18.000000000 +0100 -@@ -1093,8 +1093,17 @@ - } else { - g_snprintf(tmp, BUF_LONG, "%s", args->msg); - } -- } else -+ } else if (args->mpmsg.numparts == 0) { - g_snprintf(tmp, BUF_LONG, "%s", args->msg); -+ } else { -+ int i; -+ -+ *tmp = 0; -+ for (i = 0; i < args->mpmsg.numparts; i ++) { -+ g_strlcat(tmp, (char*) args->mpmsg.parts[i].data, BUF_LONG); -+ g_strlcat(tmp, "\n", BUF_LONG); -+ } -+ } - - strip_linefeed(tmp); - serv_got_im(gc, userinfo->sn, tmp, flags, time(NULL), -1); |