Cleanup ebuilds and make sure init.d script name matches that of the binaries.

Package-Manager: portage-2.1.2_rc4-r1

diff --git a/net-p2p/bittorrent/ChangeLog b/net-p2p/bittorrent/ChangeLog
index dbb82abefe1c0c65450a37d86562700fcb4d9c08..77fc38c41b9e2f2b6ff1ad5ed8c89e3511a387dd 100644 (file)
--- a/net-p2p/bittorrent/ChangeLog
+++ b/net-p2p/bittorrent/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/bittorrent
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/ChangeLog,v 1.93 2006/12/28 18:44:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/ChangeLog,v 1.94 2006/12/28 19:00:17 vapier Exp $
+
+  28 Dec 2006; Mike Frysinger <vapier@gentoo.org>
+  files/bittorrent-tracker.confd, files/bittorrent-tracker.initd,
+  bittorrent-4.4.0.ebuild, bittorrent-5.0.3.ebuild:
+  Cleanup ebuilds and make sure init.d script name matches that of the binaries.
 
 *bittorrent-5.0.3 (28 Dec 2006)
 

diff --git a/net-p2p/bittorrent/Manifest b/net-p2p/bittorrent/Manifest
index 00fba566997292556df31e9d5bdec7b17f3966eb..b968c62362e962ed6b813bd1d326c1a5b9f201db 100644 (file)
--- a/net-p2p/bittorrent/Manifest
+++ b/net-p2p/bittorrent/Manifest
@@ -1,72 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX bittorrent-tracker.confd 565 RMD160 d9ff91c65fee606eb536eb672d6a28f7d0cf4ba3 SHA1 e909a7e7c5b9dec428b4c2cf0d9bf06a714e3898 SHA256 b6094703dfc486b6e8d10885284479ee4f03308d7bed25d1411c28a8428d227d
-MD5 c200bdbccb6ccbf18bef6338363c1a4a files/bittorrent-tracker.confd 565
-RMD160 d9ff91c65fee606eb536eb672d6a28f7d0cf4ba3 files/bittorrent-tracker.confd 565
-SHA256 b6094703dfc486b6e8d10885284479ee4f03308d7bed25d1411c28a8428d227d files/bittorrent-tracker.confd 565
-AUX bittorrent-tracker.initd 648 RMD160 a809d2fd95eb7815f4d92a9810d418076fd78913 SHA1 dcfd953f04a68c351161c9b6c83032f697acd005 SHA256 d76bf22a11a998cd8daa8bcb9bedc4dc84d57a3a1cf2d60f4cc7a3ed3eab95c0
-MD5 48316c1ff208c04a7f2de73860fc48e6 files/bittorrent-tracker.initd 648
-RMD160 a809d2fd95eb7815f4d92a9810d418076fd78913 files/bittorrent-tracker.initd 648
-SHA256 d76bf22a11a998cd8daa8bcb9bedc4dc84d57a3a1cf2d60f4cc7a3ed3eab95c0 files/bittorrent-tracker.initd 648
-AUX btdownloadgui.desktop 160 RMD160 9485509f5f1f2536b2e789abe4eca53d3cfa702c SHA1 b36f3713aaebc1d7db8f8cfadb6d0cfd37079f7a SHA256 330391fa1d05e87b0b88a3a9264f8f6fcbe9a7add24be2e2be6eea9d67f83aca
-MD5 f458db18e2f8971ca1adc105b7936b36 files/btdownloadgui.desktop 160
-RMD160 9485509f5f1f2536b2e789abe4eca53d3cfa702c files/btdownloadgui.desktop 160
-SHA256 330391fa1d05e87b0b88a3a9264f8f6fcbe9a7add24be2e2be6eea9d67f83aca files/btdownloadgui.desktop 160
-AUX bttrack.conf 728 RMD160 52401b075386108c820a2637481b7a5f5b328360 SHA1 b466344ddf3a4ce64625d3bf603b3e2ed4a4ca77 SHA256 96de75052da899421daae857c98b71e4510d6be80b030a1d6ec905d64826aafb
-MD5 e7f2cc6381bf680bafc76c30bcb6eedf files/bttrack.conf 728
-RMD160 52401b075386108c820a2637481b7a5f5b328360 files/bttrack.conf 728
-SHA256 96de75052da899421daae857c98b71e4510d6be80b030a1d6ec905d64826aafb files/bttrack.conf 728
-AUX bttrack.rc 638 RMD160 11f3dda3b74ec720fc63885afad04000e01962c9 SHA1 a246443d9f235db7fcb8e51c4c4f416ffebbf0f1 SHA256 d789150c984eb9bc0704e598f96e7768800c56334ae5ace6673dcc6dd09e1d64
-MD5 17951ba211d03e5f0a86581cfe21fe71 files/bttrack.rc 638
-RMD160 11f3dda3b74ec720fc63885afad04000e01962c9 files/bttrack.rc 638
-SHA256 d789150c984eb9bc0704e598f96e7768800c56334ae5ace6673dcc6dd09e1d64 files/bttrack.rc 638
-AUX favicon.ico 13902 RMD160 9b8e4e83e7643f659473ae34d7d5bf48431298f8 SHA1 9eb872dad2a041740fe4e559dfda1aba2cdd5c89 SHA256 5647d176012b90ab0808b044469648a3ebdd5f85b6fa3891ac321d78e578fe7d
-MD5 b47216eb50334e4298d6ed60e44af84b files/favicon.ico 13902
-RMD160 9b8e4e83e7643f659473ae34d7d5bf48431298f8 files/favicon.ico 13902
-SHA256 5647d176012b90ab0808b044469648a3ebdd5f85b6fa3891ac321d78e578fe7d files/favicon.ico 13902
-DIST BitTorrent-3.4.2.zip 244989 RMD160 ef296e28559570463e46bee299b46ebce473f87a SHA1 e3c34b0988369e706564f24fc63d9921c6af8298 SHA256 aa7f169a6e896413bb39a63b2522fe830cc0e98fd4e58b6f8d0fda712816fed1
-DIST BitTorrent-4.2.2.tar.gz 2238224 RMD160 dd8a504490380b728d29b1d700abd8275c629a11 SHA1 c34c5ffe1b80b4d9ee5e7420da661d21017ddc74 SHA256 cd14416698064015292ad128ddf349747f2cbb6e06d3c0ffa49b7ddfeda254ff
-DIST BitTorrent-4.26.0.tar.gz 2475616 RMD160 f32850486b717e035b86f30c629f9d707ffc50af SHA1 a70a39d5791f66d88af7a538bbbd2bfe1e8cbb8a SHA256 5877bbe4193b56ea2cea68cdee913edd88b4d1ed6e54abcdbf1bd1d3c7e3e567
+AUX bittorrent-tracker.confd 565 RMD160 9a21fec4c8b654ed71ac0a1425943622cd1b525f SHA1 031d21178924dee7370fa9e5965d1d017001626d SHA256 c994ddd1670a274289043380db70f2f08829cf7c7747be9805ba31dce0e2bc86
+MD5 81c2d75d74ef8b0914346e4483164d68 files/bittorrent-tracker.confd 565
+RMD160 9a21fec4c8b654ed71ac0a1425943622cd1b525f files/bittorrent-tracker.confd 565
+SHA256 c994ddd1670a274289043380db70f2f08829cf7c7747be9805ba31dce0e2bc86 files/bittorrent-tracker.confd 565
+AUX bittorrent-tracker.initd 653 RMD160 4546d4d647969f91f623d98bc80ef53dc86a2117 SHA1 898ed64266ac07c53c8536223b1851a2fc5b671d SHA256 5f70c794dcc5d821df1224168ac449fd94983a7f9eeb3e498d31fc369b3b2ff3
+MD5 7f4a588c2d2c424321d79bbd82ec01d4 files/bittorrent-tracker.initd 653
+RMD160 4546d4d647969f91f623d98bc80ef53dc86a2117 files/bittorrent-tracker.initd 653
+SHA256 5f70c794dcc5d821df1224168ac449fd94983a7f9eeb3e498d31fc369b3b2ff3 files/bittorrent-tracker.initd 653
 DIST BitTorrent-4.4.0.tar.gz 1255281 RMD160 9e743b3178142855d289743d4430598353fb4d3f SHA1 8ca3e52c8049ff29a6785da410d6aa80c6726882 SHA256 1c9338ed384240258b5733a814670e2dee8ca2fb65babf3f0ca07978707301e0
 DIST BitTorrent-5.0.3.tar.gz 2483161 RMD160 792b0a00cb20cfe64c0bd402a7442464578fc335 SHA1 f1321425052313e2963c4655f24d45aaef0aa2a4 SHA256 38a59459ee5bf323c0f3a0e6d2f358f6de00a0036c5593372558315f9c2f7f3f
