Added make_desktop_entry for the gtk+ client and fixed the init script to work by default, thanks to Fabio Bonfante (Bug 200581)

Package-Manager: portage-2.1.4_rc4

6 files changed, 135 insertions, 23 deletions

diff --git a/net-p2p/btg/ChangeLog b/net-p2p/btg/ChangeLog
index 12b6f0a62a58..25daf4bcb93a 100644
--- a/net-p2p/btg/ChangeLog
+++ b/net-p2p/btg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/btg
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/btg/ChangeLog,v 1.3 2007/11/13 16:36:26 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/btg/ChangeLog,v 1.4 2007/11/28 13:34:14 angelos Exp $
+
+*btg-0.9.6-r1 (28 Nov 2007)
+
+  28 Nov 2007; Christoph Mende <angelos@gentoo.org> files/btgd-confd,
+  files/btgd-init, +btg-0.9.6-r1.ebuild:
+  Added make_desktop_entry for the gtk+ client and fixed the init script to
+  work by default, thanks to Fabio Bonfante (Bug 200581)
 
   13 Nov 2007; Christoph Mende <angelos@gentoo.org> btg-0.9.6.ebuild:
   Stable on amd64
diff --git a/net-p2p/btg/Manifest b/net-p2p/btg/Manifest
index d9b762e68bfa..a99e2cfd7d6a 100644
--- a/net-p2p/btg/Manifest
+++ b/net-p2p/btg/Manifest
@@ -1,23 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX btgd-confd 249 RMD160 28f5f3bc526dec4311346b3081619a43bd18c942 SHA1 38eac668c5729f2e40620a9d6432186b47eee6c3 SHA256 abb8ca35d6bcf5e2b2d4ac44bae9101f4c0326d36f8041c7c3820f1a87465c6d
-MD5 a665a9e9900bda4038b75f473d386b76 files/btgd-confd 249
-RMD160 28f5f3bc526dec4311346b3081619a43bd18c942 files/btgd-confd 249
-SHA256 abb8ca35d6bcf5e2b2d4ac44bae9101f4c0326d36f8041c7c3820f1a87465c6d files/btgd-confd 249
-AUX btgd-init 1068 RMD160 9942451bd67b5dc02abb88139b2118b8d97955f9 SHA1 210f9dcdf74ec4b7c18c734f835d4d6d889da262 SHA256 a1d29f3ebb219c84248a985063e30a44042a674d21976dced606931ca3614ac0
-MD5 923e2bd3129497324fcade7359d568d3 files/btgd-init 1068
-RMD160 9942451bd67b5dc02abb88139b2118b8d97955f9 files/btgd-init 1068
-SHA256 a1d29f3ebb219c84248a985063e30a44042a674d21976dced606931ca3614ac0 files/btgd-init 1068
+AUX btgd-confd 356 RMD160 4a5f537a334ed848d739ef0b80a93b34a4bcd393 SHA1 0b5f812cd19aa0c146a113d1d5baaff14d8ca2b1 SHA256 7feba6c4e38b11c8bafb56dcc7865efd90d88e8f08dd6366ae81c38c78f5f5a8
+MD5 5a18c406063c3da54edb865aaf98756e files/btgd-confd 356
+RMD160 4a5f537a334ed848d739ef0b80a93b34a4bcd393 files/btgd-confd 356
+SHA256 7feba6c4e38b11c8bafb56dcc7865efd90d88e8f08dd6366ae81c38c78f5f5a8 files/btgd-confd 356
+AUX btgd-init 1130 RMD160 297b02f170563a09449814d50d2cd237e0b80f20 SHA1 9cc97776bcd77d9ef63a9faab7eaa5bae5bf2e94 SHA256 1ce2b6ab0be99eef183c093f1a7c21be2a21ff799a39bad1fd234283a1945a25
+MD5 1d4a40a2470b6a4b50e33f5f92ff6729 files/btgd-init 1130
+RMD160 297b02f170563a09449814d50d2cd237e0b80f20 files/btgd-init 1130
+SHA256 1ce2b6ab0be99eef183c093f1a7c21be2a21ff799a39bad1fd234283a1945a25 files/btgd-init 1130
 DIST btg-0.9.6-p1.tar.gz 1073862 RMD160 4b3d9f96481eafd4115cdef3047f1d4f80ca7bb8 SHA1 2ec586301d1f11475cb8a9c9c34e9ed45ca6b78d SHA256 862b670aff709762be2c8ec6b79d2d7d40268061660e5d3a4fa3db76a02af60c
