partual gtk+ dep update / move to /usr

22 files changed, 20 insertions, 378 deletions

diff --git a/net-mail/balsa/balsa-1.2.0.ebuild b/net-mail/balsa/balsa-1.2.0-r1.ebuild
index 7ee6da774fa2..03b4b7f64fe8 100644
--- a/net-mail/balsa/balsa-1.2.0.ebuild
+++ b/net-mail/balsa/balsa-1.2.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Bruce A. Locke (blocke@shivan.org)
-# $Header: /var/cvsroot/gentoo-x86/net-mail/balsa/balsa-1.2.0.ebuild,v 1.1 2001/09/28 01:37:20 blocke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/balsa/balsa-1.2.0-r1.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
 
 A=${P}.tar.bz2
 S=${WORKDIR}/${P}
@@ -9,14 +9,14 @@ DESCRIPTION="Balsa: email client for GNOME"
 SRC_URI="http://www.theochem.kth.se/~pawsa/balsa/${A}"
 HOMEPAGE="http://www.balsa.net"
 
-DEPEND=">=dev-libs/glib-1.2.1
-	>=x11-libs/gtk+-1.2.1
-	>=media-libs/imlib-1.9.2
-	>=gnome-base/gnome-core-1.2.1
-	>=gnome-base/gnome-print-0.29
+DEPEND=">=dev-libs/glib-1.2.1-r1
+	>=x11-libs/gtk+-1.2.1-r4
+	>=media-libs/imlib-1.9.10-r1
+	>=gnome-base/gnome-core-1.4.0.4-r1
+	>=gnome-base/gnome-print-0.29-r1
 	>=app-text/pspell-0.11.2
 	>=net-libs/libesmtp-0.8.3
-	>=gnome-base/gtkhtml-0.13.0
+	>=gnome-base/gtkhtml-0.14.0-r1
 	>=dev-libs/libpcre-3.4
 	nls? ( sys-devel/gettext )
 	ssl? ( dev-libs/openssl )"
@@ -37,7 +37,7 @@ src_compile() {
      fi
 
     try libmutt/configure --prefix=/usr --host=${CHOST} --with-mailpath=/var/mail
-    try ./configure --prefix=/opt/gnome --host=${CHOST} --enable-threads --enable-gtkhtml --enable-pcre $myconf
+    try ./configure --prefix=/usr --host=${CHOST} --enable-threads --enable-gtkhtml --enable-pcre $myconf
     make || die
 }
 
diff --git a/net-mail/balsa/files/digest-balsa-1.2.0 b/net-mail/balsa/files/digest-balsa-1.2.0-r1
index 24e1f0cad03c..24e1f0cad03c 100644
--- a/net-mail/balsa/files/digest-balsa-1.2.0
+++ b/net-mail/balsa/files/digest-balsa-1.2.0-r1
diff --git a/net-mail/spruce/files/digest-spruce-0.7.6 b/net-mail/spruce/files/digest-spruce-0.7.6-r1
index 80e5815ea3f5..80e5815ea3f5 100644
--- a/net-mail/spruce/files/digest-spruce-0.7.6
+++ b/net-mail/spruce/files/digest-spruce-0.7.6-r1
diff --git a/net-mail/spruce/spruce-0.7.6.ebuild b/net-mail/spruce/spruce-0.7.6-r1.ebuild
index 34eed4e1f4d3..667b43c9c573 100644
--- a/net-mail/spruce/spruce-0.7.6.ebuild
+++ b/net-mail/spruce/spruce-0.7.6-r1.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Joe Bormolini <lordjoe@bigfoot.com>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/spruce/spruce-0.7.6.ebuild,v 1.4 2001/08/15 19:26:49 lordjoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/spruce/spruce-0.7.6-r1.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Gtk email client"
 SRC_URI="ftp://spruce.sourceforge.net/pub/spruce/devel/${P}.tar.gz"
 HOMEPAGE="http://spruce.sourceforge.net/"
 