-EBUILD bittorrent-3.4.2-r2.ebuild 1930 RMD160 f3e450a46dd03440a29bbcf21a5b762574631cdf SHA1 6b9749c01416b0c80f23f57e65868010165fbae5 SHA256 399f5974f0845c50960262725eada69fec9b95e55043cea299af73b74e5941bf
-MD5 55de4abd16a9d1691977235bb18b8e7d bittorrent-3.4.2-r2.ebuild 1930
-RMD160 f3e450a46dd03440a29bbcf21a5b762574631cdf bittorrent-3.4.2-r2.ebuild 1930
-SHA256 399f5974f0845c50960262725eada69fec9b95e55043cea299af73b74e5941bf bittorrent-3.4.2-r2.ebuild 1930
-EBUILD bittorrent-4.2.2.ebuild 2309 RMD160 cafd7033ccb832788bfe5a1b155207d04bfacd4a SHA1 2e45d2edda8fe8a427ea3df3e5bdcdef9d4ef1d5 SHA256 86d72aad2253b976d98a4bdefc5e317a1339e2a82718b492c7383c44ccf075e1
-MD5 37fd10a87cd1f7d00e675c861af2abc8 bittorrent-4.2.2.ebuild 2309
-RMD160 cafd7033ccb832788bfe5a1b155207d04bfacd4a bittorrent-4.2.2.ebuild 2309
-SHA256 86d72aad2253b976d98a4bdefc5e317a1339e2a82718b492c7383c44ccf075e1 bittorrent-4.2.2.ebuild 2309
-EBUILD bittorrent-4.26.0.ebuild 2246 RMD160 586a78c226c8c3776b54cb297b5b9e97b39e2c50 SHA1 fe53ba05830fe1cd45daa9524d073661e812193c SHA256 9da61da60ac46d6673469f39b6dae4877dc6c0f425f1c213594d0da752980401
-MD5 f52aceacfa0fabe6d67aa19ecb3269c7 bittorrent-4.26.0.ebuild 2246
-RMD160 586a78c226c8c3776b54cb297b5b9e97b39e2c50 bittorrent-4.26.0.ebuild 2246
-SHA256 9da61da60ac46d6673469f39b6dae4877dc6c0f425f1c213594d0da752980401 bittorrent-4.26.0.ebuild 2246
-EBUILD bittorrent-4.4.0.ebuild 1906 RMD160 a0d41d46c081d3e89486a31e2fe925f24b4e178c SHA1 3de3726472dc1a697c97dd781da4877301ae275e SHA256 2ecbed1fdaaafb3161165eaaa9200dc783b86d32030f105c1c4ce3ee69903204
-MD5 59496439d90f5d71cb7bc871c1dedcc4 bittorrent-4.4.0.ebuild 1906
-RMD160 a0d41d46c081d3e89486a31e2fe925f24b4e178c bittorrent-4.4.0.ebuild 1906
-SHA256 2ecbed1fdaaafb3161165eaaa9200dc783b86d32030f105c1c4ce3ee69903204 bittorrent-4.4.0.ebuild 1906
-EBUILD bittorrent-5.0.3.ebuild 2131 RMD160 09f8a85482b5daca4879477ef0f595189d8bd40b SHA1 5b821876d43f47f1ba32b7ab4da4e6dd918b1ea5 SHA256 c2a709d99b9675442ba89b991c64cb2b10a85aabed0c668296de08519694f391
-MD5 ab95bb6e5d027390ce008a0e743d98bd bittorrent-5.0.3.ebuild 2131
-RMD160 09f8a85482b5daca4879477ef0f595189d8bd40b bittorrent-5.0.3.ebuild 2131
-SHA256 c2a709d99b9675442ba89b991c64cb2b10a85aabed0c668296de08519694f391 bittorrent-5.0.3.ebuild 2131
-MISC ChangeLog 14282 RMD160 a5a7a36828172243d23f1e7becd194c9de1f38c7 SHA1 19a9cac342ff0f496a622478a12f958838065035 SHA256 b966eb06270de14c658bbc668fc6406d2afc0e4316b2a6bc4d05c9d6f1ee7cdd
-MD5 33192b40134c32c5659d427068448e5e ChangeLog 14282
-RMD160 a5a7a36828172243d23f1e7becd194c9de1f38c7 ChangeLog 14282
-SHA256 b966eb06270de14c658bbc668fc6406d2afc0e4316b2a6bc4d05c9d6f1ee7cdd ChangeLog 14282
+EBUILD bittorrent-4.4.0.ebuild 1841 RMD160 776ff49e0ab4a05a6b1b02e230a602df5815d21c SHA1 e1e6a2f64fe718ded431e3a8a7e8436e4ee2f44c SHA256 954e1a46799401c62f354c1d179c28d7bbc94c8fd1f4eb1435bd333f4b1d525f
+MD5 966c49439f38bddfc4e2d7e74b165443 bittorrent-4.4.0.ebuild 1841
+RMD160 776ff49e0ab4a05a6b1b02e230a602df5815d21c bittorrent-4.4.0.ebuild 1841
+SHA256 954e1a46799401c62f354c1d179c28d7bbc94c8fd1f4eb1435bd333f4b1d525f bittorrent-4.4.0.ebuild 1841
+EBUILD bittorrent-5.0.3.ebuild 2285 RMD160 8b5fe93e0c16f21b39cd001e9f40c1bca82d80af SHA1 a4dfa6ae6d91e3ed045e95b35ad7e51ab74d6796 SHA256 90b6e4035fe1b23a3e272e739edd4a7f38351109c07868ce33719318341ab769
+MD5 198cd6f9943d44a1d74bdd27d2cfe562 bittorrent-5.0.3.ebuild 2285
+RMD160 8b5fe93e0c16f21b39cd001e9f40c1bca82d80af bittorrent-5.0.3.ebuild 2285
+SHA256 90b6e4035fe1b23a3e272e739edd4a7f38351109c07868ce33719318341ab769 bittorrent-5.0.3.ebuild 2285
+MISC ChangeLog 14532 RMD160 06ed0316f49a725be9b883b103ebd182c323fe9a SHA1 5f1c2b711a6c693c1199d8b3a5635b94e69c7e36 SHA256 21063d2553053d254e0b417c5c7e3cd0f184f1bb0a762c93375ac3ebab9bbe0b
+MD5 ba01857a4d5efcc41c52322544ab5810 ChangeLog 14532
+RMD160 06ed0316f49a725be9b883b103ebd182c323fe9a ChangeLog 14532
+SHA256 21063d2553053d254e0b417c5c7e3cd0f184f1bb0a762c93375ac3ebab9bbe0b ChangeLog 14532
 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 d4624ac529d603ab33f47dce666357c3 files/digest-bittorrent-3.4.2-r2 241