+EBUILD btg-0.9.6-r1.ebuild 2419 RMD160 40017e65f15d56c8609649df4a41dcf6cdc5206a SHA1 c0628eadd18ae847ad28e87cef1fef2131accb5f SHA256 74b5f061add75639ed2ed8254a7b737d8d881bf98b663c664569d52b89f297d1
+MD5 698ca064b9000149cf8ea108fd7c07a0 btg-0.9.6-r1.ebuild 2419
+RMD160 40017e65f15d56c8609649df4a41dcf6cdc5206a btg-0.9.6-r1.ebuild 2419
+SHA256 74b5f061add75639ed2ed8254a7b737d8d881bf98b663c664569d52b89f297d1 btg-0.9.6-r1.ebuild 2419
 EBUILD btg-0.9.6.ebuild 2325 RMD160 923b6e97aed6fe40e1f4da94c5ba6e308ffb6543 SHA1 7361fafc046ea4cb244ced67e65a01c524d45d20 SHA256 abf4f730e6121680028818a570f19576cbb431c3bf4e00a3236c6c8c1bc4a24d
 MD5 0e76522c688cb2273a62383b86c85578 btg-0.9.6.ebuild 2325
 RMD160 923b6e97aed6fe40e1f4da94c5ba6e308ffb6543 btg-0.9.6.ebuild 2325
 SHA256 abf4f730e6121680028818a570f19576cbb431c3bf4e00a3236c6c8c1bc4a24d btg-0.9.6.ebuild 2325
-MISC ChangeLog 534 RMD160 86736ff31d07cad2079ea7b8fa75c13fc8f9d603 SHA1 a494e7a7bfc2b7488b4ffe417c13c7d92e6f9973 SHA256 884f6033e17ac9fad5e14dcbe0f31d123fe064dbcc3cdd47ddc060557350140c
-MD5 b1628bd84b246a056de0f9771e984c68 ChangeLog 534
-RMD160 86736ff31d07cad2079ea7b8fa75c13fc8f9d603 ChangeLog 534
-SHA256 884f6033e17ac9fad5e14dcbe0f31d123fe064dbcc3cdd47ddc060557350140c ChangeLog 534
+MISC ChangeLog 808 RMD160 86be9b5f2c0e27b9a3b17c1f4e2cb86ae60d8864 SHA1 06a74a15ce2c38e054ebee6fe58e63c8dffa1b57 SHA256 a9030cd34120512403cb12f71ac4bb379729cb3e5d79377e165914eebc9713fe
+MD5 86c0128205b69c1306231015b8e26f7b ChangeLog 808
+RMD160 86be9b5f2c0e27b9a3b17c1f4e2cb86ae60d8864 ChangeLog 808
+SHA256 a9030cd34120512403cb12f71ac4bb379729cb3e5d79377e165914eebc9713fe ChangeLog 808
 MISC metadata.xml 258 RMD160 6d4c6c4e7c021a3fc82145a078f8e113eb6f521a SHA1 02004f2821b6ac3f69abfbfdafc9744008535258 SHA256 ee85021b7ae93a2e1442a570b114d3c9bf2e577c16b7b1b409914983d5d55485
 MD5 303f6d39495a43786f7e5a07f5a12ea8 metadata.xml 258
 RMD160 6d4c6c4e7c021a3fc82145a078f8e113eb6f521a metadata.xml 258
