Version bump. Stop installing trayicon module; use GTK's instead.

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

5 files changed, 46 insertions, 105 deletions

diff --git a/net-p2p/nicotine+/ChangeLog b/net-p2p/nicotine+/ChangeLog
index 2176e9c65711..6403ded4f8d0 100644
--- a/net-p2p/nicotine+/ChangeLog
+++ b/net-p2p/nicotine+/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/nicotine+
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/ChangeLog,v 1.30 2009/02/12 03:12:58 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/ChangeLog,v 1.31 2009/02/21 16:39:28 dirtyepic Exp $
+
+*nicotine+-1.2.10 (21 Feb 2009)
+
+  21 Feb 2009; Ryan Hill <dirtyepic@gentoo.org> -nicotine+-1.2.9.ebuild,
+  -nicotine+-1.2.9-r1.ebuild, +nicotine+-1.2.10.ebuild:
+  Version bump. Stop installing trayicon module; use GTK's instead.
 
   12 Feb 2009; Ryan Hill <dirtyepic@gentoo.org> metadata.xml:
   Add myself to maintainers.
diff --git a/net-p2p/nicotine+/Manifest b/net-p2p/nicotine+/Manifest
index 00f85614ecc9..318ffedf68b5 100644
--- a/net-p2p/nicotine+/Manifest
+++ b/net-p2p/nicotine+/Manifest
@@ -2,19 +2,18 @@
 Hash: SHA1
 
 AUX nicotine+-1.2.9-locale-handling.patch 2730 RMD160 ca7839e20bcc990bf8756aa85b3b6b490b56d3c8 SHA1 4b5f6a5ae30aaea7562df012d30bff726a9b8a7e SHA256 41d4ee5a8d3e957687674805b97b9d32d3e7e093d2d916fdd5924011d27d7f23
+DIST nicotine+-1.2.10.tar.bz2 3721630 RMD160 b85042469b0e232d69b0cbe0c59c09f03fc8cb7a SHA1 f7015caf020a3b42ba45549f7074453bd35bb19f SHA256 ffdbdc699d7e413b18b57bf8fdbe1df83a5e77adb668d6cd2cbd87cdb0b51161
 DIST nicotine+-1.2.10_pre705.tar.bz2 1170436 RMD160 dbe8dfb16e1ce1b2081b957ba406dbca888fc262 SHA1 3c008cb76fb59df2a5fdfd7e3276b8974facef1d SHA256 2fba7221cf9615f17f68502800be531e105ac4bfb409f0bfd8917d3126a8be14
 DIST nicotine+-1.2.8.tar.bz2 790874 RMD160 9be15d3a7304db82c5c302cffda39bdc9addb3e9 SHA1 fdf20cf43d0f183a2c2a5d7b4e9758d51814d694 SHA256 19ad0478a08c736f115506323f04e13a13f4845ac1d27fd216a1e1f2dce536e2
-DIST nicotine+-1.2.9.tar.bz2 1148442 RMD160 fe542c1559626f6ef8e4ff483ed00d9129ca5f73 SHA1 f4c67a0361e8ab08328d49e664b08aa6040a3dfd SHA256 59df380c0c6e310046e70095ca93f9202de005a2daed0b2613ed5820eb328606
+EBUILD nicotine+-1.2.10.ebuild 936 RMD160 d85a574f43785ca09a778343614e21431ff48670 SHA1 7ff9da205bb2ac61534b22dca3bd382c115bef33 SHA256 8e89a8ae7e472e14624ef99819121c5944791d9e535aff4373e85b7557255579
 EBUILD nicotine+-1.2.10_pre705.ebuild 1199 RMD160 dae75cf9584ca1a7572ed47bab87c4a525140311 SHA1 eaaf3985b870cf60f5123dbdfa520a1dd945d613 SHA256 60ccb5f9f910c604a71f57d1bf764a3b87efda8dcf0a101deffa8b4616b376be
 EBUILD nicotine+-1.2.8.ebuild 1204 RMD160 7559f9f4660fbff37c02857f18a454ced0a5788a SHA1 bace509654c0c56c2cccb462fd0b682ea173de5e SHA256 23f511839fab747f6f7966e1666fd7e80d9882fe56432f7519ef73f9529ec775
-EBUILD nicotine+-1.2.9-r1.ebuild 1348 RMD160 325d704f804c2bef1051ae3bff4b2e7c18973515 SHA1 052773ae6af2162e3f7dc1efbb02d0954345bdee SHA256 c41be467790fcf087666db62f9dad3bdf5dc794f9780658759fec6a48d514bae
-EBUILD nicotine+-1.2.9.ebuild 1253 RMD160 c638d7c309176c6c002f122402c7ec8cef587303 SHA1 c150002b51b04ff0d5a40cb66085b61ce621ce59 SHA256 d677c0f16eadae61a9b6a5ebcdfd1e61d796ee89ff65a02538f2decee97c8eb2
-MISC ChangeLog 4131 RMD160 026423769584d60b49e6faa0893420c326ba4e95 SHA1 d191a5fd25b8aed2d7c7c2727a5cdbacf5c5362d SHA256 27269927f125262ac1bad935e31f624e83fd6f8f4fa71898ec2a970ba91e42b3
+MISC ChangeLog 4362 RMD160 b058fa6a6ca5744ceeee9905c5f883c1ab8a827f SHA1 bda52939008731b7ce7579b2920c3f319e46e956 SHA256 79b93119161808d56636d28ce745b22df44bc56ba69eb3cf7832ecc475854353
 MISC metadata.xml 253 RMD160 c5653dbfa27ea739e3430aed0980016fd12aa68f SHA1 461dedcaf3322af7e59c93c21845796c5fa27419 SHA256 301f970e0628e48cfeaf5bd540b63c012452b458b76ef05bb0bcbe640a0f373f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkmTlAUACgkQiqiDRvmkBmK2SgCeLVVEN55QRF/+RCfoEwpY/21d
