Version bump, bug #469168

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

4 files changed, 127 insertions, 15 deletions

diff --git a/net-p2p/tribler/ChangeLog b/net-p2p/tribler/ChangeLog
index 36150b1da0a0..10bb764ba039 100644
--- a/net-p2p/tribler/ChangeLog
+++ b/net-p2p/tribler/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/tribler
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/ChangeLog,v 1.46 2013/03/23 19:46:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/ChangeLog,v 1.47 2013/05/10 01:32:31 blueness Exp $
+
+*tribler-6.1.0 (10 May 2013)
+
+  10 May 2013; Anthony G. Basile <blueness@gentoo.org>
+  +files/tribler-6.1.0-fix-desktop.patch, +tribler-6.1.0.ebuild:
+  Version bump, bug #469168
 
   23 Mar 2013; Mike Frysinger <vapier@gentoo.org> tribler-6.0.3.ebuild:
   Convert to unpacker eclass for .deb unpacking.
diff --git a/net-p2p/tribler/Manifest b/net-p2p/tribler/Manifest
index e43a5b759e06..739272a365ec 100644
--- a/net-p2p/tribler/Manifest
+++ b/net-p2p/tribler/Manifest
@@ -2,28 +2,33 @@
 Hash: SHA256
 
 AUX tribler-5.9.12-fix-global-declarations.patch 944 SHA256 499d0f5869b0cf5e30dffdb19a3fa81c5da2305528eb4fb9daebdeb555d16908 SHA512 411d5fff563954f42e42ba7cb52559dbf3e38c6526e6857f65112c7844f9d297c79de8dd55b252e74cec35d353372a98017881053518a9e2453b90d6d48e6e4b WHIRLPOOL 31b7dd19cd2dadafb83118aa913c85f3711012ff4d9a48fdaffde6441d7f2a0e52703f80655114f5a9f3675a24bcc78eea4345e9fed92dc0e8c9806aed93186c
+AUX tribler-6.1.0-fix-desktop.patch 973 SHA256 3814cae379d07e7e285488119c67b6b38f428299e888cd5d7a3cedf1505babfc SHA512 59c7ce6d3f5fdf415edf5a1840309674884504dcfbf771d8444d0a4fd3413edafd0aca01ae6367711ff79fbc314113db14c10ffebdbe0a68717d32be9f5f0ee4 WHIRLPOOL 6613ed34712abc1c820da52748b4fd3869ec398bf684f75f76adaffe1ccfa8dd7909a06bb2c4316f833b37821e1e339e7db8e64582b3ba036391a46b08a5fe5c
 AUX tribler-fix-desktop.patch 848 SHA256 cd5a73a8112b6aa42329dd0c9a92f36bc5cdd4521c309248ceef71434cc99fbe SHA512 61e2495f9435bfbc1d9f215e33d86e905b27c693560f29b43b47910f4eea1cb5ad5e1b2e64f9b95599a88ba52a674bb88a9a05f9c162a499555df6df500f551a WHIRLPOOL 9bf0bdaa17ee5af8ea417571c6a2c85a8465c014af76acd8ca65548f188feac2b4db4fd183cca534087bfbfad5ffac56af4a2cf775c9c8d636c42bf3c337380e
 AUX tribler-log2homedir.patch 495 SHA256 2eb5028822b3e50775804386d7ea233868f9a3b8b4c8e56b422f715c60f56f69 SHA512 d518cf8917c89ae6e9ae777230ff2c6914ef6c08390aac7ce599e25941a51bfad3a68f28123916948cfc64a34c3631ad4f82cac6448bc87006e4ee55a4b67137 WHIRLPOOL 1d5158c5b612d71df09c938b07bd74adf6f19b695eeef751939d5af3142b858a14b47b4bfb438c6716b3ed5cae16ec8557a3522fa2424b4f9c1d68293aeed4ff
 DIST tribler-swift_6.0.0-28795_amd64.deb 718596 SHA256 b3bfe52eebc37539d6adb62f49a439d8794635c10e4d52d66bec663b6abc2467 SHA512 9f9734c2574b6d205e885c0621dcac5f5f3dcd45e1b6764017d6b6aaba5a346c242e44b1d69ea8dc47611cf6993c44e5e0e57bca150c81f5ca5b7635464d7c50 WHIRLPOOL 65933467ab002f91d1b4f81353170b5c05cec731a91bb89f28dc82fec2edee5f351b16e704a0eab5784111cab8d95670c6dc6d65747da59fbdafdaa20db46abc
 DIST tribler-swift_6.0.0-28795_i386.deb 736976 SHA256 1cd339fbb0b5e1f26c6ee75e2300c423ffe21ef8729e0f2a112a394ebf8469ac SHA512 a6458d49d1fb5c7b5d3db844cc614eaf77f72dca53809529c431e97b8fb5b4dcadce5d45a32a38853dbb4a29a9190a8486ce8ea1d1613637236d8244a312573e WHIRLPOOL fafce3fce9c0e6fcc322973bfb3701aba693a53cb301a236cbde1f5c6a8a0c22e5244f47b3be048803b1f264362a1bd5ac01ca27c1f54f706584cfadf986b040
