version bump, removed some old versions

Package-Manager: portage-2.2_rc60/cvs/Linux i686

5 files changed, 27 insertions, 211 deletions

diff --git a/net-im/mcabber/ChangeLog b/net-im/mcabber/ChangeLog
index 28714e630203..4c5093500a71 100644
--- a/net-im/mcabber/ChangeLog
+++ b/net-im/mcabber/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/mcabber
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/mcabber/ChangeLog,v 1.48 2009/11/05 07:47:04 wschlich Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/mcabber/ChangeLog,v 1.49 2010/05/06 11:31:20 wschlich Exp $
+
+*mcabber-0.10.0 (06 May 2010)
+
+  06 May 2010; Wolfram Schlich <wschlich@gentoo.org> -mcabber-0.9.6.ebuild,
+  -mcabber-0.9.9.ebuild, -mcabber-0.9.9-r1.ebuild, +mcabber-0.10.0.ebuild:
+  version bump, removed some old versions
 
 *mcabber-0.9.10 (04 Nov 2009)
 
diff --git a/net-im/mcabber/Manifest b/net-im/mcabber/Manifest
index 5418ab4902bc..1d388511e6f6 100644
--- a/net-im/mcabber/Manifest
+++ b/net-im/mcabber/Manifest
@@ -1,9 +1,6 @@
+DIST mcabber-0.10.0.tar.bz2 552111 RMD160 3c25f13bea884e929c00d696df9acdbf8811fa84 SHA1 8abf98b0577db3bbc87a1568b8f72738cb9384b7 SHA256 ef1bb95238a32f841c6e7032550b40197643843b6e459f44ad53c558f5d75c03
 DIST mcabber-0.9.10.tar.bz2 579621 RMD160 656818b304b9088097ad2a0fe485f38cd0e704fc SHA1 6ff8222ed8956e078a3c3d519013a125e715e499 SHA256 431e47ba3095c1cc6c11931bab9034c42ba0911dfadcc137ba765803e4460cb5
-DIST mcabber-0.9.6.tar.bz2 480333 RMD160 ac349286dbc2a9129e3601316532eb7ab1ba9e7b SHA1 7aa87943cce3e7c2cd42fe74960b53a0cd240331 SHA256 354573d751611b700cc961262df0991d37b5a6c8a058d1cd6916d253136543d3
-DIST mcabber-0.9.9.tar.bz2 492360 RMD160 6babdbfff6c2b5ab4a1336de412dc726b7ca0e4a SHA1 334f483f554098af3768d5746bc0395bfe663c91 SHA256 2a231c9241211d33745f110f35cfa6bdb051b32791461b9579794b6623863bb1
+EBUILD mcabber-0.10.0.ebuild 2714 RMD160 fc48194fd4e549d88e62b729a3f48968952c90c4 SHA1 23933a59ab6b20379008431b383e37cd8671e07d SHA256 3797d0675940dfc25134b7275e96d88b03f99ff11ec6ba86f041c4c27408d649
 EBUILD mcabber-0.9.10.ebuild 2956 RMD160 10decc579570a57976463ed692cd46bc7bc65941 SHA1 2a7c1b48e821be91089016ae7f8209e8b3ab797b SHA256 a0c23a91b4597ae5aa0e98fa9d29068ed628d8d4f98d7bb3744c43d39ddc7567
-EBUILD mcabber-0.9.6.ebuild 2900 RMD160 e8d305705ed4ec85755c13dc36688b4bd86ea747 SHA1 7ebc36b772a4d5068e2d182f9ff1645bafc20a13 SHA256 e1c22c3accbab777e0174b4ae4f82d80f5b02f503d25676395fe1781ec5f74e8
-EBUILD mcabber-0.9.9-r1.ebuild 2952 RMD160 a0f69a73276e8c686600fa8fb531c106e4945694 SHA1 f15208944f02f3072c3bf1fcf3c521b1fb469f5a SHA256 fc7c8c421bb3eaefd20c5d10ca3c2619ddf3626666f3e9c58a9359940c703f1c
-EBUILD mcabber-0.9.9.ebuild 2903 RMD160 785b55fe70b5b2c582018fc3bd626f7e9b05f27c SHA1 a1a23bef9369e9f73998ada1760dc35d4daf8cc2 SHA256 2989b10cdbd00c9159e98ef1ecef01967640a0ac1e6991f11d62bd230b8e4b81
-MISC ChangeLog 6368 RMD160 1c78eea208ebfa069b7465af2864752b34e07cbb SHA1 2eba3a840abe6a33a34c5465481e1451c1cf0450 SHA256 67db6fb832dab01cbcedf02959d087b3f3202f722907bd7b2b17a0cc0d466e02
+MISC ChangeLog 6593 RMD160 38ebcaa99e398dd682f2977a032c3d9c9a092f79 SHA1 8adc79756b88cc683c382567e0ae7c8751721261 SHA256 820e6fd48f1ea650e1fec5948d01ecbad39e69c1f8f143c872a6d99e7ee85b91
 MISC metadata.xml 665 RMD160 f504295bc63c5fdc0de58d75c4688088b25a1774 SHA1 f81c1831ed3d53f1665a8cdfff81be228517c2e6 SHA256 c33a2ae1ff921034609b3744b287c5fb3345ee6f8156af0b09900a1e4e0a4d0f