-RMD160 7082ff9b3f92c4e176b852c0614dba5bec9f229c files/digest-bittorrent-3.4.2-r2 241
-SHA256 b351a237532af2a0f7b40d91af7cbb493c1fe049a733c996ead85d3931acf114 files/digest-bittorrent-3.4.2-r2 241
-MD5 dfd481942395bc7c62c13a5e924900de files/digest-bittorrent-4.2.2 253
-RMD160 1c2cfb0ee31784bf2e14ed779eb469ce65e9587b files/digest-bittorrent-4.2.2 253
-SHA256 dee463afcf1e8c72462e92a120b82afe1380ff6bf909abcc0e973cb940e420d4 files/digest-bittorrent-4.2.2 253
-MD5 656b458a39e5367c4e5bb86e8fe4bb36 files/digest-bittorrent-4.26.0 256
-RMD160 91084fd4088c407385e126e1779ded7124059764 files/digest-bittorrent-4.26.0 256
-SHA256 1c5699c5511aabf14c6a9088551948f7557145ae09eebdd9ea876f4110935d8d files/digest-bittorrent-4.26.0 256
 MD5 a83d419e4505d00169381a9eaf023d59 files/digest-bittorrent-4.4.0 253
 RMD160 363ff7e44a1e324a4d2b30e0b455276fdb297357 files/digest-bittorrent-4.4.0 253
 SHA256 472a02e8501bc049b86ad1ec025bc15c08d19555ac6f0edd0bbddc62e29b7735 files/digest-bittorrent-4.4.0 253
