Version bump

Package-Manager: portage-2.1.3.19

4 files changed, 183 insertions, 5 deletions

diff --git a/net-im/bitlbee/ChangeLog b/net-im/bitlbee/ChangeLog
index ff34d6de1156..a348774bd859 100644
--- a/net-im/bitlbee/ChangeLog
+++ b/net-im/bitlbee/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/bitlbee
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.90 2007/12/13 21:05:24 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.91 2007/12/30 12:18:08 cedk Exp $
+
+*bitlbee-1.1.1 (30 Dec 2007)
+
+  30 Dec 2007; Cédric Krier <cedk@gentoo.org> +bitlbee-1.1.1.ebuild:
+  Version bump
 
   13 Dec 2007; Cédric Krier <cedk@gentoo.org> bitlbee-1.1-r1.ebuild:
   Fix to enable bogus ssl
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index fe270b54ab79..d93082ccc4eb 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -32,6 +32,7 @@ RMD160 f5e174cc7ac90242483ea1319d8b9c62afac8f18 files/oscar-sms.patch 715
 SHA256 b1401aa25f244795b921aff2894d685ab0ab04bbaca755b18938fe280140e021 files/oscar-sms.patch 715
 DIST bitlbee-1.0.3.tar.gz 455344 RMD160 d27c7a9104528402d4d3e2f78b40eda5f6490d72 SHA1 6e4065d8b576a3c11c2e6bb008ea1bdc7b182cd1 SHA256 1d272c8712ee279ee8ac305562e7b8591e634fae69664a5a2d43301cb1d6277d
 DIST bitlbee-1.0.4.tar.gz 455833 RMD160 f7e44595845aabf987a5112fdf6b9daed04448d0 SHA1 830e8a2b8930a6e5b1978a3cae9d8a16034ab7ff SHA256 6f23f37ea641d67e56c61b70d3ac7d404243929c393302ead4758d4ffe6d5b1c
+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
 EBUILD bitlbee-1.0.3.ebuild 4596 RMD160 dc3dcb30a2b75c612648b37b25a38f114f53e40d SHA1 0a7d53d8e64d5ad062e4df579abe36d3a2fbec10 SHA256 53d67d6361f22f525c85006ad6289de2adea64bbb5d28662522edce81d21ba73
 MD5 d8295a2449a820e22bd05fcc5d5fc047 bitlbee-1.0.3.ebuild 4596
@@ -45,10 +46,14 @@ EBUILD bitlbee-1.1-r1.ebuild 4522 RMD160 9db9def9d8f65bef689af8a4af1f52c28a89a2d
 MD5 f3493c6a5e7a268656fa3d04a3f3e1d2 bitlbee-1.1-r1.ebuild 4522
 RMD160 9db9def9d8f65bef689af8a4af1f52c28a89a2d3 bitlbee-1.1-r1.ebuild 4522
 SHA256 5038b3668f502dc4049677eb5b1424e4fc6b932c81d4a3ec1af82b6e11db2561 bitlbee-1.1-r1.ebuild 4522
