net-p2p/nanodc: Nuke old and re-fix the dependencies again; stop breaking it!

svn path=/sunrise/; revision=2722

5 files changed, 20 insertions, 63 deletions

diff --git a/net-p2p/nanodc/ChangeLog b/net-p2p/nanodc/ChangeLog
index 682b87c4a..5f94bc771 100644
--- a/net-p2p/nanodc/ChangeLog
+++ b/net-p2p/nanodc/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  11 Jan 2007; Jakub Moc <jakub@gentoo.org> -nanodc-0.3.2.ebuild,
+  nanodc-0.3.3.ebuild:
+  Nuke old and re-fix the dependencies again; stop breaking it!
+
   09 Jan 2007; Toni Takarautio (secretz) <thtaka@utu.fi>
   +nanodc-0.3.3.ebuild:
   Version bump.
diff --git a/net-p2p/nanodc/Manifest b/net-p2p/nanodc/Manifest
index 2cbcc0021..e7f599384 100644
--- a/net-p2p/nanodc/Manifest
+++ b/net-p2p/nanodc/Manifest
@@ -1,24 +1,16 @@
-DIST nanodc-0.3.2.tar.gz 293012 RMD160 4b19dff99d6906e7b2abefb6d5fb1ff5966f5f65 SHA1 8029ad9ef5dfb72071ed95b6b256799bbcbeb950 SHA256 dc9ab46cd3d0296a6cccd009b843b46d4bd2a53a26d3286889dacb8bee679c0e
-DIST nanodc-0.3.3.tar.gz 295429 RMD160 4e7d55418b6a3dd8ef5f0e4ca454cbf6da07471c SHA1 0ecb2333652b6ce5b0c73c779ca231e024046cd1 SHA256 b87b6bdc0bc16b374db34875084a0924c14f2f78ee1e2b861eb60ad9183531c0
-EBUILD nanodc-0.3.2.ebuild 850 RMD160 065201ee9437be3311ff92eb7c5ea8f0c0b63553 SHA1 f007ea657cfb4cc9492f7b2d3fba829297ebf19c SHA256 460dda2f824bbc52192468e36787c779d1ed5478f5f74e21d918ccc259305b34
-MD5 c203b600e35ee7e869a6d18537eb6e5e nanodc-0.3.2.ebuild 850
-RMD160 065201ee9437be3311ff92eb7c5ea8f0c0b63553 nanodc-0.3.2.ebuild 850
-SHA256 460dda2f824bbc52192468e36787c779d1ed5478f5f74e21d918ccc259305b34 nanodc-0.3.2.ebuild 850
-EBUILD nanodc-0.3.3.ebuild 862 RMD160 135c12b95bd7d993446225d7cc2b26f6733336d0 SHA1 1f419d7250d3579bb9247c1ebb46abaaa1d37fe8 SHA256 c2a550b982b661e9e5cd62095633420d714a227c32793215f5c26152dc5317b1
-MD5 66ca0befc1ad122fe600481f8fb740d3 nanodc-0.3.3.ebuild 862
-RMD160 135c12b95bd7d993446225d7cc2b26f6733336d0 nanodc-0.3.3.ebuild 862
-SHA256 c2a550b982b661e9e5cd62095633420d714a227c32793215f5c26152dc5317b1 nanodc-0.3.3.ebuild 862
-MISC ChangeLog 2081 RMD160 0cf5c76091324f2a90443cd66c623cca33e9ebab SHA1 f493ffd4f096427ade6e86ff33bc923ca7419248 SHA256 4d5e0996847f73041d37aed78fb6257d4dd388bb3f0f5c7e3ddc6d63f3807e3c
-MD5 663bf18adb5e27f22c384a4a1957143a ChangeLog 2081
-RMD160 0cf5c76091324f2a90443cd66c623cca33e9ebab ChangeLog 2081
-SHA256 4d5e0996847f73041d37aed78fb6257d4dd388bb3f0f5c7e3ddc6d63f3807e3c ChangeLog 2081
+DIST nanodc-0.3.3.tar.gz 295429 RMD160 4e7d55418b6a3dd8ef5f0e4ca454cbf6da07471c SHA256 b87b6bdc0bc16b374db34875084a0924c14f2f78ee1e2b861eb60ad9183531c0
+EBUILD nanodc-0.3.3.ebuild 852 RMD160 547a774ab89a737e8ef20bbc05def5f45db68b02 SHA1 0aa85e8a1625c626442548ac7a3cc84f4d0085b7 SHA256 4adc5b5a43c180a1b9c3ae57d62ec873d36b5b62909813ee3159f0a47bf5c542
+MD5 3e48e7bf88dda6a5cea7a43c878a2c80 nanodc-0.3.3.ebuild 852
+RMD160 547a774ab89a737e8ef20bbc05def5f45db68b02 nanodc-0.3.3.ebuild 852
+SHA256 4adc5b5a43c180a1b9c3ae57d62ec873d36b5b62909813ee3159f0a47bf5c542 nanodc-0.3.3.ebuild 852
+MISC ChangeLog 2235 RMD160 06de62f10dc67a253f2b8bb9305d61253826fe9c SHA1 f67b12eb4dba6f4988bc65edc83dd050a96876e4 SHA256 f4d526ecefddf5849fa1ca50e0b32f1e605762c3309033f1a70a0ba21b0c441e
+MD5 c30e2d2da7b0456d9e4cf621036fb3f9 ChangeLog 2235
+RMD160 06de62f10dc67a253f2b8bb9305d61253826fe9c ChangeLog 2235
+SHA256 f4d526ecefddf5849fa1ca50e0b32f1e605762c3309033f1a70a0ba21b0c441e ChangeLog 2235
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata.xml 170
-MD5 50e26589a4674f88e7d49982d9e07dff files/digest-nanodc-0.3.2 238
-RMD160 9b84be6c8d18cfdf1f9e26f83dcfa4b80d457fa1 files/digest-nanodc-0.3.2 238
-SHA256 88f6cf837acd1143265bd12dae7e7331f26f292505890ea2394e14f6a7d578d1 files/digest-nanodc-0.3.2 238
 MD5 5fc7777c84b9f6a8f04bb642112d0b56 files/digest-nanodc-0.3.3 238
 RMD160 4496b6cd9dbd7b38b3c2f1b27868bc35f52d4aac files/digest-nanodc-0.3.3 238
 SHA256 ca121333ba4e82bdbce37c859f95d208f42987b091a2980b4eb8c771c8c437dd files/digest-nanodc-0.3.3 238
