readd xface use flag. fixes bug #74860.

6 files changed, 45 insertions, 39 deletions

diff --git a/mail-client/sylpheed/ChangeLog b/mail-client/sylpheed/ChangeLog
index daa43ee2e847..bf9e1d5d9b3d 100644
--- a/mail-client/sylpheed/ChangeLog
+++ b/mail-client/sylpheed/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/sylpheed
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/ChangeLog,v 1.58 2004/12/19 09:11:30 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/ChangeLog,v 1.59 2004/12/19 09:19:59 hattya Exp $
+
+  19 Dec 2004; Akinori Hattori <hattya@gentoo.org>
+  sylpheed-0.9.12-r3.ebuild, sylpheed-0.9.12-r6.ebuild,
+  sylpheed-0.9.99-r1.ebuild, sylpheed-0.9.99.ebuild,
+  sylpheed-1.0.0_rc1.ebuild:
+  readd xface use flag. fixes bug #74860.
 
   19 Dec 2004; Akinori Hattori <hattya@gentoo.org>
   -sylpheed-1.0.0_beta1.ebuild, -sylpheed-1.0.0_beta2.ebuild,
diff --git a/mail-client/sylpheed/sylpheed-0.9.12-r3.ebuild b/mail-client/sylpheed/sylpheed-0.9.12-r3.ebuild
index 09e94164cf4f..efb1b1829fad 100644
--- a/mail-client/sylpheed/sylpheed-0.9.12-r3.ebuild
+++ b/mail-client/sylpheed/sylpheed-0.9.12-r3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-0.9.12-r3.ebuild,v 1.13 2004/11/27 18:50:18 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-0.9.12-r3.ebuild,v 1.14 2004/12/19 09:19:59 hattya Exp $
 
 inherit eutils
 
-IUSE="crypt gnome imlib ipv6 ldap nls pda ssl"
+IUSE="crypt gnome imlib ipv6 ldap nls pda ssl xface"
 
 DESCRIPTION="A lightweight email client and newsreader"
 HOMEPAGE="http://sylpheed.good-day.net/"
@@ -18,13 +18,13 @@ PROVIDE="virtual/sylpheed"
 
 DEPEND="=x11-libs/gtk+-1.2*
 	!amd64? ( nls? ( >=sys-devel/gettext-0.12.1 ) )
-	>=media-libs/compface-1.4
-	ssl? ( dev-libs/openssl )
-	pda? ( app-pda/jpilot )
-	ldap? ( >=net-nds/openldap-2.0.11 )
 	crypt? ( =app-crypt/gpgme-0.3.14-r1 )
 	gnome? ( media-libs/gdk-pixbuf )
-	imlib? ( media-libs/imlib )"
+	imlib? ( media-libs/imlib )
+	ldap? ( >=net-nds/openldap-2.0.11 )
+	pda? ( app-pda/jpilot )
+	ssl? ( dev-libs/openssl )
+	xface? ( >=media-libs/compface-1.4 )"
 RDEPEND="${DEPEND}
 	app-misc/mime-types
 	x11-misc/shared-mime-info"
@@ -52,7 +52,7 @@ src_compile() {
 		`use_enable ipv6` \
 		`use_enable imlib` \
 		`use_enable gnome gdk-pixbuf` \
-		--enable-compface \
+		`use_enable xface compface` \
 		|| die
 
 	emake || die
diff --git a/mail-client/sylpheed/sylpheed-0.9.12-r6.ebuild b/mail-client/sylpheed/sylpheed-0.9.12-r6.ebuild
index 8fbe22d8fb4e..18378d10457d 100644
--- a/mail-client/sylpheed/sylpheed-0.9.12-r6.ebuild
+++ b/mail-client/sylpheed/sylpheed-0.9.12-r6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-0.9.12-r6.ebuild,v 1.4 2004/10/31 15:38:16 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-0.9.12-r6.ebuild,v 1.5 2004/12/19 09:19:59 hattya Exp $
 
 inherit eutils
 
-IUSE="crypt gnome gtk2 imlib ipv6 ldap nls pda ssl"
+IUSE="crypt gnome gtk2 imlib ipv6 ldap nls pda ssl xface"
 
 GTK2_PV="20040918"
 MY_P="${P}-gtk2-${GTK2_PV}"
@@ -27,12 +27,12 @@ DEPEND="gtk2? ( >=x11-libs/gtk+-2.2 )
 		gnome? ( media-libs/gdk-pixbuf )
 		imlib? ( media-libs/imlib )
 	)
