From fa30be47bcfe5c2e3c484148ac48b3ddd998d66f Mon Sep 17 00:00:00 2001 From: Sergey Popov Date: Mon, 23 Apr 2018 11:20:47 +0300 Subject: net-p2p/retroshare: revision bump Add missing dependency on media-libs/speexdsp Closes: https://bugs.gentoo.org/646502 Package-Manager: Portage-2.3.31, Repoman-2.3.9 --- net-p2p/retroshare/retroshare-0.6.3-r1.ebuild | 160 ++++++++++++++++++++++++++ net-p2p/retroshare/retroshare-0.6.3.ebuild | 159 ------------------------- 2 files changed, 160 insertions(+), 159 deletions(-) create mode 100644 net-p2p/retroshare/retroshare-0.6.3-r1.ebuild delete mode 100644 net-p2p/retroshare/retroshare-0.6.3.ebuild (limited to 'net-p2p') diff --git a/net-p2p/retroshare/retroshare-0.6.3-r1.ebuild b/net-p2p/retroshare/retroshare-0.6.3-r1.ebuild new file mode 100644 index 000000000000..5686dc403dc9 --- /dev/null +++ b/net-p2p/retroshare/retroshare-0.6.3-r1.ebuild @@ -0,0 +1,160 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +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="~amd64 ~x86" + +IUSE="cli feedreader gnome-keyring +gui voip" +REQUIRED_USE=" + || ( cli gui ) + feedreader? ( gui ) + voip? ( gui )" + +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 + net-libs/libmicrohttpd + net-libs/libupnp:0 + sys-libs/zlib + gnome-keyring? ( gnome-base/libgnome-keyring ) + feedreader? ( + dev-libs/libxml2 + dev-libs/libxslt + net-misc/curl + ) + gui? ( + dev-qt/designer:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + x11-libs/libX11 + x11-libs/libXScrnSaver + ) + voip? ( + media-libs/opencv[-qt4(-)] + media-libs/speex + media-libs/speexdsp + virtual/ffmpeg[encode] + )" +DEPEND="${RDEPEND} + virtual/pkgconfig +" + +S="${WORKDIR}/RetroShare-${PV}" + +src_prepare() { + local dir + + sed -i \ + -e "s|/usr/lib/retroshare/extensions6/|/usr/$(get_libdir)/${PN}/extensions6/|" \ + libretroshare/src/rsserver/rsinit.cc \ + || die "sed on libretroshare/src/rsserver/rsinit.cc failed" + + rs_src_dirs="libbitdht/src openpgpsdk/src libresapi/src libretroshare/src supportlibs/pegmarkdown" + use cli && rs_src_dirs="${rs_src_dirs} retroshare-nogui/src" + use feedreader && rs_src_dirs="${rs_src_dirs} plugins/FeedReader" + use gui && rs_src_dirs="${rs_src_dirs} retroshare-gui/src" + use voip && rs_src_dirs="${rs_src_dirs} plugins/VOIP" + + # Force linking to sqlcipher ONLY + sed -i \ + -e '/isEmpty(SQLCIPHER_OK) {/aerror(libsqlcipher not found)' \ + retroshare-gui/src/retroshare-gui.pro \ + 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 || 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 +} + +src_configure() { + for dir in ${rs_src_dirs} ; do + pushd "${S}/${dir}" >/dev/null || die + eqmake5 $(use gnome-keyring && echo CONFIG+=rs_autologin) + popd >/dev/null || die + 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}/extensions6/" + + 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/retroshare + doins libbitdht/src/bitdht/bdboot.txt + + doins -r libresapi/src/webui + + dodoc README.md + make_desktop_entry retroshare + for i in 24 48 64 128 ; do + doicon -s ${i} "data/${i}x${i}/apps/retroshare.png" + done +} + +pkg_preinst() { + local ver + for ver in ${REPLACING_VERSIONS}; do + if ! version_is_at_least 0.5.9999 ${ver}; then + elog "You are upgrading from Retroshare 0.5.* to ${PV}" + elog "Version 0.6.* is backward-incompatible with 0.5 branch" + elog "and clients with 0.6.* can not connect to clients that have 0.5.*" + elog "It's recommended to drop all your configuration and either" + 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 +} + +pkg_postinst() { + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/net-p2p/retroshare/retroshare-0.6.3.ebuild b/net-p2p/retroshare/retroshare-0.6.3.ebuild deleted file mode 100644 index 8e7f93647e41..000000000000 --- a/net-p2p/retroshare/retroshare-0.6.3.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -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="~amd64 ~x86" - -IUSE="cli feedreader gnome-keyring +gui voip" -REQUIRED_USE=" - || ( cli gui ) - feedreader? ( gui ) - voip? ( gui )" - -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 - net-libs/libmicrohttpd - net-libs/libupnp:0 - sys-libs/zlib - gnome-keyring? ( gnome-base/libgnome-keyring ) - feedreader? ( - dev-libs/libxml2 - dev-libs/libxslt - net-misc/curl - ) - gui? ( - dev-qt/designer:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - x11-libs/libX11 - x11-libs/libXScrnSaver - ) - voip? ( - media-libs/opencv[-qt4(-)] - media-libs/speex - virtual/ffmpeg[encode] - )" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -S="${WORKDIR}/RetroShare-${PV}" - -src_prepare() { - local dir - - sed -i \ - -e "s|/usr/lib/retroshare/extensions6/|/usr/$(get_libdir)/${PN}/extensions6/|" \ - libretroshare/src/rsserver/rsinit.cc \ - || die "sed on libretroshare/src/rsserver/rsinit.cc failed" - - rs_src_dirs="libbitdht/src openpgpsdk/src libresapi/src libretroshare/src supportlibs/pegmarkdown" - use cli && rs_src_dirs="${rs_src_dirs} retroshare-nogui/src" - use feedreader && rs_src_dirs="${rs_src_dirs} plugins/FeedReader" - use gui && rs_src_dirs="${rs_src_dirs} retroshare-gui/src" - use voip && rs_src_dirs="${rs_src_dirs} plugins/VOIP" - - # Force linking to sqlcipher ONLY - sed -i \ - -e '/isEmpty(SQLCIPHER_OK) {/aerror(libsqlcipher not found)' \ - retroshare-gui/src/retroshare-gui.pro \ - 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 || 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 -} - -src_configure() { - for dir in ${rs_src_dirs} ; do - pushd "${S}/${dir}" >/dev/null || die - eqmake5 $(use gnome-keyring && echo CONFIG+=rs_autologin) - popd >/dev/null || die - 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}/extensions6/" - - 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/retroshare - doins libbitdht/src/bitdht/bdboot.txt - - doins -r libresapi/src/webui - - dodoc README.md - make_desktop_entry retroshare - for i in 24 48 64 128 ; do - doicon -s ${i} "data/${i}x${i}/apps/retroshare.png" - done -} - -pkg_preinst() { - local ver - for ver in ${REPLACING_VERSIONS}; do - if ! version_is_at_least 0.5.9999 ${ver}; then - elog "You are upgrading from Retroshare 0.5.* to ${PV}" - elog "Version 0.6.* is backward-incompatible with 0.5 branch" - elog "and clients with 0.6.* can not connect to clients that have 0.5.*" - elog "It's recommended to drop all your configuration and either" - 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 -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} -- cgit v1.2.3-65-gdbad