From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6C737139695 for ; Fri, 28 Jul 2017 13:06:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6CDBC1FC10F; Fri, 28 Jul 2017 13:06:04 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3CC851FC10F for ; Fri, 28 Jul 2017 13:06:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 09A833419CB for ; Fri, 28 Jul 2017 13:06:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 247C774B7 for ; Fri, 28 Jul 2017 13:06:01 +0000 (UTC) From: "Sergey Popov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergey Popov" Message-ID: <1501247151.11162c449cb73bf19511d0d0e72465686f1199a7.pinkbyte@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-p2p/retroshare/Manifest net-p2p/retroshare/metadata.xml net-p2p/retroshare/retroshare-0.5.5c.ebuild net-p2p/retroshare/retroshare-0.6.2.ebuild X-VCS-Directories: net-p2p/retroshare/ X-VCS-Committer: pinkbyte X-VCS-Committer-Name: Sergey Popov X-VCS-Revision: 11162c449cb73bf19511d0d0e72465686f1199a7 X-VCS-Branch: master Date: Fri, 28 Jul 2017 13:06:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 63e7510d-2048-428a-bdf7-8e2bf05e0cd7 X-Archives-Hash: 024326c37ddb978e51f85c88d691a9a0 commit: 11162c449cb73bf19511d0d0e72465686f1199a7 Author: Sergey Popov gentoo org> AuthorDate: Thu Jul 27 12:16:43 2017 +0000 Commit: Sergey Popov gentoo org> CommitDate: Fri Jul 28 13:05:51 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11162c44 net-p2p/retroshare: drop Qt4 support, drop old version Package-Manager: Portage-2.3.6, Repoman-2.3.1 net-p2p/retroshare/Manifest | 1 - net-p2p/retroshare/metadata.xml | 1 - net-p2p/retroshare/retroshare-0.5.5c.ebuild | 129 ---------------------------- net-p2p/retroshare/retroshare-0.6.2.ebuild | 52 ++++------- 4 files changed, 16 insertions(+), 167 deletions(-) diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest index bc57697ca2f..780a57b574a 100644 --- a/net-p2p/retroshare/Manifest +++ b/net-p2p/retroshare/Manifest @@ -1,2 +1 @@ DIST retroshare-0.6.2.tar.gz 18523943 SHA256 76a3ae2f2089b14562d5be34602f5ae3c73a8549aecee246ea5e67d03018de2b SHA512 7b935321f436d72948c5c0286ef5e0236bd52d1b25f00980a3b3644ae4acbde043063279f90f6bc0356363bceda484aba57e160f34f013dde120b4f6969ef6c7 WHIRLPOOL 054f5ec8dbf70c89dabaccb50265bbf2a97fe1b2eab6c6a13d0b86f0dd1d4e4097e4eacf163fa75f4cd1225307e4c2d214dddb364de7a29b809c1dc0f767c32e -DIST retroshare_0.5.5-0.7068.tar.gz 11899395 SHA256 772b0d7916137e81fc0f5ea14f0a8fa70d3d7acb701ca0b0c1c66018f2255650 SHA512 51caeca54c6b6ce6ec049d3004301a74db5bb5dc2390c769486429ca0db4e45e2d8eba98c3f9ea99628c1a2452d71c8460ea4d3b3c103e321d3459211767bc1d WHIRLPOOL f6c8a7323be84d79975e970629f5bd457487cac6a061bc6817da328ff1de03a8d3fab98ab3cf4fba0628f239e09d8f8da4c14587764689a23193bbda22419e88 diff --git a/net-p2p/retroshare/metadata.xml b/net-p2p/retroshare/metadata.xml index 1c91da5e5c0..ccf103c0b98 100644 --- a/net-p2p/retroshare/metadata.xml +++ b/net-p2p/retroshare/metadata.xml @@ -18,7 +18,6 @@ Enables the CLI version of RetroShare Enables the Feedreader plugin Enables the GUI version of RetroShare - Enables LinkClouds plugin Enables VOIP plugin diff --git a/net-p2p/retroshare/retroshare-0.5.5c.ebuild b/net-p2p/retroshare/retroshare-0.5.5c.ebuild deleted file mode 100644 index 3f6da59fe35..00000000000 --- a/net-p2p/retroshare/retroshare-0.5.5c.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils multilib gnome2-utils qmake-utils - -MY_PN="RetroShare" -MY_P="${MY_PN}-v${PV}" - -DESCRIPTION="P2P private sharing application" -HOMEPAGE="http://retroshare.sourceforge.net" -SRC_URI="mirror://sourceforge/retroshare/retroshare_0.5.5-0.7068.tar.gz" - -# pegmarkdown can also be used with MIT -LICENSE="GPL-2 GPL-3 Apache-2.0 LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="cli feedreader links-cloud qt4 voip" -REQUIRED_USE="|| ( cli qt4 ) - feedreader? ( qt4 ) - links-cloud? ( qt4 ) - voip? ( qt4 )" - -RDEPEND=" - app-arch/bzip2 - dev-libs/openssl:0 - gnome-base/libgnome-keyring - net-libs/libupnp:0 - sys-libs/zlib - cli? ( - dev-libs/protobuf - net-libs/libssh[server] - ) - feedreader? ( - dev-libs/libxml2 - dev-libs/libxslt - net-misc/curl - ) - qt4? ( - x11-libs/libX11 - x11-libs/libXScrnSaver - dev-qt/qtcore:4 - dev-qt/qtgui:4 - ) - voip? ( - media-libs/speex - dev-qt/qt-mobility[multimedia] - dev-qt/qtmultimedia:4 - )" -DEPEND="${RDEPEND} - app-arch/unzip - dev-qt/qtcore:4 - virtual/pkgconfig" - -S="${WORKDIR}/retroshare-0.5.5/src" - -src_prepare() { - local dir - - sed -i \ - -e "s|/usr/lib/retroshare/extensions/|/usr/$(get_libdir)/${PN}/extensions/|" \ - libretroshare/src/rsserver/rsinit.cc \ - || die "sed failed" - - rs_src_dirs="libbitdht/src openpgpsdk/src libretroshare/src supportlibs/pegmarkdown" - use cli && rs_src_dirs="${rs_src_dirs} retroshare-nogui/src" - use qt4 && rs_src_dirs="${rs_src_dirs} retroshare-gui/src" - use links-cloud && rs_src_dirs="${rs_src_dirs} plugins/LinksCloud" - use feedreader && rs_src_dirs="${rs_src_dirs} plugins/FeedReader" - - if use voip ; then - rs_src_dirs="${rs_src_dirs} plugins/VOIP" - echo "QT += multimedia" >> "plugins/VOIP/VOIP.pro" || die - echo "CONFIG += mobility" >> "plugins/VOIP/VOIP.pro" || die - fi -} - -src_configure() { - for dir in ${rs_src_dirs} ; do - cd "${S}"/${dir} || die - eqmake4 - done -} - -src_compile() { - local dir - - for dir in ${rs_src_dirs} ; do - emake -C ${dir} - done - - unset rs_src_dirs -} - -src_install() { - local i - local extension_dir="/usr/$(get_libdir)/${PN}/extensions/" - - use cli && dobin retroshare-nogui/src/retroshare-nogui - use qt4 && dobin retroshare-gui/src/RetroShare - - exeinto "${extension_dir}" - use feedreader && doexe plugins/FeedReader/*.so* - use links-cloud && doexe plugins/LinksCloud/*.so* - use voip && doexe plugins/VOIP/*.so* - - insinto /usr/share/RetroShare - doins libbitdht/src/bitdht/bdboot.txt - - dodoc README.txt - make_desktop_entry RetroShare - for i in 24 48 64 ; do - doicon -s ${i} build_scripts/Ubuntu_src/data/${i}x${i}/${PN}.png - done - doicon -s 128 build_scripts/Ubuntu_src/data/${PN}.png -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/net-p2p/retroshare/retroshare-0.6.2.ebuild b/net-p2p/retroshare/retroshare-0.6.2.ebuild index 0e416e880aa..9bbc687a0fb 100644 --- a/net-p2p/retroshare/retroshare-0.6.2.ebuild +++ b/net-p2p/retroshare/retroshare-0.6.2.ebuild @@ -14,11 +14,9 @@ LICENSE="GPL-2 GPL-3 Apache-2.0 LGPL-2.1" SLOT="0" KEYWORDS="amd64 x86" -IUSE="cli feedreader +gui qt4 +qt5 voip" +IUSE="cli feedreader +gui voip" REQUIRED_USE=" || ( cli gui ) - gui? ( ^^ ( qt4 qt5 ) ) - cli? ( ^^ ( qt4 qt5 ) ) feedreader? ( gui ) voip? ( gui )" @@ -26,6 +24,12 @@ RDEPEND=" app-arch/bzip2 dev-db/sqlcipher dev-libs/openssl:0 + dev-qt/qtcore:5 + dev-qt/qtmultimedia:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtscript:5 + dev-qt/qtxml:5 gnome-base/libgnome-keyring net-libs/libmicrohttpd net-libs/libupnp:0 @@ -35,39 +39,16 @@ RDEPEND=" dev-libs/libxslt net-misc/curl ) - qt4? ( - gui? ( - dev-qt/designer:4 - dev-qt/qtgui:4 - x11-libs/libX11 - x11-libs/libXScrnSaver - ) - dev-qt/qtcore:4 - ) - qt5? ( - gui? ( - dev-qt/designer:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - x11-libs/libX11 - x11-libs/libXScrnSaver - ) - dev-qt/qtcore:5 - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtscript:5 - dev-qt/qtxml:5 + gui? ( + dev-qt/designer:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + x11-libs/libX11 + x11-libs/libXScrnSaver ) voip? ( - qt5? ( - media-libs/opencv[-qt4(-)] - ) - qt4? ( - media-libs/opencv - dev-qt/qt-mobility[multimedia] - ) + media-libs/opencv[-qt4(-)] media-libs/speex virtual/ffmpeg[encode] )" @@ -106,8 +87,7 @@ src_prepare() { src_configure() { for dir in ${rs_src_dirs} ; do pushd "${S}/${dir}" >/dev/null || die - use qt4 && eqmake4 - use qt5 && eqmake5 + eqmake5 popd >/dev/null || die done }