Use desktop files instead of a hack, bug 175472

Package-Manager: portage-2.1.2.4

5 files changed, 43 insertions, 66 deletions

diff --git a/net-p2p/bittornado/ChangeLog b/net-p2p/bittornado/ChangeLog
index 15ae12ba0a1b..5328ea9b30c9 100644
--- a/net-p2p/bittornado/ChangeLog
+++ b/net-p2p/bittornado/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/bittornado
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittornado/ChangeLog,v 1.62 2007/03/23 21:07:24 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittornado/ChangeLog,v 1.63 2007/04/21 19:01:34 armin76 Exp $
+
+  21 Apr 2007; Raúl Porcel <armin76@gentoo.org> +files/bittornado.desktop,
+  bittornado-0.3.15.ebuild, bittornado-0.3.18.ebuild:
+  Use desktop files instead of a hack, bug 175472
 
   23 Mar 2007; Timothy Redaelli <drizzt@gentoo.org>
   bittornado-0.3.18.ebuild:
diff --git a/net-p2p/bittornado/Manifest b/net-p2p/bittornado/Manifest
index 08330a2c17f2..9df10c666f3f 100644
--- a/net-p2p/bittornado/Manifest
+++ b/net-p2p/bittornado/Manifest
@@ -1,10 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX bittornado-wxpython-pre2.5-fix.patch 297 RMD160 d3087426e7e8133742e98ecdb14a03bcdeff2fe5 SHA1 4ef6a769627f730a77a92cc50b3a93f4c31785f2 SHA256 552a994fe350110e33bc45a9258bfc4c3fbed8a8ed8154445f08bdc3aa15790e
 MD5 c7977a11c1bf8a5d7afb8772202af87d files/bittornado-wxpython-pre2.5-fix.patch 297
 RMD160 d3087426e7e8133742e98ecdb14a03bcdeff2fe5 files/bittornado-wxpython-pre2.5-fix.patch 297
 SHA256 552a994fe350110e33bc45a9258bfc4c3fbed8a8ed8154445f08bdc3aa15790e files/bittornado-wxpython-pre2.5-fix.patch 297
+AUX bittornado.desktop 276 RMD160 137267eb00af8964575b38177708913ee70658ce SHA1 bc0b2e21407ef588051dc2907188f3dc81d137f3 SHA256 6334f87e265189de83c6dd6dc176eaca08d66e519280935d9c4c6fcce438ec89
+MD5 845fbe72620539d5c5efc8bb15de28dc files/bittornado.desktop 276
+RMD160 137267eb00af8964575b38177708913ee70658ce files/bittornado.desktop 276
+SHA256 6334f87e265189de83c6dd6dc176eaca08d66e519280935d9c4c6fcce438ec89 files/bittornado.desktop 276
 AUX bttrack.conf 728 RMD160 c5c7438e64e335d40a33d685e9b0ee0824577ceb SHA1 fbc4cf7a9b227cf267b6f7e166696010e3cd29ee SHA256 2f40a8334dde5a951c79018476e9ab1380cb382f403068c906427f2b4b435d73
 MD5 5e0dbf4ae726b145dcec6fb57526e4c5 files/bttrack.conf 728
 RMD160 c5c7438e64e335d40a33d685e9b0ee0824577ceb files/bttrack.conf 728
@@ -19,18 +20,18 @@ RMD160 735b7ee87f222400b294866e323b281b4e9cdd70 files/favicon.ico 1406
 SHA256 ae5728b520add5961a8b7f8300058bf9571b9b14dba96dfaf64520d089e56c22 files/favicon.ico 1406
 DIST BitTornado-0.3.15.tar.gz 189992 RMD160 1967e1ec545f1c1dfa11d7525acb0abbdc2cedd2 SHA1 a9a40ada7227aab0b495afafa9c9a76e47740942 SHA256 829b7876a0951fa6ba7af0a6d42e0c6d9ec8b42239ad06885e5b270c5efab060
 DIST BitTornado-0.3.18.tar.gz 189227 RMD160 77e61f01101c2878d4e993e0581365a71c375892 SHA1 64c65b69d112f76ba8a024ff5b8671058130b71a SHA256 d9e6ad0bf5b2e9820bab809c5a4fcd94e844a57f396ac51547fe47dbe255d9e0
