Fix deps.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 13 insertions, 126 deletions

diff --git a/net-misc/twitux/Manifest b/net-misc/twitux/Manifest
index 5e810c7a344a..3da74e128e71 100644
--- a/net-misc/twitux/Manifest
+++ b/net-misc/twitux/Manifest
@@ -1,9 +1,4 @@
-DIST twitux-0.61.tar.bz2 347782 RMD160 a8631728548dcf1089ced392e2b7af756cd426ec SHA1 6d7b5054d3f9904931dbfbfe964ea6b1314d91c7 SHA256 a2c740042635f778a61e1ebdf0f62ab43bbaa4d1b5c6bd7975f7c60d8329c05b
-DIST twitux-0.62.tar.bz2 369539 RMD160 29a66998ef375bad9bf2dbfba66bfdef9f428125 SHA1 5d4fe9db47ba9236ef5f1746ef3be80f2effc2ec SHA256 09fe27c5643cb9b2ba537c8e07aceda53a09e607243b94c8e5b6a78d40b2a1ff
 DIST twitux-0.69.tar.bz2 474366 RMD160 68ef7e357fa69618f80a1356f116aa3ad7cb08ea SHA1 8693115c0016aec33c859fbaaf2557e6c3102160 SHA256 374f429b248f2aaa42d55676a6524644df29893981c7481442663ae63ba97cf0
-EBUILD twitux-0.61-r1.ebuild 949 RMD160 da306546e7ba0977450e20d82b72cf67bb4e4fe8 SHA1 e6a72766ad622e047cbf4adc42c6ebe44378299f SHA256 78227c99269a537684506463cf9535e00992bfd3bdd02bf1cc4aaf0537369e3c
-EBUILD twitux-0.61.ebuild 932 RMD160 b67c8deb54db688be19098558d0831dc4b18eaba SHA1 b3bd5ebd6353b3b369fbe65ae2d10a3f6113d216 SHA256 1b7a20bf3cb1c106cfb6bc5de2dd865d2a9e0eda586009b6e70e794388ab6573
-EBUILD twitux-0.62.ebuild 923 RMD160 720ba91eac8efe9675a96745dfe41b0e053223d1 SHA1 3f45c1a4e560eaff6638c3ede3db9afc091f66d2 SHA256 ee098302568178d3977f59ed6e00bccae0fa115c0bfbb61504c2c05b7d940992
-EBUILD twitux-0.69.ebuild 923 RMD160 7baf1ce31b1df3a97fed0af568fb0b8f5f3c6d4e SHA1 6565d5d66afa12d0cf16522bda4c54f31a1dfc5b SHA256 8cf9c0d06e3095a40d6baa15d10e444fd393a95905ce4087578e8f2725efdd6c
+EBUILD twitux-0.69.ebuild 965 RMD160 9b8b1581a74aaa1275019f2ea193e897e81bd74d SHA1 cba8706dd92116af7768458ca2a2d29609fadad6 SHA256 1b2d1f742e4061b656797b40de1145f335925393155027150cb9861b55a37843
 MISC ChangeLog 898 RMD160 ab1167107302d207f453c1ea58aa8260c8442bb0 SHA1 986fd4f5c518cd56353db66d8900feb20ab2424c SHA256 970180c4698c47cd503a971a6ed868e9f29a6d1b0ab878ab684aa201458d5d08
 MISC metadata.xml 340 RMD160 201cfaabb47663b9b64f119874691fdcec083e53 SHA1 8fba4db4eb5e2f0a4160fc022e7808d84655da1b SHA256 c6875c40aa677298740478d76b251f7a866b5e1e6749c0038d503cbf274f6e47
