Version bump for bug #236160

Package-Manager: portage-2.1.4.4

3 files changed, 179 insertions, 12 deletions

diff --git a/net-im/bitlbee/ChangeLog b/net-im/bitlbee/ChangeLog
index e4973fa8c563..8d4e8ac32bf5 100644
--- a/net-im/bitlbee/ChangeLog
+++ b/net-im/bitlbee/ChangeLog
@@ -1,6 +1,11 @@
 # 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.103 2008/08/05 16:22:36 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.104 2008/08/30 09:05:04 cedk Exp $
+
+*bitlbee-1.2.2 (30 Aug 2008)
+
+  30 Aug 2008; Cédric Krier <cedk@gentoo.org> +bitlbee-1.2.2.ebuild:
+  Version bump for bug #236160
 
   05 Aug 2008; Thomas Anderson <gentoofan23@gentoo.org> metadata.xml:
   Add USE flag description to metadata as per GLEP 56.
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index 32af74e8d8a5..a28dbe291bd6 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX bitlbee-1.0.3-xinetd.patch 504 RMD160 ceda3cb2ac112a8cd79565a4654c432747cf8821 SHA1 67cbfbcc411ec8846acb74398435daeb8bf0dddd SHA256 d1644765e413d2964997396f56ee7df915861f105a6238e926ac81d643c8d3ec
 AUX bitlbee-gentoohack.patch 1015 RMD160 7149ceb9401a3f3986bd79b10a2ee16bd671e4a6 SHA1 612e35eb03253f30d476b883a93c89f3a131c564 SHA256 5d492cce483fd54f3abc7cdf7268e60efca9d0c70ad42ce37b58e21cce6d5745
 AUX bitlbee-xinetd.patch 519 RMD160 7594a98df26708e500c3f0c9e02e7974de19eff0 SHA1 cb9f28ed97dc2222b4b14423f8e82e65e8da1b45 SHA256 8a2c05060ab68f44dc296ccf5054e1dd29342b61b9801d9d90e05830b9edc20e
@@ -14,19 +11,14 @@ DIST bitlbee-1.0.4.tar.gz 455833 RMD160 f7e44595845aabf987a5112fdf6b9daed04448d0
 DIST bitlbee-1.1.1dev.tar.gz 461690 RMD160 2f89fa16148ea197a8ec3d3eb4f851287fe2aeed SHA1 47fe878395cc341752233ca525f9b28e483e0526 SHA256 c4f33233ba57c507f1236642f70e1ca98879c0a31fa97fc23d6ff1e72ef0a8dc
 DIST bitlbee-1.1dev.tar.gz 439464 RMD160 aacee84da6f88a85890760ad6d17a3504ea55cc9 SHA1 4355c4c4186b921da6232f17e9b4842dd2943607 SHA256 a7cd5be951ff65520aa4aabee86be60233399b578dd7efd992f01f6e0c55af1c
 DIST bitlbee-1.2.1.tar.gz 471454 RMD160 ab63c4ce1ad5ddb9a666df2196e16086cfdd72f3 SHA1 1fd96b3241987f092a1be6b850864eaf806770b6 SHA256 4654e8824eea2ba787b4751782ee3ca704b756d3c4f623cda409cde212198d06
