version bump, add missing otr USE flag

Package-Manager: portage-2.1.3.19

5 files changed, 129 insertions, 17 deletions

diff --git a/net-im/mcabber/ChangeLog b/net-im/mcabber/ChangeLog
index abacc46b461c..eec1a17bbb09 100644
--- a/net-im/mcabber/ChangeLog
+++ b/net-im/mcabber/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/mcabber
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/mcabber/ChangeLog,v 1.18 2007/11/19 23:07:59 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/mcabber/ChangeLog,v 1.19 2007/11/20 00:41:02 wschlich Exp $
+
+*mcabber-0.9.5 (19 Nov 2007)
+
+  19 Nov 2007; Wolfram Schlich <wschlich@gentoo.org> mcabber-0.9.4.ebuild,
+  +mcabber-0.9.5.ebuild:
+  version bump, add missing otr USE flag for 0.9.4 and new 0.9.5
 
 *mcabber-0.9.4 (19 Nov 2007)
 
diff --git a/net-im/mcabber/Manifest b/net-im/mcabber/Manifest
index aaa1cc0a18ee..0d60bcc32728 100644
--- a/net-im/mcabber/Manifest
+++ b/net-im/mcabber/Manifest
@@ -7,6 +7,7 @@ DIST mcabber-0.9.1.tar.bz2 420985 RMD160 6f9251f9ece93399654665af7641f06eadfcd27
 DIST mcabber-0.9.2.tar.bz2 435686 RMD160 0953318e2e83ae442ee36bff74e4ab56a6e9fc0c SHA1 2383c1e2f923fa017ff98c985bec27567893d619 SHA256 9333d7b4764ffd8267bf3e26cc8c28772bee53a2edf389ccf4f438ea970cdfc7
 DIST mcabber-0.9.3.tar.bz2 437100 RMD160 5bc5d28442fe287ed2591154b7183fa0020b7f7a SHA1 a829eb4d3d39717e761ecfa7179673f8861f1548 SHA256 ee5bc81da96b958aee7b277bb6fdeeace1a8fff5e41ec61053c63cdb63016406
 DIST mcabber-0.9.4.tar.bz2 484395 RMD160 ee1c7ffdf45e1278304233a0f0de835309f08923 SHA1 3a8ab9326c288c5f471255d4e165561e3b937b9c SHA256 1a8a0bc4a7b89b4a6b351295750a541f1bda4facb1c48726477cd309c29619ef
+DIST mcabber-0.9.5.tar.bz2 487465 RMD160 2716471068356512fc08ecf1d5de44fd392810cd SHA1 df576901551100f07439c86f535d8c06112e336d SHA256 cad99f5d1ac132aa4aed4e335a444ff751de840438fafd42544ebd208efe2b7c
 EBUILD mcabber-0.7.4.ebuild 1231 RMD160 26a782287e258b4dda17f3bfafe88d5e67436540 SHA1 4f7c050a6de079640c4597c78ad51c69fd20b86d SHA256 fa68c647b5a0f5121d4861d149dd2deb2eedd107604a13678caa68031514a118
 MD5 9b748799975d5c1cc97410017056b144 mcabber-0.7.4.ebuild 1231
 RMD160 26a782287e258b4dda17f3bfafe88d5e67436540 mcabber-0.7.4.ebuild 1231
@@ -39,14 +40,18 @@ EBUILD mcabber-0.9.3.ebuild 2705 RMD160 cb6eff55a8a126f466ff8ff8e671927dd898b14d
 MD5 2de04bc67af788193959e8be62fbb469 mcabber-0.9.3.ebuild 2705
 RMD160 cb6eff55a8a126f466ff8ff8e671927dd898b14d mcabber-0.9.3.ebuild 2705
 SHA256 4d9444f17c6ffb9508c6bd7a1a6e66578ebee20525e5ad5becaa14a9c7314151 mcabber-0.9.3.ebuild 2705
