Add jpeg and otr USE flags.

(Portage version: 2.1.3.17)

5 files changed, 68 insertions, 10 deletions

diff --git a/net-im/centerim/ChangeLog b/net-im/centerim/ChangeLog
index 4e22f161cddf..f59444124f19 100644
--- a/net-im/centerim/ChangeLog
+++ b/net-im/centerim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/centerim
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/ChangeLog,v 1.4 2007/11/02 19:33:06 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/ChangeLog,v 1.5 2007/11/03 09:28:28 swegener Exp $
+
+  03 Nov 2007; Sven Wegener <swegener@gentoo.org>
+  +files/centerim-imotr-config.patch, centerim-4.22.1_p20070625.ebuild,
+  centerim-4.22.1_p20071003.ebuild, centerim-4.22.1_p20071022.ebuild:
+  Add jpeg and otr USE flags.
 
 *centerim-4.22.1_p20071022 (02 Nov 2007)
 
diff --git a/net-im/centerim/centerim-4.22.1_p20070625.ebuild b/net-im/centerim/centerim-4.22.1_p20070625.ebuild
index 58c82066cd0e..f4cd938af46e 100644
--- a/net-im/centerim/centerim-4.22.1_p20070625.ebuild
+++ b/net-im/centerim/centerim-4.22.1_p20070625.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.1_p20070625.ebuild,v 1.3 2007/11/02 19:33:06 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.1_p20070625.ebuild,v 1.4 2007/11/03 09:28:28 swegener Exp $
 
 inherit eutils
 
 PROTOCOL_IUSE="aim gadu icq irc jabber lj msn rss yahoo"
-IUSE="${PROTOCOL_IUSE} bidi nls ssl crypt"
+IUSE="${PROTOCOL_IUSE} bidi nls ssl crypt jpeg"
 
 DESCRIPTION="CenterIM is a fork of CenterICQ - a ncurses ICQ/Yahoo!/AIM/IRC/MSN/Jabber/GaduGadu/RSS/LiveJournal Client"
 if [[ ${PV} = *_p* ]] # is this a snaphot?
@@ -22,6 +22,7 @@ KEYWORDS="~x86 ~amd64"
 DEPEND=">=sys-libs/ncurses-5.2
 	bidi? ( dev-libs/fribidi )
 	ssl? ( >=dev-libs/openssl-0.9.6g )
