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 A4FAC1396D0 for ; Mon, 7 Aug 2017 08:55:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E6B3B1FC002; Mon, 7 Aug 2017 08:55:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 B41C21FC002 for ; Mon, 7 Aug 2017 08:55:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 517B534170C for ; Mon, 7 Aug 2017 08:55:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7F84374B9 for ; Mon, 7 Aug 2017 08:55:17 +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: <1502096112.6a0047276f9fc04631f1c2131764705e60fd2c48.pinkbyte@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/files/, net-p2p/retroshare/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-p2p/retroshare/Manifest net-p2p/retroshare/files/retroshare-0.6.3-fix-comment.patch net-p2p/retroshare/retroshare-0.6.3.ebuild net-p2p/retroshare/retroshare-0.6.9999.ebuild X-VCS-Directories: net-p2p/retroshare/files/ net-p2p/retroshare/ X-VCS-Committer: pinkbyte X-VCS-Committer-Name: Sergey Popov X-VCS-Revision: 6a0047276f9fc04631f1c2131764705e60fd2c48 X-VCS-Branch: master Date: Mon, 7 Aug 2017 08:55:17 +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: 8b27c9d6-d952-4c6a-be63-4f8e885c5fe7 X-Archives-Hash: 3f66032e94ffb074b0fbbb0fc4324f76 commit: 6a0047276f9fc04631f1c2131764705e60fd2c48 Author: Sergey Popov gentoo org> AuthorDate: Mon Aug 7 08:54:33 2017 +0000 Commit: Sergey Popov gentoo org> CommitDate: Mon Aug 7 08:55:12 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a004727 net-p2p/retroshare: version bump Fix comment type to prevent compile error. Sync live ebuild Reported-by: Gleb fastmail.com> Gentoo-Bug: 627150 Package-Manager: Portage-2.3.6, Repoman-2.3.1 net-p2p/retroshare/Manifest | 1 + .../files/retroshare-0.6.3-fix-comment.patch | 19 +++++++++++++ ...are-0.6.9999.ebuild => retroshare-0.6.3.ebuild} | 33 +++++++++++++++------- net-p2p/retroshare/retroshare-0.6.9999.ebuild | 16 +++++++---- 4 files changed, 53 insertions(+), 16 deletions(-) diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest index 780a57b574a..f00ff216e37 100644 --- a/net-p2p/retroshare/Manifest +++ b/net-p2p/retroshare/Manifest @@ -1 +1,2 @@ DIST retroshare-0.6.2.tar.gz 18523943 SHA256 76a3ae2f2089b14562d5be34602f5ae3c73a8549aecee246ea5e67d03018de2b SHA512 7b935321f436d72948c5c0286ef5e0236bd52d1b25f00980a3b3644ae4acbde043063279f90f6bc0356363bceda484aba57e160f34f013dde120b4f6969ef6c7 WHIRLPOOL 054f5ec8dbf70c89dabaccb50265bbf2a97fe1b2eab6c6a13d0b86f0dd1d4e4097e4eacf163fa75f4cd1225307e4c2d214dddb364de7a29b809c1dc0f767c32e +DIST retroshare-0.6.3.tar.gz 19699359 SHA256 ddb64aa5148fdc950d4426f52f1cbb11578619b1242614e3c4ca4792ee5ce30b SHA512 ee699ddc71aba3d20498d46e8183953b948896709d1469a5d5374b7c9b7955e460326b1ea3fe6f87e7235c5d2d5e8f042161410a0990b2dd2a44b42551fb5757 WHIRLPOOL 38b78b920b4be88a313d3edad4e299c05667597a1945cd3455cbf2545a673f38ceb5b2cc4703a13b2f6a199b3ea72823934650446d51c144c0efdb946dd0a1d6 diff --git a/net-p2p/retroshare/files/retroshare-0.6.3-fix-comment.patch b/net-p2p/retroshare/files/retroshare-0.6.3-fix-comment.patch new file mode 100644 index 00000000000..20652f180cd --- /dev/null +++ b/net-p2p/retroshare/files/retroshare-0.6.3-fix-comment.patch @@ -0,0 +1,19 @@ +commit b686771a38c93339ece773bd5ae4d0db1fa629b7 +Author: Gleb Nemshilov +Date: Sun Aug 6 14:27:26 2017 +0700 + + fix C++ comment to avoid compilation error + +diff --git a/supportlibs/pegmarkdown/utility_functions.c b/supportlibs/pegmarkdown/utility_functions.c +index 08f910274..9445de420 100644 +--- a/supportlibs/pegmarkdown/utility_functions.c ++++ b/supportlibs/pegmarkdown/utility_functions.c +@@ -26,7 +26,7 @@ element *reverse(element *list) { + element *new = NULL; + element *next = NULL; + #warning Phenom (2017-07-21): I don't know if it is a real memLeak for new. If not remove this warning and add a comment how it is deleted. +- // cppcheck-suppress memleak ++ /* cppcheck-suppress memleak */ + while (list != NULL) { + next = list->next; + new = cons(list, new); diff --git a/net-p2p/retroshare/retroshare-0.6.9999.ebuild b/net-p2p/retroshare/retroshare-0.6.3.ebuild similarity index 79% copy from net-p2p/retroshare/retroshare-0.6.9999.ebuild copy to net-p2p/retroshare/retroshare-0.6.3.ebuild index 15d6a116d95..8e7f93647e4 100644 --- a/net-p2p/retroshare/retroshare-0.6.9999.ebuild +++ b/net-p2p/retroshare/retroshare-0.6.3.ebuild @@ -3,16 +3,16 @@ EAPI=6 -EGIT_REPO_URI="https://github.com/RetroShare/RetroShare.git" -inherit eutils git-r3 gnome2-utils qmake-utils versionator +inherit eutils gnome2-utils qmake-utils versionator DESCRIPTION="P2P private sharing application" HOMEPAGE="http://retroshare.net" +SRC_URI="https://github.com/RetroShare/RetroShare/archive/v${PV}.tar.gz -> ${P}.tar.gz" # pegmarkdown can also be used with MIT LICENSE="GPL-2 GPL-3 Apache-2.0 LGPL-2.1" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64 ~x86" IUSE="cli feedreader gnome-keyring +gui voip" REQUIRED_USE=" @@ -53,7 +53,10 @@ RDEPEND=" virtual/ffmpeg[encode] )" DEPEND="${RDEPEND} - virtual/pkgconfig" + virtual/pkgconfig +" + +S="${WORKDIR}/RetroShare-${PV}" src_prepare() { local dir @@ -76,7 +79,13 @@ src_prepare() { retroshare-nogui/src/retroshare-nogui.pro || die 'sed on retroshare-gui/src/retroshare-gui.pro failed' # Avoid openpgpsdk false dependency on qtgui - sed -i '2iQT -= gui' openpgpsdk/src/openpgpsdk.pro + sed -i '2iQT -= gui' openpgpsdk/src/openpgpsdk.pro || die + + # Fix version + sed -i -e '/RS_BUILD_NUMBER/s/2/3/' libretroshare/src/retroshare/rsversion.in || die + + # Fix comment not allowed in C++11 + eapply "${FILESDIR}/${P}-fix-comment.patch" eapply_user } @@ -103,22 +112,22 @@ src_install() { local i local extension_dir="/usr/$(get_libdir)/${PN}/extensions6/" - use cli && dobin retroshare-nogui/src/RetroShare06-nogui - use gui && dobin retroshare-gui/src/RetroShare06 + use cli && dobin retroshare-nogui/src/retroshare-nogui + use gui && dobin retroshare-gui/src/retroshare exeinto "${extension_dir}" use feedreader && doexe plugins/FeedReader/*.so* use voip && doexe plugins/VOIP/*.so* - insinto /usr/share/RetroShare06 + insinto /usr/share/retroshare doins libbitdht/src/bitdht/bdboot.txt doins -r libresapi/src/webui dodoc README.md - make_desktop_entry RetroShare06 + make_desktop_entry retroshare for i in 24 48 64 128 ; do - doicon -s ${i} "data/${i}x${i}/apps/retroshare06.png" + doicon -s ${i} "data/${i}x${i}/apps/retroshare.png" done } @@ -133,6 +142,10 @@ pkg_preinst() { elog "generate a new certificate or import existing from a backup" break fi + if version_is_at_least 0.6.0 ${ver}; then + elog "Main executable was renamed upstream from RetroShare06 to retroshare" + break + fi done gnome2_icon_savelist } diff --git a/net-p2p/retroshare/retroshare-0.6.9999.ebuild b/net-p2p/retroshare/retroshare-0.6.9999.ebuild index 15d6a116d95..2a62dc7dc3d 100644 --- a/net-p2p/retroshare/retroshare-0.6.9999.ebuild +++ b/net-p2p/retroshare/retroshare-0.6.9999.ebuild @@ -76,7 +76,7 @@ src_prepare() { retroshare-nogui/src/retroshare-nogui.pro || die 'sed on retroshare-gui/src/retroshare-gui.pro failed' # Avoid openpgpsdk false dependency on qtgui - sed -i '2iQT -= gui' openpgpsdk/src/openpgpsdk.pro + sed -i '2iQT -= gui' openpgpsdk/src/openpgpsdk.pro || die eapply_user } @@ -103,22 +103,22 @@ src_install() { local i local extension_dir="/usr/$(get_libdir)/${PN}/extensions6/" - use cli && dobin retroshare-nogui/src/RetroShare06-nogui - use gui && dobin retroshare-gui/src/RetroShare06 + use cli && dobin retroshare-nogui/src/retroshare-nogui + use gui && dobin retroshare-gui/src/retroshare exeinto "${extension_dir}" use feedreader && doexe plugins/FeedReader/*.so* use voip && doexe plugins/VOIP/*.so* - insinto /usr/share/RetroShare06 + insinto /usr/share/retroshare doins libbitdht/src/bitdht/bdboot.txt doins -r libresapi/src/webui dodoc README.md - make_desktop_entry RetroShare06 + make_desktop_entry retroshare for i in 24 48 64 128 ; do - doicon -s ${i} "data/${i}x${i}/apps/retroshare06.png" + doicon -s ${i} "data/${i}x${i}/apps/retroshare.png" done } @@ -133,6 +133,10 @@ pkg_preinst() { elog "generate a new certificate or import existing from a backup" break fi + if version_is_at_least 0.6.0 ${ver}; then + elog "Main executable was renamed upstream from RetroShare06 to retroshare" + break + fi done gnome2_icon_savelist }