Drop unique use flag. Bug 404579 by Daniel M. Weeks.

(Portage version: 2.2.0_alpha87/cvs/Linux x86_64)

4 files changed, 9 insertions, 75 deletions

diff --git a/net-misc/remmina/ChangeLog b/net-misc/remmina/ChangeLog
index 0f5a7013e1ea..87c3540dad81 100644
--- a/net-misc/remmina/ChangeLog
+++ b/net-misc/remmina/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/remmina
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/ChangeLog,v 1.23 2012/02/20 00:51:14 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/ChangeLog,v 1.24 2012/02/20 20:45:32 floppym Exp $
+
+  20 Feb 2012; Mike Gilbert <floppym@gentoo.org> -remmina-1.0.0.ebuild,
+  remmina-1.0.0-r1.ebuild, remmina-9999.ebuild:
+  Drop unique use flag. Bug 404579 by Daniel M. Weeks.
 
   20 Feb 2012; Mike Gilbert <floppym@gentoo.org> remmina-9999.ebuild:
   Drop libdir sed in live ebuild; fixed upstream.
diff --git a/net-misc/remmina/remmina-1.0.0-r1.ebuild b/net-misc/remmina/remmina-1.0.0-r1.ebuild
index a11ddedb7e19..49cdbeca9220 100644
--- a/net-misc/remmina/remmina-1.0.0-r1.ebuild
+++ b/net-misc/remmina/remmina-1.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/remmina-1.0.0-r1.ebuild,v 1.2 2012/02/20 00:16:39 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/remmina-1.0.0-r1.ebuild,v 1.3 2012/02/20 20:45:32 floppym Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/downloads/FreeRDP/Remmina/Remmina-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ayatana avahi crypt debug freerdp gnome-keyring nls ssh telepathy unique vte"
+IUSE="ayatana avahi crypt debug freerdp gnome-keyring nls ssh telepathy vte"
 
 # net-libs/libvncserver is bundled; add dep for next release
 RDEPEND="x11-libs/gtk+:3
diff --git a/net-misc/remmina/remmina-1.0.0.ebuild b/net-misc/remmina/remmina-1.0.0.ebuild
deleted file mode 100644
index ba895f9411c3..000000000000
--- a/net-misc/remmina/remmina-1.0.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/remmina-1.0.0.ebuild,v 1.2 2012/02/17 05:23:50 floppym Exp $
-
-EAPI="4"
-
-inherit gnome2-utils cmake-utils
-
-DESCRIPTION="A GTK+ RDP, VNC, XDMCP and SSH client"
-HOMEPAGE="http://remmina.sourceforge.net/"
-SRC_URI="https://github.com/downloads/FreeRDP/Remmina/Remmina-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ayatana avahi crypt debug freerdp nls ssh telepathy unique vte"
-
-# net-libs/libvncserver is bundled; add dep for next release
-RDEPEND="x11-libs/gtk+:3
-	x11-libs/libxkbfile
-	gnome-base/libgnome-keyring
-	ayatana? ( dev-libs/libappindicator )
-	avahi? ( net-dns/avahi[gtk3] )
-	crypt? ( dev-libs/libgcrypt )
-	freerdp? ( >=net-misc/freerdp-1.0 )
-	ssh? ( net-libs/libssh[sftp] )
-	telepathy? ( net-libs/telepathy-glib )
-	!net-misc/remmina-plugins
-	vte? ( x11-libs/vte:2.90 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-DOCS=( README )
-
-src_unpack() {
-	default
-	mv FreeRDP-Remmina-* "${S}" || die
-}
-
-src_prepare() {
-	sed -i -e "/REMMINA_PLUGINDIR/s:lib:$(get_libdir):" CMakeLists.txt || die
-}
-
-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 ssh LIBSSH)
-		$(cmake-utils_use_with telepathy TELEPATHY)
-		$(cmake-utils_use_with vte VTE)
-		-DHAVE_PTHREAD=ON
-	)
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/remmina/remmina-9999.ebuild b/net-misc/remmina/remmina-9999.ebuild
index 3402be5bb01b..67003bbf048a 100644
--- a/net-misc/remmina/remmina-9999.ebuild
+++ b/net-misc/remmina/remmina-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/remmina-9999.ebuild,v 1.12 2012/02/20 00:51:14 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/remmina-9999.ebuild,v 1.13 2012/02/20 20:45:32 floppym Exp $
 
 EAPI="4"
 EGIT_REPO_URI="git://github.com/FreeRDP/Remmina.git"
@@ -13,7 +13,7 @@ HOMEPAGE="http://remmina.sourceforge.net/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="ayatana avahi crypt debug freerdp gnome-keyring nls ssh telepathy unique vte"
+IUSE="ayatana avahi crypt debug freerdp gnome-keyring nls ssh telepathy vte"
 
 RDEPEND="x11-libs/gtk+:3
 	net-libs/libvncserver