Drop old && fix bug 162640 as-needed, thanks to TGL <degrenier at easyconnect dot...

Package-Manager: portage-2.1.2-r1

diff --git a/net-p2p/ctorrent/ChangeLog b/net-p2p/ctorrent/ChangeLog
index 7e0ed4cab057607812645557fed399a51f015fdf..33e04e1e7551ed93708ce44fe4111249fa6632e3 100644 (file)
--- a/net-p2p/ctorrent/ChangeLog
+++ b/net-p2p/ctorrent/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/ctorrent
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/ctorrent/ChangeLog,v 1.18 2007/01/16 19:08:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ctorrent/ChangeLog,v 1.19 2007/01/20 14:17:55 armin76 Exp $
+
+  20 Jan 2007; Raúl Porcel <armin76@gentoo.org> +files/as-needed.patch,
+  -ctorrent-1.3.4-r2.ebuild, ctorrent-2.2.ebuild:
+  Drop old && fix bug 162640 as-needed, thanks to TGL <degrenier at
+  easyconnect dot fr> for the patch and zzam for testing
 
 *ctorrent-2.2 (16 Jan 2007)
 

diff --git a/net-p2p/ctorrent/Manifest b/net-p2p/ctorrent/Manifest
index e4a8b9d771f2d082deb077e590aadef4c0161596..c1c548c73ebb2ea81bc9f7c0c78f75b71a63a4b7 100644 (file)
--- a/net-p2p/ctorrent/Manifest
+++ b/net-p2p/ctorrent/Manifest
@@ -1,3 +1,7 @@
+AUX as-needed.patch 916 RMD160 75e4e41a6ea9358ffe773dcaae8dd70fbd7833e2 SHA1 23c6fdea278a6596e012e2b68002d4151f02a076 SHA256 1bf9f954ecf2870caa86c45829ebe593ea65f5f69a7bd07d9c968c9a5f92635e
+MD5 e9d13448cc2da2f973f0dffbf9728d2d files/as-needed.patch 916
+RMD160 75e4e41a6ea9358ffe773dcaae8dd70fbd7833e2 files/as-needed.patch 916
+SHA256 1bf9f954ecf2870caa86c45829ebe593ea65f5f69a7bd07d9c968c9a5f92635e files/as-needed.patch 916
 AUX ctorrent-1.3.4-dnh2-SHA.patch 2019 RMD160 6bcf4669767c6c21e187de89a2495eea05e62044 SHA1 350e14fb81d8fd3e84304e280c133a53d7dda038 SHA256 d3b691656ea2c3e3646ecf88d352f63fd322762274394757c91fa9e69874ab2a
 MD5 85504636c784937c49cdfde00c64711a files/ctorrent-1.3.4-dnh2-SHA.patch 2019
 RMD160 6bcf4669767c6c21e187de89a2495eea05e62044 files/ctorrent-1.3.4-dnh2-SHA.patch 2019
@@ -8,31 +12,23 @@ RMD160 043454e33d9f889bb6037924a42893c01d2b9c0e files/ctorrent-1.3.4-dnh2-vfat.p
 SHA256 c9ff4b54424f25592d6a4f0a1aa57d9f39b649b5457366d7112e94fd3857cb55 files/ctorrent-1.3.4-dnh2-vfat.patch 440
 DIST ctorrent-1.3.4-dnh2.2.tar.gz 148929 RMD160 334296564816eccb6877d4c161acdcbd30c215da SHA1 7a5be8acdbab07ae5e2c3359bd9ffa0f95e0a9e4 SHA256 a4af9334acddcdf56be12973898a481b4446d5d299e8937807b46cd194364853
 DIST ctorrent-1.3.4.tar.bz2 87333 RMD160 0cf6a89e8e29a1c3fad087e1c666941c6ecd73b9 SHA1 bf1ea430513dc6de48de5ac429cdac57ceab738d SHA256 7e2ef5d0656ac23cecd03374d9b00291a55b274c972adfe94d6f41ae3ba60c73
-DIST patchset-ctorrent-1.3.4-dnh1.diff 74172 RMD160 b1039a2cf7f9986cdfc23245f9a4407a52257f99 SHA1 ae8f07623865ee0cf11218a7bc22a5f4eb70b622 SHA256 720e3ac7b296e46ccaf9eea569b31f8055029754dbc1bc47660cbdacb59639e9
 DIST patchset-ctorrent-1.3.4-dnh2.diff 394735 RMD160 3eda43626e9583e8aabadec58df973b879ea9283 SHA1 9edd6f2cda405b20f394a8c716cac63dade7f83e SHA256 e54966def9c541bef97a08eb303e82c91af919536c06108c8582632e451da318