diff --git a/net-misc/twitux/twitux-0.61-r1.ebuild b/net-misc/twitux/twitux-0.61-r1.ebuild
deleted file mode 100644
index b8b1526d0c8a..000000000000
--- a/net-misc/twitux/twitux-0.61-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/twitux/twitux-0.61-r1.ebuild,v 1.2 2008/05/20 16:28:27 gregkh Exp $
-
-EAPI=1
-
-DESCRIPTION="A Twitter client for the Gnome desktop"
-HOMEPAGE="http://live.gnome.org/DanielMorales/Twitux"
-SRC_URI="mirror://sourceforge/twitux/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="spell gnome-keyring"
-
-DEPEND="net-libs/libsoup:2.4
-	dev-libs/libxml2
-	gnome-base/libglade
-	gnome-base/libgnome
-	gnome-base/gconf
-	x11-libs/gtk+:2
-	dev-libs/dbus-glib
-	spell? ( app-text/aspell )
-	gnome-keyring? ( gnome-base/gnome-keyring )"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	econf $(use_enable spell aspell) \
-		$(use_enable gnome-keyring) || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS NEWS README TODO
-}
diff --git a/net-misc/twitux/twitux-0.61.ebuild b/net-misc/twitux/twitux-0.61.ebuild
deleted file mode 100644
index a2ad7aae0b76..000000000000
--- a/net-misc/twitux/twitux-0.61.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/twitux/twitux-0.61.ebuild,v 1.3 2008/04/20 15:50:32 welp Exp $
-
-EAPI=1
-
-DESCRIPTION="A Twitter client for the Gnome desktop"
-HOMEPAGE="http://live.gnome.org/DanielMorales/Twitux"
-SRC_URI="mirror://sourceforge/twitux/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="spell gnome-keyring"
-
-DEPEND="net-libs/libsoup:2.4
-	dev-libs/libxml2
-	gnome-base/libglade
-	gnome-base/libgnome
-	gnome-base/gconf
-	x11-libs/gtk+:2
-	dev-libs/dbus-glib
-	spell? ( app-text/aspell )
-	gnome-keyring? ( gnome-base/gnome-keyring )"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	econf $(use_enable spell) \
-		$(use_enable gnome-keyring) || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS NEWS README TODO
-}
diff --git a/net-misc/twitux/twitux-0.62.ebuild b/net-misc/twitux/twitux-0.62.ebuild
deleted file mode 100644
index a8e8c0ba13e8..000000000000
--- a/net-misc/twitux/twitux-0.62.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/twitux/twitux-0.62.ebuild,v 1.1 2008/05/29 16:11:28 welp Exp $
-
-EAPI=1
-
-DESCRIPTION="A Twitter client for the Gnome desktop"
-HOMEPAGE="http://live.gnome.org/DanielMorales/Twitux"
-SRC_URI="mirror://sourceforge/twitux/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="spell gnome-keyring"
-
-DEPEND="net-libs/libsoup:2.4
-	dev-libs/libxml2
-	gnome-base/libgnome
-	gnome-base/gconf
-	x11-libs/gtk+:2
-	dev-libs/dbus-glib
-	spell? ( app-text/aspell )
-	gnome-keyring? ( gnome-base/gnome-keyring )"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	econf $(use_enable spell aspell) \
-		$(use_enable gnome-keyring) || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS NEWS README TODO
-}
diff --git a/net-misc/twitux/twitux-0.69.ebuild b/net-misc/twitux/twitux-0.69.ebuild
index acd627ea7833..a4184abe0699 100644
--- a/net-misc/twitux/twitux-0.69.ebuild
+++ b/net-misc/twitux/twitux-0.69.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/twitux/twitux-0.69.ebuild,v 1.1 2009/02/11 08:50:46 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/twitux/twitux-0.69.ebuild,v 1.2 2009/07/21 10:49:12 ssuominen Exp $
 
-EAPI=1
+EAPI=2
 
 DESCRIPTION="A Twitter client for the Gnome desktop"
 HOMEPAGE="http://live.gnome.org/DanielMorales/Twitux"
@@ -13,21 +13,23 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="spell gnome-keyring"
 
-DEPEND="net-libs/libsoup:2.4
+RDEPEND="net-libs/libsoup:2.4
 	dev-libs/libxml2
 	gnome-base/libgnome
 	gnome-base/gconf
-	x11-libs/gtk+:2
+	>=x11-libs/gtk+-2.14:2
 	dev-libs/dbus-glib
+	media-libs/libcanberra[gtk]
 	spell? ( app-text/aspell )
 	gnome-keyring? ( gnome-base/gnome-keyring )"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	app-text/gnome-doc-utils"
 
-src_compile() {
-	econf $(use_enable spell aspell) \
-		$(use_enable gnome-keyring) || die "econf failed"
-
-	emake || die "emake failed"
+src_configure() {
+	econf \
+		$(use_enable spell aspell) \
+		$(use_enable gnome-keyring)
 }
 
 src_install() {