diff --git a/net-im/mcabber/mcabber-0.9.9-r1.ebuild b/net-im/mcabber/mcabber-0.10.0.ebuild
index a8ea975e5d69..8f13bb17ce55 100644
--- a/net-im/mcabber/mcabber-0.9.9-r1.ebuild
+++ b/net-im/mcabber/mcabber-0.10.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/mcabber/mcabber-0.9.9-r1.ebuild,v 1.7 2009/09/30 17:32:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/mcabber/mcabber-0.10.0.ebuild,v 1.1 2010/05/06 11:31:20 wschlich Exp $
+
+EAPI="2"
 
 inherit flag-o-matic
 
@@ -10,7 +12,7 @@ SRC_URI="http://mcabber.com/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="crypt otr spell ssl"
 
@@ -20,8 +22,9 @@ for i in ${LANGS}; do
 	IUSE="${IUSE} linguas_${i}"
 done;
 
-RDEPEND="ssl? ( >=dev-libs/openssl-0.9.7-r1 )
+RDEPEND="ssl? ( net-libs/loudmouth[ssl] )
 	crypt? ( >=app-crypt/gpgme-1.0.0 )
+	>=net-libs/loudmouth-1.4.3
 	otr? ( >=net-libs/libotr-3.1.0 )
 	spell? ( app-text/aspell )
 	>=dev-libs/glib-2.0.0
@@ -30,15 +33,21 @@ RDEPEND="ssl? ( >=dev-libs/openssl-0.9.7-r1 )
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-src_compile() {
+src_prepare() {
 	use crypt && append-flags -D_FILE_OFFSET_BITS=64 # bug #277888
+	append-flags -fno-strict-aliasing
+}
+
+src_configure() {
 	econf \
+		--enable-modules \
 		$(use_enable crypt gpgme) \
 		$(use_enable otr) \
 		$(use_enable spell aspell) \
-		$(use_with ssl) \
 		|| die "econf failed"
+}
 
+src_compile() {
 	emake || die "emake failed"
 }
 
@@ -58,7 +67,7 @@ src_install() {
 
 	# contrib generic scripts
 	exeinto /usr/share/${PN}/scripts
-	doexe "${S}"/contrib/*.{pl,py,rb}
+	doexe "${S}"/contrib/*.{pl,py}
 
 	# contrib event scripts
 	exeinto /usr/share/${PN}/scripts/events
@@ -78,14 +87,6 @@ pkg_postinst() {
 	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
diff --git a/net-im/mcabber/mcabber-0.9.6.ebuild b/net-im/mcabber/mcabber-0.9.6.ebuild
deleted file mode 100644
index cef5a83bbf79..000000000000
--- a/net-im/mcabber/mcabber-0.9.6.ebuild
+++ /dev/null
@@ -1,94 +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/mcabber/mcabber-0.9.6.ebuild,v 1.7 2008/05/17 15:53:16 tester 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;
-
-RDEPEND="ssl? ( >=dev-libs/openssl-0.9.7-r1 )
-	crypt? ( >=app-crypt/gpgme-1.0.0 )
-	otr? ( >=net-libs/libotr-3.1.0 )
-	spell? ( app-text/aspell )
-	>=dev-libs/glib-2.0.0
-	sys-libs/ncurses"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-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
-}
diff --git a/net-im/mcabber/mcabber-0.9.9.ebuild b/net-im/mcabber/mcabber-0.9.9.ebuild
deleted file mode 100644
index 9f39d1bb29c8..000000000000
--- a/net-im/mcabber/mcabber-0.9.9.ebuild
+++ /dev/null
@@ -1,94 +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/mcabber/mcabber-0.9.9.ebuild,v 1.2 2008/12/17 21:06:41 maekke 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;
-
-RDEPEND="ssl? ( >=dev-libs/openssl-0.9.7-r1 )
-	crypt? ( >=app-crypt/gpgme-1.0.0 )
-	otr? ( >=net-libs/libotr-3.1.0 )
-	spell? ( app-text/aspell )
-	>=dev-libs/glib-2.0.0
-	sys-libs/ncurses"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-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
-}