-EBUILD ctorrent-1.3.4-r2.ebuild 731 RMD160 63759c35fbcc5c0f8194de9672984b2e8bbfd042 SHA1 16a04f0aeb396f4f3a3cec96b7eef7100f2c173f SHA256 d70ab898e560eb372664401d0f359dd93c12f78ae45d8e76bdb2f7ec9bf22edb
-MD5 bde774b71bced2047d36a89310c04297 ctorrent-1.3.4-r2.ebuild 731
-RMD160 63759c35fbcc5c0f8194de9672984b2e8bbfd042 ctorrent-1.3.4-r2.ebuild 731
-SHA256 d70ab898e560eb372664401d0f359dd93c12f78ae45d8e76bdb2f7ec9bf22edb ctorrent-1.3.4-r2.ebuild 731
 EBUILD ctorrent-1.3.4-r3.ebuild 916 RMD160 a33d34aad32413b5dd821a70ffa9c71a9d204fb4 SHA1 4ba5739d853c36c738cb12d5a8614205ed13ab75 SHA256 5da1bb0d7ff0fa91a419391fc39965e9c52ee02d0a5a4bb6901385c7effa39f6
 MD5 f3d8f72b38ddb0277c40708da187c335 ctorrent-1.3.4-r3.ebuild 916
 RMD160 a33d34aad32413b5dd821a70ffa9c71a9d204fb4 ctorrent-1.3.4-r3.ebuild 916
 SHA256 5da1bb0d7ff0fa91a419391fc39965e9c52ee02d0a5a4bb6901385c7effa39f6 ctorrent-1.3.4-r3.ebuild 916
-EBUILD ctorrent-2.2.ebuild 783 RMD160 4496de20e0fa6fc9488777a7c988403baa2a2156 SHA1 da83b64d2f6dceb6e35ae5ea5dda6aa7adb9bb72 SHA256 c9f166e6fd867d6209a7555ebb02494aab4e2236ff68f1f6123fe2264c97e5ee
-MD5 d977f3eba698735048c8b1da88244871 ctorrent-2.2.ebuild 783
-RMD160 4496de20e0fa6fc9488777a7c988403baa2a2156 ctorrent-2.2.ebuild 783
-SHA256 c9f166e6fd867d6209a7555ebb02494aab4e2236ff68f1f6123fe2264c97e5ee ctorrent-2.2.ebuild 783
-MISC ChangeLog 2619 RMD160 56dd5dfcec51c2977f00ec6964836e6253bc86e7 SHA1 980e7d06ce38b7a94399ca5ffca522d773ae21b0 SHA256 c19f46eaf92ff69d22723391c7c7e9f384a94b0ca2e2fc537bf12ffd836bb7bc
-MD5 270f94b08caf8cd752b6f99bbbbbd3de ChangeLog 2619
-RMD160 56dd5dfcec51c2977f00ec6964836e6253bc86e7 ChangeLog 2619
-SHA256 c19f46eaf92ff69d22723391c7c7e9f384a94b0ca2e2fc537bf12ffd836bb7bc ChangeLog 2619
+EBUILD ctorrent-2.2.ebuild 863 RMD160 03c7072509fc74489a1f38b91840cf4d04980203 SHA1 9c3163ccf2b28a70b3fe0eeb9a5ee132e49c0b6d SHA256 a69950c28a6fda4f9bc46f56ac606a37b65b5e5c4ef01c5646a1f4f3fa2185eb
+MD5 42f125a84d416eaaa63fab5645005de8 ctorrent-2.2.ebuild 863
+RMD160 03c7072509fc74489a1f38b91840cf4d04980203 ctorrent-2.2.ebuild 863
+SHA256 a69950c28a6fda4f9bc46f56ac606a37b65b5e5c4ef01c5646a1f4f3fa2185eb ctorrent-2.2.ebuild 863
+MISC ChangeLog 2868 RMD160 bb963028bc3b32e54d1745c229bd18c443407b67 SHA1 bd3a968392f938fb4820bd18d6ca10fbe73fb357 SHA256 9101074d1da15c2ea2724a70b0850ddb6b3fde0fb15254a916baf4e7c61fc9eb
+MD5 9f49769dd67a8ca05af59d6d41fe22ba ChangeLog 2868
+RMD160 bb963028bc3b32e54d1745c229bd18c443407b67 ChangeLog 2868
+SHA256 9101074d1da15c2ea2724a70b0850ddb6b3fde0fb15254a916baf4e7c61fc9eb ChangeLog 2868
 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd metadata.xml 160
 SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f metadata.xml 160
-MD5 131dbc9d2a3354eeff8d1b5fa7972655 files/digest-ctorrent-1.3.4-r2 521
-RMD160 33b350c2786abc6e2d967a8d388ffe6d0e87d49e files/digest-ctorrent-1.3.4-r2 521
-SHA256 153c5a43b28351edfde588b6739355d13b7e46c85251105ebcabbe6fcff89b45 files/digest-ctorrent-1.3.4-r2 521
 MD5 d3205b8095489ab0b54fe9eaaaf0bc29 files/digest-ctorrent-1.3.4-r3 524
 RMD160 f7dbcab448a8eed92d35d81df62285cdd256f93d files/digest-ctorrent-1.3.4-r3 524
 SHA256 2f20f34eee0bed29d1d1fff9496f3072473cfbef26c8a355434ddd44180ab62b files/digest-ctorrent-1.3.4-r3 524