+DIST bitlbee-1.2.2.tar.gz 475550 RMD160 e18fb4b6e9092cdd546ef12207c49352c42a21d3 SHA1 3dd2e9fcfa149d7731ead73592247de90d3de33c SHA256 97dc5f28197ba61415b9e01c887b81b0efc8df38d8d1e7a0b66dac3cec719025
 DIST bitlbee-1.2.tar.gz 469482 RMD160 c48c5f8af418ba4fe7310732ced6290521cc656e SHA1 71dc24e9025375460e999345db70fb5dff7d45d8 SHA256 ff69fa43445c833a34ea64c23178383e3abe98f2ec7e791ea0cf3913e4090bb8
 EBUILD bitlbee-1.0.3.ebuild 4622 RMD160 cad15ed525e30646bed341d56b50fc0ba0890280 SHA1 11241ceeb09841ee1c1967aa943255500a7b3143 SHA256 73034c4f9653ba2a71901f488719b90ea714dbd84b322d433fbf37804d59d658
 EBUILD bitlbee-1.0.4.ebuild 4780 RMD160 7ec0ca612ed9be89b962d3b8135de1d242411c66 SHA1 8ec67fb2ccbc57b12b4c929647c7d83c9553cfcc SHA256 985a541fd32d87aeece425260110bb2d278a174f869cf82178ef42b4a785575f
 EBUILD bitlbee-1.1-r1.ebuild 4525 RMD160 5db4e8fe9bbce32fcd893fe61fbea13c83e9a1e0 SHA1 3b6fd1383bf0bf9875f96f2cfb81a47d6a99926d SHA256 d6a509f1318f4c438915963792dd2ba84b97d883835cd16048b5848e2abaf4da
 EBUILD bitlbee-1.1.1.ebuild 4485 RMD160 7fadfde761bc4e8caf669c76b4d5e0f7277d9014 SHA1 1bfa40755c72c014bc3fc05b44dd28be086dbe42 SHA256 69cb6853f13059de983725bcb679db40f56312585879ed63bc90a046928d1074
 EBUILD bitlbee-1.2.1.ebuild 4746 RMD160 29cd751818c9f5c164a01d380f7a69d21e3a2353 SHA1 ac07153cad981e314b08341cd257bb975e9148ed SHA256 98e320c1896bd3b78c7b093dbae57d409db4dcd5e93a1f11e5d0192e8531b93e
+EBUILD bitlbee-1.2.2.ebuild 4746 RMD160 3300de7cb4bea066049c44fd62b4e7f09a6240d8 SHA1 9e41de15a04e74c9befd4ccd20e209cf9aa2628e SHA256 b3bbe0d2bbdd46d9d1dee743c05b649e14ab5be5ab4a34300e076425606992f4
 EBUILD bitlbee-1.2.ebuild 4763 RMD160 90fa46de3289ce1697bba3b96fce3613c4489b19 SHA1 18387f34c9b734c6ed73a52e4ecb058492938c26 SHA256 4999807a9d122bf839ce357cfadd14c19517f6f0db7d42e9ea609f63224985e6
-MISC ChangeLog 16310 RMD160 52b454f88e92daebcfbe48d7451f74504c7eee3d SHA1 8f18c7cd30ad50c1e45c0f9a655155670a7de838 SHA256 7205f6d50338b0beaa2df04c47a1e3a0a75d2c35a0d48d7820a23bbc230ebfe6
+MISC ChangeLog 16435 RMD160 2bfee248546569bb2ea0e6ef80098dc020c7feb3 SHA1 c22e6086ac36c1cce51e47028b211115b020f9ea SHA256 4baf92e33a758dc16cf2e441efd5a868c74926b246eeaccaa5d918737b8b91b0
 MISC metadata.xml 526 RMD160 962ae22fcec98d00ffe7c399a5aafb53c9f2a0dd SHA1 80d98eaf4c9a652adb79cf3b0cd3d6c6c25e06c0 SHA256 487bd953ddfca7c67071caefb3ca22387a4845d1e8b3dd34d45b101b95aafd9b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkiYgewACgkQF6yMcaBxwHnH2gCaA9/cJwxfi9v+p5qQ88MoHzvf
-7tkAnAs6WJIxMkEcG0YNJeHbjPn0x4TU
-=Txku
------END PGP SIGNATURE-----
diff --git a/net-im/bitlbee/bitlbee-1.2.2.ebuild b/net-im/bitlbee/bitlbee-1.2.2.ebuild
new file mode 100644
index 000000000000..14e5ed33915b
--- /dev/null
+++ b/net-im/bitlbee/bitlbee-1.2.2.ebuild
@@ -0,0 +1,170 @@
+# 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.1 2008/08/30 09:05: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."
+}