Version bump and cleanup.

11 files changed, 15 insertions, 73 deletions

diff --git a/net-p2p/nicotine/ChangeLog b/net-p2p/nicotine/ChangeLog
index 201a0ae6d219..a670002e7317 100644
--- a/net-p2p/nicotine/ChangeLog
+++ b/net-p2p/nicotine/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/nicotine
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine/ChangeLog,v 1.9 2004/01/04 22:11:42 tseng Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine/ChangeLog,v 1.10 2004/01/24 16:22:06 tseng Exp $
+
+*nicotine-1.0.7_rc2 (24 Jan 2004)
+
+  24 Jan 2004; Brandon Hale <tseng@gentoo.org> nicotine-1.0.4.1.ebuild,
+  nicotine-1.0.4.ebuild, nicotine-1.0.5.ebuild, nicotine-1.0.6_rc1.ebuild,
+  nicotine-1.0.7_rc2.ebuild:
+  Version bump and cleanup.
 
 *nicotine-1.0.7_rc1 (04 Jan 2004)
 
diff --git a/net-p2p/nicotine/Manifest b/net-p2p/nicotine/Manifest
index ba1677e0caa9..575f6fc9d675 100644
--- a/net-p2p/nicotine/Manifest
+++ b/net-p2p/nicotine/Manifest
@@ -6,9 +6,11 @@ MD5 d7c011de86963b29a47782eeaf9aa5f6 nicotine-1.0.5.ebuild 659
 MD5 417ee3262bba44c2442132d4a2e4a308 nicotine-1.0.6_rc1.ebuild 696
 MD5 537ee7c9b0cf98759e61be6fac3997ad nicotine-1.0.6.ebuild 661
 MD5 83f080d3e66150edcee7140efa5346e3 nicotine-1.0.7_rc1.ebuild 689
+MD5 83f080d3e66150edcee7140efa5346e3 nicotine-1.0.7_rc2.ebuild 689
 MD5 5cfab8187f861f1bccab403a82465970 files/digest-nicotine-1.0.4 67
 MD5 b93106f0feb2a186392581c8407f07a0 files/digest-nicotine-1.0.4.1 69
 MD5 a5922831ba4a64fd4bd72bb9890faf13 files/digest-nicotine-1.0.5 67
 MD5 9a7308cfd1ac666ae9da942c9258cc4b files/digest-nicotine-1.0.6_rc1 70
 MD5 ebe82bf48e6c50ff0bea6683e2cd5a11 files/digest-nicotine-1.0.6 67
 MD5 88bffb204b61c7feaec77b1f86a301fa files/digest-nicotine-1.0.7_rc1 70
