Add jpeg and otr USE flags.

Package-Manager: portage-2.1.3.17

6 files changed, 91 insertions, 29 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/Manifest b/net-im/centerim/Manifest
index fd2d17260c3e..62ad58d170cf 100644
--- a/net-im/centerim/Manifest
+++ b/net-im/centerim/Manifest
@@ -1,25 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX centerim-imotr-config.patch 115 RMD160 7970ea1fe24b88aafb7ace0bc7e910ff996817c7 SHA1 86e001ad5c83dd2a1dbb87151f83418bb6ac6baa SHA256 30cb3b3cce143b52c508f1d48bb201f743321e2ec5dc778e90b78283e4985728
+MD5 43f4ddfb26c3e70502caeb513994e085 files/centerim-imotr-config.patch 115
+RMD160 7970ea1fe24b88aafb7ace0bc7e910ff996817c7 files/centerim-imotr-config.patch 115
+SHA256 30cb3b3cce143b52c508f1d48bb201f743321e2ec5dc778e90b78283e4985728 files/centerim-imotr-config.patch 115
 DIST centerim-20070625.tar.gz 2641435 RMD160 29f73926c7ee0fcc5dbb2f87a36c95879321055d SHA1 f862019df8c1810235c57fa2b8bd0e925552a20c SHA256 55d1ebe5b8ccd13b29437acd74bfbe15f749e64102fee671218fa2078d526af7
 DIST centerim-20071003.tar.gz 2676733 RMD160 32c06d8aa6d68b1f4bbd0ee4b7ba179612f2be95 SHA1 551fae0da5eb40c27e4c8dbd01395bad2f57a4ef SHA256 c0b4d0e3275490392771c8637802c8cf78e0cc103289568af3ded554c054e678
 DIST centerim-20071022.tar.gz 2678287 RMD160 81f6daa3b5e0de418884bb3e466953e53aa79cd4 SHA1 f92cd34de4d74b44e1c07f60c571f4a2531bca4e SHA256 1e0fa12c3e4d4361b0d4d471928f34b8b9d28453c99d919bab201b8f2c230219