-	>=media-libs/compface-1.4
 	!amd64? ( nls? ( >=sys-devel/gettext-0.12.1 ) )
-	ssl? ( dev-libs/openssl )
-	pda? ( app-pda/jpilot )
+	crypt? ( =app-crypt/gpgme-0.3.14-r1 )
 	ldap? ( >=net-nds/openldap-2.0.11 )
-	crypt? ( =app-crypt/gpgme-0.3.14-r1 )"
+	pda? ( app-pda/jpilot )
+	ssl? ( dev-libs/openssl )
+	xface? ( >=media-libs/compface-1.4 )"
 RDEPEND="${DEPEND}
 	app-misc/mime-types
 	x11-misc/shared-mime-info"
@@ -76,7 +76,7 @@ src_compile() {
 		`use_enable pda jpilot` \
 		`use_enable ldap` \
 		`use_enable ipv6` \
-		--enable-compface \
+		`use_enable xface compface` \
 		${myconf} \
 		|| die
 
diff --git a/mail-client/sylpheed/sylpheed-0.9.99-r1.ebuild b/mail-client/sylpheed/sylpheed-0.9.99-r1.ebuild
index 543678cc5149..4a5ed6e36832 100644
--- a/mail-client/sylpheed/sylpheed-0.9.99-r1.ebuild
+++ b/mail-client/sylpheed/sylpheed-0.9.99-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-0.9.99-r1.ebuild,v 1.2 2004/10/26 15:36:34 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-0.9.99-r1.ebuild,v 1.3 2004/12/19 09:19:59 hattya Exp $
 
 inherit eutils
 
-IUSE="crypt gnome gtk2 imlib ipv6 ldap nls pda ssl"
+IUSE="crypt gnome gtk2 imlib ipv6 ldap nls pda ssl xface"
 
 GTK2_PV="20041024"
 MY_P="${P}-gtk2-${GTK2_PV}"
@@ -26,12 +26,12 @@ DEPEND="gtk2? ( >=x11-libs/gtk+-2.2 )
 		gnome? ( media-libs/gdk-pixbuf )
 		imlib? ( media-libs/imlib )
 	)
-	>=media-libs/compface-1.4
 	!amd64? ( nls? ( >=sys-devel/gettext-0.12.1 ) )
-	ssl? ( dev-libs/openssl )
-	pda? ( app-pda/jpilot )
+	crypt? ( =app-crypt/gpgme-0.3.14-r1 )
 	ldap? ( >=net-nds/openldap-2.0.11 )
-	crypt? ( =app-crypt/gpgme-0.3.14-r1 )"
+	pda? ( app-pda/jpilot )
+	ssl? ( dev-libs/openssl )
+	xface? ( >=media-libs/compface-1.4 )"
 RDEPEND="${DEPEND}
 	app-misc/mime-types
 	x11-misc/shared-mime-info"