@@ -25,10 +29,13 @@ SHA256 ee85021b7ae93a2e1442a570b114d3c9bf2e577c16b7b1b409914983d5d55485 metadata
 MD5 47e238922dd387dbf5af822edb31cb42 files/digest-btg-0.9.6 241
 RMD160 603323eafe0fcc2ef7477cf60e6eaaa3a91992df files/digest-btg-0.9.6 241
 SHA256 6acf85c232f3422b82ecb34e349831607e964637d41d1221c147d6fd944afed9 files/digest-btg-0.9.6 241
+MD5 47e238922dd387dbf5af822edb31cb42 files/digest-btg-0.9.6-r1 241
+RMD160 603323eafe0fcc2ef7477cf60e6eaaa3a91992df files/digest-btg-0.9.6-r1 241
+SHA256 6acf85c232f3422b82ecb34e349831607e964637d41d1221c147d6fd944afed9 files/digest-btg-0.9.6-r1 241
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHOdKQKhnDs22gwa8RAs9CAJ9LCYVGSHqIpN/6RmFMwpjfascduQCggLd8
-8luLqiNLRu5HcK9yi3trsHk=
-=Laca
+iD8DBQFHTW5gKhnDs22gwa8RAjkeAJ9zriZPEeituU7+arQKJTIVZ5zBaACdG7tm
+dxd4V6svBmxy+I64jqIqN4o=
+=7P9K
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/btg/btg-0.9.6-r1.ebuild b/net-p2p/btg/btg-0.9.6-r1.ebuild
new file mode 100644
index 000000000000..a9c2892afb12
--- /dev/null
+++ b/net-p2p/btg/btg-0.9.6-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/btg/btg-0.9.6-r1.ebuild,v 1.1 2007/11/28 13:34:14 angelos Exp $
+
+inherit eutils
+
+DESCRIPTION="bittorrent client using rb_libtorrent"
+HOMEPAGE="http://btg.berlios.de/"
+SRC_URI="mirror://berlios/${PN}/${P}-p1.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug doc event-callback gtk minimal ncurses session test upnp webinterface"
+
+RDEPEND="dev-libs/boost
+	dev-libs/expat
+	dev-libs/libgcrypt
+	dev-libs/libgpg-error
+	dev-libs/libtasn1
+	dev-util/dialog
+	net-libs/gnutls
+	net-libs/rb_libtorrent
+	gtk? ( >=dev-cpp/gtkmm-2.4
+		x11-libs/pango )
+	webinterface? ( =dev-lang/php-5* )"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.21
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/${PN}-${PV/_rc*}"
+
+pkg_setup() {
+	if ! built_with_use --missing true "dev-libs/boost" threads && \
+		! built_with_use --missing true "dev-libs/boost" threadsonly ; then
+			echo
+			elog "Compile dev-libs/boost with USE=threads or USE=threadsonly"
+			elog "if you want threading support for btg"
+			echo
+	fi
+}
+
+src_compile() {
+	local myconf=""
+
+	if built_with_use --missing true "dev-libs/boost" threads || \
+		built_with_use --missing true "dev-libs/boost" threadsonly ; then
+			myconf="--with-boost-iostreams=boost_iostreams-mt \
+				--with-boost-filesystem=boost_filesystem-mt \
+				--with-boost-thread=boost_thread-mt \
+				--with-boost-date-time=boost_date_time-mt \
+				--with-boost-program_options=boost_program_options-mt"
+	fi
+
+	econf \
+		$(use_enable debug) \
+		$(use_enable gtk gui) \
+		$(use_enable ncurses cli) \
+		$(use_enable upnp) \
+		$(use_enable event-callback) \
+		$(use_enable session session-saving) \
+		$(use_enable test unittest) \
+		$(use_enable webinterface www) \
+		$(use_enable !minimal command-list) \
+		${myconf} \
+		--disable-dependency-tracking \
+		|| die
+
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	dodoc AUTHORS ChangeLog README TODO
+
+	newinitd "${FILESDIR}/btgd-init" ${PN}
+	newconfd "${FILESDIR}/btgd-confd" ${PN}
+
+	use gtk && make_desktop_entry btgui "BTG GUI Client" btg "Network;P2P"
+}
+
+pkg_postinst() {
+	enewgroup p2p
+	enewuser p2p -1 -1 /home/p2p p2p
+
+	echo
+	elog "BTG needs a daemon.ini and client.ini, to create them run btg-config"
+	elog "and put them in the home of the user running btg (/home/p2p/.btg by default)"
+	echo
+}
diff --git a/net-p2p/btg/files/btgd-confd b/net-p2p/btg/files/btgd-confd
index 1720286c8713..fb721a696912 100644
--- a/net-p2p/btg/files/btgd-confd
+++ b/net-p2p/btg/files/btgd-confd
@@ -1,6 +1,9 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/btg/files/btgd-confd,v 1.1 2007/10/14 23:37:14 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/btg/files/btgd-confd,v 1.2 2007/11/28 13:34:15 angelos Exp $
 
 # User that runs btgd
 BTG_USER="p2p"