-tdYAnAlGLKllesxhcdlqN9Kq40bj1PPk
-=r0FP
+iEYEARECAAYFAkmgLqAACgkQiqiDRvmkBmJstwCcClE+t5m5D+LsCECaLU5J9hut
+3NsAoIKQGha+OounwyHn8spzpU36I9vu
+=ClrF
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/nicotine+/nicotine+-1.2.10.ebuild b/net-p2p/nicotine+/nicotine+-1.2.10.ebuild
new file mode 100644
index 000000000000..485ac65a96ea
--- /dev/null
+++ b/net-p2p/nicotine+/nicotine+-1.2.10.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/nicotine+-1.2.10.ebuild,v 1.1 2009/02/21 16:39:28 dirtyepic Exp $
+
+inherit distutils multilib toolchain-funcs
+
+DESCRIPTION="A fork of nicotine, a Soulseek client in Python"
+HOMEPAGE="http://nicotine-plus.sourceforge.net"
+SRC_URI="http://www.nicotine-plus.org/files/${P}.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="geoip spell vorbis"
+
+RDEPEND="virtual/python
+	>=dev-python/pygtk-2.10
+	vorbis? ( >=dev-python/pyvorbis-1.4-r3
+			  >=dev-python/pyogg-1 )
+	geoip? ( >=dev-python/geoip-python-0.2.0
+			 >=dev-libs/geoip-1.2.1 )
+	spell? ( dev-python/sexy-python )
+	!net-p2p/nicotine"
+
+DEPEND="${RDEPEND}"
+
+
+src_install() {
+	distutils_python_version
+	distutils_src_install \
+		--install-lib /usr/$(get_libdir)/python${PYVER}/site-packages
+}
diff --git a/net-p2p/nicotine+/nicotine+-1.2.9-r1.ebuild b/net-p2p/nicotine+/nicotine+-1.2.9-r1.ebuild
deleted file mode 100644
index 4558c28356a0..000000000000
--- a/net-p2p/nicotine+/nicotine+-1.2.9-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/nicotine+-1.2.9-r1.ebuild,v 1.1 2008/03/31 14:24:54 coldwind Exp $
-
-inherit distutils eutils multilib toolchain-funcs
-
-DESCRIPTION="A fork of nicotine, a Soulseek client in Python"
-HOMEPAGE="http://nicotine-plus.sourceforge.net"
-SRC_URI="mirror://sourceforge/nicotine-plus/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="geoip spell vorbis"
-
-RDEPEND="virtual/python
-	>=dev-python/pygtk-2
-	vorbis? ( >=dev-python/pyvorbis-1.4-r1
-			  >=dev-python/pyogg-1 )
-	geoip? ( >=dev-python/geoip-python-0.2.0
-			 >=dev-libs/geoip-1.2.1 )
-	spell? ( dev-python/sexy-python )
-	!net-p2p/nicotine"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-locale-handling.patch
-}
-
-src_compile() {
-	distutils_src_compile
-
-	cd "${S}"/trayicon/
-	sed -i -e "s:/lib/:/$(get_libdir)/:" \
-		Makefile.in || die "sed failed"
-	./autogen.py
-	emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	distutils_python_version
-	distutils_src_install --install-lib \
-		/usr/$(get_libdir)/python${PYVER}/site-packages
-
-	cd "${S}"/trayicon/
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/net-p2p/nicotine+/nicotine+-1.2.9.ebuild b/net-p2p/nicotine+/nicotine+-1.2.9.ebuild
deleted file mode 100644
index c2f70d2df4f3..000000000000
--- a/net-p2p/nicotine+/nicotine+-1.2.9.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/nicotine+-1.2.9.ebuild,v 1.4 2007/11/18 10:59:00 armin76 Exp $
-
-inherit distutils eutils multilib toolchain-funcs
-
-DESCRIPTION="A fork of nicotine, a Soulseek client in Python"
-HOMEPAGE="http://nicotine-plus.sourceforge.net"
-SRC_URI="mirror://sourceforge/nicotine-plus/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="geoip spell vorbis"
-
-RDEPEND="virtual/python
-	>=dev-python/pygtk-2
-	vorbis? ( >=dev-python/pyvorbis-1.4-r1
-			  >=dev-python/pyogg-1 )
-	geoip? ( >=dev-python/geoip-python-0.2.0
-			 >=dev-libs/geoip-1.2.1 )
-	spell? ( dev-python/sexy-python )
-	!net-p2p/nicotine"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=sys-apps/sed-4"
-
-src_compile() {
-	distutils_src_compile
-
-	cd "${S}"/trayicon/
-	sed -i -e "s:/lib/:/$(get_libdir)/:" \
-		Makefile.in || die "sed failed"
-	./autogen.py
-	emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	distutils_python_version
-	distutils_src_install --install-lib \
-		/usr/$(get_libdir)/python${PYVER}/site-packages
-
-	cd "${S}"/trayicon/
-	emake DESTDIR="${D}" install || die "emake install failed"
-}