-RDEPEND=">=x11-libs/gtk+-1.2.6
+RDEPEND=">=x11-libs/gtk+-1.2.10-r4
         gnome-base/libglade
 	ssl? ( >=dev-libs/openssl-0.9.6 )
         gpg? ( app-crypt/gnupg )
-        gnome? ( gnome-base/gnome-print )"
+        gnome? ( gnome-base/gnome-print-0.29-r1 )"
 
 DEPEND="$RDEPEND nls? ( sys-devel/gettext )"
 
@@ -34,22 +34,16 @@ src_compile() {
         myopts="$myopts --disable-pgp"
     fi
     if [ "`use gnome`" ] ; then
-        myopts="$myopts --enable-gnome --prefix=/opt/gnome"
-    else
-        myopts="$myopts --prefix=/usr/X11R6"
+        myopts="$myopts --enable-gnome"
     fi
 
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST} ${myopts}
+    try ./configure --prefix=/usr --host=${CHOST} ${myopts}
     try make
 
 }
 
 src_install () {
-    if [ "`use gnome`" ] ; then
-      try make prefix=${D}/opt/gnome install
-    else
-      try make prefix=${D}/usr/X11R6 install
-    fi
+    try make prefix=${D}/usr install
 
     dodoc ChangeLog README README.firewall INSTALL
 }