-EBUILD mcabber-0.9.4.ebuild 2705 RMD160 9d75e4cf141d84c589ff54edb5c9cf1df54d74ad SHA1 80ac69325c342b63f7df0a8e299c11b69ea39186 SHA256 78e2f19fc1c9a34626ba736b2abe66d5be25a1111c886c84215663d07a02bcc5
-MD5 26b4357ba44b10dc0126cca13c355fff mcabber-0.9.4.ebuild 2705
-RMD160 9d75e4cf141d84c589ff54edb5c9cf1df54d74ad mcabber-0.9.4.ebuild 2705
-SHA256 78e2f19fc1c9a34626ba736b2abe66d5be25a1111c886c84215663d07a02bcc5 mcabber-0.9.4.ebuild 2705
-MISC ChangeLog 2667 RMD160 5addca29c0f9a9ec2e4e61ff4b98e905a492ee2f SHA1 d38e10b713f4f6da326ce88a2882ebbf4cc574a6 SHA256 fda5492221807dada1cc37b3f0dc937fd2523b71e818ebd78b2973c64915a029
-MD5 9738fc6ab2f8607d143b8da54372d0d7 ChangeLog 2667
-RMD160 5addca29c0f9a9ec2e4e61ff4b98e905a492ee2f ChangeLog 2667
-SHA256 fda5492221807dada1cc37b3f0dc937fd2523b71e818ebd78b2973c64915a029 ChangeLog 2667
+EBUILD mcabber-0.9.4.ebuild 2857 RMD160 067282014de441385d442888ea3a25c589023b51 SHA1 1389a2dd966ac4619b78caffb8f3a9db8b424014 SHA256 b3c4c9c1cc93af395619510a8b36fa13a4fd2687d21a86ccd9958d046c585c88
+MD5 85151a4d6459cc1160633c7f7ce62a86 mcabber-0.9.4.ebuild 2857
+RMD160 067282014de441385d442888ea3a25c589023b51 mcabber-0.9.4.ebuild 2857
+SHA256 b3c4c9c1cc93af395619510a8b36fa13a4fd2687d21a86ccd9958d046c585c88 mcabber-0.9.4.ebuild 2857
+EBUILD mcabber-0.9.5.ebuild 2855 RMD160 de718453772c5c011affa0094d8a895a81e3bb32 SHA1 0fad08452954d5e7f1df77b44db7ff50b26fe54d SHA256 b6b613a42b1f5cf9a7a9b4afbdae1acb1ac9bfcb21b5e7bf89c72db1c8752507
+MD5 dcacdef19696f85777580cf7640173d1 mcabber-0.9.5.ebuild 2855
+RMD160 de718453772c5c011affa0094d8a895a81e3bb32 mcabber-0.9.5.ebuild 2855
+SHA256 b6b613a42b1f5cf9a7a9b4afbdae1acb1ac9bfcb21b5e7bf89c72db1c8752507 mcabber-0.9.5.ebuild 2855
+MISC ChangeLog 2863 RMD160 7918390db63934db2e445f2c6123f4fe0e0f6bb3 SHA1 f323ef9a98411da02bad64f2e4289beefc35a3ed SHA256 3d843ffc40fbec51ad65cdbace57fb49ce2b75892cc8a0705faef5a9c826e333
+MD5 74df953a470ea45b266d9fd11f5f7c28 ChangeLog 2863
+RMD160 7918390db63934db2e445f2c6123f4fe0e0f6bb3 ChangeLog 2863
+SHA256 3d843ffc40fbec51ad65cdbace57fb49ce2b75892cc8a0705faef5a9c826e333 ChangeLog 2863
 MISC metadata.xml 637 RMD160 95c3682bfd2011aa0153bd94bc95861ed8bc5709 SHA1 aa53f4c4a0f9331fc5bb2c71499db1a0c9ba2e63 SHA256 523238b5dcbb7e8f9cfdb0aeb37934a6f7cde3933ed4bc71bf22451613b3bf94
 MD5 935a70f38427f06671ef7d865454b1db metadata.xml 637
 RMD160 95c3682bfd2011aa0153bd94bc95861ed8bc5709 metadata.xml 637
@@ -78,3 +83,6 @@ SHA256 4b360231167251fec472cad8ccae3d87c812d645dc70f3a017de3e4c5851f2e7 files/di
 MD5 50a2f779505d1af2c7542a70e02d8a85 files/digest-mcabber-0.9.4 244
 RMD160 65ffe75cc81c1371f4c5e540526bfb6b4e8204ed files/digest-mcabber-0.9.4 244
 SHA256 634ddaea94939ccb83ab8997db00ab45093c0e7db7bf2c57597a611e5185c01a files/digest-mcabber-0.9.4 244