+DIST tribler-swift_6.1ubuntu1_amd64.deb 2964032 SHA256 92702ed73219e33708b7ed853ffc6a3b19e80f15fa2e37ef029cdec26bfea83f SHA512 f16226bb8d5eae8df9b80ed7f6b246daca09dda2e8313daa15bf704c0b42e3a033a569e95fd275bb1a376b6df622397ed4ee72e4ab9310e975c6abd8470735bf WHIRLPOOL f7371d1ab47fca14362ad992489e484b4d90fc9ed0ebd469cc61f76084e17fb8f97b6fab892672bc61228d6223e183b659634ad5bdd83dbf5b79b051d300a16f
+DIST tribler-swift_6.1ubuntu1_i386.deb 2975912 SHA256 21e45b52bfeca6182863d660bf36ce3f42999cb477c27f9a1823bec70747e0c7 SHA512 e3ba6735d2639448d12e375b0d26bec747a2e6ec4eca8a57876bf191a17041c35d52fa8021e2ac51ba82267caf2a32b00d6019222b05f4541481a02ae809b94e WHIRLPOOL b23274635a20149ff23737aa93aca1c23da67d274c1907d7b094fe1d8e20bb40f2459c4f5e803e3d16506270db84b09482ec21099d636632b35c973fe00ae5e3
 DIST tribler_6.0.3_all.deb 5848674 SHA256 bf6173e2162602133e93a0ca06026f33d5a95edcefc57ff41c3a59f14a19e835 SHA512 fc4a165d0ae7460a3805fe4fde86150a21152a7cff92c226186f475d690cf4a7a3366767b1da4119b2222b3b83e8c07c9a1c23300abd0b7e01ea642d0e413551 WHIRLPOOL b13f5dbc2bdf9b980dc1195b77a19aff66f26a9d2d27adfbfa0ccb0373d62fd3c8769d7e64aeb842a7fd5eddb33774129732463f6ad88ec36e520d895465f21f
+DIST tribler_6.1ubuntu1_all.deb 1910742 SHA256 91d69191d9cf6162bcfa4440bc751eca6cf4210882eceef5241e9cd09127011c SHA512 a8b85530cc8ac0fc1720f5eba1ad299b0806d69ba8897abe9f2f6315b5a4ad8edc3432514d7f108c21bc43df7cbdbde14a7c22d153c6720fdeec5699dae76243 WHIRLPOOL 240299b8974d9a15d04cc14849c54c28ab6294457701777efab3493caccfd721ddc254c5adb5511bd34bec738d83200322fd4a39f438bb98ad2fd5272a212cb9
 EBUILD tribler-6.0.3.ebuild 1805 SHA256 a7b83b492f399a26e042e170dc7753a2dc7b9d5579deb31774f609b17d9d499a SHA512 3479408a47b75e3c890dd66f9fb31585de4f50b44cd5bae4d762218762c7f5bb9ac51d05c1ac1393b5d253a980c854e225d66e967e9d6015aa00221f728ac635 WHIRLPOOL 35057528e8f052f38d72afee295391ceb6fe5f5af8e621e5f832305f4b361bf2854fb4d3e8fd4bea50c136f7c3218e2cdc1cb35cba7dde2a321064909d665a22