diff --git a/net-mail/sylpheed/files/digest-sylpheed-0.4.66 b/net-mail/sylpheed/files/digest-sylpheed-0.4.66
deleted file mode 100644
index ed56b276d7ec..000000000000
--- a/net-mail/sylpheed/files/digest-sylpheed-0.4.66
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dd997ca324a77d08de834cf81a66da0e sylpheed-0.4.66.tar.bz2
diff --git a/net-mail/sylpheed/files/digest-sylpheed-0.4.99 b/net-mail/sylpheed/files/digest-sylpheed-0.4.99
deleted file mode 100644
index 6e9dee86ec46..000000000000
--- a/net-mail/sylpheed/files/digest-sylpheed-0.4.99
+++ /dev/null
@@ -1 +0,0 @@
-MD5 61de2f05d100954f328c829f7eeefc02 sylpheed-0.4.99.tar.bz2
diff --git a/net-mail/sylpheed/files/digest-sylpheed-0.5.0 b/net-mail/sylpheed/files/digest-sylpheed-0.5.0
deleted file mode 100644
index 4c3c55fc2905..000000000000
--- a/net-mail/sylpheed/files/digest-sylpheed-0.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5fab4e67b8a9f440c83ec9fcd22a1d24 sylpheed-0.5.0.tar.bz2
diff --git a/net-mail/sylpheed/files/digest-sylpheed-0.5.0_pre2 b/net-mail/sylpheed/files/digest-sylpheed-0.5.0_pre2
deleted file mode 100644
index 5f58d93c8336..000000000000
--- a/net-mail/sylpheed/files/digest-sylpheed-0.5.0_pre2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 09cd1711d377ffa973627a2ee6368f23 sylpheed-0.5.0pre2.tar.bz2
diff --git a/net-mail/sylpheed/files/digest-sylpheed-0.5.0_pre3 b/net-mail/sylpheed/files/digest-sylpheed-0.5.0_pre3
deleted file mode 100644
index 85fbcbc4288d..000000000000
--- a/net-mail/sylpheed/files/digest-sylpheed-0.5.0_pre3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a3cd78aa28b497a461ece5b9ba122ec1 sylpheed-0.5.0pre3.tar.bz2
diff --git a/net-mail/sylpheed/files/digest-sylpheed-0.5.2 b/net-mail/sylpheed/files/digest-sylpheed-0.5.2
deleted file mode 100644
index ae28bca379c9..000000000000
--- a/net-mail/sylpheed/files/digest-sylpheed-0.5.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 82375b7071954ba8867975570e62b111 sylpheed-0.5.2.tar.bz2
diff --git a/net-mail/sylpheed/files/digest-sylpheed-0.6.1 b/net-mail/sylpheed/files/digest-sylpheed-0.6.1
deleted file mode 100644
index 1c1c1dac7803..000000000000
--- a/net-mail/sylpheed/files/digest-sylpheed-0.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ab62ca10d4bbb02903248139f398e2bd sylpheed-0.6.1.tar.bz2
diff --git a/net-mail/sylpheed/files/digest-sylpheed-0.6.1-r1 b/net-mail/sylpheed/files/digest-sylpheed-0.6.1-r1
deleted file mode 100644
index 1c1c1dac7803..000000000000
--- a/net-mail/sylpheed/files/digest-sylpheed-0.6.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ab62ca10d4bbb02903248139f398e2bd sylpheed-0.6.1.tar.bz2
diff --git a/net-mail/sylpheed/files/digest-sylpheed-0.6.2 b/net-mail/sylpheed/files/digest-sylpheed-0.6.2-r1
index 294a7a1a3407..294a7a1a3407 100644
--- a/net-mail/sylpheed/files/digest-sylpheed-0.6.2
+++ b/net-mail/sylpheed/files/digest-sylpheed-0.6.2-r1
diff --git a/net-mail/sylpheed/sylpheed-0.4.66.ebuild b/net-mail/sylpheed/sylpheed-0.4.66.ebuild
deleted file mode 100644
index d09eb8ec6a90..000000000000
--- a/net-mail/sylpheed/sylpheed-0.4.66.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed/sylpheed-0.4.66.ebuild,v 1.3 2001/07/29 10:56:02 hallski Exp $
-
-#P=
-A=${P}.tar.bz2
-S=${WORKDIR}/${P}
-DESCRIPTION="A lightweight email client and newsreader"
-SRC_URI="http://sylpheed.good-day.net/sylpheed/${A}"
-HOMEPAGE="http://sylpheed.good-day.net"
-
-DEPEND=">=x11-libs/gtk+-1.2
-        >=media-libs/compface-1.4
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )
-	nls? ( sys-devel/gettext )"
-
-RDEPEND=">=x11-libs/gtk+-1.2
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )"
-
-src_compile() {
-
-    local myconf
-    if [ -z "`use gnome`" ] ; then
-	myconf="--disable-gdk-pixbuf --disable-imlib"
-    fi
-    if [ -z "`use nls`" ] ; then
-	myconf="$myconf --disable-nls"
-    fi
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST} --enable-ipv6 $myconf
-    try make
-
-}
-
-src_install () {
-
-    try make prefix=${D}/usr manualdir=${D}/usr/share/doc/${PF}/html install
-    dodoc AUTHORS COPYING ChangeLog* NEWS README* TODO*
-
-}
-
diff --git a/net-mail/sylpheed/sylpheed-0.4.99.ebuild b/net-mail/sylpheed/sylpheed-0.4.99.ebuild
deleted file mode 100644
index 71e53979b794..000000000000
--- a/net-mail/sylpheed/sylpheed-0.4.99.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed/sylpheed-0.4.99.ebuild,v 1.2 2001/07/29 10:56:02 hallski Exp $
-
-#P=
-A=${P}.tar.bz2
-S=${WORKDIR}/${P}
-DESCRIPTION="A lightweight email client and newsreader"
-SRC_URI="http://sylpheed.good-day.net/sylpheed/${A}"
-HOMEPAGE="http://sylpheed.good-day.net"
-
-DEPEND=">=x11-libs/gtk+-1.2
-        >=media-libs/compface-1.4
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )
-	nls? ( sys-devel/gettext )"
-
-RDEPEND=">=x11-libs/gtk+-1.2
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )"
-
-src_compile() {
-
-    local myconf
-    if [ -z "`use gnome`" ] ; then
-	myconf="--disable-gdk-pixbuf --disable-imlib"
-    fi
-    if [ -z "`use nls`" ] ; then
-	myconf="$myconf --disable-nls"
-    fi
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST} --enable-ipv6 $myconf
-    try make
-
-}
-
-src_install () {
-
-    try make prefix=${D}/usr manualdir=${D}/usr/share/doc/${PF}/html install
-    dodoc AUTHORS COPYING ChangeLog* NEWS README* TODO*
-
-}
-
diff --git a/net-mail/sylpheed/sylpheed-0.5.0.ebuild b/net-mail/sylpheed/sylpheed-0.5.0.ebuild
deleted file mode 100644
index 975a21388f25..000000000000
--- a/net-mail/sylpheed/sylpheed-0.5.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed/sylpheed-0.5.0.ebuild,v 1.2 2001/07/29 10:56:02 hallski Exp $
-
-#P=
-A=${PN}-0.5.0.tar.bz2
-S=${WORKDIR}/${PN}-0.5.0
-DESCRIPTION="A lightweight email client and newsreader"
-SRC_URI="http://sylpheed.good-day.net/sylpheed/${A}"
-HOMEPAGE="http://sylpheed.good-day.net"
-
-DEPEND=">=x11-libs/gtk+-1.2
-        >=media-libs/compface-1.4
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )
-	nls? ( sys-devel/gettext )"
-
-RDEPEND=">=x11-libs/gtk+-1.2
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )"
-
-src_compile() {
-
-    local myconf
-    if [ -z "`use gnome`" ] ; then
-	myconf="--disable-gdk-pixbuf --disable-imlib"
-    fi
-    if [ -z "`use nls`" ] ; then
-	myconf="$myconf --disable-nls"
-    fi
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST} --enable-ipv6 $myconf
-    try make
-
-}
-
-src_install () {
-
-    try make prefix=${D}/usr manualdir=${D}/usr/share/doc/${PF}/html install
-    dodoc AUTHORS COPYING ChangeLog* NEWS README* TODO*
-
-}
-
diff --git a/net-mail/sylpheed/sylpheed-0.5.0_pre2.ebuild b/net-mail/sylpheed/sylpheed-0.5.0_pre2.ebuild
deleted file mode 100644
index 4cc0b7bbd427..000000000000
--- a/net-mail/sylpheed/sylpheed-0.5.0_pre2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed/sylpheed-0.5.0_pre2.ebuild,v 1.3 2001/08/02 20:16:48 danarmak Exp $
-
-#P=
-A=${PN}-0.5.0pre2.tar.bz2
-S=${WORKDIR}/${PN}-0.5.0pre2
-DESCRIPTION="A lightweight email client and newsreader"
-SRC_URI="http://sylpheed.good-day.net/sylpheed/v0.4/${A}"
-HOMEPAGE="http://sylpheed.good-day.net"
-
-DEPEND=">=x11-libs/gtk+-1.2
-        >=media-libs/compface-1.4
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )
-	nls? ( sys-devel/gettext )"
-
-RDEPEND=">=x11-libs/gtk+-1.2
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )"
-
-src_compile() {
-
-    local myconf
-    if [ -z "`use gnome`" ] ; then
-	myconf="--disable-gdk-pixbuf --disable-imlib"
-    fi
-    if [ -z "`use nls`" ] ; then
-	myconf="$myconf --disable-nls"
-    fi
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST} --enable-ipv6 $myconf
-    try make
-
-}
-
-src_install () {
-
-    try make prefix=${D}/usr manualdir=${D}/usr/share/doc/${PF}/html install
-    dodoc AUTHORS COPYING ChangeLog* NEWS README* TODO*
-
-}
-
diff --git a/net-mail/sylpheed/sylpheed-0.5.0_pre3.ebuild b/net-mail/sylpheed/sylpheed-0.5.0_pre3.ebuild
deleted file mode 100644
index a7390e0defd5..000000000000
--- a/net-mail/sylpheed/sylpheed-0.5.0_pre3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed/sylpheed-0.5.0_pre3.ebuild,v 1.4 2001/08/02 20:16:48 danarmak Exp $
-
-#P=
-A=${PN}-0.5.0pre3.tar.bz2
-S=${WORKDIR}/${PN}-0.5.0pre3
-DESCRIPTION="A lightweight email client and newsreader"
-SRC_URI="http://sylpheed.good-day.net/sylpheed/v0.4/${A}"
-HOMEPAGE="http://sylpheed.good-day.net"
-
-DEPEND=">=x11-libs/gtk+-1.2
-        >=media-libs/compface-1.4
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )
-	nls? ( sys-devel/gettext )"
-
-RDEPEND=">=x11-libs/gtk+-1.2
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )"
-
-src_compile() {
-
-    local myconf
-#    if [ -z "`use gnome`" ] ; then
-#	myconf="--disable-gdk-pixbuf --disable-imlib"
-#    fi
-    if [ -z "`use nls`" ] ; then
-	myconf="$myconf --disable-nls"
-    fi
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST} --enable-ipv6 $myconf
-    try make
-
-}
-
-src_install () {
-
-    try make prefix=${D}/usr manualdir=${D}/usr/share/doc/${PF}/html install
-    dodoc AUTHORS COPYING ChangeLog* NEWS README* TODO*
-
-}
-
diff --git a/net-mail/sylpheed/sylpheed-0.5.2.ebuild b/net-mail/sylpheed/sylpheed-0.5.2.ebuild
deleted file mode 100644
index f7468b3227c0..000000000000
--- a/net-mail/sylpheed/sylpheed-0.5.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed/sylpheed-0.5.2.ebuild,v 1.1 2001/08/04 15:58:54 achim Exp $
-
-#P=
-A=${P}.tar.bz2
-S=${WORKDIR}/${P}
-DESCRIPTION="A lightweight email client and newsreader"
-SRC_URI="http://sylpheed.good-day.net/sylpheed/${A}"
-HOMEPAGE="http://sylpheed.good-day.net"
-
-DEPEND=">=x11-libs/gtk+-1.2
-        >=media-libs/compface-1.4
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )
-	nls? ( sys-devel/gettext )"
-
-RDEPEND=">=x11-libs/gtk+-1.2
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )"
-
-src_compile() {
-
-    local myconf
-    if [ -z "`use gnome`" ] ; then
-	myconf="--disable-gdk-pixbuf --disable-imlib"
-    fi
-    if [ -z "`use nls`" ] ; then
-	myconf="$myconf --disable-nls"
-    fi
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST} --enable-ipv6 $myconf
-    try make
-
-}
-
-src_install () {
-
-    try make prefix=${D}/usr manualdir=${D}/usr/share/doc/${PF}/html install
-    dodoc AUTHORS COPYING ChangeLog* NEWS README* TODO*
-
-}
-
diff --git a/net-mail/sylpheed/sylpheed-0.6.1.ebuild b/net-mail/sylpheed/sylpheed-0.6.1.ebuild
deleted file mode 100644
index d681ef4e2854..000000000000
--- a/net-mail/sylpheed/sylpheed-0.6.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed/sylpheed-0.6.1.ebuild,v 1.2 2001/09/08 06:50:34 blocke Exp $
-
-A=${P}.tar.bz2
-S=${WORKDIR}/${P}
-DESCRIPTION="A lightweight email client and newsreader"
-SRC_URI="http://sylpheed.good-day.net/sylpheed/${A}"
-HOMEPAGE="http://sylpheed.good-day.net"
-
-DEPEND=">=x11-libs/gtk+-1.2
-        >=media-libs/compface-1.4
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )
-	nls? ( sys-devel/gettext )
-	ssl? ( dev-libs/openssl )"
-
-RDEPEND=">=x11-libs/gtk+-1.2
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )
-	ssl? ( dev-libs/openssl )"
-
-src_compile() {
-
-    local myconf
-    if [ -z "`use gnome`" ] ; then
-	myconf="--disable-gdk-pixbuf --disable-imlib"
-    fi
-    if [ -z "`use nls`" ] ; then
-	myconf="$myconf --disable-nls"
-    fi
-    if [ "`use ssl`" ] ; then
-	myconf="$myconf --enable-ssl"
-    fi
-
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST} --enable-ipv6 $myconf
-    try make
-
-}
-
-src_install () {
-
-    try make prefix=${D}/usr manualdir=${D}/usr/share/doc/${PF}/html install
-    dodoc AUTHORS COPYING ChangeLog* NEWS README* TODO*
-
-}
-
diff --git a/net-mail/sylpheed/sylpheed-0.6.1-r1.ebuild b/net-mail/sylpheed/sylpheed-0.6.2-r1.ebuild
index 0799fa63ee8e..f1652b949a74 100644
--- a/net-mail/sylpheed/sylpheed-0.6.1-r1.ebuild
+++ b/net-mail/sylpheed/sylpheed-0.6.2-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed/sylpheed-0.6.1-r1.ebuild,v 1.1 2001/09/12 05:12:29 blocke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed/sylpheed-0.6.2-r1.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
 
 A=${P}.tar.bz2
 S=${WORKDIR}/${P}
