Import Debian patchset. This will link against system libbz2 wrt #298100 and rename manpage wrt #295843.

(Portage version: 2.2_rc63/cvs/Linux x86_64)

3 files changed, 58 insertions, 42 deletions

diff --git a/net-p2p/microdc2/ChangeLog b/net-p2p/microdc2/ChangeLog
index c5b451bfc58b..b50484500a70 100644
--- a/net-p2p/microdc2/ChangeLog
+++ b/net-p2p/microdc2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/microdc2
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/microdc2/ChangeLog,v 1.4 2009/11/08 19:36:27 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/microdc2/ChangeLog,v 1.5 2010/03/06 16:23:01 ssuominen Exp $
+
+*microdc2-0.15.6-r2 (06 Mar 2010)
+
+  06 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +microdc2-0.15.6-r2.ebuild:
+  Import Debian patchset. This will link against system libbz2 wrt #298100
+  and rename manpage wrt #295843.
 
 *microdc2-0.15.6-r1 (08 Nov 2009)
 
diff --git a/net-p2p/microdc2/microdc2-0.15.6-r1.ebuild b/net-p2p/microdc2/microdc2-0.15.6-r1.ebuild
deleted file mode 100644
index 7381f8b0c8ea..000000000000
--- a/net-p2p/microdc2/microdc2-0.15.6-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/microdc2/microdc2-0.15.6-r1.ebuild,v 1.1 2009/11/08 19:30:29 armin76 Exp $
-
-inherit eutils
-
-DESCRIPTION="A small command-line based Direct Connect client"
-HOMEPAGE="http://corsair626.no-ip.org/microdc/"
-SRC_URI="http://corsair626.no-ip.org/microdc/${P}.tar.gz
-	mirror://gentoo/${P}-patches-0.1.tar.bz2
-	http://dev.gentoo.org/~armin76/dist/${P}-patches-0.1.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-DEPEND=">=dev-libs/libxml2-2.6.16
-	sys-libs/ncurses
-	>=sys-libs/readline-4
-	nls? ( sys-devel/gettext )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	EPATCH_SOURCE="${WORKDIR}/patch" EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" epatch
-}
-
-src_compile() {
-	econf $(use_enable nls) || die "econf failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README doc/*
-}
diff --git a/net-p2p/microdc2/microdc2-0.15.6-r2.ebuild b/net-p2p/microdc2/microdc2-0.15.6-r2.ebuild
new file mode 100644
index 000000000000..08011896421b
--- /dev/null
+++ b/net-p2p/microdc2/microdc2-0.15.6-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/microdc2/microdc2-0.15.6-r2.ebuild,v 1.1 2010/03/06 16:23:01 ssuominen Exp $
+
+inherit autotools eutils
+
+DESCRIPTION="A small command-line based Direct Connect client"
+HOMEPAGE="http://corsair626.no-ip.org/microdc/"
+SRC_URI="http://corsair626.no-ip.org/microdc/${P}.tar.gz
+	mirror://debian/pool/main/m/${PN}/${PN}_${PV}-1.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="app-arch/bzip2
+	>=dev-libs/libxml2-2.6.16
+	sys-libs/ncurses
+	>=sys-libs/readline-4"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	local dpatch="${WORKDIR}/debian/patches"
+
+	epatch \
+		"${dpatch}"/disable-libxml2-version-check \
+		"${dpatch}"/rename-manpage \
+		"${dpatch}"/disable-make-tthsum \
+		"${dpatch}"/debian-link-system-bz2
+
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		$(use_enable nls)
+
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README doc/*
+}