From 24e62c568e8fa5c735a451a69ed9bf7f7c2e030a Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Thu, 23 Jun 2011 11:58:36 +0000 Subject: Refactor nx logic. Thanks to Dan Weeks . Bug #372257 (Portage version: 2.1.9.49/cvs/Linux x86_64) --- net-misc/remmina-plugins/ChangeLog | 8 ++- .../remmina-plugins-0.9.2-r1.ebuild | 70 ++++++++++++++++++++++ .../remmina-plugins/remmina-plugins-0.9.2.ebuild | 66 -------------------- 3 files changed, 77 insertions(+), 67 deletions(-) create mode 100644 net-misc/remmina-plugins/remmina-plugins-0.9.2-r1.ebuild delete mode 100644 net-misc/remmina-plugins/remmina-plugins-0.9.2.ebuild diff --git a/net-misc/remmina-plugins/ChangeLog b/net-misc/remmina-plugins/ChangeLog index c8614e8723bf..cc7d7a90ac86 100644 --- a/net-misc/remmina-plugins/ChangeLog +++ b/net-misc/remmina-plugins/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-misc/remmina-plugins # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina-plugins/ChangeLog,v 1.1 2011/01/22 16:11:25 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina-plugins/ChangeLog,v 1.2 2011/06/23 11:58:36 hwoarang Exp $ + +*remmina-plugins-0.9.2-r1 (23 Jun 2011) + + 23 Jun 2011; Markos Chandras + -remmina-plugins-0.9.2.ebuild, +remmina-plugins-0.9.2-r1.ebuild: + Refactor nx logic. Thanks to Dan Weeks . Bug #372257 *remmina-plugins-0.9.2 (22 Jan 2011) diff --git a/net-misc/remmina-plugins/remmina-plugins-0.9.2-r1.ebuild b/net-misc/remmina-plugins/remmina-plugins-0.9.2-r1.ebuild new file mode 100644 index 000000000000..bb666844a470 --- /dev/null +++ b/net-misc/remmina-plugins/remmina-plugins-0.9.2-r1.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina-plugins/remmina-plugins-0.9.2-r1.ebuild,v 1.1 2011/06/23 11:58:36 hwoarang Exp $ + +EAPI=2 +inherit gnome2-utils + +DESCRIPTION="Set of plugins for Remmina GTK+ RDP, VNC, XDMCP and SSH client" +HOMEPAGE="http://remmina.sourceforge.net/" +SRC_URI="mirror://sourceforge/remmina/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~amd64" +IUSE="nls nx rdesktop ssh telepathy vnc xdmcp" + +RDEPEND=">=net-misc/remmina-0.8.0 + nls? ( virtual/libintl ) + nx? ( net-misc/nx ) + rdesktop? ( net-misc/freerdp ) + xdmcp? ( x11-base/xorg-server[kdrive] ) + ssh? ( net-libs/libssh[sftp] ) + vnc? ( net-libs/libvncserver )" + +DEPEND="${RDEPEND} + dev-util/intltool + dev-util/pkgconfig + nls? ( sys-devel/gettext ) + telepathy? ( >=net-libs/telepathy-glib-0.9.0 ) " + +src_configure() { + local myconf="--disable-dependency-tracking" + if use nx; then + if ! use ssh; then + myconf="${myconf} --disable-nx" + ewarn "nx support requires ssh." + ewarn "nx support will not be included." + else + myconf="${myconf} --enable-nx" + fi + else + myconf="${myconf} --disable-nx" + fi + + econf \ + ${myconf} \ + $(use_enable nls) \ + $(use_enable rdesktop rdp) \ + $(use_enable ssh) \ + $(use_enable telepathy) \ + $(use_enable vnc ) \ + $(use_enable xdmcp) +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc AUTHORS ChangeLog README +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/net-misc/remmina-plugins/remmina-plugins-0.9.2.ebuild b/net-misc/remmina-plugins/remmina-plugins-0.9.2.ebuild deleted file mode 100644 index 5857d313069a..000000000000 --- a/net-misc/remmina-plugins/remmina-plugins-0.9.2.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina-plugins/remmina-plugins-0.9.2.ebuild,v 1.1 2011/01/22 16:11:25 hwoarang Exp $ - -EAPI=2 -inherit gnome2-utils - -DESCRIPTION="Set of plugins for Remmina GTK+ RDP, VNC, XDMCP and SSH client" -HOMEPAGE="http://remmina.sourceforge.net/" -SRC_URI="mirror://sourceforge/remmina/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~amd64" -IUSE="nls nx rdesktop ssh telepathy vnc xdmcp" - -RDEPEND=">=net-misc/remmina-0.8.0 - nls? ( virtual/libintl ) - nx? ( net-misc/nx ) - rdesktop? ( net-misc/freerdp ) - xdmcp? ( x11-base/xorg-server[kdrive] ) - ssh? ( net-libs/libssh[sftp] ) - vnc? ( net-libs/libvncserver )" - -DEPEND="${RDEPEND} - dev-util/intltool - dev-util/pkgconfig - nls? ( sys-devel/gettext ) - telepathy? ( >=net-libs/telepathy-glib-0.9.0 ) " - -src_configure() { - local myconf="--disable-dependency-tracking" - if use nx && ! use ssh; then - myconf="${myconf} --disable-nx" - ewarn "nx support requires ssh." - ewarn "nx support will not be included." - else - myconf="${myconf} --enable-nx" - fi - - econf \ - ${myconf} \ - $(use_enable nls) \ - $(use_enable rdesktop rdp) \ - $(use_enable ssh) \ - $(use_enable telepathy) \ - $(use_enable vnc ) \ - $(use_enable xdmcp) -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc AUTHORS ChangeLog README -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} -- cgit v1.2.3-65-gdbad