Bump to 1.1.1 and update 9999 ebuild, bug #525398.

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8DBDADE

4 files changed, 106 insertions, 14 deletions

diff --git a/net-misc/remmina/ChangeLog b/net-misc/remmina/ChangeLog
index 7dde7b8d73ae..ee89602472ad 100644
--- a/net-misc/remmina/ChangeLog
+++ b/net-misc/remmina/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/remmina
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/ChangeLog,v 1.60 2014/08/27 07:59:47 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/ChangeLog,v 1.61 2014/10/17 15:54:37 maksbotan Exp $
+
+*remmina-1.1.1 (17 Oct 2014)
+
+  17 Oct 2014; Maxim Koltsov <maksbotan@gentoo.org> +remmina-1.1.1.ebuild,
+  remmina-9999.ebuild:
+  Bump to 1.1.1 and update 9999 ebuild, bug #525398.
 
   27 Aug 2014; Sergey Popov <pinkbyte@gentoo.org>
   remmina-1.0.0_p20130723.ebuild, remmina-9999.ebuild:
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index d9fe90600370..b334bebee84f 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -4,18 +4,20 @@ Hash: SHA256
 AUX remmina-1.0.0_p20121004-avahi.patch 2446 SHA256 78cbbc86a21d4f4a0becd6a607e49bf96c10e61881059c4b3ada331b1fa49c99 SHA512 2f7494d408a94b2257d49044415041d977e24d973871d5d37a42ca117799692b6794da7e407245c5fe89372fb33e499449a81ab89b880d00d375be2eee00cd15 WHIRLPOOL 0d624b2b931b4f73b59f00c2629afac33c37b3d442321ab94cfdf2594da92593ee32e424863c485cb2129a56828911cb516167656fcd6d0692aa250c161e62ab
 AUX remmina-external_tools.patch 307 SHA256 20586020f951cf861397a82305cbe0bea373220e19c6ca0c43f18fdab253163f SHA512 89d1d952d253518b0ca3a0b0debb750c458eacf104ea38a91824fa68fb07d1d67a8a212e23d47e18d26a3a1939abe0f95beecb524c8e35fc63dc5dcc869e5bd6 WHIRLPOOL f8d6246453114d05ca7909415da4d999a79cae73ed9124688efcf57819cc78161fa14263474ec0e40ff78e290b125ef5d50673235a1bd7294223ef83dad3dd0f
 DIST remmina-1.0.0_p20130723.tar.gz 387023 SHA256 675c59ae7df75bbe2661d84655559379f5864b7b273c74111b4c0a889c5efbf5 SHA512 065a585f2c630dbc2cecc4bc52c545ad7c9b66e616cabb9e32f7d3464fcb80b51f52b4707f71e129553bd0d1e9d19fa44d7cdfe749ca9dcb6ac3148630d1f4ea WHIRLPOOL 798ad3c6644719763e2e0a20e02dfcf391f7e6aac77342f167e6f62d11fb98ffc4733d6156137a402e56e87d8ca740a649cca8125047adb04e937f56755d4562
+DIST remmina-1.1.1.tar.gz 797163 SHA256 c96485a919848d9c1602c38075359b10417f4285659588b115b75d2cd5a4e884 SHA512 09bacd725522e0a57a1e387db778fe735d0f0d4ce62a63ad4f02799e225296509d075c56fb0c81d6b0c16ab2242889104271e1ecd508417e0aaeed7a35eea594 WHIRLPOOL 97c8961327cc6c11fa365ca4f2ca6e312b01bf7e0e3fc23e5c23b010b26488696984be4f93130ca8b0266f4dad7d038acfc824ac1d822a822d132a45b7b9158e
 EBUILD remmina-1.0.0_p20130723.ebuild 2134 SHA256 1fd8016bd71ed609930b120c2b9088739f0bcc39c526051ed40e5c47b4670112 SHA512 bddcb805df9b45985beb8fffed7669b57ab48f20fc4d225ef0d934d8a7a67ba8d13ebea763e85ffaf8bbd1519f4fd6c07ba6f61ed7f4056116b9ac4e59e4750d WHIRLPOOL edf0d1de2bd746140a633f386313fa2faef81b9569331ade83f08272bf103d63b8bb49d65b5dd9d4bc5ea4d81969c76aa2f61d4a81b5b56ecf609a35ee4b6520