@@ -73,7 +73,7 @@ src_compile() {
 		`use_enable pda jpilot` \
 		`use_enable ldap` \
 		`use_enable ipv6` \
-		--enable-compface \
+		`use_enable xface compface` \
 		${myconf} \
 		|| die
 
diff --git a/mail-client/sylpheed/sylpheed-0.9.99.ebuild b/mail-client/sylpheed/sylpheed-0.9.99.ebuild
index 7a418b32fdbf..6c0b41299daf 100644
--- a/mail-client/sylpheed/sylpheed-0.9.99.ebuild
+++ b/mail-client/sylpheed/sylpheed-0.9.99.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-0.9.99.ebuild,v 1.3 2004/11/21 16:44:05 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-0.9.99.ebuild,v 1.4 2004/12/19 09:19:59 hattya Exp $
 
 inherit eutils
 
-IUSE="crypt gnome imlib ipv6 ldap nls pda ssl"
+IUSE="crypt gnome imlib ipv6 ldap nls pda ssl xface"
 
 DESCRIPTION="A lightweight email client and newsreader"
 HOMEPAGE="http://sylpheed.good-day.net/"
@@ -18,13 +18,13 @@ PROVIDE="virtual/sylpheed"
 
 DEPEND="=x11-libs/gtk+-1.2*
 	!amd64? ( nls? ( >=sys-devel/gettext-0.12.1 ) )
-	>=media-libs/compface-1.4
-	ssl? ( dev-libs/openssl )
-	pda? ( app-pda/jpilot )
-	ldap? ( >=net-nds/openldap-2.0.11 )
 	crypt? ( =app-crypt/gpgme-0.3.14-r1 )
 	gnome? ( media-libs/gdk-pixbuf )
-	imlib? ( media-libs/imlib )"
+	imlib? ( media-libs/imlib )
+	ldap? ( >=net-nds/openldap-2.0.11 )
+	pda? ( app-pda/jpilot )
+	ssl? ( dev-libs/openssl )
+	xface? ( >=media-libs/compface-1.4 )"
 RDEPEND="${DEPEND}
 	app-misc/mime-types
 	x11-misc/shared-mime-info"
@@ -52,7 +52,7 @@ src_compile() {
 		`use_enable ipv6` \
 		`use_enable imlib` \
 		`use_enable gnome gdk-pixbuf` \
-		--enable-compface \
+		`use_enable xface compface` \
 		|| die
 
 	emake || die
diff --git a/mail-client/sylpheed/sylpheed-1.0.0_rc1.ebuild b/mail-client/sylpheed/sylpheed-1.0.0_rc1.ebuild
index 85b8ae68ddcb..79e8dab42052 100644
--- a/mail-client/sylpheed/sylpheed-1.0.0_rc1.ebuild
+++ b/mail-client/sylpheed/sylpheed-1.0.0_rc1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-1.0.0_rc1.ebuild,v 1.1 2004/12/17 13:25:58 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-1.0.0_rc1.ebuild,v 1.2 2004/12/19 09:19:59 hattya Exp $
 
 inherit eutils
 
-IUSE="crypt gnome imlib ipv6 ldap nls pda ssl"
+IUSE="crypt gnome imlib ipv6 ldap nls pda ssl xface"
 
 MY_P="${P/_rc1/rc}"
 
@@ -21,13 +21,13 @@ PROVIDE="virtual/sylpheed"
 
 DEPEND="=x11-libs/gtk+-1.2*
 	!amd64? ( nls? ( >=sys-devel/gettext-0.12.1 ) )
-	>=media-libs/compface-1.4
-	ssl? ( dev-libs/openssl )
-	pda? ( app-pda/jpilot )
-	ldap? ( >=net-nds/openldap-2.0.11 )
 	crypt? ( =app-crypt/gpgme-0.3.14-r1 )
 	gnome? ( media-libs/gdk-pixbuf )
-	imlib? ( media-libs/imlib )"
+	imlib? ( media-libs/imlib )
+	ldap? ( >=net-nds/openldap-2.0.11 )
+	pda? ( app-pda/jpilot )
+	ssl? ( dev-libs/openssl )
+	xface? ( >=media-libs/compface-1.4 )"
 RDEPEND="${DEPEND}
 	app-misc/mime-types
 	x11-misc/shared-mime-info"
@@ -55,7 +55,7 @@ src_compile() {
 		`use_enable ipv6` \
 		`use_enable imlib` \
 		`use_enable gnome gdk-pixbuf` \
-		--enable-compface \
+		`use_enable xface compface` \
 		|| die
 
 	emake || die