new version

6 files changed, 84 insertions, 81 deletions

diff --git a/net-misc/d4x/ChangeLog b/net-misc/d4x/ChangeLog
index badd9df1500c..096f7c98abc4 100644
--- a/net-misc/d4x/ChangeLog
+++ b/net-misc/d4x/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/d4x
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/ChangeLog,v 1.2 2002/09/01 08:14:22 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/ChangeLog,v 1.3 2002/10/19 13:32:11 azarah Exp $
+
+*nt-2.4_beta (19 Oct 2002)
+
+  19 Oct 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Add beta to portage.
 
   1 Sep 2002; Martin Schlemmer <azarah@gentoo.org> :
   Move the whole shebang to net-misc/d4x, as it seems not all know
diff --git a/net-misc/d4x/d4x-2.02.ebuild b/net-misc/d4x/d4x-2.02.ebuild
deleted file mode 100644
index 59dd661b4db2..000000000000
--- a/net-misc/d4x/d4x-2.02.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/d4x-2.02.ebuild,v 1.2 2002/10/05 05:39:23 drobbins Exp $
-
-IUSE="nls esd gnome oss"
-
-#name of tarball changed
-S="${WORKDIR}/${P}"
-DESCRIPTION="GTK based download manager for X."
-SRC_URI="http://www.krasu.ru/soft/chuchelo/files/${P}.tar.gz"
-HOMEPAGE="http://www.krasu.ru/soft/chuchelo/"
-
-KEYWORDS="x86 sparc sparc64"
-SLOT="0"
-LICENSE="nt"
-
-DEPEND="=x11-libs/gtk+-1.2*
-	>=dev-libs/glib-1.2.10
-	>=media-libs/gdk-pixbuf-0.2.5
-	esd? ( >=media-sound/esound-0.2.7 )"
-
-RDEPEND=${DEPEND}
-
-
-src_unpack() {
-
-	unpack ${A}
-
-	# Use our own $CXXFLAGS
-	cd ${S}
-	cp configure configure.orig
-	sed -e "s:CXXFLAGS=\"-O2\":CXXFLAGS=\"${CXXFLAGS}\":g" \
-		configure.orig >configure
-}
-
-src_compile() {
-
-	myconf=""
-	use nls || myconf="${myconf} --disable-nls"
-	use esd || myconf="${myconf} --disable-esd"
-	use oss || myconf="${myconf} --disable-oss"
-
-	./configure --host=${HOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--enable-release \
-		${myconf} || die
-		
-	emake || die
-}
-
-src_install () {
-
-	dodir /usr/bin
-	dodir /usr/share/d4x
-	
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-   
-	dodoc AUTHORS COPYING ChangeLog* NEWS PLANS README TODO
-	cd ${S}/DOC
-	dodoc FAQ* LICENSE NAMES TROUBLES THANKS
-
-	cd ${S}
-	insinto /usr/share/pixmaps
-	doins *.png *.xpm
-
-	if [ "`use gnome`" ] ; then
-		insinto /usr/share/gnome/apps/Internet
-		newins nt.desktop d4x.desktop
-	fi
-}
-
diff --git a/net-misc/d4x/d4x-2.03.ebuild b/net-misc/d4x/d4x-2.03.ebuild
index a980d4a3d7ec..79ad5a339d3f 100644
--- a/net-misc/d4x/d4x-2.03.ebuild
+++ b/net-misc/d4x/d4x-2.03.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/d4x-2.03.ebuild,v 1.3 2002/10/05 05:39:23 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/d4x-2.03.ebuild,v 1.4 2002/10/19 13:32:11 azarah Exp $
 
 IUSE="nls esd gnome oss"
 
@@ -14,10 +14,9 @@ SLOT="0"
 LICENSE="nt"
 
 DEPEND="=x11-libs/gtk+-1.2*
-	>=dev-libs/glib-1.2.10
+	=dev-libs/glib-1.2*
 	>=media-libs/gdk-pixbuf-0.2.5
 	esd? ( >=media-sound/esound-0.2.7 )"
-RDEPEND=${DEPEND}
 
 
 src_unpack() {
diff --git a/net-misc/d4x/d4x-2.4_beta.ebuild b/net-misc/d4x/d4x-2.4_beta.ebuild
new file mode 100644
index 000000000000..372c8bbc0d27
--- /dev/null
+++ b/net-misc/d4x/d4x-2.4_beta.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/d4x-2.4_beta.ebuild,v 1.1 2002/10/19 13:32:11 azarah Exp $
+
+IUSE="nls esd gnome oss"
+
+S="${WORKDIR}/${P/_}"
+DESCRIPTION="GTK based download manager for X."
+SRC_URI="http://www.krasu.ru/soft/chuchelo/files/${P/_}.tar.gz"
+HOMEPAGE="http://www.krasu.ru/soft/chuchelo/"
+
+# Currently seems to be pretty borked
+KEYWORDS="-x86 -ppc -sparc -sparc64 -alpha"
+SLOT="0"
+LICENSE="nt"
+
+DEPEND=">=x11-libs/gtk+-2.0
+	>=dev-libs/glib-2.0
+	esd? ( >=media-sound/esound-0.2.7 )"
+
+
+src_unpack() {
+
+	unpack ${A}
+
+	# Use our own $CXXFLAGS
+	cd ${S}
+	cp configure configure.orig
+	sed -e "s:CXXFLAGS=\"-O2\":CXXFLAGS=\"${CXXFLAGS}\":g" \
+		configure.orig >configure
+}
+
+src_compile() {
+
+	myconf=""
+	
+	use nls \
+		&& myconf="${myconf} --enable-nls" \
+		|| myconf="${myconf} --disable-nls"
+	
+	use esd \
+		&& myconf="${myconf} --enable-esd" \
+		|| myconf="${myconf} --disable-esd"
+	
+	use oss \
+		&& myconf="${myconf} --enable-oss" \
+		|| myconf="${myconf} --disable-oss"
+
+	econf --enable-release \
+		${myconf} || die
+		
+	emake || die
+}
+
+src_install () {
+
+	dodir /usr/bin
+	dodir /usr/share/d4x
+
+	einstall || die
+
+	insinto /usr/share/pixmaps
+	doins *.png *.xpm
+
+	if [ -n "`use gnome`" ]
+	then
+		insinto /usr/share/gnome/apps/Internet
+		newins nt.desktop d4x.desktop
+	fi
+
+	rm -rf ${D}/usr/share/d4x/{FAQ*,INSTALL*,README*,LICENSE,NAMES,TROUBLES}
+	dodoc AUTHORS COPYING ChangeLog* NEWS PLANS TODO \
+		DOC/{FAQ*,LICENSE,NAMES,README*,TROUBLES,THANKS}
+}
+
diff --git a/net-misc/d4x/files/digest-d4x-2.02 b/net-misc/d4x/files/digest-d4x-2.02
deleted file mode 100644
index b379f8e63cb3..000000000000
--- a/net-misc/d4x/files/digest-d4x-2.02
+++ /dev/null
@@ -1 +0,0 @@
-MD5 54a134fe5edfb3558fe07ac76f08a901 d4x-2.02.tar.gz 1253235
diff --git a/net-misc/d4x/files/digest-d4x-2.4_beta b/net-misc/d4x/files/digest-d4x-2.4_beta
new file mode 100644
index 000000000000..c2bee7dd705f
--- /dev/null
+++ b/net-misc/d4x/files/digest-d4x-2.4_beta
@@ -0,0 +1 @@
+MD5 66093d5dba093bfe285855ae84a00185 d4x-2.4beta.tar.gz 1267851