-EBUILD remmina-9999.ebuild 2124 SHA256 9a384f9f6f95a0ae7b026a0896ecf2643d8ae34716faedbcff3f01427c2e2d79 SHA512 864d0edfa5b6ec4f6711ab9e68a3379dc58d69e46d8b14cf60c13bb488f4c828d249e40bf6ea4d4b4c4a2d52adb2e08878e488c489e2e0ec66c8beba963fb415 WHIRLPOOL 09e891dc1b4a29f8b76b709667e2b21c08a7c6a33dedd0b02582e1d669c2cac80f8a15acfceb009fcb8c67137e5f296cec5d030a4915ab48a50604615bec2909
-MISC ChangeLog 9295 SHA256 d8bad3af32a631938513e1d80e1482505ac473e3bd7019fbb125c878ace9f4c7 SHA512 3dffad19a9b6795df96f23bba824b8d649fb657af0f7c24713584e61d8e6824b519197afb39bcdda03b5397e9ec8e106c38dc64cc6e3f793936d39f9bdc03930 WHIRLPOOL 5647a832759818e64696a353528df4831532fb1d18f03ed14de9ba5802dfea846ebc7c0e2aee5f64240a7b8199ae2c65c4a3745dce061545d93f9a775ea8c574
+EBUILD remmina-1.1.1.ebuild 2079 SHA256 1d420f2af4ad582e851c605248bcd372352900e5918d5ca079f43217b4b7a876 SHA512 fb710a720da40e6cb140601fbc7dee0a7bd8b90c45362ef96628bdde7e2f086f243b7060ee4fd50f6f20ca2b17ea230ee9392d83b8a8424f1e5526bb0249a294 WHIRLPOOL 4791a97d68abe0776e35984f33d4a8f52372b746c09c7f471f0aff7a3c8236271019fd40aa5f2d048f775ebe000fd3b64bf19679d4c5291718f4073355780170
+EBUILD remmina-9999.ebuild 2079 SHA256 057b50feb2c1998835d17f4bc55c908409a95664d5065b6f9b53c92e7ac6b370 SHA512 a44279a3bf607d89172f8ad39a4d92faab88207f3f44e41d21bd7186f6e11505f46f63ae25b9bc6ca453795e675ede48d4b6011b87149cd8ddb940f6802a4add WHIRLPOOL fd164e63fab1be608e852c88f2d6b696479219216f5e93c76eef60e1a10bf99055f51409ced3aedd57ff57da219a2beb9aab089363429430fdfea53a70ced50a
+MISC ChangeLog 9478 SHA256 0be7b9c9e8ef3199afa5b325b4a337a76204de34d257072a31f10e9fd122e649 SHA512 92ce765d416a253b59a320bbd19564bf8a35fd7514ce2ea6f7ad42102b275a0eb911ffa350f0cd2530ee28a6e45844fc0a8a57db9e32db8cfa283a6afbfba522 WHIRLPOOL c5edd8dcd40f14f36ad408bfc9837ceb935140c58c031e18a469b1344a3a3a64f920621fb422061bd91add2f6bd88ed055c1902ad45d7b59972a9075eae2f2b1
 MISC metadata.xml 541 SHA256 470b3760f3377d6d98ea0fad762c8754c12a997e54fcab30ddfadf30fd6ef5e4 SHA512 c15ed6f1d21c253fc0d6ec20721e24d7e92cd3ce7f7ddcd9349495d28da788aa1adf7f6b696eff6698054f34a05baf66b09b80fc49764de73e25e97d7d5c2ebf WHIRLPOOL fba96dad2aeb7f21c5e2e4807e8836b54d7acaece3e0e92b0b01bc6956a9a2249577f96f2ee5a3fbb57800a335f04d3f944a8b8e1cca94f479f6772a3490c689
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT/Y/0AAoJECo/aRed92670B4H/2h1arKdLVJX0kGDbT00T1NS
-vz9fSlH8sCMj6n+6qri1FaXlIK2N5lS37k9mMLyQchT0P16EsJGOBBPPWgYQYd7h
-za52A5j0xoUi1LuDKbFdNcYb5pOhBeqNRS6mKvnFUEuhR4n8kB5NlZSjKFmXaoMj
-vCzFx9RPTQflec9fOJhE1WQDlL64Df7g7Xt5tflu7fV0UD54f4zlGr6YhXQWO2OE
-2l6x0qKVR0pLm9fm+T4IWfYH5MRnVQks8etLGN/lycjYvmP/nEM8eAI73GTxSLVC
-uVBNltiuCbZDpaRToxs332HFH7G69Un6zN/XUp1DHod8IFR4kC5Zigt901YOfu4=
-=Ez21
+iQEcBAEBCAAGBQJUQTuyAAoJEAmJmMX429revtAIAImzKXc9JerdqFCFYCDuW+XC
+4bc1H+ZlozukKbGMeu2GPD4djgNduVRHkF/XOle/BEA3zqGFXMzfIHLxVqtPRhux
+cCFXNL2MMkxNdKwJCldCi4FWqm5cfXkNFPXhFHwt+pKHIL1wRAM9aLq/O+JExrzz
+A1cVIgUgdL6Ye87joH39EvwWkq77qQHoe1Nuwe5i/HqYTiOjJ6AnpuVavwnvF608
+3dxVAVCFm2Ue8KUr3A1WUKsWao20izY+dUH0C+3OL9+X5KbvwhJaoC8ou8L+CC3U
+mNXbx+NBFuh6qK+QAc1YsjGKmw19Ny6hYo1X6/lrYT2C/GFY7nHMPOL1lz5VYA4=
+=pVvS
 -----END PGP SIGNATURE-----