@@ -76,7 +36,7 @@ SHA256 205d76990893ff6a8804b0ec6d6832214438ba56443812e650de01f8af145abe files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFlBDX8bi6rjpTunYRAqseAKDjs0U6EjndKtM71m0xTjwU9QP+uQCgkON+
-4+tT9mZbDAz4CkbAwYQRQho=
-=FhzH
+iD8DBQFFlBR88bi6rjpTunYRAlSHAJ4iZIfAc5mCcV1zvEFhh/gtBy2CawCgr4SK
+bOvva3yC4SnfxnmALFPR25s=
+=/2f2
 -----END PGP SIGNATURE-----

diff --git a/net-p2p/bittorrent/bittorrent-4.4.0.ebuild b/net-p2p/bittorrent/bittorrent-4.4.0.ebuild
index fe32bb3880b85a0cb1f3f0929bd3844c6a066daa..e5b26ecbb1382ca0be992cb1b59a1cdc5025d980 100644 (file)
--- a/net-p2p/bittorrent/bittorrent-4.4.0.ebuild
+++ b/net-p2p/bittorrent/bittorrent-4.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-4.4.0.ebuild,v 1.12 2006/09/30 18:55:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-4.4.0.ebuild,v 1.13 2006/12/28 19:00:17 vapier Exp $
 
 inherit distutils fdo-mime eutils
 
