commit: 569f04d7daf8710d815810599c4ca09de21b429d Author: Diogo Pereira <sir.suriv <AT> gmail <DOT> com> AuthorDate: Fri Nov 4 21:41:39 2016 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Nov 6 20:17:08 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=569f04d7
net-misc/remmina: drop old Closes: https://github.com/gentoo/gentoo/pull/2745 Signed-off-by: David Seifert <soap <AT> gentoo.org> net-misc/remmina/Manifest | 1 - .../files/remmina-1.0.0_p20121004-avahi.patch | 68 ---------------- ...mina-1.2.0_rc14-allow-disabling-libsecret.patch | 22 ----- net-misc/remmina/metadata.xml | 1 - net-misc/remmina/remmina-1.2.0_rc14-r1.ebuild | 94 ---------------------- net-misc/remmina/remmina-1.2.0_rc14.ebuild | 92 --------------------- net-misc/remmina/remmina-1.2.0_rc3.ebuild | 91 --------------------- 7 files changed, 369 deletions(-) diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest index b1c5bfc..0a72bd2 100644 --- a/net-misc/remmina/Manifest +++ b/net-misc/remmina/Manifest @@ -1,4 +1,3 @@ -DIST remmina-1.2.0_rc14.tar.gz 940432 SHA256 00c854cd08438399f3788606bf5ee6e4fad48016bab25b3c853c93e85e371050 SHA512 02d5db7c061b760d2b101e2e5b906015c8192b5cc30d75ce649c522e4d7f53ade2dff65324c244139bfce491d31a413342a330dfe0b217af5847e1adbb53935f WHIRLPOOL 31ac11f07665d05e4d48712b8364670c8529a9a96a76809c28fa52327b5a75efff561b7ae4e38f70c8579e15356b7b8ab98ed8af30bc967a8a75c8b913bb7e3e DIST remmina-1.2.0_rc15.tar.gz 968892 SHA256 ba3ab12d1701cf00c09edddbd65293c1b9024195297cce3e8812238e0b5b82f7 SHA512 f899eb57688f1106c607fefc59e44be006e804259e681604747e8af1dcf8527dcae3ca8a1a3dd868a079f37870184100adfde33dc9181bab6a067491147d6aba WHIRLPOOL e79cca76c6585e8531ab4386ad3a6125dd98f917239369e88794d672661a0f188f680fe0aa5c09f09cb1d54c1b038120db4de2754e995fe58604b5638324f43d DIST remmina-1.2.0_rc16.tar.gz 1008438 SHA256 edb347f9e4d0a2e682f7ffd22caa364b477653a1aca31d1c1922a86d81df4995 SHA512 a6d2fb95a3fc68ee7ce4c8205c775cbc7bb83fa2f90b68d04f355b4ca8b4d0956a29ecbc028260c432b55c582802e9f243ad62426212d9fd0f02f7e50a56856f WHIRLPOOL a5d136e1abaeafcc1ad070c400a0c7456e29d1406ea3542add5eb36c4cb1e32cedf0a2bac855298a5e1e703e19774d007ec70c822c49ec13a9f565123b33181d DIST remmina-1.2.0_rc3.tar.gz 791812 SHA256 bfe352cd87b031585d867d519c3a36ee117cca9cc79efb7c11cd11d0f9697208 SHA512 e740cbeda40bfca96c846c77140120ff92803f1bf5fff15c3eb3ba90e7ebe9ccbfa04825ad3fca96c09a5440f496934711141dedc665572965bf0d9c32e053da WHIRLPOOL 1686a4e029a9cd3019b2dc0b59c715cc67b66d6c75337c7032a72ee0228e1df7d7dfd8dc7fb7f51d6298a1c886b29d45b7352bf7a9e025ecb1cd184b08d385ed diff --git a/net-misc/remmina/files/remmina-1.0.0_p20121004-avahi.patch b/net-misc/remmina/files/remmina-1.0.0_p20121004-avahi.patch deleted file mode 100644 index abb058a..00000000 --- a/net-misc/remmina/files/remmina-1.0.0_p20121004-avahi.patch +++ /dev/null @@ -1,68 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=438060 -https://github.com/FreeRDP/Remmina/issues/120 - -diff --git a/cmake/FindAVAHI.cmake b/cmake/FindAVAHI.cmake -index 0a5cc21..91878dc 100644 ---- a/cmake/FindAVAHI.cmake -+++ b/cmake/FindAVAHI.cmake -@@ -17,29 +17,42 @@ - # Foundation, Inc., 59 Temple Place, Suite 330, - # Boston, MA 02111-1307, USA. - --if(GTK3_FOUND) -- set(_AVAHI_LIB_NAME avahi-ui-gtk3) -- set(_AVAHI_PKG_NAME avahi-ui-gtk3>=0.6.30 avahi-client>=0.6.30) --else() -- set(_AVAHI_LIB_NAME avahi-ui) -- set(_AVAHI_PKG_NAME avahi-ui>=0.6.30 avahi-client>=0.6.30) -+include(FindPkgConfig) -+ -+if(PKG_CONFIG_FOUND) -+ pkg_check_modules(PC_AVAHI_CLIENT avahi-client) -+ if(GTK3_FOUND) -+ set(_AVAHI_UI_LIB_NAME avahi-ui-gtk3) -+ set(_AVAHI_UI_PKG_NAME avahi-ui-gtk3>=0.6.30 avahi-client>=0.6.30) -+ else() -+ set(_AVAHI_UI_LIB_NAME avahi-ui) -+ set(_AVAHI_UI_PKG_NAME avahi-ui>=0.6.30 avahi-client>=0.6.30) -+ endif() -+ pkg_check_modules(PC_AVAHI_UI ${_AVAHI_UI_PKG_NAME}) - endif() - --find_package(PkgConfig) --pkg_check_modules(PC_AVAHI ${_AVAHI_PKG_NAME}) - --find_path(AVAHI_INCLUDE_DIR avahi-ui/avahi-ui.h -- HINTS ${PC_AVAHI_INCLUDEDIR} ${PC_AVAHI_INCLUDE_DIRS}) -- --find_library(AVAHI_LIBRARY NAMES ${_AVAHI_LIB_NAME} -- HINTS ${PC_AVAHI_LIBDIR} ${PC_AVAHI_LIBRARY_DIRS}) -+find_library(AVAHI_COMMON_LIBRARY NAMES avahi-common PATHS ${PC_AVAHI_CLIENT_LIBRARY_DIRS}) -+if(AVAHI_COMMON_LIBRARY) -+ set(AVAHI_COMMON_FOUND TRUE) -+endif() - --include(FindPackageHandleStandardArgs) -+find_library(AVAHI_CLIENT_LIBRARY NAMES avahi-client PATHS ${PC_AVAHI_CLIENT_LIBRARY_DIRS}) -+if(AVAHI_CLIENT_LIBRARY) -+ set(AVAHI_CLIENT_FOUND TRUE) -+endif() - --find_package_handle_standard_args(AVAHI DEFAULT_MSG AVAHI_LIBRARY AVAHI_INCLUDE_DIR) -+find_path(AVAHI_UI_INCLUDE_DIR avahi-ui/avahi-ui.h PATHS ${PC_AVAHI_UI_INCLUDE_DIRS}) -+find_library(AVAHI_UI_LIBRARY NAMES ${_AVAHI_UI_LIB_NAME} PATHS ${PC_AVAHI_UI_LIBRARY_DIRS}) -+if(AVAHI_UI_INCLUDE_DIR AND AVAHI_UI_LIBRARY) -+ set(AVAHI_UI_FOUND TRUE) -+endif() - --set(AVAHI_LIBRARIES ${AVAHI_LIBRARY}) --set(AVAHI_INCLUDE_DIRS ${AVAHI_INCLUDE_DIR}) -+FIND_PACKAGE_HANDLE_STANDARD_ARGS(AVAHI DEFAULT_MSG AVAHI_COMMON_FOUND AVAHI_CLIENT_FOUND AVAHI_UI_FOUND) - --mark_as_advanced(AVAHI_INCLUDE_DIR AVAHI_LIBRARY) -+if (AVAHI_FOUND) -+ set(AVAHI_INCLUDE_DIRS ${AVAHI_UI_INCLUDE_DIR}) -+ set(AVAHI_LIBRARIES ${AVAHI_COMMON_LIBRARY} ${AVAHI_CLIENT_LIBRARY} ${AVAHI_UI_LIBRARY}) -+endif() - -+mark_as_advanced(AVAHI_INCLUDE_DIRS AVAHI_LIBRARIES) diff --git a/net-misc/remmina/files/remmina-1.2.0_rc14-allow-disabling-libsecret.patch b/net-misc/remmina/files/remmina-1.2.0_rc14-allow-disabling-libsecret.patch deleted file mode 100644 index 06ce4c9..00000000 --- a/net-misc/remmina/files/remmina-1.2.0_rc14-allow-disabling-libsecret.patch +++ /dev/null @@ -1,22 +0,0 @@ -From d22cc5aa53f6c7312fb1da7a2a507155bab8fabc Mon Sep 17 00:00:00 2001 -From: Diogo Pereira <[email protected]> -Date: Wed, 3 Aug 2016 01:15:52 +0100 -Subject: [PATCH] Allow disabling libsecret dependency - ---- - remmina-plugins-gnome/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/remmina-plugins-gnome/CMakeLists.txt b/remmina-plugins-gnome/CMakeLists.txt -index adf2d03..b392ad6 100644 ---- a/remmina-plugins-gnome/CMakeLists.txt -+++ b/remmina-plugins-gnome/CMakeLists.txt -@@ -31,7 +31,7 @@ - # files in the program, then also delete it here. - - --find_package(Libsecret) -+find_suggested_package(Libsecret) - if(LIBSECRET_FOUND) - set(REMMINA_PLUGINS_GNOME_SRCS - src/glibsecret_plugin.c diff --git a/net-misc/remmina/metadata.xml b/net-misc/remmina/metadata.xml index 3687ff4..19b77f4 100644 --- a/net-misc/remmina/metadata.xml +++ b/net-misc/remmina/metadata.xml @@ -20,7 +20,6 @@ </longdescription> <use> <flag name="freerdp">Add support for the net-misc/freerdp application</flag> - <flag name="libsecret">Enable libsecret support to store login credentials</flag> <flag name="spice">Support connecting to SPICE-enabled virtual machines</flag> <flag name="ssh">Enable support for SSH/SFTP protocol; see also 'vte'</flag> <flag name="telepathy">Enable telepathy support</flag> diff --git a/net-misc/remmina/remmina-1.2.0_rc14-r1.ebuild b/net-misc/remmina/remmina-1.2.0_rc14-r1.ebuild deleted file mode 100644 index 70c7b33..00000000 --- a/net-misc/remmina/remmina-1.2.0_rc14-r1.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -inherit cmake-utils gnome2-utils versionator - -MY_PV_MAIN=$(get_version_component_range 1-3) -MY_PV_RC=$(get_version_component_range 4) -MY_PV="${MY_PV_MAIN}-${MY_PV_RC//rc/rcgit.}" - -if [[ ${PV} != 9999 ]]; then - SRC_URI="https://github.com/FreeRDP/Remmina/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -else - inherit git-r3 - SRC_URI="" - EGIT_REPO_URI="git://github.com/FreeRDP/Remmina.git - https://github.com/FreeRDP/Remmina.git"; -fi - -DESCRIPTION="A GTK+ RDP, VNC, XDMCP and SSH client" -HOMEPAGE="http://remmina.org/ https://github.com/FreeRDP/Remmina"; - -LICENSE="GPL-2" -SLOT="0" -IUSE="ayatana crypt debug freerdp gnome-keyring nls ssh telepathy vte webkit zeroconf" -REQUIRED_USE="ssh? ( vte )" #546886 - -RDEPEND=" - >=dev-libs/glib-2.31.18:2 - >=net-libs/libvncserver-0.9.8.2 - x11-libs/libxkbfile - x11-libs/gdk-pixbuf - x11-libs/gtk+:3 - x11-libs/libX11 - virtual/freedesktop-icon-theme - ayatana? ( dev-libs/libappindicator:3 ) - crypt? ( dev-libs/libgcrypt:0= ) - freerdp? ( >=net-misc/freerdp-2 ) - gnome-keyring? ( app-crypt/libsecret ) - ssh? ( net-libs/libssh[sftp] ) - telepathy? ( net-libs/telepathy-glib ) - vte? ( x11-libs/vte:2.91 ) - webkit? ( net-libs/webkit-gtk:4 ) - zeroconf? ( net-dns/avahi[gtk3] ) -" -DEPEND="${RDEPEND} - dev-util/intltool - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" -RDEPEND+=" - x11-base/xorg-server[kdrive] - !net-misc/remmina-plugins -" - -DOCS=( README.md ) - -PATCHES=( "${FILESDIR}/${P}-allow-disabling-libsecret.patch" ) - -S="${WORKDIR}/Remmina-${MY_PV}" - -src_configure() { - local mycmakeargs=( - -DWITH_APPINDICATOR=$(usex ayatana) - -DWITH_GCRYPT=$(usex crypt) - -DWITH_FREERDP=$(usex freerdp) - -DWITH_LIBSECRET=$(usex gnome-keyring) - -DWITH_GETTEXT=$(usex nls) - -DWITH_TRANSLATIONS=$(usex nls) - -DWITH_LIBSSH=$(usex ssh) - -DWITH_TELEPATHY=$(usex telepathy) - -DWITH_VTE=$(usex vte) - -DWITH_SURVEY=$(usex webkit) - -DWITH_AVAHI=$(usex zeroconf) - -DGTK_VERSION=3 - ) - cmake-utils_src_configure -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update - - elog "XDMCP support requires x11-base/xorg-server[xephyr]." -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/net-misc/remmina/remmina-1.2.0_rc14.ebuild b/net-misc/remmina/remmina-1.2.0_rc14.ebuild deleted file mode 100644 index 10edf9e..00000000 --- a/net-misc/remmina/remmina-1.2.0_rc14.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -inherit cmake-utils gnome2-utils versionator - -MY_PV_MAIN=$(get_version_component_range 1-3) -MY_PV_RC=$(get_version_component_range 4) -MY_PV="${MY_PV_MAIN}-${MY_PV_RC//rc/rcgit.}" - -if [[ ${PV} != 9999 ]]; then - SRC_URI="https://github.com/FreeRDP/Remmina/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -else - inherit git-r3 - SRC_URI="" - EGIT_REPO_URI="git://github.com/FreeRDP/Remmina.git - https://github.com/FreeRDP/Remmina.git"; -fi - -DESCRIPTION="A GTK+ RDP, VNC, XDMCP and SSH client" -HOMEPAGE="http://remmina.org/ https://github.com/FreeRDP/Remmina"; - -LICENSE="GPL-2" -SLOT="0" -IUSE="ayatana crypt debug freerdp libsecret nls ssh telepathy vte webkit zeroconf" -REQUIRED_USE="ssh? ( vte )" #546886 - -RDEPEND=" - >=dev-libs/glib-2.31.18:2 - >=net-libs/libvncserver-0.9.8.2 - x11-libs/libxkbfile - x11-libs/gdk-pixbuf - x11-libs/gtk+:3 - x11-libs/libX11 - virtual/freedesktop-icon-theme - ayatana? ( dev-libs/libappindicator:3 ) - crypt? ( dev-libs/libgcrypt:0= ) - freerdp? ( >=net-misc/freerdp-2 ) - libsecret? ( app-crypt/libsecret ) - ssh? ( net-libs/libssh[sftp] ) - telepathy? ( net-libs/telepathy-glib ) - vte? ( x11-libs/vte:2.91 ) - webkit? ( || ( net-libs/webkit-gtk:4 net-libs/webkit-gtk:3 ) ) - zeroconf? ( net-dns/avahi[gtk3] ) -" -DEPEND="${RDEPEND} - dev-util/intltool - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" -RDEPEND+=" - x11-base/xorg-server[kdrive] - !net-misc/remmina-plugins -" - -DOCS=( README.md ) - -S="${WORKDIR}/Remmina-${MY_PV}" - -src_configure() { - local mycmakeargs=( - -DWITH_APPINDICATOR=$(usex ayatana) - -DWITH_GCRYPT=$(usex crypt) - -DWITH_FREERDP=$(usex freerdp) - -DWITH_LIBSECRET=$(usex libsecret) - -DWITH_GETTEXT=$(usex nls) - -DWITH_TRANSLATIONS=$(usex nls) - -DWITH_LIBSSH=$(usex ssh) - -DWITH_TELEPATHY=$(usex telepathy) - -DWITH_VTE=$(usex vte) - -DWITH_SURVEY=$(usex webkit) - -DWITH_AVAHI=$(usex zeroconf) - -DGTK_VERSION=3 - ) - cmake-utils_src_configure -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update - - elog "XDMCP support requires x11-base/xorg-server[xephyr]." -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/net-misc/remmina/remmina-1.2.0_rc3.ebuild b/net-misc/remmina/remmina-1.2.0_rc3.ebuild deleted file mode 100644 index 4caf945..00000000 --- a/net-misc/remmina/remmina-1.2.0_rc3.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit versionator gnome2-utils cmake-utils - -MY_PV_MAIN=$(get_version_component_range 1-3) -MY_PV_RC=$(get_version_component_range 4) -MY_PV="${MY_PV_MAIN}-${MY_PV_RC//rc/rcgit.}" - -if [[ ${PV} != 9999 ]]; then - SRC_URI="https://github.com/FreeRDP/Remmina/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~x86" -else - inherit git-2 - SRC_URI="" - EGIT_REPO_URI="git://github.com/FreeRDP/Remmina.git - https://github.com/FreeRDP/Remmina.git"; - KEYWORDS="" -fi - -DESCRIPTION="A GTK+ RDP, VNC, XDMCP and SSH client" -HOMEPAGE="http://freerdp.github.io/Remmina/"; - -LICENSE="GPL-2" -SLOT="0" -IUSE="ayatana avahi crypt debug freerdp gnome-keyring nls ssh telepathy vte" - -RDEPEND=" - x11-libs/gtk+:3 - >=dev-libs/glib-2.31.18:2 - >=net-libs/libvncserver-0.9.8.2 - x11-libs/libxkbfile - x11-themes/gnome-icon-theme - x11-libs/gdk-pixbuf - x11-libs/libX11 - avahi? ( net-dns/avahi[gtk3] ) - ayatana? ( dev-libs/libappindicator ) - crypt? ( dev-libs/libgcrypt:0 ) - freerdp? ( - >=net-misc/freerdp-1.2 - <net-misc/freerdp-2 - ) - gnome-keyring? ( gnome-base/libgnome-keyring ) - ssh? ( net-libs/libssh[sftp] ) - telepathy? ( net-libs/telepathy-glib ) - vte? ( x11-libs/vte:2.90 ) -" -DEPEND="${RDEPEND} - dev-util/intltool - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" -RDEPEND+=" - !net-misc/remmina-plugins -" - -DOCS=( README ) - -S="${WORKDIR}/Remmina-${MY_PV}" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_with ayatana APPINDICATOR) - $(cmake-utils_use_with avahi AVAHI) - $(cmake-utils_use_with crypt GCRYPT) - $(cmake-utils_use_with freerdp FREERDP) - $(cmake-utils_use_with gnome-keyring GNOMEKEYRING) - $(cmake-utils_use_with nls GETTEXT) - $(cmake-utils_use_with nls TRANSLATIONS) - $(cmake-utils_use_with ssh LIBSSH) - $(cmake-utils_use_with telepathy TELEPATHY) - $(cmake-utils_use_with vte VTE) - -DGTK_VERSION=3 - ) - cmake-utils_src_configure -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -}