+	jpeg? ( media-libs/jpeg )
 	jabber? ( crypt? ( >=app-crypt/gpgme-1.0.2 ) )
 	msn? (
 		net-misc/curl
@@ -64,6 +65,13 @@ pkg_setup() {
 		eerror
 		die "net-misc/curl dependencie issue"
 	fi
+
+	if use gadu && ! use jpeg
+	then
+		ewarn
+		ewarn "You need jpeg support to be able to register Gadu-Gadu accounts!"
+		ewarn
+	fi
 }
 
 src_compile() {
@@ -71,6 +79,7 @@ src_compile() {
 		$(use_with ssl) \
 		$(use_enable aim) \
 		$(use_with bidi fribidi) \
+		$(use_with jpeg libjpeg) \
 		$(use_enable gadu gg) \
 		$(use_enable icq) \
 		$(use_enable irc) \
@@ -88,5 +97,5 @@ src_compile() {
 src_install () {
 	emake DESTDIR="${D}" install || die "emake install failed"
 
-	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING FAQ README THANKS TODO
+	dodoc AUTHORS ChangeLog FAQ README THANKS TODO
 }
diff --git a/net-im/centerim/centerim-4.22.1_p20071003.ebuild b/net-im/centerim/centerim-4.22.1_p20071003.ebuild
index 257ec29139a9..05893940d958 100644
--- a/net-im/centerim/centerim-4.22.1_p20071003.ebuild
+++ b/net-im/centerim/centerim-4.22.1_p20071003.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.1_p20071003.ebuild,v 1.2 2007/11/02 19:33:06 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.1_p20071003.ebuild,v 1.3 2007/11/03 09:28:28 swegener Exp $
 
 inherit eutils
 
 PROTOCOL_IUSE="aim gadu icq irc jabber lj msn rss yahoo"
-IUSE="${PROTOCOL_IUSE} bidi nls ssl crypt"
+IUSE="${PROTOCOL_IUSE} bidi nls ssl crypt jpeg otr"
 
 DESCRIPTION="CenterIM is a fork of CenterICQ - a ncurses ICQ/Yahoo!/AIM/IRC/MSN/Jabber/GaduGadu/RSS/LiveJournal Client"
 if [[ ${PV} = *_p* ]] # is this a snaphot?
@@ -22,6 +22,8 @@ KEYWORDS="~x86 ~amd64"
 DEPEND=">=sys-libs/ncurses-5.2
 	bidi? ( dev-libs/fribidi )
 	ssl? ( >=dev-libs/openssl-0.9.6g )
+	jpeg? ( media-libs/jpeg )
+	otr? ( net-libs/libotr )
 	jabber? ( crypt? ( >=app-crypt/gpgme-1.0.2 ) )
 	msn? (
 		net-misc/curl
@@ -64,6 +66,20 @@ pkg_setup() {
 		eerror
 		die "net-misc/curl dependencie issue"
 	fi
+
+	if use gadu && ! use jpeg
+	then
+		ewarn
+		ewarn "You need jpeg support to be able to register Gadu-Gadu accounts!"
+		ewarn
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-imotr-config.patch
 }
 
 src_compile() {
@@ -71,6 +87,8 @@ src_compile() {
 		$(use_with ssl) \
 		$(use_enable aim) \
 		$(use_with bidi fribidi) \
+		$(use_with jpeg libjpeg) \
+		$(use_with otr libotr) \
 		$(use_enable gadu gg) \
 		$(use_enable icq) \
 		$(use_enable irc) \
@@ -88,5 +106,5 @@ src_compile() {
 src_install () {
 	emake DESTDIR="${D}" install || die "emake install failed"
 
-	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING FAQ README THANKS TODO
+	dodoc AUTHORS ChangeLog FAQ README THANKS TODO
 }
diff --git a/net-im/centerim/centerim-4.22.1_p20071022.ebuild b/net-im/centerim/centerim-4.22.1_p20071022.ebuild
index 569f0e6fd58f..d70695e0d42c 100644
--- a/net-im/centerim/centerim-4.22.1_p20071022.ebuild
+++ b/net-im/centerim/centerim-4.22.1_p20071022.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.1_p20071022.ebuild,v 1.1 2007/11/02 19:33:06 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.1_p20071022.ebuild,v 1.2 2007/11/03 09:28:28 swegener Exp $
 
 inherit eutils
 
 PROTOCOL_IUSE="aim gadu icq irc jabber lj msn rss yahoo"
-IUSE="${PROTOCOL_IUSE} bidi nls ssl crypt"
+IUSE="${PROTOCOL_IUSE} bidi nls ssl crypt jpeg otr"
 
 DESCRIPTION="CenterIM is a fork of CenterICQ - a ncurses ICQ/Yahoo!/AIM/IRC/MSN/Jabber/GaduGadu/RSS/LiveJournal Client"
 if [[ ${PV} = *_p* ]] # is this a snaphot?
@@ -22,6 +22,8 @@ KEYWORDS="~x86 ~amd64"
 DEPEND=">=sys-libs/ncurses-5.2
 	bidi? ( dev-libs/fribidi )
 	ssl? ( >=dev-libs/openssl-0.9.6g )
+	jpeg? ( media-libs/jpeg )
+	otr? ( net-libs/libotr )
 	jabber? ( crypt? ( >=app-crypt/gpgme-1.0.2 ) )
 	msn? (
 		net-misc/curl
@@ -64,6 +66,20 @@ pkg_setup() {
 		eerror
 		die "net-misc/curl dependencie issue"
 	fi
+
+	if use gadu && ! use jpeg
+	then
+		ewarn
+		ewarn "You need jpeg support to be able to register Gadu-Gadu accounts!"
+		ewarn
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-imotr-config.patch
 }
 
 src_compile() {
@@ -71,6 +87,8 @@ src_compile() {
 		$(use_with ssl) \
 		$(use_enable aim) \
 		$(use_with bidi fribidi) \
+		$(use_with jpeg libjpeg) \
+		$(use_with otr libotr) \
 		$(use_enable gadu gg) \
 		$(use_enable icq) \
 		$(use_enable irc) \
@@ -88,5 +106,5 @@ src_compile() {
 src_install () {
 	emake DESTDIR="${D}" install || die "emake install failed"
 
-	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING FAQ README THANKS TODO
+	dodoc AUTHORS ChangeLog FAQ README THANKS TODO
 }
diff --git a/net-im/centerim/files/centerim-imotr-config.patch b/net-im/centerim/files/centerim-imotr-config.patch
new file mode 100644
index 000000000000..b90fbc9630fc
--- /dev/null
+++ b/net-im/centerim/files/centerim-imotr-config.patch
@@ -0,0 +1,8 @@
+--- centerim/src/imotr.cc
++++ centerim/src/imotr.cc
+@@ -1,3 +1,5 @@
++#include "config.h"
++
+ #include "imotr.h"
+ 
+