Version bump. Should resolve bug 423841. Remove old.

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

5 files changed, 25 insertions, 143 deletions

diff --git a/net-misc/remmina/ChangeLog b/net-misc/remmina/ChangeLog
index 46172881fa85..901820b83b57 100644
--- a/net-misc/remmina/ChangeLog
+++ b/net-misc/remmina/ChangeLog
@@ -1,6 +1,13 @@
 # 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.34 2012/05/05 03:20:42 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/ChangeLog,v 1.35 2012/07/08 00:37:54 floppym Exp $
+
+*remmina-1.0.0_p20120529 (08 Jul 2012)
+
+  08 Jul 2012; Mike Gilbert <floppym@gentoo.org>
+  +remmina-1.0.0_p20120529.ebuild, -remmina-0.7.5.ebuild, -remmina-0.9.3.ebuild,
+  -remmina-1.0.0-r1.ebuild, remmina-9999.ebuild:
+  Version bump. Should resolve bug 423841. Remove old.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> remmina-0.7.5.ebuild,
   remmina-0.9.3.ebuild, remmina-1.0.0-r1.ebuild,
@@ -138,4 +145,3 @@
   26 May 2010; Tristan Heaven <nyhm@gentoo.org> +remmina-0.7.5.ebuild,
   +metadata.xml:
   Initial commit, based on Anthony Low's ebuild from bug #301069