diff --git a/net-misc/remmina/remmina-1.1.1.ebuild b/net-misc/remmina/remmina-1.1.1.ebuild
new file mode 100644
index 000000000000..6f002981d410
--- /dev/null
+++ b/net-misc/remmina/remmina-1.1.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/remmina-1.1.1.ebuild,v 1.1 2014/10/17 15:54:37 maksbotan Exp $
+
+EAPI="4"
+
+inherit gnome2-utils cmake-utils
+
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="https://github.com/FreeRDP/Remmina/archive/v${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://remmina.sourceforge.net/"
+
+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
+	avahi? ( net-dns/avahi[gtk3] )
+	ayatana? ( dev-libs/libappindicator )
+	crypt? ( dev-libs/libgcrypt:0 )
+	freerdp? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 )
+	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 )
+PATCHES=( "${FILESDIR}/remmina-external_tools.patch" )
+
+S="${WORKDIR}/Remmina-${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
+		-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 0000bb30d7eb..43708607625f 100644
--- a/net-misc/remmina/remmina-9999.ebuild
+++ b/net-misc/remmina/remmina-9999.ebuild
@@ -1,15 +1,13 @@
 # Copyright 1999-2014 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.34 2014/08/27 07:59:47 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/remmina-9999.ebuild,v 1.35 2014/10/17 15:54:37 maksbotan Exp $
 
 EAPI="4"
 
 inherit gnome2-utils cmake-utils
 
 if [[ ${PV} != 9999 ]]; then
-	inherit vcs-snapshot
-	COMMIT="b6a55ae6f4633d55f8f03e7ce2eeb5899514a8fc"
-	SRC_URI="https://github.com/FreeRDP/Remmina/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/FreeRDP/Remmina/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 else
 	inherit git-2
@@ -53,6 +51,8 @@ RDEPEND+="
 DOCS=( README )
 PATCHES=( "${FILESDIR}/remmina-external_tools.patch" )
 
+S="${WORKDIR}/Remmina-${PV}"
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_with ayatana APPINDICATOR)