+MD5 bc76772efc834e4d7150dc88c2095091 files/digest-mcabber-0.9.5 244
+RMD160 103b25c9372bf7a0e1e51093b01ce4bb01836fe4 files/digest-mcabber-0.9.5 244
+SHA256 379d9cb78accaeff475c23216be1c71a8e5962593f7268b476de46caf664d177 files/digest-mcabber-0.9.5 244
diff --git a/net-im/mcabber/files/digest-mcabber-0.9.5 b/net-im/mcabber/files/digest-mcabber-0.9.5
new file mode 100644
index 000000000000..aa1b07ebc1e7
--- /dev/null
+++ b/net-im/mcabber/files/digest-mcabber-0.9.5
@@ -0,0 +1,3 @@
+MD5 69a002038def978689d95b54dc7be9f4 mcabber-0.9.5.tar.bz2 487465
+RMD160 2716471068356512fc08ecf1d5de44fd392810cd mcabber-0.9.5.tar.bz2 487465
+SHA256 cad99f5d1ac132aa4aed4e335a444ff751de840438fafd42544ebd208efe2b7c mcabber-0.9.5.tar.bz2 487465
diff --git a/net-im/mcabber/mcabber-0.9.4.ebuild b/net-im/mcabber/mcabber-0.9.4.ebuild
index b8c0a3c42004..85e50a473a78 100644
--- a/net-im/mcabber/mcabber-0.9.4.ebuild
+++ b/net-im/mcabber/mcabber-0.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/mcabber/mcabber-0.9.4.ebuild,v 1.1 2007/11/19 23:07:59 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/mcabber/mcabber-0.9.4.ebuild,v 1.2 2007/11/20 00:41:02 wschlich Exp $
 
 DESCRIPTION="A small Jabber console client with various features, like MUC, SSL, PGP"
 HOMEPAGE="http://www.lilotux.net/~mikael/mcabber/"
@@ -10,7 +10,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="crypt spell ssl"
+IUSE="crypt otr spell ssl"
 
 LANGS="de en fr nl pl uk ru"
 # localized help versions are installed only, when LINGUAS var is set
@@ -20,6 +20,7 @@ done;
 
 DEPEND="ssl? ( >=dev-libs/openssl-0.9.7-r1 )
 	crypt? ( >=app-crypt/gpgme-1.0.0 )
+	otr? ( net-libs/libotr )
 	spell? ( app-text/aspell )
 	>=dev-libs/glib-2.0.0
 	sys-libs/ncurses"