-MISC ChangeLog 6952 SHA256 903552d9c8d44386528c1070dd2c42049f9bea141771a9363dc2f12a707fe06c SHA512 3e21ee52fdc0311a518ee94973af10b78b3f015e9d1387d702ba4f1b63fc8b8cd419941b7e6c61838ae5e16cab035b69cd09fac42507e24285f0d82371abe968 WHIRLPOOL b306722028c171b83dbe16a30ee52d2d5c8842479b42cf3b14e5367cd33ac616c3a6876a8444859dc8ff432f728f00eecd4c13c90fe2a447bdc9f118a91eb19f
+EBUILD tribler-6.1.0.ebuild 1826 SHA256 ecb4fdf94e93888d832ec495bcc9c9bf50ffdfb60cb231ca00a9430d3c82a336 SHA512 d831ca974d3998a7ef1b7e61046aa7e9fdcc079b30b9bb90920da864691f854b2c1c9ea50373600325b4d52a8a97fd8ceef1b85142062b07e98faf0959fe570e WHIRLPOOL 0998191e07cf1792829899dc980b45b4d76370febbf9c56c51a46fc067a095430ab3be034f86d043fd297983dbcc6468207392d3e1cf2b3bd642a56dbfc9d959
+MISC ChangeLog 7133 SHA256 9287f68ceac227252f95dea8998a02639fd47653e9c75fe2429643b92f30f478 SHA512 89b43ce32b711da53a0d3504544178288128a6426a0974095d5fba054c3c58f093035c33d8171cbbe38413b104a34e90869590a223fedcda8a90314806fd028d WHIRLPOOL a2a22299010818a2a9ce6e6cb5b3b4bab4fe912de2689528177cfbf446e3fbe42ce4b3097b67ccf6af45b1eb0a2018d4e3d2fc95e77760f60b4954be4113b3fa
 MISC metadata.xml 456 SHA256 de4487feb43cb09d85bf841828694e1c01ea93c405421a45654cdb14569593b9 SHA512 ff5df2f76626de16e50cdf2b48eb797a07de5db9f0c7aec5d00c1ba21b42e1beaf9aeb0f91fdea9d202109b94bb4d6a28ba630f5ff81eca73ba60ded527f7940 WHIRLPOOL 3d1bd66e56c68b1f2f579ad047f3bdd6cc59fb095f2008d07b062f32f408123c217f0be82f89345a14dae7256a9c176bb28a8af563a9fb8e34d17828cccd21bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRTgeUAAoJELEHsLL7fEFW05YP/1ycfHxNtFFDrgoiC9YnlN8o