diff --git a/net-p2p/nanodc/files/digest-nanodc-0.3.2 b/net-p2p/nanodc/files/digest-nanodc-0.3.2
deleted file mode 100644
index b06a06a4b..000000000
--- a/net-p2p/nanodc/files/digest-nanodc-0.3.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 64cfb0f4f239457c5c8a02031dc49dcf nanodc-0.3.2.tar.gz 293012
-RMD160 4b19dff99d6906e7b2abefb6d5fb1ff5966f5f65 nanodc-0.3.2.tar.gz 293012
-SHA256 dc9ab46cd3d0296a6cccd009b843b46d4bd2a53a26d3286889dacb8bee679c0e nanodc-0.3.2.tar.gz 293012
diff --git a/net-p2p/nanodc/nanodc-0.3.2.ebuild b/net-p2p/nanodc/nanodc-0.3.2.ebuild
deleted file mode 100644
index ef5896c1a..000000000
--- a/net-p2p/nanodc/nanodc-0.3.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit toolchain-funcs versionator
-
-DESCRIPTION="Ncurses DC++ client"
-HOMEPAGE="http://sourceforge.net/projects/nanodc/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-RDEPEND="sys-libs/ncurses
-	sys-libs/zlib
-	>=dev-libs/libsigc++-2.0.0
-	>=dev-libs/glib-2.0.0"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/scons"
-
-BIGVERSION=nanodc-$(get_version_component_range 1-2 )
-
-pkg_setup() {
-	if [[[ gcc-major-version ] != 4 ]]; then
-		eerror "We need at least gcc-4.0 to compile"
-		die "gcc-4 required"
-	fi
-}
-
-src_compile() {
-	cd "${WORKDIR}/${BIGVERSION}/trunk/src"
-	scons || die "scons failed!"
-}
-
-src_install() {
-	dobin "${WORKDIR}/${BIGVERSION}/trunk/src/nanodc"
-}
diff --git a/net-p2p/nanodc/nanodc-0.3.3.ebuild b/net-p2p/nanodc/nanodc-0.3.3.ebuild
index 1b9899919..0ddb0cc29 100644
--- a/net-p2p/nanodc/nanodc-0.3.3.ebuild
+++ b/net-p2p/nanodc/nanodc-0.3.3.ebuild
@@ -7,18 +7,20 @@ inherit toolchain-funcs versionator
 DESCRIPTION="Ncurses DC++ client"
 HOMEPAGE="http://sourceforge.net/projects/nanodc/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~ppc"
 IUSE=""
-DEPEND="app-arch/bzip2
-	sys-libs/ncurses
-	dev-util/pkgconfig
-	dev-util/scons
+
+RDEPEND="sys-libs/ncurses
 	sys-libs/zlib
 	>=dev-libs/libsigc++-2.0.0
 	>=dev-libs/glib-2.0.0"
-RDEPEND=${DEPEND}
+DEPEND="${RDEPEND}
+	dev-util/scons
+	dev-util/pkgconfig"
+
 BIGVERSION=nanodc-$(get_version_component_range 1-2 )
 
 pkg_setup() {