@@ -27,6 +28,7 @@ DEPEND="ssl? ( >=dev-libs/openssl-0.9.7-r1 )
 src_compile() {
 	econf \
 		$(use_enable crypt gpgme) \
+		$(use_enable otr) \
 		$(use_enable spell aspell) \
 		$(use_with ssl) \
 		|| die "econf failed"
@@ -35,10 +37,10 @@ src_compile() {
 }
 
 src_install() {
-	make install DESTDIR=${D} || die "make install failed"
+	make install DESTDIR="${D}" || die "make install failed"
 	# clean unneeded language documentation
 	for i in ${LANGS}; do
-		! use linguas_${i} && rm -rf ${D}/usr/share/${PN}/help/${i}
+		! use linguas_${i} && rm -rf "${D}"/usr/share/${PN}/help/${i}
 	done
 
 	dodoc AUTHORS ChangeLog NEWS README TODO mcabberrc.example
@@ -46,15 +48,15 @@ src_install() {
 
 	# contrib themes
 	insinto /usr/share/${PN}/themes
-	doins ${S}/contrib/themes/*
+	doins "${S}"/contrib/themes/*
 
 	# contrib generic scripts
 	exeinto /usr/share/${PN}/scripts
-	doexe ${S}/contrib/*.{pl,py,rb}
+	doexe "${S}"/contrib/*.{pl,py,rb}
 
 	# contrib event scripts
 	exeinto /usr/share/${PN}/scripts/events
-	doexe ${S}/contrib/events/*
+	doexe "${S}"/contrib/events/*
 }
 
 pkg_postinst() {
@@ -72,10 +74,12 @@ pkg_postinst() {
 	elog
 	elog "As of MCabber version 0.8.2, there is also a wizard script"
 	elog "with which you can create all necessary configuration options."
-	elog "To use it, simply execute the following command:"
+	elog "To use it, simply execute the following command (please note that you need"
+	elog "to have dev-lang/ruby installed for it to work!):"
 	elog
 	elog "  ${ROOT}usr/share/${PN}/scripts/mcwizz.rb"
 	elog
+	elog
 	elog "See the CONFIGURATION FILE and FILES sections of the mcabber"
 	elog "manual page (section 1) for more information."
 	elog
diff --git a/net-im/mcabber/mcabber-0.9.5.ebuild b/net-im/mcabber/mcabber-0.9.5.ebuild
new file mode 100644
index 000000000000..57e73416ce1a
--- /dev/null
+++ b/net-im/mcabber/mcabber-0.9.5.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/mcabber/mcabber-0.9.5.ebuild,v 1.1 2007/11/20 00:41:02 wschlich Exp $
+
+DESCRIPTION="A small Jabber console client with various features, like MUC, SSL, PGP"
+HOMEPAGE="http://www.lilotux.net/~mikael/mcabber/"
+SRC_URI="http://www.lilotux.net/~mikael/${PN}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="crypt otr spell ssl"
+
+LANGS="de en fr nl pl uk ru"
+# localized help versions are installed only, when LINGUAS var is set
+for i in ${LANGS}; do
+	IUSE="${IUSE} linguas_${i}"
+done;
+
+DEPEND="ssl? ( >=dev-libs/openssl-0.9.7-r1 )
+	crypt? ( >=app-crypt/gpgme-1.0.0 )
+	otr? ( net-libs/libotr )
+	spell? ( app-text/aspell )
+	>=dev-libs/glib-2.0.0
+	sys-libs/ncurses"
+
+src_compile() {
+	econf \
+		$(use_enable crypt gpgme) \
+		$(use_enable otr) \
+		$(use_enable spell aspell) \
+		$(use_with ssl) \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make install DESTDIR=${D} || die "make install failed"
+	# clean unneeded language documentation
+	for i in ${LANGS}; do
+		! use linguas_${i} && rm -rf "${D}"/usr/share/${PN}/help/${i}
+	done
+
+	dodoc AUTHORS ChangeLog NEWS README TODO mcabberrc.example
+	dodoc doc/README_PGP.txt
+
+	# contrib themes
+	insinto /usr/share/${PN}/themes
+	doins "${S}"/contrib/themes/*
+
+	# contrib generic scripts
+	exeinto /usr/share/${PN}/scripts
+	doexe "${S}"/contrib/*.{pl,py,rb}
+
+	# contrib event scripts
+	exeinto /usr/share/${PN}/scripts/events
+	doexe "${S}"/contrib/events/*
+}
+
+pkg_postinst() {
+	elog
+	elog "MCabber requires you to create a subdirectory .mcabber in your home"
+	elog "directory and to place a configuration file there."
+	elog "An example mcabberrc was installed as part of the documentation."
+	elog "To create a new mcabberrc based on the example mcabberrc, execute the"
+	elog "following commands:"
+	elog
+	elog "  mkdir -p ~/.mcabber"
+	elog "  bzcat ${ROOT}usr/share/doc/${PF}/mcabberrc.example.bz2 >~/.mcabber/mcabberrc"
+	elog
+	elog "Then edit ~/.mcabber/mcabberrc with your favorite editor."
+	elog
+	elog "As of MCabber version 0.8.2, there is also a wizard script"
+	elog "with which you can create all necessary configuration options."
+	elog "To use it, simply execute the following command (please note that you need"
+	elog "to have dev-lang/ruby installed for it to work!):"
+	elog
+	elog "  ${ROOT}usr/share/${PN}/scripts/mcwizz.rb"
+	elog
+	elog
+	elog "See the CONFIGURATION FILE and FILES sections of the mcabber"
+	elog "manual page (section 1) for more information."
+	elog
+	elog "From version 0.9.0 on, MCabber supports PGP encryption of messages."
+	elog "See README_PGP.txt for details."
+	elog
+	elog "Check out ${ROOT}usr/share/${PN} for contributed themes and event scripts."
+	elog
+}