version bump and cleanup (#37018)

8 files changed, 17 insertions, 95 deletions

diff --git a/net-misc/d4x/ChangeLog b/net-misc/d4x/ChangeLog
index fef1c55463d1..dc5375fd2cf0 100644
--- a/net-misc/d4x/ChangeLog
+++ b/net-misc/d4x/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/d4x
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/ChangeLog,v 1.11 2003/08/31 14:54:23 liquidx Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/ChangeLog,v 1.12 2004/02/04 18:34:04 liquidx Exp $
+
+*d4x-2.5.0_rc2 (04 Feb 2004)
+
+  04 Feb 2004; Alastair Tse <liquidx@gentoo.org> d4x-2.4.1.ebuild,
+  d4x-2.5.0_beta2.ebuild, d4x-2.5.0_rc2.ebuild, metadata.xml:
+  version bump and cleanup (#37018)
 
 *d4x-2.5.0_beta2 (31 Aug 2003)
 
diff --git a/net-misc/d4x/Manifest b/net-misc/d4x/Manifest
index 4a024e7dd849..1b898fa993a5 100644
--- a/net-misc/d4x/Manifest
+++ b/net-misc/d4x/Manifest
@@ -1,11 +1,9 @@
-MD5 253d8a4ed77c60c845fc79aebfde3ff1 ChangeLog 2732
+MD5 75cd7d6ca753f59042651fdf7782e463 ChangeLog 2928
 MD5 8740947a3c0f83fced85e71bbeeb2c6f d4x-2.03.ebuild 1546
 MD5 f3600ffc94bb147861f7c457e7b29e64 d4x-2.4.1-r1.ebuild 1932
-MD5 6f424e73b4ad48577d90473b21f46a5e d4x-2.4.1.ebuild 1772
-MD5 6b8891e08052b7b10666456481404894 d4x-2.5.0_beta2.ebuild 1943
-MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
+MD5 3eb91190f89f156c189df23f1f0de2b0 d4x-2.5.0_rc2.ebuild 1941
+MD5 5d41ee33c5ff557bad7627cbc67c3b6f metadata.xml 224
 MD5 07dde74dfe302bab95327f285a5a16ba files/d4x-2.4.1-fix-statusbar-crash.patch 772
 MD5 724445bfed12d4bafd7bb97eef1d669c files/digest-d4x-2.03 61
-MD5 3e8783cc051415a9ee4f756fcc45c925 files/digest-d4x-2.4.1 62
 MD5 3e8783cc051415a9ee4f756fcc45c925 files/digest-d4x-2.4.1-r1 62
-MD5 bdfcea0af2b0e25cce97a40365fbebed files/digest-d4x-2.5.0_beta2 67
+MD5 fc389107a8b5d040a989fe1d220beb3e files/digest-d4x-2.5.0_rc2 65
diff --git a/net-misc/d4x/d4x-2.4.1.ebuild b/net-misc/d4x/d4x-2.4.1.ebuild
deleted file mode 100644
index 082981ec4352..000000000000
--- a/net-misc/d4x/d4x-2.4.1.ebuild
+++ /dev/null
@@ -1,81 +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-misc/d4x/d4x-2.4.1.ebuild,v 1.6 2003/09/05 22:01:48 msterret Exp $
-
-IUSE="nls esd gnome oss kde"
-
-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"
-SLOT="0"
-LICENSE="Artistic"
-
-DEPEND=">=x11-libs/gtk+-2.0.6
-	>=dev-libs/glib-2.0.6
-	>=sys-devel/gettext-0.11.2
-	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
-}
-
-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 share/*.png share/*.xpm
-
-	if [ -n "`use kde`" ]
-	then
-		insinto /usr/share/applnk/Internet
-		newins share/nt.desktop d4x.desktop
-	fi
-
-	if [ -n "`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.0_beta2.ebuild b/net-misc/d4x/d4x-2.5.0_rc2.ebuild
index d68e47f3d9d4..005d5a7b79a7 100644
--- a/net-misc/d4x/d4x-2.5.0_beta2.ebuild
+++ b/net-misc/d4x/d4x-2.5.0_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-misc/d4x/d4x-2.5.0_beta2.ebuild,v 1.2 2003/09/05 22:01:48 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/d4x-2.5.0_rc2.ebuild,v 1.1 2004/02/04 18:34:05 liquidx Exp $
 
 IUSE="nls esd gnome oss kde"
 
@@ -32,7 +32,7 @@ src_unpack() {
 
 	# Fix a miscompile with gcc-3.2.2 and CFLAGS="-O2"
 	# <azarah@gentoo.org> (30 Mar 2003)
-	epatch ${FILESDIR}/${PN}-2.4.1-fix-statusbar-crash.patch
+	#epatch ${FILESDIR}/${PN}-2.4.1-fix-statusbar-crash.patch
 }
 
 src_compile() {
diff --git a/net-misc/d4x/files/digest-d4x-2.4.1 b/net-misc/d4x/files/digest-d4x-2.4.1
deleted file mode 100644
index e611f2b3faa4..000000000000
--- a/net-misc/d4x/files/digest-d4x-2.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9ff1521a6c7ecedb6d71f1e1a6a6696a d4x-2.4.1.tar.gz 1390726
diff --git a/net-misc/d4x/files/digest-d4x-2.5.0_beta2 b/net-misc/d4x/files/digest-d4x-2.5.0_beta2
deleted file mode 100644
index d9f1b074d412..000000000000
--- a/net-misc/d4x/files/digest-d4x-2.5.0_beta2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3fa993748fee4e0066e09bb5ac2a12e3 d4x-2.5.0beta2.tar.gz 1451792
diff --git a/net-misc/d4x/files/digest-d4x-2.5.0_rc2 b/net-misc/d4x/files/digest-d4x-2.5.0_rc2
new file mode 100644
index 000000000000..b0d32ecd88b6
--- /dev/null
+++ b/net-misc/d4x/files/digest-d4x-2.5.0_rc2
@@ -0,0 +1 @@
+MD5 73b880b3c4e8a6e05bb88f9eac3e7bb4 d4x-2.5.0rc2.tar.gz 1536242
diff --git a/net-misc/d4x/metadata.xml b/net-misc/d4x/metadata.xml
index 76b9f6f406d5..312cab566b7d 100644
--- a/net-misc/d4x/metadata.xml
+++ b/net-misc/d4x/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>desktop-misc</herd>
 <maintainer><email>liquidx@gentoo.org</email></maintainer>
 </pkgmetadata>