diff --git a/net-p2p/ctorrent/ctorrent-1.3.4-r2.ebuild b/net-p2p/ctorrent/ctorrent-1.3.4-r2.ebuild
deleted file mode 100644 (file)
index 9d7ca01..0000000
--- a/net-p2p/ctorrent/ctorrent-1.3.4-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/ctorrent/ctorrent-1.3.4-r2.ebuild,v 1.5 2006/05/12 02:51:09 tsunam Exp $
-
-inherit eutils
-
-DESCRIPTION="CTorrent is a BitTorrent console client written in C."
-HOMEPAGE="http://ctorrent.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-       http://www.rahul.net/dholmes/ctorrent/patchset-${P}-dnh1.diff"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE=""
-
-DEPEND=">=sys-apps/sed-4
-       dev-libs/openssl"
-
-src_unpack()
-{
-       unpack ${A}
-       cd ${S}
-
-       epatch ${DISTDIR}/patchset-${P}-dnh1.diff
-}
-
-src_install() {
-       make DESTDIR=${D} install || die
-       dodoc README NEWS
-}

diff --git a/net-p2p/ctorrent/ctorrent-2.2.ebuild b/net-p2p/ctorrent/ctorrent-2.2.ebuild
index 1b7473f64f752a21ce1250beec5fa8c62ee7b3b8..cfa07cc8dc2efa735799e901251e3fbbf13c4c6f 100644 (file)
--- a/net-p2p/ctorrent/ctorrent-2.2.ebuild
+++ b/net-p2p/ctorrent/ctorrent-2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/ctorrent/ctorrent-2.2.ebuild,v 1.1 2007/01/16 19:08:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ctorrent/ctorrent-2.2.ebuild,v 1.2 2007/01/20 14:17:55 armin76 Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -21,6 +21,12 @@ S="${WORKDIR}/${PN}-dnh${PV}"
 DEPEND=">=sys-apps/sed-4
        dev-libs/openssl"
 
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       epatch "${FILESDIR}"/as-needed.patch
+}
+
 src_install() {
        emake DESTDIR="${D}" install || die "emake install failed"
        dodoc README-DNH.TXT README NEWS

diff --git a/net-p2p/ctorrent/files/as-needed.patch b/net-p2p/ctorrent/files/as-needed.patch
new file mode 100644 (file)
index 0000000..cc43be0
--- /dev/null
+++ b/net-p2p/ctorrent/files/as-needed.patch
@@ -0,0 +1,28 @@
+--- btcontent.cpp.orig 2007-01-19 00:12:24.000000000 +0100
++++ btcontent.cpp      2007-01-19 00:12:35.000000000 +0100
+@@ -9,9 +9,9 @@
+ #else
+ #include <unistd.h>
+ #include <sys/param.h>
+-#if defined(HAVE_LIBCRYPT) || defined(HAVE_LIBMD) || defined(HAVE_LIBCRYPTO)
++#if defined(HAVE_LIBCRYPT) || defined(HAVE_LIBMD)
+ #include <sha.h>
+-#elif defined(HAVE_LIBSSL)
++#elif defined(HAVE_LIBSSL) || defined(HAVE_LIBCRYPTO)
+ #include <openssl/sha.h>
+ #endif
+ #endif
+--- btfiles.cpp.orig   2007-01-19 00:17:04.000000000 +0100
++++ btfiles.cpp        2007-01-19 00:17:18.000000000 +0100
+@@ -8,9 +8,9 @@
+ #include <unistd.h>
+ #include <dirent.h>
+ #include <sys/param.h>
+-#if defined(HAVE_LIBCRYPT) || defined(HAVE_LIBMD) || defined(HAVE_LIBCRYPTO)
++#if defined(HAVE_LIBCRYPT) || defined(HAVE_LIBMD)
+ #include <sha.h>
+-#elif defined(HAVE_LIBSSL)
++#elif defined(HAVE_LIBSSL) || defined(HAVE_LIBCRYPTO)
+ #include <openssl/sha.h>
+ #endif
+ #endif

diff --git a/net-p2p/ctorrent/files/digest-ctorrent-1.3.4-r2 b/net-p2p/ctorrent/files/digest-ctorrent-1.3.4-r2
deleted file mode 100644 (file)
index b994b3b..0000000
--- a/net-p2p/ctorrent/files/digest-ctorrent-1.3.4-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 823010ec78215d476537c9eba9381cdd ctorrent-1.3.4.tar.bz2 87333
-RMD160 0cf6a89e8e29a1c3fad087e1c666941c6ecd73b9 ctorrent-1.3.4.tar.bz2 87333
-SHA256 7e2ef5d0656ac23cecd03374d9b00291a55b274c972adfe94d6f41ae3ba60c73 ctorrent-1.3.4.tar.bz2 87333
-MD5 319c7202281a87dc3a9e68f99b50741f patchset-ctorrent-1.3.4-dnh1.diff 74172
-RMD160 b1039a2cf7f9986cdfc23245f9a4407a52257f99 patchset-ctorrent-1.3.4-dnh1.diff 74172
-SHA256 720e3ac7b296e46ccaf9eea569b31f8055029754dbc1bc47660cbdacb59639e9 patchset-ctorrent-1.3.4-dnh1.diff 74172