diff options
| author |   Raúl Porcel <armin76@gentoo.org> | 2006-12-13 14:27:58 +0000 |
|---|---|---|
| committer | Raúl Porcel <armin76@gentoo.org> | 2006-12-13 14:27:58 +0000 |
| commit | 46f3b51069a5d37d94e67c3ccdf65e2c67041536 (patch) | |
| tree | 5ba58a865e89ccf1aaa600cca0d06e64acd59458 | |
| parent | new license for sci-biology/gmap: gmap (diff) | |
| download | sunrise-46f3b51069a5d37d94e67c3ccdf65e2c67041536.tar.gz sunrise-46f3b51069a5d37d94e67c3ccdf65e2c67041536.tar.bz2 sunrise-46f3b51069a5d37d94e67c3ccdf65e2c67041536.zip | |
net-libs/rb_libtorrent: make blocker of net-libs/libtorrent since they collide
svn path=/sunrise/; revision=2293
| -rw-r--r-- | net-libs/rb_libtorrent/ChangeLog | 4 | ||||
| -rw-r--r-- | net-libs/rb_libtorrent/Manifest | 16 | ||||
| -rw-r--r-- | net-libs/rb_libtorrent/rb_libtorrent-0.11.ebuild | 3 |
3 files changed, 14 insertions, 9 deletions
diff --git a/net-libs/rb_libtorrent/ChangeLog b/net-libs/rb_libtorrent/ChangeLog index 37731bcb5..90f89f2e5 100644 --- a/net-libs/rb_libtorrent/ChangeLog +++ b/net-libs/rb_libtorrent/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 13 Dec 2006; Raul Porcel (armin76) <armin76@gmail.com> + rb_libtorrent-0.11.ebuild: + make blocker of net-libs/libtorrent since they collide + 28 Nov 2006; Stefan Schweizer <genstef@gentoo.org> -rb_libtorrent-0.10.ebuild: remove obsolete old ebuilds, thanks pcheck diff --git a/net-libs/rb_libtorrent/Manifest b/net-libs/rb_libtorrent/Manifest index cca2e8970..9789f2a70 100644 --- a/net-libs/rb_libtorrent/Manifest +++ b/net-libs/rb_libtorrent/Manifest @@ -1,12 +1,12 @@ DIST libtorrent-0.11.tar.gz 1130537 RMD160 24e871a048fd085e24c60f1eaece6cd432d4d64b SHA1 166a2efc907b0b589ed3eb1e10c79c81c183d314 SHA256 f350e0af6b42c2cdb1f19008b00fe5f0b70236817f532a94bcb1e3ef6ebba0d7 -EBUILD rb_libtorrent-0.11.ebuild 1148 RMD160 67e31b1631c9e4f171f37a1ff7c922da3395ef77 SHA1 ffb1dd369968ccc7949d2f2a091c98aa319ac748 SHA256 c9c2aa3ff59bd2880d0915974a25cee9d85106f0fa9a47fcc222cabc1ef25798 -MD5 0234b57155a451dcc348f4f0dc1d35a4 rb_libtorrent-0.11.ebuild 1148 -RMD160 67e31b1631c9e4f171f37a1ff7c922da3395ef77 rb_libtorrent-0.11.ebuild 1148 -SHA256 c9c2aa3ff59bd2880d0915974a25cee9d85106f0fa9a47fcc222cabc1ef25798 rb_libtorrent-0.11.ebuild 1148 -MISC ChangeLog 1457 RMD160 f2f5d1e3ae4531befcd59e3c1c63482f0a26c762 SHA1 26531f2cba8a2f9d09c3a3412f51a71a2de763fc SHA256 583f693cb493a8ec0bb6a4c1bdb33f5724723e2a366522da35ce6dab51ac0d9f -MD5 1d450492cddf9dc1f6c3fdc7fa137de3 ChangeLog 1457 -RMD160 f2f5d1e3ae4531befcd59e3c1c63482f0a26c762 ChangeLog 1457 -SHA256 583f693cb493a8ec0bb6a4c1bdb33f5724723e2a366522da35ce6dab51ac0d9f ChangeLog 1457 +EBUILD rb_libtorrent-0.11.ebuild 1169 RMD160 c4babe4b2288721189722fdf7a93e58a84840c42 SHA1 d2b49eb1ec62e8eff6f4e2fc75c4d02f92009592 SHA256 2e848e64f23757ff941a1b2b88847e957a38700ec7faa2d6ba84a63dba16799f +MD5 ba1d3d540b8515433ffe55e654d6ab2a rb_libtorrent-0.11.ebuild 1169 +RMD160 c4babe4b2288721189722fdf7a93e58a84840c42 rb_libtorrent-0.11.ebuild 1169 +SHA256 2e848e64f23757ff941a1b2b88847e957a38700ec7faa2d6ba84a63dba16799f rb_libtorrent-0.11.ebuild 1169 +MISC ChangeLog 1601 RMD160 2d8b67bc04e1b924df437a60631573ab14b08974 SHA1 7c715a52ba1838cdd9fe524c935239db479b43ed SHA256 d3698e9662bf5ae3bdea93f1a0d4af6c1ae27114bfdcdbc5fa2c17ea385497a3 +MD5 fa3b8937dffdb748383d1d2a636379f0 ChangeLog 1601 +RMD160 2d8b67bc04e1b924df437a60631573ab14b08974 ChangeLog 1601 +SHA256 d3698e9662bf5ae3bdea93f1a0d4af6c1ae27114bfdcdbc5fa2c17ea385497a3 ChangeLog 1601 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170 diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.11.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.11.ebuild index c716fb165..23815eebe 100644 --- a/net-libs/rb_libtorrent/rb_libtorrent-0.11.ebuild +++ b/net-libs/rb_libtorrent/rb_libtorrent-0.11.ebuild @@ -18,7 +18,8 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="debug" -DEPEND="dev-libs/boost" +DEPEND="dev-libs/boost + !net-libs/rtorrent" RDEPEND="${DEPEND}" src_compile() { |