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

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

diff --git a/net-p2p/microdc2/ChangeLog b/net-p2p/microdc2/ChangeLog
index c5b451bfc58b966c0154e2a20f6feae5d4b80bc0..b50484500a7082ea80e9fa944d0d94dcd5bc478d 100644 (file)
--- 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/Manifest b/net-p2p/microdc2/Manifest
index 8aca454568b3f9dfa606d024ce089481d34c0c54..1cb37d44ffd2cda0035f07e3e8b9d3359e557c94 100644 (file)
--- a/net-p2p/microdc2/Manifest
+++ b/net-p2p/microdc2/Manifest
@@ -1,5 +1,5 @@
-DIST microdc2-0.15.6-patches-0.1.tar.bz2 22794 RMD160 c5c4c1fbeb6a2cbe80f3c3d2cb89de6466dae622 SHA1 4c99a78ca03fda4a77e326e2197da58f737a504a SHA256 0bdc9562e4c73fe6842979982c066c6049e827d99b01836ab668706b65344fd4
 DIST microdc2-0.15.6.tar.gz 639392 RMD160 c7e05994c9012f4774c1de6eaea7ee3225c63336 SHA1 d39fedfb817203b70854aaff3a9e7fb2f2f317d2 SHA256 d1990eb1aa52115c649466011c8163e454272250b041e480f0a521212c04bc49
-EBUILD microdc2-0.15.6-r1.ebuild 1044 RMD160 e7c68f034922047091de0d83013e5e8eec037ae7 SHA1 c5081aa6a6196a20afdb55d3cd947f29accdbda9 SHA256 5bc546a951feed77a2ffbc70cdfdaf4afdbd223f0266723d83b9d7c626a1baa9
-MISC ChangeLog 696 RMD160 df94919b7847857283b228d5569e2a94e0551c43 SHA1 f73b1f54b78644312b4b111fc19d551de9efdb9e SHA256 73801ae8afa69425283b080f27d7893edd83e56930cfefec210e12b79fd38306
+DIST microdc2_0.15.6-1.debian.tar.gz 162790 RMD160 8a279ebadbc1e75f2ca6f97e6d6cc0d03e62f4ed SHA1 111742c5b44133fee05063322c5dfab5a9c57822 SHA256 3761ce9f6ea8b7ad77f21c9300cee9cc9570e6ab057d6c1b21edc8bb81f75665
+EBUILD microdc2-0.15.6-r2.ebuild 1110 RMD160 184d9ac1d82c7739ed35b659f2f5fd93d97009e9 SHA1 a7a26b233e53850becbda6da03ed9531fa6090c9 SHA256 8a70e2a0b8f444159f22b304f291164583ac66407570620037196a7d65dc3fd9
+MISC ChangeLog 927 RMD160 831604b62479a5899f5ea1dff019489a189f89c2 SHA1 7cfb39da4ec5a67fdccab827d90f535c5a49f247 SHA256 cd19b963a201f487476a3cedd5fd4ba045955c31409611c8dc98c884084b6d1e
 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f

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 (file)
index 7381f8b..0000000
--- 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 (file)
index 0000000..0801189
--- /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/*
+}