-EBUILD bittornado-0.3.15.ebuild 2090 RMD160 3f8551189441c0e8cd0bbd76d008c58dd07fc6eb SHA1 c20b8b7587e88f9d3877149a69836d8b0ce19854 SHA256 72341df645d24080d7280e6cb510b73ceb7887c8a0bc3f277fea4cec1d18b5df
-MD5 6caacf085810cf3f2cf73bb9813d34f2 bittornado-0.3.15.ebuild 2090
-RMD160 3f8551189441c0e8cd0bbd76d008c58dd07fc6eb bittornado-0.3.15.ebuild 2090
-SHA256 72341df645d24080d7280e6cb510b73ceb7887c8a0bc3f277fea4cec1d18b5df bittornado-0.3.15.ebuild 2090
-EBUILD bittornado-0.3.18.ebuild 2099 RMD160 1b7524846b234ff5653cb24b45e18bfd82f387f7 SHA1 cd9de3cdfaaa94d4b3d96fafe9957b0cc3b7bbbf SHA256 42aa8e22687dacffd8943c3d33123c81cb60077859d9308eab253eb154bfda1f
-MD5 345943df21f9006f0fe010b5c2d8dfb1 bittornado-0.3.18.ebuild 2099
-RMD160 1b7524846b234ff5653cb24b45e18bfd82f387f7 bittornado-0.3.18.ebuild 2099
-SHA256 42aa8e22687dacffd8943c3d33123c81cb60077859d9308eab253eb154bfda1f bittornado-0.3.18.ebuild 2099
-MISC ChangeLog 8402 RMD160 4e5115c939024ea69c9d6af8df340fd6c090d2eb SHA1 395222280e1c880afbfe1c8011e5f7754f5b9fdd SHA256 39b83b5b06fa822d2c8c485268ce3ada8cfc8c5908b7b4d97751034d2ebbb73b
-MD5 b566b2fca35c086fcb4d0412c0307a79 ChangeLog 8402
-RMD160 4e5115c939024ea69c9d6af8df340fd6c090d2eb ChangeLog 8402
-SHA256 39b83b5b06fa822d2c8c485268ce3ada8cfc8c5908b7b4d97751034d2ebbb73b ChangeLog 8402
+EBUILD bittornado-0.3.15.ebuild 1493 RMD160 c0e934fa6be6532df815c9ec6b70d5f26e8d2529 SHA1 0c38429c928d12421b032b42ee6f3cb98f77da24 SHA256 65b5ad06e8df5dbde4db231c02aad7a2e0f842ef92c35af7cd777695617a1bff
+MD5 bafd2008c45a1e6b9e9c84e25f66f5b5 bittornado-0.3.15.ebuild 1493
+RMD160 c0e934fa6be6532df815c9ec6b70d5f26e8d2529 bittornado-0.3.15.ebuild 1493
+SHA256 65b5ad06e8df5dbde4db231c02aad7a2e0f842ef92c35af7cd777695617a1bff bittornado-0.3.15.ebuild 1493
+EBUILD bittornado-0.3.18.ebuild 1502 RMD160 12a91ddc265b4d2ada7921b89e6cb452da829be2 SHA1 f70d72eb6443d7af20b303b8e4648b07650fdd92 SHA256 0a13dfd5c6f2617bd4a98db8250ebee0a21c68a517b092db57a9a0a65c0405f1
+MD5 10447235cdc823751fc14380eaa3aecc bittornado-0.3.18.ebuild 1502
+RMD160 12a91ddc265b4d2ada7921b89e6cb452da829be2 bittornado-0.3.18.ebuild 1502
+SHA256 0a13dfd5c6f2617bd4a98db8250ebee0a21c68a517b092db57a9a0a65c0405f1 bittornado-0.3.18.ebuild 1502
+MISC ChangeLog 8584 RMD160 473c53c74d897de4caa01336e622350ee5c48e4f SHA1 5fb0009298dcd3e25080f0f40ba63cfbb681769a SHA256 296d0833d9074b0b8016e20ed55a435f0ca0c5061d496879ae51d422539033b7
+MD5 11b9698ab4c4323f2e88333221cafdcf ChangeLog 8584
+RMD160 473c53c74d897de4caa01336e622350ee5c48e4f ChangeLog 8584
+SHA256 296d0833d9074b0b8016e20ed55a435f0ca0c5061d496879ae51d422539033b7 ChangeLog 8584
 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd metadata.xml 160
@@ -41,10 +42,3 @@ SHA256 945e05057654448ebb8e939e9e43ba0e6479f920a080fa67b94359cd38f31a77 files/di
 MD5 a71e2168482debac2ca6b058eb25dbf3 files/digest-bittornado-0.3.18 253
 RMD160 c8f58828ac130e9aed8c033febe95454bcd0d05b files/digest-bittornado-0.3.18 253
 SHA256 87aac6c0975b752b676536769e6b6f4492bee8b9b7ee2aac6a3df6ad07a160db files/digest-bittornado-0.3.18 253
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGBEGSGDyatLGpTbYRAm8uAJ43s4g4Bj8gv2+vqtJUV887lTzo6ACfY2hl
-BS0QnPAXdZx3zfJuTWkf4kw=
-=g1ly
------END PGP SIGNATURE-----
diff --git a/net-p2p/bittornado/bittornado-0.3.15.ebuild b/net-p2p/bittornado/bittornado-0.3.15.ebuild
index d08089f5d65c..098d1f63bb04 100644
--- a/net-p2p/bittornado/bittornado-0.3.15.ebuild
+++ b/net-p2p/bittornado/bittornado-0.3.15.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/bittornado/bittornado-0.3.15.ebuild,v 1.8 2007/02/24 11:36:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittornado/bittornado-0.3.15.ebuild,v 1.9 2007/04/21 19:01:34 armin76 Exp $
 
 inherit distutils eutils
 
