From: Tim Harder Date: Tue, 11 Oct 2011 19:33:25 +0000 (+0000) Subject: Remove old. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=686c73f11fc20cf85d74575d80ac009596c4ea4f;p=gentoo.git Remove old. Package-Manager: portage-2.2.0_alpha66/cvs/Linux x86_64 --- diff --git a/net-im/bitlbee/ChangeLog b/net-im/bitlbee/ChangeLog index 3e494df8a36f..fcb7e3308e24 100644 --- a/net-im/bitlbee/ChangeLog +++ b/net-im/bitlbee/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-im/bitlbee # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.146 2011/10/11 11:38:14 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.147 2011/10/11 19:33:24 radhermit Exp $ + + 11 Oct 2011; Tim Harder + -files/bitlbee-1.2.2-fix_tests_check_set.patch, -bitlbee-1.2.3.ebuild, + -bitlbee-1.2.3-r1.ebuild, -bitlbee-1.2.8.ebuild, -bitlbee-3.0.ebuild, + -bitlbee-3.0.1.ebuild, -files/bitlbee-3.0.1-ldflags.patch, + -files/bitlbee-3.0.1-no-ssl.patch, -bitlbee-3.0.2.ebuild, + -files/bitlbee-3.0-jabber.patch, -files/bitlbeed.confd2, + -files/bitlbeed.initd: + Remove old. 11 Oct 2011; Kacper Kowalik bitlbee-3.0.3.ebuild: ppc stable wrt #375155 diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest index 3da71f46055c..9cf505dd28c1 100644 --- a/net-im/bitlbee/Manifest +++ b/net-im/bitlbee/Manifest @@ -1,36 +1,21 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA512 -AUX bitlbee-1.2.2-fix_tests_check_set.patch 452 RMD160 22544fc0acde62566a44ca97a63f5c1a23e29d07 SHA1 5874404077a692a3c8be6fc29b3bbc2ff7324b58 SHA256 1569026c1c9e5d784e6deddbc71f9bf63a58c28fd62325294c733e897a151271 AUX bitlbee-3.0-configure.patch 393 RMD160 eb546e7271549cd56b87168ccf0ccb3ffb80742d SHA1 7762bae624acf765d3905b46b84448762694a25f SHA256 615e0cadb52abea5c133f8588b7d772c787bee725f11a986bed90226e5da4acd -AUX bitlbee-3.0-jabber.patch 481 RMD160 e3c96940bc3288ec34ade677f6a359d53753fd84 SHA1 f0cfd20158be0ae99b470db7409c0ae2438f10d1 SHA256 0d65fbe01c2a59b20f5f9f21c1bc3c9832c4d6332286f6eb8e47977327d5b6cd -AUX bitlbee-3.0.1-ldflags.patch 371 RMD160 8a80b076afdf1c0c5d399a51d4f06cb423eaf690 SHA1 d3f3a6082f6ac922c831df8707d888fce00345df SHA256 f84238b02c06270855b97dcefb1d3bde4d9eca8c2421aba5db2081f7b0287564 -AUX bitlbee-3.0.1-no-ssl.patch 160 RMD160 9a088629bba90c6c0c7cb03bdc132c7a6ad8dd86 SHA1 51f858fc1acf4e6128008efeff4a7bd5924de7bb SHA256 af2860ef67318985c325d1d5a1c5bfcf8f6d06f8d3f5b6b3afcfbd6522e50ca4 AUX bitlbee.confd 62 RMD160 f71fff4ab4fe49eebc071d693896f567291bee54 SHA1 80beb974922b2ff6cf9732a7bce1eb03cc10d870 SHA256 105afc0382fc5adc03ed644dba4e78817015a55432349f259a286ac3c1b06628 AUX bitlbee.initd 605 RMD160 183c4a8117556cb474c01ba4038b357a6716f98e SHA1 3427fa5f558b2957046ef1a6afdd4bc2bb8807e3 SHA256 037091df1746b9a477f07cdac52d99f9310055646ce0e10f859835ba105e3fb4 -AUX bitlbeed.confd2 524 RMD160 13aeb8ebb6b2885a310ba8606d1994aced3c1cb6 SHA1 7ac73948da0ffeb705482cf1d05a6fa93c267f3d SHA256 8f9e258452d62eb15990b465e1f74251e7ceb4d6b2c93a35c42a026d75e96418 -AUX bitlbeed.initd 619 RMD160 198fad260fc60a44897becca7ff442e3152e185d SHA1 105ec657f49b4be1fec46d8246eba988ea41e341 SHA256 32757768687046e379bf2f57dafcc8ce313b936431af1dcf835bef681d266a84 -DIST bitlbee-1.2.3.tar.gz 475748 RMD160 a4e994a97c3a7cc1d2bd6544a9a472d9c40ebb3f SHA1 cfa152bd4d0ff703feaeedf55dbab84b64657dc8 SHA256 0cbb30188c829dc486f8d1a4157626280f93ae2a60c9f6846fe6414c416745e2 -DIST bitlbee-1.2.8.tar.gz 513768 RMD160 151b7d9b854b1199edd8ef08a2e6a90b8dcbb545 SHA1 9c8cfea597d28604aa99c32c2a57b0087f42e6af SHA256 3a061b88776699001b774bc323e0a0ffdcd5cde6dec2dda965bc1aa2f2ee8e86 -DIST bitlbee-3.0.1.tar.gz 668353 RMD160 cc62179e807ef175db0c2351d9363f118e28f394 SHA1 f3a0651d723b71b08f0dad3b5cb2843608d5c265 SHA256 408a737b35db4b9c407e3db09b2d2e7b528836a68e2d783373254b78812bf608 -DIST bitlbee-3.0.2.tar.gz 669827 RMD160 8805a03b84e1207cf96140dc676fc513a4d0fd0a SHA1 59113b1dc440ebd775e6cf324d1cfb698fb20cfc SHA256 a00b7e325d24e05fc9fcfa68355f78cf69dac3badea697d8617083b8fc1e93d8 DIST bitlbee-3.0.3.tar.gz 676417 RMD160 4b537871eef1bb5b6839105bc7bc9f2567e5b8e1 SHA1 4140eb7aaa2c6a39fa059d19f8fbaec0d7a1ebff SHA256 82ca758937ce7bedaab49edec75f4ad45a3102ac3beaa932b64c34fbb1e3af25 -DIST bitlbee-3.0.tar.gz 662460 RMD160 7d3e9fbbf2835c014bbaf64d926aa00b3a66624d SHA1 c791d46b974187a1d4cf341418c3d1729f9b9658 SHA256 146d6ec238454c1e735bdb35e8a5f15f913f5eb14d240e8ccd87f205a3376698 -EBUILD bitlbee-1.2.3-r1.ebuild 4847 RMD160 fdf50926a2eb62b90c337b85abd29a42b877fe89 SHA1 d7bd1bf22c96fcddbe16b34ea4eee0aae618dc63 SHA256 85a532a9a0fe4727d509561288b69ba92b549f12e45d7a3b497dfce03d499bd2 -EBUILD bitlbee-1.2.3.ebuild 4787 RMD160 91eaa868a2063ce56e11506c01318ae468a6e3e3 SHA1 9a3fb734afeeb7e037f49a2c78b1d50e9275da58 SHA256 46477796499b2a8a7251673e246b2e3a8631779b698b2f1d29873eb300446227 -EBUILD bitlbee-1.2.8.ebuild 4683 RMD160 ea6ab8deac113106af787e74d59b76f7a9352f02 SHA1 74053ece23aefbe6130e4899ae6883ed96b07ca9 SHA256 2cccea87333751df463aa95a92ba8bc593a10fe8b2dde30aaf4dd830e825d861 -EBUILD bitlbee-3.0.1.ebuild 5551 RMD160 d376217342def6eacc42b8dde502623b1133eb73 SHA1 930693be32dff23a0113577236fe2e29999d6363 SHA256 e01092bfc39e06ef13bb525aac24a6ef425bd95dd6596330d4b6a0c77e5ec383 -EBUILD bitlbee-3.0.2.ebuild 4642 RMD160 6ef898f3880e028d364b600254b1159b1155dd7f SHA1 4bdf0cd9c1545b5b10206840fe7681187de5a361 SHA256 854dc79a99626830462d4c90ec64670f2ee7220afe982a5a20ad3762c5cd4c4f EBUILD bitlbee-3.0.3.ebuild 4438 RMD160 c2f7439307701c30ab6d8b60966348ed75dedba3 SHA1 be603acc6fef1d6e44fcde4d46ad6ebddd516b54 SHA256 06da79c62eb09481bad54b641152cdc10bd9d3a6c9c4ea4ea84348ceb2cdd66e -EBUILD bitlbee-3.0.ebuild 5501 RMD160 d41c34a90639140a87667b48aac30eb7c448a9ee SHA1 40a556908e372e304402c8764cf84f57e6d059b0 SHA256 9c4c59dcdf2031ffb1a0c944c28bb8904386692001062f6c0388405f1d81ede1 -MISC ChangeLog 22476 RMD160 2d1c388ff52715e9ff3463fc04f74445b304b38a SHA1 bfb09883385c9eb20a9f1f72101e4087405fbbac SHA256 412ad8c8ce45e6794e7cf12e2d29b707878843fd4741922880e448b188b71bfc +MISC ChangeLog 22889 RMD160 4496fcb788d89ad08427fe031aa8def71f2cef18 SHA1 369f5bf253cb0eab6f90d407923bb8298cc461fa SHA256 cf0184bb9ecf507ab010ff9b6f98a25e51205d578298b9edf01972c30c04b755 MISC metadata.xml 1026 RMD160 a2745a59703295794f17246716edd8610c10c776 SHA1 59fc3b090bd0b0d6c72ff1c77dcbd96f7207d608 SHA256 e6760ca4cd330d1c84b127e73144a2310f9e0215562246156ce9519112e73726 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iJwEAQEIAAYFAk6UKrIACgkQIiMqcbOVdxRjkwP+Jz+Ib8dfa5orRLaG1kLsaHvS -ABm7v7oZ462P1tAADvfgFlBfIiUJ3y+TVLEJEFMONpo8qIP3B6GR91q+sU3s6qip -pdI8y8HvgBTy7rAwDjRlM23c5+G8XsUp6q0pLD068/BOTQwQ3GClr8nWw+PPxOso -/5Xa6g+Gp3J8SVIsY7g= -=cjDg +iQEcBAEBCgAGBQJOlJoNAAoJEEqz6FtPBkyjmnMH/2U5Osinx42UlYwB7L6i6ijl +24bPUS7FpM98T/vDfpU3bmrYXB1LDEz+3b2uPGUdHYVsO5vpfoX8PR08DVyYiqfd +5AlAtsTH8C7wSBy+PSTC3Ksxe3FQLFnvo7ua5zC7bkR7C9tKO1Q9g+qy6o5Z4ju8 +0ikY0wMkc3kdE4nmAPiHvlwYibjj0O2s4YNr+wN3TVZIat8y3og6YC01YoLYEpjb +DRZvJpbVk0J1tE+RYogIrMI1re8EfLQYEp3hNccF/V7GVecCW9ZuYfA9Yq4jR9mC +9m8BOgmMW5LOTtK9fwONtYyjYXN7JYzYVX1AWI60UyOp2GOF3twHB/Z8sTvibMk= +=57h4 -----END PGP SIGNATURE----- diff --git a/net-im/bitlbee/bitlbee-1.2.3-r1.ebuild b/net-im/bitlbee/bitlbee-1.2.3-r1.ebuild deleted file mode 100644 index 068498dd2152..000000000000 --- a/net-im/bitlbee/bitlbee-1.2.3-r1.ebuild +++ /dev/null @@ -1,173 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-1.2.3-r1.ebuild,v 1.5 2011/01/23 14:55:15 armin76 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="amd64 ppc 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}/${PN}-1.2.2-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" - make install-dev 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.3.ebuild b/net-im/bitlbee/bitlbee-1.2.3.ebuild deleted file mode 100644 index f6d167bd509f..000000000000 --- a/net-im/bitlbee/bitlbee-1.2.3.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-1.2.3.ebuild,v 1.6 2011/01/23 14:55:15 armin76 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="amd64 ppc 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}/${PN}-1.2.2-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.8.ebuild b/net-im/bitlbee/bitlbee-1.2.8.ebuild deleted file mode 100644 index 2792aa21000e..000000000000 --- a/net-im/bitlbee/bitlbee-1.2.8.ebuild +++ /dev/null @@ -1,163 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-1.2.8.ebuild,v 1.2 2011/01/23 14:55:15 armin76 Exp $ - -EAPI="3" -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="~amd64 ~ppc ~x86 ~x86-fbsd" -IUSE="debug gnutls ipv6 +jabber msn nss +oscar ssl test twitter +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 twitter 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_prepare() { - 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_configure() { - # ldap hard-disabled for now - local myconf="--ldap=0" - - # setup protocol, ipv6 and debug - for flag in debug ipv6 msn jabber oscar twitter 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}/" \ - -e "/^EFLAGS/s:=:&${LDFLAGS} :" \ - Makefile.settings || die "sed failed" -} - -src_install() { - emake install install-etc install-doc install-dev 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 - - if use xinetd; then - insinto /etc/xinetd.d - newins doc/bitlbee.xinetd bitlbee - fi - - newinitd "${FILESDIR}"/bitlbee.initd bitlbee || die - newconfd "${FILESDIR}"/bitlbee.confd bitlbee || die - - keepdir /var/run/bitlbee - fowners bitlbee:bitlbee /var/run/bitlbee - - 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 - chown -R bitlbee:bitlbee "${ROOT}"/var/run/bitlbee - - elog "The utils included in bitlbee are now located in /usr/share/bitlbee" - elog - elog "NOTE: The IRSSI script is no longer provided by BitlBee." - elog - elog "The bitlbeed init script has been replaced by bitlbee." - elog "You must update your configuration." -} diff --git a/net-im/bitlbee/bitlbee-3.0.1.ebuild b/net-im/bitlbee/bitlbee-3.0.1.ebuild deleted file mode 100644 index 89141d4f139d..000000000000 --- a/net-im/bitlbee/bitlbee-3.0.1.ebuild +++ /dev/null @@ -1,195 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.0.1.ebuild,v 1.8 2011/02/25 14:49:51 tomka Exp $ - -EAPI="3" -inherit eutils toolchain-funcs confutils multilib - -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="amd64 ppc x86 ~x86-fbsd" -IUSE="debug gnutls ipv6 +jabber libevent msn nss +oscar otr +plugins purple ssl test twitter +yahoo xinetd" # ldap - Bug 195758 - -COMMON_DEPEND="purple? ( net-im/pidgin ) - libevent? ( dev-libs/libevent ) - !libevent? ( >=dev-libs/glib-2.4 ) - otr? ( net-libs/libotr ) - 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() { - if use purple ; then - elog "You have enabled libpurple support. This disables all the other" - elog " protocol modules, since everything is handled by libpurple." - elog - else - elog "Support for all IM protocols are controlled by use flags." - elog " Make sure you've enabled the flags you want." - elog - fi - - confutils_require_any jabber msn oscar twitter yahoo purple - - # 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_prepare() { - 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}"/${PN}-3.0-configure.patch - epatch "${FILESDIR}"/${PN}-3.0.1-ldflags.patch - epatch "${FILESDIR}"/${P}-no-ssl.patch -} - -src_configure() { - # ldap hard-disabled for now - local myconf="--ldap=0" - - # setup plugins, protocol, ipv6 and debug - for flag in debug ipv6 msn jabber oscar plugins purple twitter yahoo ; do - if use ${flag} ; then - myconf="${myconf} --${flag}=1" - else - myconf="${myconf} --${flag}=0" - fi - done - - # set otr - if use otr && use plugins ; then - myconf="${myconf} --otr=plugin" - else - if use otr ; then - ewarn "OTR support has been disabled automatically because it" - ewarn "requires the plugins USE flag." - fi - myconf="${myconf} --otr=0" - fi - - # setup ssl use flags - if use gnutls ; then - myconf="${myconf} --ssl=gnutls" - einfo "Using gnutls for SSL support" - elif use ssl ; then - myconf="${myconf} --ssl=openssl" - einfo "Using openssl for SSL support" - elif use nss ; then - myconf="${myconf} --ssl=nss" - einfo "Using nss for SSL support" - else - myconf="${myconf} --ssl=bogus" - einfo "You will not have any encryption support enabled." - fi - - # set event handler - if use libevent ; then - myconf="${myconf} --events=libevent" - else - myconf="${myconf} --events=glib" - 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 --plugindir=/usr/$(get_libdir)/bitlbee \ - --strip=0 ${myconf} || die "econf failed" - - sed -i \ - -e "s/CFLAGS=.*$/CFLAGS=${CFLAGS}/" \ - -e "/^EFLAGS/s:=:&${LDFLAGS} :" \ - Makefile.settings || die "sed failed" -} - -src_install() { - emake install install-etc install-doc install-dev 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 - - if use xinetd ; then - insinto /etc/xinetd.d - newins doc/bitlbee.xinetd bitlbee - fi - - newinitd "${FILESDIR}"/bitlbee.initd bitlbee || die - newconfd "${FILESDIR}"/bitlbee.confd bitlbee || die - - keepdir /var/run/bitlbee - fowners bitlbee:bitlbee /var/run/bitlbee - - dodir /usr/share/bitlbee - insinto /usr/share/bitlbee - cd utils - doins convert_purple.py bitlbee-ctl.pl -} - -pkg_postinst() { - chown -R bitlbee:bitlbee "${ROOT}"/var/lib/bitlbee - chown -R bitlbee:bitlbee "${ROOT}"/var/run/bitlbee - - elog "The utils included in bitlbee are now located in /usr/share/bitlbee" - elog - elog "NOTE: The IRSSI script is no longer provided by BitlBee." - elog - elog "The bitlbeed init script has been replaced by bitlbee." - elog "You must update your configuration." -} diff --git a/net-im/bitlbee/bitlbee-3.0.2.ebuild b/net-im/bitlbee/bitlbee-3.0.2.ebuild deleted file mode 100644 index a92d97f6c1f0..000000000000 --- a/net-im/bitlbee/bitlbee-3.0.2.ebuild +++ /dev/null @@ -1,171 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.0.2.ebuild,v 1.1 2011/03/08 10:40:42 radhermit Exp $ - -EAPI="4" -inherit eutils toolchain-funcs multilib - -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="~amd64 ~ppc ~x86 ~x86-fbsd" -IUSE="debug gnutls ipv6 +jabber libevent msn nss +oscar otr +plugins purple ssl test twitter +yahoo xinetd" # ldap - Bug 195758 - -COMMON_DEPEND="purple? ( net-im/pidgin ) - libevent? ( dev-libs/libevent ) - !libevent? ( >=dev-libs/glib-2.4 ) - otr? ( net-libs/libotr ) - gnutls? ( net-libs/gnutls ) - !gnutls? ( - nss? ( dev-libs/nss ) - !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 )" - -REQUIRED_USE="^^ ( purple || ( jabber msn oscar yahoo ) ) - msn? ( || ( gnutls nss ssl ) ) - jabber? ( !nss )" - -pkg_setup() { - if use jabber && ! use gnutls && ! use ssl ; then - einfo - 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" - einfo - fi - - enewgroup bitlbee - enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee -} - -src_prepare() { - 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}"/${PN}-3.0-configure.patch - epatch "${FILESDIR}"/${PN}-3.0.1-ldflags.patch -} - -src_configure() { - # ldap hard-disabled for now - local myconf="--ldap=0" - - # setup plugins, protocol, ipv6 and debug - for flag in debug ipv6 msn jabber oscar plugins purple twitter yahoo ; do - if use ${flag} ; then - myconf="${myconf} --${flag}=1" - else - myconf="${myconf} --${flag}=0" - fi - done - - # set otr - if use otr && use plugins ; then - myconf="${myconf} --otr=plugin" - else - if use otr ; then - ewarn "OTR support has been disabled automatically because it" - ewarn "requires the plugins USE flag." - fi - myconf="${myconf} --otr=0" - fi - - # setup ssl use flags - if use gnutls ; then - myconf="${myconf} --ssl=gnutls" - einfo "Using gnutls for SSL support" - elif use ssl ; then - myconf="${myconf} --ssl=openssl" - einfo "Using openssl for SSL support" - elif use nss ; then - myconf="${myconf} --ssl=nss" - einfo "Using nss for SSL support" - else - myconf="${myconf} --ssl=bogus" - einfo "You will not have any encryption support enabled." - fi - - # set event handler - if use libevent ; then - myconf="${myconf} --events=libevent" - else - myconf="${myconf} --events=glib" - 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 --plugindir=/usr/$(get_libdir)/bitlbee \ - --strip=0 ${myconf} || die "econf failed" - - sed -i \ - -e "s/CFLAGS=.*$/CFLAGS=${CFLAGS}/" \ - -e "/^EFLAGS/s:=:&${LDFLAGS} :" \ - Makefile.settings || die "sed failed" -} - -src_install() { - emake install install-etc install-doc install-dev DESTDIR="${D}" - - 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 - - if use xinetd ; then - insinto /etc/xinetd.d - newins doc/bitlbee.xinetd bitlbee - fi - - newinitd "${FILESDIR}"/bitlbee.initd bitlbee - newconfd "${FILESDIR}"/bitlbee.confd bitlbee - - keepdir /var/run/bitlbee - fowners bitlbee:bitlbee /var/run/bitlbee - - dodir /usr/share/bitlbee - insinto /usr/share/bitlbee - cd utils - doins convert_purple.py bitlbee-ctl.pl -} - -pkg_postinst() { - chown -R bitlbee:bitlbee "${ROOT}"/var/lib/bitlbee - chown -R bitlbee:bitlbee "${ROOT}"/var/run/bitlbee - - einfo - elog "The utils included in bitlbee are now located in /usr/share/bitlbee" - elog - elog "NOTE: The IRSSI script is no longer provided by BitlBee." - elog - elog "The bitlbeed init script has been replaced by bitlbee." - elog "You must update your configuration." - einfo -} diff --git a/net-im/bitlbee/bitlbee-3.0.ebuild b/net-im/bitlbee/bitlbee-3.0.ebuild deleted file mode 100644 index 3fef6c2c20f8..000000000000 --- a/net-im/bitlbee/bitlbee-3.0.ebuild +++ /dev/null @@ -1,194 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.0.ebuild,v 1.3 2011/01/23 14:55:15 armin76 Exp $ - -EAPI="3" -inherit eutils toolchain-funcs confutils multilib - -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="~amd64 ~ppc ~x86 ~x86-fbsd" -IUSE="debug gnutls ipv6 +jabber libevent msn nss +oscar otr +plugins purple ssl test twitter +yahoo xinetd" # ldap - Bug 195758 - -COMMON_DEPEND="purple? ( net-im/pidgin ) - libevent? ( dev-libs/libevent ) - !libevent? ( >=dev-libs/glib-2.4 ) - otr? ( net-libs/libotr ) - 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() { - if use purple ; then - elog "You have enabled libpurple support. This disables all the other" - elog " protocol modules, since everything is handled by libpurple." - elog - else - elog "Support for all IM protocols are controlled by use flags." - elog " Make sure you've enabled the flags you want." - elog - fi - - confutils_require_any jabber msn oscar twitter yahoo purple - - # 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_prepare() { - 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}-configure.patch - epatch "${FILESDIR}"/${P}-jabber.patch -} - -src_configure() { - # ldap hard-disabled for now - local myconf="--ldap=0" - - # setup plugins, protocol, ipv6 and debug - for flag in debug ipv6 msn jabber oscar plugins purple twitter yahoo ; do - if use ${flag} ; then - myconf="${myconf} --${flag}=1" - else - myconf="${myconf} --${flag}=0" - fi - done - - # set otr - if use otr && use plugins ; then - myconf="${myconf} --otr=plugin" - else - if use otr ; then - ewarn "OTR support has been disabled automatically because it" - ewarn "requires the plugins USE flag." - fi - myconf="${myconf} --otr=0" - fi - - # setup ssl use flags - if use gnutls ; then - myconf="${myconf} --ssl=gnutls" - einfo "Using gnutls for SSL support" - elif use ssl ; then - myconf="${myconf} --ssl=openssl" - einfo "Using openssl for SSL support" - elif use nss ; then - myconf="${myconf} --ssl=nss" - einfo "Using nss for SSL support" - else - myconf="${myconf} --ssl=bogus" - einfo "You will not have any encryption support enabled." - fi - - # set event handler - if use libevent ; then - myconf="${myconf} --events=libevent" - else - myconf="${myconf} --events=glib" - 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 --plugindir=/usr/$(get_libdir)/bitlbee \ - --strip=0 ${myconf} || die "econf failed" - - sed -i \ - -e "s/CFLAGS=.*$/CFLAGS=${CFLAGS}/" \ - -e "/^EFLAGS/s:=:&${LDFLAGS} :" \ - Makefile.settings || die "sed failed" -} - -src_install() { - emake install install-etc install-doc install-dev 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 - - if use xinetd ; then - insinto /etc/xinetd.d - newins doc/bitlbee.xinetd bitlbee - fi - - newinitd "${FILESDIR}"/bitlbee.initd bitlbee || die - newconfd "${FILESDIR}"/bitlbee.confd bitlbee || die - - keepdir /var/run/bitlbee - fowners bitlbee:bitlbee /var/run/bitlbee - - dodir /usr/share/bitlbee - insinto /usr/share/bitlbee - cd utils - doins convert_purple.py bitlbee-ctl.pl -} - -pkg_postinst() { - chown -R bitlbee:bitlbee "${ROOT}"/var/lib/bitlbee - chown -R bitlbee:bitlbee "${ROOT}"/var/run/bitlbee - - elog "The utils included in bitlbee are now located in /usr/share/bitlbee" - elog - elog "NOTE: The IRSSI script is no longer provided by BitlBee." - elog - elog "The bitlbeed init script has been replaced by bitlbee." - elog "You must update your configuration." -} diff --git a/net-im/bitlbee/files/bitlbee-1.2.2-fix_tests_check_set.patch b/net-im/bitlbee/files/bitlbee-1.2.2-fix_tests_check_set.patch deleted file mode 100644 index 839edd0869bf..000000000000 --- a/net-im/bitlbee/files/bitlbee-1.2.2-fix_tests_check_set.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru bitlbee-1.2.2~/tests/check_set.c bitlbee-1.2.2/tests/check_set.c ---- bitlbee-1.2.2~/tests/check_set.c 2008-08-30 17:53:39.000000000 +0200 -+++ bitlbee-1.2.2/tests/check_set.c 2008-08-30 17:53:58.000000000 +0200 -@@ -98,6 +98,7 @@ - START_TEST(test_setstr_implicit) - void *data = "data"; - set_t *s = NULL, *t; -+ t = set_add(&s, "name", "foo", NULL, data); - set_setstr(&s, "name", "bloe"); - fail_unless(set_find(&s, "name") != NULL); - END_TEST diff --git a/net-im/bitlbee/files/bitlbee-3.0-jabber.patch b/net-im/bitlbee/files/bitlbee-3.0-jabber.patch deleted file mode 100644 index fd8d0de81d3b..000000000000 --- a/net-im/bitlbee/files/bitlbee-3.0-jabber.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- protocols/jabber/jabber_util.c 2010-10-21 00:11:02 +0000 -+++ protocols/jabber/jabber_util.c 2010-10-22 23:46:44 +0000 -@@ -579,8 +579,9 @@ - ( ( s == NULL && bud->resource == NULL ) || - ( bud->resource && s && strcmp( bud->resource, s + 1 ) == 0 ) ) ) - { -+ int st = jabber_buddy_remove_bare( ic, full_jid ); - g_free( full_jid ); -- return jabber_buddy_remove_bare( ic, full_jid_ ); -+ return st; - } - else if( s == NULL || bud->resource == NULL ) - { - diff --git a/net-im/bitlbee/files/bitlbee-3.0.1-ldflags.patch b/net-im/bitlbee/files/bitlbee-3.0.1-ldflags.patch deleted file mode 100644 index a294801cd7ee..000000000000 --- a/net-im/bitlbee/files/bitlbee-3.0.1-ldflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile 2011-01-18 01:16:42.346666267 +0000 -+++ Makefile 2011-01-18 01:17:35.246666305 +0000 -@@ -120,7 +120,7 @@ $(subdirs): - - $(OTR_PI): %.so: $(SRCDIR)%.c - @echo '*' Building plugin $@ -- @$(CC) $(CFLAGS) $(OTRFLAGS) -fPIC -shared $< -o $@ -+ @$(CC) $(CFLAGS) $(OTRFLAGS) -fPIC -shared $(LDFLAGS) $< -o $@ - - $(objects): %.o: $(SRCDIR)%.c - @echo '*' Compiling $< diff --git a/net-im/bitlbee/files/bitlbee-3.0.1-no-ssl.patch b/net-im/bitlbee/files/bitlbee-3.0.1-no-ssl.patch deleted file mode 100644 index 6164ca9ed6b9..000000000000 --- a/net-im/bitlbee/files/bitlbee-3.0.1-no-ssl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bitlbee-3.0.1/lib/ssl_bogus.c.orig -+++ bitlbee-3.0.1/lib/ssl_bogus.c -@@ -69,8 +69,3 @@ - { - return 0; - } -- --int ssl_pending( void *conn ) --{ -- return 0; --} diff --git a/net-im/bitlbee/files/bitlbeed.confd2 b/net-im/bitlbee/files/bitlbeed.confd2 deleted file mode 100644 index 1e90ae007382..000000000000 --- a/net-im/bitlbee/files/bitlbeed.confd2 +++ /dev/null @@ -1,15 +0,0 @@ -# location of bitlbeed executable -# -# output from bitlbeed -h -# -# Usage: bitlbeed [-i ] [-p ] [-n ] -# 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.initd b/net-im/bitlbee/files/bitlbeed.initd deleted file mode 100644 index 7e0b143d395a..000000000000 --- a/net-im/bitlbee/files/bitlbeed.initd +++ /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.initd,v 1.1 2007/09/05 21:35:23 cedk Exp $ - -BITLBEED_EXEC=/usr/bin/bitlbeed - -depend() { - need logger net -} - -start () { - ebegin "Starting bitlbeed" - start-stop-daemon --start --startas ${BITLBEED_EXEC} \ - -c bitlbee:bitlbee --exec ${BITLBEED_EXEC} -- \ - ${BITLBEED_OPTS} /usr/sbin/bitlbee - eend $? -} - -stop() { - ebegin "Stopping bitlbeed" - start-stop-daemon --stop --signal 9 \ - --exec ${BITLBEED_EXEC} - eend $? -} -