-EBUILD centerim-4.22.1_p20070625.ebuild 2220 RMD160 5441309404b75fc72f5e093b136f5db7e0dfca88 SHA1 367a07728a230a018b55a6d8e5ab558f437cd3c9 SHA256 be2f08ba5319d93e06b334854b52b01a9f0c24c1042f7af890fe6af506e42f68
-MD5 b9889c472f01359104fe28426af38f9a centerim-4.22.1_p20070625.ebuild 2220
-RMD160 5441309404b75fc72f5e093b136f5db7e0dfca88 centerim-4.22.1_p20070625.ebuild 2220
-SHA256 be2f08ba5319d93e06b334854b52b01a9f0c24c1042f7af890fe6af506e42f68 centerim-4.22.1_p20070625.ebuild 2220
-EBUILD centerim-4.22.1_p20071003.ebuild 2220 RMD160 f12d085103f7aa007215748678df13890c65aae6 SHA1 c50e2b5dd203ebedb6234a3d61e9e796290c8db7 SHA256 83fc2880c46c19406c15d31931e6cc99435a6efb7c797bd075f980372cec2931
-MD5 5b4f037a2e93c44da22ac36ffbde69de centerim-4.22.1_p20071003.ebuild 2220
-RMD160 f12d085103f7aa007215748678df13890c65aae6 centerim-4.22.1_p20071003.ebuild 2220
-SHA256 83fc2880c46c19406c15d31931e6cc99435a6efb7c797bd075f980372cec2931 centerim-4.22.1_p20071003.ebuild 2220
-EBUILD centerim-4.22.1_p20071022.ebuild 2220 RMD160 03d2856f87918587286d2a418a7269a72f1fa594 SHA1 cb2f7aa0bccdd28dd35e92ea08c0c5946711263b SHA256 6fc54b3fc8d7d6cc817a9e3d65bd12f1e80e98ef6f543628a7ca9e83f4202a8e
-MD5 23dcf24d5d97be1546a9c13497ad64d9 centerim-4.22.1_p20071022.ebuild 2220
-RMD160 03d2856f87918587286d2a418a7269a72f1fa594 centerim-4.22.1_p20071022.ebuild 2220
-SHA256 6fc54b3fc8d7d6cc817a9e3d65bd12f1e80e98ef6f543628a7ca9e83f4202a8e centerim-4.22.1_p20071022.ebuild 2220
-MISC ChangeLog 993 RMD160 8d64202052746394ab3735e1abb1d93e76321576 SHA1 d7dd6928d48bc14d7cf15cef3f7e76cf50a6f0c6 SHA256 bb28baedc2abe671fd5d329273b2b635fbd4e21a23310dd7a03d42e8cfb7e2d4
-MD5 f4ff874ba70bfd5ef42554c724df4dad ChangeLog 993
-RMD160 8d64202052746394ab3735e1abb1d93e76321576 ChangeLog 993
-SHA256 bb28baedc2abe671fd5d329273b2b635fbd4e21a23310dd7a03d42e8cfb7e2d4 ChangeLog 993
+EBUILD centerim-4.22.1_p20070625.ebuild 2392 RMD160 f92a6062bbf76ca6f3c3e5f73af57d399693aff7 SHA1 524218e52c4e8548931044dba9330d03a8f13963 SHA256 7f8ba1b1140100e92de3a3d6665962171b06c1157cb4e87aca699bfd26717a72
+MD5 e1192b27f07a91bbcab62fa83488ba01 centerim-4.22.1_p20070625.ebuild 2392
+RMD160 f92a6062bbf76ca6f3c3e5f73af57d399693aff7 centerim-4.22.1_p20070625.ebuild 2392
+SHA256 7f8ba1b1140100e92de3a3d6665962171b06c1157cb4e87aca699bfd26717a72 centerim-4.22.1_p20070625.ebuild 2392
+EBUILD centerim-4.22.1_p20071003.ebuild 2539 RMD160 e504ba020ba03db053ebc67d5b34af902d7a2a18 SHA1 fc4194691ccbd14f6db274d9bcd4a288f8f1e366 SHA256 be72cf4778bcc7c73788fe38d267127e11a96630e95a1119a77748cf249bba68
+MD5 d6c62d504d158e144cd505d0cb99f8f5 centerim-4.22.1_p20071003.ebuild 2539
+RMD160 e504ba020ba03db053ebc67d5b34af902d7a2a18 centerim-4.22.1_p20071003.ebuild 2539
+SHA256 be72cf4778bcc7c73788fe38d267127e11a96630e95a1119a77748cf249bba68 centerim-4.22.1_p20071003.ebuild 2539
+EBUILD centerim-4.22.1_p20071022.ebuild 2539 RMD160 6ac668de421fb746609c5a1c1f6efc2e70031000 SHA1 056ba7623bf421f80a4718834c4888f6c8b90d00 SHA256 f28d37913d437eda7450cee7f0edd4e8485e37f84613b6ee495cdaa1ee6bdd55
+MD5 75405676cd17195b3bfde00d85ca890c centerim-4.22.1_p20071022.ebuild 2539
+RMD160 6ac668de421fb746609c5a1c1f6efc2e70031000 centerim-4.22.1_p20071022.ebuild 2539
+SHA256 f28d37913d437eda7450cee7f0edd4e8485e37f84613b6ee495cdaa1ee6bdd55 centerim-4.22.1_p20071022.ebuild 2539
+MISC ChangeLog 1216 RMD160 5fd291df035cca841c7997efbed9864e05040b2c SHA1 d8c9e37ebe8fa461be44898ee56869737dae1101 SHA256 d94054661a02f4c0901858d67177c9cc48361ca900eafa775b1376f88113bc6c
+MD5 7cb0793aa563445574e42ff98f99761d ChangeLog 1216
+RMD160 5fd291df035cca841c7997efbed9864e05040b2c ChangeLog 1216
+SHA256 d94054661a02f4c0901858d67177c9cc48361ca900eafa775b1376f88113bc6c ChangeLog 1216
 MISC metadata.xml 270 RMD160 01cecefd41441cf3f8bd37ead6ec864b154be2d7 SHA1 6762f98354ff738ecbe57163b0bbfe9c95dabf15 SHA256 2f9cdcca7aeb9551225d2854c8b3ab2048a1a6c9424b1cceb67db2bd030d4602
 MD5 59ddc43b17320bfa384ade93c548f569 metadata.xml 270
 RMD160 01cecefd41441cf3f8bd37ead6ec864b154be2d7 metadata.xml 270
@@ -36,7 +40,7 @@ SHA256 4e263d92d233464e9fabb3ae2dfabd820de815fecbbdc328ae9c55cdf3875c56 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHK3t7I1lqEGTUzyQRAhSMAKDe0BL9nVo/DSj56KaJ108O7jLKxQCfagU/
-jh+Sv/z2n5Znvrwb1Y3D49I=
-=ti4o
+iD8DBQFHLD9GI1lqEGTUzyQRAkDrAKDa3CpoRQLZN+9mp9Rg2OCzl2tOHwCghO70
+ByiC8VGw9ABuKRqkOgbcraU=
+=+YKr
 -----END PGP SIGNATURE-----
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"
+ 
+