stable on x86; cleanups

5 files changed, 9 insertions, 52 deletions

diff --git a/net-p2p/Circle/ChangeLog b/net-p2p/Circle/ChangeLog
index 72dd64b54605..fcd0d7e5f157 100644
--- a/net-p2p/Circle/ChangeLog
+++ b/net-p2p/Circle/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/Circle
 # Copyright 1999-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/Circle/ChangeLog,v 1.4 2004/05/12 08:24:09 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/Circle/ChangeLog,v 1.5 2004/06/02 13:44:34 squinky86 Exp $
+
+  02 Jun 2004; Jon Hood <squinky86@gentoo.org> Circle-0.39-r1.ebuild,
+  -Circle-0.39.ebuild:
+  stable on x86; cleanups
 
 *Circle-0.39-r1 (02 May 2004)
 
diff --git a/net-p2p/Circle/Circle-0.39-r1.ebuild b/net-p2p/Circle/Circle-0.39-r1.ebuild
index 08979da1d495..6e491bf3c39d 100644
--- a/net-p2p/Circle/Circle-0.39-r1.ebuild
+++ b/net-p2p/Circle/Circle-0.39-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/Circle/Circle-0.39-r1.ebuild,v 1.1 2004/05/02 13:13:34 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/Circle/Circle-0.39-r1.ebuild,v 1.2 2004/06/02 13:44:34 squinky86 Exp $
 
 inherit python
 
@@ -10,7 +10,7 @@ SRC_URI="http://thecircle.org.au/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 IUSE="oggvorbis gnome"
 
 DEPEND="virtual/python
diff --git a/net-p2p/Circle/Circle-0.39.ebuild b/net-p2p/Circle/Circle-0.39.ebuild
deleted file mode 100644
index 29d7022cf5f7..000000000000
--- a/net-p2p/Circle/Circle-0.39.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/Circle/Circle-0.39.ebuild,v 1.2 2004/04/14 09:10:38 dholm Exp $
-
-inherit python
-
-DESCRIPTION="The Circle messaging and file sharing system"
-HOMEPAGE="http://thecircle.org.au/"
-SRC_URI="http://thecircle.org.au/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="oggvorbis gnome"
-
-DEPEND="virtual/python
-	>=dev-python/pygtk-1.99.14
-	>=gtk+-2
-	oggvorbis? ( dev-python/pyogg
-		dev-python/pyvorbis )
-	gnome? ( dev-python/gnome-python )"
-
-src_compile() {
-	einfo "Nothing to compile."
-}
-
-src_install() {
-	python_version
-	exeinto /usr/bin/
-	doexe circle
-	exeinto /usr/lib/apt/methods/
-	doexe cftp chttp
-	insinto /usr/lib/python${PYVER}/site-packages/circlelib/
-	doins circlelib/*.py*
-	doins circlelib/*.xpm
-	insinto /usr/share/pixmaps/
-	doins circle-icon.png
-	if [ `use gnome` ] ; then
-		insinto /usr/share/gnome/apps/Internet/
-		doins circle.desktop
-	fi
-	dohtml circlelib/*.html
-	dodoc NEWS PKG-INFO README
-}
diff --git a/net-p2p/Circle/Manifest b/net-p2p/Circle/Manifest
index 37bec7473e85..01680174272d 100644
--- a/net-p2p/Circle/Manifest
+++ b/net-p2p/Circle/Manifest
@@ -1,6 +1,4 @@
-MD5 ced09043623f44a00856c8c4834cde72 Circle-0.39.ebuild 1075
-MD5 2e09287b731dd6fc2198462615bf6ad6 Circle-0.39-r1.ebuild 1173
-MD5 149ab2db3958e3a3f5ab7e082465f1c9 ChangeLog 612
+MD5 e640cfff639460c3acc6209c32de2413 Circle-0.39-r1.ebuild 1172
+MD5 e2b86b0ce75cac096fb38bd5ef86d876 ChangeLog 737
 MD5 8abcb326775f027b2e13f23344036e34 metadata.xml 224
-MD5 ba1dc7ed119049827966f37f58172fe3 files/digest-Circle-0.39 63
 MD5 ba1dc7ed119049827966f37f58172fe3 files/digest-Circle-0.39-r1 63
diff --git a/net-p2p/Circle/files/digest-Circle-0.39 b/net-p2p/Circle/files/digest-Circle-0.39
deleted file mode 100644
index ff31ea05f9b7..000000000000
--- a/net-p2p/Circle/files/digest-Circle-0.39
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e2879eb59e801c5a01f0c33192d440e3 Circle-0.39.tar.gz 372862