diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2007-11-26 19:32:47 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2007-11-26 19:32:47 +0000 |
commit | ccf51628186443cbc57e14644b94ff031f4647ac (patch) | |
tree | 8ce943d1706e6c1bb8477f2ed1fdfa8e7b43aa4b /net-p2p/hrktorrent | |
parent | Stable on ppc64; bug #195095 (diff) | |
download | historical-ccf51628186443cbc57e14644b94ff031f4647ac.tar.gz historical-ccf51628186443cbc57e14644b94ff031f4647ac.tar.bz2 historical-ccf51628186443cbc57e14644b94ff031f4647ac.zip |
Makefile was confusing LDFLAGS with LIBS, CFLAGS with CXXFLAGS, add a patch for it. Keyword ~amd64 wrt #200409.
Package-Manager: portage-2.1.4_rc3
Diffstat (limited to 'net-p2p/hrktorrent')
-rw-r--r-- | net-p2p/hrktorrent/ChangeLog | 7 | ||||
-rw-r--r-- | net-p2p/hrktorrent/Manifest | 20 | ||||
-rw-r--r-- | net-p2p/hrktorrent/files/hrktorrent-0.2.2-Makefile.patch | 26 | ||||
-rw-r--r-- | net-p2p/hrktorrent/hrktorrent-0.2.2.ebuild | 38 |
4 files changed, 65 insertions, 26 deletions
diff --git a/net-p2p/hrktorrent/ChangeLog b/net-p2p/hrktorrent/ChangeLog index 16c26dfb34aa..2d93c0797949 100644 --- a/net-p2p/hrktorrent/ChangeLog +++ b/net-p2p/hrktorrent/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-p2p/hrktorrent # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/hrktorrent/ChangeLog,v 1.2 2007/11/26 17:46:17 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/hrktorrent/ChangeLog,v 1.3 2007/11/26 19:32:46 drac Exp $ + + 26 Nov 2007; Samuli Suominen <drac@gentoo.org> + +files/hrktorrent-0.2.2-Makefile.patch, hrktorrent-0.2.2.ebuild: + Makefile was confusing LDFLAGS with LIBS, CFLAGS with CXXFLAGS, add a patch + for it. Keyword ~amd64 wrt #200409. *hrktorrent-0.2.2 (26 Nov 2007) diff --git a/net-p2p/hrktorrent/Manifest b/net-p2p/hrktorrent/Manifest index 448de39811e9..9cd9b832b948 100644 --- a/net-p2p/hrktorrent/Manifest +++ b/net-p2p/hrktorrent/Manifest @@ -1,12 +1,16 @@ +AUX hrktorrent-0.2.2-Makefile.patch 715 RMD160 37e2571739d371c2c743e6eeb0bb5df59cb5f6f3 SHA1 b5df4b63570783b30c1e4dbd5b53249d775a7aec SHA256 36321895127379416f0fc6949698ba982a146f1cb101eddc52eb9d46781864e7 +MD5 a49ba48bc5295fdc12cc119471597a38 files/hrktorrent-0.2.2-Makefile.patch 715 +RMD160 37e2571739d371c2c743e6eeb0bb5df59cb5f6f3 files/hrktorrent-0.2.2-Makefile.patch 715 +SHA256 36321895127379416f0fc6949698ba982a146f1cb101eddc52eb9d46781864e7 files/hrktorrent-0.2.2-Makefile.patch 715 DIST hrktorrent-0.2.2.tar.bz2 5477 RMD160 b03efd8ea652912fd6334f52297e4b51807a68b7 SHA1 55450bd27022eb5bce77dd3d48568f8db6b69578 SHA256 6afffa0d1478341ce2b871dc49352b2574e259592e4f4468c95713d2afd1790b -EBUILD hrktorrent-0.2.2.ebuild 1236 RMD160 ee85c2e6e104d764ff67240be7092743663d6e19 SHA1 0dba2516a4bcd14330e9594359d33bacf7061375 SHA256 e6d8aabc5b211560569147889bc4d75cd488cb629be7d2467b8fd9671e7afbac -MD5 de9f921e394765a6ff1837c54be4e3e0 hrktorrent-0.2.2.ebuild 1236 -RMD160 ee85c2e6e104d764ff67240be7092743663d6e19 hrktorrent-0.2.2.ebuild 1236 -SHA256 e6d8aabc5b211560569147889bc4d75cd488cb629be7d2467b8fd9671e7afbac hrktorrent-0.2.2.ebuild 1236 -MISC ChangeLog 553 RMD160 8a07927377d1d2fe7436d615a66b373212efa740 SHA1 bd21f676b2483c752c6c950566757f68f38b27b1 SHA256 11967aa0b060fa60fd3ff6446c2bd56a93abe8feb461c85541511ee86d0ed208 -MD5 1dda4317e048ff84172d569d13ad756d ChangeLog 553 -RMD160 8a07927377d1d2fe7436d615a66b373212efa740 ChangeLog 553 -SHA256 11967aa0b060fa60fd3ff6446c2bd56a93abe8feb461c85541511ee86d0ed208 ChangeLog 553 +EBUILD hrktorrent-0.2.2.ebuild 1191 RMD160 98d78f8770cdf897de62d844f25c9a6360cce98e SHA1 961c4ea2bfd958bb9de91edecc2fd339b96f3f6e SHA256 26a1cb9e28b98d31956fdc8b232c9ce63c5640416b7e3ed22842967e366c078b +MD5 b92f7ea799c6c65493c4bfe5c02b935c hrktorrent-0.2.2.ebuild 1191 +RMD160 98d78f8770cdf897de62d844f25c9a6360cce98e hrktorrent-0.2.2.ebuild 1191 +SHA256 26a1cb9e28b98d31956fdc8b232c9ce63c5640416b7e3ed22842967e366c078b hrktorrent-0.2.2.ebuild 1191 +MISC ChangeLog 783 RMD160 53709b6e074db49fe18335f040c89946177294df SHA1 339c2a0e1fb5b58448f08aabf88014a6d990a9d4 SHA256 c095455c4e1f670c6247975a3ce9e2738a5ddaf7e57feee5341592d5259d86bf +MD5 ed04e1152d4239f30fc87fd1be771210 ChangeLog 783 +RMD160 53709b6e074db49fe18335f040c89946177294df ChangeLog 783 +SHA256 c095455c4e1f670c6247975a3ce9e2738a5ddaf7e57feee5341592d5259d86bf ChangeLog 783 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd metadata.xml 160 diff --git a/net-p2p/hrktorrent/files/hrktorrent-0.2.2-Makefile.patch b/net-p2p/hrktorrent/files/hrktorrent-0.2.2-Makefile.patch new file mode 100644 index 000000000000..660d53cd12e7 --- /dev/null +++ b/net-p2p/hrktorrent/files/hrktorrent-0.2.2-Makefile.patch @@ -0,0 +1,26 @@ +diff -ur hrktorrent-0.2.2.orig/Makefile hrktorrent-0.2.2/Makefile +--- hrktorrent-0.2.2.orig/Makefile 2007-11-25 17:17:16.000000000 +0200 ++++ hrktorrent-0.2.2/Makefile 2007-11-26 21:26:51.000000000 +0200 +@@ -1,17 +1,17 @@ +-C = g++ ++CXX = g++ + OBJ = main.o core.o settings.o utils.o + OUT = hrktorrent + +-CFLAGS = `pkg-config --cflags libtorrent` -O2 -pipe +-LDFLAGS = `pkg-config --libs libtorrent` -lpthread ++CXXFLAGS += `pkg-config --cflags libtorrent` ++LIBS = `pkg-config --libs libtorrent` -lpthread + + all: $(OUT) + + %.o: %.cpp +- $(C) -c -o $@ $< ++ $(CXX) $(CXXFLAGS) -c -o $@ $< + + $(OUT): $(OBJ) +- $(C) $(LDFLAGS) $(OBJ) -o $(OUT) ++ $(CXX) $(LDFLAGS) $(OBJ) $(LIBS) -o $(OUT) + + clean: + rm -rf $(OBJ) $(OUT) diff --git a/net-p2p/hrktorrent/hrktorrent-0.2.2.ebuild b/net-p2p/hrktorrent/hrktorrent-0.2.2.ebuild index bdc53f5856ef..56e325b12b0b 100644 --- a/net-p2p/hrktorrent/hrktorrent-0.2.2.ebuild +++ b/net-p2p/hrktorrent/hrktorrent-0.2.2.ebuild @@ -1,41 +1,45 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/hrktorrent/hrktorrent-0.2.2.ebuild,v 1.1 2007/11/26 17:46:17 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/hrktorrent/hrktorrent-0.2.2.ebuild,v 1.2 2007/11/26 19:32:46 drac Exp $ -inherit toolchain-funcs +inherit eutils toolchain-funcs DESCRIPTION="A slim rb_libtorrent based console torrent application supporting DHT" -HOMEPAGE="http://henrik.unit5.ca/hrktorrent/" -SRC_URI="http://henrik.unit5.ca/hrktorrent/${P}.tar.bz2" +HOMEPAGE="http://henrik.unit5.ca/hrktorrent" +SRC_URI="http://henrik.unit5.ca/${PN}/${P}.tar.bz2" LICENSE="BSD" SLOT="0" -KEYWORDS="~x86" +KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND="dev-cpp/asio - =net-libs/rb_libtorrent-0.12" -DEPEND="${RDEPEND}" +RDEPEND="=net-libs/rb_libtorrent-0.12*" +DEPEND="${RDEPEND} + dev-cpp/asio + dev-util/pkgconfig" src_unpack() { unpack ${A} cd "${S}" + # Makefile is confusing LIBS with LDFLAGS and CFLAGS with CXXFLAGS. + epatch "${FILESDIR}"/${P}-Makefile.patch +} - # Respect CFLAGS, call g++ correctly, and don't strip - sed -i -e "s/-O2 -pipe/${CFLAGS}/g" -e "s/g++/$(tc-getCXX)/g" \ - -e "s/-lpthread -s/-lpthread/g" -e "s/\$(C) -c/\$(C) \$(CFLAGS) -c/g" \ - Makefile || die "sed failed" +src_compile() { + emake CXX="$(tc-getCXX)" || die "emake failed." } src_install() { - dodir /usr/bin - cp "${WORKDIR}/${P}/hrktorrent" "${D}/usr/bin" || die "install failed" - dodoc CHANGELOG README hrktorrent.rc.example + dobin ${PN} + doman ${PN}.1 + dodoc CHANGELOG README ${PN}.rc.example } pkg_postinst() { - elog "A sample configuration file for ${PN} can be found" - elog "in /usr/share/doc/${PF}/hrktorrent.rc.example.{gz,bz2}" + local docsuffix=$(ecompress --suffix) + + elog "A sample configuration file for ${PN} can be found in" + elog "/usr/share/doc/${PF}/hrktorrent.rc.example${docsuffix}" elog "To use a config file, extract it, put it in your home directory" elog "and name it \".hrktorrent.rc\"" } |