+
+# Full path to daemon.ini (default /home/p2p/.btg/daemon.ini)
+BTG_CONFIG_FILE="/home/p2p/.btg/daemon.ini"
diff --git a/net-p2p/btg/files/btgd-init b/net-p2p/btg/files/btgd-init
index c52a968912f9..50d4180f3201 100644
--- a/net-p2p/btg/files/btgd-init
+++ b/net-p2p/btg/files/btgd-init
@@ -1,9 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/btg/files/btgd-init,v 1.1 2007/10/14 23:37:14 angelos Exp $ 
-
-BTG_HOME="$(getent passwd ${BTG_USER} | cut -d : -f 6)"
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/btg/files/btgd-init,v 1.2 2007/11/28 13:34:15 angelos Exp $ 
 
 depend() {
 	need net
@@ -13,12 +11,15 @@ checkconfig() {
 	if [ -z ${BTG_USER} ]; then
 		eerror "BTG_USER unset, please edit /etc/conf.d/btgd first"
 		return 1
+	elif [ -z ${BTG_CONFIG_FILE} ]; then
+		eerror "BTG_CONFIG_FILE unset, please edit /etc/conf.d/btgd first"
+		return 1
 	elif [ ! -d "${BTG_HOME}" ]; then
 		eerror "The home for ${BTG_USER} does not exist"
 		eerror "Please check /etc/conf.d/btgd"
 		return 1
-	elif [ ! -f "${BTG_HOME}/.btg/daemon.ini" ]; then
-		eerror "Unable to find daemon.ini in ${BTG_HOME}/.btg"
+	elif [ ! -f "${BTG_CONFIG_FILE}" ]; then
+		eerror "Unable to find ${BTG_CONFIG_FILE}"
 		eerror "Please run btg-config first"
 		return 1
 	fi
@@ -31,7 +32,7 @@ start() {
 	start-stop-daemon --start \
 		-c ${BTG_USER} --quiet -b --make-pidfile \
 		--pidfile /var/run/btgdaemon.pid \
-		-x /usr/bin/btgdaemon -- -n
+		-x /usr/bin/btgdaemon -- -n -c ${BTG_CONFIG_FILE}
 	eend $?
 }
 
diff --git a/net-p2p/btg/files/digest-btg-0.9.6-r1 b/net-p2p/btg/files/digest-btg-0.9.6-r1
new file mode 100644
index 000000000000..707c17258963
--- /dev/null
+++ b/net-p2p/btg/files/digest-btg-0.9.6-r1
@@ -0,0 +1,3 @@
+MD5 364111ab4a98b5a97bd0beca7cf41ab3 btg-0.9.6-p1.tar.gz 1073862
+RMD160 4b3d9f96481eafd4115cdef3047f1d4f80ca7bb8 btg-0.9.6-p1.tar.gz 1073862
+SHA256 862b670aff709762be2c8ec6b79d2d7d40268061660e5d3a4fa3db76a02af60c btg-0.9.6-p1.tar.gz 1073862