@@ -17,11 +17,11 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ppc ppc64 s390 sh sparc x86"
 IUSE="gtk"
 
-RDEPEND="gtk? (
+RDEPEND=">=dev-lang/python-2.3
+       gtk? (
                >=x11-libs/gtk+-2.6
                >=dev-python/pygtk-2.6
        )
-       >=dev-lang/python-2.3
        >=dev-python/pycrypto-2.0
        !virtual/bittorrent"
 DEPEND="${RDEPEND}
@@ -30,45 +30,36 @@ DEPEND="${RDEPEND}
        dev-python/dnspython"
 PROVIDE="virtual/bittorrent"
 
-DOCS="TRACKERLESS.txt LICENSE.txt public.key"
+DOCS="TRACKERLESS.txt public.key credits.txt"
 PYTHON_MODNAME="BitTorrent"
 
 src_unpack() {
        unpack ${A}
-       cd ${S}
-
-       # path for documentation is in lowercase (see bug #109743)
+       cd "${S}"
+       # path for documentation is in lowercase #109743
        sed -i -r "s:(dp.*appdir):\1.lower():" BitTorrent/platform.py
 }
 
 src_install() {
        distutils_src_install
-       if ! use gtk; then
-               rm ${D}/usr/bin/bittorrent
-       fi
+       use gtk || rm -f "${D}"/usr/bin/bittorrent
        dohtml redirdonate.html
 
-       mv ${S}/{credits-l10n.txt,credits.txt} \
-               ${D}/usr/share/doc/${P}
-
        if use gtk ; then
-               cp ${D}/usr/share/pixmaps/${MY_P}/bittorrent.ico ${D}/usr/share/pixmaps/
-               make_desktop_entry "bittorrent" "BitTorrent" \
-                       /usr/share/pixmaps/bittorrent.ico "Network"
+               doicon images/logo/bittorrent.ico
+               make_desktop_entry "bittorrent" "BitTorrent" bittorrent.ico "Network"
                echo "MimeType=application/x-bittorrent" \
-                       >> ${D}/usr/share/applications/bittorrent-${PN}.desktop
+                       >> "${D}"/usr/share/applications/bittorrent-${PN}.desktop
        fi
 
-       insinto /etc/conf.d
-       newins ${FILESDIR}/bttrack.conf bttrack
-
-       exeinto /etc/init.d
-       newexe ${FILESDIR}/bttrack.rc bttrack
+       newinitd "${FILESDIR}"/bittorrent-tracker.initd bittorrent-tracker
+       newconfd "${FILESDIR}"/bittorrent-tracker.confd bittorrent-tracker
 }
 
 pkg_postinst() {
        einfo "Remember that BitTorrent has changed file naming scheme"
        einfo "To run BitTorrent just execute /usr/bin/bittorrent"
+       einfo "To run the init.d, please use /etc/init.d/bittorrent-tracker"
        distutils_pkg_postinst
        fdo-mime_desktop_database_update
 }