-6IYIL/V0EvGHI/j414dp+jIa0p57dyFR/KMm0sjhVCrNJLUcec6r28sZCdy1xzPQ
-qquJUgNJ0U858GN8rLdTOrXCIl10UBCDMZwC682qtyl0InacZFcgbHKZj0VjIfIZ
-rCSR+Ld53EQW5x6FOHcQ22W42URCkcATYKl8WwBdq92xtTc4IYnKhsdNqS0oLSgY
-J8/bzMW2aZMBjW8N+zeFi/0T9wOSGMioMnta7o9DbiGcVOgAGnv628tmopkZOgoh
-dAQJs+kw07wOLnoK2qlngm7yX9uQeJUgs/FgLHhxD3P8mudJv+yxgUhK4OJIMF7w
-AOf45KPv+cvd05iBAJlWK9DLAJOXubhRRtHDnuN+4La+mk5YeBBxaNepwXNiVgrt
-nE/zPYlsi4udzKazchOurCFxXY7zjeK0NfPCcw07UfR27+kqfhMoqaBR2aZ1+zcz
-nxmcIy/enXofeOIo/KDGxVey1u1tNTj/Kwv9HNI05W7Nu31s92qbBzbGKE5hwUs5
-rMAiDINqCeF3VwkpT8DkAW/sXEqtW2bGtHhPKjFTnSbkt5rpIzduqj2gicw/pV/R
-2f2mro6OOIFHMSM5AAbuWm7/jQ/hClrAyOEyKNc1yTMoHacogxN7j729aroOlFjP
-9CiUDANTZyh2Gi5/6rG7
-=eHYr
+iQIcBAEBCAAGBQJRjE4sAAoJEJOE+m71LUu6bToP/A66tTFAVb3hpH9GTUJounyi
+FfMGx2bD1I7On6KNt2xO3MPznb8PMTgqd0wd1A3o3v+ORLYqp3ShmcelS5EWrW45
+yu8ypuykvVcfkOI9DoQKBfCT95So6nbX+g0ZNWzrfB87koIEDONwWGh/RWrXE1En
+yTsKu9yi0XxEJ6wXAZquKVX6+m+r+3o9YVM16qHKtlAmCE4a5dS5+hH21jk53MfJ
+r+OtI9MGzz73vy0aYeGBn5lW1QJ8Fsiy6txLZZndYb79tvAmY48A4wuyqx1OQlL4
+WymgbR2uDAsNMITyAxBUVzhf/Kn1fhkVRkG58SrYseWaMTqPjJX2W5FVL5oLxJQp
+2+EpKWvEZuDLnm1mnonhGYzK28BAjtGmvw3UJJUP78ydT8N6h7P3M/6qMk8pt+OR
+K2MPUxl+bPKwZIjvB4THtZm+TDbwpcq6GIMZ4aJU+l368gu+PiZbI7IsBNsFcRTl
+BYbpSOUe6b1lmjnedN5x6K/sRexqqssF7W/qwvQVSWwGT6QuKOYuCqTRvpHNG44G
+3mHLCxVc/15Tmp2tNMrRO1k6naCM0dyGui4eaq/+B69KGDPKggsXp+XMXHyt5bSD
+eIyQJGbapNK+LAsyOKOXkt2LfwIqry1TenweQihG/zzdz9bLEeKYD93DRPjPJ60e
+8NhoovdvFBiC2TNcyy5I
+=KNRC
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/tribler/files/tribler-6.1.0-fix-desktop.patch b/net-p2p/tribler/files/tribler-6.1.0-fix-desktop.patch
new file mode 100644
index 000000000000..250deda21616
--- /dev/null
+++ b/net-p2p/tribler/files/tribler-6.1.0-fix-desktop.patch
@@ -0,0 +1,21 @@
+diff -Naur usr.orig/share/applications/swarmplayer.desktop usr/share/applications/swarmplayer.desktop
+--- usr.orig/share/applications/swarmplayer.desktop	2013-05-09 20:47:46.000000000 -0400
++++ usr/share/applications/swarmplayer.desktop	2013-05-09 20:48:34.000000000 -0400
+@@ -5,4 +5,4 @@
+ Icon=swarmplayer
+ Terminal=false
+ Type=Application
+-Categories=Application;Network;P2P
++Categories=Network;P2P;
+diff -Naur usr.orig/share/applications/tribler.desktop usr/share/applications/tribler.desktop
+--- usr.orig/share/applications/tribler.desktop	2013-05-09 20:47:46.000000000 -0400
++++ usr/share/applications/tribler.desktop	2013-05-09 20:49:03.000000000 -0400
+@@ -5,5 +5,5 @@
+ Icon=tribler
+ Terminal=false
+ Type=Application
+-Categories=Application;Network;P2P
+-MimeType=x-scheme-handler/ppsp;x-scheme-handler/tswift;x-scheme-handler/magnet
+\ No newline at end of file
++Categories=Network;P2P;
++MimeType=x-scheme-handler/ppsp;x-scheme-handler/tswift;x-scheme-handler/magnet;
diff --git a/net-p2p/tribler/tribler-6.1.0.ebuild b/net-p2p/tribler/tribler-6.1.0.ebuild
new file mode 100644
index 000000000000..d545d6d807c1
--- /dev/null
+++ b/net-p2p/tribler/tribler-6.1.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/tribler-6.1.0.ebuild,v 1.1 2013/05/10 01:32:31 blueness Exp $
+
+EAPI="5"
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="sqlite"
+
+inherit eutils python unpacker
+
+DESCRIPTION="Bittorrent client that does not require a website to discover content"
+HOMEPAGE="http://www.tribler.org/"
+SRC_URI="
+	http://dl.tribler.org/tribler_6.1ubuntu1_all.deb
+	x86?   ( http://dl.tribler.org/tribler-swift_6.1ubuntu1_i386.deb )
+	amd64? ( http://dl.tribler.org/tribler-swift_6.1ubuntu1_amd64.deb )"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="vlc"
+
+RDEPEND="
+	dev-python/apsw
+	dev-python/feedparser
+	dev-python/m2crypto
+	dev-python/netifaces
+	dev-libs/openssl
+	dev-python/wxpython
+	net-libs/rb_libtorrent
+	vlc? (
+			media-video/vlc
+			media-video/ffmpeg
+		)"
+
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/lib/tribler/swift"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-5.9.12-fix-global-declarations.patch"
+	epatch "${FILESDIR}/${PN}-log2homedir.patch"
+	epatch "${FILESDIR}/${P}-fix-desktop.patch"
+
+	python_convert_shebangs -r 2 .
+}
+
+src_compile() { :; }
+
+src_install() {
+	#Rename the doc dir properly
+	mv usr/share/doc/${PN} usr/share/doc/${P}
+
+	#Move the readme to the doc dir
+	mv usr/share/${PN}/Tribler/readme.txt usr/share/doc/${P}
+
+	#Remove the licenses scattered throughout
+	rm usr/share/doc/${P}/copyright
+	rm usr/share/${PN}/Tribler/*.txt
+	rm usr/share/${PN}/Tribler/Core/DecentralizedTracking/pymdht/LGPL-2.1.txt
+
+	#Copy the rest over
+	cp -pPR usr/ "${ED}"/
+}
+
+pkg_postinst() {
+	python_mod_optimize "${ROOT}"usr/share/${PN}
+}
+
+pkg_postrm() {
+	python_mod_cleanup "${ROOT}"usr/share/${PN}
+}