10 files changed, 13 insertions, 296 deletions
diff --git a/net-misc/d4x/ChangeLog b/net-misc/d4x/ChangeLog
index 22c19f393a2b..5d0c9aa12e35 100644
--- a/net-misc/d4x/ChangeLog
+++ b/net-misc/d4x/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/d4x
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/ChangeLog,v 1.37 2005/12/28 19:05:48 nelchael Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/ChangeLog,v 1.38 2006/01/15 15:24:43 nelchael Exp $
+
+  15 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  -files/d4x-2.5.0-fix-compile-gtk26.patch,
+  -files/d4x-2.5.0_rc2-gtk24.patch, -files/d4x-2.5.0_rc4-fix-cast.patch,
+  -files/d4x-2.5.5-stdint.patch, -d4x-2.5.0-r1.ebuild, -d4x-2.5.5.ebuild,
+  d4x-2.5.6.ebuild:
+  Removed old versions, 2.5.6 stable on x86.
 
   28 Dec 2005; Krzysiek Pawlik <nelchael@gentoo.org>
   +files/d4x-2.5.6-libintl_fix.patch, d4x-2.5.6.ebuild:
diff --git a/net-misc/d4x/d4x-2.5.0-r1.ebuild b/net-misc/d4x/d4x-2.5.0-r1.ebuild
deleted file mode 100644
index 0a4babbfaf88..000000000000
--- a/net-misc/d4x/d4x-2.5.0-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/d4x-2.5.0-r1.ebuild,v 1.2 2005/08/20 18:42:56 smithj Exp $
-
-IUSE="nls esd gnome oss kde"
-
-inherit eutils flag-o-matic
-
-S="${WORKDIR}/${P}final"
-DESCRIPTION="GTK based download manager for X."
-SRC_URI="http://www.krasu.ru/soft/chuchelo/files/${P}final.tar.gz"
-HOMEPAGE="http://www.krasu.ru/soft/chuchelo/"
-
-KEYWORDS="x86 ~amd64"
-SLOT="0"
-LICENSE="Artistic"
-
-DEPEND=">=x11-libs/gtk+-2.6.0
-	>=dev-libs/glib-2.6.0
-	>=sys-devel/gettext-0.11.2
-	esd? ( >=media-sound/esound-0.2.7 )"
-
-src_unpack() {
-	unpack ${A}
-
-	# Use our own $CXXFLAGS
-	cd ${S}
-	epatch ${FILESDIR}/${P}-fix-compile-gtk26.patch
-	cp configure configure.orig
-	sed -e "s:CXXFLAGS=\"-O2\":CXXFLAGS=\"${CXXFLAGS}\":g;s:OPTFLAGS=\"-O2\":OPTFLAGS=\"\":g" \
-		configure.orig >configure
-}
-
-src_compile() {
-
-	myconf=""
-	append-flags -D_FILE_OFFSET_BITS=64
-
-	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 share/*.png share/*.xpm
-
-	if use kde
-	then
-		insinto /usr/share/applnk/Internet
-		newins share/nt.desktop d4x.desktop
-	fi
-
-	if use gnome
-	then
-		echo "Categories=Application;Network;" >> ${S}/share/nt.desktop
-		insinto /usr/share/applications
-		newins share/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/d4x-2.5.5.ebuild b/net-misc/d4x/d4x-2.5.5.ebuild
deleted file mode 100644
index b274ae8123e4..000000000000
--- a/net-misc/d4x/d4x-2.5.5.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/d4x-2.5.5.ebuild,v 1.2 2005/09/27 18:50:23 nelchael Exp $
-
-IUSE="nls esd gnome oss kde"
-
-inherit eutils flag-o-matic
-
-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 ~amd64"
-SLOT="0"
-LICENSE="Artistic"
-
-DEPEND=">=x11-libs/gtk+-2.0.6
-	>=dev-libs/glib-2.0.6
-	>=sys-devel/gettext-0.11.2
-	>=dev-libs/openssl-0.9.7f
-	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;s:OPTFLAGS=\"-O2\":OPTFLAGS=\"\":g" \
-		configure.orig >configure
-
-	epatch "${FILESDIR}/d4x-${PV}-stdint.patch"
-}
-
-src_compile() {
-
-	myconf=""
-	append-flags -D_FILE_OFFSET_BITS=64
-
-	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 share/*.png share/*.xpm
-
-	if use kde
-	then
-		insinto /usr/share/applnk/Internet
-		newins share/nt.desktop d4x.desktop
-	fi
-
-	if use gnome
-	then
-		echo "Categories=Application;Network;" >> ${S}/share/nt.desktop
-		insinto /usr/share/applications
-		newins share/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/d4x-2.5.6.ebuild b/net-misc/d4x/d4x-2.5.6.ebuild
index 02e9f9242d4e..52a773ef8f8a 100644
--- a/net-misc/d4x/d4x-2.5.6.ebuild
+++ b/net-misc/d4x/d4x-2.5.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/d4x-2.5.6.ebuild,v 1.2 2005/12/28 19:05:48 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/d4x-2.5.6.ebuild,v 1.3 2006/01/15 15:24:43 nelchael Exp $
 
 IUSE="nls esd gnome oss kde"
 
@@ -10,14 +10,14 @@ 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 ~amd64"
+KEYWORDS="~amd64 x86"
 SLOT="0"
 LICENSE="Artistic"
 
 DEPEND=">=x11-libs/gtk+-2.0.6
 	>=dev-libs/glib-2.0.6
 	>=sys-devel/gettext-0.11.2
-	>=dev-libs/openssl-0.9.7f
+	>=dev-libs/openssl-0.9.7e
 	esd? ( >=media-sound/esound-0.2.7 )"
 
 src_unpack() {
diff --git a/net-misc/d4x/files/d4x-2.5.0-fix-compile-gtk26.patch b/net-misc/d4x/files/d4x-2.5.0-fix-compile-gtk26.patch
deleted file mode 100644
index 0d30860fdfb0..000000000000
--- a/net-misc/d4x/files/d4x-2.5.0-fix-compile-gtk26.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- main/face/lod.cc.orig	2005-01-26 17:36:46.380944672 +0100
-+++ main/face/lod.cc	2005-01-26 17:36:52.208058816 +0100
-@@ -127,20 +127,20 @@
- 
- /***************************************************************/
- 
--struct GtkCellRendererProgress{
-+struct GtkCellRendererProgressd4x{
- 	GtkCellRenderer parent;
- 	gfloat percent;
- 	tDownload *dwn;
- };
- 
--struct GtkCellRendererProgressClass{
-+struct GtkCellRendererProgressd4xClass{
- 	GtkCellRendererClass parent_class;
- };
- 
--GtkType          gtk_cell_renderer_progress_get_type (void);
-+//GtkType          gtk_cell_renderer_progress_get_type (void);
--GtkCellRenderer *gtk_cell_renderer_progress_new      (void);
-+//GtkCellRenderer *gtk_cell_renderer_progress_new      (void);
- 
--static void gtk_cell_renderer_progress_init (GtkCellRendererProgress *cellpixbuf){
-+static void gtk_cell_renderer_progress_init (GtkCellRendererProgressd4x *cellpixbuf){
- };
- 
- static void
-@@ -172,7 +172,7 @@
- 					 guint         param_id,
- 					 const GValue *value,
- 					 GParamSpec   *pspec){
--	GtkCellRendererProgress *renderer = (GtkCellRendererProgress *)object;
-+	GtkCellRendererProgressd4x *renderer = (GtkCellRendererProgressd4x *)object;
- 	switch (param_id){
- 	case 1:
- 		renderer->percent=g_value_get_float(value);
-@@ -195,7 +195,7 @@
- 				   GdkRectangle       *expose_area,
- 				   GtkCellRendererState flags){
- 	char tmpc[100];
--	float p=((GtkCellRendererProgress*)cell)->percent;
-+	float p=((GtkCellRendererProgressd4x*)cell)->percent;
- 
- 	if (p>99.0 && p<100.0)
- 		sprintf(tmpc,"%.1f",p);
-@@ -223,7 +223,7 @@
- 	switch (CFG.PROGRESS_MODE){
- 	case 2:{
- 		if (p<=0) break;
--		tDownload *temp=((GtkCellRendererProgress*)cell)->dwn;;
-+		tDownload *temp=((GtkCellRendererProgressd4x*)cell)->dwn;;
- 		if (temp && temp->segments && temp->finfo.size>0){
- 			temp->segments->lock_public();
- 			tSegment *tmp=temp->segments->get_first();
-@@ -271,7 +271,7 @@
- };
- 
- 
--static void gtk_cell_renderer_progress_class_init (GtkCellRendererProgressClass *klass){
-+static void gtk_cell_renderer_progress_class_init (GtkCellRendererProgressd4xClass *klass){
- 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
- 	GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (klass);
- 
-@@ -300,19 +300,19 @@
- 	{
- 		static const GTypeInfo cell_progress_info =
- 		{
--			sizeof (GtkCellRendererProgressClass),
-+			sizeof (GtkCellRendererProgressd4xClass),
- 			NULL,		/* base_init */
- 			NULL,		/* base_finalize */
- 			(GClassInitFunc) gtk_cell_renderer_progress_class_init,
- 			NULL,		/* class_finalize */
- 			NULL,		/* class_data */
--			sizeof (GtkCellRendererProgress),
-+			sizeof (GtkCellRendererProgressd4x),
- 			0,              /* n_preallocs */
- 			(GInstanceInitFunc) gtk_cell_renderer_progress_init,
- 		};
- 
- 		cell_progress_type = g_type_register_static (GTK_TYPE_CELL_RENDERER,
--							     "GtkCellRendererProgress",
-+							     "GtkCellRendererProgressd4x",
- 							     &cell_progress_info,
- 							     GTypeFlags(0));
- 	}
diff --git a/net-misc/d4x/files/d4x-2.5.0_rc2-gtk24.patch b/net-misc/d4x/files/d4x-2.5.0_rc2-gtk24.patch
deleted file mode 100644
index 43bb85ce249c..000000000000
--- a/net-misc/d4x/files/d4x-2.5.0_rc2-gtk24.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.old	2004-04-29 16:07:43.000000000 +0100
-+++ configure	2004-04-29 16:07:51.000000000 +0100
-@@ -14535,10 +14535,6 @@
- _ACEOF
- 
- 
--cat >>confdefs.h <<\_ACEOF
--#define GTK_DISABLE_DEPRECATED
--_ACEOF
--
- 
- # Prepare all requiered flags
- CXXFLAGS="$CXXFLAGS $OS_CXXFLAGS"
diff --git a/net-misc/d4x/files/d4x-2.5.0_rc4-fix-cast.patch b/net-misc/d4x/files/d4x-2.5.0_rc4-fix-cast.patch
deleted file mode 100644
index 9d04511f0cd0..000000000000
--- a/net-misc/d4x/files/d4x-2.5.0_rc4-fix-cast.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- d4x-2.5.0rc4/main/face/misc.cc.orig	2004-06-16 14:49:59.235168784 +0200
-+++ d4x-2.5.0rc4/main/face/misc.cc	2004-06-16 14:55:39.809393632 +0200
-@@ -329,5 +329,6 @@
- };
- 
- gchar *d4x_menu_translate_func(const gchar *label,gpointer data){
--	return _(label);
-+	gchar *retval = (gchar *)label;
-+	return _(retval);
- };
diff --git a/net-misc/d4x/files/d4x-2.5.5-stdint.patch b/net-misc/d4x/files/d4x-2.5.5-stdint.patch
deleted file mode 100644
index bce746abc4bd..000000000000
--- a/net-misc/d4x/files/d4x-2.5.5-stdint.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru d4x-2.5.5/main/base64.cc d4x-2.5.5.patched/main/base64.cc
---- d4x-2.5.5/main/base64.cc	2005-09-16 06:32:16.000000000 +0200
-+++ d4x-2.5.5.patched/main/base64.cc	2005-09-26 20:42:33.000000000 +0200
-@@ -13,6 +13,7 @@
- #include "base64.h"
- #include <string.h>
- #include <stdio.h>
-+#include <stdint.h>
- 
- char Table64[64]={  'A','B','C','D','E','F','G','H',
- 		    'I','J','K','L','M','N','O','P',
diff --git a/net-misc/d4x/files/digest-d4x-2.5.0-r1 b/net-misc/d4x/files/digest-d4x-2.5.0-r1
deleted file mode 100644
index 3361a17ec683..000000000000
--- a/net-misc/d4x/files/digest-d4x-2.5.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c2b2f5571c2028dd845563e69a1d55c3 d4x-2.5.0final.tar.gz 1766770
diff --git a/net-misc/d4x/files/digest-d4x-2.5.5 b/net-misc/d4x/files/digest-d4x-2.5.5
deleted file mode 100644
index c09ba49c7d85..000000000000
--- a/net-misc/d4x/files/digest-d4x-2.5.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eadf98c2069c93e43992acd286e59b3d d4x-2.5.5.tar.gz 1947839