-
diff --git a/net-misc/remmina/remmina-0.7.5.ebuild b/net-misc/remmina/remmina-0.7.5.ebuild
deleted file mode 100644
index bbcf49e77298..000000000000
--- a/net-misc/remmina/remmina-0.7.5.ebuild
+++ /dev/null
@@ -1,60 +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-0.7.5.ebuild,v 1.4 2012/05/05 03:20:42 jdhore Exp $
-
-EAPI=2
-inherit gnome2-utils
-
-DESCRIPTION="A GTK+ RDP, VNC, XDMCP and SSH client"
-HOMEPAGE="http://remmina.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="avahi crypt nls rdesktop ssh unique vnc vte xdmcp"
-
-RDEPEND="x11-libs/gtk+:2
-	avahi? ( net-dns/avahi )
-	crypt? ( dev-libs/libgcrypt )
-	nls? ( virtual/libintl )
-	ssh? ( net-libs/libssh[sftp] )
-	unique? ( dev-libs/libunique:1 )
-	vnc? ( net-libs/libvncserver )
-	vte? ( x11-libs/vte:0 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-RDEPEND="${RDEPEND}
-	rdesktop? ( net-misc/rdesktop )
-	xdmcp? ( x11-base/xorg-server[kdrive] )"
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable avahi) \
-		$(use_enable crypt gcrypt) \
-		$(use_enable nls) \
-		$(use_enable ssh) \
-		$(use_enable unique) \
-		$(use_enable vnc vnc dl) \
-		$(use_enable vte)
-}
-
-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/remmina-0.9.3.ebuild b/net-misc/remmina/remmina-0.9.3.ebuild
deleted file mode 100644
index 0dc4b96aa9b4..000000000000
--- a/net-misc/remmina/remmina-0.9.3.ebuild
+++ /dev/null
@@ -1,62 +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-0.9.3.ebuild,v 1.3 2012/05/05 03:20:42 jdhore Exp $
-
-EAPI=2
-inherit eutils gnome2-utils
-
-DESCRIPTION="A GTK+ RDP, VNC, XDMCP and SSH client"
-HOMEPAGE="http://remmina.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="avahi crypt debug nls ssh unique vte"
-
-RDEPEND="x11-libs/gtk+:2
-	avahi? ( net-dns/avahi )
-	crypt? ( dev-libs/libgcrypt )
-	nls? ( virtual/libintl )
-	ssh? ( net-libs/libssh[sftp] )
-	unique? ( dev-libs/libunique:1 )
-	vte? ( x11-libs/vte:0 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_configure() {
-	if use ssh && ! use vte; then
-		ewarn "Enabling ssh without vte only provides sftp support."
-	fi
-
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable avahi) \
-		$(use_enable crypt gcrypt) \
-		$(use_enable debug) \
-		$(use_enable nls) \
-		$(use_enable ssh) \
-		$(use_enable unique) \
-		$(use_enable vte)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README || die "dodoc failed"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	elog "You need to install net-misc/remmina-plugins which"
-	elog "provide all the necessary network protocols required by ${PN}"
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/remmina/remmina-1.0.0-r1.ebuild b/net-misc/remmina/remmina-1.0.0_p20120529.ebuild
index 64e0c3d0fb4a..92854123eb2b 100644
--- a/net-misc/remmina/remmina-1.0.0-r1.ebuild
+++ b/net-misc/remmina/remmina-1.0.0_p20120529.ebuild
@@ -1,28 +1,38 @@
 # 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.9 2012/05/05 03:20:42 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/remmina-1.0.0_p20120529.ebuild,v 1.1 2012/07/08 00:37:54 floppym Exp $
 
 EAPI="4"
 
 inherit gnome2-utils cmake-utils
 
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="mirror://github/FreeRDP/Remmina/${P}.tar.gz
+		mirror://gentoo/${P}.tar.gz
+		http://dev.gentoo.org/~floppym/distfiles/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+else
+	inherit git-2
+	SRC_URI=""
+	EGIT_REPO_URI="git://github.com/FreeRDP/Remmina.git"
+	KEYWORDS=""
+fi
+
 DESCRIPTION="A GTK+ RDP, VNC, XDMCP and SSH client"
 HOMEPAGE="http://remmina.sourceforge.net/"
-SRC_URI="mirror://github/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 vte"
 
-# net-libs/libvncserver is bundled; add dep for next release
 RDEPEND="
 	x11-libs/gtk+:3
+	>=net-libs/libvncserver-0.9.8.2
 	x11-libs/libxkbfile
 	avahi? ( net-dns/avahi[gtk3] )
 	ayatana? ( dev-libs/libappindicator )
 	crypt? ( dev-libs/libgcrypt )
-	freerdp? ( >=net-misc/freerdp-1.0 )
+	freerdp? ( >=net-misc/freerdp-1.0.1_p20120704 )
 	gnome-keyring? ( gnome-base/libgnome-keyring )
 	ssh? ( net-libs/libssh[sftp] )
 	telepathy? ( net-libs/telepathy-glib )
@@ -39,18 +49,6 @@ RDEPEND+="
 
 DOCS=( README )
 
-src_unpack() {
-	default
-	mv FreeRDP-Remmina-* "${S}" || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-desktop-file.patch"
-	epatch "${FILESDIR}/${P}-fix-desktop-file.patch"
-	epatch "${FILESDIR}/${P}-optional-gnome-keyring.patch"
-	sed -i -e "/REMMINA_PLUGINDIR/s:lib:$(get_libdir):" CMakeLists.txt || die
-}
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_with ayatana APPINDICATOR)
diff --git a/net-misc/remmina/remmina-9999.ebuild b/net-misc/remmina/remmina-9999.ebuild
index 10c1fab080f8..2b54582d472b 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.22 2012/05/05 03:20:42 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/remmina-9999.ebuild,v 1.23 2012/07/08 00:37:54 floppym Exp $
 
 EAPI="4"
 
@@ -32,7 +32,7 @@ RDEPEND="
 	avahi? ( net-dns/avahi[gtk3] )
 	ayatana? ( dev-libs/libappindicator )
 	crypt? ( dev-libs/libgcrypt )
-	freerdp? ( >=net-misc/freerdp-1.0.1_p20120318 )
+	freerdp? ( >=net-misc/freerdp-1.0.1_p20120704 )
 	gnome-keyring? ( gnome-base/libgnome-keyring )
 	ssh? ( net-libs/libssh[sftp] )
 	telepathy? ( net-libs/telepathy-glib )