@@ -9,16 +9,16 @@ DESCRIPTION="A lightweight email client and newsreader"
 SRC_URI="http://sylpheed.good-day.net/sylpheed/${A}"
 HOMEPAGE="http://sylpheed.good-day.net"
 
-DEPEND=">=x11-libs/gtk+-1.2
+DEPEND=">=x11-libs/gtk+-1.2.10-r4
         >=media-libs/compface-1.4
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )
+	gnome? ( >=media-libs/gdk-pixbuf-0.11.0-r1 )
 	nls? ( sys-devel/gettext )
 	ssl? ( dev-libs/openssl )
 	gpg? ( >=app-crypt/gnupg-1.0.6 >=app-crypt/gpgme-0.2.2 )" 
 
 
-RDEPEND=">=x11-libs/gtk+-1.2
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )
+RDEPEND=">=x11-libs/gtk+-1.2.10-r4
+	gnome? ( >=media-libs/gdk-pixbuf-0.11.0-r1 )
 	ssl? ( dev-libs/openssl )
 	gpg? ( >=app-crypt/gnupg-1.0.6 >=app-crypt/gpgme-0.2.2 )"
 
@@ -38,7 +38,7 @@ src_compile() {
 		myconf="$myconf --enable-gpgme"
     fi
 
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST} --enable-ipv6 $myconf
+    try ./configure --prefix=/usr --host=${CHOST} --enable-ipv6 $myconf
     try make
 
 }