diff --git a/net-p2p/bittorrent/bittorrent-5.0.3.ebuild b/net-p2p/bittorrent/bittorrent-5.0.3.ebuild
index a3a5fe2237bac93eaa9ca8a860ce8c0ab408d4b7..4090bebcf1fd621dff4a3e4e354d29491cb9710d 100644 (file)
--- a/net-p2p/bittorrent/bittorrent-5.0.3.ebuild
+++ b/net-p2p/bittorrent/bittorrent-5.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-5.0.3.ebuild,v 1.1 2006/12/28 18:44:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-5.0.3.ebuild,v 1.2 2006/12/28 19:00:17 vapier Exp $
 
 inherit distutils fdo-mime eutils
 
@@ -60,19 +60,21 @@ src_install() {
        dohtml redirdonate.html
 
        if use gtk ; then
+               doicon images/logo/bittorrent.ico
                newicon images/logo/bittorrent_icon_32.png bittorrent.png
                make_desktop_entry "bittorrent" "BitTorrent" bittorrent.png "Network"
                echo "MimeType=application/x-bittorrent" \
                        >> "${D}"/usr/share/applications/bittorrent-${PN}.desktop
        fi
 
-       newinitd "${FILESDIR}"/bttrack.rc bttrack
-       newconfd "${FILESDIR}"/bttrack.conf bttrack
+       newinitd "${FILESDIR}"/bittorrent-tracker.initd bittorrent-tracker
+       newconfd "${FILESDIR}"/bittorrent-tracker.confd bittorrent-tracker
 }
 
 pkg_postinst() {
        einfo "Remember that BitTorrent has changed file naming scheme"
        einfo "To run BitTorrent just execute /usr/bin/bittorrent"
+       einfo "To run the init.d, please use /etc/init.d/bittorrent-tracker"
        distutils_pkg_postinst
        fdo-mime_desktop_database_update
 }

diff --git a/net-p2p/bittorrent/files/bittorrent-tracker.confd b/net-p2p/bittorrent/files/bittorrent-tracker.confd
index 0f9d19f08b2efa4d044f0cafbab8b2d3ea626af8..71e29cb861c441b1b922dd09a488788761059a8d 100644 (file)
--- a/net-p2p/bittorrent/files/bittorrent-tracker.confd
+++ b/net-p2p/bittorrent/files/bittorrent-tracker.confd
@@ -8,7 +8,7 @@ PORT=8082
 DFILE=/usr/share/bittorrent/tracker.dfile
 
 # path to favicon.ico which many popular web browsers can use
-FAVICON=/usr/share/bittorrent/favicon.ico
+FAVICON=/usr/share/pixmaps/bittorrent.ico
 
 # Connection logs are sent to stdout by default, so they should be sent to a
 # file when using this script.

diff --git a/net-p2p/bittorrent/files/bittorrent-tracker.initd b/net-p2p/bittorrent/files/bittorrent-tracker.initd
index 5f19dce835865c544141c47dd99b9b31ba007598..7732f3abf481769e0019787b31a39d0509324ac3 100644 (file)
--- a/net-p2p/bittorrent/files/bittorrent-tracker.initd
+++ b/net-p2p/bittorrent/files/bittorrent-tracker.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/files/bittorrent-tracker.initd,v 1.1 2005/12/18 20:08:06 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/files/bittorrent-tracker.initd,v 1.2 2006/12/28 19:00:18 vapier Exp $
 
 depend() {
        need net
@@ -10,9 +10,9 @@ depend() {
 start() {
        ebegin "Starting bttrack"
        start-stop-daemon --start --quiet --background --make-pidfile \
-       --pidfile /var/run/bttrack.pid \
-       --exec /usr/bin/bittorrent-tracker -- --port ${PORT} \
-       --dfile ${DFILE} --favicon ${FAVICON} --logfile ${LOGFILE}
+               --pidfile /var/run/bttrack.pid \
+               --exec /usr/bin/bittorrent-tracker -- --port ${PORT} \
+               --dfile ${DFILE} --favicon ${FAVICON} --logfile ${LOGFILE}
        eend $?
 }