+MD5 b225714ff170f3932cfa9bdde6b5037e files/digest-nicotine-1.0.7_rc2 70
diff --git a/net-p2p/nicotine/files/digest-nicotine-1.0.4 b/net-p2p/nicotine/files/digest-nicotine-1.0.4
deleted file mode 100644
index 267060839dc5..000000000000
--- a/net-p2p/nicotine/files/digest-nicotine-1.0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f6e87c354a2a1ecb1b161c7ffa34c80b nicotine-1.0.4.tar.bz2 205042
diff --git a/net-p2p/nicotine/files/digest-nicotine-1.0.4.1 b/net-p2p/nicotine/files/digest-nicotine-1.0.4.1
deleted file mode 100644
index 9d531db39482..000000000000
--- a/net-p2p/nicotine/files/digest-nicotine-1.0.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bc89054d83eb9785e78a59b84ae3dc4e nicotine-1.0.4.1.tar.bz2 217306
diff --git a/net-p2p/nicotine/files/digest-nicotine-1.0.5 b/net-p2p/nicotine/files/digest-nicotine-1.0.5
deleted file mode 100644
index f5da9dafe9fd..000000000000
--- a/net-p2p/nicotine/files/digest-nicotine-1.0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 da2a4d3589d6bc176a1a433304ca90a4 nicotine-1.0.5.tar.bz2 221359
diff --git a/net-p2p/nicotine/files/digest-nicotine-1.0.6_rc1 b/net-p2p/nicotine/files/digest-nicotine-1.0.6_rc1
deleted file mode 100644
index 5a9eb1ad316d..000000000000
--- a/net-p2p/nicotine/files/digest-nicotine-1.0.6_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 af811a21a7381956c6fdfcba652f8a5d nicotine-1.0.6rc1.tar.bz2 270403
diff --git a/net-p2p/nicotine/files/digest-nicotine-1.0.7_rc2 b/net-p2p/nicotine/files/digest-nicotine-1.0.7_rc2
new file mode 100644
index 000000000000..1039e1e3678c
--- /dev/null
+++ b/net-p2p/nicotine/files/digest-nicotine-1.0.7_rc2
@@ -0,0 +1 @@
+MD5 6d27ed14784d68b6fdf21828fc527c16 nicotine-1.0.7rc2.tar.bz2 292547
diff --git a/net-p2p/nicotine/nicotine-1.0.4.1.ebuild b/net-p2p/nicotine/nicotine-1.0.4.1.ebuild
deleted file mode 100644
index a092ac858ba5..000000000000
--- a/net-p2p/nicotine/nicotine-1.0.4.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine/nicotine-1.0.4.1.ebuild,v 1.2 2003/11/01 13:26:30 weeve Exp $
-
-inherit distutils
-
-DESCRIPTION="Soulseek client written in Python"
-HOMEPAGE="http://thegraveyard.org/nicotine/"
-SRC_URI="http://thegraveyard.org/nicotine/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~sparc"
-IUSE="oggvorbis geoip"
-
-DEPEND="virtual/python
-	>=dev-python/pygtk-1.99.16
-	oggvorbis? ( >=dev-python/pyvorbis-1
-				>=dev-python/pyogg-1 )
-	geoip? ( >=dev-python/geoip-python-0.2.0
-		>=dev-libs/geoip-1.2.1 )"
diff --git a/net-p2p/nicotine/nicotine-1.0.4.ebuild b/net-p2p/nicotine/nicotine-1.0.4.ebuild
deleted file mode 100644
index e0b017b16400..000000000000
--- a/net-p2p/nicotine/nicotine-1.0.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine/nicotine-1.0.4.ebuild,v 1.2 2003/11/01 13:26:30 weeve Exp $
-
-inherit distutils
-
-DESCRIPTION="Soulseek client written in Python"
-HOMEPAGE="http://thegraveyard.org/nicotine/"
-SRC_URI="http://thegraveyard.org/nicotine/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~sparc"
-IUSE="oggvorbis geoip"
-
-DEPEND="virtual/python
-	>=dev-python/pygtk-1.99.16
-	oggvorbis? ( >=dev-python/pyvorbis-1
-				>=dev-python/pyogg-1 )
-	geoip? ( >=dev-python/geoip-python-0.2.0
-		>=dev-libs/geoip-1.2.1 )"
diff --git a/net-p2p/nicotine/nicotine-1.0.5.ebuild b/net-p2p/nicotine/nicotine-1.0.5.ebuild
deleted file mode 100644
index c07cfd092f8e..000000000000
--- a/net-p2p/nicotine/nicotine-1.0.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine/nicotine-1.0.5.ebuild,v 1.2 2003/11/07 03:39:27 seemant Exp $
-
-inherit distutils
-
-DESCRIPTION="Soulseek client written in Python"
-HOMEPAGE="http://thegraveyard.org/nicotine/"
-SRC_URI="http://thegraveyard.org/nicotine/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
-
-IUSE="oggvorbis geoip"
-
-DEPEND="virtual/python
-	>=dev-python/pygtk-1.99.16
-	oggvorbis? ( >=dev-python/pyvorbis-1
-				>=dev-python/pyogg-1 )
-	geoip? ( >=dev-python/geoip-python-0.2.0
-		>=dev-libs/geoip-1.2.1 )"
diff --git a/net-p2p/nicotine/nicotine-1.0.6_rc1.ebuild b/net-p2p/nicotine/nicotine-1.0.7_rc2.ebuild
index a460d9811ee2..0a38672cd6eb 100644
--- a/net-p2p/nicotine/nicotine-1.0.6_rc1.ebuild
+++ b/net-p2p/nicotine/nicotine-1.0.7_rc2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine/nicotine-1.0.6_rc1.ebuild,v 1.1 2003/11/22 04:43:42 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine/nicotine-1.0.7_rc2.ebuild,v 1.1 2004/01/24 16:22:06 tseng Exp $
 
 inherit distutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://thegraveyard.org/nicotine/${MY_P}.tar.bz2"
 S=${WORKDIR}/${MY_P}
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="~x86"
 IUSE="oggvorbis geoip"
 
 DEPEND="virtual/python