@@ -40,35 +40,19 @@ src_unpack() {
 src_install() {
 	distutils_src_install
 
-	dodir /etc
-	cp -pPR /etc/mailcap ${D}/etc/
-	MAILCAP_STRING="application/x-bittorrent; /usr/bin/btdownloadgui.py '%s'; test=test -n \"\$DISPLAY\""
-
 	if use gtk; then
 		dodir ${PIXMAPLOC}
 		insinto ${PIXMAPLOC}
 		doins icons/*.ico icons/*.gif
-		if [ -n "`grep 'application/x-bittorrent' ${D}/etc/mailcap`" ]; then
-			# replace bittorrent entry if it already exists
-			einfo "updating bittorrent mime info"
-			sed -i "s,application/x-bittorrent;.*,${MAILCAP_STRING}," ${D}/etc/mailcap
-		else
-			# add bittorrent entry if it doesn't exist
-			einfo "adding bittorrent mime info"
-			echo "${MAILCAP_STRING}" >> ${D}/etc/mailcap
-		fi
 	else
 		# get rid of any reference to the not-installed gui version
-		sed -i '/btdownloadgui/d' ${D}/etc/mailcap
 		rm ${D}/usr/bin/*gui.py
 	fi
-	insinto /usr/share/bittorrent
-	doins ${FILESDIR}/favicon.ico
 
-	insinto /etc/conf.d
-	newins ${FILESDIR}/bttrack.conf bttrack
+	newicon ${FILESDIR}/favicon.ico ${PN}.ico
+	domenu ${FILESDIR}/bittornado.desktop
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/bttrack.rc bttrack
+	newconfd ${FILESDIR}/bttrack.conf bttrack
+	newinitd ${FILESDIR}/bttrack.rc bttrack
 }
 
diff --git a/net-p2p/bittornado/bittornado-0.3.18.ebuild b/net-p2p/bittornado/bittornado-0.3.18.ebuild
index ee5dd1035a57..cd2394fadd8d 100644
--- a/net-p2p/bittornado/bittornado-0.3.18.ebuild
+++ b/net-p2p/bittornado/bittornado-0.3.18.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/bittornado/bittornado-0.3.18.ebuild,v 1.8 2007/03/23 21:07:24 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittornado/bittornado-0.3.18.ebuild,v 1.9 2007/04/21 19:01:34 armin76 Exp $
 
 inherit distutils eutils
 
@@ -40,34 +40,18 @@ src_unpack() {
 src_install() {
 	distutils_src_install
 
-	dodir /etc
-	cp -pPR /etc/mailcap ${D}/etc/
-	MAILCAP_STRING="application/x-bittorrent; /usr/bin/btdownloadgui.py '%s'; test=test -n \"\$DISPLAY\""
-
 	if use gtk; then
 		dodir ${PIXMAPLOC}
 		insinto ${PIXMAPLOC}
 		doins icons/*.ico icons/*.gif
-		if [ -n "`grep 'application/x-bittorrent' ${D}/etc/mailcap`" ]; then
-			# replace bittorrent entry if it already exists
-			einfo "updating bittorrent mime info"
-			sed -i "s,application/x-bittorrent;.*,${MAILCAP_STRING}," ${D}/etc/mailcap
-		else
-			# add bittorrent entry if it doesn't exist
-			einfo "adding bittorrent mime info"
-			echo "${MAILCAP_STRING}" >> ${D}/etc/mailcap
-		fi
 	else
 		# get rid of any reference to the not-installed gui version
-		sed -i '/btdownloadgui/d' ${D}/etc/mailcap
 		rm ${D}/usr/bin/*gui.py
 	fi
-	insinto /usr/share/bittorrent
-	doins ${FILESDIR}/favicon.ico
 
-	insinto /etc/conf.d
-	newins ${FILESDIR}/bttrack.conf bttrack
+	newicon ${FILESDIR}/favicon.ico ${PN}.ico
+	domenu ${FILESDIR}/bittornado.desktop
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/bttrack.rc bttrack
-}
+	newconfd ${FILESDIR}/bttrack.conf bttrack
+	newinitd ${FILESDIR}/bttrack.rc bttrack
+}
\ No newline at end of file
diff --git a/net-p2p/bittornado/files/bittornado.desktop b/net-p2p/bittornado/files/bittornado.desktop
new file mode 100644
index 000000000000..cac072c0828a
--- /dev/null
+++ b/net-p2p/bittornado/files/bittornado.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=BitTornado BitTorrent Client
+Comment=TheShad0w's experimental BitTorrent client
+Exec=/usr/bin/btdownloadgui.py
+Icon=bittornado.ico
+Terminal=false
+Type=Application
+Categories=Application;Network
+MimeType=application/x-bittorrent;
\ No newline at end of file