From 724a5fffb00d23c99a58b4cb334546d56111eff2 Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Mon, 18 Feb 2013 19:01:33 +0000 Subject: Remove older stable; fix .desktop, bug #457582 (Portage version: 2.1.11.50/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA) --- net-p2p/tribler/ChangeLog | 6 +- net-p2p/tribler/files/tribler-fix-desktop.patch | 18 ++++++ net-p2p/tribler/tribler-6.0.2.ebuild | 86 ------------------------- net-p2p/tribler/tribler-6.0.3.ebuild | 3 +- 4 files changed, 25 insertions(+), 88 deletions(-) create mode 100644 net-p2p/tribler/files/tribler-fix-desktop.patch delete mode 100644 net-p2p/tribler/tribler-6.0.2.ebuild (limited to 'net-p2p/tribler') diff --git a/net-p2p/tribler/ChangeLog b/net-p2p/tribler/ChangeLog index c8f102757ff1..37abd979d3aa 100644 --- a/net-p2p/tribler/ChangeLog +++ b/net-p2p/tribler/ChangeLog @@ -1,6 +1,10 @@ # 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.44 2013/02/14 20:19:55 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/ChangeLog,v 1.45 2013/02/18 19:01:32 blueness Exp $ + + 18 Feb 2013; Anthony G. Basile + +files/tribler-fix-desktop.patch, -tribler-6.0.2.ebuild, tribler-6.0.3.ebuild: + Remove older stable; fix .desktop, bug #457582 14 Feb 2013; Agostino Sarubbo tribler-6.0.3.ebuild: Stable for x86, wrt bug #457460 diff --git a/net-p2p/tribler/files/tribler-fix-desktop.patch b/net-p2p/tribler/files/tribler-fix-desktop.patch new file mode 100644 index 000000000000..469ed7ee7e03 --- /dev/null +++ b/net-p2p/tribler/files/tribler-fix-desktop.patch @@ -0,0 +1,18 @@ +diff -Naur usr.orig/share/applications/tribler.desktop usr/share/applications/tribler.desktop +--- usr.orig/share/applications/tribler.desktop 2012-09-24 20:50:23.000000000 -0400 ++++ usr/share/applications/tribler.desktop 2013-02-18 13:58:57.000000000 -0500 +@@ -5,4 +5,4 @@ + Icon=tribler + Terminal=false + Type=Application +-Categories=Application;Network;P2P ++Categories=Network;P2P; +diff -Naur usr.orig/share/tribler/Tribler/Main/Build/Ubuntu/tribler.desktop usr/share/tribler/Tribler/Main/Build/Ubuntu/tribler.desktop +--- usr.orig/share/tribler/Tribler/Main/Build/Ubuntu/tribler.desktop 2012-11-19 23:26:42.000000000 -0500 ++++ usr/share/tribler/Tribler/Main/Build/Ubuntu/tribler.desktop 2013-02-18 13:59:08.000000000 -0500 +@@ -5,4 +5,4 @@ + Icon=tribler + Terminal=false + Type=Application +-Categories=Application;Network;P2P ++Categories=Network;P2P; diff --git a/net-p2p/tribler/tribler-6.0.2.ebuild b/net-p2p/tribler/tribler-6.0.2.ebuild deleted file mode 100644 index 43a9f88b0d95..000000000000 --- a/net-p2p/tribler/tribler-6.0.2.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/tribler-6.0.2.ebuild,v 1.3 2012/12/14 12:53:25 ago Exp $ - -EAPI="4" -PYTHON_DEPEND="2" -PYTHON_USE_WITH="sqlite" - -inherit eutils python - -MY_PV="${PN}_${PV}_all" - -DESCRIPTION="Bittorrent client that does not require a website to discover content" -HOMEPAGE="http://www.tribler.org/" -SRC_URI=" - http://dl.tribler.org/${MY_PV}.deb - x86? ( http://dl.tribler.org/tribler-swift_6.0.0-28795_i386.deb ) - amd64? ( http://dl.tribler.org/tribler-swift_6.0.0-28795_amd64.deb )" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="vlc" - -RDEPEND=" - dev-python/apsw - dev-python/m2crypto - dev-python/netifaces - dev-libs/openssl - dev-python/wxpython - vlc? ( - media-video/vlc - media-video/ffmpeg - )" - -DEPEND="${RDEPEND} - app-arch/unzip" - -S="${WORKDIR}" - -QA_PREBUILT="/usr/share/tribler/swift" - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_unpack() { - for i in ${A}; do - unpack ${i} - unpack ./data.tar.gz - done -} - -src_prepare() { - epatch "${FILESDIR}/${PN}-5.9.12-fix-global-declarations.patch" - epatch "${FILESDIR}/${PN}-log2homedir.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,LICENSE.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} -} diff --git a/net-p2p/tribler/tribler-6.0.3.ebuild b/net-p2p/tribler/tribler-6.0.3.ebuild index 5520fa04af7b..cb7f3d62e4ff 100644 --- a/net-p2p/tribler/tribler-6.0.3.ebuild +++ b/net-p2p/tribler/tribler-6.0.3.ebuild @@ -1,6 +1,6 @@ # 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.0.3.ebuild,v 1.3 2013/02/14 20:19:55 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/tribler-6.0.3.ebuild,v 1.4 2013/02/18 19:01:32 blueness Exp $ EAPI="4" PYTHON_DEPEND="2" @@ -55,6 +55,7 @@ src_unpack() { src_prepare() { epatch "${FILESDIR}/${PN}-5.9.12-fix-global-declarations.patch" epatch "${FILESDIR}/${PN}-log2homedir.patch" + epatch "${FILESDIR}/${PN}-fix-desktop.patch" python_convert_shebangs -r 2 . } -- cgit v1.2.3-65-gdbad