-MISC ChangeLog 14838 RMD160 1eb067beccb53e9592ab21d2f78b3ee573d1831d SHA1 aefec149288a47dae8311ba7e3864c92d6f36fdd SHA256 ea86139dc027ffa17b37f10563aa495f78b60500bf82920c5029f028cf44fa15
-MD5 d8bb5e2ce3dc8802e0a9b158a640f64d ChangeLog 14838
-RMD160 1eb067beccb53e9592ab21d2f78b3ee573d1831d ChangeLog 14838
-SHA256 ea86139dc027ffa17b37f10563aa495f78b60500bf82920c5029f028cf44fa15 ChangeLog 14838
+EBUILD bitlbee-1.1.1.ebuild 4485 RMD160 7fadfde761bc4e8caf669c76b4d5e0f7277d9014 SHA1 1bfa40755c72c014bc3fc05b44dd28be086dbe42 SHA256 69cb6853f13059de983725bcb679db40f56312585879ed63bc90a046928d1074
+MD5 0141d977de14d4f825cfa330d9d7e260 bitlbee-1.1.1.ebuild 4485
+RMD160 7fadfde761bc4e8caf669c76b4d5e0f7277d9014 bitlbee-1.1.1.ebuild 4485
+SHA256 69cb6853f13059de983725bcb679db40f56312585879ed63bc90a046928d1074 bitlbee-1.1.1.ebuild 4485
+MISC ChangeLog 14954 RMD160 6c5c8671e8572cb5097647b1e28495200a4c727f SHA1 a9087044db1c17f41db003b5bb2df8b6adc70138 SHA256 68b1388f06edbdf0de1201e285f4969aafb90c7a81deabf1ca6fca24619d1378
+MD5 1347e71bf58e8352d02298e78ba1db69 ChangeLog 14954
+RMD160 6c5c8671e8572cb5097647b1e28495200a4c727f ChangeLog 14954
+SHA256 68b1388f06edbdf0de1201e285f4969aafb90c7a81deabf1ca6fca24619d1378 ChangeLog 14954
 MISC metadata.xml 441 RMD160 f440e9e63bc4c6abdcf4b7e23fcfddcd678f961e SHA1 6cca8fafd875ff937fc225a1b0fd1876802ffb42 SHA256 a6dcfed15814498c58a9625f9bb9f742595a253181656d8b7fc69234d3170840
 MD5 9a965cf0ec63031ac941c8eae0121f2b metadata.xml 441
 RMD160 f440e9e63bc4c6abdcf4b7e23fcfddcd678f961e metadata.xml 441
@@ -62,3 +67,6 @@ SHA256 34bf3eddc86ba6157fecc0cd490e4b62c569dbf400299f0ccfe6863701c874f6 files/di
 MD5 a8b6091407e1ec76ae0c34ba101dadad files/digest-bitlbee-1.1-r1 244
 RMD160 cdc386a32e0d5563a34695d7d93796313f5af5a1 files/digest-bitlbee-1.1-r1 244
 SHA256 776634d5663140f71e9a00cdbd7cf145bc9ecebbb99192a550e501d110d0de7a files/digest-bitlbee-1.1-r1 244
+MD5 afd21af0b10fd68e568ccda462dbff91 files/digest-bitlbee-1.1.1 250
+RMD160 e66b942a32f4c7725c2383bb845e65e2efba3987 files/digest-bitlbee-1.1.1 250
+SHA256 0c9ec21a34e27576a3ba3b0d3b94f376b0f7a01da5736f4001105f9e73f4429a files/digest-bitlbee-1.1.1 250
diff --git a/net-im/bitlbee/bitlbee-1.1.1.ebuild b/net-im/bitlbee/bitlbee-1.1.1.ebuild
new file mode 100644
index 000000000000..da87aa33fbda
--- /dev/null
+++ b/net-im/bitlbee/bitlbee-1.1.1.ebuild
@@ -0,0 +1,162 @@
+# 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/files/digest-bitlbee-1.1.1 b/net-im/bitlbee/files/digest-bitlbee-1.1.1
new file mode 100644
index 000000000000..7b9653538162
--- /dev/null
+++ b/net-im/bitlbee/files/digest-bitlbee-1.1.1
@@ -0,0 +1,3 @@
+MD5 ad38f3b2154a511a797fb7da8b533b49 bitlbee-1.1.1dev.tar.gz 461690
+RMD160 2f89fa16148ea197a8ec3d3eb4f851287fe2aeed bitlbee-1.1.1dev.tar.gz 461690
+SHA256 c4f33233ba57c507f1236642f70e1ca98879c0a31fa97fc23d6ff1e72ef0a8dc bitlbee-1.1.1dev.tar.gz 461690