diff --git a/net-mail/sylpheed/sylpheed-0.6.2.ebuild b/net-mail/sylpheed/sylpheed-0.6.2.ebuild
deleted file mode 100644
index 8280ac4b84c2..000000000000
--- a/net-mail/sylpheed/sylpheed-0.6.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed/sylpheed-0.6.2.ebuild,v 1.1 2001/09/19 05:55:25 lordjoe Exp $
-
-A=${P}.tar.bz2
-S=${WORKDIR}/${P}
-DESCRIPTION="A lightweight email client and newsreader"
-SRC_URI="http://sylpheed.good-day.net/sylpheed/${A}"
-HOMEPAGE="http://sylpheed.good-day.net"
-
-DEPEND=">=x11-libs/gtk+-1.2
-        >=media-libs/compface-1.4
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )
-	nls? ( sys-devel/gettext )
-	ssl? ( dev-libs/openssl )
-	gpg? ( >=app-crypt/gnupg-1.0.6 >=app-crypt/gpgme-0.2.2 )" 
-
-
-RDEPEND=">=x11-libs/gtk+-1.2
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )
-	ssl? ( dev-libs/openssl )
-	gpg? ( >=app-crypt/gnupg-1.0.6 >=app-crypt/gpgme-0.2.2 )"
-
-src_compile() {
-
-    local myconf
-    if [ -z "`use gnome`" ] ; then
-		myconf="--disable-gdk-pixbuf --disable-imlib"
-    fi
-    if [ -z "`use nls`" ] ; then
-		myconf="$myconf --disable-nls"
-    fi
-    if [ "`use ssl`" ] ; then
-		myconf="$myconf --enable-ssl"
-    fi
-	if [ "`use gpg`" ] ; then
-		myconf="$myconf --enable-gpgme"
-    fi
-
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST} --enable-ipv6 $myconf
-    try make
-
-}
-
-src_install () {
-
-    try make prefix=${D}/usr manualdir=${D}/usr/share/doc/${PF}/html install
-    dodoc AUTHORS COPYING ChangeLog* NEWS README* TODO*
-
-}
-